From cb9c375209c236c16557878a1b864f91de27b88d Mon Sep 17 00:00:00 2001 From: root Date: Mon, 12 Dec 2011 23:14:53 +0000 Subject: Mon Dec 12 23:14:53 UTC 2011 --- community/ctpl/PKGBUILD | 26 ++- community/freedroidrpg/PKGBUILD | 10 +- community/kdenlive/PKGBUILD | 8 +- community/libvirt/PKGBUILD | 6 +- community/moreutils/PKGBUILD | 5 +- community/netcf/PKGBUILD | 30 +++ community/netcf/netcf-0.1.7.patch | 426 ++++++++++++++++++++++++++++++++++++++ community/winefish/PKGBUILD | 9 +- 8 files changed, 491 insertions(+), 29 deletions(-) create mode 100644 community/netcf/PKGBUILD create mode 100644 community/netcf/netcf-0.1.7.patch (limited to 'community') diff --git a/community/ctpl/PKGBUILD b/community/ctpl/PKGBUILD index f2d098254..bae7a5242 100644 --- a/community/ctpl/PKGBUILD +++ b/community/ctpl/PKGBUILD @@ -1,25 +1,29 @@ -# $Id: PKGBUILD 56633 2011-10-09 09:46:57Z angvp $ -# Maintainer: Angel Velasquez +# $Id: PKGBUILD 60331 2011-12-11 14:46:35Z arodseth $ +# Maintainer: Alexander Rødseth +# Contributor: Angel Velasquez # Contributor: Patrick Melo - pkgname=ctpl pkgver=0.3.3 -pkgrel=1 -pkgdesc="CTPL is a template engine library written in C" -arch=('i686' 'x86_64') +pkgrel=2 +pkgdesc="Template engine library written in C" +arch=('x86_64' 'i686') url="http://ctpl.tuxfamily.org/" license=('GPL') depends=('glib2' 'gvfs') -source=(http://download.tuxfamily.org/ctpl/releases/$pkgname-$pkgver.tar.gz) -md5sums=('3380e06d94d921fb50b0e40ddb351daa') +options=(!libtool) +source=("http://download.tuxfamily.org/ctpl/releases/$pkgname-$pkgver.tar.gz") +sha256sums=('7da73e7d8f10d222f5685b8eb80541d7e4d342aa74673039692fa5c4e8b120a7') build() { - cd ${srcdir}/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr make } package() { - cd ${srcdir}/$pkgname-$pkgver - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install } +# vim:set ts=2 sw=2 et: diff --git a/community/freedroidrpg/PKGBUILD b/community/freedroidrpg/PKGBUILD index 26971f606..19eb799c2 100644 --- a/community/freedroidrpg/PKGBUILD +++ b/community/freedroidrpg/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 60014 2011-12-03 08:20:18Z spupykin $ +# $Id: PKGBUILD 60343 2011-12-11 19:59:55Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: nut543 #pkgbase=freedroidrpg #pkgname=('freedroidrpg' 'freedroidrpg-data') pkgname='freedroidrpg' -pkgver=0.15rc1 +pkgver=0.15rc2 pkgrel=1 arch=('i686' 'x86_64') # depends=('sdl_mixer' 'sdl_image' 'libogg' 'libvorbis' 'libgl' 'freedroidrpg-data') -depends=('sdl_mixer' 'sdl_image' 'sdl_gfx' 'libogg' 'libvorbis' 'libgl') +depends=('sdl_mixer' 'sdl_image' 'sdl_gfx' 'libogg' 'libvorbis' 'libgl' 'mesa') optdepends=('python2' 'espeak') pkgdesc="a mature science fiction role playing game set in the future" url="http://freedroid.sourceforge.net" license=("GPL") -source=(http://downloads.sourceforge.net/project/freedroid/freedroidRPG/freedroidRPG-0.15/freedroidrpg-$pkgver.tar.bz2 +source=(http://downloads.sourceforge.net/project/freedroid/freedroidRPG/freedroidRPG-0.15/freedroidrpg-$pkgver.tar.gz freedroidrpg.jpg freedroidrpg.desktop) -md5sums=('2309a9e7087d384a6a66e6985cc06bd7' +md5sums=('0e098aae0b16b6f87ffe5f7932580491' 'b73d9dac44c7e83a6c80fbe4eb96ba79' '9a10c2a2064439cdcff5b945dfb1c3ac') diff --git a/community/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD index c51383fe2..c91e32c6b 100644 --- a/community/kdenlive/PKGBUILD +++ b/community/kdenlive/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 58466 2011-11-12 20:42:16Z spupykin $ +# $Id: PKGBUILD 60345 2011-12-11 20:16:27Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Zuf # Contributor: Darwin Bautista pkgname=kdenlive -pkgver=0.8.2 -pkgrel=2 +pkgver=0.8.2.1 +pkgrel=1 pkgdesc="A non-linear video editor for Linux" arch=('i686' 'x86_64') url="http://www.kdenlive.org/" @@ -17,7 +17,7 @@ install=kdenlive.install options=('docs') source=("http://downloads.sourceforge.net/kdenlive/kdenlive-${pkgver}.tar.gz" glu.patch) -md5sums=('0836842f489f6142cee101842ac76c54' +md5sums=('96b39531eba98c77546e7eba45a744ce' 'fd6c5fe46419ee505c562363d41f6e9f') build() { diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 30758edc2..e12494bab 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 60240 2011-12-08 11:32:20Z spupykin $ +# $Id: PKGBUILD 60347 2011-12-11 20:18:29Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Jonathan Wiersma pkgname=libvirt pkgver=0.9.8 -pkgrel=1 +pkgrel=2 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') url="http://libvirt.org/" @@ -12,7 +12,7 @@ license=('LGPL') depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2' 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap' 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs' - 'iproute2') + 'iproute2' 'netcf') makedepends=('pkgconfig' 'lvm2') optdepends=('bridge-utils: for briged networking (default)' 'dnsmasq: for NAT/DHCP for guests' diff --git a/community/moreutils/PKGBUILD b/community/moreutils/PKGBUILD index 7a1bae427..3b6f9142c 100644 --- a/community/moreutils/PKGBUILD +++ b/community/moreutils/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 58952 2011-11-20 18:08:19Z spupykin $ +# $Id: PKGBUILD 60349 2011-12-11 20:19:24Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Alessio 'mOLOk' Bolognino pkgname=moreutils pkgver=0.45 -pkgrel=1 +pkgrel=2 pkgdesc="A growing collection of the unix tools that nobody thought to write thirty years ago" arch=('i686' 'x86_64') url="http://kitenet.net/~joey/code/moreutils.html" license=('GPL') makedepends=('docbook2x' 'docbook-xml' 'perl-xml-sax') depends=('perl') +optdepends=('perl-timedate' 'perl-time-duration' 'perl-ipc-run') options=('!emptydirs' 'zipman') replaces=(moreutils-svn) source=(http://ftp.de.debian.org/debian/pool/main/m/moreutils/moreutils_$pkgver.tar.gz) diff --git a/community/netcf/PKGBUILD b/community/netcf/PKGBUILD new file mode 100644 index 000000000..cfc7411aa --- /dev/null +++ b/community/netcf/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 60351 2011-12-11 20:20:01Z spupykin $ +# Maintainer: Sergej Pupykin +# Contributor: Aurélien Wailly + +pkgname=netcf +pkgver=0.1.7 +pkgrel=2 +pkgdesc="A library for configuring network interfaces" +arch=('i686' 'x86_64') +license=('LGPL') +url="https://fedorahosted.org/netcf/" +depends=('augeas>=0.7.4' 'netcfg' 'libxslt' 'libxml2' 'libnl') +makedepends=('gcc') +options=(!libtool) +source=("https://fedorahosted.org/released/netcf/$pkgname-$pkgver.tar.gz" + netcf-0.1.7.patch) +md5sums=('8e313b623c907eb035cf3948b71fecc2' + '0e88ee6813219e9e75a943444fe439f5') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ${srcdir}/netcf-0.1.7.patch + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR=${pkgdir} install +} diff --git a/community/netcf/netcf-0.1.7.patch b/community/netcf/netcf-0.1.7.patch new file mode 100644 index 000000000..d4a4d31b7 --- /dev/null +++ b/community/netcf/netcf-0.1.7.patch @@ -0,0 +1,426 @@ +diff -ur netcf-0.1.7.ori//data/xml/initscripts-get.xsl netcf-0.1.7/data/xml/initscripts-get.xsl +--- netcf-0.1.7.ori//data/xml/initscripts-get.xsl 2009-10-04 08:18:41.000000000 +0200 ++++ netcf-0.1.7/data/xml/initscripts-get.xsl 2010-12-08 14:54:28.891813397 +0100 +@@ -47,9 +47,12 @@ + + + +- /files/etc/sysconfig/network-scripts/ifcfg- +- +- ++ /files/etc/network.d/ifcfg- ++ ++ ++ ++ ++ + + + +@@ -68,6 +71,7 @@ + + + ++ + + + +@@ -75,7 +79,11 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + + +- /files/etc/sysconfig/network-scripts/ifcfg- +- ++ /files/etc/network.d/ifcfg- ++ + + + +@@ -153,6 +178,7 @@ + + + ++ + + + +@@ -184,14 +210,14 @@ + + + +- ++ + + + + + +- +- ++ ++ + + + +diff -ur netcf-0.1.7.ori//data/xml/initscripts-put.xsl netcf-0.1.7/data/xml/initscripts-put.xsl +--- netcf-0.1.7.ori//data/xml/initscripts-put.xsl 2009-10-04 08:18:41.000000000 +0200 ++++ netcf-0.1.7/data/xml/initscripts-put.xsl 2010-11-26 10:44:46.133757628 +0100 +@@ -47,7 +47,7 @@ + + + +- ++ + + + +@@ -55,7 +55,7 @@ + + + +- ++ + + + +@@ -70,7 +70,7 @@ + match="tree[node[@label = 'TYPE' and @value = 'Bridge']]"> + + +- ++ + + + +@@ -101,17 +101,17 @@ + Bond + --> + +- ++ + + + + + + +- ++ + + +- ++ + + + +@@ -125,7 +125,7 @@ + + + ++ match="tree[node[@label = 'INTERFACE'][@value = //tree/node[@label = 'MASTER']/@value]][count(node[@label = 'BRIDGE']) = 0]"> + + + +@@ -154,7 +154,7 @@ + + + +- ++ + + + +@@ -173,7 +173,7 @@ + + ++ select="count(node[@label = 'ADDR']) > 0"/> + + + +@@ -186,7 +186,7 @@ + + + +- ++ + + + +diff -ur netcf-0.1.7.ori//src/drv_initscripts.c netcf-0.1.7/src/drv_initscripts.c +--- netcf-0.1.7.ori//src/drv_initscripts.c 2010-09-23 14:13:13.000000000 +0200 ++++ netcf-0.1.7/src/drv_initscripts.c 2010-12-08 13:57:02.027361706 +0100 +@@ -49,17 +49,20 @@ + #include + + static const char *const network_scripts_path = +- "/files/etc/sysconfig/network-scripts"; ++ //"/files/etc/sysconfig/network-scripts"; ++ "/files/etc/network.d/*"; + + static const char *const ifcfg_path = +- "/files/etc/sysconfig/network-scripts/*"; ++ //"/files/etc/sysconfig/network-scripts/*"; ++ "/files/etc/network.d/*"; + + /* Augeas should only load the files we are interested in */ + static const struct augeas_pv augeas_xfm_common_pv[] = { + /* Ifcfg files */ + { "/augeas/load/Ifcfg/lens", "Sysconfig.lns" }, + { "/augeas/load/Ifcfg/incl", +- "/etc/sysconfig/network-scripts/ifcfg-*" }, ++ "/etc/network.d/ifcfg-*" }, ++ //"/etc/sysconfig/network-scripts/ifcfg-*" }, + { "/augeas/load/Ifcfg/excl[1]", "*~" }, + { "/augeas/load/Ifcfg/excl[2]", "*.bak" }, + { "/augeas/load/Ifcfg/excl[3]", "*.orig" }, +@@ -107,10 +110,10 @@ + int nmatches; + + nmatches = aug_fmt_match(ncf, NULL, +- "%s[ DEVICE = '%s'" ++ "%s[ INTERFACE = '%s'" + " or BRIDGE = '%s'" + " or MASTER = '%s'" +- " or MASTER = ../*[BRIDGE = '%s']/DEVICE ]/DEVICE", ++ " or MASTER = ../*[BRIDGE = '%s']/INTERFACE ]/INTERFACE", + ifcfg_path, name, name, name, name); + return nmatches > 0; + } +@@ -173,7 +176,7 @@ + aug = get_augeas(ncf); + ERR_BAIL(ncf); + +- ndevs = aug_fmt_match(ncf, &devs, "%s[DEVICE = '%s']", ++ ndevs = aug_fmt_match(ncf, &devs, "%s[INTERFACE = '%s']", + ifcfg_path, name); + ERR_COND_BAIL(ndevs < 0, ncf, EOTHER); + +@@ -296,7 +299,8 @@ + int result = 0, ndevs; + char **devs = NULL; + +- ndevs = aug_fmt_match(ncf, &devs, "%s/DEVICE", ifcfg_path); ++ ndevs = aug_fmt_match(ncf, &devs, "%s/INTERFACE", ifcfg_path); ++ printf("%i\n", ndevs); + ERR_COND_BAIL(ndevs < 0, ncf, EOTHER); + + result = uniq_ifcfg_paths(ncf, ndevs, devs, intf); +@@ -453,11 +457,11 @@ + + int drv_list_interfaces(struct netcf *ncf, int maxnames, char **names, + unsigned int flags) { +- return list_interface_ids(ncf, maxnames, names, flags, "DEVICE"); ++ return list_interface_ids(ncf, maxnames, names, flags, "INTERFACE"); + } + + int drv_num_of_interfaces(struct netcf *ncf, unsigned int flags) { +- return list_interface_ids(ncf, 0, NULL, flags, "DEVICE"); ++ return list_interface_ids(ncf, 0, NULL, flags, "INTERFACE"); + } + + struct netcf_if *drv_lookup_by_name(struct netcf *ncf, const char *name) { +@@ -599,8 +603,8 @@ + + ncf = nif->ncf; + ndevs = aug_fmt_match(ncf, &devs, +- "%s[ DEVICE = '%s' or BRIDGE = '%s' or MASTER = '%s'" +- " or MASTER = ../*[BRIDGE = '%s']/DEVICE ]/DEVICE", ++ "%s[ INTERFACE = '%s' or BRIDGE = '%s' or MASTER = '%s'" ++ " or MASTER = ../*[BRIDGE = '%s']/INTERFACE ]/INTERFACE", + ifcfg_path, nif->name, nif->name, nif->name, nif->name); + ERR_BAIL(ncf); + +@@ -745,7 +749,7 @@ + int nmatches = 0; + + nmatches = aug_fmt_match(ncf, NULL, +- "%s[ DEVICE = '%s' and TYPE = 'Bridge']", ++ "%s[ INTERFACE = '%s' and TYPE = 'Bridge']", + ifcfg_path, name); + return nmatches > 0; + } +@@ -758,7 +762,7 @@ + ERR_BAIL(ncf); + + nslaves = aug_fmt_match(ncf, slaves, +- "%s[ BRIDGE = '%s' ]/DEVICE", ifcfg_path, name); ++ "%s[ BRIDGE = '%s' ]/INTERFACE", ifcfg_path, name); + ERR_BAIL(ncf); + for (int i=0; i < nslaves; i++) { + char *p = (*slaves)[i]; +@@ -790,8 +794,8 @@ + /* The last or clause catches slaves of a bond that are enslaved to + * a bridge NAME */ + r = xasprintf(&path, +- "%s[ DEVICE = '%s' or BRIDGE = '%s' or MASTER = '%s' " +- " or MASTER = ../*[BRIDGE = '%s']/DEVICE ]", ++ "%s[ INTERFACE = '%s' or BRIDGE = '%s' or MASTER = '%s' " ++ " or MASTER = ../*[BRIDGE = '%s']/INTERFACE ]", + ifcfg_path, name, name, name, name); + ERR_NOMEM(r < 0, ncf); + +@@ -967,7 +971,7 @@ + for (int i = 0; i < nmatches; i++) { + if (!has_ifcfg_file(ncf, matches[i])) + continue; +- r = xasprintf(&ifcfg, "%s[DEVICE = '%s']", ifcfg_path, matches[i]); ++ r = xasprintf(&ifcfg, "%s[INTERFACE = '%s']", ifcfg_path, matches[i]); + ERR_NOMEM(r < 0, ncf); + + if (! is_slave(ncf, ifcfg)) +@@ -1023,7 +1027,10 @@ + */ + + int drv_if_up(struct netcf_if *nif) { +- static const char *const ifup = "ifup"; ++ //static const char *const ifup = "ifup"; ++ static const char *const ifup = "netcfg"; ++ static const char *const ifprefix = "ifcfg-"; ++ char ifname[strlen(nif->name) + sizeof(ifprefix)]; + struct netcf *ncf = nif->ncf; + char **slaves = NULL; + int nslaves = 0; +@@ -1035,11 +1042,24 @@ + ERR_BAIL(ncf); + + for (int i=0; i < nslaves; i++) { +- run1(ncf, ifup, slaves[i]); ++ //run1(ncf, ifup, slaves[i]); ++ const char *const argv[] = { ++ ifup, "-u", slaves[i], NULL ++ }; ++ ++ run_program(ncf, argv); + ERR_BAIL(ncf); + } + } +- run1(ncf, ifup, nif->name); ++ //run1(ncf, ifup, nif->name); ++ /* Interfaces name have to be equal to script under /etc/network.d */ ++ strcpy(ifname, ifprefix); ++ strcat(ifname, nif->name); ++ const char *const argv[] = { ++ ifup, "-u", ifname, NULL ++ }; ++ ++ run_program(ncf, argv); + ERR_BAIL(ncf); + result = 0; + error: +@@ -1048,13 +1068,23 @@ + } + + int drv_if_down(struct netcf_if *nif) { +- static const char *const ifdown = "ifdown"; ++ //static const char *const ifdown = "ifdown"; ++ static const char *const ifdown = "netcfg"; ++ static const char *const ifprefix = "ifcfg-"; ++ char ifname[strlen(nif->name) + sizeof(ifprefix)]; + struct netcf *ncf = nif->ncf; + char **slaves = NULL; + int nslaves = 0; + int result = -1; + +- run1(ncf, ifdown, nif->name); ++ //run1(ncf, ifdown, nif->name); ++ strcpy(ifname, ifprefix); ++ strcat(ifname, nif->name); ++ const char *const argv[] = { ++ ifdown, "-d", ifname, NULL ++ }; ++ ++ run_program(ncf, argv); + ERR_BAIL(ncf); + if (is_bridge(ncf, nif->name)) { + /* Bring up bridge slaves after the bridge */ +@@ -1062,7 +1092,12 @@ + ERR_BAIL(ncf); + + for (int i=0; i < nslaves; i++) { +- run1(ncf, ifdown, slaves[i]); ++ //run1(ncf, ifdown, slaves[i]); ++ const char *const argvs[] = { ++ ifdown, "-d", slaves[i], NULL ++ }; ++ ++ run_program(ncf, argvs); + ERR_BAIL(ncf); + } + } +diff -ur netcf-0.1.7.ori//tests/interface/bridge.xml~ netcf-0.1.7/tests/interface/bridge.xml~ +--- netcf-0.1.7.ori//tests/interface/bridge.xml~ 2009-10-13 19:14:53.000000000 +0200 ++++ netcf-0.1.7/tests/interface/bridge.xml~ 2009-10-14 05:09:05.000000000 +0200 +@@ -2,10 +2,12 @@ + + + +- ++ + + + ++ + ++ + + +diff -ur netcf-0.1.7.ori//tests/interface/vlan.xml~ netcf-0.1.7/tests/interface/vlan.xml~ +--- netcf-0.1.7.ori//tests/interface/vlan.xml~ 2010-07-30 06:02:39.000000000 +0200 ++++ netcf-0.1.7/tests/interface/vlan.xml~ 2010-09-07 18:26:22.000000000 +0200 +@@ -1,9 +1,9 @@ +- ++ + + + + + +- ++ + + diff --git a/community/winefish/PKGBUILD b/community/winefish/PKGBUILD index c692791b8..a2fb79c8c 100644 --- a/community/winefish/PKGBUILD +++ b/community/winefish/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 23711 2010-08-15 05:56:23Z shusmann $ +# $Id: PKGBUILD 60333 2011-12-11 17:42:32Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski # Contributor: Allan McRae # Contributor: Claudio Riva -# Maintainer: Stefan Husmann +# Contributor: Stefan Husmann pkgname=winefish pkgver=1.3.3 -pkgrel=9 +pkgrel=10 pkgdesc="LaTeX editor based on Bluefish with auto-completion and syntax highlighting" url="http://winefish.berlios.de/" arch=('i686' 'x86_64') license=('GPL') -depends=('libgnomeui') +depends=('gtk2' 'desktop-file-utils' 'shared-mime-info') makedepends=('pkgconfig') optdepends=('aspell: for spell check') install=$pkgname.install -- cgit v1.2.3-54-g00ecf