From a3669c04838b48b6891b2ffc4b296fa515f8174f Mon Sep 17 00:00:00 2001 From: root Date: Tue, 21 Aug 2012 00:02:33 +0000 Subject: Tue Aug 21 00:02:33 UTC 2012 --- community/evas_generic_loaders-svn/PKGBUILD | 6 +- community/gambas2/PKGBUILD | 4 +- community/gambas3/PKGBUILD | 4 +- community/libextractor/PKGBUILD | 4 +- community/mfs/PKGBUILD | 86 ++++++++++++++++++++--------- community/mfs/mfs.install | 25 +++++++++ community/mfs/mfscgiserv.service | 13 +++++ community/mfs/mfschunkserver.service | 14 +++++ community/mfs/mfsmaster.service | 13 +++++ community/mfs/mfsmetalogger.service | 13 +++++ community/mldonkey/PKGBUILD | 12 ++-- community/pdf2djvu/PKGBUILD | 6 +- community/tcpflow/PKGBUILD | 6 +- 13 files changed, 159 insertions(+), 47 deletions(-) create mode 100644 community/mfs/mfs.install create mode 100644 community/mfs/mfscgiserv.service create mode 100644 community/mfs/mfschunkserver.service create mode 100644 community/mfs/mfsmaster.service create mode 100644 community/mfs/mfsmetalogger.service (limited to 'community') diff --git a/community/evas_generic_loaders-svn/PKGBUILD b/community/evas_generic_loaders-svn/PKGBUILD index 1eda842a0..8ad8e7795 100644 --- a/community/evas_generic_loaders-svn/PKGBUILD +++ b/community/evas_generic_loaders-svn/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75123 2012-08-14 09:46:37Z rvanharen $ +# $Id: PKGBUILD 75312 2012-08-19 08:00:14Z heftig $ # Maintainer: Daniel Wallace # Contributor: Ronald van Haren pkgname=evas_generic_loaders-svn pkgver=75109 -pkgrel=1 +pkgrel=2 pkgdesc="Additional generic loaders for Evas" arch=('i686' 'x86_64') groups=('e17-libs-svn' 'e17-svn') @@ -15,7 +15,6 @@ makedepends=('subversion') conflicts=('evas_generic_loaders') provides=('evas_generic_loaders') options=('!libtool' '!emptydirs') -md5sums=() _svntrunk="http://svn.enlightenment.org/svn/e/trunk/evas_generic_loaders" _svnmod="evas_generic_loaders" @@ -49,5 +48,4 @@ package() { "$pkgdir/usr/share/licenses/$pkgname/COPYING" rm -r "$srcdir/$_svnmod-build" - } diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD index f5b795f13..e1bc2770e 100644 --- a/community/gambas2/PKGBUILD +++ b/community/gambas2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74537 2012-07-30 05:08:23Z lcarlier $ +# $Id: PKGBUILD 75313 2012-08-19 08:00:28Z heftig $ # Maintainer : Laurent Carlier # Contributor: Biru Ionut # Contributor: Andrea Scarpino @@ -20,7 +20,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' 'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') pkgver=2.24.0 -pkgrel=5 +pkgrel=6 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net" diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index fc6401272..8235914f2 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74975 2012-08-10 23:14:23Z lcarlier $ +# $Id: PKGBUILD 75314 2012-08-19 08:00:36Z heftig $ # Maintainer: Laurent Carlier # Contributor : sebikul @@ -15,7 +15,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') pkgver=3.2.1 -pkgrel=4 +pkgrel=5 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net/" diff --git a/community/libextractor/PKGBUILD b/community/libextractor/PKGBUILD index 4f68aaa85..73d27883f 100644 --- a/community/libextractor/PKGBUILD +++ b/community/libextractor/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74837 2012-08-06 23:09:06Z andrea $ +# $Id: PKGBUILD 75315 2012-08-19 08:00:41Z heftig $ # Maintainer: Sergej Pupykin # Contributor: damir pkgname=libextractor pkgver=0.6.3 -pkgrel=6 +pkgrel=7 pkgdesc="A library used to extract meta-data from files of arbitrary type" arch=("i686" "x86_64") license=('GPL') diff --git a/community/mfs/PKGBUILD b/community/mfs/PKGBUILD index fcf870eb4..f7370e8e6 100644 --- a/community/mfs/PKGBUILD +++ b/community/mfs/PKGBUILD @@ -1,23 +1,32 @@ -# $Id: PKGBUILD 71606 2012-05-30 19:22:00Z arodseth $ +# $Id: PKGBUILD 75321 2012-08-19 15:17:28Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Thomas S Hatch pkgbase=mfs -pkgname=('mfs-client' 'mfs-chunkserver' 'mfs-master') -pkgver=1.6.25 +pkgname=('mfs-master' 'mfs-chunkserver' 'mfs-client') +pkgver=1.6.26 pkgrel=1 -pkgdesc="MooseFS, fault tolerant, network distributed file system" -license=("GPL3") +pkgdesc='MooseFS, fault tolerant, network distributed file system' +license=('GPL3') arch=('x86_64' 'i686') options=('!libtool') -depends=('zlib' 'fuse' 'python2' 'bash') -url="http://www.moosefs.com/" +depends=('zlib' 'fuse' 'python2' 'bash' 'xfsprogs') +url='http://www.moosefs.com/' +install=mfs.install source=("http://www.moosefs.org/tl_files/mfscode/mfs-$pkgver.tar.gz" - "mfsmaster" - "mfschunkserver" - "mfsmetalogger" - "mfscgiserv") -sha256sums=('64b7ce749699e437f47e1561e8044362ea714a8dd2d3bad0c6a7165e9ad142ee' + 'mfsmaster.service' + 'mfschunkserver.service' + 'mfsmetalogger.service' + 'mfscgiserv.service' + 'mfsmaster' + 'mfschunkserver' + 'mfsmetalogger' + 'mfscgiserv') +sha256sums=('f250f97c6f2a229277fdbf9fe96036873fd6c95a38f484f06e6b87a404c01885' + 'b24fc4f699e7d11fcda00d83a1feb45aa0e6f4f448e675a1857edcf315427fe0' + '19262bde4dbefb1d3eba09ba7d507595aed9647328a0a7822bbc1915ae3201a7' + 'bf92e93be68308d53f649de84dc5bbb0fb433e33306b8d0c303be6c6c3e59a55' + '6725a732c6294ee8817be6c24e3811481bf05e97a0a64108908e2312d7687f1a' '7c307f7be520644ac5d9c71e39ff7ec7e26800aa77c8a18c51a2d0087e5b2f48' '2d07e544f4bfeb497c24276936d3a8ce9f906597d6b9c898dc491426b21e74e0' 'd9c072cbb9d9645e5131d08b08628ccc2a2bef0a4e9c6fd8c3c33e50efce39f3' @@ -26,42 +35,40 @@ sha256sums=('64b7ce749699e437f47e1561e8044362ea714a8dd2d3bad0c6a7165e9ad142ee' build() { cd "$srcdir" - msg2 "Building client..." + msg2 'Building client...' cp -r $pkgbase-$pkgver $pkgbase-client cd $pkgbase-client ./configure \ --prefix=/usr \ - --sysconfdir=/etc \ + --sysconfdir=/etc/mfs \ --localstatedir=/var/lib \ --disable-mfschunkserver \ --disable-mfsmaster \ --disable-mfscgi \ --disable-mfscgiserv make - cd .. - msg2 "Building chunkserver..." + msg2 'Building chunkserver...' cp -r $pkgbase-$pkgver $pkgbase-chunk cd $pkgbase-chunk ./configure \ --prefix=/usr \ - --sysconfdir=/etc \ + --sysconfdir=/etc/mfs \ --localstatedir=/var/lib \ --disable-mfsmaster \ --disable-mfsmount \ --disable-mfscgi \ --disable-mfscgiserv make - cd .. - msg2 "Building master..." + msg2 'Building master...' cp -r $pkgbase-$pkgver $pkgbase-master cd $pkgbase-master ./configure \ --prefix=/usr \ - --sysconfdir=/etc \ + --sysconfdir=/etc/mfs \ --localstatedir=/var/lib \ --disable-mfschunkserver \ --disable-mfsmount @@ -71,7 +78,11 @@ build() { package_mfs-client() { depends=('zlib' 'fuse' 'bash') cd "$srcdir/$pkgbase-client" + + msg2 'Packaging client...' make DESTDIR="$pkgdir" install + + msg2 'Cleaning up...' rm -rf "$pkgdir/usr/share/man/man7" rmdir "$pkgdir/usr/share/man/man5" } @@ -79,27 +90,52 @@ package_mfs-client() { package_mfs-chunkserver() { depends=('zlib' 'bash') cd "$srcdir/$pkgbase-chunk" + + msg2 'Packaging chunkserver...' make DESTDIR="$pkgdir" install + + msg2 'Packaging Systemd service...' + install -Dm644 "$srcdir/mfschunkserver.service" \ + "$pkgdir/usr/lib/systemd/system/mfschunkserver.service" + + msg2 'Packaging initscript...' + install -Dm755 "$srcdir/mfschunkserver" "$pkgdir/etc/rc.d/mfschunkserver" + + msg2 'Cleaning up...' rm -rf "$pkgdir/usr/share/man/man7" rmdir "$pkgdir/usr/share/man/man1" - install -Dm755 "$srcdir/mfschunkserver" "$pkgdir/etc/rc.d/mfschunkserver" mv "$pkgdir/usr/sbin" "$pkgdir/usr/bin" } package_mfs-master() { depends=('zlib' 'python2') cd "$srcdir/$pkgbase-master" + + msg2 'Packaging master, metalogger and web interface...' make DESTDIR="$pkgdir" install + + msg2 'Packaging various text files...' install -Dm644 README "$pkgdir/usr/share/doc/$pkgbase/README" install -Dm644 INSTALL "$pkgdir/usr/share/doc/$pkgbase/INSTALL" install -Dm644 NEWS "$pkgdir/usr/share/doc/$pkgbase/NEWS" install -Dm644 UPGRADE "$pkgdir/usr/share/doc/$pkgbase/UPGRADE" - install -Dm755 "$srcdir/mfsmaster" "$pkgdir/etc/rc.d/mfsmaster" - install -Dm755 "$srcdir/mfsmetalogger" "$pkgdir/etc/rc.d/mfsmetalogger" - install -Dm755 "$srcdir/mfscgiserv" "$pkgdir/etc/rc.d/mfscgiserv" + + msg2 'Packaging Systemd services and initscripts...' + for fn in master metalogger cgiserv; do + install -Dm755 "$srcdir/mfs$fn" "$pkgdir/etc/rc.d/mfs$fn" + install -Dm644 "$srcdir/mfs$fn.service" \ + "$pkgdir/usr/lib/systemd/system/mfs$fn.service" + done + + msg2 'Python2 fix...' + sed -i '0,/on/s//on2/' \ + "$pkgdir/usr/sbin/mfscgiserv" \ + "$pkgdir/usr/share/mfscgi/chart.cgi" \ + "$pkgdir/usr/share/mfscgi/mfs.cgi" + + msg2 'Cleaning up...' rmdir "$pkgdir/usr/share/man/man1" mv "$pkgdir/usr/sbin" "$pkgdir/usr/bin" - sed -i '0,/on/s//on2/' "$pkgdir/usr/bin/mfscgiserv" } # vim:set ts=2 sw=2 et: diff --git a/community/mfs/mfs.install b/community/mfs/mfs.install new file mode 100644 index 000000000..906932aaa --- /dev/null +++ b/community/mfs/mfs.install @@ -0,0 +1,25 @@ +post_upgrade() { + # Moving the old configuration to the new location at /etc/mfs/ + for fn in chunkserver hdd mount metalogger master exports topology; do + if [ -e /etc/mfs$fn.cfg -a ! -e /etc/mfs/mfs$fn.cfg ]; then + echo "Moving /etc/mfs$fn.cfg to /etc/mfs/mfs$fn.cfg" + mv /etc/mfs$fn.cfg /etc/mfs/mfs$fn.cfg + fi + done +} + +post_install() { + post_upgrade + echo + echo 'For configuring MooseFS, the .cfg.dist files in /etc/mfs can' + echo 'be used as a basis for writing the corresponding .cfg files.' + echo + echo 'To troubleshoot a service, like "mfschunkserver", just running' + echo '"/usr/bin/mfschunkserver start" can be helpful.' + echo + echo '"systemctl enable mfschunkserver" can be used to enable a service' + echo "at boot, if you're using systemd." + echo +} + +# vim:set ts=2 sw=2 et: diff --git a/community/mfs/mfscgiserv.service b/community/mfs/mfscgiserv.service new file mode 100644 index 000000000..09daf41b7 --- /dev/null +++ b/community/mfs/mfscgiserv.service @@ -0,0 +1,13 @@ +[Unit] +Description=Distributed file system (web interface) +After=network.target + +[Service] +Type=forking +ExecStart=/usr/bin/mfscgiserv +ExecStop=/bin/kill -15 $MAINPID +PIDFile=/run/mfs/mfscgiserv.pid +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/community/mfs/mfschunkserver.service b/community/mfs/mfschunkserver.service new file mode 100644 index 000000000..83ef11adc --- /dev/null +++ b/community/mfs/mfschunkserver.service @@ -0,0 +1,14 @@ +[Unit] +Description=Distributed file system (chunk server) +After=network.target + +[Service] +Type=forking +ExecStart=/usr/bin/mfschunkserver start +ExecStop=/usr/bin/mfschunkserver stop +ExecReload=/usr/bin/mfschunkserver reload +PIDFile=/run/mfs/mfschunkserver.pid +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/community/mfs/mfsmaster.service b/community/mfs/mfsmaster.service new file mode 100644 index 000000000..410774f9a --- /dev/null +++ b/community/mfs/mfsmaster.service @@ -0,0 +1,13 @@ +[Unit] +Description=Distributed file system (master) +After=network.target + +[Service] +Type=forking +ExecStart=/usr/bin/mfsmaster start +ExecStop=/usr/bin/mfsmaster stop +PIDFile=/run/mfs/mfsmaster.pid +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/community/mfs/mfsmetalogger.service b/community/mfs/mfsmetalogger.service new file mode 100644 index 000000000..611afc532 --- /dev/null +++ b/community/mfs/mfsmetalogger.service @@ -0,0 +1,13 @@ +[Unit] +Description=Distributed file system (meta logger) +After=network.target + +[Service] +Type=forking +ExecStart=/usr/bin/mfsmetalogger start +ExecStop=/usr/bin/mfsmetalogger stop +PIDFile=/run/mfs/mfsmetalogger.pid +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/community/mldonkey/PKGBUILD b/community/mldonkey/PKGBUILD index 6fd39e952..b4345c6ef 100644 --- a/community/mldonkey/PKGBUILD +++ b/community/mldonkey/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 73966 2012-07-17 18:24:40Z cbrannon $ +# $Id: PKGBUILD 75327 2012-08-19 20:51:39Z cbrannon $ # Maintainer: Chris Brannon # Contributor: Corrado Primier # Contributor: Alessio 'mOLOk' Bolognino pkgname=mldonkey -pkgver=3.1.2 -pkgrel=2 +pkgver=3.1.3 +pkgrel=1 pkgdesc="A multi-network P2P client" arch=('i686' 'x86_64') url="http://mldonkey.sourceforge.net/" @@ -19,6 +19,9 @@ install=mldonkey.install source=(http://downloads.sourceforge.net/sourceforge/mldonkey/$pkgname-$pkgver.tar.bz2 mldonkeyd mldonkey.conf) +md5sums=('671f60467a918a9b7c2affef63ff5c25' + '9e90003a012cf17b548dcc647961ffa6' + '1f86d92db51c62cded0e6f3833057dee') build() { cd "$srcdir/$pkgname-$pkgver" @@ -39,6 +42,3 @@ package() { install -Dm644 "distrib/mldonkey.desktop" \ "$pkgdir/usr/share/applications/mldonkey.desktop" } -md5sums=('85e6a0fe358b8c71a71da6d979c9760f' - '9e90003a012cf17b548dcc647961ffa6' - '1f86d92db51c62cded0e6f3833057dee') diff --git a/community/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD index 4cf9443d0..a1b45f2e5 100644 --- a/community/pdf2djvu/PKGBUILD +++ b/community/pdf2djvu/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72974 2012-06-25 18:51:32Z foutrelis $ +# $Id: PKGBUILD 75316 2012-08-19 08:00:44Z heftig $ # Contributor: Paulo Matias # Maintainer: Jelle van der Waa pkgname=pdf2djvu pkgver=0.7.13 -pkgrel=2 +pkgrel=4 pkgdesc="Creates DjVu files from PDF files" arch=('i686' 'x86_64') url="http://pdf2djvu.googlecode.com" @@ -12,6 +12,7 @@ license=('GPL') depends=('poppler' 'djvulibre' 'libxslt' 'gcc-libs' 'graphicsmagick') makedepends=('pstreams' 'python2-nose' 'ttf-liberation') source=("http://pdf2djvu.googlecode.com/files/${pkgname}_${pkgver}.tar.gz") +md5sums=('b5327c5949057711a8250dffb6ccfd2d') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -30,4 +31,3 @@ check() { sed -i 's/nosetests/nosetests2/' tests/Makefile make test } -md5sums=('b5327c5949057711a8250dffb6ccfd2d') diff --git a/community/tcpflow/PKGBUILD b/community/tcpflow/PKGBUILD index e6bc5469d..2ac149074 100644 --- a/community/tcpflow/PKGBUILD +++ b/community/tcpflow/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 69671 2012-04-22 09:26:57Z cbrannon $ +# $Id: PKGBUILD 75325 2012-08-19 20:50:53Z cbrannon $ # Maintainer: Chris Brannon # Contributor: Jeff Mickey pkgname=tcpflow -pkgver=1.2.6 +pkgver=1.2.9 pkgrel=1 pkgdesc="Captures data transmitted as part of TCP connections then stores the data conveniently" arch=('i686' 'x86_64') @@ -11,6 +11,7 @@ url="http://afflib.org/software/tcpflow" license=('GPL') depends=('gcc-libs' 'libpcap' 'zlib') source=("https://github.com/downloads/simsong/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('99e2fbbc6ab8db03a1a9b935689dd407') build() { cd "$srcdir/$pkgname-$pkgver" @@ -22,4 +23,3 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums=('7562f8a1a65f1ce1238be84a1fe83bf6') -- cgit v1.2.3-54-g00ecf