diff options
39 files changed, 126 insertions, 557 deletions
diff --git a/community/activity-log-manager/PKGBUILD b/community/activity-log-manager/PKGBUILD index 6b7fbaddb..e4a898185 100644 --- a/community/activity-log-manager/PKGBUILD +++ b/community/activity-log-manager/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88673 2013-04-21 22:16:39Z heftig $ +# $Id: PKGBUILD 92682 2013-06-12 04:38:43Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: Ner0 pkgname=activity-log-manager -pkgver=0.9.4 -pkgrel=4 +pkgver=0.9.5 +pkgrel=1 pkgdesc="A graphical user interface which lets you easily control what gets logged by Zeitgeist" arch=('i686' 'x86_64') url="https://launchpad.net/activity-log-manager" @@ -12,33 +12,19 @@ license=('GPL2') depends=('gtk3' 'libgee06' 'libzeitgeist' 'zeitgeist' 'hicolor-icon-theme' 'xdg-utils') makedepends=('vala' 'intltool') install=$pkgname.install -source=(https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz - http://pkgbuild.com/~bgyorgy/sources/$pkgname-translations-20121021.tar.gz - fix-crash.patch - config.vapi) -md5sums=('cf85aecdaa6c0188a53d659709e1f8cd' - '6167df74ce44659aa94a89f31ff4d351' - '1052dec3691826f01fa3d4fd84284ccc' - 'fecc5ac50dfcd79c4c8d54599760d225') +source=(https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz + http://pkgbuild.com/~bgyorgy/sources/$pkgname-translations-20121021.tar.gz) +md5sums=('460b4439798badbf4ba4b76b31cc1d03' + '6167df74ce44659aa94a89f31ff4d351') build() { cd "$srcdir/$pkgname-$pkgver" - # Fix docdir location - sed -i 's/almdocdir =.*/almdocdir = ${docdir}/' Makefile.{am,in} - - # Install updated language files + # Install language files rename $pkgname- '' ../po/$pkgname-*.po mv -f -t po ../po/* printf "%s\n" po/*.po | sed -e 's/po\///g' -e 's/\.po//g' >po/LINGUAS - # Fix crash with GTK+ 3.6 - # https://bugs.launchpad.net/activity-log-manager/+bug/1058037 - patch -Np1 -i "$srcdir/fix-crash.patch" - - # We need this file for build - mv "$srcdir/config.vapi" "$srcdir/$pkgname-$pkgver/src" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var make } @@ -47,7 +33,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - - # We don't have Whoopsie on Arch Linux - rm -r "$pkgdir/etc" "$pkgdir"/usr/share/{applications/activity-log-manager-ccpanel.desktop,dbus-1,gnome-control-center,polkit-1} } diff --git a/community/activity-log-manager/config.vapi b/community/activity-log-manager/config.vapi deleted file mode 100644 index ee9823051..000000000 --- a/community/activity-log-manager/config.vapi +++ /dev/null @@ -1,11 +0,0 @@ -[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")] -namespace Config { - public const string GETTEXT_PACKAGE; - public const string SPRITE_DIR; - public const string BACKGROUND_DIR; - public const string PACKAGE_DATA_DIR; - public const string PACKAGE_LOCALE_DIR; - public const string PACKAGE_NAME; - public const string PACKAGE_VERSION; - public const string VERSION; -} diff --git a/community/activity-log-manager/fix-crash.patch b/community/activity-log-manager/fix-crash.patch deleted file mode 100644 index 92bb5683c..000000000 --- a/community/activity-log-manager/fix-crash.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur activity-log-manager-0.9.4.orig/src/alm.vala activity-log-manager-0.9.4/src/alm.vala ---- activity-log-manager-0.9.4.orig/src/alm.vala 2012-02-22 20:24:08.000000000 +0100 -+++ activity-log-manager-0.9.4/src/alm.vala 2012-11-01 09:33:15.466534392 +0100 -@@ -41,10 +41,7 @@ - static int main (string[] args) - { - Gtk.init (ref args); -- var alm = new Gtk.Application ("org.zeitgeist.Alm", -- ApplicationFlags.FLAGS_NONE); -- var window = new Main (); -- alm.add_window (window); -+ new Main (); - - Gtk.main (); - return 0; diff --git a/community/gtkspell3/PKGBUILD b/community/gtkspell3/PKGBUILD index e66c20ba3..9d761e88a 100644 --- a/community/gtkspell3/PKGBUILD +++ b/community/gtkspell3/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87235 2013-03-28 21:25:14Z bgyorgy $ +# $Id: PKGBUILD 92677 2013-06-12 04:09:55Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Ben <ben@benmazer.net> pkgname=gtkspell3 -pkgver=3.0.2 +pkgver=3.0.3 pkgrel=1 url="http://gtkspell.sourceforge.net/" pkgdesc="Provides word-processor-style highlighting and replacement of misspelled words in a GtkTextView widget" @@ -14,7 +14,7 @@ depends=('gtk3' 'enchant') makedepends=('intltool' 'gobject-introspection' 'vala') options=('!libtool') source=(http://gtkspell.sourceforge.net/download/$pkgname-$pkgver.tar.gz) -md5sums=('5db501ead123ffbe8aad7d5f76c44c71') +md5sums=('58f68a0fe9007d9a3d6092b222689320') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/libaccounts-glib/PKGBUILD b/community/libaccounts-glib/PKGBUILD index e289718d1..3a0fed574 100644 --- a/community/libaccounts-glib/PKGBUILD +++ b/community/libaccounts-glib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 85006 2013-02-26 17:28:47Z bgyorgy $ +# $Id: PKGBUILD 92686 2013-06-12 04:53:53Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=libaccounts-glib -pkgver=1.8 +pkgver=1.11 pkgrel=1 pkgdesc="Glib-based client library for accessing the online accounts database" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('dbus-glib' 'libxml2' 'sqlite3') makedepends=('python2-gobject') options=('!libtool') source=(http://accounts-sso.googlecode.com/files/$pkgname-$pkgver.tar.gz) -sha1sums=('5d827392f6da2ff74e342a6b3a50fbe3486b49b0') +sha1sums=('467480fc800c6d22d8d53373f67d49f8a1e4d970') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/libsignon-glib/PKGBUILD b/community/libsignon-glib/PKGBUILD index 11e80c101..d17506366 100644 --- a/community/libsignon-glib/PKGBUILD +++ b/community/libsignon-glib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 84337 2013-02-16 20:27:53Z bgyorgy $ +# $Id: PKGBUILD 92688 2013-06-12 04:57:26Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=libsignon-glib -pkgver=1.9 +pkgver=1.10 pkgrel=1 pkgdesc="GLib-based client library for applications handling account authentication through the Online Accounts Single Sign-On service" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('signon') makedepends=('python2-gobject') options=('!libtool') source=(http://accounts-sso.googlecode.com/files/$pkgname-$pkgver.tar.gz) -sha1sums=('09e0b8da14f4ea9450e33eb5f6808afeefdbbe03') +sha1sums=('224f66c9662843705da4b35d781a50d6aeb8ca5f') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/qmc2/PKGBUILD b/community/qmc2/PKGBUILD deleted file mode 100644 index 7760f385c..000000000 --- a/community/qmc2/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 82281 2013-01-14 09:21:45Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> - -pkgname=qmc2 -pkgver=0.38 -pkgrel=1 -pkgdesc="Qt 4 based UNIX MAME frontend supporting SDLMAME" -url="http://qmc2.arcadehits.net" -license=("GPL") -arch=('i686' 'x86_64') -depends=('qtwebkit' 'phonon' 'sdl') -makedepends=('rsync' 'mesa') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2") -md5sums=('075cd54c3f4eb306c4f8304dd08900c6') - -build() { - cd "$srcdir/$pkgname" - export CTIME=0 - make PREFIX=/usr DATADIR=/usr/share SYSCONFDIR=/etc QTDIR=/usr -} - -package() { - cd "$srcdir/$pkgname" - make PREFIX=/usr DATADIR=/usr/share SYSCONFDIR=/etc QTDIR=/usr DESTDIR=$pkgdir install - install -d $pkgdir/usr/share/{applications,pixmaps} - install -D -m644 "$srcdir/qmc2/data/img/mame.png" "$pkgdir/usr/share/pixmaps" -} diff --git a/community/signon-ui/PKGBUILD b/community/signon-ui/PKGBUILD index 1d6befcfa..453349cd5 100644 --- a/community/signon-ui/PKGBUILD +++ b/community/signon-ui/PKGBUILD @@ -1,19 +1,16 @@ -# $Id: PKGBUILD 87395 2013-03-30 17:58:57Z bgyorgy $ +# $Id: PKGBUILD 92692 2013-06-12 05:09:15Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=signon-ui -pkgver=0.14 -_pkgver=0.14+bzr85 +pkgver=0.15 pkgrel=1 pkgdesc="UI component that responsible for handling the user interactions which can happen during the login process of an online account" arch=('i686' 'x86_64') url="https://launchpad.net/online-accounts-signon-ui" license=('GPL') depends=('libaccounts-qt' 'qtwebkit' 'signon' 'libnotify') -source=(https://launchpad.net/online-accounts-signon-ui/13.04/$_pkgver/+download/$pkgname-$_pkgver.tar.bz2 - Makefile) -md5sums=('5857a1b9ed957a5de72863c3868049da' - 'c73ecd27c76a9060862512b7678ae4f1') +source=(https://launchpad.net/online-accounts-signon-ui/trunk/$pkgver/+download/$pkgname-$pkgver.tar.bz2) +md5sums=('67ac8ce4cc85b69ec6ff67ae892fda90') build() { cd "$srcdir/$pkgname-$pkgver" @@ -22,9 +19,6 @@ build() { echo 'INSTALLS =' >>tests/unit/tst_inactivity_timer.pro echo 'INSTALLS =' >>tests/unit/tst_signon_ui.pro - # Fix build - cp "$srcdir/Makefile" po/Makefile - qmake-qt4 PREFIX=/usr LIBDIR=/usr/lib make } diff --git a/community/signon/PKGBUILD b/community/signon/PKGBUILD index 4df065ba1..e6c081be6 100644 --- a/community/signon/PKGBUILD +++ b/community/signon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90876 2013-05-15 06:33:09Z bgyorgy $ +# $Id: PKGBUILD 92690 2013-06-12 05:04:06Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgbase=signon pkgname=('signon' 'signon-doc') -pkgver=8.51 +pkgver=8.52 pkgrel=1 pkgdesc="Framework to provide credential storage and authentication service" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ backup=(etc/signond.conf) install=$pkgname.install source=(http://accounts-sso.googlecode.com/files/$pkgbase-$pkgver.tar.bz2 use_keyring.patch) -sha1sums=('5d62d9f2923381baf5cffbd112adf3ae935e6c65' +sha1sums=('cebedffb219ee1d28d9dde0cafb8f978acf34d95' 'cfdd48b494ad267654ceba23f1b81bcb8f56b9a1') build() { diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index b03e92a2d..367179984 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 91789 2013-05-27 20:00:36Z tpowa $ +# $Id: PKGBUILD 92703 2013-06-12 15:19:19Z alucryd $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') pkgver=4.2.12 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/community/virtualbox-modules/virtualbox-guest-modules.install b/community/virtualbox-modules/virtualbox-guest-modules.install index 8706a7205..9348ea3c8 100644 --- a/community/virtualbox-modules/virtualbox-guest-modules.install +++ b/community/virtualbox-modules/virtualbox-guest-modules.install @@ -1,4 +1,4 @@ -VERSION='3.9.4-1-ARCH' +VERSION='3.9.5-1-ARCH' post_install() { cat << EOF diff --git a/community/virtualbox-modules/virtualbox-host-modules.install b/community/virtualbox-modules/virtualbox-host-modules.install index c75dd089c..7043167f8 100644 --- a/community/virtualbox-modules/virtualbox-host-modules.install +++ b/community/virtualbox-modules/virtualbox-host-modules.install @@ -1,4 +1,4 @@ -VERSION='3.9.4-1-ARCH' +VERSION='3.9.5-1-ARCH' post_install() { cat << EOF diff --git a/core/acl/PKGBUILD b/core/acl/PKGBUILD index 30b17d194..0b5f41665 100644 --- a/core/acl/PKGBUILD +++ b/core/acl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 176120 2013-01-27 15:38:26Z dreisner $ +# $Id: PKGBUILD 188195 2013-06-12 15:53:07Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=acl -pkgver=2.2.51 -pkgrel=3 +pkgver=2.2.52 +pkgrel=1 pkgdesc="Access control list utilities, libraries and headers" arch=('i686' 'x86_64') url="http://savannah.nongnu.org/projects/acl" @@ -14,8 +14,8 @@ provides=('xfsacl') conflicts=('xfsacl') options=('!libtool') source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.src.tar.gz"{,.sig}) -sha256sums=('06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225' - '10893e2a044905acc88e2d98291e739b7b858b36c836ff66a3532909964067ce') +sha256sums=('179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23' + 'SKIP') build() { cd "$pkgname-$pkgver" diff --git a/core/attr/PKGBUILD b/core/attr/PKGBUILD index 5fb0a8ed0..5b5dbba0b 100644 --- a/core/attr/PKGBUILD +++ b/core/attr/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 158576 2012-05-05 00:02:37Z allan $ +# $Id: PKGBUILD 188196 2013-06-12 15:53:08Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=attr -pkgver=2.4.46 -pkgrel=2 +pkgver=2.4.47 +pkgrel=1 pkgdesc="Extended attribute support library for ACL support" arch=('i686' 'x86_64') url="http://savannah.nongnu.org/projects/attr" @@ -15,8 +15,8 @@ provides=('xfsattr') conflicts=('xfsattr') options=('!libtool') source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.src.tar.gz"{,.sig}) -sha256sums=('dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f' - 'a8ee37a0d02c0365049b8a06dc6963e6698a448ff2c0a54ed040f0c60f27bca3') +sha256sums=('25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859' + 'SKIP') build() { cd "$pkgname-$pkgver" @@ -30,7 +30,7 @@ package() { make -C "$pkgname-$pkgver" DIST_ROOT="$pkgdir" install install-lib install-dev # tidy up - rm -f "$pkgdir"/usrlib/libattr.a + rm -f "$pkgdir"/usr/lib/libattr.a chmod 0755 "$pkgdir"/usr/lib/libattr.so.*.*.* # remove conflicting manpages diff --git a/core/openvpn/PKGBUILD b/core/openvpn/PKGBUILD index 7c63db027..1f6754e23 100644 --- a/core/openvpn/PKGBUILD +++ b/core/openvpn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187038 2013-06-03 11:15:29Z allan $ +# $Id: PKGBUILD 188197 2013-06-12 15:53:27Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=openvpn -pkgver=2.3.1 -pkgrel=2 +pkgver=2.3.2 +pkgrel=1 pkgdesc="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)" arch=(i686 x86_64) url="http://openvpn.net/index.php/open-source.html" @@ -18,7 +18,7 @@ source=(http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz http://build.openvpn.net/downloads/releases/easy-rsa-2.2.0_master.tar.gz.asc openvpn@.service openvpn-2.3.0-fix-systemd-ask-password-path.patch) -md5sums=('57a3b64597fc37b7842a3fde354d8bbe' +md5sums=('06e5f93dbf13f2c19647ca15ffc23ac1' 'SKIP' 'fbf818b6e1f212e77b9ce0e6d92584a1' 'SKIP' diff --git a/core/ppp/PKGBUILD b/core/ppp/PKGBUILD index 0489a38bf..41fdb183d 100644 --- a/core/ppp/PKGBUILD +++ b/core/ppp/PKGBUILD @@ -1,22 +1,16 @@ -# $Id: PKGBUILD 187039 2013-06-03 11:15:31Z allan $ +# $Id: PKGBUILD 188198 2013-06-12 15:53:29Z thomas $ # Maintainer: Thomas Baechler <thomas@archlinux.org> pkgname=ppp pkgver=2.4.5 -pkgrel=6 +pkgrel=7 pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking" arch=(i686 x86_64) url="http://www.samba.org/ppp/" license=('custom:GPL/BSD') -groups=('base') depends=('glibc' 'libpcap>=1.0.0') -backup=(etc/ppp/{chap-secrets,pap-secrets,options,ip-up,ip-down}) +backup=(etc/ppp/{chap-secrets,pap-secrets,options,ip-up,ip-down,ip-down.d/00-dns.sh,ip-up.d/00-dns.sh,ipv6-up.d/00-iface-config.sh}) source=(ftp://ftp.samba.org/pub/ppp/ppp-${pkgver}.tar.gz options - pon - poff - ppp - plog - pon.1 ip-up ip-down ip-up.d.dns.sh @@ -27,19 +21,14 @@ source=(ftp://ftp.samba.org/pub/ppp/ppp-${pkgver}.tar.gz ppp.systemd) md5sums=('4621bc56167b6953ec4071043fe0ec57' '7a9259a8f038073eeea7e4552ff1849f' - '48c024f73a80c8b69c4def22f86902cc' - '2d811f8470ccdea3b8c4505a438483e9' - '7561c73b557292d5ba1a9c5dbd270fde' - '86cdaf133f7a79fb464f02d83afc7734' - '44cc662ba9aa61dd9add3ddd4c5ded57' 'e4beb16ed600b61336d50b2bd2df7cd5' '529b924f644f80cf30d72a966abc7419' - '4a074d74c29625b254a1db720cb87b99' - '8d1be5af8e46393ba6eb273377831e38' + '0a79f6427e28426d42b76f7207c531e1' + '3a5d56ac23e36cdbf48187813c8ec981' '4cbd0a9af01c27067450ec7d3f5fa673' 'b75c2fbc4afa9f2d8108b680c88c7036' '9dde53aa5a931ebe1c7e3469199777c5' - 'fafead5c9d66d0574e6f0a2e5f4d4631') + '37401eb0c3dcccb87f5ac4716d0f9f2c') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -81,13 +70,12 @@ package() { install -d -m755 "${pkgdir}/etc/ppp/ipv6-up.d" install -d -m755 "${pkgdir}/etc/ppp/ipv6-down.d" install -m755 ../ipv6-up.d.iface-config.sh "${pkgdir}/etc/ppp/ipv6-up.d/00-iface-config.sh" - install -D -m755 ../pon "${pkgdir}/usr/bin/pon" - install -D -m755 ../poff "${pkgdir}/usr/bin/poff" - install -D -m755 ../plog "${pkgdir}/usr/sbin/plog" + install -D -m755 scripts/pon "${pkgdir}/usr/bin/pon" + install -D -m755 scripts/poff "${pkgdir}/usr/bin/poff" + install -D -m755 scripts/plog "${pkgdir}/usr/sbin/plog" + install -D -m644 scripts/pon.1 "${pkgdir}/usr/share/man/man1/pon.1" install -D -m600 etc.ppp/pap-secrets "${pkgdir}/etc/ppp/pap-secrets" install -D -m600 etc.ppp/chap-secrets "${pkgdir}/etc/ppp/chap-secrets" - install -D -m755 ${srcdir}/ppp "${pkgdir}/etc/rc.d/ppp" - install -D -m644 ${srcdir}/pon.1 "${pkgdir}/usr/share/man/man1/pon.1" install -d -m755 "${pkgdir}/etc/ppp/peers" chmod 0755 "${pkgdir}/usr/lib/pppd/${pkgver}"/*.so install -D -m644 "${srcdir}"/ppp.systemd "${pkgdir}"/usr/lib/systemd/system/ppp@.service diff --git a/core/ppp/ip-down.d.dns.sh b/core/ppp/ip-down.d.dns.sh index 9e19f7d1b..c9da47a63 100644 --- a/core/ppp/ip-down.d.dns.sh +++ b/core/ppp/ip-down.d.dns.sh @@ -1,3 +1,7 @@ #!/bin/sh -[ -e /etc/resolv.conf.backup.${IFNAME} ] && mv /etc/resolv.conf.backup.${IFNAME} /etc/resolv.conf +if [ -x /usr/bin/resolvconf ]; then + /usr/bin/resolvconf -fd ${IFNAME} +else + [ -e /etc/resolv.conf.backup.${IFNAME} ] && mv /etc/resolv.conf.backup.${IFNAME} /etc/resolv.conf +fi diff --git a/core/ppp/ip-up.d.dns.sh b/core/ppp/ip-up.d.dns.sh index f9df543a4..47e4ca41f 100644 --- a/core/ppp/ip-up.d.dns.sh +++ b/core/ppp/ip-up.d.dns.sh @@ -1,7 +1,11 @@ #!/bin/sh if [ "$USEPEERDNS" = "1" -a -f /etc/ppp/resolv.conf ]; then - [ -e /etc/resolv.conf ] && mv /etc/resolv.conf /etc/resolv.conf.backup.${IFNAME} - mv /etc/ppp/resolv.conf /etc/resolv.conf - chmod 644 /etc/resolv.conf + if [ -x /usr/bin/resolvconf ]; then + /usr/bin/resolvconf -a ${IFNAME} </etc/ppp/resolv.conf + elif + [ -e /etc/resolv.conf ] && mv /etc/resolv.conf /etc/resolv.conf.backup.${IFNAME} + mv /etc/ppp/resolv.conf /etc/resolv.conf + chmod 644 /etc/resolv.conf + fi fi diff --git a/core/ppp/plog b/core/ppp/plog deleted file mode 100644 index 84d2c7340..000000000 --- a/core/ppp/plog +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if [ -s /var/log/ppp.log ]; then - exec tail "$@" /var/log/ppp.log -else - exec tail "$@" /var/log/syslog | grep ' \(pppd\|chat\)\[' -fi diff --git a/core/ppp/poff b/core/ppp/poff deleted file mode 100644 index 8b4dffc59..000000000 --- a/core/ppp/poff +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/sh - -# Written by John Hasler <john@dhh.gt.org> and based on work -# by Phil Hands <phil@hands.com>. Distributed under the GNU GPL - -if [ -x /usr/bin/kill ]; then - KILL="/usr/bin/kill" -else - KILL="/bin/kill" -fi -SIG=TERM -DONE="stopped" -MODE="" - -usage () -{ - cat <<!EOF! -usage: $0 [option] [provider] -options: - -r Cause pppd to drop the line and redial. - -d Toggle the state of pppd's debug option. - -c Cause pppd to renegotiate compression. - -a Stop all pppd's. 'provider' will be ignored. - -h Print this help summary and exit. - -v Print version and exit. - none Stop pppd. - -Options may not be combined. - -If 'provider' is omitted pppd will be stopped or signalled if and only if -there is exactly one running unless the '-a' option was given. If -'provider' is supplied the pppd controlling the connection to that -provider will be stopped or signalled. -!EOF! -} - -# Get option. If there are none replace the "?" that getopts puts in -# FLAG on error with "null". -getopts rdcavh FLAG -if [ "$?" -ne 0 ]; then - FLAG="null" -fi - -# Check for additional options. Should be none. -getopts :rdcavh DUMMY -if [ "$?" -eq 0 ]; then - echo "$0: Illegal option -- ${OPTARG}." - exit 1 -fi - -case $FLAG in - "r") SIG=HUP; DONE=signalled; shift ;; - "d") SIG=USR1; DONE=signalled; shift ;; - "c") SIG=USR2; DONE=signalled; shift ;; - "a") MODE="all"; shift ;; - "v") echo "$0$Revision: 1.1 $_TrickToPrint_RCS_Revision"; exit 0 ;; - "h") usage; exit 0 ;; - "?") exit 1; -esac - -# Get the PIDs of all the pppds running. Could also get these from -# /var/run, but pppd doesn't create .pid files until ppp is up. -PIDS=`pidof pppd` - -# poff is pointless if pppd isn't running. -if test -z "$PIDS"; then - echo "$0: No pppd is running. None ${DONE}." - exit 1 -fi - -# Find out how many pppd's are running. -N=`echo "$PIDS" | wc -w` - -# If there are no arguments we can't do anything if there is more than one -# pppd running. -if test "$#" -eq 0 -a "$N" -gt 1 -a $FLAG != "a" ; then - echo "$0: More than one pppd running and no "-a" option and -no arguments supplied. Nothing ${DONE}." - exit 1 -fi - -# If either there are no arguments or '-a' was specified kill all the -# pppd's. -if test "$#" -eq 0 -o "$MODE" = "all" ; then - $KILL -$SIG $PIDS || { - echo "$0: $KILL failed. None ${DONE}." - exit 1 - } - exit 0 -fi - -# There is an argument, so kill the pppd started on that provider. -PID=`ps axw | grep "[ /]pppd call $1 *\$" | awk '{print $1}'` -if test -n "$PID" ; then - $KILL -$SIG $PID || { - echo "$0: $KILL failed. None ${DONE}." - exit 1 - } -else - echo "$0: I could not find a pppd process for provider '$1'. None ${DONE}." - exit 1 -fi -exit 0 diff --git a/core/ppp/pon b/core/ppp/pon deleted file mode 100644 index 36885050b..000000000 --- a/core/ppp/pon +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -case "$1" in - -*) echo " -Usage: pon [provider] [arguments] - -If you specify one argument, a PPP connection will be started using -settings from the appropriate file in the /etc/ppp/peers/ directory, and -any additional arguments supplied will be passed as extra arguments to -pppd. -" - exit 0 - ;; -esac - -if [ -z "$1" -a ! -f /etc/ppp/peers/provider ]; then - echo " -Please configure /etc/ppp/peers/provider or use a command line argument to -use another file in /etc/ppp/peers/ directory. -" - exit 1 -fi - -if [ "$1" -a ! -f "/etc/ppp/peers/$1" ]; then - echo " -The file /etc/ppp/peers/$1 does not exist. -" - exit 1 -fi - -exec /usr/sbin/pppd call ${@:-provider} - diff --git a/core/ppp/pon.1 b/core/ppp/pon.1 deleted file mode 100644 index bb3220564..000000000 --- a/core/ppp/pon.1 +++ /dev/null @@ -1,121 +0,0 @@ -.\" This manual is published under the GPL. -.\" All guidelines specified in the GPL apply here. -.\" To get an ascii file: -.\" groff -man -Tascii pon.1 > pon.txt -.\" -.TH PON 1 "July 2000" "Debian Project" "Debian PPPD" -.SH NAME -pon, poff, plog \- starts up, shuts down or lists the log of PPP connections -.SH SYNOPSIS -.B pon -[ isp-name [ options ] ] -.br -.B poff -[ -r ] [ -d ] [ -c ] [ -a ] [ -h ] [ isp-name ] -.br -.B plog -[ arguments ] -.SH DESCRIPTION -This manual page describes the \fBpon\fP, \fBplog\fP and \fBpoff\fP -scripts, which allow users to control PPP connections. -.. -.SS pon -\fBpon\fP, invoked without arguments, runs the \fI/etc/ppp/ppp_on_boot\fP -file, if it exists and is executable. Otherwise, a PPP connection will be -started using configuration from \fI/etc/ppp/peers/provider\fP. -This is the default behaviour unless an \fBisp-name\fP argument is given. -.PP -For instance, to use ISP configuration "myisp" run: -.IP -pon myisp -.PP -\fBpon\fP will then use the options file \fI/etc/ppp/peers/myisp\fP. -You can pass additional \fBoptions\fP after the ISP name, too. -\fBpon\fP can be used to run multiple, simultaneous PPP connections. -.. -.SS poff -\fBpoff\fP closes a PPP connection. If more than one PPP connection exists, -the one named in the argument to \fBpoff\fP will be killed, e.g. -.IP -poff myprovider2 -.PP -will terminate the connection to myprovider2, and leave the PPP connections -to e.g. "myprovider1" or "myprovider3" up and running. -.PP -\fBpoff\fP takes the following command line options: -.RS -.TP -.B "\-r" -causes the connection to be redialed after it is dropped. -.TP -.B "\-d" -toggles the state of pppd's debug option. -.TP -.B "\-c" -causes -.BR pppd (8) -to renegotiate compression. -.TP -.B "\-a" -stops all running ppp connections. If the argument \fBisp-name\fP -is given it will be ignored. -.TP -.B "\-h" -displays help information. -.TP -.B "\-v" -prints the version and exits. -.PP -If no argument is given, \fBpoff\fP will stop or signal pppd if and only -if there is exactly one running. If more than one connection is active, -it will exit with an error code of 1. -.. -.SS plog -\fBplog\fP shows you the last few lines of \fI/var/log/ppp.log\fP. If that -file doesn't exist, it shows you the last few lines of your -\fI/var/log/syslog\fP file, but excluding the lines not generated by pppd. -This script makes use of the -.BR tail (1) -command, so arguments that can be passed to -.BR tail (1) -can also be passed to \fBplog\fP. -.PP -Note: the \fBplog\fP script can only be used by root or another system -administrator in group "adm", due to security reasons. Also, to have all -pppd-generated information in one logfile, that plog can show, you need the -following line in your \fI/etc/syslog.conf\fP file: -.PP -local2.* -/var/log/ppp.log -.RE -.SH FILES -.TP -.I /etc/ppp/options -PPPd system options file. -.TP -.I /etc/ppp/pap-secrets -System PAP passwords file. -.TP -.I /etc/ppp/chap-secrets -System CHAP passwords file. -.TP -.I /etc/ppp/peers/ -Directory holding the peer options files. The default file is called -\fIprovider\fP. -.TP -.I /etc/chatscripts/provider -The chat script invoked from the default \fI/etc/ppp/peers/provider\fP. -.TP -.I /var/log/ppp.log -The default PPP log file. -.SH AUTHORS -The p-commands were written by Christoph Lameter <clameter@debian.org>. -Updated and revised by Philip Hands <phil@hands.com>. -.br -This manual was written by Othmar Pasteka <othmar@tron.at>. Modified -by Rob Levin <lilo@openprojects.net>, with some extensions taken from -the old p-commands manual written by John Hasler <jhasler@debian.org>. -.SH "SEE ALSO" -.BR pppd (8), -.BR chat (8), -.BR tail (1). - diff --git a/core/ppp/ppp b/core/ppp/ppp deleted file mode 100644 index 16e01bad7..000000000 --- a/core/ppp/ppp +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/pppd` -case "$1" in - start) - stat_busy "Starting PPP daemon" - [ -z "$PID" ] && /usr/bin/pon - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon ppp - stat_done - fi - ;; - stop) - stat_busy "Stopping PPP daemon" - [ ! -z "$PID" ] && poff -a &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon ppp - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/core/ppp/ppp.systemd b/core/ppp/ppp.systemd index a5c490a73..8a963af74 100644 --- a/core/ppp/ppp.systemd +++ b/core/ppp/ppp.systemd @@ -3,7 +3,7 @@ Description=PPP link to %I Before=network.target [Service] -ExecStart=/usr/sbin/pppd call %I nodetach +ExecStart=/usr/sbin/pppd call %I nodetach nolog [Install] WantedBy=multi-user.target diff --git a/extra/libxkbcommon/PKGBUILD b/extra/libxkbcommon/PKGBUILD index ae4d1bdff..1d4c5811d 100644 --- a/extra/libxkbcommon/PKGBUILD +++ b/extra/libxkbcommon/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 181161 2013-04-01 20:10:49Z heftig $ +# $Id: PKGBUILD 188191 2013-06-12 13:53:24Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Daniel Micay <danielmicay@gmail.com> # Contributor: Mladen Pejakovic <pejakm@gmail.com> pkgname=libxkbcommon -pkgver=0.3.0 +pkgver=0.3.1 pkgrel=1 pkgdesc="Keyboard handling library using XKB data" arch=(i686 x86_64) @@ -14,7 +14,8 @@ depends=(xkeyboard-config) makedepends=(doxygen xorg-util-macros) options=('!libtool') source=("http://xkbcommon.org/download/$pkgname-$pkgver.tar.xz") -md5sums=('22a046100738f99b4cc0297aa210f4e4') +#source=("$pkgname-$pkgver::git://github.com/xkbcommon/$pkgname.git") +md5sums=('7287ea51df79c0f80e92b970a30b95e9') build() { cd $pkgname-$pkgver diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index 2b794f481..30aa977a8 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186427 2013-05-26 09:26:08Z bluewind $ +# $Id: PKGBUILD 188189 2013-06-12 11:20:08Z bpiotrowski $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=subversion -pkgver=1.7.9 -pkgrel=6 +pkgver=1.7.10 +pkgrel=1 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64') license=('APACHE') @@ -25,7 +25,7 @@ source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2 #{,.as svnserve.tmpfiles svnserve.service subversion.rpath.fix.patch) -md5sums=('8d532025771a67c06c23f299699f056f' +md5sums=('4088a77e14232876c9b4ff1541e6e200' 'a0db6dd43af33952739b6ec089852630' 'c459e299192552f61578f3438abf0664' 'bb2857eceafcfac35dde39dcffad2314' diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD index faf3f61c8..47a80be3c 100644 --- a/extra/webkitgtk/PKGBUILD +++ b/extra/webkitgtk/PKGBUILD @@ -1,31 +1,23 @@ -# $Id: PKGBUILD 187877 2013-06-07 17:10:54Z heftig $ +# $Id: PKGBUILD 188207 2013-06-12 20:16:30Z heftig $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=webkitgtk -pkgver=2.0.2 -pkgrel=3 +pkgver=2.0.3 +pkgrel=1 pkgdesc="GTK+ Web content engine library" arch=(i686 x86_64) url="http://webkitgtk.org/" license=(custom) -depends=(libxt libxslt sqlite libsoup enchant libgl geoclue gtk3 gst-plugins-base-libs libsecret libwebp - harfbuzz-icu) +depends=(libxt libxslt sqlite libsoup enchant libgl geoclue gtk3 gst-plugins-base-libs + libsecret libwebp harfbuzz-icu) makedepends=(gtk2 gperf gobject-introspection python mesa ruby gtk-doc) -optdepends=('gtk2: Webkit2 plugin support') -conflicts=(webkitgtk3 libwebkit3) +optdepends=('gtk2: Netscape plugin support') provides=("webkitgtk3=${pkgver}" "libwebkit3=${pkgver}") +conflicts=(webkitgtk3 libwebkit3) replaces=(webkitgtk3 libwebkit3) options=(!libtool !emptydirs) -source=(http://webkitgtk.org/releases/$pkgname-${pkgver}.tar.xz - changeset_150963.diff) -sha256sums=('c3685032545eb4c23f3f56826817783a6963ad59bd7bbf806705059b3d8caeb2' - '8d2542600cba876b714cdf6be478d847b6672bff2856e6e6d0582b1566fe5764') - -prepare() { - cd $pkgname-$pkgver - patch -Np2 -i ../changeset_150963.diff - autoreconf -fi -I Source/autotools -} +source=(http://webkitgtk.org/releases/$pkgname-${pkgver}.tar.xz) +sha256sums=('9bf8a32afbf087c4fc2c652b193a52c44b180735ba9c7c8db88137904d458e1b') build() { cd $pkgname-$pkgver diff --git a/extra/webkitgtk/changeset_150963.diff b/extra/webkitgtk/changeset_150963.diff deleted file mode 100644 index d56c1c729..000000000 --- a/extra/webkitgtk/changeset_150963.diff +++ /dev/null @@ -1,30 +0,0 @@ -2013-05-30 Alberto Garcia <agarcia@igalia.com> - -[GTK] Needs to check for harfbuzz-icu -https://bugs.webkit.org/show_bug.cgi?id=116978 - -Reviewed by Xan Lopez. - -HarfBuzz 0.9.18 splits harbuzz-icu into a separate library so we -also need to check for it in order to get the necessary flags for -the compiler and the linker. - -We keep this conditional for now since we still want to support -earlier versions of HarfBuzz. - -Index: /trunk/Source/autotools/FindDependencies.m4 -=================================================================== ---- /trunk/Source/autotools/FindDependencies.m4 (revision 150962) -+++ /trunk/Source/autotools/FindDependencies.m4 (revision 150963) -@@ -376,4 +376,11 @@ - [cairo-ft fontconfig >= fontconfig_required_version freetype2 >= freetype2_required_version harfbuzz >= harfbuzz_required_version]) - fi -+# HarfBuzz 0.9.18 splits harbuzz-icu into a separate library. -+# Since we support earlier HarfBuzz versions we keep this conditional for now. -+if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then -+ PKG_CHECK_MODULES(HARFBUZZ_ICU, harfbuzz-icu >= $harfbuzz_required_version) -+ FREETYPE_CFLAGS+=" $HARFBUZZ_ICU_CFLAGS" -+ FREETYPE_LIBS+=" $HARFBUZZ_ICU_LIBS" -+fi - AC_SUBST([FREETYPE_CFLAGS]) - AC_SUBST([FREETYPE_LIBS]) diff --git a/extra/webkitgtk/python3.patch b/extra/webkitgtk/python3.patch deleted file mode 100644 index efd640043..000000000 --- a/extra/webkitgtk/python3.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/Tools/gtk/generate-feature-defines-files b/Tools/gtk/generate-feature-defines-files -index 1a92bf50a05831655308cb62646eb05a6db4b63c..f5b2c7e61eab12bf0eb25b0f9c595f2fd83ebbe9 100755 ---- a/Tools/gtk/generate-feature-defines-files -+++ b/Tools/gtk/generate-feature-defines-files -@@ -32,13 +32,13 @@ def write_file_if_contents_changed(filename, contents): - - def write_feature_defines_header(feature_defines): - contents = '' -- for (feature, value) in feature_defines.iteritems(): -+ for (feature, value) in feature_defines.items(): - contents += '#define {0} {1}\n'.format(feature, value) - write_file_if_contents_changed("WebKitFeatures.h", contents) - - def write_flattened_feature_defines_file(feature_defines): - contents = '' -- for (feature, value) in feature_defines.iteritems(): -+ for (feature, value) in feature_defines.items(): - contents += '{0}={1}\n'.format(feature, value) - write_file_if_contents_changed("WebKitFeatures.txt", contents) - diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index 8a3f13e9e..946bce8bd 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 188105 2013-06-09 20:39:09Z guillaume $ +# $Id: PKGBUILD 188206 2013-06-12 20:04:04Z 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.10.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('GPL2') -makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' +makedepends=('bison' 'flex' 'gtk3' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'lua51' 'python') url='http://www.wireshark.org/' options=(!libtool) @@ -36,7 +36,8 @@ build() { --prefix=/usr \ --with-ssl \ --with-zlib=yes \ - --with-lua + --with-lua \ + --with-gtk3=yes make all } @@ -66,7 +67,7 @@ package_wireshark-cli() { package_wireshark-gtk() { pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - GTK frontend' - depends=('gtk2' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme') + depends=('gtk3' 'wireshark-cli' 'desktop-file-utils' 'hicolor-icon-theme') install=wireshark-gtk.install replaces=(wireshark) conflicts=(wireshark) diff --git a/extra/xf86-video-modesetting/PKGBUILD b/extra/xf86-video-modesetting/PKGBUILD index 98ba58173..d443a228b 100644 --- a/extra/xf86-video-modesetting/PKGBUILD +++ b/extra/xf86-video-modesetting/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180914 2013-03-27 23:14:30Z andyrtr $ +# $Id: PKGBUILD 188204 2013-06-12 19:08:23Z lcarlier $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> pkgname=xf86-video-modesetting -pkgver=0.7.0 +pkgver=0.8.0 pkgrel=1 pkgdesc="X.org generic modesetting video driver" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ groups=('xorg-drivers' 'xorg') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('2bc55f776eaee7b4e13df13238d36c4facf1cdca095a11519baf2376f5c996ac') +sha256sums=('13dc349e9aa50987ab2479d27d6879cda2c1f9ad8c8d3a1422a2f53c36f047f8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-nouveau/PKGBUILD b/extra/xf86-video-nouveau/PKGBUILD index 5de63e725..c3a3570fb 100644 --- a/extra/xf86-video-nouveau/PKGBUILD +++ b/extra/xf86-video-nouveau/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180916 2013-03-27 23:16:59Z andyrtr $ +# $Id: PKGBUILD 188202 2013-06-12 18:59:24Z lcarlier $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: buddabrod <buddabrod@gmail.com> pkgname=xf86-video-nouveau -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=1 pkgdesc="Open Source 2D acceleration driver for nVidia cards" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ groups=('xorg-drivers' 'xorg') options=('!libtool') install=$pkgname.install source=(http://xorg.freedesktop.org/archive/individual/driver/$pkgname-$pkgver.tar.bz2) -sha256sums=('d187c658e1823ca829c941f3f601f8e7220d427e079c3e52b94ecff45bc2e131') +sha256sums=('9b904314b8e9c7a5800724a6a31038ed88fa3fcfd35da6f4015fc104c8283617') build() { cd $pkgname-$pkgver diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index ca6fbb0fa..3ea34ec08 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186437 2013-05-26 15:22:24Z tpowa $ +# $Id: PKGBUILD 188067 2013-06-08 08:17:48Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.9 -pkgver=${_basekernel}.4 +pkgver=${_basekernel}.5 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,7 +22,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('120df29f88622dabf7015a22c7cc8e25' - 'ae8a4997bfa4a6b9acfd0cefbb6e9aa0' + '558743403ba219c51570d29e03d362d5' '7985f1e2cdb6838cf89bd85c0229db6a' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' @@ -117,14 +117,16 @@ _package() { # add vmlinux install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux" - # install fallback mkinitcpio.conf file and preset file for kernel - install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" - # set correct depmod command for install + cp -f "${startdir}/${install}" "${startdir}/${install}.pkg" + true && install=${install}.pkg sed \ -e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \ -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \ - -i "${startdir}/${pkgbase}.install" + -i "${startdir}/${install}" + + # install mkinitcpio preset file for kernel + install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" sed \ -e "1s|'linux*.*'|'${pkgbase}'|" \ -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \ diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install index a5e974c9b..4fcf06d11 100644 --- a/kernels/linux-libre-pae/linux-libre-pae.install +++ b/kernels/linux-libre-pae/linux-libre-pae.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-pae -KERNEL_VERSION=3.9.4-1-LIBRE-PAE +KERNEL_VERSION= # 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/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 7ae0ec08c..2291b6f45 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186437 2013-05-26 15:22:24Z tpowa $ +# $Id: PKGBUILD 188067 2013-06-08 08:17:48Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.9 -pkgver=${_basekernel}.4 +pkgver=${_basekernel}.5 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,7 +22,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('120df29f88622dabf7015a22c7cc8e25' - 'ae8a4997bfa4a6b9acfd0cefbb6e9aa0' + '558743403ba219c51570d29e03d362d5' '8cc2a43c771d0fbb652c8264c746c007' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' @@ -117,14 +117,16 @@ _package() { # add vmlinux install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux" - # install fallback mkinitcpio.conf file and preset file for kernel - install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" - # set correct depmod command for install + cp -f "${startdir}/${install}" "${startdir}/${install}.pkg" + true && install=${install}.pkg sed \ -e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \ -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \ - -i "${startdir}/${pkgbase}.install" + -i "${startdir}/${install}" + + # install mkinitcpio preset file for kernel + install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" sed \ -e "1s|'linux*.*'|'${pkgbase}'|" \ -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \ diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index 2bde797ef..4b7373be1 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.9.4-1-LIBRE-XEN +KERNEL_VERSION= # 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/abiword-libre/PKGBUILD b/libre/abiword-libre/PKGBUILD index 248da54c7..30ef5cec2 100644 --- a/libre/abiword-libre/PKGBUILD +++ b/libre/abiword-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgbase=abiword pkgbase=abiword-libre pkgname=('abiword-libre' 'abiword-libre-plugins') pkgver=2.8.6 -pkgrel=9 +pkgrel=9.1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.abisource.com" diff --git a/libre/spectrwm-libre/PKGBUILD b/libre/spectrwm-libre/PKGBUILD index d873da4f7..27758d8a0 100644 --- a/libre/spectrwm-libre/PKGBUILD +++ b/libre/spectrwm-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id$ +# $Id: PKGBUILD 92647 2013-06-10 15:12:25Z bpiotrowski $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> _pkgname=spectrwm pkgname=spectrwm-libre -pkgver=2.2.0 +pkgver=2.3.0 pkgrel=1 pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way, without nonfree profont support" arch=('i686' 'x86_64' 'mips64el') @@ -21,7 +21,7 @@ backup=(etc/spectrwm.conf) source=(http://opensource.conformal.com/snapshots/$_pkgname/$_pkgname-$pkgver.tgz \ LICENSE \ baraction.sh) -md5sums=('c572727b5fb9fe3674c03a7e51d191c4' +md5sums=('7698a5b219fdabad07a76ef45b1360d1' 'a67cfe51079481e5b0eab1ad371379e3' '950d663692e1da56e0ac864c6c3ed80e') @@ -56,8 +56,8 @@ package() { 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" + #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" diff --git a/pcr/triceratops-lv2/PKGBUILD b/pcr/triceratops-lv2/PKGBUILD index ff02793aa..db8b7b101 100644 --- a/pcr/triceratops-lv2/PKGBUILD +++ b/pcr/triceratops-lv2/PKGBUILD @@ -1,16 +1,17 @@ # Maintainer: Guest One <theguestone at gmail dot com> pkgname=triceratops-lv2 -pkgver=0.1.6c +pkgver=0.1.7 pkgrel=1 pkgdesc="Polyphonic synthesizer LV2 plugin" -arch=('i686') -url="http://sourceforge.net/projects/triceratops/" +arch=('i686' 'x86_64') +url="http://deliriumdecrypted.blogspot.com/" license=('GPL') +groups=('lv2-plugins') depends=('gtkmm' 'lv2') makedepends=('python2') source=("http://downloads.sourceforge.net/project/${pkgname/-lv2}/$pkgname-v$pkgver.tar.gz") -md5sums=('7a0755876c4d3af6f1b4cac899679472') +md5sums=('b4f058c30b3b218bd21dbaa04430dd8b') build() { cd "$srcdir/$pkgname-v$pkgver" |