Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (44989a569abaf1927eb60ecd39b8b68587afa514)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (44989a569abaf1927eb60ecd39b8b68587afa514)
  • Date: Mon, 17 Mar 2014 14:06:00 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

chat-irc/bitlbee/BUILD | 25 +++++++++++-----
chat-irc/bitlbee/CONFIGURE | 56 ++++++++++++++++--------------------
chat-irc/bitlbee/DEPENDS | 61
++++++++++++++++++++++++++++------------
chat-irc/bitlbee/DETAILS | 12 ++++---
chat-irc/bitlbee/HISTORY | 15 +++++++++
chat-irc/bitlbee/INSTALL | 15 ++++-----
chat-irc/bitlbee/PRE_BUILD | 4 ++
chat-irc/bitlbee/init.d/bitlbee | 9 +++++
8 files changed, 128 insertions(+), 69 deletions(-)

New commits:
commit fd46e55234759301b3337ea7218f90cdc3bc84dc
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

bitlbee: => 3.2.1

diff --git a/chat-irc/bitlbee/BUILD b/chat-irc/bitlbee/BUILD
index 0bdd98d..c8eb040 100755
--- a/chat-irc/bitlbee/BUILD
+++ b/chat-irc/bitlbee/BUILD
@@ -1,13 +1,24 @@
+if list_find "$LDFLAGS" "-s"; then
+ OPTS="--strip=1 $OPTS"
+else
+ OPTS="--strip=0 $OPTS"
+fi &&
+
# BUILD file required because of --etcdir path
# no --sysconfdir is recognized by the bitlbee Makefile
+./configure --prefix="$INSTALL_ROOT/usr" \
+ --etcdir="$INSTALL_ROOT/etc/bitlbee" \
+ $BITLBEE_OPTS \
+ $OPTS &&

-./configure --build=$BUILD \
- --prefix=/usr \
- --etcdir=/etc/bitlbee \
- $BITLBEE_OPTS $OPTS
+make &&

-make
+if [[ "$BITLBEE_BITLBEED" == y ]]; then
+ cd ${SOURCE_DIRECTORY}/utils &&
+ gcc $CFLAGS bitlbeed.c -o bitlbeed &&

-if [[ "$BITLBEE_BITLBEED" == y ]] ; then
- (cd ${SOURCE_DIRECTORY}/utils && gcc bitlbeed.c -o bitlbeed)
+ if list_find "$LDFLAGS" "-s"; then
+ strip bitlbeed
+ fi &&
+ cd ..
fi
diff --git a/chat-irc/bitlbee/CONFIGURE b/chat-irc/bitlbee/CONFIGURE
index a8648b8..6b1f739 100755
--- a/chat-irc/bitlbee/CONFIGURE
+++ b/chat-irc/bitlbee/CONFIGURE
@@ -1,41 +1,35 @@
-config_query_option BITLBEE_OPTS "Enable plugin support? " y \
- "--plugins=1" "--plugins=0" &&
+config_query_option BITLBEE_OPTS "Enable plugin support?" y \
+ "--plugins=1" \
+ "--plugins=0" &&

-config_query_option BITLBEE_OPTS "Enable Jabber (XMPP) protocol? " n \
- "--jabber=1" "--jabber=0" &&
+config_query_option BITLBEE_OPTS "Enable Twitter protocol?" y \
+ "--twitter=1" \
+ "--twitter=0" &&

-config_query_option BITLBEE_OPTS "Enable Oscar protocol (for ICQ or AIM)? "
y \
- "--oscar=1" "--oscar=0" &&
+config_query_option BITLBEE_OPTS "Enable Skype support?" n \
+ "--skype=1" \
+ "--skype=0" &&

-config_query_option BITLBEE_OPTS "Enable Yahoo protocol? " y \
- "--yahoo=1" "--yahoo=0" &&
+if ! list_find "$BITLBEE_OPTS" "--skype=0" && list_find "$BITLBEE_OPTS"
"--plugins=1"; then
+ config_query BITLBEE_SKYPEPLUGIN "Build Skype support as a plugin?" n &&

-config_query_option BITLBEE_OPTS "Enable Twitter protocol? " y \
- "--twitter=1" "--twitter=0" &&
-
-config_query_option BITLBEE_OPTS "Enable MSN protocol? " y \
- "--msn=1" "--msn=0" &&
-
-config_query BITLBEE_OTR "Enable off-the-record (OTR) encryption support?" y
&&
-
-if [[ "$BITLBEE_OTR" == "y" ]]
-then
- if [[ "$BITLBEE_OPTS" == *--plugins=1* ]]
- then
- config_query BITLBEE_OTRPLUGIN "Build OTR support as a plugin?" n &&
- [[ "$BITLBEE_OTRPLUGIN" == "y" ]] && BITLBEE_OPTS="$BITLBEE_OPTS
--otr=plugin"
- else
- BITLBEE_OPTS="$BITLBEE_OPTS --otr=1"
+ if [[ $BITLBEE_SKYPEPLUGIN == y ]]; then
+ list_remove "BITLBEE_OPTS" "--skype=1" &&
+ list_add "BITLBEE_OPTS" "--skype=plugin"
fi
fi &&

+config_query_option BITLBEE_OPTS "Enable debugging?" n \
+ "--debug=1" \
+ "--debug=0" &&
+
config_query_list BITLBEE_SSL "Which SSL library would you like to use?" \
- "openssl" \
- "gnutls" &&
+ gnutls \
+ openssl \
+ nss &&

-config_query_list BITLBEE_EVENT "Which event library would you like to use?"
\
- "glib2" \
- "libevent" &&
+config_query_list BITLBEE_EVENT "Which event handler library would you like
to use?" \
+ glib2 \
+ libevent &&

-config_query BITLBEE_BITLBEED \
- "Build bitlbeed (to run bitlbee without xinetd)?" n
+config_query BITLBEE_BITLBEED "Build bitlbeed (to run bitlbee as a non-root
user)?" n
diff --git a/chat-irc/bitlbee/DEPENDS b/chat-irc/bitlbee/DEPENDS
index ab81f14..fb21fba 100755
--- a/chat-irc/bitlbee/DEPENDS
+++ b/chat-irc/bitlbee/DEPENDS
@@ -1,25 +1,50 @@
-if [[ "$BITLBEE_EVENT" == "glib2" ]]
-then
- depends glib2 "--events=glib" ""
-elif [[ "$BILBEE_EVENT" == "libevent" ]]
-then
- depends libevent "--events=libevent" ""
-fi &&
+depends glib2 &&

-if [[ "$BITLBEE_SSL" == "openssl" ]]
-then
- depends openssl "--ssl=openssl" ""
-elif [[ "$BILBEE_SSL" == "gnutls" ]]
-then
- depends gnutls "--ssl=gnutls" ""
-fi &&
+depends "$BITLBEE_SSL" "--ssl=$BITLBEE_SSL" &&
+depends "$BITLBEE_EVENT" "--events=${BITLBEE_EVENT/glib2/glib}" &&
+
+optional_depends libotr \
+ "--otr=1" \
+ "--otr=0" \
+ "for off-the-record (OTR) encryption support" &&

-if [[ "$BITLBEE_OTR" == "y" ]]
-then
- depends libotr
+if is_depends_enabled $SPELL libotr && list_find "$BITLBEE_OPTS"
"--plugins=1"; then
+ config_query BITLBEE_OTRPLUGIN "Build OTR support as a plugin?" n &&
+
+ if [[ $BITLBEE_OTRPLUGIN == y ]]; then
+ list_remove "BITLBEE_OPTS" "--otr=1" &&
+ list_add "BITLBEE_OPTS" "--otr=plugin"
+ fi
fi &&

optional_depends pidgin \
"--purple=1" \
"--purple=0" \
- "for enabling protocol support via libpurple"
+ "for enabling protocol support via libpurple" &&
+
+if ! is_depends_enabled $SPELL pidgin; then
+ config_query_option BITLBEE_OPTS "Enable Jabber (XMPP) protocol?" y \
+ "--jabber=1" \
+ "--jabber=0" &&
+
+ config_query_option BITLBEE_OPTS "Enable Oscar protocol (for ICQ or AIM)?"
y \
+ "--oscar=1" \
+ "--oscar=0" &&
+
+ config_query_option BITLBEE_OPTS "Enable Yahoo protocol?" y \
+ "--yahoo=1" \
+ "--yahoo=0" &&
+
+ config_query_option BITLBEE_OPTS "Enable MSN protocol?" y \
+ "--msn=1" \
+ "--msn=0"
+else
+ list_add "BITLBEE_OPTS" "--jabber=0" &&
+ list_add "BITLBEE_OPTS" "--oscar=0" &&
+ list_add "BITLBEE_OPTS" "--yahoo=0" &&
+ list_add "BITLBEE_OPTS" "--msn=0"
+fi &&
+
+if ! list_find "$BITLBEE_OPTS" "--skype=0"; then
+ depends asciidoc
+fi
diff --git a/chat-irc/bitlbee/DETAILS b/chat-irc/bitlbee/DETAILS
index 6c1a3f2..27b84e7 100755
--- a/chat-irc/bitlbee/DETAILS
+++ b/chat-irc/bitlbee/DETAILS
@@ -1,15 +1,17 @@
SPELL=bitlbee
- VERSION=3.0.5
+ VERSION=3.2.1
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://get.bitlbee.org/src/$SOURCE
+
SOURCE_HASH=sha512:5df1ab94602a801024a459ef166e5515e94e202773b8ade838c55967865f706291d3b3fa63bdd7737d461e96cf8af2f191d5ea4451e14149ac28edb9f5bfce9f
+ DOCS="doc/AUTHORS doc/CHANGES doc/CREDITS doc/FAQ doc/HACKING
doc/INSTALL doc/README doc/user-guide/user-guide.* $DOCS"
+ DOC_DIRS=""
WEB_SITE=http://www.bitlbee.org
ENTERED=20031024
- SECURITY_PATCH=1
-
SOURCE_HASH=sha512:68a630914c24ceafd35361dfdc1de30a431cb8f549a493ade40c4bf45f83431d60ee5b7642c254657cbaa2b5b6b1f4b49196bd3137699a03d29f1a4d5032b7f9
LICENSE[0]=GPL
KEYWORDS="irc chat"
- SHORT="bitlbee - an IRC gateway to IM chat networks"
+ SHORT="IRC gateway to IM chat networks"
cat << EOF
BitlBee is an IRC daemon that can talk to instant messaging networks
and acts as a gateway. Users can connect to the server with any normal
diff --git a/chat-irc/bitlbee/HISTORY b/chat-irc/bitlbee/HISTORY
index 2eb3c69..06a539e 100644
--- a/chat-irc/bitlbee/HISTORY
+++ b/chat-irc/bitlbee/HISTORY
@@ -1,3 +1,18 @@
+2014-03-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.2.1; quoting paths; fixed short desc
+ * CONFIGURE: readability++; moved libpurple-exclusive plugins to
+ DEPENDS; added skype and debug configure flags; corrected bitlbeed
+ description
+ * DEPENDS: jabber is on by default; fixed typos in ssl/event
selection;
+ added required glib2 dependency; added missing asciidoc dependency
+ when skype is selected
+ * BUILD: removed deprecated '--build'; added [C|LD]FLAGS for bitlbeed;
+ use INSTALL_ROOT; added missing `&&'; added return from utils dir
+ * INSTALL: verbosity++; use INSTALL_ROOT; echo -> message; mkdir+chown
+ -> install
+ * PRE_BUILD: added, to replace unprivileged user in default config
+ * init.d/bitlbee: added init script for daemon/forkdaemon modes
+
2012-07-01 Justin Boffemmyer <flux AT sourcemage.org>
* CONFIGURE: fix missing space

diff --git a/chat-irc/bitlbee/INSTALL b/chat-irc/bitlbee/INSTALL
index 875b94f..1ef9054 100755
--- a/chat-irc/bitlbee/INSTALL
+++ b/chat-irc/bitlbee/INSTALL
@@ -1,19 +1,18 @@
default_install &&
-# repertory for bitlbee to store personnal datas of each user
+# repertory for bitlbee to store personal datas of each user
# allow bitlbee to write in by changing owner
-if ! [ -d /var/lib/bitlbee ]; then
- mkdir /var/lib/bitlbee &&
- chown nobody.nogroup /var/lib/bitlbee
+if ! [ -d "$INSTALL_ROOT/var/lib/bitlbee" ]; then
+ install -vm 700 -d -o nobody -g nogroup "$INSTALL_ROOT/var/lib/bitlbee"
fi &&

# default configuration files installation (bitlbee.conf and motd.txt)
# files removed when dispelled if not modified by user
-if [ -f /etc/bitlbee/bitlbee.conf ]; then
- echo "A Bitlbee configuration file already exists"
+if [ -f "$INSTALL_ROOT/etc/bitlbee/bitlbee.conf" ]; then
+ message "${MESSAGE_COLOR}Bitlbee configuration file already
exists!${DEFAULT_COLOR}"
else
make install-etc
fi

-if [[ "$BITLBEE_BITLBEED" == y ]] ; then
- install utils/bitlbeed /usr/sbin/bitlbeed
+if [[ "$BITLBEE_BITLBEED" == y ]]; then
+ install -vm 755 "utils/bitlbeed" "$INSTALL_ROOT/usr/sbin/bitlbeed"
fi
diff --git a/chat-irc/bitlbee/PRE_BUILD b/chat-irc/bitlbee/PRE_BUILD
new file mode 100755
index 0000000..3bac230
--- /dev/null
+++ b/chat-irc/bitlbee/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+sedit "s:User =.*:User = nobody:" bitlbee.conf
diff --git a/chat-irc/bitlbee/init.d/bitlbee b/chat-irc/bitlbee/init.d/bitlbee
new file mode 100755
index 0000000..0b5431f
--- /dev/null
+++ b/chat-irc/bitlbee/init.d/bitlbee
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+PROGRAM=/usr/sbin/bitlbee
+PIDFILE=/var/run/bitlbee.pid
+ARGS="-P $PIDFILE"
+RUNLEVEL=3
+NEEDS="+network"
+
+. /etc/init.d/smgl_init



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (44989a569abaf1927eb60ecd39b8b68587afa514), Vlad Glagolev, 03/17/2014

Archive powered by MHonArc 2.6.24.

Top of Page