From d184897bb273331edc2aa9c37f6514f9956c58f4 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 25 Jul 2013 01:46:50 -0700 Subject: Thu Jul 25 01:44:55 PDT 2013 --- extra/abook/PKGBUILD | 27 ++- extra/abook/vcard-compat.patch | 347 ------------------------------------ extra/avahi/PKGBUILD | 10 +- extra/fvwm/PKGBUILD | 6 +- extra/refind-efi/PKGBUILD | 46 +++-- extra/refind-efi/refind-efi.install | 8 +- extra/rygel/PKGBUILD | 6 +- extra/twisted/PKGBUILD | 6 +- extra/x11vnc/PKGBUILD | 17 +- extra/x11vnc/conf.d | 5 - extra/x11vnc/rc.d | 37 ---- 11 files changed, 57 insertions(+), 458 deletions(-) delete mode 100644 extra/abook/vcard-compat.patch delete mode 100644 extra/x11vnc/conf.d delete mode 100644 extra/x11vnc/rc.d (limited to 'extra') diff --git a/extra/abook/PKGBUILD b/extra/abook/PKGBUILD index 7c4e1c16c..c53e9ed18 100644 --- a/extra/abook/PKGBUILD +++ b/extra/abook/PKGBUILD @@ -1,30 +1,29 @@ -# $Id: PKGBUILD 160233 2012-05-31 11:55:41Z bisson $ -# Contributor: damir -# Contributor: Thayer Williams -# Contributor: Daniel J Griffiths +# $Id: PKGBUILD 191361 2013-07-24 01:43:47Z bisson $ # Maintainer: Gaetan Bisson +# Contributor: Daniel J Griffiths +# Contributor: Thayer Williams +# Contributor: damir pkgname=abook -pkgver=0.6.0pre2 -pkgrel=5 +pkgver=0.6.0pre2.20130724 +pkgrel=1 pkgdesc='Text-based addressbook designed for use with Mutt' -arch=('i686' 'x86_64') url='http://abook.sourceforge.net/' +arch=('i686' 'x86_64') license=('GPL2') +makedepends=('git') depends=('readline') -source=("http://abook.sourceforge.net/devel/abook-${pkgver}.tar.gz" - 'vcard-compat.patch') -sha1sums=('42a939fba43e51aa011fa185113c12ec4bc1e1ec' - 'feb35deb79116c187953d06e514c7918be5646b6') +source=("abook::git://abook.git.sourceforge.net/gitroot/abook/abook#commit=2e3d4f7341e154bf09907aabcdfe73345cc72e68") +sha1sums=('SKIP') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../vcard-compat.patch + cd "${srcdir}/${pkgname}" ./configure --prefix=/usr --mandir=/usr/share/man make + cd po && make update-po } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}" make DESTDIR="${pkgdir}" install } diff --git a/extra/abook/vcard-compat.patch b/extra/abook/vcard-compat.patch deleted file mode 100644 index cc8ea7f3f..000000000 --- a/extra/abook/vcard-compat.patch +++ /dev/null @@ -1,347 +0,0 @@ -diff -aur old/filter.c new/filter.c ---- old/filter.c 2006-09-06 15:26:10.000000000 +1000 -+++ new/filter.c 2012-05-31 17:48:18.644744197 +1000 -@@ -44,6 +44,7 @@ - static int csv_parse_file(FILE *in); - static int allcsv_parse_file(FILE *in); - static int palmcsv_parse_file(FILE *in); -+static int vcard_parse_file(FILE *in); - - /* - * export filter prototypes -@@ -75,6 +76,7 @@ - { "csv", N_("comma separated values"), csv_parse_file }, - { "allcsv", N_("comma separated values (all fields)"), allcsv_parse_file }, - { "palmcsv", N_("Palm comma separated values"), palmcsv_parse_file }, -+ { "vcard", N_("vCard file"), vcard_parse_file }, - { "\0", NULL, NULL } - }; - -@@ -1331,6 +1333,263 @@ - */ - - /* -+ * vCard import filter -+ */ -+ -+static char *vcard_fields[] = { -+ "FN", /* NAME */ -+ "EMAIL", /* EMAIL */ -+ "ADR", /* ADDRESS */ -+ "ADR", /* ADDRESS2 - not used */ -+ "ADR", /* CITY */ -+ "ADR", /* STATE */ -+ "ADR", /* ZIP */ -+ "ADR", /* COUNTRY */ -+ "TEL", /* PHONE */ -+ "TEL", /* WORKPHONE */ -+ "TEL", /* FAX */ -+ "TEL", /* MOBILEPHONE */ -+ "NICKNAME", /* NICK */ -+ "URL", /* URL */ -+ "NOTE", /* NOTES */ -+ "BDAY", /* ANNIVERSARY */ -+ NULL -+}; -+ -+/* -+ * mappings between vCard ADR field and abook's ADDRESS -+ * see rfc2426 section 3.2.1 -+ */ -+static int vcard_address_fields[] = { -+ -1, /* vCard(post office box) - not used */ -+ -1, /* vCard(the extended address) - not used */ -+ 2, /* vCard(the street address) - ADDRESS */ -+ 4, /* vCard(the locality) - CITY */ -+ 5, /* vCard(the region) - STATE */ -+ 6, /* vCard(the postal code) - ZIP */ -+ 7 /* vCard(the country name) - COUNTRY */ -+}; -+ -+enum { -+ VCARD_KEY = 0, -+ VCARD_KEY_ATTRIBUTE, -+ VCARD_VALUE, -+}; -+ -+static char * -+vcard_get_line_element(char *line, int element) -+{ -+ int i; -+ char *line_copy = 0; -+ char *result = 0; -+ char *key = 0; -+ char *key_attr = 0; -+ char *value = 0; -+ -+ line_copy = xstrdup(line); -+ -+ /* make newline characters if exist end of string */ -+ for(i=0; line_copy[i]; i++) { -+ if(line_copy[i] == '\r' || line_copy[i] == '\n') { -+ line_copy[i] = '\0'; -+ break; -+ } -+ } -+ -+ /* separate key from value */ -+ for(i=0; line_copy[i]; i++) { -+ if(line_copy[i] == ':') { -+ line_copy[i] = '\0'; -+ key = line_copy; -+ value = &line_copy[i+1]; -+ break; -+ } -+ } -+ -+ /* separate key from key attributes */ -+ if (key) { -+ for(i=0; key[i]; i++) { -+ if(key[i] == ';') { -+ key[i] = '\0'; -+ key_attr = &key[i+1]; -+ break; -+ } -+ } -+ } -+ -+ switch(element) { -+ case VCARD_KEY: -+ if(key) -+ result = xstrdup(key); -+ break; -+ case VCARD_KEY_ATTRIBUTE: -+ if(key_attr) -+ result = xstrdup(key_attr); -+ break; -+ case VCARD_VALUE: -+ if(value) -+ result = xstrdup(value); -+ break; -+ } -+ -+ xfree(line_copy); -+ return result; -+} -+ -+static void -+vcard_parse_email(list_item item, char *line) -+{ -+ char *email; -+ -+ email = vcard_get_line_element(line, VCARD_VALUE); -+ -+ if(item[1]) { -+ item[1] = strconcat(item[1], ",", email, 0); -+ xfree(email); -+ } -+ else { -+ item[1] = email; -+ } -+} -+ -+static void -+vcard_parse_address(list_item item, char *line) -+{ -+ int i; -+ int k; -+ char *value; -+ char *address_field; -+ -+ value = vcard_get_line_element(line, VCARD_VALUE); -+ if(!value) -+ return; -+ -+ address_field = value; -+ for(i=k=0; value[i]; i++) { -+ if(value[i] == ';') { -+ value[i] = '\0'; -+ if(vcard_address_fields[k] >= 0) { -+ item[vcard_address_fields[k]] = xstrdup(address_field); -+ } -+ address_field = &value[i+1]; -+ k++; -+ if((k+1)==(sizeof(vcard_address_fields)/sizeof(*vcard_address_fields))) -+ break; -+ } -+ } -+ item[vcard_address_fields[k]] = xstrdup(address_field); -+ xfree(value); -+} -+ -+static void -+vcard_parse_phone(list_item item, char *line) -+{ -+ int index = 8; -+ char *type = vcard_get_line_element(line, VCARD_KEY_ATTRIBUTE); -+ char *value = vcard_get_line_element(line, VCARD_VALUE); -+ -+ /* set the standard number */ -+ if (!type) { -+ item[index] = value; -+ } -+ -+ /* -+ * see rfc2426 section 3.3.1 -+ */ -+ else if (strstr(type, "TYPE=") == type){ -+ if (strcasestr(type, "home")) { -+ item[index] = xstrdup(value); -+ } -+ if (strcasestr(type, "work")) { -+ item[index+1] = xstrdup(value); -+ } -+ if (strcasestr(type, "fax")) { -+ item[index+2] = xstrdup(value); -+ } -+ if (strcasestr(type, "cell")) { -+ item[index+3] = xstrdup(value); -+ } -+ -+ xfree(type); -+ xfree(value); -+ } -+} -+ -+static void -+vcard_parse_line(list_item item, char *line) -+{ -+ int i; -+ char *key; -+ -+ for(i=0; vcard_fields[i]; i++) { -+ key = vcard_fields[i]; -+ -+ if(!strncmp(key, line, strlen(key))) { -+ if(i == 1) { -+ vcard_parse_email(item, line); -+ } -+ else if(i == 2) { -+ vcard_parse_address(item, line); -+ } -+ else if(i == 8) { -+ vcard_parse_phone(item, line); -+ } -+ else { -+ item[i] = vcard_get_line_element(line, VCARD_VALUE); -+ } -+ break; -+ } -+ } -+} -+ -+static void -+vcard_parse_item(FILE *in) -+{ -+ char *line = NULL; -+ list_item item = item_create(); -+ -+ while(!feof(in)) { -+ line = getaline(in); -+ -+ if(line && !strncmp("END:VCARD", line, 9)) { -+ xfree(line); -+ break; -+ } -+ else if(line) { -+ vcard_parse_line(item, line); -+ xfree(line); -+ } -+ } -+ -+ add_item2database(item); -+ item_free(&item); -+} -+ -+static int -+vcard_parse_file(FILE *in) -+{ -+ char *line = NULL; -+ -+ while(!feof(in)) { -+ line = getaline(in); -+ -+ if(line && !strncmp("BEGIN:VCARD", line, 11)) { -+ xfree(line); -+ vcard_parse_item(in); -+ } -+ else if(line) { -+ xfree(line); -+ } -+ } -+ -+ return 0; -+} -+ -+/* -+ * end of vCard import filter -+ */ -+ -+/* - * csv addressbook export filters - */ - -@@ -1547,10 +1806,18 @@ - - free(name); - -+ if(db_fget(e.item, NICK)) -+ fprintf(out, "NICKNAME:%s\r\n", -+ db_fget(e.item, NICK)); -+ -+ if(db_fget(e.item, ANNIVERSARY)) -+ fprintf(out, "BDAY:%s\r\n", -+ db_fget(e.item, ANNIVERSARY)); -+ - if(db_fget(e.item, ADDRESS)) -- fprintf(out, "ADR:;;%s;%s;%s;%s;%s;%s\r\n", -- safe_str(db_fget(e.item, ADDRESS)), -+ fprintf(out, "ADR:;%s;%s;%s;%s;%s;%s\r\n", - safe_str(db_fget(e.item, ADDRESS2)), -+ safe_str(db_fget(e.item, ADDRESS)), - safe_str(db_fget(e.item, CITY)), - safe_str(db_fget(e.item, STATE)), - safe_str(db_fget(e.item, ZIP)), -diff -aur old/misc.c new/misc.c ---- old/misc.c 2006-09-05 05:24:18.000000000 +1000 -+++ new/misc.c 2012-05-31 17:40:46.241284874 +1000 -@@ -77,6 +77,27 @@ - return 1; - } - -+char * -+strcasestr(char *haystack, char *needle) -+{ -+ int i; -+ int k; -+ -+ assert(haystack != NULL); -+ assert(needle != NULL); -+ -+ for(i=0; i # Maintainer: Gaetan Bisson pkgname=avahi pkgver=0.6.31 -pkgrel=9 +pkgrel=10 pkgdesc='Multicast/unicast DNS-SD framework' url='http://www.avahi.org/' license=('LGPL') arch=('i686' 'x86_64') options=('!libtool' '!emptydirs') -depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm') -optdepends=('dbus: communicating with client applications' - 'gtk3: avahi-discover-standalone, bshell, bssh, bvnc' +depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm' 'dbus') +optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc' 'gtk2: gtk2 bindings' 'qt3: qt3 bindings' 'qt4: qt4 bindings' @@ -39,6 +38,7 @@ install=install prepare() { cd "${srcdir}/${pkgname}-${pkgver}" + sed '/^Libs:/s:$: -ldbus-1:' -i avahi-client.pc.in sed 's:netdev:network:g' -i avahi-daemon/avahi-dbus.conf sed 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' -i */*.action } diff --git a/extra/fvwm/PKGBUILD b/extra/fvwm/PKGBUILD index 8af0e2e65..37a0291a9 100644 --- a/extra/fvwm/PKGBUILD +++ b/extra/fvwm/PKGBUILD @@ -1,15 +1,17 @@ -# $Id: PKGBUILD 184378 2013-05-06 19:37:15Z foutrelis $ +# $Id: PKGBUILD 191373 2013-07-24 20:02:25Z eric $ # Maintainer: Eric Bélanger pkgname=fvwm pkgver=2.6.5 -pkgrel=2 +pkgrel=3 pkgdesc="A multiple large virtual desktop window manager originally derived from twm" arch=('i686' 'x86_64') url="http://www.fvwm.org" license=('GPL' 'custom') depends=('imlib' 'fribidi' 'perl' 'libstroke' 'libxpm' 'librsvg' 'libxinerama' 'libxcursor') makedepends=('libxslt') +optdepends=('perl-tk: for ClickToFocus support' + 'perl-x11-protocol: for ClickToFocus support') options=('!emptydirs' '!makeflags') source=(ftp://ftp.fvwm.org/pub/fvwm/version-${pkgver%%.*}/${pkgname}-${pkgver}.tar.bz2 fvwm.desktop) sha1sums=('c4cf96df65817d501b41c6fd79cf22658dd516a8' diff --git a/extra/refind-efi/PKGBUILD b/extra/refind-efi/PKGBUILD index 21188dee0..5b7826717 100644 --- a/extra/refind-efi/PKGBUILD +++ b/extra/refind-efi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 190825 2013-07-18 07:06:20Z tpowa $ +# $Id: PKGBUILD 191365 2013-07-24 10:47:59Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> @@ -17,7 +17,7 @@ _COMPILER="GCC46" pkgname="refind-efi" pkgver="0.7.1" -pkgrel="3" +pkgrel="4" pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager - built with Tianocore UDK libs" url="http://www.rodsbooks.com/refind/index.html" arch=('x86_64' 'i686') @@ -181,16 +181,16 @@ build() { package() { msg "Install the rEFInd UEFI application" - install -d "${pkgdir}/usr/lib/refind/" - install -D -m0644 "${srcdir}/refind-${pkgver}/refind/refind_${_TIANO_S_ARCH}.efi" "${pkgdir}/usr/lib/refind/refind_${_TIANO_S_ARCH}.efi" + install -d "${pkgdir}/usr/share/refind/" + install -D -m0644 "${srcdir}/refind-${pkgver}/refind/refind_${_TIANO_S_ARCH}.efi" "${pkgdir}/usr/share/refind/refind_${_TIANO_S_ARCH}.efi" msg "Install UEFI drivers built from rEFInd" - install -d "${pkgdir}/usr/lib/refind/drivers_${_TIANO_S_ARCH}/" - install -D -m0644 "${srcdir}/refind-${pkgver}/drivers_${_TIANO_S_ARCH}"/*.efi "${pkgdir}/usr/lib/refind/drivers_${_TIANO_S_ARCH}/" + install -d "${pkgdir}/usr/share/refind/drivers_${_TIANO_S_ARCH}/" + install -D -m0644 "${srcdir}/refind-${pkgver}/drivers_${_TIANO_S_ARCH}"/*.efi "${pkgdir}/usr/share/refind/drivers_${_TIANO_S_ARCH}/" msg "Install UEFI applications built from rEFInd" - install -d "${pkgdir}/usr/lib/refind/tools_${_TIANO_S_ARCH}" - install -D -m0644 "${srcdir}/refind-${pkgver}/gptsync/gptsync_${_TIANO_S_ARCH}.efi" "${pkgdir}/usr/lib/refind/tools_${_TIANO_S_ARCH}/gptsync_${_TIANO_S_ARCH}.efi" + install -d "${pkgdir}/usr/share/refind/tools_${_TIANO_S_ARCH}" + install -D -m0644 "${srcdir}/refind-${pkgver}/gptsync/gptsync_${_TIANO_S_ARCH}.efi" "${pkgdir}/usr/share/refind/tools_${_TIANO_S_ARCH}/gptsync_${_TIANO_S_ARCH}.efi" msg "Install rEFInd helper scripts" install -d "${pkgdir}/usr/bin/" @@ -200,17 +200,17 @@ package() { install -D -m0755 "${srcdir}/refind-${pkgver}/fonts/mkfont.sh" "${pkgdir}/usr/bin/refind-mkfont" msg "Install the rEFInd sample config files" - install -D -m0644 "${srcdir}/refind-${pkgver}/refind.conf-sample" "${pkgdir}/usr/lib/refind/refind.conf-sample" - install -D -m0644 "${srcdir}/refind_linux.conf" "${pkgdir}/usr/lib/refind/refind_linux.conf-sample" + install -D -m0644 "${srcdir}/refind-${pkgver}/refind.conf-sample" "${pkgdir}/usr/share/refind/refind.conf-sample" + install -D -m0644 "${srcdir}/refind_linux.conf" "${pkgdir}/usr/share/refind/refind_linux.conf-sample" msg "Install the rEFInd docs" - install -d "${pkgdir}/usr/share/doc/refind/html/" - install -d "${pkgdir}/usr/share/doc/refind/Styles/" - install -D -m0644 "${srcdir}/refind-${pkgver}/docs/refind"/* "${pkgdir}/usr/share/doc/refind/html/" - install -D -m0644 "${srcdir}/refind-${pkgver}/docs/Styles"/* "${pkgdir}/usr/share/doc/refind/Styles/" - install -D -m0644 "${srcdir}/refind-${pkgver}/README.txt" "${pkgdir}/usr/share/doc/refind/README" - install -D -m0644 "${srcdir}/refind-${pkgver}/NEWS.txt" "${pkgdir}/usr/share/doc/refind/NEWS" - rm -f "${pkgdir}/usr/share/doc/refind/html/.DS_Store" || true + install -d "${pkgdir}/usr/share/refind/docs/html/" + install -d "${pkgdir}/usr/share/refind/docs/Styles/" + install -D -m0644 "${srcdir}/refind-${pkgver}/docs/refind"/* "${pkgdir}/usr/share/refind/docs/html/" + install -D -m0644 "${srcdir}/refind-${pkgver}/docs/Styles"/* "${pkgdir}/usr/share/refind/docs/Styles/" + install -D -m0644 "${srcdir}/refind-${pkgver}/README.txt" "${pkgdir}/usr/share/refind/docs/README.txt" + install -D -m0644 "${srcdir}/refind-${pkgver}/NEWS.txt" "${pkgdir}/usr/share/refind/docs/NEWS.txt" + rm -f "${pkgdir}/usr/share/refind/docs/html/.DS_Store" || true msg "Install the rEFInd fonts" install -d "${pkgdir}/usr/share/refind/fonts/" @@ -236,15 +236,9 @@ package() { msg "Use '#!/usr/bin/env bash' in all scripts" sed 's|#!/bin/bash|#!/usr/bin/env bash|g' -i "${pkgdir}/usr/bin"/refind-* || true - msg "Point refind dir paths to /usr/lib/refind/ in refind-install script" - sed 's|^ThisDir=.*|ThisDir="/usr/lib/refind/"|g' -i "${pkgdir}/usr/bin/refind-install" - sed 's|^RefindDir=.*|RefindDir="/usr/lib/refind/"|g' -i "${pkgdir}/usr/bin/refind-install" + msg "Point refind dir paths to /usr/share/refind/ in refind-install script" + sed 's|^ThisDir=.*|ThisDir="/usr/share/refind/"|g' -i "${pkgdir}/usr/bin/refind-install" + sed 's|^RefindDir=.*|RefindDir="/usr/share/refind/"|g' -i "${pkgdir}/usr/bin/refind-install" sed 's|^ThisScript=.*|ThisScript="/usr/bin/refind-install"|g' -i "${pkgdir}/usr/bin/refind-install" - msg "Setup SYMLINKS to refind dirs for the sake of refind-install script" - ln -s "/usr/share/refind/fonts" "${pkgdir}/usr/lib/refind/fonts" - ln -s "/usr/share/refind/icons" "${pkgdir}/usr/lib/refind/icons" - ln -s "/usr/share/refind/keys" "${pkgdir}/usr/lib/refind/keys" - ln -s "/usr/share/doc/refind" "${pkgdir}/usr/lib/refind/docs" - } diff --git a/extra/refind-efi/refind-efi.install b/extra/refind-efi/refind-efi.install index 011552bcd..947d157e3 100644 --- a/extra/refind-efi/refind-efi.install +++ b/extra/refind-efi/refind-efi.install @@ -2,14 +2,14 @@ post_install() { cat << EOF -rEFInd UEFI application has been installed at /usr/lib/refind/refind_*.efi +rEFInd UEFI application has been installed at /usr/share/refind/refind_*.efi -Other UEFI applications have been installed at /usr/lib/refind/tools_*/ +Other UEFI applications have been installed at /usr/share/refind/tools_*/ -UEFI drivers have deen installed at /usr/lib/refind/drivers_*/ +UEFI drivers have deen installed at /usr/share/refind/drivers_*/ Copy the efi application (according to your UEFI ARCH) -and /usr/lib/refind/refind.conf-sample to a sub-directory of /EFI/ +and /usr/share/refind/refind.conf-sample to a sub-directory of /EFI/ as refind.conf and add an entry to firmware boot menu using efibootmgr or mactel-boot (for Macs) diff --git a/extra/rygel/PKGBUILD b/extra/rygel/PKGBUILD index 9c6aa8053..5efa11aeb 100644 --- a/extra/rygel/PKGBUILD +++ b/extra/rygel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185316 2013-05-13 09:39:29Z heftig $ +# $Id: PKGBUILD 191370 2013-07-24 12:22:37Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Balló György pkgname=rygel -pkgver=0.18.2 +pkgver=0.18.3 pkgrel=1 pkgdesc="UPnP AV MediaServer and MediaRenderer that allows you to easily share audio, video and pictures, and control of media player on your home network" arch=(i686 x86_64) @@ -22,7 +22,7 @@ options=('!libtool') install=rygel.install groups=('gnome-extra') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('26dea444e69f68cec822e58080162d056528a518b9b155503016a19dda0b48a4') +sha256sums=('b3bb97476b44f7adae162c8cdb062160120336ed33a88c2a692ab8fac187d105') build() { cd $pkgname-$pkgver diff --git a/extra/twisted/PKGBUILD b/extra/twisted/PKGBUILD index 036de41ab..1ad8c45d3 100644 --- a/extra/twisted/PKGBUILD +++ b/extra/twisted/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182404 2013-04-10 06:49:54Z eric $ +# $Id: PKGBUILD 191375 2013-07-24 21:41:22Z eric $ # Maintainer : Ionut Biru # Contributor: Juergen Hoetzel # Contributor: Douglas Soares de Andrade pkgname=twisted -pkgver=13.0.0 +pkgver=13.1.0 pkgrel=1 pkgdesc="Asynchronous networking framework written in Python" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ optdepends=('python2-pyopenssl' 'tk: for using tkconch') install=twisted.install source=(http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-$pkgver.tar.bz2) -sha1sums=('5c66a4f231a5f3e17860a41498ac80e76a156dca') +sha1sums=('7f6e07b8098b248157ac26378fafa9e018f279a7') prepare() { cd "Twisted-$pkgver" diff --git a/extra/x11vnc/PKGBUILD b/extra/x11vnc/PKGBUILD index 323462d23..eb75748b0 100644 --- a/extra/x11vnc/PKGBUILD +++ b/extra/x11vnc/PKGBUILD @@ -1,25 +1,20 @@ -# $Id: PKGBUILD 168731 2012-10-15 02:00:18Z bisson $ +# $Id: PKGBUILD 191363 2013-07-24 02:13:55Z bisson $ # Maintainer: Gaetan Bisson # Contributor: damir pkgname=x11vnc pkgver=0.9.13 -pkgrel=3 +pkgrel=4 pkgdesc='VNC server for real X displays' url='http://www.karlrunge.com/x11vnc/' arch=('i686' 'x86_64') license=('GPL2') -depends=('openssl' 'libjpeg' 'libxtst' 'libxinerama' 'libxdamage' 'libxrandr' 'avahi') optdepends=('tk: for GUI support') -backup=('etc/conf.d/x11vnc') +depends=('openssl' 'libjpeg' 'libxtst' 'libxinerama' 'libxdamage' 'libxrandr' 'avahi') source=("http://downloads.sourceforge.net/project/libvncserver/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" - 'service' - 'conf.d' - 'rc.d') + 'service') sha1sums=('f011d81488ac94dc8dce2d88739c23bd85a976fa' - '53e1ed7f84518a699a29607a03bee2321f9f9624' - '11011cce06511e9ba61672a1c80bb63a3a187539' - '477892cf0f0020043444b7493c80684762ded506') + '53e1ed7f84518a699a29607a03bee2321f9f9624') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -30,8 +25,6 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/x11vnc" - install -Dm644 ../conf.d "${pkgdir}/etc/conf.d/x11vnc" install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/x11vnc.service" rm -fr "${pkgdir}"/usr/include/rfb # provided by libvncserver } diff --git a/extra/x11vnc/conf.d b/extra/x11vnc/conf.d deleted file mode 100644 index 8a81e3286..000000000 --- a/extra/x11vnc/conf.d +++ /dev/null @@ -1,5 +0,0 @@ -# -# Parameters to be passed to x11vnc -# - -X11VNC_ARGS="" diff --git a/extra/x11vnc/rc.d b/extra/x11vnc/rc.d deleted file mode 100644 index b5f2a6464..000000000 --- a/extra/x11vnc/rc.d +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/x11vnc - -PID=$(pidof -o %PPID /usr/bin/x11vnc) -case "$1" in - start) - stat_busy "Starting x11vnc" - [[ -z "$PID" ]] && /usr/bin/x11vnc $X11VNC_ARGS &> /dev/null & - if [[ $? -gt 0 ]]; then - stat_fail - else - add_daemon x11vnc - stat_done - fi - ;; - stop) - stat_busy "Stopping x11vnc" - [[ ! -z "$PID" ]] && kill $PID &> /dev/null - if [[ $? -gt 0 ]]; then - stat_fail - else - rm_daemon x11vnc - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 -- cgit v1.2.3-54-g00ecf