Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=a69835e7f326b5d3286f3fa7129b3b72a975e408
commit a69835e7f326b5d3286f3fa7129b3b72a975e408
Author: Miklos Vajna vmik...@frugalware.org
Date: Wed Mar 9 15:38:56 2011 +0100
bitlbee-3.0.2-1-i686
- version bump
- add patch from upstream bugtracker for systemd support
diff --git a/source/network-extra/bitlbee/FrugalBuild
b/source/network-extra/bitlbee/FrugalBuild
index 4870e58..ebe57f7 100644
--- a/source/network-extra/bitlbee/FrugalBuild
+++ b/source/network-extra/bitlbee/FrugalBuild
@@ -4,7 +4,7 @@
USE_DEVEL=${USE_DEVEL:-n}
pkgname=bitlbee
-pkgver=3.0.1
+pkgver=3.0.2
Fuse $USE_DEVEL pkgver=1.3dev.bzr635
pkgrel=1
pkgdesc=An IRC to other chat networks gateway.
@@ -12,14 +12,16 @@ url=http://www.bitlbee.org/main.php/news.html;
# inetd: othervise it can't serve on port 6667
# tcp_wrappers: provides /usr/sbin/tcpd
rodepends=('inetd' 'tcp_wrappers')
-depends=('glib2' 'gnutls=2.8')
+depends=('glib2' 'gnutls=2.8' 'systemd')
Fuse $USE_DEVEL makedepends=('docbook-xsl=1.73.0-2' 'docbook-xml' 'xmlto')
backup=(etc/biltbee/{bitlbee.conf,motd.txt})
groups=('network-extra')
archs=('i686' 'x86_64' 'ppc')
up2date=lynx -dump http://www.bitlbee.org/ |grep Stable |sed 's/.*:
\(.*\)/\1/'
-source=(http://get.bitlbee.org/src/$pkgname-$pkgver.tar.gz)
-sha1sums=('f3a0651d723b71b08f0dad3b5cb2843608d5c265')
+source=(http://get.bitlbee.org/src/$pkgname-$pkgver.tar.gz \
+ bitlbee-systemd.patch)
+sha1sums=('59113b1dc440ebd775e6cf324d1cfb698fb20cfc' \
+ 'dad60158fa774d5f91e3f3c39ffd55c50fbb895b')
options=('scriptlet')
subpkgs=('bitlbee-otr')
@@ -36,8 +38,6 @@ if Fuse $USE_DEVEL; then
Finclude scm
fi
-# TODO: rc.bitlbee
-
build() {
Fuse $USE_DEVEL Funpack_scm
Fpatchall
diff --git a/source/network-extra/bitlbee/bitlbee-systemd.patch
b/source/network-extra/bitlbee/bitlbee-systemd.patch
new file mode 100644
index 000..7604bed
--- /dev/null
+++ b/source/network-extra/bitlbee/bitlbee-systemd.patch
@@ -0,0 +1,134 @@
+diff -up bitlbee-3.0.2/configure.systemd bitlbee-3.0.2/configure
+--- bitlbee-3.0.2/configure.systemd2011-03-09 09:46:37.263884813 +0100
bitlbee-3.0.2/configure2011-03-09 09:47:39.983708602 +0100
+@@ -15,6 +15,7 @@ datadir='$prefix/share/bitlbee/'
+ config='/var/lib/bitlbee/'
+ plugindir='$prefix/lib/bitlbee/'
+ includedir='$prefix/include/bitlbee/'
++systemdsystemunitdir=''
+ libevent='/usr/'
+ pidfile='/var/run/bitlbee.pid'
+ ipcsocket='/var/run/bitlbee.sock'
+@@ -61,6 +62,7 @@ Option Description
Default
+ --mandir=... $mandir
+ --datadir=... $datadir
+ --plugindir=... $plugindir
++--systemdsystemunitdir=...$systemdsystemunitdir
+ --pidfile=... $pidfile
+ --config=... $config
+ --ipcsocket=... $ipcsocket
+@@ -488,6 +490,17 @@ else
+ fi;
+ fi
+
++if [ -z $systemdsystemunitdir ]; then
++ if $PKG_CONFIG --exists systemd; then
++ systemdsystemunitdir=`$PKG_CONFIG
--variable=systemdsystemunitdir systemd`
++ fi
++fi
++if [ -n $systemdsystemunitdir ]; then
++ if [ $systemdsystemunitdir != no ]; then
++ echo SYSTEMDSYSTEMUNITDIR=$systemdsystemunitdir
Makefile.settings
++ fi
++fi
++
+ if [ $gcov = 1 ]; then
+ echo CFLAGS+=--coverage Makefile.settings
+ echo EFLAGS+=--coverage Makefile.settings
+@@ -728,6 +741,12 @@ else
+ echo ' Off-the-Record (OTR) Messaging disabled.'
+ fi
+
++if [ -n $systemdsystemunitdir ]; then
++ echo ' systemd enabled.'
++else
++ echo ' systemd disabled.'
++fi
++
+ echo ' Using event handler: '$events
+ echo ' Using SSL library: '$ssl
+ #echo ' Building with these storage backends: '$STORAGES
+diff -up bitlbee-3.0.2/init/bitlbee.service.in.systemd
bitlbee-3.0.2/init/bitlbee.service.in
+--- bitlbee-3.0.2/init/bitlbee.service.in.systemd 2011-03-09
09:46:37.266884804 +0100
bitlbee-3.0.2/init/bitlbee.service.in 2011-03-09 09:46:37.266884804
+0100
+@@ -0,0 +1,9 @@
++[Unit]
++Description=BitlBee IRC/IM gateway
++After=syslog.target
++
++[Service]
++ExecStart=@sbindir@bitlbee -F -n
++
++[Install]
++WantedBy=multi-user.target
+diff -up bitlbee-3.0.2/init/bitl...@.service.in.systemd
bitlbee-3.0.2/init/bitl...@.service.in
+--- bitlbee-3.0.2/init/bitl...@.service.in.systemd 2011-03-09
09:46:37.267884801 +0100
bitlbee-3.0.2/init/bitl...@.service.in 2011-03-09 09:46:37.267884801
+0100
+@@ -0,0 +1,8 @@
++[Unit]
++Description=BitlBee Per-Connection Server
++After=syslog.target
++
++[Service]
++ExecStart=@sbindir@bitlbee
++StandardInput=socket
++User=bitlbee
+diff -up bitlbee-3.0.2/init/bitlbee.socket.systemd
bitlbee-3.0.2/init/bitlbee.socket
+---
