diff options
32 files changed, 435 insertions, 113 deletions
diff --git a/community/avifile/PKGBUILD b/community/avifile/PKGBUILD index 01a3fb809..f04a93557 100644 --- a/community/avifile/PKGBUILD +++ b/community/avifile/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 58655 2011-11-17 10:01:32Z spupykin $ +# $Id: PKGBUILD 75654 2012-08-28 09:59:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=avifile pkgver=0.7.45 -pkgrel=8 +pkgrel=9 pkgdesc="A library that allows you to read and write compressed AVI files" arch=('i686' 'x86_64' 'mips64el') -depends=('qt' 'sdl' 'freetype2' 'libpng' 'libjpeg' +depends=('qt3' 'sdl' 'freetype2' 'libpng' 'libjpeg' 'libvorbis' 'xvidcore' 'libxxf86dga' 'libxi' 'libxv') -makedepends=('lame' 'qt3' 'v4l-utils' 'chrpath') +makedepends=('lame' 'v4l-utils' 'chrpath') url="http://avifile.sourceforge.net" license=('GPL') options=('!libtool') @@ -18,7 +18,7 @@ source=("http://downloads.sourceforge.net/sourceforge/avifile/$pkgname-0.7-$pkgv 'gcc.patch' 'videodev.patch') md5sums=('7da94802f120d1b69e04a13170dcd21d' - '588c3ce7bdebc1244f46ba56d8ef8a42' + '79a488db80c82f0abb8a83f52e3b3aa0' '6cca050885afe85c2d98982f75f5e3b0') build() { diff --git a/community/avifile/gcc.patch b/community/avifile/gcc.patch index e93de24a8..078b4ae81 100644 --- a/community/avifile/gcc.patch +++ b/community/avifile/gcc.patch @@ -131,3 +131,15 @@ diff -wbBur avifile-0.7-0.7.45/samples/qtvidcap/v4lxif.cpp avifile-0.7-0.7.45.my if (!base) avml(AVML_WARN, "v4l1: can not allocate frame buffer base: %p\n", base); +diff -wbBur avifile-0.7-0.7.45/lib/aviread/AsfNetworkInputStream.cpp avifile-0.7-0.7.45.my/lib/aviread/AsfNetworkInputStream.cpp +--- avifile-0.7-0.7.45.org/lib/aviread/AsfNetworkInputStream.cpp 2004-10-25 14:15:38.000000000 +0400 ++++ avifile-0.7-0.7.45/lib/aviread/AsfNetworkInputStream.cpp 2012-08-28 13:26:33.000000000 +0400 +@@ -937,7 +937,7 @@ + } + + asf_packet* p; +- unsigned short& size = chhdr.size; ++ uint16_t size = chhdr.size; + //printf("STREAMPACKET 0x%x sz:%d %lld seq:%d part:%d sc:%d\n", chhdr.kind, size, rsize, chhdr.seq, chhdr.partflag, chhdr.size_confirm); + switch (chhdr.kind) + { diff --git a/community/drbd/PKGBUILD b/community/drbd/PKGBUILD index 5babd0437..f90419cb6 100644 --- a/community/drbd/PKGBUILD +++ b/community/drbd/PKGBUILD @@ -1,27 +1,24 @@ -# $Id: PKGBUILD 73826 2012-07-16 02:13:49Z seblu $ +# $Id: PKGBUILD 75667 2012-08-28 14:04:52Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgname=drbd -pkgver=8.3.11 -pkgrel=4 +pkgver=8.3.13 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') -pkgdesc='Userland tools for drbd block devices' +pkgdesc='Userland tools for Distributed Replicated Block Device' url='http://www.drbd.org' license=('GPL2') +depends=('perl' 'bash') source=("http://oss.linbit.com/drbd/8.3/$pkgname-$pkgver.tar.gz" "$pkgname.rc" - "$pkgname.service" - '01-remove-old-sanity-check.diff') + "$pkgname.service") backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf') -md5sums=('e47a35a80143b72e9708844efbe2e608' +md5sums=('760a25459ef6b7262a2a3572c1561c5b' '8902a2f7aca6245c27e9566a1509312c' - 'afbb345094db49b0a474c0b4e51c0acd' - '24144d23b31f9ce66929fe989247c779') + 'afbb345094db49b0a474c0b4e51c0acd') build() { cd $pkgname-$pkgver - # patch bad sanity check in makefile - patch -p1 -i "$srcdir/01-remove-old-sanity-check.diff" ./configure \ --prefix=/usr \ --localstatedir=/var \ diff --git a/community/gsmartcontrol/PKGBUILD b/community/gsmartcontrol/PKGBUILD index d1d24c446..3047069fd 100644 --- a/community/gsmartcontrol/PKGBUILD +++ b/community/gsmartcontrol/PKGBUILD @@ -2,18 +2,18 @@ pkgname=gsmartcontrol pkgver=0.8.7 -pkgrel=1 +pkgrel=2 pkgdesc="A graphical user interface for the smartctl hard disk drive health inspection tool." arch=('i686' 'x86_64' 'mips64el') url="http://gsmartcontrol.berlios.de/home/index.php/en/Home" license=('GPL3') depends=('smartmontools' 'pcre' 'gtkmm' 'libglademm' 'glib2' 'xorg-xmessage') -optdepends=('gnomesu: for gsmartcontrol-root' - 'gksu: for gsmartcontrol-root') +optdepends=('polkit: to run gparted directly from menu') install=${pkgname}.install -source=(http://download.berlios.de/gsmartcontrol/${pkgname}-${pkgver}.tar.bz2) -md5sums=('6d104c2ffc1e693cd1a8052a6d7e3b30') - +source=(http://download.berlios.de/gsmartcontrol/${pkgname}-${pkgver}.tar.bz2 org.archlinux.pkexec.gsmartcontrol.policy gsmartcontrol.desktop) +md5sums=('6d104c2ffc1e693cd1a8052a6d7e3b30' + 'e7b9380849cdcaa4356a42559ea7954f' + '19b20293a639e51fa2abb929a3faae01') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -30,4 +30,12 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install -} + + # Install pexec fixed desktop file + install -Dm755 $srcdir/gsmartcontrol.desktop $pkgdir/usr/share/applications/gsmartcontrol.desktop + + # Install pexec file + install -Dm766 $srcdir/org.archlinux.pkexec.gsmartcontrol.policy \ + $pkgdir/usr/share/polkit-1/actions/org.archlinux.pkexec.gsmartcontrol.policy + + } diff --git a/community/gsmartcontrol/gsmartcontrol.desktop b/community/gsmartcontrol/gsmartcontrol.desktop new file mode 100644 index 000000000..e65a26ef6 --- /dev/null +++ b/community/gsmartcontrol/gsmartcontrol.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Version=1.0 +Name=GSmartControl +GenericName=Hard Disk Health Inspection +Comment=Monitor and control SMART data on hard disks +Icon=gsmartcontrol +Exec=pkexec /usr/bin/gsmartcontrol +Type=Application +Categories=GTK;GNOME;System;Filesystem; diff --git a/community/gsmartcontrol/org.archlinux.pkexec.gsmartcontrol.policy b/community/gsmartcontrol/org.archlinux.pkexec.gsmartcontrol.policy new file mode 100644 index 000000000..fb985df87 --- /dev/null +++ b/community/gsmartcontrol/org.archlinux.pkexec.gsmartcontrol.policy @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE policyconfig PUBLIC + "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" + "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd"> +<policyconfig> + + <action id="org.archlinux.pkexec.gsmartcontrol"> + <message>Authentication is required to run the gsmartcontrol</message> + <icon_name>gsmartcontrol</icon_name> + <defaults> + <allow_any>auth_admin</allow_any> + <allow_inactive>auth_admin</allow_inactive> + <allow_active>auth_admin</allow_active> + </defaults> + <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/gsmartcontrol</annotate> + <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate> + </action> + +</policyconfig> diff --git a/community/privoxy/PKGBUILD b/community/privoxy/PKGBUILD index 10beb55de..e592680a7 100644 --- a/community/privoxy/PKGBUILD +++ b/community/privoxy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 72126 2012-06-08 23:13:24Z dreisner $ +# $Id: PKGBUILD 75656 2012-08-28 10:03:15Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Juergen Hoetzel <juergen@hoetzel.info> # Contributor: basilburn (basilburn), Paul Bredbury (brebs) pkgname=privoxy pkgver=3.0.19 -pkgrel=4 +pkgrel=5 pkgdesc='A web proxy with advanced filtering capabilities.' arch=('i686' 'x86_64' 'mips64el') url='http://www.privoxy.org' @@ -20,11 +20,13 @@ install='privoxy.install' source=("http://downloads.sourceforge.net/ijbswa/${pkgname}-${pkgver}-stable-src.tar.gz" 'privoxy' 'privoxy.logrotate.d' - 'privoxy.conf.d') + 'privoxy.conf.d' + 'privoxy.service') md5sums=('57acc79059565cc42eda67982842785d' '1b4ed8c4e7e5b04b10ef41b597dc3f3b' 'fc3046377137003726a151ee27b142a2' - '27830ef79418e277b90c1c1fa933f876') + '27830ef79418e277b90c1c1fa933f876' + '7285327a5dbef5511242651f88dbc218') build() { cd "${srcdir}/${pkgname}-${pkgver}-stable" @@ -64,4 +66,7 @@ package() { # avoid conflict with filesystem>=2012.06 rmdir "$pkgdir/var/run" + + # systemd unit file + install -Dm0644 "${srcdir}/privoxy.service" "${pkgdir}/usr/lib/systemd/system/privoxy.service" } diff --git a/community/privoxy/privoxy.service b/community/privoxy/privoxy.service new file mode 100644 index 000000000..db0f43012 --- /dev/null +++ b/community/privoxy/privoxy.service @@ -0,0 +1,11 @@ +[Unit] +Description=Privoxy Web Proxy With Advanced Filtering Capabilities +After=network.target + +[Service] +Type=forking +PIDFile=/run/privoxy.pid +ExecStart=/usr/sbin/privoxy --pidfile /run/privoxy.pid --user privoxy.privoxy /etc/privoxy/config + +[Install] +WantedBy=multi-user.target diff --git a/community/tor/PKGBUILD b/community/tor/PKGBUILD index 9b090039f..13bcb41da 100644 --- a/community/tor/PKGBUILD +++ b/community/tor/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72796 2012-06-22 12:52:15Z dreisner $ +# $Id: PKGBUILD 75652 2012-08-28 09:58:29Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: simo <simo@archlinux.org> pkgname=tor -pkgver=0.2.2.37 +pkgver=0.2.2.38 pkgrel=1 pkgdesc='Anonymizing overlay network.' arch=('i686' 'x86_64' 'mips64el') @@ -21,8 +21,8 @@ source=("http://www.torproject.org/dist/${pkgname}-${pkgver}.tar.gz"{,.asc} 'tor' 'tor.conf.d' 'tor.service') -md5sums=('5aafdca4fb6af6e12b503d32b03f14a7' - '8d3adf70109d16e860dbf414f9d70eac' +md5sums=('91a9dd2c9d7fbd946bda5a13edbe5667' + '3486e60baeebe27d5702dbd38fa39c9d' '56c75d4e8a66f34167d31e38c43793dd' 'f8e6868a389877346e7eebaacd1078bb' '5c7c6834064b3530c442def6079ac3aa' diff --git a/community/tp_smapi/PKGBUILD b/community/tp_smapi/PKGBUILD new file mode 100644 index 000000000..e80492955 --- /dev/null +++ b/community/tp_smapi/PKGBUILD @@ -0,0 +1,58 @@ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: xduugu +# Contributor: nh2 +# Contributor: Steven Davidovitz <steviedizzle ð gmail đ com> +# Contributor: Nick B <Shirakawasuna ð gmail đ com> +# Contributor: Christof Musik <christof ð senfdax đ de> +# Contributor: Stefan Rupp <archlinux ð stefanrupp đ de> +# Contributor: Ignas Anikevicius <anikevicius ð gmail đ com> + +pkgname=tp_smapi +pkgver=0.41 +pkgrel=5 +pkgdesc="Modules for ThinkPad's SMAPI functionality" +arch=('i686' 'x86_64') +url='https://github.com/evgeni/tp_smapi' +license=('GPL') +depends=('linux>=3.5' 'linux<3.6') +makedepends=('linux-headers>=3.5' 'linux-headers<3.6') +install="${pkgname}.install" +source=("https://github.com/downloads/evgeni/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('63c683415c764568f6bf17c7eabe4752') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + _kernver=${_kernver:-$(uname -r)} + _extramodules=$(readlink -f "/usr/lib/modules/${_kernver}/extramodules" || true) + _kernver=$(< "${_extramodules}/version") + + sed -ri -e "s/^(KVER\s*:=).*$/\1 ${_kernver}/" \ + -e "s#^(KBASE\s*:=).*\$#\1 ${_extramodules%/*}/${_kernver}#" Makefile + + make HDAPS=1 +} + +package() { + _kernver=${_kernver:-$(uname -r)} + _extramodules=$(readlink -f "/usr/lib/modules/${_kernver}/extramodules" || true) + _kernver=$(< "${_extramodules}/version") + + make -C "${_extramodules%/*}/${_kernver}/build" \ + INSTALL_MOD_PATH="${pkgdir}/${_extramodules%%/lib/*}" \ + M="${srcdir}/${pkgname}-${pkgver}" modules_install + + cd "${pkgdir}/${_extramodules%/*}" + mv "${_kernver}/extra" "${_extramodules##*/}" + rmdir "${_kernver}" + + # compress kernel modules + find "${pkgdir}" -name "*.ko" -exec gzip -9 {} + + + # load module on startup + echo tp_smapi > "${srcdir}/${pkgname}.conf" + install -Dm644 "${srcdir}/${pkgname}.conf" "${pkgdir}/usr/lib/modules-load.d/${pkgname}.conf" + + # update kernel version in install file + sed -ri "s#^(extramodules=).*\$#\1${_extramodules}#" "${startdir}/${pkgname}.install" +} diff --git a/community/tp_smapi/tp_smapi.install b/community/tp_smapi/tp_smapi.install new file mode 100644 index 000000000..5fe1bab90 --- /dev/null +++ b/community/tp_smapi/tp_smapi.install @@ -0,0 +1,13 @@ +extramodules=/usr/lib/modules/extramodules-3.5-ARCH + +post_install() { + depmod -v $(< "$extramodules/version") &>/dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/xmlrpc-c/PKGBUILD b/community/xmlrpc-c/PKGBUILD index e51311297..5d4965be6 100644 --- a/community/xmlrpc-c/PKGBUILD +++ b/community/xmlrpc-c/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75449 2012-08-24 16:17:09Z arodseth $ +# $Id: PKGBUILD 75673 2012-08-28 21:19:22Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -7,7 +7,7 @@ pkgname=xmlrpc-c pkgver=1.31.04 epoch=1 -pkgrel=1 +pkgrel=2 pkgdesc='XML-RPC for C and C++' arch=('i686' 'x86_64' 'mips64el') url='http://xmlrpc-c.sourceforge.net/' @@ -16,7 +16,7 @@ depends=('curl' 'libxml2') makedepends=('libtool' 'setconf') options=('!makeflags' '!libtool' '!emptydirs') source=("$pkgname-advanced-$pkgver.tar.gz::http://xmlrpc-c.svn.sourceforge.net/viewvc/xmlrpc-c/advanced.tar.gz") -sha256sums=('f37239df6a0900149cf878dc4f57733cb80de1b44ffadc4efb5e26b02273533c') +sha256sums=('a85e6f9db7db21ed2811e455e61f7b62f5d08770cd68d83bdf10886b74e038f6') build() { cd "$srcdir/advanced" @@ -27,16 +27,19 @@ build() { --enable-libxml2-backend \ --disable-cgi-server \ --disable-libwww-client \ - --disable-wininet-client + --disable-wininet-client \ + --enable-cplusplus mkdir include/curl touch include/curl/types.h make CFLAGS_PERSONAL="$CFLAGS" + make CFLAGS_PERSONAL="$CFLAGS" -C tools } package() { cd "$srcdir/advanced" make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C tools install install -Dm644 doc/COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" # Remove references to build directory setconf "$pkgdir/usr/bin/xmlrpc-c-config" BLDDIR "" diff --git a/core/crda/PKGBUILD b/core/crda/PKGBUILD index c22889fbf..4c26eb1a2 100644 --- a/core/crda/PKGBUILD +++ b/core/crda/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 158615 2012-05-05 03:17:06Z allan $ +# $Id: PKGBUILD 165664 2012-08-28 11:02:19Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=crda pkgver=1.1.2 -pkgrel=3 +pkgrel=4 pkgdesc="Central Regulatory Domain Agent for wireless networks" arch=(i686 x86_64 'mips64el') url="http://wireless.kernel.org/en/developers/Regulatory/CRDA" license=('custom') -depends=('wireless-regdb' 'libnl' 'libgcrypt' 'udev' 'iw') +depends=('wireless-regdb' 'libnl' 'libgcrypt' 'systemd-tools' 'iw') makedepends=('python-m2crypto') install=crda.install source=(http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2 - crda.rc libnl32.patch) + set-wireless-regdom + libnl32.patch) md5sums=('5226f65aebacf94baaf820f8b4e06df4' - '014eef3f8655e9a130064ec6891317fc' + '65c93f2ff2eb1b29d9e9fa102ae2dd45' 'c1f7aff29f15a0364ae6f7905a1d4ae6') build() { @@ -27,11 +28,13 @@ build() { package() { # Install crda, regdbdump and udev rules cd "${srcdir}"/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" UDEV_RULE_DIR=/usr/lib/udev/rules.d/ install + make DESTDIR="${pkgdir}" UDEV_RULE_DIR=/usr/lib/udev/rules.d/ SBINDIR=/usr/bin/ install + # Adjust paths in udev rule file + sed 's|/sbin/crda|/usr/bin/crda|' -i "${pkgdir}"/usr/lib/udev/rules.d/85-regulatory.rules # This rule automatically sets the regulatory domain when cfg80211 is loaded - echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/etc/rc.d/wireless-regdom start >/dev/null"' >> "${pkgdir}"/usr/lib/udev/rules.d/85-regulatory.rules + echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/usr/bin/set-wireless-regdom"' >> "${pkgdir}"/usr/lib/udev/rules.d/85-regulatory.rules install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}"/usr/share/licenses/crda/LICENSE - install -D -m755 "${srcdir}"/crda.rc "${pkgdir}"/etc/rc.d/wireless-regdom + install -D -m755 "${srcdir}"/set-wireless-regdom "${pkgdir}"/usr/bin/set-wireless-regdom } diff --git a/core/crda/crda.install b/core/crda/crda.install index c18e15f71..9618a74ca 100644 --- a/core/crda/crda.install +++ b/core/crda/crda.install @@ -1,18 +1,5 @@ ## arg 1: the new package version post_install() { echo "Uncomment the right regulatory domain in /etc/conf.d/wireless-regdom." - echo "It will automatically be set when necessary." -} - -## arg 1: the new package version -## arg 2: the old package version -post_upgrade() { - # In an upgrade from 1.0.1-1 or older, the wireless-regdom file moves from the crda package - # to the new wireless-regdb package. If the user changed the file, it is save to overwrite the one - # from wireless-regdb by the user-defined one - if [ $(vercmp $2 1.0.1-2) -lt 0 ]; then - if [ -f /etc/conf.d/wireless-regdom.pacorig -a -n "$(grep -v ^# /etc/conf.d/wireless-regdom.pacorig 2>/dev/null | grep -v ^$)" ]; then - mv /etc/conf.d/wireless-regdom.pacorig /etc/conf.d/wireless-regdom - fi - fi + echo "It will automatically be set on boot." } diff --git a/core/crda/set-wireless-regdom b/core/crda/set-wireless-regdom new file mode 100755 index 000000000..3905ae98a --- /dev/null +++ b/core/crda/set-wireless-regdom @@ -0,0 +1,5 @@ +#!/bin/bash + +unset WIRELESS_REGDOM +. /etc/conf.d/wireless-regdom +[ -n "${WIRELESS_REGDOM}" ] && iw reg set ${WIRELESS_REGDOM} diff --git a/extra/ethtool/PKGBUILD b/extra/ethtool/PKGBUILD index e6cbef202..4c0e68c77 100644 --- a/extra/ethtool/PKGBUILD +++ b/extra/ethtool/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 161868 2012-06-16 00:18:47Z ibiru $ +# $Id: PKGBUILD 165653 2012-08-28 08:48:01Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Martin Kemp <mdkemp@elys.com> pkgname=ethtool -pkgver=3.4 +pkgver=3.5 pkgrel=1 epoch=1 pkgdesc="Utility for controlling network drivers and hardware" @@ -13,7 +13,7 @@ url="http://www.kernel.org/pub/software/network/ethtool/" license=('GPL') depends=('glibc') source=(http://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('cc4c4cf3ac086a53cd24f17d426f2b8f') +md5sums=('021b5785f65637a04d65c2d44d6c2250') build() { cd $pkgname-$pkgver diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD index 27e6e9170..aa798e3a1 100644 --- a/extra/feh/PKGBUILD +++ b/extra/feh/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 154300 2012-03-25 17:19:28Z bisson $ +# $Id: PKGBUILD 165670 2012-08-28 15:59:06Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=feh -pkgver=2.5 +pkgver=2.6 pkgrel=1 pkgdesc='Fast and light imlib2-based image viewer' url='http://feh.finalrewind.org/' -license=('MIT') +license=('custom:MIT') arch=('i686' 'x86_64' 'mips64el') depends=('giblib' 'curl' 'libxinerama' 'libexif') optdepends=('perl: feh-cam, webcam wrapper for feh' 'imagemagick: support more file formats') makedepends=('libxt') source=("${url}${pkgname}-${pkgver}.tar.bz2") -sha1sums=('d1bf7fa8ec6b5d1ce16c291edf38d45de01f252d') +sha1sums=('396d3507010a52e8a384fdbae452e291d5504971') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gc/PKGBUILD b/extra/gc/PKGBUILD index 1c4f8cc28..8fdc938a6 100644 --- a/extra/gc/PKGBUILD +++ b/extra/gc/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 165614 2012-08-27 10:02:13Z jgc $ +# $Id: PKGBUILD 165647 2012-08-28 07:31:01Z jgc $ # Maintainer: Daniel Isenmann <daniel [at] archlinux.org> # Contributor: dorphell <dorphell@gmx.net> pkgname=gc -pkgver=7.2.c +pkgver=7.2.d pkgrel=1 pkgdesc="A garbage collector for C and C++" arch=('i686' 'x86_64' 'mips64el') url="http://www.hpl.hp.com/personal/Hans_Boehm/gc/" license=('GPL') -source=("http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/${pkgname}-7.2c.tar.gz") +source=("http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/${pkgname}-7.2d.tar.gz") depends=('gcc-libs') options=('!libtool') -md5sums=('edd99c64174a1f3b10a474b3e4c74634') +md5sums=('91340b28c61753a789eb6077675d87d2') build() { cd "${srcdir}/${pkgname}-7.2" diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD index e85ff5367..1148b234b 100644 --- a/extra/libtorrent-rasterbar/PKGBUILD +++ b/extra/libtorrent-rasterbar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163820 2012-07-20 21:36:20Z ibiru $ +# $Id: PKGBUILD 165655 2012-08-28 09:42:38Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=libtorrent-rasterbar -pkgver=0.16.2 +pkgver=0.16.3 pkgrel=1 epoch=1 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around" @@ -14,7 +14,7 @@ depends=('boost-libs' 'geoip' 'python2') makedepends=('boost') options=('!libtool' '!emptydirs') source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz) -sha1sums=('04da641d21d0867fc103f4f57ffd41b3fce19ead') +sha1sums=('72788037bdf6a0a4796b4d74e543528cbfe9899b') build() { cd $pkgname-$pkgver diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index 2da1b26db..8c6b7c37b 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164956 2012-08-07 10:42:12Z tpowa $ +# $Id: PKGBUILD 165667 2012-08-28 12:51:24Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgbase=samba @@ -8,7 +8,7 @@ pkgver=3.6.7 # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! _realver=3.6.7 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64 mips64el) url="http://www.samba.org" license=('GPL3') @@ -163,7 +163,7 @@ md5sums=('b23be56c15dd52f64eb7ba54c0ea1ed5' 'a4bbfa39fee95bba2e7ad6b535fae7e6' '96f82c38f3f540b53f3e5144900acf17' 'f2f2e348acd1ccb566e95fa8a561b828' - '389cc4fa3b459360feaa1b3d93274693' - 'ea6a1251be979cb30c6098a28b270d2d' - '455f106ce7a4f983975b3a686eaa85e5' + '4b9c54d6fed4d0a225a84963516fc46f' + '67ce9229c4e343a91d70edba6de29437' + '617079917cdc84b450d109557b1fe2e1' '8e7ed39b54968e427f9506e9107bfb45') diff --git a/extra/samba/nmbd.service b/extra/samba/nmbd.service index 6e22ef2fb..55c22f563 100644 --- a/extra/samba/nmbd.service +++ b/extra/samba/nmbd.service @@ -1,5 +1,6 @@ [Unit] Description=Samba NetBIOS name server +After=network.target [Service] ExecStart=/usr/sbin/nmbd -F diff --git a/extra/samba/smbd.service b/extra/samba/smbd.service index beb9bfad7..68d1947da 100644 --- a/extra/samba/smbd.service +++ b/extra/samba/smbd.service @@ -1,5 +1,6 @@ [Unit] Description=Samba SMB/CIFS server +After=network.target [Service] ExecStart=/usr/sbin/smbd -F diff --git a/extra/samba/winbindd.service b/extra/samba/winbindd.service index 509c89628..dc9fe199b 100644 --- a/extra/samba/winbindd.service +++ b/extra/samba/winbindd.service @@ -1,5 +1,6 @@ [Unit] Description=Samba Winbind daemon +After=network.target [Service] ExecStart=/usr/sbin/winbindd -F diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD index 1bb3c4c6c..4b44034e9 100644 --- a/extra/sane/PKGBUILD +++ b/extra/sane/PKGBUILD @@ -1,41 +1,29 @@ -# $Id: PKGBUILD 162163 2012-06-22 12:59:38Z dreisner $ +# $Id: PKGBUILD 165659 2012-08-28 10:12:18Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Simo L. <neotuli@yahoo.com> # Contributor: eric <eric@archlinux.org> pkgname=sane -pkgver=1.0.22 -pkgrel=9 +pkgver=1.0.23 +pkgrel=1 pkgdesc="Scanner Access Now Easy" url="http://www.sane-project.org/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('libtiff>=4.0.0' 'libgphoto2>=2.4.7-2' 'libjpeg>=8' 'libusb-compat' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp') +depends=('libtiff>=4.0.0' 'libgphoto2>=2.4.7-2' 'libjpeg>=8' 'libusb-compat' 'libcups' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp') makedepends=('texlive-latexextra') install=$pkgname.install -backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,mustek_usb2.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane) -source=(ftp://ftp2.sane-project.org/pub/sane/$pkgname-backends-$pkgver/$pkgname-backends-$pkgver.tar.gz +backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,kodakaio.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane) +source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz 'sane.xinetd' - 'libv4l-0.8.3.patch' - 'xerox_mfp_fix_usb_devices.patch' 'saned.socket' 'saned.service') options=(!libtool) -md5sums=('fadf56a60f4776bfb24491f66b617cf5' - 'da946cc36fb83612162cf9505986d4b2' - 'e645a8921cff9f18ffbdabb2ed885060' - 'cfef73e7db7c28308914d3db6767d852' - 'e57e9e15528f47f5f1b3f1411135ed5d' - 'e44bd4c994a52d6f472463d1eb0a03be') build() { cd "${srcdir}/${pkgname}-backends-${pkgver}" - patch -p1 -i "${srcdir}"/libv4l-0.8.3.patch - # fix https://bugs.archlinux.org/task/26114 - patch -Np1 -i "${srcdir}"/xerox_mfp_fix_usb_devices.patch - ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -70,3 +58,7 @@ package () { install -D -m644 ${srcdir}/saned.service \ "${pkgdir}/usr/lib/systemd/system/saned@.service" } +md5sums=('e226a89c54173efea80e91e9a5eb6573' + 'da946cc36fb83612162cf9505986d4b2' + 'e57e9e15528f47f5f1b3f1411135ed5d' + 'e44bd4c994a52d6f472463d1eb0a03be') diff --git a/libre-testing/filesystem/PKGBUILD b/libre-testing/filesystem/PKGBUILD index d5dea3ecd..21deceea2 100644 --- a/libre-testing/filesystem/PKGBUILD +++ b/libre-testing/filesystem/PKGBUILD @@ -5,7 +5,7 @@ pkgname=filesystem pkgver=2012.8 -pkgrel=1 +pkgrel=1.1 pkgdesc='Base filesystem for Parabola' arch=('any') license=('GPL') @@ -108,5 +108,5 @@ md5sums=('45940618da782cc391c59f88ab3333c3' 'f95416882cef800edef08382a1176b7d' 'f3b6ae7db8adffaaa4bffc6099dcbd50' 'a8a962370cd0128465d514e6a1f74130' - '2b504fc5a41b7788ba890e651930b4b3' + '3674fcb22044d2946934e7826aa0c632' '3807d07215d9116331fe1cf8feeaa0f8') diff --git a/libre-testing/filesystem/parabola.7.txt b/libre-testing/filesystem/parabola.7.txt index b5cde9f32..f7da03147 100644 --- a/libre-testing/filesystem/parabola.7.txt +++ b/libre-testing/filesystem/parabola.7.txt @@ -14,7 +14,7 @@ Overview of the basic configuration of Parabola GNU/Linux-libre. DESCRIPTION ----------- -Parabola GNU/Linux-libre exposes the user to the system without hiding any details. This manpage gives a +Parabola exposes the user to the system without hiding any details. This manpage gives a brief overview of the configuration files that should be set up on a fresh install. INITSCRIPTS[[I]] @@ -78,5 +78,4 @@ mkinitcpio(8), pacman(8), pacman.conf(5), grub-mkconfig(8), syslinux(1), modules AUTHORS ------- -Written by Tom Gundersen. -Adapted for Parabola GNU/Linux-libre by André Silva. +Written by Tom Gundersen. Rebranded for Parabola by Nicolás Reynolds and André Silva. diff --git a/libre/spectrwm-libre/LICENSE b/libre/spectrwm-libre/LICENSE new file mode 100644 index 000000000..24c04f3a0 --- /dev/null +++ b/libre/spectrwm-libre/LICENSE @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2009 Marco Peereboom <marco@peereboom.us> + * Copyright (c) 2009 Ryan McBride <mcbride@countersiege.com> + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/* + * Much code and ideas taken from dwm under the following license: + * MIT/X Consortium License + * + * 2006-2008 Anselm R Garbe <garbeam at gmail dot com> + * 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com> + * 2006-2007 Jukka Salmi <jukka at salmi dot ch> + * 2007 Premysl Hruby <dfenze at gmail dot com> + * 2007 Szabolcs Nagy <nszabolcs at gmail dot com> + * 2007 Christof Musik <christof at sendfax dot de> + * 2007-2008 Enno Gottox Boland <gottox at s01 dot de> + * 2007-2008 Peter Hartlich <sgkkr at hartlich dot com> + * 2008 Martin Hurton <martin dot hurton at gmail dot com> + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ diff --git a/libre/spectrwm-libre/PKGBUILD b/libre/spectrwm-libre/PKGBUILD new file mode 100644 index 000000000..4b4bccec3 --- /dev/null +++ b/libre/spectrwm-libre/PKGBUILD @@ -0,0 +1,65 @@ +# $Id$ +# Maintainer: Kyle Keen <keenerd@gmail.com> +# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> + +_pkgname=spectrwm +pkgname=spectrwm-libre +pkgver=2.0.1 +pkgrel=1 +pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way (without unfree profont support)" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.spectrwm.org" +_watch="https://opensource.conformal.com/snapshots/spectrwm/" +license=('custom:ISC') +depends=('dmenu' 'xcb-util' 'xcb-util-wm' 'xcb-util-keysyms' 'libxrandr' 'libxft' 'libxcursor') +replaces=('spectrwm' 'scrotwm') +conflicts=('spectrwm') +provides=("spectrwm=${pkgver}") +makedepends=('libxt') +optdepends=('scrot: screenshots' 'xlockmore: screenlocking' 'terminus-font: great font') +backup=(etc/spectrwm.conf) +source=(http://opensource.conformal.com/snapshots/$_pkgname/$_pkgname-$pkgver.tgz \ + LICENSE \ + baraction.sh) +md5sums=('ed553574e65bb364e26d359790e204f2' + 'a67cfe51079481e5b0eab1ad371379e3' + '950d663692e1da56e0ac864c6c3ed80e') + +build() { + cd "$srcdir/$_pkgname-$pkgver" + + # it is like a patch, only less fragile + sed -i 's|\"/usr/local/lib/libswmhack.so\"|\"libswmhack.so\"|' spectrwm.c + sed -i 's/verbose_layout = 0;/verbose_layout = 1;/' spectrwm.c + sed -i 's/# modkey = Mod1/modkey = Mod4/' spectrwm.conf + sed -i 's/-\*-terminus-medium-\*-\*-\*-\*/-*-profont-*-*-*-*-12/' spectrwm.conf + + cd linux + make PREFIX="/usr" +} + +package() { + cd "$srcdir/$_pkgname-$pkgver/linux" + make PREFIX="/usr" DESTDIR="$pkgdir" install + install -Dm644 spectrwm.desktop "$pkgdir/usr/share/xsessions/spectrwm.desktop" + cd .. + install -Dm644 spectrwm.conf "$pkgdir/etc/spectrwm.conf" + install -Dm755 screenshot.sh "$pkgdir/usr/share/spectrwm/screenshot.sh" + mkdir -p "$pkgdir/etc/spectrwm" + cp spectrwm_*.conf "$pkgdir/etc/spectrwm/" + cd "$srcdir" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$_pkgname/LICENSE" + install -Dm755 baraction.sh "$pkgdir/usr/share/spectrwm/baraction.sh" + + ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so.0" + ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so" + + # fix this for real in the makefile + rm "$pkgdir/usr/bin/scrotwm" + ln -s "/usr/bin/spectrwm" "$pkgdir/usr/bin/scrotwm" + mkdir -p "$pkgdir"/usr/share/man/{es,it,pt,ru}/man1/ + mv "$pkgdir/usr/share/man/man1/spectrwm_es.1" "$pkgdir/usr/share/man/es/man1/" + mv "$pkgdir/usr/share/man/man1/spectrwm_it.1" "$pkgdir/usr/share/man/it/man1/" + mv "$pkgdir/usr/share/man/man1/spectrwm_pt.1" "$pkgdir/usr/share/man/pt/man1/" + mv "$pkgdir/usr/share/man/man1/spectrwm_ru.1" "$pkgdir/usr/share/man/ru/man1/" +} diff --git a/libre/spectrwm-libre/baraction.sh b/libre/spectrwm-libre/baraction.sh new file mode 100644 index 000000000..96a8a7b1a --- /dev/null +++ b/libre/spectrwm-libre/baraction.sh @@ -0,0 +1,82 @@ +#!/bin/bash +# baraction.sh for spectrwm status bar +# From http://wiki.archlinux.org/index.php/Scrotwm + +SLEEP_SEC=5 +#loops forever outputting a line every SLEEP_SEC secs +while :; do + + eval $(cat /proc/acpi/battery/BAT0/state | awk '/charging state/ {printf "BAT_CHGSTATE=%s;", $3}; /remaining capacity/ {printf "BAT_REMNG=%s;",$3}; /present rate/ {printf "BAT_RATE=%s;",$3};' -) + eval $(cat /proc/acpi/battery/BAT0/info | awk '/present/ {printf "BAT_PRESENT=%s;", $2}; /last full capacity/ {printf "BAT_LASTFULL=%s;",$4};' -) + + BAT_REMNG_WH=`echo "scale=1; a=($BAT_REMNG+50)/1000; print a" | bc -l` + BAT_RATE_W=`echo "scale=1; a=($BAT_RATE+50)/1000; print a" | bc -l` + BCSCRIPT="scale=0; a=(100*$BAT_REMNG / $BAT_LASTFULL); print a" + BAT_PCT=`echo $BCSCRIPT | bc -l`% + + case $BAT_PRESENT in + no) + POWER_STR="AC, NO BATTERY" + ;; + yes) + + case $BAT_CHGSTATE in + charged) + #on ac + AC_STATUS="ON AC" + TIME_REMNG="N/A" + POWER_STR="$AC_STATUS $BAT_CHGSTATE $BAT_PCT" + ;; + charging) + #on ac + AC_STATUS="ON AC" + BCSCRIPT="scale=1; a=(60*($BAT_LASTFULL - $BAT_REMNG) / $BAT_RATE); print a" + TIMETOFULL_MIN=`echo $BCSCRIPT | bc -l` + POWER_STR="$AC_STATUS $BAT_CHGSTATE $BAT_PCT C="$BAT_REMNG_WH"Wh Rate="$BAT_RATE_W"W TTF="$TIMETOFULL_MIN"min" + ;; + discharging) + AC_STATUS="ON BATT" + TIME_REMNG_MIN=`echo "scale=0; a=(60*$BAT_REMNG / $BAT_RATE); print a" | bc -l` + TIME_REMNG_HH=`echo "scale=0; a=($BAT_REMNG / $BAT_RATE); if (a<10) {print "0"; print a} else {print a}" | bc -l` + + TIME_REMNG_MM=`echo "scale=0; a=($TIME_REMNG_MIN-60*$TIME_REMNG_HH); if (a<10) {print "0"; print a} else {print a}" | bc -l` + POWER_STR="$AC_STATUS $BAT_PCT C="$BAT_REMNG_WH"Wh P="$BAT_RATE_W"W R="$TIME_REMNG_HH":"$TIME_REMNG_MM + ;; + *) + POWER_STR=$BAT_CHGSTATE + ;; + esac + + ;; + *) + POWER_STR="error" + ;; + esac + + #spectrwm bar_print can't handle UTF-8 characters, such as degree symbol + #Core 0: +67.0°C (crit = +100.0°C) + eval $(sensors 2>/dev/null | sed s/[°+]//g | awk '/^Core 0/ {printf "CORE0TEMP=%s;", $3}; /^Core 1/ {printf "CORE1TEMP=%s;",$3}; /^fan1/ {printf "FANSPD=%s;",$2};' -) + TEMP_STR="Tcpu=$CORE0TEMP,$CORE1TEMP F=$FANSPD" + + WLAN_ESSID=$(iwconfig wlan0 | awk -F "\"" '/wlan0/ { print $2 }') + eval $(cat /proc/net/wireless | sed s/[.]//g | awk '/wlan0/ {printf "WLAN_QULTY=%s; WLAN_SIGNL=%s; WLAN_NOISE=%s", $3,$4,$5};' -) + BCSCRIPT="scale=0;a=100*$WLAN_QULTY/70;print a" + WLAN_QPCT=`echo $BCSCRIPT | bc -l` + WLAN_POWER=`iwconfig 2>/dev/null| grep "Tx-Power"| awk {'print $4'}|sed s/Tx-Power=//` + WLAN_STR="$WLAN_ESSID: Q=$WLAN_QPCT% S/N="$WLAN_SIGNL"/"$WLAN_NOISE"dBm T="$WLAN_POWER"dBm" + + CPUFREQ_STR=`echo "Freq:"$(cat /proc/cpuinfo | grep 'cpu MHz' | sed 's/.*: //g; s/\..*//g;')` + CPULOAD_STR="Load:$(uptime | sed 's/.*://; s/,//g')" + + eval $(awk '/^MemTotal/ {printf "MTOT=%s;", $2}; /^MemFree/ {printf "MFREE=%s;",$2}' /proc/meminfo) + MUSED=$(( $MTOT - $MFREE )) + MUSEDPT=$(( ($MUSED * 100) / $MTOT )) + MEM_STR="Mem:${MUSEDPT}%" + + echo -e "$POWER_STR $TEMP_STR $CPUFREQ_STR $CPULOAD_STR $MEM_STR $WLAN_STR" + #alternatively if you prefer a different date format + #DATE_STR=`date +"%H:%M %a %d %b` + #echo -e "$DATE_STR $POWER_STR $TEMP_STR $CPUFREQ_STR $CPULOAD_STR $MEM_STR $WLAN_STR" + + sleep $SLEEP_SEC +done diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD index 12b89be90..193db8900 100644 --- a/libre/syslinux/PKGBUILD +++ b/libre/syslinux/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 165001 2012-08-08 15:45:08Z tpowa $ +# $Id: PKGBUILD 165555 2012-08-23 18:27:20Z thomas $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname=syslinux pkgver=4.05 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64' 'mips64el') pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)" url="http://syslinux.zytor.com/" @@ -26,6 +27,13 @@ source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.t avoid-using-ext2_fs.patch handle-ctors-dtors-via-init_array-and-fini_array.patch splash.png) +md5sums=('82299242418385da1274c9479a778cb2' + '1528c376e43f0eaccaa80d8ad1bc13b4' + '8dc2afca3739667e892faf04eb97e7b1' + '680750f73dc2e587ac567d057d485813' + '2e2c674a71c0c0bf265d96cfc19ce985' + 'd016d03f15177b1bb534ce3753b2aa9b' + '0035b6cac6756a384b861eda8d33e4f7') build() { # Do not try to build syslinux with our default LDFLAGS, it will fail @@ -39,7 +47,9 @@ build() { patch -Np1 -i "$srcdir"/handle-ctors-dtors-via-init_array-and-fini_array.patch # Fix FHS manpage path sed 's|/usr/man|/usr/share/man|g' -i mk/syslinux.mk - make + make installer + make -C utils + make -C com32 } package() { @@ -57,10 +67,3 @@ package() { mv "$pkgdir"/sbin/extlinux "$pkgdir"/usr/sbin/extlinux rmdir "$pkgdir"/sbin } -md5sums=('82299242418385da1274c9479a778cb2' - '1528c376e43f0eaccaa80d8ad1bc13b4' - '8dc2afca3739667e892faf04eb97e7b1' - '680750f73dc2e587ac567d057d485813' - '2e2c674a71c0c0bf265d96cfc19ce985' - '12a2dbd3fe59230df2f470600dd62dac' - '0035b6cac6756a384b861eda8d33e4f7') diff --git a/libre/syslinux/handle-ctors-dtors-via-init_array-and-fini_array.patch b/libre/syslinux/handle-ctors-dtors-via-init_array-and-fini_array.patch index 99e0d4777..aa513312b 100644 --- a/libre/syslinux/handle-ctors-dtors-via-init_array-and-fini_array.patch +++ b/libre/syslinux/handle-ctors-dtors-via-init_array-and-fini_array.patch @@ -61,6 +61,7 @@ index 37ee46c..008e4ce 100644 + KEEP (*(SORT(.dtors*))) PROVIDE (__dtors_end = .); } + +-- +1.7.6.5 --- -1.7.6.5
\ No newline at end of file diff --git a/social/batctl/PKGBUILD b/social/batctl/PKGBUILD index 7a6f37c76..33df8ca41 100644 --- a/social/batctl/PKGBUILD +++ b/social/batctl/PKGBUILD @@ -9,8 +9,6 @@ url="http://www.open-mesh.net/" license=('GPL') depends=('glibc') source=("http://downloads.open-mesh.net/batman/releases/batman-adv-${pkgver}/${pkgname}-${pkgver}.tar.gz"{,.asc}) -md5sums=('fe9e6a3994539037b48afc5e3d31628c' - 'fdc6433ebc7fe59ce9eaec56dd843eb9') build(){ cd ${srcdir}/${pkgname}-${pkgver} @@ -23,3 +21,5 @@ package() { } # vim:set ts=2 sw=2 et: +md5sums=('fe9e6a3994539037b48afc5e3d31628c' + 'fdc6433ebc7fe59ce9eaec56dd843eb9') |