diff options
63 files changed, 637 insertions, 777 deletions
diff --git a/community/chicken/PKGBUILD b/community/chicken/PKGBUILD index 1cb98a34a..f0b24c58b 100644 --- a/community/chicken/PKGBUILD +++ b/community/chicken/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 83421 2013-01-31 20:35:27Z arodseth $ +# $Id: PKGBUILD 85275 2013-02-28 11:49:19Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: <david@pako.st> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=chicken -pkgver=4.8.0.1 +pkgver=4.8.0.2 pkgrel=1 pkgdesc='Compiler for R5RS scheme, featuring handy extensions' arch=('x86_64' 'i686') url='http://call-cc.org/' license=('BSD') depends=('gcc') -source=("http://code.call-cc.org/releases/${pkgver/.1}/$pkgname-$pkgver.tar.gz") -sha256sums=('a60efa9d2a621ecb9e03b41ebdd03ae27ecb32c1292671fd969506c9baf88d0c') +source=("http://code.call-cc.org/releases/${pkgver%.*}/$pkgname-$pkgver.tar.gz") +sha256sums=('bf933f8cc4586b8b468c9abb8ec079a9f109ea20b5f12a1af2776f694e14791d') build() { cd "$pkgname-$pkgver" diff --git a/community/cinnamon-screensaver/PKGBUILD b/community/cinnamon-screensaver/PKGBUILD index d7932cc34..5b712d8d1 100644 --- a/community/cinnamon-screensaver/PKGBUILD +++ b/community/cinnamon-screensaver/PKGBUILD @@ -5,13 +5,13 @@ pkgname=cinnamon-screensaver pkgver=1.7.1 -pkgrel=3 +pkgrel=4 pkgdesc="Screensaver designed to integrate well with the Cinnamon desktop." arch=('i686' 'x86_64') license=('GPL') url="https://github.com/linuxmint/cinnamon-screensaver" backup=(etc/pam.d/cinnamon-screensaver) -depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop') +depends=('cinnamon' 'gnome-screensaver') makedepends=('intltool' 'gnome-common') options=(!emptydirs) source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-screensaver/archive/$pkgver.tar.gz @@ -19,14 +19,16 @@ source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-screensav cinnamon2d-screensaver.desktop cinnamon-screensaver.pam gnome-autogen.sh - configure.patch) + configure.patch + fix-dbus-compatibility.patch) sha256sums=('055abbc24305dad5efa609b354e01fdc367792ccac5383df4b28090ab0bf64e1' '2f29a72991deb5cc2b44da06f49d1115148fee6a0a22b1abfecee1c1661abcaa' '335df8f2fb270484829d94995622521f0a42a12d6887f7de827db34fc81f583a' 'c19870c4f2d6e91ba0eea2603753a74e0c5c82ff5fa3cacb1198027a38d0a6cb' '827276b01e658afb8045fb0dcbebb54f679ef47dac482f4399e1839369277ccc' - 'fed5f1f94404fab13c5369f4106b0b498cff2bb71351cae4f3d9c27f417f5e6a') + 'fed5f1f94404fab13c5369f4106b0b498cff2bb71351cae4f3d9c27f417f5e6a' + '9013004395a401e99ce6685abb8319eb1e9ddd888c4fa6a7e45729fb93d285d1') build() { cd $pkgname-$pkgver @@ -38,6 +40,9 @@ build() { patch -uNp2 -r- -i ${srcdir}/configure.patch + # Fix compatibility with gnome-screensaver's D-Bus interface and various fixes + patch -Np1 -i ${srcdir}/fix-dbus-compatibility.patch + ./autogen.sh --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/cinnamon-screensaver \ --localstatedir=/var \ diff --git a/community/cinnamon-screensaver/fix-dbus-compatibility.patch b/community/cinnamon-screensaver/fix-dbus-compatibility.patch new file mode 100644 index 000000000..fa53f6fac --- /dev/null +++ b/community/cinnamon-screensaver/fix-dbus-compatibility.patch @@ -0,0 +1,86 @@ +diff --git a/src/cinnamon-screensaver-command.c b/src/cinnamon-screensaver-command.c +index 4267bd0..5c90916 100644 +--- a/src/cinnamon-screensaver-command.c ++++ b/src/cinnamon-screensaver-command.c +@@ -311,11 +311,11 @@ do_command (GDBusConnection *connection) + + if (do_lock) { + if (g_strcmp0 (away_message, "DEFAULT") == 0) { +- reply = screensaver_send_message_string (connection, "Lock", away_message); ++ reply = screensaver_send_message_string (connection, "LockMessage", away_message); + } + else { + gchar * custom_message = g_strdup_printf("CUSTOM###%s", away_message); +- reply = screensaver_send_message_string (connection, "Lock", custom_message); ++ reply = screensaver_send_message_string (connection, "LockMessage", custom_message); + g_free (custom_message); + } + if (reply == NULL) { +diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c +index 2a98aee..6dbf12d 100644 +--- a/src/gs-listener-dbus.c ++++ b/src/gs-listener-dbus.c +@@ -653,6 +653,8 @@ do_introspect (DBusConnection *connection, + xml = g_string_append (xml, + " <interface name=\""GS_INTERFACE"\">\n" + " <method name=\"Lock\">\n" ++ " </method>\n" ++ " <method name=\"LockMessage\">\n" + " <arg name=\"body\" direction=\"in\" type=\"s\"/>\n" + " </method>\n" + " <method name=\"SimulateUserActivity\">\n" +@@ -744,6 +746,10 @@ listener_dbus_handle_session_message (DBusConnection *connection, + g_return_val_if_fail (message != NULL, DBUS_HANDLER_RESULT_NOT_YET_HANDLED); + + if (dbus_message_is_method_call (message, GS_SERVICE, "Lock")) { ++ g_signal_emit (listener, signals [LOCK], 0); ++ return send_success_reply (connection, message); ++ } ++ if (dbus_message_is_method_call (message, GS_SERVICE, "LockMessage")) { + return listener_lock (listener, connection, message); + } + if (dbus_message_is_method_call (message, GS_SERVICE, "Quit")) { +@@ -906,7 +912,7 @@ listener_dbus_handle_system_message (DBusConnection *connection, + } else if (dbus_message_is_signal (message, SYSTEMD_LOGIND_SESSION_INTERFACE, "Lock")) { + if (_listener_message_path_is_our_session (listener, message)) { + gs_debug ("systemd requested session lock"); +- return listener_lock (listener, connection, message); ++ g_signal_emit (listener, signals [LOCK], 0); + } + + return DBUS_HANDLER_RESULT_HANDLED; +@@ -948,7 +954,7 @@ listener_dbus_handle_system_message (DBusConnection *connection, + } else if (dbus_message_is_signal (message, CK_SESSION_INTERFACE, "Lock")) { + if (_listener_message_path_is_our_session (listener, message)) { + gs_debug ("ConsoleKit requested session lock"); +- return listener_lock (listener, connection, message); ++ g_signal_emit (listener, signals [LOCK], 0); + } + + return DBUS_HANDLER_RESULT_HANDLED; +diff --git a/src/gs-manager.c b/src/gs-manager.c +index 1544921..bc09cb9 100644 +--- a/src/gs-manager.c ++++ b/src/gs-manager.c +@@ -1275,10 +1275,18 @@ void + gs_manager_set_away_message (GSManager *manager, + const char *message) + { +- g_free (manager->priv->logout_command); +- +- manager->priv->away_message = g_strdup(message); + GSList *l; ++ ++ g_return_if_fail (GS_IS_MANAGER (manager)); ++ ++ g_free (manager->priv->away_message); ++ ++ if (message) { ++ manager->priv->away_message = g_strdup (message); ++ } else { ++ manager->priv->away_message = NULL; ++ } ++ + for (l = manager->priv->windows; l; l = l->next) { + gs_window_set_away_message (l->data, manager->priv->away_message); + } diff --git a/community/connman/PKGBUILD b/community/connman/PKGBUILD index c9091f03d..ead2ff768 100644 --- a/community/connman/PKGBUILD +++ b/community/connman/PKGBUILD @@ -1,9 +1,9 @@ -#$Id: PKGBUILD 83726 2013-02-04 18:08:38Z dwallace $ +#$Id: PKGBUILD 85296 2013-02-28 15:31:09Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Lucas De Marchi <lucas.de.marchi@gmail.com> pkgname=connman -pkgver=1.11 +pkgver=1.12 pkgrel=1 pkgdesc="Wireless LAN network manager" url="http://connman.net/" @@ -15,11 +15,9 @@ optdepends=('bluez: Support for Bluetooth devices' 'wpa_supplicant: For WiFi devices') makedepends=('bluez' 'wpa_supplicant' 'openconnect' 'openvpn') options=('!libtool') -source=('connmand-daemon' - "http://www.kernel.org/pub/linux/network/${pkgname}/${pkgname}-${pkgver}.tar.bz2" +source=("http://www.kernel.org/pub/linux/network/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'allow_group_network.diff') -md5sums=('88ece7cbf1d0d289545ce4f8553fdab8' - '73f1f93ce503ee80dcc8c9bdda2c3426' +md5sums=('41e5bbc603d031459df4ff243b8318f0' 'a8d22ee089fb0ed725130d16ad393047') build() { @@ -40,9 +38,6 @@ build() { } package(){ - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - install -Dm755 "$srcdir"/connmand-daemon "$pkgdir"/etc/rc.d/connmand + make -C "${srcdir}/${pkgname}-${pkgver}" DESTDIR="${pkgdir}" install install -Dm755 "$srcdir/$pkgname-$pkgver/client/${pkgname}ctl" "$pkgdir/usr/sbin/${pkgname}ctl" } diff --git a/community/connman/connmand-daemon b/community/connman/connmand-daemon deleted file mode 100755 index aff1ddeb2..000000000 --- a/community/connman/connmand-daemon +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -DESC="Connection Manager" -NAME="connmand" -ARGS="" -DAEMON="/usr/sbin/$NAME" - -PID=`pidof -o %PPID ${DAEMON}` -case "$1" in - start) - stat_busy "Starting ${DESC}" - if [ -z "$PID" ]; then - ${DAEMON} ${ARGS} - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon ${NAME} - stat_done - fi - ;; - stop) - stat_busy "Stopping ${DESC}" - [ ! -z "$PID" ] && killall ${DAEMON} &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon ${NAME} - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/community/dspam/PKGBUILD b/community/dspam/PKGBUILD index 5baa8c294..8e5bd8bf8 100644 --- a/community/dspam/PKGBUILD +++ b/community/dspam/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77118 2012-10-05 10:37:20Z spupykin $ +# $Id: PKGBUILD 85298 2013-02-28 15:36:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=dspam pkgver=3.10.2 -pkgrel=2 +pkgrel=3 pkgdesc="A scalable, open-source statistical anti-spam filter" arch=('i686' 'x86_64') url="http://dspam.nuclearelephant.com/" @@ -13,29 +13,35 @@ backup=('etc/dspam/dspam.conf' 'srv/http/dspam/cgi-bin/subadmins') license=("GPL") depends=(readline libcap ncurses zlib openssl) -makedepends=('libmysqlclient' 'postgresql-libs' 'db' 'sqlite') +makedepends=('libmysqlclient' 'postgresql-libs' 'db' 'sqlite' 'libldap') optdepends=('libmysqlclient: MySQL support' 'postgresql-libs: PostgreSQL support' 'db: BerkeleyDB support' - 'sqlite: SQLite support') + 'sqlite: SQLite support' + 'clamav: ClamAV support' + 'libldap: external lookup support') options=('zipman' 'docs' '!libtool') install=$pkgname.install source=(http://downloads.sourceforge.net/project/dspam/dspam/dspam-$pkgver/dspam-$pkgver.tar.gz dspam.logrotated dspam dspam.service - dspam.tmpfiles) + dspam.tmpfiles + dspam_maintenance.cron) md5sums=('0e0e405d3284485b2a43f47eaf6b09bb' - '2163ca41de383f09f4d754e2d35cb158' + 'cec7e3df4cbc6feca387fb516a5b3490' 'bb2300eff5b2a6eb987750c71a2c2169' '1581a94598cec370b66f37b118970676' - '933643f2204ccbd7e451a439f83db1ea') + '933643f2204ccbd7e451a439f83db1ea' + 'ebfb0fec16a56f6e1a3a61ced2d5015d') build() { - OPTS="--with-dspam-owner=dspam --with-dspam-group=dspam --enable-daemon --enable-virtual-users \ + OPTS="--with-dspam-owner=dspam --with-dspam-group=dspam --with-dspam-home-group=dspam --with-dspam-mode=2510 \ + --enable-daemon --enable-virtual-users --enable-large-scale --enable-long-usernames --enable-external-lookup \ + --enable-split-configuration --enable-syslog --enable-clamav \ + --with-dspam-home=/var/lib/dspam --with-logdir=/var/log/dspam --with-logfile=/var/log/dspam/dspam.log \ --with-mysql-includes=/usr/include/mysql --with-mysql-libraries=/usr/lib \ - --with-storage-driver="mysql_drv,libdb4_drv,pgsql_drv,sqlite3_drv,hash_drv" --with-dspam-home=/var/lib/dspam \ - --with-logdir=/var/log/dspam --enable-preferences-extension --enable-large-scale" + --with-storage-driver="mysql_drv,libdb4_drv,pgsql_drv,sqlite3_drv,hash_drv" --enable-preferences-extension" cd $srcdir/$pkgname-$pkgver [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --sysconfdir=/etc/dspam --localstatedir=/var ${OPTS} @@ -52,25 +58,32 @@ package() { find $pkgdir/srv/http/dspam/ -type f -name '*.in' -exec rm -f {} \; install -d $pkgdir/etc/logrotate.d \ - $pkgdir/etc/rc.d $pkgdir/var/lib/dspam/{mysql,pgsql} + $pkgdir/etc/rc.d \ + $pkgdir/usr/share/dspam/{mysql,pgsql} install -m644 ../dspam.logrotated $pkgdir/etc/logrotate.d/dspam install -m755 ../dspam $pkgdir/etc/rc.d sed -i 's|#ServerPID|ServerPID|' $pkgdir/etc/dspam/dspam.conf - sed -e 's:^#*\(ServerDomainSocketPath[\t ]\{1,\}\).*:\1\"/var/run/dspam/dspam.sock\":gI' \ - -e 's:^#*\(ServerPID[\t ]\{1,\}\).*:\1/var/run/dspam/dspam.pid:gI' \ + sed -e 's:^#*\(ServerDomainSocketPath[\t ]\{1,\}\).*:\1\"/run/dspam/dspam.sock\":gI' \ + -e 's:^#*\(ServerPID[\t ]\{1,\}\).*:\1/run/dspam/dspam.pid:gI' \ -i $pkgdir/etc/dspam/dspam.conf sed -i 's|/var/lib/mysql/mysql.sock|/tmp/mysql.sock|' $pkgdir/etc/dspam/dspam.conf - cp -r src/tools.mysql_drv/*.sql $pkgdir/var/lib/dspam/mysql - cp -r src/tools.pgsql_drv/*.sql $pkgdir/var/lib/dspam/pgsql + cp -r src/tools.mysql_drv/*.sql $pkgdir/usr/share/dspam/mysql + cp -r src/tools.pgsql_drv/*.sql $pkgdir/usr/share/dspam/pgsql + + # install dspam_maintenance from contrib/ + install -Dm0755 contrib/dspam_maintenance/dspam_maintenance.sh $pkgdir/usr/bin/dspam_maintenance + install -Dm0644 contrib/dspam_maintenance/dspam_maintenance.1 $pkgdir/usr/share/man/man1/dspam_maintenance.1 + install -Dm0755 $srcdir/dspam_maintenance.cron $pkgdir/etc/cron.daily/dspam_maintenance cd $pkgdir/usr/share/man/man3 find -type l -exec ln -sf libdspam.3 {} \; - chmod 0755 $pkgdir/usr/bin/* + # make logrotate happy + chmod 750 $pkgdir/var/log/dspam install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf diff --git a/community/dspam/dspam.install b/community/dspam/dspam.install index fc74fe55e..4eac46ede 100644 --- a/community/dspam/dspam.install +++ b/community/dspam/dspam.install @@ -3,8 +3,10 @@ post_install() { groupadd -g 115 dspam && echo "done." echo -n "adding dspam system user... " useradd -c "DSPAM Daemon" -u 115 -d /var/lib/dspam -g dspam -s /bin/false dspam \ - && echo "done." + && echo "done." passwd -l dspam &>/dev/null + chown root:dspam usr/bin/dspamc + chmod g+s usr/bin/dspamc cat << EOF >>> To populate the DSPAM database, you need to follow several steps. @@ -27,6 +29,11 @@ cat << EOF EOF } +post_upgrade() { + chown root:dspam usr/bin/dspamc + chmod g+s usr/bin/dspamc +} + post_remove() { echo -n -e "\nremoving dspam system user and group..." userdel dspam && echo "done." diff --git a/community/dspam/dspam.logrotated b/community/dspam/dspam.logrotated index 89db6f565..c73b1dcb3 100644 --- a/community/dspam/dspam.logrotated +++ b/community/dspam/dspam.logrotated @@ -1,5 +1,10 @@ -/var/log/dspam/sql.errors /var/log/dspam/system.log /var/log/dspam/dspam.debug /var/log/dspam/dspam.messages { - weekly - compress - create 0644 dspam dspam +/var/log/dspam/sql.errors +/var/lib/dspam/system.log +/var/log/dspam/dspam.debug +/var/log/dspam/dspam.messages +/var/log/dspam/dspam.log { + weekly + compress + missingok + copytruncate } diff --git a/community/dspam/dspam_maintenance.cron b/community/dspam/dspam_maintenance.cron new file mode 100644 index 000000000..940d8aed1 --- /dev/null +++ b/community/dspam/dspam_maintenance.cron @@ -0,0 +1,6 @@ +#!/bin/sh + +# DSPAM maintenance tasks +# check "man 1 dspam_maintenance" for more options + +/usr/bin/dspam_maintenance --verbose --purgescriptdir=/usr/share/dspam 1> /dev/null diff --git a/community/erlang-cl/PKGBUILD b/community/erlang-cl/PKGBUILD index ec9bcc128..bd40ff483 100644 --- a/community/erlang-cl/PKGBUILD +++ b/community/erlang-cl/PKGBUILD @@ -4,7 +4,7 @@ pkgname=erlang-cl pkgver=1.0 -pkgrel=2 +pkgrel=3 arch=('x86_64' 'i686') pkgdesc='OpenCL binding for Erlang' url="http://github.com/tonyrog/cl" @@ -13,21 +13,21 @@ depends=('erlang' 'libcl' 'bash') replaces=('cl') makedepends=('opencl-headers') source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/tonyrog/cl/tar.gz/master") -sha256sums=('e2cb407489ebe1d8e8f287283eb5c715d559ce95255f6bbcac137cb84c500be6') -_dirname='cl-master' +sha256sums=('76991eba2418ced8e28f4237878e1ec8bb231193c614dab63623ff518b2dc56c') if [ "$CARCH" = "x86_64" ] then _wordsize=64 else _wordsize=32 fi +_dirname='cl-master' build() { cd "$srcdir/$_dirname/c_src" make configure - ./configure --with-wordsize=$_wordsize --prefix=/usr - make all$_wordsize + ./configure --with-wordsize="$_wordsize" --prefix=/usr + make "all$_wordsize" rm config.* } @@ -36,6 +36,7 @@ package() { mkdir -p "$pkgdir/usr/lib/erlang/lib/cl-$pkgver" cp -r * "$pkgdir/usr/lib/erlang/lib/cl-$pkgver" + install -Dm644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } # vim:set ts=2 sw=2 et: diff --git a/community/erlang-nox/PKGBUILD b/community/erlang-nox/PKGBUILD index 77f83f11c..899e1e02f 100644 --- a/community/erlang-nox/PKGBUILD +++ b/community/erlang-nox/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84208 2013-02-13 18:26:31Z arodseth $ +# $Id: PKGBUILD 85253 2013-02-28 10:04:50Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Lukas Fleischer <archlinux@cryptocrack.de> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> @@ -7,8 +7,8 @@ # Contributor: Ricardo Catalinas Jiménez <jimenezrick@gmail.com> pkgname=erlang-nox -pkgver=R15B03_1 -pkgrel=3 +pkgver=R16B +pkgrel=1 pkgdesc='General-purpose concurrent functional programming language developed by Ericsson (headless version)' arch=('x86_64' 'i686') url='http://www.erlang.org/' @@ -22,8 +22,8 @@ optdepends=('erlang-unixodbc: database support' 'lksctp-tools: for SCTP support') source=("http://www.erlang.org/download/otp_src_${pkgver/_/-}.tar.gz" "http://www.erlang.org/download/otp_doc_man_${pkgver/_/-}.tar.gz") -sha256sums=('4bccac86dd76aec050252e44276a0283a0df9218e6470cf042a9b9f9dfc9476c' - '07980d8014c7cf8194b7078c137353f5083992add4663ced3dcba2ff91f228d8') +sha256sums=('f01c2cfe512d3118fd3398a66bdb82bea6ad0f45b464a46a58e452264b7682cd' + 'f7b1baa088d4ecda4a86944d3a782fcbf80c6b9161756bb50fec9e8d129176b9') build() { cd "$srcdir/otp_src_${pkgver/_1/}" diff --git a/community/erlang-sdl/PKGBUILD b/community/erlang-sdl/PKGBUILD index b154943c6..c7011e33b 100644 --- a/community/erlang-sdl/PKGBUILD +++ b/community/erlang-sdl/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 85225 2013-02-27 19:58:03Z andrea $ +# $Id: PKGBUILD 85286 2013-02-28 12:24:52Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: kappa <kappacurve@gmail.com> pkgname=erlang-sdl pkgver=1.2 -pkgrel=3 +pkgrel=6 arch=('x86_64' 'i686') pkgdesc='SDL and OpenGL bindings for Erlang (r15b-driver-compat branch)' url='http://esdl.sourceforge.net/' license=('custom') -depends=('erlang' 'sdl' 'glu' 'libgl') +depends=('erlang' 'sdl' 'glu' 'libgl' 'erlang') makedepends=('mesa-libgl') replaces=('esdl') source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/dgud/esdl/tar.gz/dgud/r15b-driver-compat") diff --git a/community/erlang/PKGBUILD b/community/erlang/PKGBUILD index c1409a81f..668e8494c 100644 --- a/community/erlang/PKGBUILD +++ b/community/erlang/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84206 2013-02-13 17:23:45Z arodseth $ +# $Id: PKGBUILD 85255 2013-02-28 10:10:52Z arodseth $ # Maintainer: Lukas Fleischer <archlinux@cryptocrack.de> # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> @@ -8,16 +8,16 @@ pkgbase=erlang pkgname=('erlang' 'erlang-unixodbc') -pkgver=R15B03_1 -pkgrel=3 +pkgver=R16B +pkgrel=1 arch=('x86_64' 'i686') url='http://www.erlang.org/' license=('custom') makedepends=('perl' 'mesa' 'lksctp-tools' 'unixodbc') source=("http://www.erlang.org/download/otp_src_${pkgver/_/-}.tar.gz" "http://www.erlang.org/download/otp_doc_man_${pkgver/_/-}.tar.gz") -sha256sums=('4bccac86dd76aec050252e44276a0283a0df9218e6470cf042a9b9f9dfc9476c' - '07980d8014c7cf8194b7078c137353f5083992add4663ced3dcba2ff91f228d8') +sha256sums=('f01c2cfe512d3118fd3398a66bdb82bea6ad0f45b464a46a58e452264b7682cd' + 'f7b1baa088d4ecda4a86944d3a782fcbf80c6b9161756bb50fec9e8d129176b9') build() { cd "$srcdir/otp_src_${pkgver/_1/}" diff --git a/community/freeorion/PKGBUILD b/community/freeorion/PKGBUILD index d26d979a5..c491ff590 100644 --- a/community/freeorion/PKGBUILD +++ b/community/freeorion/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85227 2013-02-27 19:59:02Z andrea $ +# $Id: PKGBUILD 85311 2013-02-28 21:00:16Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Elmo Todurov <todurov@gmail.com> # Contributor: guini <sidtrun@googlemail.com> @@ -8,7 +8,7 @@ pkgname=freeorion pkgver=0.4.2 -pkgrel=1 +pkgrel=2 pkgdesc='Turn-based galactic conquest game inspired by Master of Orion' arch=('x86_64' 'i686') url='http://www.freeorion.org/' @@ -21,8 +21,7 @@ else fi depends=('bullet>=2.81' 'freealut' 'libvorbis' 'python2' 'gigi' 'desktop-file-utils' 'libgl') makedepends=('boost>=1.49.0' 'ogre' 'sdl' 'gigi>=0.8.0-12' 'graphviz' 'mesa-libgl' - 'desktop-file-utils' 'setconf' 'cmake' 'gendesk' 'subversion' - 'libogg') + 'desktop-file-utils' 'setconf' 'cmake' 'gendesk' 'subversion' 'libogg') options=('!strip' '!emptydirs') install=$pkgname.install source=("$pkgname.sh" @@ -43,10 +42,9 @@ build() { #_releaserevision=`curl --progress-bar -o- ${url}index.php/Compile | grep "$pkgver" | cut -d':' -f2 | cut -d' ' -f10 | tail -1` #msg2 'The revision for the latest official release is $_releaserevision" ## _revision=$_releaserevision + #msg2 "Compiling with revision $_revision" - msg2 'Compiling with revision $_revision' - - msg2 'Checking out svn revision $_revision...' + msg2 "Checking out svn revision $_revision..." if [[ -d "$pkgname/.svn" ]]; then (cd "$pkgname" && svn up -r "$_revision") else diff --git a/community/gigi/PKGBUILD b/community/gigi/PKGBUILD index be9a68f2b..ed430d7b6 100644 --- a/community/gigi/PKGBUILD +++ b/community/gigi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83897 2013-02-06 12:43:24Z arodseth $ +# $Id: PKGBUILD 85249 2013-02-28 09:21:43Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: fana-m <geminin@gmx.net> @@ -7,15 +7,15 @@ pkgname=gigi pkgver=0.8.0 -pkgrel=17 -_fixedrevision=5407 +pkgrel=18 +_fixedrevision=5780 #5407 pkgdesc='Small, efficient and feature rich GUI for OpenGL and C++ (freeorion fork)' -url='http://freeorion.svn.sourceforge.net/viewvc/freeorion/trunk/FreeOrion/GG/' #url='http://gigi.sourceforge.net/' +url='http://freeorion.svn.sourceforge.net/viewvc/freeorion/trunk/FreeOrion/GG/' arch=('x86_64' 'i686') license=('LGPL') depends=('boost' 'libpng' 'libtiff' 'ogre' 'sdl' 'python') -makedepends=('subversion' 'cmake' 'setconf' 'doxygen' 'mesa') +makedepends=('subversion' 'cmake' 'setconf' 'doxygen' 'mesa-libgl') build() { cd "$srcdir" @@ -39,7 +39,8 @@ build() { setconf cmake/GiGiSDL.pc.in prefix /usr # It would be better if CMAKE_INSTALL_PREFIX or the resulting Makefiles # could be re-configured in the package() function, but this works too. - cmake -D CMAKE_INSTALL_PREFIX="$srcdir/pkg/usr" \ + cmake \ + -D CMAKE_INSTALL_PREFIX="$srcdir/pkg/usr" \ -D BUILD_TUTORIALS=OFF \ -D CPACK_GENERATOR=GiGiDevel \ -D CMAKE_C_FLAGS_RELEASE='-DNDEBUG' \ diff --git a/community/glitz/PKGBUILD b/community/glitz/PKGBUILD index be833ed8f..98c9f7eea 100644 --- a/community/glitz/PKGBUILD +++ b/community/glitz/PKGBUILD @@ -1,29 +1,31 @@ -# $Id: PKGBUILD 66602 2012-02-26 14:06:03Z lfleischer $ +# $Id: PKGBUILD 85262 2013-02-28 10:34:33Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> pkgname=glitz pkgver=0.5.6 -pkgrel=3 -pkgdesc="OpenGL image compositing library" -arch=('i686' 'x86_64') -url="http://cairographics.org/" +pkgrel=4 +pkgdesc='OpenGL image compositing library' +arch=('x86_64' 'i686') +url='http://cairographics.org/' license=('BSD') -depends=('libgl') -makedepends=('mesa') +depends=('libgl' 'glibc') +makedepends=('mesa-libgl') options=('!libtool') -source=("http://cairographics.org/snapshots/${pkgname}-${pkgver}.tar.gz") -md5sums=('c507f140ecccc06aed8888c958edda4c') +source=("http://cairographics.org/snapshots/$pkgname-$pkgver.tar.gz") +sha256sums=('132adf06e48531f4c01b6ba5843881e2b584a170c5222353d03cbef736d4a471') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } +# vim:set ts=2 sw=2 et: diff --git a/community/glob2/PKGBUILD b/community/glob2/PKGBUILD index ecb9b7f0a..17cacaedc 100644 --- a/community/glob2/PKGBUILD +++ b/community/glob2/PKGBUILD @@ -1,41 +1,38 @@ -# $Id: PKGBUILD 83780 2013-02-05 07:28:52Z arodseth $ +# $Id: PKGBUILD 85280 2013-02-28 12:06:25Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> pkgname=glob2 pkgver=0.9.4.4 -pkgrel=15 +pkgrel=16 pkgdesc='RTS game which minimizes micro-management by automatically assigning tasks to units' arch=('x86_64' 'i686') url='http://www.globulation2.org/' license=('GPL3') depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'glu' - 'fribidi' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils') -makedepends=('scons' 'boost' 'mesa') -install=glob2.install -source=("http://dl.sv.nongnu.org/releases/$pkgname/0.9.4/$pkgname-$pkgver.tar.gz" - 'glob2-0.9.4.1-gcc44.patch') + 'fribidi' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 'libgl') +makedepends=('scons' 'boost' 'mesa-libgl') +install="$pkgname.install" +source=("http://dl.sv.nongnu.org/releases/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.gz" + "$pkgname-${pkgver%.*}.1-gcc44.patch") sha256sums=('0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8' '3a0cfc06696d1aaf2d7948b5f6a09a8ce96492767039dc09bfc25182b92d7b7a') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np0 -i "$srcdir/glob2-0.9.4.1-gcc44.patch" - scons \ - LINKFLAGS="-lboost_system" + patch -Np0 -i "$srcdir/$pkgname-${pkgver%.*}.1-gcc44.patch" + scons LINKFLAGS="-lboost_system" } package () { cd "$srcdir/$pkgname-$pkgver" - scons install \ - BINDIR="$pkgdir/usr/bin" \ - INSTALLDIR="$pkgdir/usr/share" + scons install BINDIR="$pkgdir/usr/bin" INSTALLDIR="$pkgdir/usr/share" find "$pkgdir/usr/share" -type f -exec chmod 644 '{}' \; - install -Dm644 data/icons/glob2-icon-48x48.png \ - "$pkgdir/usr/share/pixmaps/glob2-icon-48x48.png" + install -Dm644 "data/icons/$pkgname-icon-48x48.png" \ + "$pkgdir/usr/share/pixmaps/$pkgname-icon-48x48.png" } # vim:set ts=2 sw=2 et: diff --git a/community/kmscon/PKGBUILD b/community/kmscon/PKGBUILD index 11cb9492d..801f87927 100644 --- a/community/kmscon/PKGBUILD +++ b/community/kmscon/PKGBUILD @@ -1,37 +1,48 @@ +# $Id: PKGBUILD 85313 2013-02-28 21:20:56Z thestinger $ # Maintainer: Daniel Micay <danielmicay@gmail.com> # Contributor: David Herrmann <dh.herrmann@googlemail.com> pkgname=kmscon -pkgver=6 -pkgrel=3 +pkgver=7 +pkgrel=1 pkgdesc='Terminal emulator based on Kernel Mode Setting (KMS)' arch=(i686 x86_64) url='https://github.com/dvdhrm/kmscon' license=('MIT') depends=(systemd libdrm mesa libegl libgbm libgles pango libxkbcommon libpciaccess xkeyboard-config) -makedepends=('libxslt' 'docbook-xsl' 'linux-api-headers') +makedepends=(git libxslt docbook-xsl linux-api-headers) options=(!libtool) -source=(https://github.com/downloads/dvdhrm/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('12f6966cef8e846f31dbcad916a9f347') + +__gitroot=https://github.com/dvdhrm/kmscon.git +__gitname=kmscon build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure \ - --prefix=/usr \ - --enable-kmscon \ - --disable-wlterm \ - --enable-multi-seat \ - --enable-hotplug \ - --enable-pciaccess \ - --with-video=fbdev,dumb,drm \ - --with-fonts=pango,freetype2,8x16 \ - --with-sessions=dummy,terminal + cd "$srcdir" + + msg "Connecting to GIT server...." + + if [[ -d "$__gitname" ]]; then + cd "$__gitname" && git pull origin + msg "The local files are updated." + else + git clone "$__gitroot" "$__gitname" + fi + + msg "GIT checkout done or server timeout" + msg "Starting build..." + + rm -rf "$srcdir/$__gitname-build" + git clone "$srcdir/$__gitname" "$srcdir/$__gitname-build" + cd "$srcdir/$__gitname-build" + + git checkout $pkgname-$pkgver + ./autogen.sh --prefix=/usr --disable-wlterm make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$__gitname-build" make DESTDIR="$pkgdir/" install mkdir -p "$pkgdir/usr/share/licenses/$pkgname" "$pkgdir/usr/lib/systemd/system" cp COPYING "$pkgdir/usr/share/licenses/$pkgname/" - cp docs/kmscon{,@}.service "$pkgdir/usr/lib/systemd/system/" + cp docs/kmscon{,vt@}.service "$pkgdir/usr/lib/systemd/system/" } diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 0a1f8fac4..54337d10f 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 84161 2013-02-12 12:14:11Z thomas $ +# $Id: PKGBUILD 85292 2013-02-28 15:18:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt -pkgver=1.0.2 -pkgrel=3 +pkgver=1.0.3 +pkgrel=1rc2 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') url="http://libvirt.org/" @@ -29,20 +29,18 @@ backup=('etc/conf.d/libvirtd' 'etc/libvirt/qemu.conf' 'etc/sasl2/libvirt.conf') install="libvirt.install" -source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" +source=("http://libvirt.org/sources/$pkgname-$pkgver-rc2.tar.gz" libvirtd.rc.d libvirtd.conf.d libvirtd-guests.rc.d libvirtd-guests.conf.d - libvirt.tmpfiles.d - python.patch) -md5sums=('7e268ed702c4331d393e5b43449cae13' + libvirt.tmpfiles.d) +md5sums=('d03a65be35c455bc09ee96df66ea2c4d' 'c43244c40a0437038c82089618e7beaa' '3ed0e24f5b5e25bf553f5427d64915e6' '0ee5b6c58590ff392a266f20f7928d1f' '0a96ed876ffb1fcb9dff5a9b3a609c1e' - '020971887442ebbf1b6949e031c8dd3f' - '4280310abbdebbb7ad756840e4ff5671') + '020971887442ebbf1b6949e031c8dd3f') build() { cd "$srcdir/$pkgname-$pkgver" @@ -54,8 +52,6 @@ build() { sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file done - patch -p1 <$srcdir/python.patch - export LDFLAGS=-lX11 export RADVD=/usr/sbin/radvd [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" \ diff --git a/community/libvirt/python.patch b/community/libvirt/python.patch deleted file mode 100644 index c791a54e9..000000000 --- a/community/libvirt/python.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/python/generator.py b/python/generator.py -index 5d27f66..71ca883 100755 ---- a/python/generator.py -+++ b/python/generator.py -@@ -123,7 +123,7 @@ class docParser(xml.sax.handler.ContentHandler): - self.function_return_field = attrs['field'] - elif tag == 'enum': - if (attrs['file'] == "libvirt" or -- attrs['file'] == "virterror"): -+ attrs['file'] == "virerror"): - enum(attrs['type'],attrs['name'],attrs['value']) - elif attrs['file'] == "libvirt-lxc": - lxc_enum(attrs['type'],attrs['name'],attrs['value']) -@@ -137,7 +137,7 @@ class docParser(xml.sax.handler.ContentHandler): - if self.function != None: - if (self.function_module == "libvirt" or - self.function_module == "virevent" or -- self.function_module == "virterror"): -+ self.function_module == "virerror"): - function(self.function, self.function_descr, - self.function_return, self.function_args, - self.function_file, self.function_module, diff --git a/community/mesa-dri1/PKGBUILD b/community/mesa-dri1/PKGBUILD index f63f0d717..3fa2266bf 100644 --- a/community/mesa-dri1/PKGBUILD +++ b/community/mesa-dri1/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=mesa-dri1 pkgname=('unichrome-dri' 'i810-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri') pkgver=7.11.2 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') makedepends=('glproto>=1.4.14' 'dri2proto' 'libdrm>=2.4.26' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6.1' 'python2' 'libxml2' 'imake' 'llvm' 'udev') @@ -35,21 +35,21 @@ build() { } package_unichrome-dri() { - depends=("libgl") + depends=("mesa-libgl") pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome" make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/unichrome DESTDIR="${pkgdir}" install } package_i810-dri() { - depends=("libgl") + depends=("mesa-libgl") pkgdesc="Mesa DRI drivers for Intel i810" make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i810 DESTDIR="${pkgdir}" install } package_mach64-dri() { - depends=("libgl") + depends=("mesa-libgl") pkgdesc="Mesa DRI drivers for ATI Mach64" conflicts=('xf86-video-mach64<6.8.2') @@ -57,7 +57,7 @@ package_mach64-dri() { } package_mga-dri() { - depends=("libgl") + depends=("mesa-libgl") pkgdesc="Mesa DRI drivers for Matrox" conflicts=('xf86-video-mga<1.4.11') @@ -65,7 +65,7 @@ package_mga-dri() { } package_r128-dri() { - depends=("libgl") + depends=("mesa-libgl") pkgdesc="Mesa DRI drivers for ATI Rage128" conflicts=('xf86-video-r128<6.8.1') @@ -73,7 +73,7 @@ package_r128-dri() { } package_savage-dri() { - depends=("libgl") + depends=("mesa-libgl") pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage" conflicts=('xf86-video-savage<2.3.1') @@ -81,7 +81,7 @@ package_savage-dri() { } package_sis-dri() { - depends=("libgl") + depends=("mesa-libgl") pkgdesc="Mesa DRI drivers for SiS" conflicts=('xf86-video-sis<0.10.2') @@ -89,7 +89,7 @@ package_sis-dri() { } package_tdfx-dri() { - depends=("libgl") + depends=("mesa-libgl") pkgdesc="Mesa DRI drivers for 3dfx" conflicts=('xf86-video-tdfx<1.4.3') diff --git a/community/mupdf/PKGBUILD b/community/mupdf/PKGBUILD index f339be13c..52e6ed643 100644 --- a/community/mupdf/PKGBUILD +++ b/community/mupdf/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75333 2012-08-20 06:45:01Z bpiotrowski $ +# $Id: PKGBUILD 85309 2013-02-28 20:50:02Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> @@ -6,23 +6,23 @@ # Contributor: xduugu (.desktop and install files) pkgname=mupdf -pkgver=1.1 +pkgver=1.2 pkgrel=1 -pkgdesc="lightweight PDF viewer and toolkit written in portable C" +pkgdesc='Lightweight PDF and XPS viewer' arch=('i686' 'x86_64') -url="http://mupdf.com" +url='http://mupdf.com' license=('GPL3') depends=('freetype2' 'libjpeg' 'jbig2dec' 'openjpeg' 'libxext' 'desktop-file-utils' 'xdg-utils') install=mupdf.install -source=("http://mupdf.com/download/$pkgname-$pkgver-source.tar.gz") -md5sums=('f7b5fd753f40aca207e9afd70d8f8edf') +source=(https://mupdf.googlecode.com/files/$pkgname-$pkgver-source.zip) +sha256sums=('9bc9e31ec27c091dad37f70940bd799e46ab6da4299bc58e803bff3dbb07dc3b') build() { - CFLAGS+=" -fPIC" - CXXFLAGS+=" -fPIC" + CFLAGS+=' -fPIC' + CXXFLAGS+=' -fPIC' cd "$srcdir"/$pkgname-$pkgver-source - make build=release prefix="$pkgdir"/usr + make build=release prefix=/usr } package() { diff --git a/community/pyqt3/PKGBUILD b/community/pyqt3/PKGBUILD index 01edb1144..f23faf9e2 100644 --- a/community/pyqt3/PKGBUILD +++ b/community/pyqt3/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 77656 2012-10-13 11:44:31Z allan $ +# $Id: PKGBUILD 85290 2013-02-28 14:49:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net> pkgname=pyqt3 pkgver=3.18.1 -pkgrel=11 +pkgrel=12 pkgdesc="A set of Python bindings for the Qt3 toolkit" arch=('i686' 'x86_64') url="http://www.riverbankcomputing.com/software/pyqt/intro" depends=('python2-sip' 'qscintilla-qt3') makedepends=('glu') license=('GPL') -source=("http://www.riverbankcomputing.com/static/Downloads/PyQt3/PyQt-x11-gpl-${pkgver}.tar.gz") +source=("http://downloads.sourceforge.net/project/pyqt/PyQt3/PyQt-x11-gpl-${pkgver}.tar.gz") md5sums=('f1d120495d1aaf393819e988c0a7bb7e') build() { @@ -21,7 +21,7 @@ build() { echo yes | python2 configure.py -b /usr/bin \ -d /usr/lib/python2.7/site-packages \ -v /usr/share/sip - make + make CXX="g++ -DANY=void" } package() { diff --git a/community/rbutil/PKGBUILD b/community/rbutil/PKGBUILD new file mode 100755 index 000000000..228292f4c --- /dev/null +++ b/community/rbutil/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 85270 2013-02-28 11:01:50Z alucryd $ +# Maintainer: Maxime Gauduin <alucryd@gmail.com> +# Contributor: said <atvordhosbn@gmail.com> +# Contributor: clinx <clinx.hacker@googlemail.com> + +pkgname=rbutil +pkgver=1.3.1 +pkgrel=2 +pkgdesc="Rockbox Utility" +arch=('i686' 'x86_64') +url="http://www.rockbox.org/twiki/bin/view/Main/RockboxUtility" +license=("GPL") +depends=('qt' 'libusb') +source=("http://download.rockbox.org/${pkgname}/source/RockboxUtility-v${pkgver}-src.tar.bz2" "${pkgname}.desktop") +sha256sums=('6c04b5c7eaad1762577908dedb9e40f5b0cee675150ae5ba844ea2c9bea294ca' + '539285237af16fbc60a7501963e8c2f584e58a31f2613481e6b42d21337b7a25') + +build() { + cd "${srcdir}"/RockboxUtility-v${pkgver}/${pkgname}/rbutilqt + +# Build + lrelease rbutilqt.pro + qmake + make +} + +package(){ + cd "${srcdir}"/RockboxUtility-v${pkgver}/${pkgname}/rbutilqt + +# Install + install -dm 755 "${pkgdir}"/usr/{bin,share/pixmaps} + install -m 644 icons/rockbox-64.png "${pkgdir}"/usr/share/pixmaps/rbutil.png + install -m 755 RockboxUtility "${pkgdir}"/usr/bin/rbutil + +# Desktop file + install -dm 755 "${pkgdir}"/usr/share/applications + install -m 644 "${srcdir}"/rbutil.desktop "${pkgdir}"/usr/share/applications/rbutil.desktop +} + +#vim: ts=2 sw=2 et: diff --git a/community/rbutil/rbutil.desktop b/community/rbutil/rbutil.desktop new file mode 100755 index 000000000..920b6a452 --- /dev/null +++ b/community/rbutil/rbutil.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Rockbox Utility +GenericName=Rockbox Utility +Comment=Configure Rockbox +Encoding=UTF-8 +Exec=rbutil +Icon=rbutil.png +Categories=Application;Qt;AudioVideo;Audio; +StartupNotify=false +Terminal=false +Type=Application diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD index d95d1579e..952598ee5 100644 --- a/community/rekonq/PKGBUILD +++ b/community/rekonq/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83068 2013-01-27 10:02:41Z andrea $ +# $Id: PKGBUILD 85307 2013-02-28 20:20:52Z andrea $ # Maintainer: Peter Lewis <plewis@aur.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Panagiotis Papadopoulos <pano_90 AT gmx DOT net> pkgname=rekonq -pkgver=2.1 +pkgver=2.2 pkgrel=1 pkgdesc='A WebKit based web browser for KDE' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4') optdepends=('qca-ossl: to use the sync handler') install=${pkgname}.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -sha256sums=('92640c80b19e88934d5ed618b4a61c767ee7a27e4792e43bd3ccf51a7b5ce664') +sha256sums=('f5050bc7386807f1b91f0f90209397be08f67a95824e77ce78d1c1779015aeda') build(){ mkdir build diff --git a/community/rusxmms/PKGBUILD b/community/rusxmms/PKGBUILD index 28a581ec8..a9d9209e5 100644 --- a/community/rusxmms/PKGBUILD +++ b/community/rusxmms/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 54066 2011-08-13 05:45:42Z ebelanger $ +# $Id: PKGBUILD 85265 2013-02-28 10:39:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -23,36 +23,29 @@ md5sums=('f3e6dbaf0b3f571a532ab575656be506' build() { cd "${srcdir}"/xmms-${_xmmsver} + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/g' configure.in libxmms/configure.in -if true; then ln -s "$srcdir"/RusXMMS2 "$srcdir"/xmms-${_xmmsver}/RusXMMS2 (cd "$srcdir"/xmms-${_xmmsver}/RusXMMS2 && ./apply.sh) mv "$srcdir"/RusXMMS2/source/* "$srcdir"/xmms-${_xmmsver}/libxmms/ -# sed -i 's#charset.c charset.h#charset.c charset.h rcc.h rcc.c rcc_lang.h#g' "$srcdir"/xmms-${_xmmsver}/libxmms/Makefile.am && \ - -# I already remove esound from repo and it has some autotools errors that I can't seem to figure out. So let's use a hack to get the esound removal rebuild done. -# aclocal -# automake -autoconf + autoconf sed -i 's/unicode.c//g' Input/mpg123/Makefile.in sed -i 's/unicode.lo//g' Input/mpg123/Makefile.in - (cd libxmms && aclocal && automake && autoconf) case $CARCH in x86_64) - ./configure --prefix=/usr --disable-mikmod --disable-simd + ./configure --prefix=/usr --disable-mikmod --disable-simd ;; i686) - ./configure --prefix=/usr --disable-mikmod --enable-simd --disable-vorbis --disable-vorbistest + ./configure --prefix=/usr --disable-mikmod --enable-simd --disable-vorbis --disable-vorbistest ;; *) return 1 ;; esac -fi make } diff --git a/community/wings3d/PKGBUILD b/community/wings3d/PKGBUILD index a03916839..1cc5d5830 100644 --- a/community/wings3d/PKGBUILD +++ b/community/wings3d/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 80322 2012-11-19 22:41:50Z arodseth $ +# $Id: PKGBUILD 85259 2013-02-28 10:18:30Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: kappa <kappacurve@gmail.com> pkgname=wings3d _pkgname=wings pkgver=1.4.1 -pkgrel=10 +pkgrel=12 pkgdesc='3D modeling program' arch=('x86_64' 'i686') url='http://www.wings3d.com/' license=('GPL') -depends=('erlang-sdl' 'erlang-cl' 'bash' 'desktop-file-utils') +depends=('erlang-sdl' 'erlang-cl' 'bash' 'desktop-file-utils' 'erlang=R15B03_1') makedepends=('setconf' 'gendesk') optdepends=('povray: rendering support via POV-Ray') install=$pkgname.install diff --git a/community/yaws/PKGBUILD b/community/yaws/PKGBUILD index 47f65c69c..1b103536b 100644 --- a/community/yaws/PKGBUILD +++ b/community/yaws/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 82428 2013-01-17 13:32:57Z arodseth $ -# Maintainer: Vesa Kaihlavirta +# $Id: PKGBUILD 85282 2013-02-28 12:10:15Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Patrick Smits <mail@patricksmits.net> pkgname=yaws pkgver=1.95 -pkgrel=4 +pkgrel=5 pkgdesc='Yet Another Web Server, pure Erlang HTTP server/framework' arch=('x86_64' 'i686') url='http://yaws.hyber.org/' @@ -14,7 +14,7 @@ depends=('pam' 'erlang') backup=('etc/yaws/yaws.conf') options=('!emptydirs') install=$pkgname.install -optdepends=('erlang-nox: erlang without X') +optdepends=('erlang-nox: Erlang without X (headless)') source=("http://yaws.hyber.org/download/$pkgname-$pkgver.tar.gz" "$pkgname.service") sha256sums=('e4efae836561f5e8a1324a5c9ab63fb82468e9dc93dc95cb4cb6248ab6b95406' diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD index 461cb95ca..5535ed99d 100644 --- a/extra/clutter-gst/PKGBUILD +++ b/extra/clutter-gst/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 176007 2013-01-25 17:41:45Z ioni $ +# $Id: PKGBUILD 178920 2013-02-28 18:58:26Z ioni $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=clutter-gst -pkgver=2.0.0 +pkgver=2.0.2 pkgrel=1 pkgdesc="GStreamer bindings for clutter" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('clutter' 'gst-plugins-base-libs' 'libxdamage') makedepends=('gobject-introspection') options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('c612926f1e0bbd3c1ad748192cfccf0f15fdff0113db3b983d9f58989431f99a') +sha256sums=('577957598d6ee407348dc5d78879da2b212ae54fb3071f86f8409e393dde34c4') build() { cd $pkgname-$pkgver diff --git a/extra/gmime/PKGBUILD b/extra/gmime/PKGBUILD index 0384bba2c..2de2ee148 100644 --- a/extra/gmime/PKGBUILD +++ b/extra/gmime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173089 2012-12-10 21:30:33Z jgc $ +# $Id: PKGBUILD 178917 2013-02-28 18:49:48Z ioni $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Ben <ben@benmazer.net> pkgname=gmime -pkgver=2.6.13 +pkgver=2.6.15 pkgrel=1 pkgdesc="Core mime parsing library" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('glib2' 'gpgme' 'zlib') makedepends=('gtk-sharp-2') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('42a47a7f9508db3e1cfbb374a23260e75d7fc7696f488a26aa59f5e2d8dac154') +sha256sums=('b4c2a0b99b82063387cd750a38421ebaa0636f339e67984a84371bcb697dc99a') build() { # get rid of that .wapi errors in fakeroot diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD index 3f489f182..2ddf1da9a 100644 --- a/extra/gnome-keyring/PKGBUILD +++ b/extra/gnome-keyring/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 170820 2012-11-12 08:37:05Z heftig $ +#$Id: PKGBUILD 178926 2013-02-28 19:25:14Z ioni $ # Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=gnome-keyring -pkgver=3.6.2 +pkgver=3.6.3 pkgrel=1 pkgdesc="GNOME Password Management daemon" arch=(i686 x86_64) @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gnome-keyring.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('ae60558d60171325ddd90603328393d35d7b560a70b7ab45c4d2718d01130cd6') +sha256sums=('e0153a3f16a25e943237e6242054870802815e0f694c5a4cd808ee72f6014151') build() { cd "$pkgname-$pkgver" diff --git a/extra/gtk-vnc/PKGBUILD b/extra/gtk-vnc/PKGBUILD index 3a02c9737..a403e3373 100644 --- a/extra/gtk-vnc/PKGBUILD +++ b/extra/gtk-vnc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 168733 2012-10-15 02:01:46Z eric $ +# $Id: PKGBUILD 178918 2013-02-28 18:50:22Z ioni $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: lp76 <l.peduto@gmail.com> pkgname=gtk-vnc -pkgver=0.5.1 +pkgver=0.5.2 pkgrel=1 pkgdesc="A VNC viewer widget for GTK" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ optdepends=('gtk2: GTK2 widget') makedepends=('intltool' 'pygtk' 'pygobject2-devel' 'gtk-doc' 'gtk2' 'vala' 'gobject-introspection') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('1ad1847a23f8ea8fbf2396de46c51ec0900ee3698cde4e205760518cd1e01a40') +sha256sums=('b51bda7edebb82ab142c292bd1b1493406bc8225a5c834d854bbafef9e9a471f') build() { rm -rf gtk2-build gtk3-build diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index 86ece58f5..eb887b40e 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 177873 2013-02-10 13:29:01Z heftig $ +# $Id: PKGBUILD 178912 2013-02-28 18:37:56Z ioni $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.15 +pkgver=2.24.16 pkgrel=1 arch=('i686' 'x86_64') url="http://www.gtk.org/" @@ -13,7 +13,7 @@ options=('!libtool') license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz xid-collision-debug.patch) -sha256sums=('d7e1c6d6ae6baa48c88441fe52b73b0fb6008763644867d59b049bafb0cf771b' +sha256sums=('93cd69cc2cecf9a3aa31a50caf4a24752a6928a48c527ae967b109df6f9302d3' 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') build() { diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD index 756c16915..d304aa9e8 100644 --- a/extra/icedtea-web-java7/PKGBUILD +++ b/extra/icedtea-web-java7/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=icedtea-web-java7 pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc') pkgver=1.3.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') @@ -46,6 +46,7 @@ package_icedtea-web-java7() { pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project" depends=('jre7-openjdk' 'gtk2' 'desktop-file-utils') provides=('java-web-start=7') + replaces=('icedtea-web') install=${pkgname}.install cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}" @@ -77,6 +78,7 @@ package_icedtea-web-java7() { package_icedtea-web-java7-doc() { pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files" + replaces=('icedtea-web-doc') cd "${srcdir}"/icedtea-web* make DESTDIR="${pkgdir}" install-data-local diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 348991cd9..b395e03a3 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178359 2013-02-20 19:02:07Z andyrtr $ +# $Id: PKGBUILD 178897 2013-02-28 13:12:14Z guillaume $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> @@ -23,7 +23,7 @@ _HOTSPOT_CHANGESET=104e2c65892d # see "${srcdir}/icedtea7"/hotspot.map _bootstrap=0 # 0/1 for quick build or full bootstrap pkgver=${_java_ver}.${_updatever}_${_icedtea_ver} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://icedtea.classpath.org" license=('custom') @@ -62,10 +62,10 @@ sha256sums=('378f67f6f84bfb6c705f600b47b68a61b18d67648dd7eaf8498b152587695940' '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479' 'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea' 'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4' - '2ec2c6d3a8b62c5743bf8c50c358d98f6a86219d1d8b70645bcc0e1707670410' + 'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea' '3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd' - 'faf5fbaf24c33c101d58bacf8b93c1dbe08a0cbde4c596d5b4a6e28dd4b18f0a' - '84d3b91cc57c67b2cf2ddb7fe5abcf1e88b5a151565aaecf4b595c7ce8f3fee9') + 'b7c045b08ad55a9f79390c104fa846d0e7dbb49fccffb2fab2a3824b6b19c9c8' + '89d99d8ac269ca66e2e279aff652d5aac938a35faec93cd8cff8f048052bd3ce') noextract=("${_OPENJDK_CHANGESET}.tar.gz" "${_CORBA_CHANGESET}.tar.gz" @@ -248,7 +248,7 @@ package_jre7-openjdk-headless() { } package_jre7-openjdk() { - pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs -Full Java runtime environment - needed for executing Java GUI and Webstart programs" + pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - Full Java runtime environment - needed for executing Java GUI and Webstart programs" depends=('jre7-openjdk-headless' 'xdg-utils' 'hicolor-icon-theme') optdepends=('icedtea-web-java7: web browser plugin + Java Web Start' 'alsa-lib: for basic sound support' diff --git a/extra/java7-openjdk/jdk7-openjdk.profile b/extra/java7-openjdk/jdk7-openjdk.profile index 91265cc86..89a6a82a0 100644 --- a/extra/java7-openjdk/jdk7-openjdk.profile +++ b/extra/java7-openjdk/jdk7-openjdk.profile @@ -1,6 +1 @@ -export J2SDKDIR=/usr/lib/jvm/java-7-openjdk -export J2REDIR=$J2SDKDIR/jre export JAVA_HOME=/usr/lib/jvm/java-7-openjdk - -# For non-reparenting window managers, enable '_JAVA_AWT_WM_NONREPARENTING' -# in /etc/profile.d/jre7.sh diff --git a/extra/java7-openjdk/jre7-openjdk.profile b/extra/java7-openjdk/jre7-openjdk.profile index c86ce857a..b267392e5 100644 --- a/extra/java7-openjdk/jre7-openjdk.profile +++ b/extra/java7-openjdk/jre7-openjdk.profile @@ -1,5 +1,4 @@ -export J2REDIR=/usr/lib/jvm/java-7-openjdk/jre export JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-7-openjdk/jre} -# enable this for non-reparenting window managers +# Enable this for non-reparenting window managers #export _JAVA_AWT_WM_NONREPARENTING=1 diff --git a/extra/java7-openjdk/jre7-openjdk.profile.csh b/extra/java7-openjdk/jre7-openjdk.profile.csh index a9aed27d1..c4009af2e 100644 --- a/extra/java7-openjdk/jre7-openjdk.profile.csh +++ b/extra/java7-openjdk/jre7-openjdk.profile.csh @@ -1,5 +1,4 @@ -setenv J2REDIR "/usr/lib/jvm/java-7-openjdk/jre" setenv JAVA_HOME "/usr/lib/jvm/java-7-openjdk/jre" -# enable this for non-reparenting window managers +# Enable this for non-reparenting window managers #setenv _JAVA_AWT_WM_NONREPARENTING 1 diff --git a/extra/libgsf/PKGBUILD b/extra/libgsf/PKGBUILD index 24f20d70a..cfe96699a 100644 --- a/extra/libgsf/PKGBUILD +++ b/extra/libgsf/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 170960 2012-11-14 03:19:40Z heftig $ +# $Id: PKGBUILD 178924 2013-02-28 19:13:21Z ioni $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=libgsf -pkgver=1.14.25 +pkgver=1.14.26 pkgrel=1 arch=(i686 x86_64) pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats" @@ -13,7 +13,7 @@ options=('!libtool') depends=('libxml2' 'gdk-pixbuf2' 'bzip2') makedepends=('intltool' 'gobject-introspection') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.14/$pkgname-$pkgver.tar.xz) -sha256sums=('127548f07e07951984fb139c3f89d65b9e471aefe6555387de03e1113944d1a2') +sha256sums=('8919e725aadd785380350c8dec7427d82cf33164bc9a9a549df9440a0c3da6d5') build() { cd "$pkgname-$pkgver" diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD index 2e9fb6098..0fb057092 100644 --- a/extra/mediastreamer/PKGBUILD +++ b/extra/mediastreamer/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178134 2013-02-16 22:48:53Z ioni $ +# $Id: PKGBUILD 178928 2013-02-28 19:31:23Z eric $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -6,7 +6,7 @@ pkgname=mediastreamer pkgver=2.8.2 -pkgrel=3 +pkgrel=4 pkgdesc="A library written in C that allows you to create and run audio and video streams" arch=('i686' 'x86_64') url="http://www.linphone.org/" @@ -18,7 +18,7 @@ source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${ mediastreamer-ffmpeg.patch) md5sums=('e51ea9d5fce1396b374d10473dfbadec' '805da7def98f367e621363fa0c951fe8' - 'f147546489a973f148ce3dd2dba36834') + '553d5d47ea4a8c8dfeabdc0281849d5f') build() { cd "${srcdir}"/$pkgname-$pkgver diff --git a/extra/mediastreamer/mediastreamer-ffmpeg.patch b/extra/mediastreamer/mediastreamer-ffmpeg.patch index 944d4b833..3304e9f56 100644 --- a/extra/mediastreamer/mediastreamer-ffmpeg.patch +++ b/extra/mediastreamer/mediastreamer-ffmpeg.patch @@ -1,205 +1,57 @@ -diff --git a/include/mediastreamer2/msvideo.h b/include/mediastreamer2/msvideo.h -index 5ae8a63..86edf86 100644 ---- mediastreamer2/include/mediastreamer2/msvideo.h -+++ mediastreamer2/include/mediastreamer2/msvideo.h -@@ -21,6 +21,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - #define msvideo_h - - #include <mediastreamer2/msfilter.h> -+#ifndef INT64_C -+#define INT64_C(c) (c ## LL) -+#define UINT64_C(c) (c ## ULL) -+#endif -+#include <libavutil/avutil.h> -+#include <libavcodec/version.h> - - /* some global constants for video MSFilter(s) */ - #define MS_VIDEO_SIZE_SQCIF_W 128 -@@ -206,7 +212,9 @@ extern "C"{ - MS2_PUBLIC int ms_pix_fmt_to_ffmpeg(MSPixFmt fmt); - MS2_PUBLIC MSPixFmt ffmpeg_pix_fmt_to_ms(int fmt); - MS2_PUBLIC MSPixFmt ms_fourcc_to_pix_fmt(uint32_t fourcc); -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - MS2_PUBLIC void ms_ffmpeg_check_init(void); -+#endif - MS2_PUBLIC int ms_yuv_buf_init_from_mblk(MSPicture *buf, mblk_t *m); - MS2_PUBLIC int ms_yuv_buf_init_from_mblk_with_size(MSPicture *buf, mblk_t *m, int w, int h); - MS2_PUBLIC int ms_picture_init_from_mblk_with_size(MSPicture *buf, mblk_t *m, MSPixFmt fmt, int w, int h); +commit f586917ea4d66f9ba8910f0967a8830e54d50784 +Author: Yann Diorcet <yann.diorcet@belledonne-communications.com> +Date: Tue Jun 5 11:07:48 2012 +0200 + + Fixes for new versions of ffmpeg + diff --git a/src/h264dec.c b/src/h264dec.c -index 223de3d..8c40a7c 100644 ---- mediastreamer2/src/h264dec.c -+++ mediastreamer2/src/h264dec.c -@@ -44,7 +44,9 @@ typedef struct _DecData{ +index c4a84ee..5229b5e 100644 +--- a/src/h264dec.c ++++ b/src/h264dec.c +@@ -45,7 +45,9 @@ typedef struct _DecData{ static void ffmpeg_init(){ static bool_t done=FALSE; if (!done){ -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) ++#ifdef FF_API_AVCODEC_INIT avcodec_init(); +#endif avcodec_register_all(); done=TRUE; } -diff --git a/src/mscommon.c b/src/mscommon.c -index 2cab005..bebb946 100644 ---- mediastreamer2/src/mscommon.c -+++ mediastreamer2/src/mscommon.c -@@ -33,9 +33,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - #include "mediastreamer2/mscodecutils.h" - #include "mediastreamer2/msfilter.h" - #include <ortp/ortp_srtp.h> -+#ifndef INT64_C -+#define INT64_C(c) (c ## LL) -+#define UINT64_C(c) (c ## ULL) -+#endif -+#include <libavutil/avutil.h> -+#include <libavcodec/version.h> - - extern void __register_ffmpeg_encoders_if_possible(void); -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - extern void ms_ffmpeg_check_init(); -+#endif - extern bool_t libmsandroiddisplay_init(void); - extern void libmsandroiddisplaybad_init(void); - extern void libmsandroidopengldisplay_init(void); -@@ -645,7 +653,9 @@ void ms_init(){ - } - } - #if !defined(NO_FFMPEG) -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - ms_ffmpeg_check_init(); -+#endif - __register_ffmpeg_encoders_if_possible(); - #endif - #endif -diff --git a/src/videodec.c b/src/videodec.c -index c04e1e9..a455075 100644 ---- mediastreamer2/src/videodec.c -+++ mediastreamer2/src/videodec.c -@@ -27,9 +27,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - #include "mediastreamer2/msvideo.h" - #include "mediastreamer2/msticker.h" - #include "rfc2429.h" -+#ifndef INT64_C -+#define INT64_C(c) (c ## LL) -+#define UINT64_C(c) (c ## ULL) -+#endif -+#include <libavutil/avutil.h> -+#include <libavcodec/version.h> - -- -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - extern void ms_ffmpeg_check_init(); -+#endif - - - typedef struct DecState{ -@@ -50,7 +57,9 @@ typedef struct DecState{ - - static void dec_init(MSFilter *f, enum CodecID cid){ - DecState *s=(DecState *)ms_new0(DecState,1); -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - ms_ffmpeg_check_init(); -+#endif - - avcodec_get_context_defaults(&s->av_context); - s->av_codec=NULL; diff --git a/src/videoenc.c b/src/videoenc.c -index 21d016f..520f06a 100644 ---- mediastreamer2/src/videoenc.c -+++ mediastreamer2/src/videoenc.c -@@ -37,7 +37,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - #define RATE_CONTROL_MARGIN 15000 /*bits/second*/ +index 21d016f..fb35760 100644 +--- a/src/videoenc.c ++++ b/src/videoenc.c +@@ -39,6 +39,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) static bool_t avcodec_initialized=FALSE; -+#endif ++#ifndef FF_I_TYPE ++#define FF_I_TYPE AV_PICTURE_TYPE_I ++#endif ++ #ifdef ENABLE_LOG_FFMPEG -@@ -51,6 +53,7 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) - - #endif + void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) +@@ -53,7 +57,9 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl) -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) void ms_ffmpeg_check_init(){ if(!avcodec_initialized){ ++#ifdef FF_API_AVCODEC_INIT avcodec_init(); -@@ -62,6 +65,7 @@ void ms_ffmpeg_check_init(){ - #endif - } - } +#endif - - /* the goal of this small object is to tell when to send I frames at startup: - at 2 and 4 seconds*/ -@@ -201,7 +205,9 @@ static void enc_init(MSFilter *f, enum CodecID codec) - { - EncState *s=(EncState *)ms_new(EncState,1); - f->data=s; -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - ms_ffmpeg_check_init(); -+#endif - s->profile=0;/*always default to profile 0*/ - s->comp_buf=NULL; - s->fps=15; -@@ -300,9 +306,13 @@ static void prepare_h263(EncState *s){ + avcodec_register_all(); + avcodec_initialized=TRUE; + #ifdef ENABLE_LOG_FFMPEG +@@ -300,10 +306,10 @@ static void prepare_h263(EncState *s){ if (s->profile==0){ s->codec=CODEC_ID_H263; }else{ -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) ++ /* c->flags|=CODEC_FLAG_H263P_UMV; -+#endif c->flags|=CODEC_FLAG_AC_PRED; -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT; -+#endif - /* +- /* c->flags|=CODEC_FLAG_OBMC; c->flags|=CODEC_FLAG_AC_PRED; -@@ -372,7 +382,11 @@ static void add_rfc2190_header(mblk_t **packet, AVCodecContext *context){ - // assume video size is CIF or QCIF - if (context->width == 352 && context->height == 288) header->b_wptr[1] = 0x60; - else header->b_wptr[1] = 0x40; -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - if (context->coded_frame->pict_type != FF_I_TYPE) header->b_wptr[1] |= 0x10; -+#else -+ if (context->coded_frame->pict_type != AV_PICTURE_TYPE_I) header->b_wptr[1] |= 0x10; -+#endif - header->b_wptr += 4; - header->b_cont = *packet; - *packet = header; -@@ -779,7 +793,11 @@ static void process_frame(MSFilter *f, mblk_t *inm){ - s->req_vfu=TRUE; - } - if (s->req_vfu){ -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - pict.pict_type=FF_I_TYPE; -+#else -+ pict.pict_type=AV_PICTURE_TYPE_I; -+#endif - s->req_vfu=FALSE; - } - comp_buf->b_rptr=comp_buf->b_wptr=comp_buf->b_datap->db_base; -@@ -799,7 +817,11 @@ static void process_frame(MSFilter *f, mblk_t *inm){ - if (s->framenum==1){ - video_starter_first_frame (&s->starter,f->ticker->time); - } -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - if (c->coded_frame->pict_type==FF_I_TYPE){ -+#else -+ if (c->coded_frame->pict_type==AV_PICTURE_TYPE_I){ -+#endif - ms_message("Emitting I-frame"); - } - comp_buf->b_wptr+=error; -@@ -1067,7 +1089,9 @@ MSFilterDesc ms_mjpeg_enc_desc={ - #endif - - void __register_ffmpeg_encoders_if_possible(void){ -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100) - ms_ffmpeg_check_init(); -+#endif - if (avcodec_find_encoder(CODEC_ID_MPEG4)) - ms_filter_register(&ms_mpeg4_enc_desc); - if (avcodec_find_encoder(CODEC_ID_H263)){ + */ diff --git a/extra/nautilus-open-terminal/PKGBUILD b/extra/nautilus-open-terminal/PKGBUILD index f99837098..fcd1cb9a6 100644 --- a/extra/nautilus-open-terminal/PKGBUILD +++ b/extra/nautilus-open-terminal/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 169998 2012-10-30 23:01:23Z heftig $ +# $Id: PKGBUILD 178922 2013-02-28 19:09:50Z ioni $ # Maintainer : Biru Ionut <ionut@archlinux.ro> # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=nautilus-open-terminal -pkgver=0.19 -pkgrel=3 +pkgver=0.20 +pkgrel=1 pkgdesc="A nautilus plugin for opening terminals in arbitrary local paths" arch=('i686' 'x86_64') url="http://ftp.gnome.org/pub/GNOME/sources/nautilus-open-terminal" @@ -12,9 +12,9 @@ license=('GPL') depends=('nautilus' 'gconf') makedepends=('pkgconfig' 'gettext' 'intltool') install=nautilus-open-terminal.install -source=(ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2) +source=(ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz) options=('!libtool' '!emptydirs') -sha256sums=('4760f3a5a862ba9239ea92690a42ecee2c68fad413b023dd06505bdb3ee1f6af') +sha256sums=('84905e98a13990ef73ce698144bdf0ad9adb1346c22a7d7381a3d65f17a364f0') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/libre/iceape-l10n/PKGBUILD b/libre/iceape-l10n/PKGBUILD index 64b0b812b..d8fc4308a 100644 --- a/libre/iceape-l10n/PKGBUILD +++ b/libre/iceape-l10n/PKGBUILD @@ -23,7 +23,7 @@ pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) pkgver=${_debver}.${_debrel} -pkgrel=2 +pkgrel=3 pkgdesc="Language packs for Debian Iceape." arch=('i686' 'x86_64' 'mips64el') @@ -74,7 +74,7 @@ package_iceape-l10n-$(echo $lang | tr A-Z a-z)() { " done -md5sums=('428246ef3fb64103ff2cf5eaae2a92ca' +md5sums=('7558c5a34cc5f661d4e96885300d0c41' '22a14a6a2f03d0004a1fa990892094ef' 'af2379ea50672fe37ff8550d5c9e20a0' 'e5975c3b1ffaa5fcb3f5203cdfe8e0fb' diff --git a/libre/iceape-l10n/region.properties b/libre/iceape-l10n/region.properties index 4399d8db7..551605dd7 100644 --- a/libre/iceape-l10n/region.properties +++ b/libre/iceape-l10n/region.properties @@ -24,9 +24,9 @@ browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+ gecko.handlerService.defaultHandlersVersion=3 # The default set of protocol handlers for irc: -gecko.handlerService.schemes.irc.0.name=Freenode -gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s +gecko.handlerService.schemes.irc.0.name=Freenode Web IRC +gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net # The default set of protocol handlers for ircs: -gecko.handlerService.schemes.ircs.0.name=Freenode -gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s +gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index b84a30e72..1dff5d2dd 100644 --- a/libre/iceape-libre/PKGBUILD +++ b/libre/iceape-libre/PKGBUILD @@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} -pkgrel=3 +pkgrel=4 pkgdesc="A libre version of Debian Iceape, the internet suite based on SeaMonkey." arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') @@ -35,7 +35,7 @@ md5sums=('1ee82aa6ec73c13e2099b4cb6f16a908' '7266333e31731af8bb50c2eca8d0bd26' '25b6fe16ac24cd5c852213e5c1adb272' 'c395d443a8c4c16880c7322bcf174743' - '3e0a275b57e5ccfeb7573e716693441a') + 'e6e4a2b5b5976404d7d54c21f9d1c2c3') build() { export LDFLAGS="${LDFLAGS} -Wl,--as-needed,-rpath,/usr/lib/${_pkgname}" diff --git a/libre/iceape-libre/libre.patch b/libre/iceape-libre/libre.patch index e316dbf4c..860fd0d82 100644 --- a/libre/iceape-libre/libre.patch +++ b/libre/iceape-libre/libre.patch @@ -46,14 +46,14 @@ # The default set of protocol handlers for irc: -gecko.handlerService.schemes.irc.0.name=Mibbit -gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s -+gecko.handlerService.schemes.irc.0.name=Freenode -+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s ++gecko.handlerService.schemes.irc.0.name=Freenode Web IRC ++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net # The default set of protocol handlers for ircs: -gecko.handlerService.schemes.ircs.0.name=Mibbit -gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s -+gecko.handlerService.schemes.ircs.0.name=Freenode -+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s ++gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC ++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net --- comm-release.orig/mozilla/modules/libpref/src/init/all.js 2012-03-16 04:46:09.000000000 -0300 +++ comm-release/mozilla/modules/libpref/src/init/all.js 2012-05-12 04:03:52.163831535 -0300 @@ -47,7 +47,7 @@ diff --git a/libre/icecat-l10n/PKGBUILD b/libre/icecat-l10n/PKGBUILD index eeb2b0382..15e559623 100644 --- a/libre/icecat-l10n/PKGBUILD +++ b/libre/icecat-l10n/PKGBUILD @@ -108,7 +108,7 @@ pkgname=( done) ) pkgver=17.0.1 -pkgrel=2 +pkgrel=3 pkgdesc='Language packs for GNU IceCat.' arch=( any @@ -167,7 +167,7 @@ package_icecat-l10n-$(echo $lang | tr A-Z a-z) () { done sha512sums=( - 20064992e694b3fed0f75bee9d54af3427c01ae0048e0ec220895e58127954ceb4db47ea85627e86d9ea6614ce3feaf30f652d87f7c2e896fc00774a757a640a + 1ec2a61191cdcd98678cdc823cf7b03bfad1444c5e33b5f2e264863ee302639202680207fc36c9a0337d699dcc7d7cc99a3f02b9caa07dc64d907c0c42a51138 f3c627282fa78ef67335fa70671af848f2fff2252db1c4125838bcbfd92c61ae978b9a32885f4b33beac4eb4d8dc3fc034b18703686164a4903c4180de539439 d88793ed54794833ec6200d7a1957b68ebe8dd5c1dd6f4d030440919e5ca7f85f84fefd459603d29be57fd6b9d0961356c7760aedaca638bc3b58532ceae8441 6f3f6e026bc7d4ac6d6aa9e1ebb5995d663293f9b26190d33de8857cbfd5e6454bbda49bd13d6c6c1dab544ef0f2da0cdec50b1d9fbfb73aa5d66b0a6a67a87c diff --git a/libre/icecat-l10n/region.properties b/libre/icecat-l10n/region.properties index 4399d8db7..551605dd7 100644 --- a/libre/icecat-l10n/region.properties +++ b/libre/icecat-l10n/region.properties @@ -24,9 +24,9 @@ browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+ gecko.handlerService.defaultHandlersVersion=3 # The default set of protocol handlers for irc: -gecko.handlerService.schemes.irc.0.name=Freenode -gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s +gecko.handlerService.schemes.irc.0.name=Freenode Web IRC +gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net # The default set of protocol handlers for ircs: -gecko.handlerService.schemes.ircs.0.name=Freenode -gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s +gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 785e3e077..6898105d8 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -13,7 +13,7 @@ # If you are updating this package, don't forget to update the version number in # the value for 'browser.dictionaries.download.url' in 'libre.patch' -_pgo=true +_pgo=false pkgname=icecat pkgver=17.0.1 pkgrel=7 @@ -79,7 +79,7 @@ md5sums=( 2a35cf0054d0459993e3c3bae3d9841d dfeb4ab2c96aae3356a4c347eee0b97b 3009b176cc5f9b1e416b1bf7c45b064b - fcd2d895a0335c1b5fb652401e9da0d5 + 1dec37a964098fb3bc46bc767a5c0587 b41f82994fa056ffa5f8e6d99570e27a b30ba2b5562558d510fdd09d626d0faa 64826fcf48816b13090042eefddbaa58 diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch index 496c6b983..38b9fca01 100644 --- a/libre/icecat/libre.patch +++ b/libre/icecat/libre.patch @@ -59,12 +59,12 @@ diff -urN a/browser/locales/en-US/chrome/browser-region/region.properties b/brow gecko.handlerService.defaultHandlersVersion=3 + +# The default set of protocol handlers for irc: -+gecko.handlerService.schemes.irc.0.name=Freenode -+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s ++gecko.handlerService.schemes.irc.0.name=Freenode Web IRC ++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net + +# The default set of protocol handlers for ircs: -+gecko.handlerService.schemes.ircs.0.name=Freenode -+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s ++gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC ++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net diff -Nur a/dom/ipc/test.xul b/dom/ipc/test.xul --- a/dom/ipc/test.xul +++ b/dom/ipc/test.xul diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index 607d15feb..2e4837872 100644 --- a/libre/iceweasel-l10n/PKGBUILD +++ b/libre/iceweasel-l10n/PKGBUILD @@ -23,7 +23,7 @@ pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) pkgver=$_debver.$_debrel -pkgrel=1 +pkgrel=2 pkgdesc="Language packs for Debian Iceweasel." arch=('any') @@ -74,7 +74,7 @@ package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() { " done -md5sums=('97761543729499b0d5f150e0379a20b1' +md5sums=('e88728730ecf9f0f145de5f70e362b15' '5f91205d41a4622848e61bee463f14a1' 'e29da15887bb4ab2b569c5c4dd776a25' '7b76f37c83a29b64749cdc22c5165631' diff --git a/libre/iceweasel-l10n/region.properties b/libre/iceweasel-l10n/region.properties index a5870f54c..fe7f265ce 100644 --- a/libre/iceweasel-l10n/region.properties +++ b/libre/iceweasel-l10n/region.properties @@ -18,9 +18,9 @@ browser.search.order.3=Seeks Search gecko.handlerService.defaultHandlersVersion=3 # The default set of protocol handlers for irc: -gecko.handlerService.schemes.irc.0.name=Freenode -gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s +gecko.handlerService.schemes.irc.0.name=Freenode Web IRC +gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net # The default set of protocol handlers for ircs: -gecko.handlerService.schemes.ircs.0.name=Freenode -gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s +gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 065835d99..1c036c545 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=$_debver.$_debrel -pkgrel=2 +pkgrel=3 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=('i686' 'x86_64' 'mips64el') @@ -53,7 +53,7 @@ md5sums=('b4c109e987f869f94220188a901d4425' 'e1d6920cb49c9de88b8e00eb14b1b0e7' 'f90c6a70d0a6d0a9e7f9a0eed6aeffd3' 'dfeb4ab2c96aae3356a4c347eee0b97b' - 'acb402fa414bed916fb0e09dfc1485c4' + '7ef2c05dbd5631741404f2589c4ea07e' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' '6dd547c72bb875a3101135a1c32d4783' diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index 1691a4aa1..154fc3b94 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -199,14 +199,14 @@ diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio # The default set of protocol handlers for irc: -gecko.handlerService.schemes.irc.0.name=Mibbit -gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s -+gecko.handlerService.schemes.irc.0.name=Freenode -+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s ++gecko.handlerService.schemes.irc.0.name=Freenode Web IRC ++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net # The default set of protocol handlers for ircs: -gecko.handlerService.schemes.ircs.0.name=Mibbit -gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s -+gecko.handlerService.schemes.ircs.0.name=Freenode -+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s ++gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC ++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net diff -ruN mozilla-release.orig/dom/ipc/test.xul mozilla-release/dom/ipc/test.xul --- mozilla-release.orig/dom/ipc/test.xul 2013-01-04 18:44:31.000000000 -0500 +++ mozilla-release/dom/ipc/test.xul 2013-01-10 18:19:26.000000000 -0500 diff --git a/libre/linux-libre/CVE-2013-1763.patch b/libre/linux-libre/CVE-2013-1763.patch deleted file mode 100644 index 82b59a6dc..000000000 --- a/libre/linux-libre/CVE-2013-1763.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 6e601a53566d84e1ffd25e7b6fe0b6894ffd79c0 Mon Sep 17 00:00:00 2001 -From: Mathias Krause <minipli@googlemail.com> -Date: Sat, 23 Feb 2013 01:13:47 +0000 -Subject: [PATCH] sock_diag: Fix out-of-bounds access to sock_diag_handlers[] - -Userland can send a netlink message requesting SOCK_DIAG_BY_FAMILY -with a family greater or equal then AF_MAX -- the array size of -sock_diag_handlers[]. The current code does not test for this -condition therefore is vulnerable to an out-of-bound access opening -doors for a privilege escalation. - -Signed-off-by: Mathias Krause <minipli@googlemail.com> -Acked-by: Eric Dumazet <edumazet@google.com> -Signed-off-by: David S. Miller <davem@davemloft.net> ---- - net/core/sock_diag.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c -index 602cd63..750f44f 100644 ---- a/net/core/sock_diag.c -+++ b/net/core/sock_diag.c -@@ -121,6 +121,9 @@ static int __sock_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) - if (nlmsg_len(nlh) < sizeof(*req)) - return -EINVAL; - -+ if (req->sdiag_family >= AF_MAX) -+ return -EINVAL; -+ - hndl = sock_diag_lock_handler(req->sdiag_family); - if (hndl == NULL) - err = -ENOENT; --- -1.7.6.5 - diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 15bb939d0..2ca4e803c 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178533 2013-02-25 11:02:32Z tpowa $ +# $Id: PKGBUILD 178913 2013-02-28 18:41:03Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar> @@ -10,18 +10,17 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -#_sublevel=9 -#pkgver=${_basekernel}.${_sublevel} -pkgver=${_basekernel} -pkgrel=2 -#_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver +_sublevel=1 +pkgver=${_basekernel}.${_sublevel} +pkgrel=1 +_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl') options=('!strip') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" - #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" # the main kernel config files 'config.i686' 'config.x86_64' # standard config files for mkinitcpio ramdisk @@ -30,22 +29,22 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'Kbuild.platforms' 'boot-logo.patch' 'change-default-console-loglevel.patch' - 'CVE-2013-1763.patch') - #"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") + "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - '101e798e00fd9b66a4c86cd30d28b844' - '5f3338af83af116b99746eb8a3ca65e4' + 'd5ad2ecc865a32378517c3c07ca99173' + '4d73ccd0f1825a4bd474d4fead6c0d42' + 'e132184c6d02ef580a504967c067e1c5' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' - '420991808fe4cba143013427c0737aa9') -#if [ "$CARCH" != "mips64el" ]; then -# # Don't use the Loongson-specific patches on non-mips64el arches. -# unset source[${#source[@]}-1] -# unset md5sums[${#md5sums[@]}-1] -#fi + 'c48f693ef89e848335edefbf84494ea1') +if [ "$CARCH" != "mips64el" ]; then + # Don't use the Loongson-specific patches on non-mips64el arches. + unset source[${#source[@]}-1] + unset md5sums[${#md5sums[@]}-1] +fi _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE @@ -60,10 +59,6 @@ build() { # Add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" - # Fix security vulnetability CVE-2013-1763.patch - # https://bugs.archlinux.org/task/34005 - patch -Np1 -i "${srcdir}/CVE-2013-1763.patch" - # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index f6af7876a..4cdc0a65f 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.8.0 Kernel Configuration +# Linux/i386 3.8.0-2 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1493,6 +1493,9 @@ CONFIG_MTD_PLATRAM=m CONFIG_MTD_PMC551=m # CONFIG_MTD_PMC551_BUGFIX is not set # CONFIG_MTD_PMC551_DEBUG is not set +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_M25P80 is not set +# CONFIG_MTD_SST25L is not set # CONFIG_MTD_SLRAM is not set CONFIG_MTD_PHRAM=m CONFIG_MTD_MTDRAM=m @@ -1614,6 +1617,7 @@ CONFIG_BLK_DEV_RBD=m CONFIG_SENSORS_LIS3LV02D=m CONFIG_AD525X_DPOT=m CONFIG_AD525X_DPOT_I2C=m +# CONFIG_AD525X_DPOT_SPI is not set # CONFIG_IBM_ASM is not set CONFIG_PHANTOM=m CONFIG_INTEL_MID_PTI=m @@ -1635,9 +1639,11 @@ CONFIG_SENSORS_BH1770=m CONFIG_SENSORS_APDS990X=m CONFIG_HMC6352=m CONFIG_DS1682=m +# CONFIG_TI_DAC7512 is not set CONFIG_VMWARE_BALLOON=m CONFIG_BMP085=y CONFIG_BMP085_I2C=m +# CONFIG_BMP085_SPI is not set # CONFIG_PCH_PHUB is not set CONFIG_USB_SWITCH_FSA9480=m CONFIG_C2PORT=m @@ -1647,9 +1653,11 @@ CONFIG_C2PORT_DURAMAR_2150=m # EEPROM support # CONFIG_EEPROM_AT24=m +# CONFIG_EEPROM_AT25 is not set CONFIG_EEPROM_LEGACY=m CONFIG_EEPROM_MAX6875=m CONFIG_EEPROM_93CX6=m +# CONFIG_EEPROM_93XX46 is not set CONFIG_CB710_CORE=m # CONFIG_CB710_DEBUG is not set CONFIG_CB710_DEBUG_ASSUMPTIONS=y @@ -2203,8 +2211,11 @@ CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y CONFIG_NET_VENDOR_MICREL=y CONFIG_KS8842=m +# CONFIG_KS8851 is not set CONFIG_KS8851_MLL=m CONFIG_KSZ884X_PCI=m +CONFIG_NET_VENDOR_MICROCHIP=y +# CONFIG_ENC28J60 is not set CONFIG_NET_VENDOR_MYRI=y CONFIG_MYRI10GE=m CONFIG_MYRI10GE_DCA=y @@ -2323,6 +2334,7 @@ CONFIG_MICREL_PHY=m CONFIG_MDIO_BUS_MUX=m CONFIG_MDIO_BUS_MUX_GPIO=m CONFIG_MDIO_BUS_MUX_MMIOREG=m +# CONFIG_MICREL_KS8995MA is not set CONFIG_PLIP=m CONFIG_PPP=m CONFIG_PPP_BSDCOMP=m @@ -2493,6 +2505,7 @@ CONFIG_LIBERTAS=m CONFIG_LIBERTAS_USB=m CONFIG_LIBERTAS_CS=m CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_SPI is not set # CONFIG_LIBERTAS_DEBUG is not set CONFIG_LIBERTAS_MESH=y CONFIG_HERMES=m @@ -2508,6 +2521,7 @@ CONFIG_ORINOCO_USB=m CONFIG_P54_COMMON=m CONFIG_P54_USB=m CONFIG_P54_PCI=m +# CONFIG_P54_SPI is not set CONFIG_P54_LEDS=y CONFIG_RT2X00=m CONFIG_RT2400PCI=m @@ -2543,10 +2557,12 @@ CONFIG_RTLWIFI=m CONFIG_RTL8192C_COMMON=m CONFIG_WL_TI=y CONFIG_WL1251=m +# CONFIG_WL1251_SPI is not set CONFIG_WL1251_SDIO=m CONFIG_WL12XX=m CONFIG_WL18XX=m CONFIG_WLCORE=m +# CONFIG_WLCORE_SPI is not set CONFIG_WLCORE_SDIO=m CONFIG_WL12XX_PLATFORM_DATA=y CONFIG_ZD1211RW=m @@ -2566,6 +2582,8 @@ CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 CONFIG_IEEE802154_DRIVERS=m CONFIG_IEEE802154_FAKEHARD=m CONFIG_IEEE802154_FAKELB=m +CONFIG_IEEE802154_AT86RF230=m +# CONFIG_IEEE802154_MRF24J40 is not set CONFIG_VMXNET3=m CONFIG_HYPERV_NET=m CONFIG_ISDN=y @@ -2821,14 +2839,18 @@ CONFIG_TABLET_USB_HANWANG=m CONFIG_TABLET_USB_KBTAB=m CONFIG_TABLET_USB_WACOM=m CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_ADS7846 is not set +# CONFIG_TOUCHSCREEN_AD7877 is not set CONFIG_TOUCHSCREEN_AD7879=m CONFIG_TOUCHSCREEN_AD7879_I2C=m +# CONFIG_TOUCHSCREEN_AD7879_SPI is not set CONFIG_TOUCHSCREEN_ATMEL_MXT=m CONFIG_TOUCHSCREEN_AUO_PIXCIR=m CONFIG_TOUCHSCREEN_BU21013=m CONFIG_TOUCHSCREEN_CY8CTMG110=m CONFIG_TOUCHSCREEN_CYTTSP_CORE=m CONFIG_TOUCHSCREEN_CYTTSP_I2C=m +# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set CONFIG_TOUCHSCREEN_DYNAPRO=m CONFIG_TOUCHSCREEN_HAMPSHIRE=m CONFIG_TOUCHSCREEN_EETI=m @@ -2879,12 +2901,14 @@ CONFIG_TOUCHSCREEN_USB_NEXIO=y CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y CONFIG_TOUCHSCREEN_TOUCHIT213=m CONFIG_TOUCHSCREEN_TSC_SERIO=m +# CONFIG_TOUCHSCREEN_TSC2005 is not set CONFIG_TOUCHSCREEN_TSC2007=m CONFIG_TOUCHSCREEN_ST1232=m CONFIG_TOUCHSCREEN_TPS6507X=m CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m +CONFIG_INPUT_AD714X_SPI=m CONFIG_INPUT_BMA150=m CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_MC13783_PWRBUTTON=m @@ -2910,6 +2934,7 @@ CONFIG_INPUT_PWM_BEEPER=m CONFIG_INPUT_GPIO_ROTARY_ENCODER=m CONFIG_INPUT_ADXL34X=m CONFIG_INPUT_ADXL34X_I2C=m +CONFIG_INPUT_ADXL34X_SPI=m CONFIG_INPUT_CMA3000=m CONFIG_INPUT_CMA3000_I2C=m @@ -2980,6 +3005,8 @@ CONFIG_SERIAL_8250_DW=m # # Non-8250 serial port support # +# CONFIG_SERIAL_MAX3100 is not set +# CONFIG_SERIAL_MAX310X is not set CONFIG_SERIAL_MFD_HSU=m CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y @@ -2991,6 +3018,7 @@ CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 +# CONFIG_SERIAL_IFX6X60 is not set CONFIG_SERIAL_PCH_UART=m CONFIG_SERIAL_XILINX_PS_UART=m CONFIG_SERIAL_ARC=m @@ -3116,7 +3144,32 @@ CONFIG_SCx200_ACB=m # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set -# CONFIG_SPI is not set +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_ALTERA is not set +# CONFIG_SPI_BITBANG is not set +# CONFIG_SPI_BUTTERFLY is not set +# CONFIG_SPI_GPIO is not set +# CONFIG_SPI_LM70_LLP is not set +# CONFIG_SPI_OC_TINY is not set +# CONFIG_SPI_PXA2XX is not set +# CONFIG_SPI_PXA2XX_PCI is not set +# CONFIG_SPI_SC18IS602 is not set +# CONFIG_SPI_TOPCLIFF_PCH is not set +# CONFIG_SPI_XCOMM is not set +# CONFIG_SPI_XILINX is not set +# CONFIG_SPI_DESIGNWARE is not set + +# +# SPI Protocol Masters +# +# CONFIG_SPI_SPIDEV is not set +# CONFIG_SPI_TLE62X0 is not set # CONFIG_HSI is not set # @@ -3185,7 +3238,10 @@ CONFIG_GPIO_AMD8111=m # # SPI GPIO expanders: # +# CONFIG_GPIO_MAX7301 is not set # CONFIG_GPIO_MCP23S08 is not set +# CONFIG_GPIO_MC33880 is not set +# CONFIG_GPIO_74X164 is not set # # AC97 GPIO expanders: @@ -3232,8 +3288,10 @@ CONFIG_HWMON_VID=m # CONFIG_SENSORS_ABITUGURU=m CONFIG_SENSORS_ABITUGURU3=m +# CONFIG_SENSORS_AD7314 is not set CONFIG_SENSORS_AD7414=m CONFIG_SENSORS_AD7418=m +# CONFIG_SENSORS_ADCXX is not set CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1025=m CONFIG_SENSORS_ADM1026=m @@ -3270,6 +3328,7 @@ CONFIG_SENSORS_IT87=m CONFIG_SENSORS_JC42=m CONFIG_SENSORS_LINEAGE=m CONFIG_SENSORS_LM63=m +# CONFIG_SENSORS_LM70 is not set CONFIG_SENSORS_LM73=m CONFIG_SENSORS_LM75=m CONFIG_SENSORS_LM77=m @@ -3287,6 +3346,7 @@ CONFIG_SENSORS_LTC4245=m CONFIG_SENSORS_LTC4261=m CONFIG_SENSORS_LM95241=m CONFIG_SENSORS_LM95245=m +# CONFIG_SENSORS_MAX1111 is not set CONFIG_SENSORS_MAX16065=m CONFIG_SENSORS_MAX1619=m CONFIG_SENSORS_MAX1668=m @@ -3326,6 +3386,7 @@ CONFIG_SENSORS_SCH5627=m CONFIG_SENSORS_SCH5636=m CONFIG_SENSORS_ADS1015=m CONFIG_SENSORS_ADS7828=m +# CONFIG_SENSORS_ADS7871 is not set CONFIG_SENSORS_AMC6821=m CONFIG_SENSORS_INA2XX=m CONFIG_SENSORS_THMC50=m @@ -3474,18 +3535,25 @@ CONFIG_MFD_LM3533=m CONFIG_TPS65010=m CONFIG_TPS6507X=m CONFIG_MFD_TPS65217=m +# CONFIG_MFD_TPS65912_SPI is not set +# CONFIG_MFD_STMPE is not set # CONFIG_MFD_TMIO is not set +# CONFIG_MFD_DA9052_SPI is not set CONFIG_MFD_ARIZONA=y CONFIG_MFD_ARIZONA_I2C=m +# CONFIG_MFD_ARIZONA_SPI is not set CONFIG_MFD_WM5102=y CONFIG_MFD_WM5110=y +# CONFIG_MFD_WM831X_SPI is not set CONFIG_MFD_PCF50633=m CONFIG_PCF50633_ADC=m CONFIG_PCF50633_GPIO=m CONFIG_MFD_MC13783=m CONFIG_MFD_MC13XXX=m +# CONFIG_MFD_MC13XXX_SPI is not set CONFIG_MFD_MC13XXX_I2C=m CONFIG_ABX500_CORE=y +# CONFIG_EZX_PCAP is not set CONFIG_MFD_CS5535=m # CONFIG_MFD_TIMBERDALE is not set CONFIG_LPC_SCH=m @@ -4197,7 +4265,16 @@ CONFIG_FB_VIRTUAL=m # CONFIG_EXYNOS_VIDEO is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=m +# CONFIG_LCD_L4F00242T03 is not set +# CONFIG_LCD_LMS283GF05 is not set +# CONFIG_LCD_LTV350QV is not set +# CONFIG_LCD_ILI9320 is not set +# CONFIG_LCD_TDO24M is not set +# CONFIG_LCD_VGG2432A4 is not set CONFIG_LCD_PLATFORM=m +# CONFIG_LCD_S6E63M0 is not set +# CONFIG_LCD_LD9040 is not set +# CONFIG_LCD_AMS369FG06 is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set CONFIG_BACKLIGHT_LM3533=m @@ -4420,6 +4497,7 @@ CONFIG_SND_VIA82XX_MODEM=m CONFIG_SND_VIRTUOSO=m CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m +CONFIG_SND_SPI=y CONFIG_SND_USB=y CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_UA101=m @@ -4871,6 +4949,7 @@ CONFIG_LEDS_LP5523=m CONFIG_LEDS_CLEVO_MAIL=m CONFIG_LEDS_PCA955X=m CONFIG_LEDS_PCA9633=m +# CONFIG_LEDS_DAC124S085 is not set CONFIG_LEDS_BD2802=m CONFIG_LEDS_INTEL_SS4200=m CONFIG_LEDS_LT3593=m @@ -4964,6 +5043,15 @@ CONFIG_RTC_DRV_RV3029C2=m # # SPI RTC drivers # +# CONFIG_RTC_DRV_M41T93 is not set +# CONFIG_RTC_DRV_M41T94 is not set +# CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_DS1390 is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_R9701 is not set +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_DS3234 is not set +# CONFIG_RTC_DRV_PCF2123 is not set # # Platform RTC drivers diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 5818aa984..92976aa89 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.8.0 Kernel Configuration +# Linux/x86_64 3.8.0-2 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -1460,6 +1460,9 @@ CONFIG_MTD_PLATRAM=m CONFIG_MTD_PMC551=m # CONFIG_MTD_PMC551_BUGFIX is not set # CONFIG_MTD_PMC551_DEBUG is not set +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_M25P80 is not set +# CONFIG_MTD_SST25L is not set # CONFIG_MTD_SLRAM is not set CONFIG_MTD_PHRAM=m CONFIG_MTD_MTDRAM=m @@ -1562,6 +1565,7 @@ CONFIG_BLK_DEV_RBD=m CONFIG_SENSORS_LIS3LV02D=m CONFIG_AD525X_DPOT=m CONFIG_AD525X_DPOT_I2C=m +# CONFIG_AD525X_DPOT_SPI is not set # CONFIG_IBM_ASM is not set CONFIG_PHANTOM=m CONFIG_INTEL_MID_PTI=m @@ -1583,9 +1587,11 @@ CONFIG_SENSORS_BH1770=m CONFIG_SENSORS_APDS990X=m CONFIG_HMC6352=m CONFIG_DS1682=m +# CONFIG_TI_DAC7512 is not set CONFIG_VMWARE_BALLOON=m CONFIG_BMP085=y CONFIG_BMP085_I2C=m +# CONFIG_BMP085_SPI is not set CONFIG_PCH_PHUB=m CONFIG_USB_SWITCH_FSA9480=m CONFIG_C2PORT=m @@ -1595,9 +1601,11 @@ CONFIG_C2PORT_DURAMAR_2150=m # EEPROM support # CONFIG_EEPROM_AT24=m +# CONFIG_EEPROM_AT25 is not set CONFIG_EEPROM_LEGACY=m CONFIG_EEPROM_MAX6875=m CONFIG_EEPROM_93CX6=m +# CONFIG_EEPROM_93XX46 is not set CONFIG_CB710_CORE=m # CONFIG_CB710_DEBUG is not set CONFIG_CB710_DEBUG_ASSUMPTIONS=y @@ -2108,8 +2116,11 @@ CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y CONFIG_NET_VENDOR_MICREL=y CONFIG_KS8842=m +# CONFIG_KS8851 is not set CONFIG_KS8851_MLL=m CONFIG_KSZ884X_PCI=m +CONFIG_NET_VENDOR_MICROCHIP=y +# CONFIG_ENC28J60 is not set CONFIG_NET_VENDOR_MYRI=y CONFIG_MYRI10GE=m CONFIG_MYRI10GE_DCA=y @@ -2215,6 +2226,7 @@ CONFIG_STE10XP=m CONFIG_LSI_ET1011C_PHY=m CONFIG_MICREL_PHY=m # CONFIG_MDIO_BITBANG is not set +# CONFIG_MICREL_KS8995MA is not set CONFIG_PLIP=m CONFIG_PPP=m CONFIG_PPP_BSDCOMP=m @@ -2385,6 +2397,7 @@ CONFIG_LIBERTAS=m CONFIG_LIBERTAS_USB=m CONFIG_LIBERTAS_CS=m CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_SPI is not set # CONFIG_LIBERTAS_DEBUG is not set CONFIG_LIBERTAS_MESH=y CONFIG_HERMES=m @@ -2400,6 +2413,7 @@ CONFIG_ORINOCO_USB=m CONFIG_P54_COMMON=m CONFIG_P54_USB=m CONFIG_P54_PCI=m +# CONFIG_P54_SPI is not set CONFIG_P54_LEDS=y CONFIG_RT2X00=m CONFIG_RT2400PCI=m @@ -2435,10 +2449,12 @@ CONFIG_RTLWIFI=m CONFIG_RTL8192C_COMMON=m CONFIG_WL_TI=y CONFIG_WL1251=m +# CONFIG_WL1251_SPI is not set CONFIG_WL1251_SDIO=m CONFIG_WL12XX=m CONFIG_WL18XX=m CONFIG_WLCORE=m +# CONFIG_WLCORE_SPI is not set CONFIG_WLCORE_SDIO=m CONFIG_WL12XX_PLATFORM_DATA=y CONFIG_ZD1211RW=m @@ -2458,6 +2474,8 @@ CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 CONFIG_IEEE802154_DRIVERS=m CONFIG_IEEE802154_FAKEHARD=m CONFIG_IEEE802154_FAKELB=m +CONFIG_IEEE802154_AT86RF230=m +# CONFIG_IEEE802154_MRF24J40 is not set CONFIG_XEN_NETDEV_FRONTEND=m CONFIG_XEN_NETDEV_BACKEND=m CONFIG_VMXNET3=m @@ -2694,14 +2712,18 @@ CONFIG_TABLET_USB_HANWANG=m CONFIG_TABLET_USB_KBTAB=m CONFIG_TABLET_USB_WACOM=m CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_ADS7846 is not set +# CONFIG_TOUCHSCREEN_AD7877 is not set CONFIG_TOUCHSCREEN_AD7879=m CONFIG_TOUCHSCREEN_AD7879_I2C=m +# CONFIG_TOUCHSCREEN_AD7879_SPI is not set CONFIG_TOUCHSCREEN_ATMEL_MXT=m CONFIG_TOUCHSCREEN_AUO_PIXCIR=m CONFIG_TOUCHSCREEN_BU21013=m CONFIG_TOUCHSCREEN_CY8CTMG110=m CONFIG_TOUCHSCREEN_CYTTSP_CORE=m CONFIG_TOUCHSCREEN_CYTTSP_I2C=m +# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set CONFIG_TOUCHSCREEN_DYNAPRO=m CONFIG_TOUCHSCREEN_HAMPSHIRE=m CONFIG_TOUCHSCREEN_EETI=m @@ -2750,12 +2772,14 @@ CONFIG_TOUCHSCREEN_USB_NEXIO=y CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y CONFIG_TOUCHSCREEN_TOUCHIT213=m CONFIG_TOUCHSCREEN_TSC_SERIO=m +# CONFIG_TOUCHSCREEN_TSC2005 is not set CONFIG_TOUCHSCREEN_TSC2007=m CONFIG_TOUCHSCREEN_ST1232=m CONFIG_TOUCHSCREEN_TPS6507X=m CONFIG_INPUT_MISC=y CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m +CONFIG_INPUT_AD714X_SPI=m CONFIG_INPUT_BMA150=m CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_MC13783_PWRBUTTON=m @@ -2779,6 +2803,7 @@ CONFIG_INPUT_PCF8574=m CONFIG_INPUT_GPIO_ROTARY_ENCODER=m CONFIG_INPUT_ADXL34X=m CONFIG_INPUT_ADXL34X_I2C=m +CONFIG_INPUT_ADXL34X_SPI=m CONFIG_INPUT_CMA3000=m CONFIG_INPUT_CMA3000_I2C=m CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m @@ -2849,6 +2874,8 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # # Non-8250 serial port support # +# CONFIG_SERIAL_MAX3100 is not set +# CONFIG_SERIAL_MAX310X is not set CONFIG_SERIAL_MFD_HSU=m CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y @@ -2859,6 +2886,7 @@ CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200 +# CONFIG_SERIAL_IFX6X60 is not set CONFIG_SERIAL_PCH_UART=m CONFIG_SERIAL_ARC=m CONFIG_SERIAL_ARC_NR_PORTS=1 @@ -2978,7 +3006,31 @@ CONFIG_I2C_VIPERBOARD=m # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set -# CONFIG_SPI is not set +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_ALTERA is not set +# CONFIG_SPI_BITBANG is not set +# CONFIG_SPI_BUTTERFLY is not set +# CONFIG_SPI_GPIO is not set +# CONFIG_SPI_LM70_LLP is not set +# CONFIG_SPI_OC_TINY is not set +# CONFIG_SPI_PXA2XX_PCI is not set +# CONFIG_SPI_SC18IS602 is not set +# CONFIG_SPI_TOPCLIFF_PCH is not set +# CONFIG_SPI_XCOMM is not set +# CONFIG_SPI_XILINX is not set +# CONFIG_SPI_DESIGNWARE is not set + +# +# SPI Protocol Masters +# +# CONFIG_SPI_SPIDEV is not set +# CONFIG_SPI_TLE62X0 is not set # CONFIG_HSI is not set # @@ -3044,7 +3096,10 @@ CONFIG_GPIO_LANGWELL=y # # SPI GPIO expanders: # +# CONFIG_GPIO_MAX7301 is not set # CONFIG_GPIO_MCP23S08 is not set +# CONFIG_GPIO_MC33880 is not set +# CONFIG_GPIO_74X164 is not set # # AC97 GPIO expanders: @@ -3089,8 +3144,10 @@ CONFIG_HWMON_VID=m # CONFIG_SENSORS_ABITUGURU=m CONFIG_SENSORS_ABITUGURU3=m +# CONFIG_SENSORS_AD7314 is not set CONFIG_SENSORS_AD7414=m CONFIG_SENSORS_AD7418=m +# CONFIG_SENSORS_ADCXX is not set CONFIG_SENSORS_ADM1021=m CONFIG_SENSORS_ADM1025=m CONFIG_SENSORS_ADM1026=m @@ -3127,6 +3184,7 @@ CONFIG_SENSORS_IT87=m CONFIG_SENSORS_JC42=m CONFIG_SENSORS_LINEAGE=m CONFIG_SENSORS_LM63=m +# CONFIG_SENSORS_LM70 is not set CONFIG_SENSORS_LM73=m CONFIG_SENSORS_LM75=m CONFIG_SENSORS_LM77=m @@ -3144,6 +3202,7 @@ CONFIG_SENSORS_LTC4245=m CONFIG_SENSORS_LTC4261=m CONFIG_SENSORS_LM95241=m CONFIG_SENSORS_LM95245=m +# CONFIG_SENSORS_MAX1111 is not set CONFIG_SENSORS_MAX16065=m CONFIG_SENSORS_MAX1619=m CONFIG_SENSORS_MAX1668=m @@ -3183,6 +3242,7 @@ CONFIG_SENSORS_SCH5627=m CONFIG_SENSORS_SCH5636=m CONFIG_SENSORS_ADS1015=m CONFIG_SENSORS_ADS7828=m +# CONFIG_SENSORS_ADS7871 is not set CONFIG_SENSORS_AMC6821=m CONFIG_SENSORS_INA2XX=m CONFIG_SENSORS_THMC50=m @@ -3324,18 +3384,25 @@ CONFIG_MFD_LM3533=m CONFIG_TPS65010=m CONFIG_TPS6507X=m CONFIG_MFD_TPS65217=m +# CONFIG_MFD_TPS65912_SPI is not set +# CONFIG_MFD_STMPE is not set # CONFIG_MFD_TMIO is not set +# CONFIG_MFD_DA9052_SPI is not set CONFIG_MFD_ARIZONA=y CONFIG_MFD_ARIZONA_I2C=m +# CONFIG_MFD_ARIZONA_SPI is not set CONFIG_MFD_WM5102=y CONFIG_MFD_WM5110=y +# CONFIG_MFD_WM831X_SPI is not set CONFIG_MFD_PCF50633=m CONFIG_PCF50633_ADC=m CONFIG_PCF50633_GPIO=m CONFIG_MFD_MC13783=m CONFIG_MFD_MC13XXX=m +# CONFIG_MFD_MC13XXX_SPI is not set CONFIG_MFD_MC13XXX_I2C=m CONFIG_ABX500_CORE=y +# CONFIG_EZX_PCAP is not set CONFIG_MFD_CS5535=m # CONFIG_MFD_TIMBERDALE is not set CONFIG_LPC_SCH=m @@ -4036,7 +4103,16 @@ CONFIG_XEN_FBDEV_FRONTEND=m # CONFIG_EXYNOS_VIDEO is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=m +# CONFIG_LCD_L4F00242T03 is not set +# CONFIG_LCD_LMS283GF05 is not set +# CONFIG_LCD_LTV350QV is not set +# CONFIG_LCD_ILI9320 is not set +# CONFIG_LCD_TDO24M is not set +# CONFIG_LCD_VGG2432A4 is not set CONFIG_LCD_PLATFORM=m +# CONFIG_LCD_S6E63M0 is not set +# CONFIG_LCD_LD9040 is not set +# CONFIG_LCD_AMS369FG06 is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y # CONFIG_BACKLIGHT_GENERIC is not set CONFIG_BACKLIGHT_LM3533=m @@ -4218,6 +4294,7 @@ CONFIG_SND_VIA82XX_MODEM=m CONFIG_SND_VIRTUOSO=m CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m +CONFIG_SND_SPI=y CONFIG_SND_USB=y CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_UA101=m @@ -4628,6 +4705,7 @@ CONFIG_MMC_SDHCI_ACPI=m CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_WBSD=m CONFIG_MMC_TIFM_SD=m +# CONFIG_MMC_SPI is not set CONFIG_MMC_SDRICOH_CS=m CONFIG_MMC_CB710=m CONFIG_MMC_VIA_SDMMC=m @@ -4668,6 +4746,7 @@ CONFIG_LEDS_LP5523=m CONFIG_LEDS_CLEVO_MAIL=m CONFIG_LEDS_PCA955X=m CONFIG_LEDS_PCA9633=m +# CONFIG_LEDS_DAC124S085 is not set CONFIG_LEDS_BD2802=m CONFIG_LEDS_INTEL_SS4200=m CONFIG_LEDS_LT3593=m @@ -4759,6 +4838,15 @@ CONFIG_RTC_DRV_RV3029C2=m # # SPI RTC drivers # +# CONFIG_RTC_DRV_M41T93 is not set +# CONFIG_RTC_DRV_M41T94 is not set +# CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_DS1390 is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_R9701 is not set +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_DS3234 is not set +# CONFIG_RTC_DRV_PCF2123 is not set # # Platform RTC drivers diff --git a/libre/linux-libre/drm-fix-track-free-areas-3.7.patch b/libre/linux-libre/drm-fix-track-free-areas-3.7.patch deleted file mode 100644 index 6d00c6d3e..000000000 --- a/libre/linux-libre/drm-fix-track-free-areas-3.7.patch +++ /dev/null @@ -1,153 +0,0 @@ -From 9ff0ab9881bd47f7d8a95c07a2fa61f594a91d0a Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Sun, 16 Dec 2012 16:15:00 +0000 -Subject: [PATCH] drm: Only evict the blocks required to create the requested - hole - -Avoid clobbering adjacent blocks if they happen to expire earlier and -amalgamate together to form the requested hole. - -In passing this fixes a regression from -commit ea7b1dd44867e9cd6bac67e7c9fc3f128b5b255c -Author: Daniel Vetter <daniel.vetter@ffwll.ch> -Date: Fri Feb 18 17:59:12 2011 +0100 - - drm: mm: track free areas implicitly - -which swaps the end address for size (with a potential overflow) and -effectively causes the eviction code to clobber almost all earlier -buffers above the evictee. - -v2: Check the original hole not the adjusted as the coloring may confuse -us when later searching for the overlapping nodes. Also make sure that -we do apply the range restriction and color adjustment in the same -order for both scanning, searching and insertion. - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> -Cc: Daniel Vetter <daniel.vetter@ffwll.ch> ---- - drivers/gpu/drm/drm_mm.c | 45 +++++++++++++++++---------------------------- - include/drm/drm_mm.h | 2 +- - 2 files changed, 18 insertions(+), 29 deletions(-) - -diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c -index 0761a03..665553c 100644 ---- a/drivers/gpu/drm/drm_mm.c -+++ b/drivers/gpu/drm/drm_mm.c -@@ -213,11 +213,13 @@ static void drm_mm_insert_helper_range(struct drm_mm_node *hole_node, - - BUG_ON(!hole_node->hole_follows || node->allocated); - -- if (mm->color_adjust) -- mm->color_adjust(hole_node, color, &adj_start, &adj_end); -- - if (adj_start < start) - adj_start = start; -+ if (adj_end > end) -+ adj_end = end; -+ -+ if (mm->color_adjust) -+ mm->color_adjust(hole_node, color, &adj_start, &adj_end); - - if (alignment) { - unsigned tmp = adj_start % alignment; -@@ -489,7 +491,7 @@ void drm_mm_init_scan(struct drm_mm *mm, - mm->scan_size = size; - mm->scanned_blocks = 0; - mm->scan_hit_start = 0; -- mm->scan_hit_size = 0; -+ mm->scan_hit_end = 0; - mm->scan_check_range = 0; - mm->prev_scanned_node = NULL; - } -@@ -516,7 +518,7 @@ void drm_mm_init_scan_with_range(struct drm_mm *mm, - mm->scan_size = size; - mm->scanned_blocks = 0; - mm->scan_hit_start = 0; -- mm->scan_hit_size = 0; -+ mm->scan_hit_end = 0; - mm->scan_start = start; - mm->scan_end = end; - mm->scan_check_range = 1; -@@ -535,8 +537,7 @@ int drm_mm_scan_add_block(struct drm_mm_node *node) - struct drm_mm *mm = node->mm; - struct drm_mm_node *prev_node; - unsigned long hole_start, hole_end; -- unsigned long adj_start; -- unsigned long adj_end; -+ unsigned long adj_start, adj_end; - - mm->scanned_blocks++; - -@@ -553,14 +554,8 @@ int drm_mm_scan_add_block(struct drm_mm_node *node) - node->node_list.next = &mm->prev_scanned_node->node_list; - mm->prev_scanned_node = node; - -- hole_start = drm_mm_hole_node_start(prev_node); -- hole_end = drm_mm_hole_node_end(prev_node); -- -- adj_start = hole_start; -- adj_end = hole_end; -- -- if (mm->color_adjust) -- mm->color_adjust(prev_node, mm->scan_color, &adj_start, &adj_end); -+ adj_start = hole_start = drm_mm_hole_node_start(prev_node); -+ adj_end = hole_end = drm_mm_hole_node_end(prev_node); - - if (mm->scan_check_range) { - if (adj_start < mm->scan_start) -@@ -569,11 +564,14 @@ int drm_mm_scan_add_block(struct drm_mm_node *node) - adj_end = mm->scan_end; - } - -+ if (mm->color_adjust) -+ mm->color_adjust(prev_node, mm->scan_color, -+ &adj_start, &adj_end); -+ - if (check_free_hole(adj_start, adj_end, - mm->scan_size, mm->scan_alignment)) { - mm->scan_hit_start = hole_start; -- mm->scan_hit_size = hole_end; -- -+ mm->scan_hit_end = hole_end; - return 1; - } - -@@ -609,19 +607,10 @@ int drm_mm_scan_remove_block(struct drm_mm_node *node) - node_list); - - prev_node->hole_follows = node->scanned_preceeds_hole; -- INIT_LIST_HEAD(&node->node_list); - list_add(&node->node_list, &prev_node->node_list); - -- /* Only need to check for containement because start&size for the -- * complete resulting free block (not just the desired part) is -- * stored. */ -- if (node->start >= mm->scan_hit_start && -- node->start + node->size -- <= mm->scan_hit_start + mm->scan_hit_size) { -- return 1; -- } -- -- return 0; -+ return (drm_mm_hole_node_end(node) > mm->scan_hit_start && -+ node->start < mm->scan_hit_end); - } - EXPORT_SYMBOL(drm_mm_scan_remove_block); - -diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h -index 06d7f79..a1b66b7 100644 ---- a/include/drm/drm_mm.h -+++ b/include/drm/drm_mm.h -@@ -70,7 +70,7 @@ struct drm_mm { - unsigned long scan_color; - unsigned long scan_size; - unsigned long scan_hit_start; -- unsigned scan_hit_size; -+ unsigned long scan_hit_end; - unsigned scanned_blocks; - unsigned long scan_start; - unsigned long scan_end; --- -1.7.10.4 - diff --git a/libre/linux-libre/fat-3.6.x.patch b/libre/linux-libre/fat-3.6.x.patch deleted file mode 100644 index d8deeb788..000000000 --- a/libre/linux-libre/fat-3.6.x.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Dave Reisner <dreisner@archlinux.org> -Date: Thu, 29 Nov 2012 03:18:52 +0000 (+1100) -Subject: fs/fat: strip "cp" prefix from codepage in display -X-Git-Tag: next-20121130~1^2~97 -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnext%2Flinux-next.git;a=commitdiff_plain;h=f15914873184cc3f2a8d590fa4f7e32ab0a8a405 - -fs/fat: strip "cp" prefix from codepage in display - -Option parsing code expects an unsigned integer for the codepage option, -but prefixes and stores this option with "cp" before passing to -load_nls(). This makes the displayed option in /proc an invalid one. -Strip the prefix when printing so that the displayed option is valid for -reuse. - -Signed-off-by: Dave Reisner <dreisner@archlinux.org> -Acked-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> -Signed-off-by: Andrew Morton <akpm@linux-foundation.org> ---- - -diff --git a/fs/fat/inode.c b/fs/fat/inode.c -index 3b733a7..3580681 100644 ---- a/fs/fat/inode.c -+++ b/fs/fat/inode.c -@@ -726,7 +726,8 @@ static int fat_show_options(struct seq_file *m, struct dentry *root) - if (opts->allow_utime) - seq_printf(m, ",allow_utime=%04o", opts->allow_utime); - if (sbi->nls_disk) -- seq_printf(m, ",codepage=%s", sbi->nls_disk->charset); -+ /* strip "cp" prefix from displayed option */ -+ seq_printf(m, ",codepage=%s", &sbi->nls_disk->charset[2]); - if (isvfat) { - if (sbi->nls_io) - seq_printf(m, ",iocharset=%s", sbi->nls_io->charset); diff --git a/libre/linux-libre/fix-watchdog-3.7.patch b/libre/linux-libre/fix-watchdog-3.7.patch deleted file mode 100644 index fe4431604..000000000 --- a/libre/linux-libre/fix-watchdog-3.7.patch +++ /dev/null @@ -1,38 +0,0 @@ -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git;a=blobdiff_plain;f=kernel%2Fwatchdog.c;h=75a2ab3d0b0208dfa51e40339ffd00206622732e;hp=997c6a16ec2278969a10f251f63f237e7559d42e;hb=3935e89505a1c3ab3f3b0c7ef0eae54124f48905;hpb=74779e22261172ea728b989310f6ecc991b57d62 - -diff --git a/kernel/watchdog.c b/kernel/watchdog.c -index 997c6a1..75a2ab3 100644 ---- a/kernel/watchdog.c -+++ b/kernel/watchdog.c -@@ -344,6 +344,10 @@ static void watchdog_enable(unsigned int cpu) - { - struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer); - -+ /* kick off the timer for the hardlockup detector */ -+ hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); -+ hrtimer->function = watchdog_timer_fn; -+ - if (!watchdog_enabled) { - kthread_park(current); - return; -@@ -352,10 +356,6 @@ static void watchdog_enable(unsigned int cpu) - /* Enable the perf event */ - watchdog_nmi_enable(cpu); - -- /* kick off the timer for the hardlockup detector */ -- hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); -- hrtimer->function = watchdog_timer_fn; -- - /* done here because hrtimer_start can only pin to smp_processor_id() */ - hrtimer_start(hrtimer, ns_to_ktime(sample_period), - HRTIMER_MODE_REL_PINNED); -@@ -369,9 +369,6 @@ static void watchdog_disable(unsigned int cpu) - { - struct hrtimer *hrtimer = &__raw_get_cpu_var(watchdog_hrtimer); - -- if (!watchdog_enabled) -- return; -- - watchdog_set_prio(SCHED_NORMAL, 0); - hrtimer_cancel(hrtimer); - /* disable the perf event */ diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index fb7fa81c2..e734fb2aa 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.8.0-2-LIBRE +KERNEL_VERSION=3.8.1-1-LIBRE # 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' |