diff options
-rw-r--r-- | community/chmsee/PKGBUILD | 8 | ||||
-rw-r--r-- | community/gambas2/PKGBUILD | 69 | ||||
-rw-r--r-- | community/warsow/PKGBUILD | 88 | ||||
-rw-r--r-- | community/wt/PKGBUILD | 14 | ||||
-rw-r--r-- | extra/wireshark/PKGBUILD | 14 | ||||
-rw-r--r-- | extra/wireshark/wireshark.install | 12 | ||||
-rw-r--r-- | libre/linux-libre/PKGBUILD | 23 | ||||
-rw-r--r-- | libre/linux-libre/avmfritz-only-few-bytes-are-transfered-on-a-conn.patch | 48 | ||||
-rw-r--r-- | libre/linux-libre/config.i686 | 16 | ||||
-rw-r--r-- | libre/linux-libre/config.x86_64 | 16 | ||||
-rw-r--r-- | libre/linux-libre/linux-libre.install | 2 | ||||
-rw-r--r-- | libre/lirc-libre/PKGBUILD | 2 | ||||
-rw-r--r-- | libre/virtualbox-libre-modules/PKGBUILD | 12 |
13 files changed, 166 insertions, 158 deletions
diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD index fb37b421d..81332fbba 100644 --- a/community/chmsee/PKGBUILD +++ b/community/chmsee/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72043 2012-06-06 19:44:09Z lcarlier $ +# $Id: PKGBUILD 74503 2012-07-29 19:34:09Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: dionydonny <dionydonny@gmail.com> # Contributor: Ermanno <erm67@yahoo.it> pkgname=chmsee -pkgver=1.99.10 +pkgver=1.99.12 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner." @@ -15,14 +15,14 @@ makedepends=('python2') source=(chmsee-$pkgver.tar.gz::https://github.com/jungleji/chmsee/tarball/v$pkgver chmsee) install=chmsee.install -md5sums=('8d8a45f10fe68c08d2248ea1df62a697' +md5sums=('6cce2f994867fbe8a637a129c721546b' '242a9390bc943cc38237fa71137fb26c') build() { cd ${srcdir}/jungleji-chmsee-*/src cp Makefile.arch Makefile - sed -i -e 's/12.*/13.*/g' ../application.ini + #sed -i -e 's/12.*/13.*/g' ../application.ini make } diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD index ebe2a2b12..081942518 100644 --- a/community/gambas2/PKGBUILD +++ b/community/gambas2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72971 2012-06-25 18:51:13Z foutrelis $ +# $Id: PKGBUILD 74496 2012-07-29 17:53:21Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Biru Ionut <ionut@archlinux.ro> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -12,7 +12,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2 'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql' 'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' 'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' - 'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui' + 'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl' 'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre' 'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl' @@ -20,7 +20,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' 'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') pkgver=2.24.0 -pkgrel=2 +pkgrel=4 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net" @@ -40,7 +40,8 @@ source=(http://downloads.sourceforge.net/gambas/$pkgbase-$pkgver.tar.bz2 md5sums=('b59072b6f57b681d586cc84c02333690' '9dda03a1bbfb7e7ba8b6a4ae91b6752b' '870ff5b4b33cd75aa9c290539e6fdd5d' - 'ab5667175c4945282d2f40a35d0e9e5b') + 'ab5667175c4945282d2f40a35d0e9e5b' + '5eb70afe712c0f8667a700df4d9a6735') _gbfiles="${srcdir}/$pkgbase-$pkgver/main/gbc" _buildgbcomp() { @@ -88,7 +89,7 @@ package_gambas2-meta() { 'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql' 'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' 'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' - 'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui' + 'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl' 'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre' 'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl' @@ -101,6 +102,8 @@ package_gambas2-meta() { package_gambas2-runtime() { depends=('libffi' 'xdg-utils') pkgdesc="Gambas2 runtime environment" + provides=('gambas2-gb-gui') + conflicts=('gambas2-gb-gui') install=gambas2-runtime.install cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -116,8 +119,16 @@ package_gambas2-runtime() { ${pkgdir}/usr/lib/gambas2 ln -s gbx2 ${pkgdir}/usr/bin/gbr2 ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - rm -f ${pkgdir}/usr/lib/gambas2/gb.{so*,la} + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + + rm ${pkgdir}/usr/lib/gambas2/gb.{qt.*,so*,la} + rm ${pkgdir}/usr/share/gambas2/info/gb.qt* + ## needed for postinst with xdg-utils install -d -m755 ${pkgdir}/usr/share/gambas2/mime install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/mime/* \ @@ -192,7 +203,7 @@ package_gambas2-examples() { 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql' 'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' 'gambas2-gb-desktop' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' - 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui' + 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl' 'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre' 'gambas2-gb-pdf' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl' @@ -200,7 +211,6 @@ package_gambas2-examples() { 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' 'gambas2-gb-web' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') pkgdesc="Gambas2 examples" -# arch=('any') cd ${srcdir}/${pkgbase}-${pkgver} make XDG_UTILS='' DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install @@ -212,7 +222,6 @@ package_gambas2-examples() { package_gambas2-help() { depends=() pkgdesc="Gambas2 help files" -# arch=('any') cd ${srcdir}/${pkgbase}-${pkgver}/help make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install @@ -225,7 +234,6 @@ package_gambas2-script() { depends=('gambas2-devel') pkgdesc="Gambas2 scripter and server programs support" install=gambas2-script.install -# arch=('any') ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -259,7 +267,6 @@ package_gambas2-script() { package_gambas2-gb-chart() { depends=('gambas2-gb-form') pkgdesc="Gambas2 chart component" -# arch=('any') ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -332,7 +339,6 @@ package_gambas2-gb-db-firebird() { package_gambas2-gb-db-form() { depends=('gambas2-gb-db' 'gambas2-gb-form') pkgdesc="Gambas2 database form component" -# arch=('any') ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -426,9 +432,8 @@ package_gambas2-gb-desktop() { } package_gambas2-gb-form() { - depends=('gambas2-gb-gui') + depends=('gambas2-gb-runtime') pkgdesc="Gambas2 form component" -# arch=('any') ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -456,7 +461,6 @@ package_gambas2-gb-form() { package_gambas2-gb-form-dialog() { depends=('gambas2-gb-form') pkgdesc="Gambas2 form dialog component" -# arch=('any') ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -485,7 +489,6 @@ package_gambas2-gb-form-dialog() { package_gambas2-gb-form-mdi() { depends=('gambas2-gb-form') pkgdesc="Gambas2 form MDI component" -# arch=('any') ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -576,31 +579,6 @@ package_gambas2-gb-gtk-svg() { ## } -package_gambas2-gb-gui() { - depends=('gambas2-gb-qt' 'gambas2-gb-gtk') - pkgdesc="Gambas2 automatic gui toolkit chooser" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la}} - rm -rf ${pkgdir}/usr/bin - ## -} - package_gambas2-gb-image() { depends=('gambas2-runtime') pkgdesc="Gambas2 image processing component" @@ -612,7 +590,6 @@ package_gambas2-gb-image() { package_gambas2-gb-info() { depends=('gambas2-runtime') pkgdesc="Gambas2 info component" -# arch=('any') ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -773,7 +750,6 @@ package_gambas2-gb-qt-kde-html() { package_gambas2-gb-report() { depends=('gambas2-runtime' 'gambas2-gb-form') pkgdesc="Gambas2 report component" -# arch=('any') ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -820,7 +796,6 @@ package_gambas2-gb-sdl-sound() { package_gambas2-gb-settings() { depends=('gambas2-runtime') pkgdesc="Gambas2 settings management component" -# arch=('any') ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -857,7 +832,6 @@ package_gambas2-gb-vb() { package_gambas2-gb-web() { depends=('gambas2-runtime') pkgdesc="Gambas2 CGI component" -# arch=('any') ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx @@ -947,8 +921,3 @@ package_gambas2-gb-xml-xslt() { rm -rf ${pkgdir}/usr/bin ## } -md5sums=('b59072b6f57b681d586cc84c02333690' - '9dda03a1bbfb7e7ba8b6a4ae91b6752b' - '870ff5b4b33cd75aa9c290539e6fdd5d' - 'ab5667175c4945282d2f40a35d0e9e5b' - '5eb70afe712c0f8667a700df4d9a6735') diff --git a/community/warsow/PKGBUILD b/community/warsow/PKGBUILD index 56f1e1622..eea94f42f 100644 --- a/community/warsow/PKGBUILD +++ b/community/warsow/PKGBUILD @@ -1,87 +1,57 @@ -# $Id: PKGBUILD 64728 2012-02-18 03:09:46Z svenstaro $ +# $Id: PKGBUILD 74467 2012-07-29 03:46:52Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Slash <demodevil5[at]yahoo[dot]com> # Contributor: Babets # Contributor: Vain pkgname=warsow -pkgver=0.62 -pkgrel=3 -pkgdesc="a free online multiplayer competitive FPS based on the Qfusion engine" +pkgver=1.0 +pkgrel=1 +pkgdesc="Free online multiplayer competitive FPS based on the Qfusion engine" url="http://www.warsow.net/" license=('GPL') -arch=('i686' 'x86_64' 'mips64el') -depends=('curl' 'libjpeg' 'libvorbis' 'libxinerama' 'libxxf86dga' 'libxxf86vm' 'sdl' 'warsow-data') -makedepends=('mesa' 'openal' 'unzip') +arch=('i686' 'x86_64') +depends=('curl' 'libjpeg' 'libvorbis' 'libxinerama' 'libxxf86dga' 'libxxf86vm' 'sdl' 'warsow-data' 'libxrandr' 'libpng' 'libtheora') +makedepends=('mesa' 'openal' 'imagemagick' 'gendesk') optdepends=('openal: for openal audio support') -source=('warsow.desktop' 'warsow.launcher' 'wsw-server.launcher' 'wswtv-server.launcher' \ -"http://www.zcdn.org/dl/warsow_${pkgver}_sdk.zip") -noextract=("warsow_${pkgver}_sdk.zip") -md5sums=('f9bf60c80820237f7097c4e50a9582cd' - 'ec00081d81ad9802a8ca42fc2eac5498' +source=('warsow.launcher' 'wsw-server.launcher' 'wswtv-server.launcher' \ + "http://funpark.warsow-esport.net/~warsow/1.0/warsow_${pkgver}_sdk.tar.gz") +_genericname=('First person shooter') +_comment=('Online Mulitiplayer Competitive FPS') +md5sums=('ec00081d81ad9802a8ca42fc2eac5498' 'f73e10c26197178df71b941b10bf83d7' 'd7e4a69835bbcf801e58307e9d6b951e' - '649568447e938efded07e77cdfb3accb') + '35b9a8f530b51cda15c660b3a73f377e') build() { - unset CFLAGS - unset CXXFLAGS + cd "$srcdir" + gendesk -n - # Extract Game Source Code - unzip -o warsow_${pkgver}_sdk.zip -d $srcdir/warsow-src - - # Patch Makefile to use correct program to query for system information - sed -i 's:openal-config:pkg-config:g' $srcdir/warsow-src/source/Makefile - - # Patch Makefile to correctly pass on ld opts - sed -i 's:--as-needed:-Wc,--as-needed:g' $srcdir/warsow-src/source/Makefile - - # Patch Sound Code to point to base openal library - sed -i 's:libopenal.so.0:libopenal.so:g' $srcdir/warsow-src/source/snd_openal/snd_main.c - - # Patch for libjpeg8 - sed -i 's/jpeg_mem_src/_jpeg_mem_src/g' $srcdir/warsow-src/source/ref_gl/r_image.c - - # Patch AngelScript so it compiles correctly on i686 - if [ "$CARCH" == "i686" ]; then - sed -i 's:CXXFLAGS = \(.*\):CXXFLAGS = -march=i686 \1:' \ - $srcdir/warsow-src/libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc/makefile - fi + # This was used to fix some crashing due to alignment problems before. Has upstream + # finally got their shit together and we don't need them anymore? + #unset CFLAGS + #unset CXXFLAGS # Compile Warsow - cd $srcdir/warsow-src/source/ + cd $srcdir/warsow_${pkgver}_sdk/source/ make -j1 } package() { - cd $srcdir/warsow-src/source/ + cd $srcdir/warsow_${pkgver}_sdk/source/ # Create Destination Directories install -d $pkgdir/opt/warsow/ # Move Compiled Data to Destination Directory - cp -r $srcdir/warsow-src/source/release/* \ - $pkgdir/opt/warsow - - # Install Client Game Launcher - install -D -m 0755 $srcdir/warsow.launcher \ - $pkgdir/usr/bin/warsow - - # Install Server Game Launcher - install -D -m 0755 $srcdir/wsw-server.launcher \ - $pkgdir/usr/bin/wsw-server - - # Install WSWTV Server Launcher - install -D -m 0755 $srcdir/wswtv-server.launcher \ - $pkgdir/usr/bin/wswtv-server - - # Install Client Desktop Shortcut - install -D -m 0644 $srcdir/warsow.desktop \ - $pkgdir/usr/share/applications/warsow.desktop - - # Install Icon - install -D -m 0644 $srcdir/warsow-src/source/win32/warsow.ico \ - $pkgdir/usr/share/pixmaps/warsow.ico + cp -r $srcdir/warsow_${pkgver}_sdk/source/release/* $pkgdir/opt/warsow + + install -D -m 0755 $srcdir/warsow.launcher $pkgdir/usr/bin/warsow + install -D -m 0755 $srcdir/wsw-server.launcher $pkgdir/usr/bin/wsw-server + install -D -m 0755 $srcdir/wswtv-server.launcher $pkgdir/usr/bin/wswtv-server + install -D -m 0644 $srcdir/warsow.desktop $pkgdir/usr/share/applications/warsow.desktop + convert $srcdir/warsow_${pkgver}_sdk/source/win32/warsow.ico $srcdir/warsow.png + install -D -m 0644 $srcdir/warsow-0.png $pkgdir/usr/share/pixmaps/warsow.png } # vim: ts=2:sw=2 diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD index 29babe5bc..86b092245 100644 --- a/community/wt/PKGBUILD +++ b/community/wt/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 74389 2012-07-26 08:51:55Z spupykin $ +# $Id: PKGBUILD 74507 2012-07-29 20:16:09Z svenstaro $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Denis Martinez <deuns.martinez@gmail.com> pkgname=wt -pkgver=3.2.2 -_pkgver=3.2.2 -pkgrel=1 +pkgver=3.2.2.1 +_pkgver=3.2.2-p1 +pkgrel=2 pkgdesc="a C++ library and application server for developing and deploying web applications" arch=('i686' 'x86_64' 'mips64el') url="http://www.webtoolkit.eu/" license=('GPL') -depends=('boost-libs>=1.36') -makedepends=('boost>=1.36' 'cmake>=2.8' +depends=('boost-libs') +makedepends=('boost' 'cmake>=2.8' 'postgresql-libs' 'zlib' 'fcgi' 'sqlite' 'libharu' 'graphicsmagick' 'pango' 'mysql++' 'qt') optdepends=('openssl: for SSL support in built-in webserver' 'zlib: for compression in HTTP protocol' @@ -26,7 +26,7 @@ optdepends=('openssl: for SSL support in built-in webserver' 'qt: for the Wt/Qt interopability example (wtwithqt)') backup=('etc/wt/wt_config.xml') source=(http://downloads.sourceforge.net/witty/$pkgname-${_pkgver}.tar.gz) -md5sums=('86e1eac9baa7a061fd3dd9b53dd77baa') +md5sums=('d436430a4f1ae5fbcf038e645e4b5260') build() { cd ${srcdir}/${pkgname}-${_pkgver} diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index ac0458c99..1835503cc 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162251 2012-06-24 12:43:16Z guillaume $ +# $Id: PKGBUILD 164263 2012-07-29 10:20:53Z guillaume $ # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> pkgname=('wireshark-cli' 'wireshark-gtk') pkgbase=wireshark -pkgver=1.8.0 +pkgver=1.8.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -12,7 +12,7 @@ makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' url="http://www.wireshark.org/" options=(!libtool) source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2) -md5sums=('3eca81253800a0089d0f957e75853b05') +md5sums=('629fe03f4a64eb8c7bd9308ee4e22e2e') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -61,7 +61,13 @@ package_wireshark-gtk() { install -Dm755 .libs/wireshark "${pkgdir}/usr/bin/wireshark" for d in 16 32 48; do - install -Dm644 image/hi${d}-app-wireshark.png "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png" + install -Dm644 image/hi${d}-app-wireshark.png \ + "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png" + done + + for d in 16 24 32 48 64 128 256 ; do + install -Dm644 image/WiresharkDoc-${d}.png \ + "${pkgdir}/usr/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png" done install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop" } diff --git a/extra/wireshark/wireshark.install b/extra/wireshark/wireshark.install index 6585ba272..69adcc4bc 100644 --- a/extra/wireshark/wireshark.install +++ b/extra/wireshark/wireshark.install @@ -1,18 +1,18 @@ post_install() { - getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null + /usr/bin/getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null - setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap + /usr/sbin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group" } post_upgrade() { - getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null + /usr/bin/getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null - setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap + /usr/sbin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap } post_remove() { - if getent group wireshark >/dev/null 2>&1; then - groupdel wireshark + if /usr/bin/getent group wireshark >/dev/null 2>&1; then + /usr/sbin/groupdel wireshark fi } diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index d796efe65..683e4e715 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -16,7 +16,7 @@ _basekernel=3.5 #pkgver=${_basekernel}.${_sublevel} pkgver=${_basekernel} _lxopkgver=${_basekernel}.6 # nearly always the same as pkgver -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,17 +32,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'Kbuild.platforms' 'boot-logo.patch' 'change-default-console-loglevel.patch' - 'i915-fix-ghost-tv-output.patch' + 'avmfritz-only-few-bytes-are-transfered-on-a-conn.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('2407fc9563a74acaf38aa0c06516eb1c' - 'a89ff57fd3ce5833d51f7cdef17a9a3c' - '978a58bebbdfe04d6e91523e09da5ad5' + '7f0b7950bc9d2a20cdb6b850e6e4eb5a' + 'a796ea383eb136cb38fab0a52b6d2f52' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' - '263725f20c0b9eb9c353040792d644e5' + '2afcc001cc178be72e3a19d95f4bd5eb' 'a9338d11a2b23fe0cd43cc4fee5aed42') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. @@ -60,21 +60,16 @@ build() { # Add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" - # Some chips detect a ghost TV output - # mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html - # Arch Linux bug report: FS#19234 - # - # It is unclear why this patch wasn't merged upstream, it was accepted, - # then dropped because the reasoning was unclear. However, it is clearly - # needed. - patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.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) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" + # fix avmfritz capi20 functionallity + # https://bugzilla.kernel.org/show_bug.cgi?id=45271 + patch -Np1 -i "${srcdir}/avmfritz-only-few-bytes-are-transfered-on-a-conn.patch" + if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ diff --git a/libre/linux-libre/avmfritz-only-few-bytes-are-transfered-on-a-conn.patch b/libre/linux-libre/avmfritz-only-few-bytes-are-transfered-on-a-conn.patch new file mode 100644 index 000000000..f8bb193c6 --- /dev/null +++ b/libre/linux-libre/avmfritz-only-few-bytes-are-transfered-on-a-conn.patch @@ -0,0 +1,48 @@ +From 285c08154eede7dc4387bfc925967c884594dcc9 Mon Sep 17 00:00:00 2001 +From: Karsten Keil <keil@b1-systems.de> +Date: Sat, 28 Jul 2012 20:10:04 +0200 +Subject: [PATCH] mISDN: Bugfix only few bytes are transfered on a connection + +The test for the fillempty condition was wrong in one place. +Changed the variable to the right boolean type. + +Signed-off-by: Karsten Keil <keil@b1-systems.de> +--- + drivers/isdn/hardware/mISDN/avmfritz.c | 7 ++++--- + 1 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/drivers/isdn/hardware/mISDN/avmfritz.c b/drivers/isdn/hardware/mISDN/avmfritz.c +index c08fc60..fa6ca47 100644 +--- a/drivers/isdn/hardware/mISDN/avmfritz.c ++++ b/drivers/isdn/hardware/mISDN/avmfritz.c +@@ -449,7 +449,8 @@ hdlc_fill_fifo(struct bchannel *bch) + { + struct fritzcard *fc = bch->hw; + struct hdlc_hw *hdlc; +- int count, fs, cnt = 0, idx, fillempty = 0; ++ int count, fs, cnt = 0, idx; ++ bool fillempty = false; + u8 *p; + u32 *ptr, val, addr; + +@@ -462,7 +463,7 @@ hdlc_fill_fifo(struct bchannel *bch) + return; + count = fs; + p = bch->fill; +- fillempty = 1; ++ fillempty = true; + } else { + count = bch->tx_skb->len - bch->tx_idx; + if (count <= 0) +@@ -477,7 +478,7 @@ hdlc_fill_fifo(struct bchannel *bch) + hdlc->ctrl.sr.cmd |= HDLC_CMD_XME; + } + ptr = (u32 *)p; +- if (fillempty) { ++ if (!fillempty) { + pr_debug("%s.B%d: %d/%d/%d", fc->name, bch->nr, count, + bch->tx_idx, bch->tx_skb->len); + bch->tx_idx += count; +-- +1.7.7 + diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 114841394..a66ebeaa7 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.5.0-1 Kernel Configuration +# Linux/i386 3.5.0-2 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -204,9 +204,11 @@ CONFIG_OPROFILE=m # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set CONFIG_HAVE_OPROFILE=y CONFIG_OPROFILE_NMI_TIMER=y -# CONFIG_KPROBES is not set +CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y +CONFIG_UPROBES=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_KRETPROBES=y CONFIG_USER_RETURN_NOTIFIER=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y @@ -1071,7 +1073,9 @@ CONFIG_IP_DCCP_TFRC_LIB=y # DCCP Kernel Hacking # # CONFIG_IP_DCCP_DEBUG is not set +CONFIG_NET_DCCPPROBE=m CONFIG_IP_SCTP=m +CONFIG_NET_SCTPPROBE=m # CONFIG_SCTP_DBG_MSG is not set # CONFIG_SCTP_DBG_OBJCNT is not set # CONFIG_SCTP_HMAC_NONE is not set @@ -1191,6 +1195,7 @@ CONFIG_BQL=y # Network testing # CONFIG_NET_PKTGEN=m +CONFIG_NET_TCPPROBE=m CONFIG_NET_DROP_MONITOR=y CONFIG_HAMRADIO=y @@ -5624,6 +5629,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_CPU_STALL_VERBOSE is not set # CONFIG_RCU_CPU_STALL_INFO is not set # CONFIG_RCU_TRACE is not set +# CONFIG_KPROBES_SANITY_TEST is not set # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set @@ -5664,8 +5670,9 @@ CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ALL_BRANCHES is not set CONFIG_STACK_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y -# CONFIG_UPROBE_EVENT is not set -# CONFIG_PROBE_EVENTS is not set +CONFIG_KPROBE_EVENT=y +CONFIG_UPROBE_EVENT=y +CONFIG_PROBE_EVENTS=y CONFIG_DYNAMIC_FTRACE=y CONFIG_FUNCTION_PROFILER=y CONFIG_FTRACE_MCOUNT_RECORD=y @@ -5697,6 +5704,7 @@ CONFIG_DEBUG_RODATA=y CONFIG_DOUBLEFAULT=y # CONFIG_IOMMU_STRESS is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y +# CONFIG_X86_DECODER_SELFTEST is not set CONFIG_IO_DELAY_TYPE_0X80=0 CONFIG_IO_DELAY_TYPE_0XED=1 CONFIG_IO_DELAY_TYPE_UDELAY=2 diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index fcc8b37dd..350a2b905 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.5.0-1 Kernel Configuration +# Linux/x86_64 3.5.0-2 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -206,9 +206,11 @@ CONFIG_OPROFILE=m # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set CONFIG_HAVE_OPROFILE=y CONFIG_OPROFILE_NMI_TIMER=y -# CONFIG_KPROBES is not set +CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y +CONFIG_UPROBES=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_KRETPROBES=y CONFIG_USER_RETURN_NOTIFIER=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y @@ -1036,7 +1038,9 @@ CONFIG_IP_DCCP_TFRC_LIB=y # DCCP Kernel Hacking # # CONFIG_IP_DCCP_DEBUG is not set +CONFIG_NET_DCCPPROBE=m CONFIG_IP_SCTP=m +CONFIG_NET_SCTPPROBE=m # CONFIG_SCTP_DBG_MSG is not set # CONFIG_SCTP_DBG_OBJCNT is not set # CONFIG_SCTP_HMAC_NONE is not set @@ -1153,6 +1157,7 @@ CONFIG_BPF_JIT=y # Network testing # CONFIG_NET_PKTGEN=m +CONFIG_NET_TCPPROBE=m CONFIG_NET_DROP_MONITOR=y CONFIG_HAMRADIO=y @@ -5393,6 +5398,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_CPU_STALL_VERBOSE is not set # CONFIG_RCU_CPU_STALL_INFO is not set # CONFIG_RCU_TRACE is not set +# CONFIG_KPROBES_SANITY_TEST is not set # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set @@ -5433,8 +5439,9 @@ CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ALL_BRANCHES is not set CONFIG_STACK_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y -# CONFIG_UPROBE_EVENT is not set -# CONFIG_PROBE_EVENTS is not set +CONFIG_KPROBE_EVENT=y +CONFIG_UPROBE_EVENT=y +CONFIG_PROBE_EVENTS=y CONFIG_DYNAMIC_FTRACE=y CONFIG_FUNCTION_PROFILER=y CONFIG_FTRACE_MCOUNT_RECORD=y @@ -5466,6 +5473,7 @@ CONFIG_DEBUG_RODATA=y # CONFIG_IOMMU_DEBUG is not set # CONFIG_IOMMU_STRESS is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y +# CONFIG_X86_DECODER_SELFTEST is not set CONFIG_IO_DELAY_TYPE_0X80=0 CONFIG_IO_DELAY_TYPE_0XED=1 CONFIG_IO_DELAY_TYPE_UDELAY=2 diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 87de3c8d5..5f1005477 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.5.0-1-LIBRE +KERNEL_VERSION=3.5.0-2-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' diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index 4442712f0..4b3384c25 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=24 +pkgrel=25 epoch=1 _extramodules=extramodules-3.5-LIBRE arch=('i686' 'x86_64' 'mips64el') diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index ef63d7ff0..d1b6f5fae 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-modules' 'virtualbox-libre-parabola-modules') pkgver=4.1.18 -pkgrel=5.1 +pkgrel=6 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -47,12 +47,16 @@ md5sums=('38db0a87cba659b484af868b0c2bd3ac' 'f7d275fc52e5f3cfafd85646c2914063') _extramodules=extramodules-3.5-LIBRE -_kernver="$(cat /usr/lib/modules/${_extramodules}/version || true)" -export KERN_DIR=/usr/lib/modules/${_kernver}/build -export KERN_INCL=/usr/src/linux-${_kernver}/include/ + + build() { + _kernver="$(cat /usr/lib/modules/${_extramodules}/version || true)" + + export KERN_DIR=/usr/lib/modules/${_kernver}/build + export KERN_INCL=/usr/src/linux-${_kernver}/include/ + cd "$srcdir/VirtualBox-${pkgver}" patch -Np1 -i "$srcdir/libre.patch" |