From f37cbd892db45b858a9a876c3aea2f007803b7e1 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 6 Jul 2013 01:37:35 -0700 Subject: Sat Jul 6 01:36:25 PDT 2013 --- community/aspell-pl/PKGBUILD | 15 ++--- community/cgoban/PKGBUILD | 27 +++++++++ community/cromfs/PKGBUILD | 34 +++++++++++ community/cromfs/make-generic.patch | 25 ++++++++ community/libvirt/PKGBUILD | 12 ++-- community/openbox/PKGBUILD | 70 +++++++++++----------- community/openbox/movesize.patch | 19 ------ ...5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch | 28 +++++++++ .../openbox/openbox-3.5.0-title-matching.patch | 11 ++++ community/openbox/openbox-3.5.0-which-2.20.patch | 11 ++++ community/openbox/openbox.install | 4 -- community/openbox/title-matching.patch | 11 ---- community/openbox/which-2.20.patch | 11 ---- community/paps/PKGBUILD | 27 +++++++++ community/percona-server/PKGBUILD | 6 +- community/rxvt-unicode/PKGBUILD | 40 ++++++++----- community/scite/PKGBUILD | 6 +- community/thttpd/PKGBUILD | 67 +++++++++++++++++++++ community/thttpd/config | 7 +++ community/thttpd/discreet.patch | 34 +++++++++++ community/thttpd/forwarded-for.patch | 16 +++++ community/thttpd/getline.patch | 21 +++++++ community/thttpd/logrotate.d | 12 ++++ community/thttpd/service | 10 ++++ community/virtualbox-modules-lts/PKGBUILD | 34 +++++------ .../virtualbox-guest-modules-lts.install | 13 ++-- .../virtualbox-host-modules-lts.install | 13 ++-- community/virtualbox-modules/PKGBUILD | 6 +- 28 files changed, 446 insertions(+), 144 deletions(-) create mode 100644 community/cgoban/PKGBUILD create mode 100644 community/cromfs/PKGBUILD create mode 100644 community/cromfs/make-generic.patch delete mode 100644 community/openbox/movesize.patch create mode 100644 community/openbox/openbox-3.5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch create mode 100644 community/openbox/openbox-3.5.0-title-matching.patch create mode 100644 community/openbox/openbox-3.5.0-which-2.20.patch delete mode 100644 community/openbox/openbox.install delete mode 100644 community/openbox/title-matching.patch delete mode 100644 community/openbox/which-2.20.patch create mode 100644 community/paps/PKGBUILD create mode 100644 community/thttpd/PKGBUILD create mode 100644 community/thttpd/config create mode 100644 community/thttpd/discreet.patch create mode 100644 community/thttpd/forwarded-for.patch create mode 100644 community/thttpd/getline.patch create mode 100644 community/thttpd/logrotate.d create mode 100644 community/thttpd/service (limited to 'community') diff --git a/community/aspell-pl/PKGBUILD b/community/aspell-pl/PKGBUILD index 3b0df74f5..fb512bfd4 100644 --- a/community/aspell-pl/PKGBUILD +++ b/community/aspell-pl/PKGBUILD @@ -1,29 +1,26 @@ -# $Id: PKGBUILD 58727 2011-11-18 05:20:53Z bpiotrowski $ +# $Id: PKGBUILD 93578 2013-07-05 19:42:56Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Jaroslaw Swierczynski # Contributor: Arkadiusz Laczynski pkgname=aspell-pl -pkgver=20111117 +pkgver=20130705 pkgrel=1 -pkgdesc="Polish dictionary for aspell" +pkgdesc='Polish dictionary for aspell' arch=('i686' 'x86_64') url="http://www.sjp.pl/slownik/en/" license=('GPL' 'LGPL' 'MPL') depends=('aspell') -#source=(http://sjp.pl/slownik/ort/sjp-aspell6-pl-6.0_$pkgver-0.tar.bz2) source=(ftp://ftp.archlinux.org/other/community/$pkgname/sjp-aspell6-pl-6.0_$pkgver-0.tar.bz2) -md5sums=('27aa9ca734d7049238399c279c5417fb') +md5sums=('977708b770709d55909b23be2851af10') build() { - cd "$srcdir/aspell6-pl-6.0_$pkgver-0" - + cd aspell6-pl-6.0_$pkgver-0 ./configure make } package() { - cd "$srcdir/aspell6-pl-6.0_$pkgver-0" - + cd aspell6-pl-6.0_$pkgver-0 make DESTDIR="$pkgdir" install } diff --git a/community/cgoban/PKGBUILD b/community/cgoban/PKGBUILD new file mode 100644 index 000000000..0c16f3877 --- /dev/null +++ b/community/cgoban/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 93531 2013-07-05 01:29:22Z bisson $ +# Maintainer: Gaetan Bisson +# Contributor: Jason Chu +# Contributor: Tom Newsom + +pkgname=cgoban +pkgver=1.9.14 +pkgrel=2 +pkgdesc='SGF editor and client for connection to IGS' +url='http://sourceforge.net/projects/cgoban1/' +arch=('i686' 'x86_64') +license=('GPL2') +depends=('libxt') +source=("http://downloads.sourceforge.net/project/cgoban1/cgoban1/${pkgver}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('90bd53499c9f410caddaae601e7f00350d520a32') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + install -d "${pkgdir}"/usr/{bin,share/man/man6} + make DESTDIR="${pkgdir}" install +} diff --git a/community/cromfs/PKGBUILD b/community/cromfs/PKGBUILD new file mode 100644 index 000000000..2d3b2454a --- /dev/null +++ b/community/cromfs/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 93532 2013-07-05 01:31:34Z bisson $ +# Maintainer: Gaetan Bisson + +pkgname=cromfs +pkgver=1.5.10.1 +pkgrel=2 +arch=('i686' 'x86_64') +pkgdesc='Compressed read-only filesystem based on FUSE' +url='http://bisqwit.iki.fi/source/cromfs.html' +license=('GPL') +depends=('fuse' 'lzo2') +source=("http://bisqwit.iki.fi/src/arch/${pkgname}-${pkgver}.tar.gz" + 'make-generic.patch') +sha1sums=('3d591530ea3a6ed9b6b53b3fcccf9c7c021efd13' + 'ae51f1d2446df20bcbaef6ac125b1756177725d4') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../make-generic.patch +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -d "${pkgdir}"/usr/{bin,share/doc/cromfs} + install -m755 install/progs/* "${pkgdir}"/usr/bin/ + install -m644 install/docs/* "${pkgdir}"/usr/share/doc/cromfs/ +} diff --git a/community/cromfs/make-generic.patch b/community/cromfs/make-generic.patch new file mode 100644 index 000000000..6dff65efb --- /dev/null +++ b/community/cromfs/make-generic.patch @@ -0,0 +1,25 @@ +diff -Naur old/configure new/configure +--- old/configure 2012-04-11 09:33:55.000000000 +0200 ++++ new/configure 2012-04-11 12:05:07.098916602 +0200 +@@ -96,9 +96,9 @@ + fi + } + +-CFLAGS="" +-CPPFLAGS="" +-LDFLAGS="" ++CFLAGS="$CFLAGS" ++CPPFLAGS="$CXXFLAGS" ++LDFLAGS="$LDFLAGS" + OPTIM="" + + do_echo -n "Determining compiler version to use... " +@@ -451,6 +451,8 @@ + OPTIM="$OPTIM_BACKUP $BEST_CPUFEATURE" + fi + ++OPTIM="" ++ + do_echo "Updating Makefile.sets ..." + + if [ "$DEBUG" = "1" ]; then diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 3e4c3b6f8..473cc16a0 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 93317 2013-07-01 14:35:45Z spupykin $ +# $Id: PKGBUILD 93546 2013-07-05 10:38:11Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Jonathan Wiersma pkgname=libvirt pkgver=1.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') url="http://libvirt.org/" @@ -33,11 +33,13 @@ install="libvirt.install" source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd.conf.d libvirtd-guests.conf.d - libvirt.tmpfiles.d) + libvirt.tmpfiles.d + "storage-fix.patch::https://bugs.archlinux.org/index.php?getfile=10700") md5sums=('f980a84719033e9efca01048da505dfb' '3ed0e24f5b5e25bf553f5427d64915e6' '0a96ed876ffb1fcb9dff5a9b3a609c1e' - '020971887442ebbf1b6949e031c8dd3f') + '020971887442ebbf1b6949e031c8dd3f' + '321f03bd626d2d24e816d5298c3bc3fe') build() { cd "$srcdir/$pkgname-$pkgver" @@ -49,6 +51,8 @@ build() { sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file done + patch -p1 <$srcdir/storage-fix.patch + export LDFLAGS=-lX11 export RADVD=/usr/bin/radvd [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" --sbindir=/usr/bin \ diff --git a/community/openbox/PKGBUILD b/community/openbox/PKGBUILD index 47e6573b4..2443d6e7c 100644 --- a/community/openbox/PKGBUILD +++ b/community/openbox/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70588 2012-05-12 09:12:54Z bpiotrowski $ +# $Id: PKGBUILD 93576 2013-07-05 19:21:33Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Brad Fanella # Contributor: Andrea Scarpino @@ -6,52 +6,54 @@ pkgname=openbox pkgver=3.5.0 -pkgrel=7 -pkgdesc="A highly configurable and lightweight X11 window manager" +pkgrel=8 +pkgdesc='Highly configurable and lightweight X11 window manager' arch=('i686' 'x86_64') -url="http://openbox.org" +url='http://openbox.org' license=('GPL') depends=('startup-notification' 'libxml2' 'libxinerama' 'libxrandr' 'libxcursor' 'pango' 'imlib2') -optdepends=('pyxdg: for the xdg-autostart script') +optdepends=('python2: for the xdg-autostart script') groups=('lxde') -install=${pkgname}.install options=('!libtool') backup=('etc/xdg/openbox/menu.xml' 'etc/xdg/openbox/rc.xml') -source=(http://www.icculus.org/openbox/releases/${pkgname}-${pkgver}.tar.gz - which-2.20.patch - movesize.patch - title-matching.patch) +source=(http://www.icculus.org/openbox/releases/$pkgname-$pkgver.tar.gz + openbox-3.5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch + openbox-3.5.0-title-matching.patch + openbox-3.5.0-which-2.20.patch) md5sums=('00441b53cf14c03566c8e82643544ff9' - '7ca3b5244bb092d46f5bcf1e2bdf4a18' - 'e09d77842aac9a0cd7eebe112df88383' - '6f99711eee0b1c413dca9fa691917b71') + 'f2e5198a9dfc803c59fd42448a85f2da' + '0a11d7149da210a31ef88f8a9c717711' + '7ca3b5244bb092d46f5bcf1e2bdf4a18') -build() { - cd "${srcdir}"/${pkgname}-${pkgver} +prepare() { + cd $pkgname-$pkgver + + patch -Np1 -i "$srcdir"/openbox-3.5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch # FS#29812 + patch -Np1 -i "$srcdir"/openbox-3.5.0-title-matching.patch # OB#5277 + patch -Np1 -i "$srcdir"/openbox-3.5.0-which-2.20.patch # FS#11455 - patch -Np1 -i "${srcdir}"/which-2.20.patch # FS#11455 - patch -Np1 -i "${srcdir}"/movesize.patch # FS#29812 - patch -Np0 -i "${srcdir}"/title-matching.patch # FS#5277 on Openbox bugtracker + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ + data/autostart/openbox-xdg-autostart +} - sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ - data/autostart/openbox-xdg-autostart - - ./configure --prefix=/usr \ - --with-x \ - --enable-startup-notification \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/openbox - - make +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr \ + --with-x \ + --enable-startup-notification \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/openbox + make } package() { - cd "${srcdir}"/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + rm "$pkgdir"/usr/bin/{gdm-control,gnome-panel-control} - sed -i "s:startkde:/usr/bin/\0:" \ - "${pkgdir}"/usr/share/xsessions/openbox-kde.desktop - sed -i "s:=gnome-session:=/usr/bin/gnome-session:" \ - "${pkgdir}"/usr/share/xsessions/openbox-gnome.desktop + sed -i 's:startkde:/usr/bin/\0:' \ + "$pkgdir"/usr/share/xsessions/openbox-kde.desktop + sed -i 's:=gnome-session:=/usr/bin/gnome-session:' \ + "$pkgdir"/usr/share/xsessions/openbox-gnome.desktop } diff --git a/community/openbox/movesize.patch b/community/openbox/movesize.patch deleted file mode 100644 index 4f0e8595e..000000000 --- a/community/openbox/movesize.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- openbox-3.5.0/openbox/moveresize.c.orig 2011-08-01 21:14:58.000000000 +0100 -+++ openbox-3.5.0/openbox/moveresize.c 2012-03-28 20:04:36.100459920 +0100 -@@ -326,6 +326,16 @@ void moveresize_end(gboolean cancel) - #endif - } - -+ if (!moveresize_client) { -+ ob_debug("moveresize_end: moveresize_client is NULL!"); -+ return; -+ } -+ -+ if (!moveresize_in_progress) { -+ ob_debug("moveresize_end: moveresize_in_progress is FALSE!"); -+ return; -+ } -+ - /* don't use client_move() here, use the same width/height as - we've been using during the move, otherwise we get different results - when moving maximized windows between monitors of different sizes ! diff --git a/community/openbox/openbox-3.5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch b/community/openbox/openbox-3.5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch new file mode 100644 index 000000000..174482da4 --- /dev/null +++ b/community/openbox/openbox-3.5.0-Fix-crash-on-NET_WM_MOVERESIZE_CANCEL.patch @@ -0,0 +1,28 @@ +From 339c19d1b3a7a5139aed8b59bad755ddd0e518ff Mon Sep 17 00:00:00 2001 +From: Mikael Magnusson +Date: Sun, 3 Jun 2012 20:18:48 +0200 +Subject: [PATCH] Fix crash on unexpected NET_WM_MOVERESIZE_CANCEL messages + +gtk+ 3.4 apparently sends these randomly when you select text in a +GtkEntry. This also fixes bug #5460. +--- + openbox/event.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/openbox/event.c b/openbox/event.c +index b9ec1c5..4d091bf 100644 +--- a/openbox/event.c ++++ b/openbox/event.c +@@ -1495,7 +1495,8 @@ static void event_handle_client(ObClient *client, XEvent *e) + } + else if ((Atom)e->xclient.data.l[2] == + OBT_PROP_ATOM(NET_WM_MOVERESIZE_CANCEL)) +- moveresize_end(TRUE); ++ if (moveresize_client) ++ moveresize_end(TRUE); + } else if (msgtype == OBT_PROP_ATOM(NET_MOVERESIZE_WINDOW)) { + gint ograv, x, y, w, h; + +-- +1.7.10 + diff --git a/community/openbox/openbox-3.5.0-title-matching.patch b/community/openbox/openbox-3.5.0-title-matching.patch new file mode 100644 index 000000000..fdfe28af0 --- /dev/null +++ b/community/openbox/openbox-3.5.0-title-matching.patch @@ -0,0 +1,11 @@ +--- openbox-3.5.0/openbox/client.c 2011-08-01 22:14:58.000000000 +0200 ++++ openbox-3.5.0/openbox/client.c 2011-10-22 14:59:56.000000000 +0200 +@@ -883,7 +883,7 @@ + !g_pattern_match(app->role, + strlen(self->role), self->role, NULL)) + match = FALSE; +- else if (app->title && ++ else if (app->title && self->title && + !g_pattern_match(app->title, + strlen(self->title), self->title, NULL)) + match = FALSE; diff --git a/community/openbox/openbox-3.5.0-which-2.20.patch b/community/openbox/openbox-3.5.0-which-2.20.patch new file mode 100644 index 000000000..f947d6a98 --- /dev/null +++ b/community/openbox/openbox-3.5.0-which-2.20.patch @@ -0,0 +1,11 @@ +--- openbox-3.5.0/data/autostart/autostart.in~ 2011-08-02 15:50:01.963531310 +0000 ++++ openbox-3.5.0/data/autostart/autostart.in 2011-08-02 15:51:57.277879458 +0000 +@@ -8,7 +8,7 @@ + # + #if test -x @libexecdir@/gnome-settings-daemon >/dev/null; then + # @libexecdir@/gnome-settings-daemon & +-#elif which gnome-settings-daemon >/dev/null; then ++#elif which gnome-settings-daemon >/dev/null 2>&1; then + # gnome-settings-daemon & + #fi + diff --git a/community/openbox/openbox.install b/community/openbox/openbox.install deleted file mode 100644 index 762a3ef14..000000000 --- a/community/openbox/openbox.install +++ /dev/null @@ -1,4 +0,0 @@ -post_install() { - echo "Place menu.xml, rc.xml and autostart in ~/.config/openbox" - echo "They can be found in /etc/xdg/openbox" -} diff --git a/community/openbox/title-matching.patch b/community/openbox/title-matching.patch deleted file mode 100644 index 88ed73546..000000000 --- a/community/openbox/title-matching.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- openbox/client.c 2011-08-01 22:14:58.000000000 +0200 -+++ openbox/client.c 2011-10-22 14:59:56.000000000 +0200 -@@ -883,7 +883,7 @@ - !g_pattern_match(app->role, - strlen(self->role), self->role, NULL)) - match = FALSE; -- else if (app->title && -+ else if (app->title && self->title && - !g_pattern_match(app->title, - strlen(self->title), self->title, NULL)) - match = FALSE; diff --git a/community/openbox/which-2.20.patch b/community/openbox/which-2.20.patch deleted file mode 100644 index f947d6a98..000000000 --- a/community/openbox/which-2.20.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- openbox-3.5.0/data/autostart/autostart.in~ 2011-08-02 15:50:01.963531310 +0000 -+++ openbox-3.5.0/data/autostart/autostart.in 2011-08-02 15:51:57.277879458 +0000 -@@ -8,7 +8,7 @@ - # - #if test -x @libexecdir@/gnome-settings-daemon >/dev/null; then - # @libexecdir@/gnome-settings-daemon & --#elif which gnome-settings-daemon >/dev/null; then -+#elif which gnome-settings-daemon >/dev/null 2>&1; then - # gnome-settings-daemon & - #fi - diff --git a/community/paps/PKGBUILD b/community/paps/PKGBUILD new file mode 100644 index 000000000..e5d0721de --- /dev/null +++ b/community/paps/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 93533 2013-07-05 01:34:25Z bisson $ +# Maintainer: Gaetan Bisson +# Contributor: Artyom 'logus' Pervukhin +# Contributor: Tim Yang + +pkgname=paps +pkgver=0.6.8 +pkgrel=5 +pkgdesc='UTF-8 to PostScript converter via Pango' +url='http://paps.sourceforge.net/' +license=('LGPL') +depends=('pango') +arch=('i686' 'x86_64') +source=("http://downloads.sourceforge.net/paps/paps-${pkgver}.tar.gz") +sha1sums=('83646b0de89deb8321f260c2c5a665bc7c8f5928') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + export LDFLAGS=${LDFLAGS/,--as-needed/} + ./configure --prefix=/usr --mandir=/usr/share/man --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD index 2f7aef7df..67d824f5a 100644 --- a/community/percona-server/PKGBUILD +++ b/community/percona-server/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 91599 2013-05-25 10:17:47Z mtorromeo $ +# $Id: PKGBUILD 93544 2013-07-05 09:53:28Z mtorromeo $ # Maintainer: Massimiliano Torromeo pkgname=percona-server -pkgver=5.5.31_rel30.3 +pkgver=5.5.32_rel31.0 pkgrel=1 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation" arch=('i686' 'x86_64') @@ -97,7 +97,7 @@ package() { rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1 } -sha256sums=('808fea7fa2a10e61a3767819f4f9275afc8e5a66a7567b7b6d9e3bde2b79fce3' +sha256sums=('e34676cea5ceb398258408e31e8527724845f83bbbf1f22308f5069304118e8f' '82a241d9fa4032187a26597d044e94ba810b209b53a7ce14bb6eb92555993a48' '9bc66470f3f80534c0bb62f9f8325ccf60b164f421f74ad74a963f065d7b1869' 'badf6a701d9dc6ea3b4ddca26cb0f42b6236432ccdbc14c64962147802594a60') diff --git a/community/rxvt-unicode/PKGBUILD b/community/rxvt-unicode/PKGBUILD index d4c42a962..10c6751aa 100644 --- a/community/rxvt-unicode/PKGBUILD +++ b/community/rxvt-unicode/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 91706 2013-05-26 09:26:28Z bluewind $ +# $Id: PKGBUILD 93568 2013-07-05 17:54:59Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Angel Velasquez # Contributor: tobias # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org -pkgname=rxvt-unicode +pkgbase=rxvt-unicode +pkgname=('rxvt-unicode' 'rxvt-unicode-terminfo') pkgver=9.18 -pkgrel=5 -pkgdesc='An unicode enabled rxvt-clone terminal emulator (urxvt)' +pkgrel=7 arch=('i686' 'x86_64') url='http://software.schmorp.de/pkg/rxvt-unicode.html' license=('GPL') -depends=('libxft' 'perl' 'startup-notification') -optdepends=('gtk2-perl: to use the urxvt-tabbed') +makedepends=('libxft' 'perl' 'startup-notification') source=( "http://dist.schmorp.de/rxvt-unicode/$pkgname-$pkgver.tar.bz2" 'urxvt.desktop' @@ -32,6 +31,7 @@ prepare() { build() { cd $pkgname-$pkgver + # we disable smart-resize (FS#34807) ./configure \ --prefix=/usr \ --with-terminfo=/usr/share/terminfo \ @@ -49,7 +49,7 @@ build() { --enable-rxvt-scroll \ --enable-selectionscrolling \ --enable-slipwheeling \ - --enable-smart-resize \ + --disable-smart-resize \ --enable-startup-notification \ --enable-transparency \ --enable-unicode3 \ @@ -63,20 +63,30 @@ build() { make } -package() { - pushd $pkgname-$pkgver +package_rxvt-unicode() { + pkgdesc='An unicode enabled rxvt-clone terminal emulator (urxvt)' + depends=('rxvt-unicode-terminfo' 'libxft' 'perl' 'startup-notification') + optdepends=('gtk2-perl: to use the urxvt-tabbed') + + # install freedesktop menu + for _f in urxvt urxvtc urxvt-tabbed; do + install -Dm644 $_f.desktop "$pkgdir/usr/share/applications/$_f.desktop" + done + cd $pkgname-$pkgver # workaround terminfo installation - export TERMINFO="$pkgdir/usr/share/terminfo" + export TERMINFO="$srcdir/terminfo" install -d "$TERMINFO" make DESTDIR="$pkgdir" install # install the tabbing wrapper ( requires gtk2-perl! ) sed -i 's/\"rxvt\"/"urxvt"/' doc/rxvt-tabbed install -Dm 755 doc/rxvt-tabbed "$pkgdir/usr/bin/urxvt-tabbed" - popd - # install freedesktop menu - for _f in urxvt urxvtc urxvt-tabbed; do - install -Dm644 $_f.desktop "$pkgdir/usr/share/applications/$_f.desktop" - done +} + +package_rxvt-unicode-terminfo() { + pkgdesc='Terminfo files for urxvt' + conflict=('rxvt-unicode<=9.18-6') + install -dm 755 "$pkgdir/usr/share/" + mv terminfo "$pkgdir/usr/share/" } # vim:set ts=2 sw=2 et: diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD index f4e3a4b08..1bbd902dd 100644 --- a/community/scite/PKGBUILD +++ b/community/scite/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88149 2013-04-12 13:59:38Z arodseth $ +# $Id: PKGBUILD 93570 2013-07-05 18:26:15Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Thomas S Hatch # Contributor: Corrado 'bardo' Primier @@ -6,7 +6,7 @@ # Contributor: Daniel J Griffiths pkgname=scite -pkgver=3.3.1 +pkgver=3.3.3 pkgrel=1 pkgdesc='Editor with facilities for building and running programs' arch=('x86_64' 'i686') @@ -17,7 +17,7 @@ makedepends=('setconf') backup=('usr/share/scite/SciTEGlobal.properties') install="$pkgname.install" source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver//./}.tgz") -sha256sums=('96f1b74f728375e405a39f210b34dfabbbd2654b9c30ba886d8c3b4acbafc717') +sha256sums=('ee4d8e976d1a13657cb1b60af392cef60fbb2c441932e0398f2c9562fbcbe6a3') prepare() { if [ $?CXXBASEFLAGS == 1 ]; then diff --git a/community/thttpd/PKGBUILD b/community/thttpd/PKGBUILD new file mode 100644 index 000000000..9f645e7d1 --- /dev/null +++ b/community/thttpd/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 93534 2013-07-05 01:36:00Z bisson $ +# Maintainer: Gaetan Bisson +# Contributor: Damir Perisa +# Contributor: Stewart Starbuck + +pkgname=thttpd +pkgver=2.25b +pkgrel=10 +pkgdesc='Simple, small, portable, fast, and secure HTTP server' +url='http://www.acme.com/software/thttpd/' +license=('custom:BSD') +arch=('i686' 'x86_64') +backup=('etc/thttpd.conf') +source=("http://www.acme.com/software/thttpd/${pkgname}-${pkgver}.tar.gz" + 'forwarded-for.patch' + 'discreet.patch' + 'getline.patch' + 'logrotate.d' + 'service' + 'config') +sha1sums=('cd0e823233ad73e34ee1c9b871b01050feb9db52' + '1293fbaf83a489c65d6d2b107d797c687233d96a' + '1e73fca7d9ac2579da317f985c8666a181dc37c1' + '5ac14035a10b9155d813b363520e9aa74c5d91fc' + '36ffeefd1675ca4920605b1b5ca32dd5141a8f23' + '73bd76de0e89a9cc31e5605659837d83b3c8dfde' + '16640870a69cfc48021ee3acfea7c95834549d46') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../forwarded-for.patch + patch -p1 -i ../discreet.patch + patch -p1 -i ../getline.patch + echo 'mkv video/x-matroska' >> mime_types.txt +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + CPPFLAGS= ./configure --prefix=/usr --mandir=/usr/share/man + sed \ + -e 's/^CFLAGS =/CFLAGS +=/' \ + -e '/^STATICFLAG =/c STATICFLAG =' \ + -i Makefile */Makefile + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + install -d "${pkgdir}"/usr/share/man/man{1,8} + make \ + BINDIR="${pkgdir}"/usr/bin \ + WEBDIR="${pkgdir}"/srv/http \ + MANDIR="${pkgdir}"/usr/share/man \ + WEBGROUP=root install + + rm -fr "${pkgdir}"/srv + chown root:root -R "${pkgdir}" + chmod 755 -R "${pkgdir}"/usr/bin # strip needs u+w + + install -Dm644 ../config "${pkgdir}"/etc/thttpd.conf + install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/thttpd.service + install -Dm644 ../logrotate.d "${pkgdir}"/etc/logrotate.d/thttpd + + install -d "${pkgdir}"/var/log/thttpd + install -d "${pkgdir}"/usr/share/licenses/"${pkgname}" + head -n 26 thttpd.c > "${pkgdir}"/usr/share/licenses/"${pkgname}"/LICENSE +} diff --git a/community/thttpd/config b/community/thttpd/config new file mode 100644 index 000000000..6be17f1f7 --- /dev/null +++ b/community/thttpd/config @@ -0,0 +1,7 @@ +dir=/srv/http +vhost +user=http +cgipat=**.cgi +logfile=/var/log/thttpd/thttpd.log +pidfile=/var/run/thttpd.pid +charset=utf-8 diff --git a/community/thttpd/discreet.patch b/community/thttpd/discreet.patch new file mode 100644 index 000000000..b427ecc2c --- /dev/null +++ b/community/thttpd/discreet.patch @@ -0,0 +1,34 @@ +diff -Naur old/libhttpd.c new/libhttpd.c +--- old/libhttpd.c 2012-04-27 14:24:50.971711600 +0200 ++++ new/libhttpd.c 2012-04-27 14:33:24.559135581 +0200 +@@ -744,7 +744,7 @@ + (void) my_snprintf( buf, sizeof(buf), "\ + \n\ + %d %s\n\ +-\n\ ++\n\ +

%d %s

\n", + status, title, status, title ); + add_response( hc, buf ); +@@ -769,11 +769,8 @@ + char buf[1000]; + + (void) my_snprintf( buf, sizeof(buf), "\ +-
\n\ +-
%s
\n\ + \n\ +-\n", +- SERVER_ADDRESS, EXPOSED_SERVER_SOFTWARE ); ++\n" ); + add_response( hc, buf ); + } + +@@ -2766,7 +2763,7 @@ + (void) fprintf( fp, "\ + \n\ + Index of %.80s\n\ +-\n\ ++\n\ +

Index of %.80s

\n\ + 
\n\
+ mode  links  bytes  last-changed  name\n\
diff --git a/community/thttpd/forwarded-for.patch b/community/thttpd/forwarded-for.patch
new file mode 100644
index 000000000..348eb00cf
--- /dev/null
+++ b/community/thttpd/forwarded-for.patch
@@ -0,0 +1,16 @@
+diff -Naur old/libhttpd.c new/libhttpd.c
+--- old/libhttpd.c	2005-06-30 03:50:39.000000000 +1000
++++ new/libhttpd.c	2012-10-24 12:12:17.144560917 +1100
+@@ -2207,6 +2207,12 @@
+ 		if ( strcasecmp( cp, "keep-alive" ) == 0 )
+ 		    hc->keep_alive = 1;
+ 		}
++	    else if ( strncasecmp( buf, "X-Forwarded-For:", 16 ) == 0 )
++		{
++		cp = &buf[16];
++		cp += strspn( cp, " \t" );
++		inet_aton( cp, &(hc->client_addr.sa_in.sin_addr) );
++		}
+ #ifdef LOG_UNKNOWN_HEADERS
+ 	    else if ( strncasecmp( buf, "Accept-Charset:", 15 ) == 0 ||
+ 		      strncasecmp( buf, "Accept-Language:", 16 ) == 0 ||
diff --git a/community/thttpd/getline.patch b/community/thttpd/getline.patch
new file mode 100644
index 000000000..1ec3946b1
--- /dev/null
+++ b/community/thttpd/getline.patch
@@ -0,0 +1,21 @@
+diff -Nur thttpd-2.25b.orig/extras/htpasswd.c thttpd-2.25b/extras/htpasswd.c
+--- thttpd-2.25b.orig/extras/htpasswd.c	2001-12-19 02:08:08.000000000 +0200
++++ thttpd-2.25b/extras/htpasswd.c	2010-04-11 14:43:31.037809054 +0300
+@@ -49,7 +49,7 @@
+     while((line[y++] = line[x++]));
+ }
+ 
+-static int getline(char *s, int n, FILE *f) {
++static int get_line(char *s, int n, FILE *f) {
+     register int i=0;
+ 
+     while(1) {
+@@ -189,7 +189,7 @@
+     strcpy(user,argv[2]);
+ 
+     found = 0;
+-    while(!(getline(line,MAX_STRING_LEN,f))) {
++    while(!(get_line(line,MAX_STRING_LEN,f))) {
+         if(found || (line[0] == '#') || (!line[0])) {
+             putline(tfp,line);
+             continue;
diff --git a/community/thttpd/logrotate.d b/community/thttpd/logrotate.d
new file mode 100644
index 000000000..efac62704
--- /dev/null
+++ b/community/thttpd/logrotate.d
@@ -0,0 +1,12 @@
+/var/log/thttpd/*log {
+	missingok
+	postrotate
+	test -d /sys/fs/cgroup/systemd && {
+		systemctl status thttpd.service | grep -q running &&
+		systemctl restart thttpd.service >/dev/null 
+	} || {
+		rc.d list thttpd | grep -q STARTED &&
+		/etc/rc.d/thttpd restart >/dev/null
+	}
+	endscript
+}
diff --git a/community/thttpd/service b/community/thttpd/service
new file mode 100644
index 000000000..2b40115ba
--- /dev/null
+++ b/community/thttpd/service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Tiny HTTP Daemon
+
+[Service]
+PIDFile=/run/thttpd.pid
+ExecStart=/usr/bin/thttpd -D -C /etc/thttpd.conf
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD
index 361c29a4c..603ad9195 100644
--- a/community/virtualbox-modules-lts/PKGBUILD
+++ b/community/virtualbox-modules-lts/PKGBUILD
@@ -1,26 +1,28 @@
-# $Id: PKGBUILD 93065 2013-06-23 17:40:20Z seblu $
+# $Id: PKGBUILD 93526 2013-07-05 00:46:38Z seblu $
 # Maintainer: Bartłomiej Piotrowski 
 # Contributor: Ionut Biru 
 # Contributor: Sébastien Luttringer
 
 pkgbase=virtualbox-modules-lts
 pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts')
-pkgver=4.2.14
+pkgver=4.2.16
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
-makedepends=('linux-lts'
-             'linux-lts-headers'
+makedepends=('linux-lts>=3.0' 'linux-lts<3.1'
+             'linux-lts-headers>=3.0' 'linux-lts-headers<3.1'
              "virtualbox-host-dkms>=$pkgver"
              "virtualbox-guest-dkms>=$pkgver"
              'expac'
              'sed'
              'bc')
 
+# remember to also adjust the .install files and the package deps below
+_extramodules=extramodules-3.0-lts
+
 build() {
-  _kernmaj=$(expac -Q '%v' linux-lts|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
-  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-lts/version)
+  _kernver=$(cat /usr/lib/modules/$_extramodules/version)
   # dkms need modification to be run as user
   cp -r /var/lib/dkms .
   echo "dkms_tree='$srcdir/dkms'" > dkms.conf
@@ -33,38 +35,34 @@ build() {
 }
 
 package_virtualbox-host-modules-lts(){
-  _kernmaj=$(expac -Q '%v' linux-lts|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
-  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-lts/version)
+  _kernver=$(cat /usr/lib/modules/$_extramodules/version)
   pkgdesc='Host kernel modules for VirtualBox'
-  depends=("linux-lts>=$_kernmaj" "linux-lts<$(echo "$_kernmaj+0.1"|bc)")
+  depends=('linux-lts>=3.0' 'linux-lts<3.1')
   replaces=('virtualbox-modules-lts')
   conflicts=('virtualbox-modules-lts')
   provides=("virtualbox-host-modules=$pkgver")
   install=virtualbox-host-modules-lts.install
 
   cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
-  install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-lts/"
-  install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-lts/"
+  install -dm755 "$pkgdir/usr/lib/modules/$_extramodules/"
+  install -m644 * "$pkgdir/usr/lib/modules/$_extramodules/"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-host-modules-lts.install"
 }
 
 package_virtualbox-guest-modules-lts(){
-  _kernmaj=$(expac -Q '%v' linux-lts|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
-  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-lts/version)
+  _kernver=$(cat /usr/lib/modules/$_extramodules/version)
   pkgdesc='Guest kernel modules for VirtualBox'
   license=('GPL')
-  depends=("linux-lts>=$_kernmaj" "linux-lts<$(echo "$_kernmaj+0.1"|bc)")
+  depends=('linux-lts>=3.0' 'linux-lts<3.1')
   replaces=('virtualbox-archlinux-modules-lts')
   conflicts=('virtualbox-archlinux-modules-lts')
   provides=("virtualbox-host-modules=$pkgver")
   install=virtualbox-guest-modules-lts.install
 
   cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
-  install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-lts/"
-  install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-lts/"
+  install -dm755 "$pkgdir/usr/lib/modules/$_extramodules/"
+  install -m644 * "$pkgdir/usr/lib/modules/$_extramodules/"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-guest-modules-lts.install"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/virtualbox-modules-lts/virtualbox-guest-modules-lts.install b/community/virtualbox-modules-lts/virtualbox-guest-modules-lts.install
index 82bda9855..f7526e308 100644
--- a/community/virtualbox-modules-lts/virtualbox-guest-modules-lts.install
+++ b/community/virtualbox-modules-lts/virtualbox-guest-modules-lts.install
@@ -1,18 +1,21 @@
-VERSION=''
+_depmod() {
+  EXTRAMODULES='extramodules-3.0-lts'
+  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
 
 post_install() {
-cat << EOF
+  cat << EOF
 ===> You may want to load vboxguest, vboxsf and vboxvideo
 EOF
-  depmod $VERSION
+  _depmod
 }
 
 post_upgrade() {
-  depmod $VERSION
+  _depmod
 }
 
 post_remove() {
-  depmod $VERSION
+  _depmod
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/virtualbox-modules-lts/virtualbox-host-modules-lts.install b/community/virtualbox-modules-lts/virtualbox-host-modules-lts.install
index 6c1a57d3a..cddbffb43 100644
--- a/community/virtualbox-modules-lts/virtualbox-host-modules-lts.install
+++ b/community/virtualbox-modules-lts/virtualbox-host-modules-lts.install
@@ -1,20 +1,23 @@
-VERSION=''
+_depmod() {
+  EXTRAMODULES='extramodules-3.0-lts'
+  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
 
 post_install() {
-cat << EOF
+  cat << EOF
 ===> You must load vboxdrv module before starting VirtualBox:
 ===> # modprobe vboxdrv
 EOF
-  depmod $VERSION
+  _depmod
 }
 
 post_upgrade() {
-  depmod $VERSION
+  _depmod
   echo 'In order to use the new version, reload all virtualbox modules manually.'
 }
 
 post_remove() {
-  depmod $VERSION
+  _depmod
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
index cc9ce02bf..4d220f40b 100644
--- a/community/virtualbox-modules/PKGBUILD
+++ b/community/virtualbox-modules/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 93232 2013-06-29 10:08:01Z foutrelis $
+# $Id: PKGBUILD 93524 2013-07-05 00:43:46Z seblu $
 # Maintainer: Ionut Biru 
 # Maintainer: Sébastien Luttringer
 
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
-pkgver=4.2.14
-pkgrel=2
+pkgver=4.2.16
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
-- 
cgit v1.2.3-54-g00ecf