diff options
Diffstat (limited to 'social')
| -rw-r--r-- | social/seeks/PKGBUILD | 100 | ||||
| -rw-r--r-- | social/seeks/conf.patch | 20 | ||||
| -rw-r--r-- | social/seeks/docbook2man.patch | 24 | ||||
| -rw-r--r-- | social/seeks/img_websearch.patch | 13 | ||||
| -rw-r--r-- | social/seeks/seeks.conf.d | 11 | ||||
| -rw-r--r-- | social/seeks/seeks.install | 12 | ||||
| -rw-r--r-- | social/seeks/seeks.logrotate | 2 | ||||
| -rw-r--r-- | social/seeks/seeks.rc.d | 57 | ||||
| -rw-r--r-- | social/seeks/seeksdaemon | 41 |
9 files changed, 228 insertions, 52 deletions
diff --git a/social/seeks/PKGBUILD b/social/seeks/PKGBUILD index 09da52060..53cc57471 100644 --- a/social/seeks/PKGBUILD +++ b/social/seeks/PKGBUILD @@ -2,61 +2,65 @@ # Co-maintainer: Enjolras < 0enjolras0 at laposte dot net > pkgname=seeks -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=2 -pkgdesc="An open decentralized platform for collaborative search content" -arch=('i686' 'x86_64') -url="http://www.seeks-project.info" -license=('AGPL3') +pkgdesc="A social decentralized internet overlay for collaborative searches" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.seeks-project.info/site/" +license=('AGPL3' 'LGPL' 'BSD') backup=('etc/logrotate.d/seeks' 'etc/conf.d/seeks' 'etc/seeks/config') -depends=('curl' 'libevent' 'protobuf' 'tokyotyrant' 'opencv' 'icu') -makedepends=('docbook2x' 'pkg-config' ) -source=("http://downloads.sourceforge.net/project/seeks/hippy/seeks-0.4.0.tar.gz" - 'seeks' - 'seeks.conf.d' - 'seeks.logrotate' - 'logfile.patch') -install='install' +depends=('curl' 'libevent>=2.0' 'libxml2' 'opencv' 'protobuf' 'icu' 'tokyotyrant') +makedepends=('pkg-config' 'docbook-xml' 'docbook2x') +source=("http://downloads.sourceforge.net/project/${pkgname}/hippy/${pkgname}-${pkgver}.tar.gz" +'seeks.conf.d' + 'seeks.rc.d' + 'img_websearch.patch' + 'conf.patch' + 'seeks.logrotate') +install=seeks.install build() { - cd "$srcdir/$pkgname-$pkgver" - - autoreconf -ivs - sed -i s/docbook2x-man/docbook2man/ ./configure - ./configure LDFLAGS="-Wl,--no-as-needed" \ - --prefix=/usr --sysconfdir=/etc \ - --enable-opencv --enable-httpserv-plugin --enable-image-websearch-plugin=yes \ - --enable-xslserializer-plugin --enable-personalization --enable-keepalive --enable-extended-host-patterns - - sed -i s/cxflann.h/cv.h/ src/plugins/img_websearch/ocvsurf.cpp - sed -i s/,--as-needed,/,/ config.status - - make - + cd "$srcdir/$pkgname-$pkgver" + # replace <cxflann.h> by <cv.h> + patch -p1 -i "$srcdir/img_websearch.patch" + + # linking issue with --as-needed linker flag, Cli not building with RC2 + LDFLAGS="-Wl,--no-as-needed" \ + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --enable-httpserv-plugin \ + --enable-extended-host-patterns + #--disable-cli \ + + sed -i s/,--as-needed,/,/ config.status + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check-local } package() { - cd "$srcdir/$pkgname-$pkgver/src/" - - #Changing logdir and logfile options - #disable plugins cf and query-capture in config - patch -p0 < "$srcdir/logfile.patch" - - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - install -D -m644 Licenses "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -m644 AGPL-3.txt "${pkgdir}/usr/share/licenses/${pkgname}/" - install -m644 BSD-yui.txt "${pkgdir}/usr/share/licenses/${pkgname}/" - install -D -m755 ../seeks "${pkgdir}"/etc/rc.d/seeks - install -D -m644 ../seeks.conf.d "${pkgdir}"/etc/conf.d/seeks - install -D -m600 ../seeks.logrotate "${pkgdir}"/etc/logrotate.d/seeks + cd "$srcdir/$pkgname-$pkgver" + # Patch config file to make seeks log in /var/log instead of ./ (needed for rc.d) + patch -p1 -i "$srcdir/conf.patch" + make DESTDIR="$pkgdir/" install + + install -D -m644 Licenses "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 ../seeks.conf.d "${pkgdir}/etc/conf.d/seeks" + install -D -m755 ../seeks.rc.d "${pkgdir}/etc/rc.d/seeks" + install -D -m600 ../seeks.logrotate "${pkgdir}/etc/logrotate.d/seeks" + install -d -m755 "${pkgdir}/var/log/seeks" + install -d -m755 "${pkgdir}/var/lib/seeks" } -md5sums=('a2d0b6e7b91036883c0b327ead5e93c0' - '33e6da05cca492019e6aff39684aed26' - '52e7e06a28974547041012a1cf3207f3' - 'd1aba6739972239c6cd09178807e196f' - 'e352306f5396a1af4dfc81a18bfc5a71') + +# vim:set ts=2 sw=2 et: +md5sums=('2545192be5fa2e70d850f7395d039a0f' + 'ed29089d43873600726d570e63a5043d' + '72a00a931363edd2ed11c0072bfd5b10' + '2554e9f9f733d83203d0926e599e66db' + '71a99dafa726539b9de9055468e2f56c' + '5fbdf9c327999605b0f124132f27a27d') diff --git a/social/seeks/conf.patch b/social/seeks/conf.patch new file mode 100644 index 000000000..93e12c311 --- /dev/null +++ b/social/seeks/conf.patch @@ -0,0 +1,20 @@ +--- a/src/config 2011-11-13 15:21:14.000000000 +0100 ++++ b/src/config 2011-11-13 15:46:15.856186336 +0100 +@@ -148,7 +148,7 @@ + # + # No trailing "/", please. + # +-confdir . ++confdir /etc/seeks + # + # + # 2.2. templdir +@@ -193,7 +193,7 @@ + # + # No trailing "/", please. + # +-logdir . ++logdir /var/log/seeks + # + # + # 2.4. logfile diff --git a/social/seeks/docbook2man.patch b/social/seeks/docbook2man.patch new file mode 100644 index 000000000..c5de2e063 --- /dev/null +++ b/social/seeks/docbook2man.patch @@ -0,0 +1,24 @@ +--- seeks/configure 2011-07-30 15:16:27.000000000 +0200 ++++ seeks/configure.patch 2011-07-30 16:04:34.000000000 +0200 +@@ -16726,10 +16726,10 @@ PCRE_CFLAGS=`$PCRE_CONFIG --cflags` + + + #========================================================================== +-# Finding docbook2x-man ++# Finding docbook2man + #========================================================================== +-# Extract the first word of "docbook2x-man", so it can be a program name with args. +-set dummy docbook2x-man; ac_word=$2 ++# Extract the first word of "docbook2man", so it can be a program name with args. ++set dummy docbook2man; ac_word=$2 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 + $as_echo_n "checking for $ac_word... " >&6; } + if ${ac_cv_prog_docbook+:} false; then : +--- seeks/doc/Makefile.am 2011-07-30 16:51:14.000000000 +0200 ++++ seeks/doc/Makefile.am.patch 2011-07-30 16:55:58.000000000 +0200 +@@ -8,4 +8,4 @@ endif + + EXTRA_DIST=seeks.1.docbook + seeks.1: +- docbook2x-man ${srcdir}/seeks.1.docbook ++ docbook2man ${srcdir}/seeks.1.docbook diff --git a/social/seeks/img_websearch.patch b/social/seeks/img_websearch.patch new file mode 100644 index 000000000..94362e2fc --- /dev/null +++ b/social/seeks/img_websearch.patch @@ -0,0 +1,13 @@ +diff --git a/src/plugins/img_websearch/ocvsurf.cpp b/src/plugins/img_websearch/ocvsurf.cpp +index 5caa9dd..c3cccb4 100644 +--- a/src/plugins/img_websearch/ocvsurf.cpp ++++ b/src/plugins/img_websearch/ocvsurf.cpp +@@ -29,7 +29,7 @@ + #include "miscutil.h" + #include "errlog.h" + +-#include <cxflann.h> ++#include <cv.h> + + #include <iostream> + #include <fstream> diff --git a/social/seeks/seeks.conf.d b/social/seeks/seeks.conf.d index 21ed0526a..c28382aca 100644 --- a/social/seeks/seeks.conf.d +++ b/social/seeks/seeks.conf.d @@ -1,6 +1,11 @@ # -# Array for your vde config files +# Arguments to be passed to the Seeks daemon +# + +# User +SEEKS_USER="seeks" +# Config file (default if empty) SEEKS_CONFIG="" +# Args +SEEKS_ARGS="" -# Parameters to be passed to seeks -SEEKS_ARGS="--daemon --user seeks $SEEKS_CONFIG" diff --git a/social/seeks/seeks.install b/social/seeks/seeks.install new file mode 100644 index 000000000..bf9849e78 --- /dev/null +++ b/social/seeks/seeks.install @@ -0,0 +1,12 @@ +post_install() { + getent group seeks >/dev/null || groupadd -r seeks + getent passwd seeks >/dev/null || useradd -r -c "Seeks daemon" -g seeks -M -d /var/lib/seeks -s /bin/false seeks + passwd -l seeks &>/dev/null + chown seeks:seeks var/log/seeks var/lib/seeks +} + +pre_remove() { + getent passwd seeks &>/dev/null && userdel seeks >/dev/null + getent group seeks &>/dev/null && groupdel seeks >/dev/null + return 0 +} diff --git a/social/seeks/seeks.logrotate b/social/seeks/seeks.logrotate index 24b6f539f..98b411884 100644 --- a/social/seeks/seeks.logrotate +++ b/social/seeks/seeks.logrotate @@ -1,4 +1,4 @@ -/var/log/seeks.log { +/var/log/seeks/logfile { missingok notifempty size 30k diff --git a/social/seeks/seeks.rc.d b/social/seeks/seeks.rc.d new file mode 100644 index 000000000..67de9251a --- /dev/null +++ b/social/seeks/seeks.rc.d @@ -0,0 +1,57 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/seeks + +PIDFILE="/var/run/seeks.pid" + +if [[ -f $PIDFILE ]]; then + read -r PID < "$PIDFILE" + + # prevent stale pidfiles from hanging around + if [[ ! -d /proc/$PID ]]; then + echo 'pid not found. deleteing stale pidfile' + unset PID + rm -f "$PIDFILE" + fi +fi + +case "$1" in + start) + stat_busy "Starting Seeks" + if [[ $PID ]]; then + stat_fail + exit 1 + fi + if /usr/bin/seeks --daemon --pidfile "$PIDFILE" --user $SEEKS_USER $SEEKS_ARGS $SEEKS_CONFIG 2>&1 > /dev/null; then + add_daemon seeks + stat_done + else + stat_fail + exit 1 + fi + ;; + stop) + stat_busy "Stopping Seeks" + if [[ ! $PID ]]; then + stat_fail + exit 1 + fi + if { kill $PID && rm -f "$PIDFILE"; } &>/dev/null; then + rm_daemon seeks + stat_done + else + stat_fail + exit 1 + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac + diff --git a/social/seeks/seeksdaemon b/social/seeks/seeksdaemon new file mode 100644 index 000000000..551197d28 --- /dev/null +++ b/social/seeks/seeksdaemon @@ -0,0 +1,41 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/seeks + +PID=`pidof -o %PPID /usr/bin/seeks` + +case "$1" in + start) + stat_busy "Starting seeks daemon" + [ -z "$PID" ] && /usr/bin/seeks $SEEKS_ARGS + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon seeks + stat_done + fi + ;; + + stop) + stat_busy "Stopping seeks daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon seeks + stat_done + fi + ;; + restart) + $0 stop + while [ ! -z "$PID" -a -d "/proc/$PID" ]; do sleep 1; done + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + +esac +exit 0 + |