sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (892963086e3e3d9c4b9e12198f114d21148b20a5)
- 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 (892963086e3e3d9c4b9e12198f114d21148b20a5)
- Date: Sun, 19 Apr 2020 20:15:47 +0000
GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:
chat-irc/bitlbee/CONFIGURE | 24 +++++++++++-------------
chat-irc/bitlbee/DEPENDS | 33 ++++++++++++---------------------
chat-irc/bitlbee/DETAILS | 4 ++--
chat-irc/bitlbee/HISTORY | 7 +++++++
chat-irc/bitlbee/PRE_BUILD | 4 +++-
chat-irc/bitlbee/libressl.patch | 11 +++++++++++
6 files changed, 46 insertions(+), 37 deletions(-)
New commits:
commit 892963086e3e3d9c4b9e12198f114d21148b20a5
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
bitlbee: => 3.6
diff --git a/chat-irc/bitlbee/CONFIGURE b/chat-irc/bitlbee/CONFIGURE
index 993189e..c410c6b 100755
--- a/chat-irc/bitlbee/CONFIGURE
+++ b/chat-irc/bitlbee/CONFIGURE
@@ -1,3 +1,14 @@
+# remove obsolete options from BITLBEE_OPTS
+list_remove BITLBEE_OPTS '--skype=1' &&
+list_remove BITLBEE_OPTS '--skype=0' &&
+list_remove BITLBEE_OPTS '--skype=plugin' &&
+list_remove BITLBEE_OPTS '--msn=1' &&
+list_remove BITLBEE_OPTS '--msn=0' &&
+list_remove BITLBEE_OPTS '--yahoo=1' &&
+list_remove BITLBEE_OPTS '--yahoo=0' &&
+list_remove BITLBEE_OPTS '--oscar=1' &&
+list_remove BITLBEE_OPTS '--oscar=0' &&
+
config_query_option BITLBEE_OPTS "Enable plugin support?" y \
"--plugins=1" \
"--plugins=0" &&
@@ -6,19 +17,6 @@ config_query_option BITLBEE_OPTS "Enable Twitter protocol?"
y \
"--twitter=1" \
"--twitter=0" &&
-config_query_option BITLBEE_OPTS "Enable Skype support?" n \
- "--skype=1" \
- "--skype=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 &&
-
- 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" &&
diff --git a/chat-irc/bitlbee/DEPENDS b/chat-irc/bitlbee/DEPENDS
index bb8d168..3cdfc4e 100755
--- a/chat-irc/bitlbee/DEPENDS
+++ b/chat-irc/bitlbee/DEPENDS
@@ -14,6 +14,16 @@ esac &&
depends "$BITLBEE_EVENT" "--events=${BITLBEE_EVENT/glib2/glib}" &&
+optional_depends linux-pam \
+ "--pam=1" \
+ "--pam=0" \
+ "for PAM authentication support" &&
+
+optional_depends openldap \
+ "--ldap=1" \
+ "--ldap=0" \
+ "for LDAP authentication support" &&
+
optional_depends libotr \
"--otr=1" \
"--otr=0" \
@@ -36,26 +46,7 @@ optional_depends pidgin \
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"
+ "--jabber=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
+ list_add "BITLBEE_OPTS" "--jabber=0"
fi
diff --git a/chat-irc/bitlbee/DETAILS b/chat-irc/bitlbee/DETAILS
index eb27bdd..c649c1d 100755
--- a/chat-irc/bitlbee/DETAILS
+++ b/chat-irc/bitlbee/DETAILS
@@ -1,10 +1,10 @@
SPELL=bitlbee
- VERSION=3.5.1
+ VERSION=3.6
SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://get.bitlbee.org/src/$SOURCE
-
SOURCE_HASH=sha512:4eb3b0d3a92910c8dd789cd23338cc6296bf40212c5244fcb27a88ede10e86424ea59c78e719841863701a7fdd8c61819f2775f7b58833e287d9110e49d036f3
+
SOURCE_HASH=sha512:ccbf0f23e228de2de147241f36f59744b2256cba958e2fabfba0cfa60935e55bbb7d7e20fffa54da9a345e55ffa9ca82cb62e9b99dc738ba35c6e268c6561a8d
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
diff --git a/chat-irc/bitlbee/HISTORY b/chat-irc/bitlbee/HISTORY
index 1452516..b154d8c 100644
--- a/chat-irc/bitlbee/HISTORY
+++ b/chat-irc/bitlbee/HISTORY
@@ -1,3 +1,10 @@
+2020-04-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.6
+ * DEPENDS: added linux-pam and openldap optional dependencies
+ * CONFIGURE: dropped unsupported options
+ * PRE_BUILD: apply patch
+ * libressl.patch: added, to fix build with libressl
+
2017-05-19 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.5.1; SECURITY_PATCH++
diff --git a/chat-irc/bitlbee/PRE_BUILD b/chat-irc/bitlbee/PRE_BUILD
index 3bac230..1965bcd 100755
--- a/chat-irc/bitlbee/PRE_BUILD
+++ b/chat-irc/bitlbee/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
+cd "${SOURCE_DIRECTORY}" &&
+
+patch -p0 < "${SPELL_DIRECTORY}/libressl.patch" &&
sedit "s:User =.*:User = nobody:" bitlbee.conf
diff --git a/chat-irc/bitlbee/libressl.patch b/chat-irc/bitlbee/libressl.patch
new file mode 100644
index 0000000..da4a51a
--- /dev/null
+++ b/chat-irc/bitlbee/libressl.patch
@@ -0,0 +1,11 @@
+--- lib/ssl_openssl.c.orig 2019-02-07 19:53:38.000000000 +0000
++++ lib/ssl_openssl.c 2020-04-19 19:55:29.951927356 +0000
+@@ -64,7 +64,7 @@
+ {
+ const SSL_METHOD *meth;
+
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L ||
(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2060000fL)
+ SSL_library_init();
+
+ meth = SSLv23_client_method();
- [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (892963086e3e3d9c4b9e12198f114d21148b20a5), Vlad Glagolev, 04/19/2020
Archive powered by MHonArc 2.6.24.