sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (c8f41703eadd12b39cfba9716f28a6f20c05b677)
- 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 (c8f41703eadd12b39cfba9716f28a6f20c05b677)
- Date: Fri, 19 Apr 2019 03:29:32 +0000
GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:
ChangeLog | 3 ++
chat-im/profanity/DEPENDS | 37
+++++++++++++++++++----------------
chat-im/profanity/DETAILS | 7 +++---
chat-im/profanity/HISTORY | 4 +++
chat-irc/irssi-xmpp/BUILD | 1
chat-irc/irssi-xmpp/DEPENDS | 3 ++
chat-irc/irssi-xmpp/DETAILS | 15 ++++++++++++++
chat-irc/irssi-xmpp/HISTORY | 2 +
chat-irc/irssi-xmpp/INSTALL | 1
chat-libs/libstrophe/DEPENDS | 16 ++++++++++++---
chat-libs/libstrophe/DETAILS | 23 +++++++++++++++++----
chat-libs/libstrophe/HISTORY | 7 ++++++
chat-libs/libstrophe/PREPARE | 3 ++
chat-libs/libstrophe/PRE_BUILD | 11 +++++++---
chat-libs/libstrophe/libressl.patch | 38
++++++++++++++++++++++++++++++++++++
15 files changed, 141 insertions(+), 30 deletions(-)
New commits:
commit c8f41703eadd12b39cfba9716f28a6f20c05b677
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
profanity: => 0.6.0
commit 06be6f93a801bb04a86d5cda0fa05c2359bdf251
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libstrophe: => 0.9.2
commit 3bc9d3e117d2922a0ffe0ff42e1f2c7792406982
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
irssi-xmpp: new spell, XMPP plugin for Irssi
diff --git a/ChangeLog b/ChangeLog
index 675944c..0d3da0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2019-04-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * chat-irc/irssi-xmpp: new spell, XMPP plugin for Irssi
+
2019-04-14 Vlad Glagolev <stealth AT sourcemage.org>
* python-pypi/haishoku: new spell, color scheme generator
* python-pypi/pywal: new spell, generate and change color-schemes on
diff --git a/chat-im/profanity/DEPENDS b/chat-im/profanity/DEPENDS
index 6e10443..644e8ac 100755
--- a/chat-im/profanity/DEPENDS
+++ b/chat-im/profanity/DEPENDS
@@ -1,22 +1,27 @@
-depends ncurses &&
-depends libstrophe &&
-depends glib2 &&
-depends curl &&
+depends ncurses &&
+depends libstrophe &&
+depends glib2 &&
+depends curl &&
-optional_depends expat \
- "" \
- "" \
- "for XML parsing" &&
+optional_depends gtk+2 \
+ "--enable-icons" \
+ "--disable-icons" \
+ "to enable GTK tray icons" &&
-optional_depends libxml2 \
- "--with-libxml2" \
- "" \
- "for XML parsing" &&
+optional_depends gpgme \
+ "--enable-pgp" \
+ "--disable-pgp" \
+ "for PGP support" &&
-optional_depends SSL \
- "" \
- "" \
- "for TLS connections" &&
+optional_depends libotr \
+ "--enable-otr" \
+ "--disable-otr" \
+ "for OTR support" &&
+
+optional_depends python \
+ "--enable-python-plugins" \
+ "--disable-python-plugins" \
+ "for Python plugins support" &&
optional_depends libxscrnsaver \
"--with-xscreensaver" \
diff --git a/chat-im/profanity/DETAILS b/chat-im/profanity/DETAILS
index 1e49f9b..956b8b0 100755
--- a/chat-im/profanity/DETAILS
+++ b/chat-im/profanity/DETAILS
@@ -7,16 +7,17 @@ if [[ ${PROFANITY_BRANCH} == scm ]]; then
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=on
else
- VERSION=0.3.0
+ VERSION=0.6.0
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL[0]=http://www.profanity.im/${SPELL}-${VERSION}.tar.gz
-
SOURCE_HASH=sha512:a6957dc20b7888073ee4c66862b3cff6dd8a46d1ee937120089e3064aabf9b2ee022a14e098202e79d66fb5233576b3cf3c78e2949ca154d501a2b0c60d704af
+
SOURCE_HASH=sha512:c7d8e74b764276f59fccfa029d45271032db315cdbf6e00deccbd611f202983a0930fed99021202333047acee9f3f0d7779cd9bb3628d2e5c4757e3de8c3629e
fi
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ DOC_DIRS=""
WEB_SITE="http://www.profanity.im/";
LICENSE[0]=GPL
ENTERED=20131013
- SHORT="a console based XMPP client"
+ SHORT="Ncurses based XMPP client"
cat << EOF
Profanity is a console based XMPP client written in C using ncurses and
libstrophe, inspired by Irssi.
diff --git a/chat-im/profanity/HISTORY b/chat-im/profanity/HISTORY
index bd15642..4ad7891 100644
--- a/chat-im/profanity/HISTORY
+++ b/chat-im/profanity/HISTORY
@@ -1,3 +1,7 @@
+2019-04-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.6.0
+ * DEPENDS: rewritten
+
2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: openssl => SSL
diff --git a/chat-irc/irssi-xmpp/BUILD b/chat-irc/irssi-xmpp/BUILD
new file mode 100755
index 0000000..c978eaf
--- /dev/null
+++ b/chat-irc/irssi-xmpp/BUILD
@@ -0,0 +1 @@
+make PREFIX="${INSTALL_ROOT}/usr"
diff --git a/chat-irc/irssi-xmpp/DEPENDS b/chat-irc/irssi-xmpp/DEPENDS
new file mode 100755
index 0000000..a312ab2
--- /dev/null
+++ b/chat-irc/irssi-xmpp/DEPENDS
@@ -0,0 +1,3 @@
+depends glib2 &&
+depends loudmouth &&
+depends irssi
diff --git a/chat-irc/irssi-xmpp/DETAILS b/chat-irc/irssi-xmpp/DETAILS
new file mode 100755
index 0000000..88c1719
--- /dev/null
+++ b/chat-irc/irssi-xmpp/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=irssi-xmpp
+ VERSION=0.54
+ SOURCE=${SPELL}-${VERSION}.tar.gz
+
SOURCE_URL[0]=https://github.com/cdidier/${SPELL}/archive/v${VERSION}.tar.gz
+
SOURCE_HASH=sha512:31ddd9e0147eec23d08b8bcbe242e831d612cb2d00f3b56776e9d0b87db9bd76d4bb147422cdf18c0567f0e0463ab828ab7a0ef80a2b35cfdc0a8be962b39f14
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ DOC_DIRS=""
+ WEB_SITE=https://github.com/cdidier/irssi-xmpp
+ LICENSE[0]=GPL
+ ENTERED=20190418
+ KEYWORDS="irc xmpp jabber"
+ SHORT="XMPP plugin for Irssi"
+cat << EOF
+irssi-xmpp is an irssi plugin to connect to the Jabber network.
+EOF
diff --git a/chat-irc/irssi-xmpp/HISTORY b/chat-irc/irssi-xmpp/HISTORY
new file mode 100644
index 0000000..dcbdd70
--- /dev/null
+++ b/chat-irc/irssi-xmpp/HISTORY
@@ -0,0 +1,2 @@
+2019-04-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS, DETAILS, BUILD, INSTALL: created spell, version 0.54
diff --git a/chat-irc/irssi-xmpp/INSTALL b/chat-irc/irssi-xmpp/INSTALL
new file mode 100755
index 0000000..e72b41d
--- /dev/null
+++ b/chat-irc/irssi-xmpp/INSTALL
@@ -0,0 +1 @@
+make PREFIX="${INSTALL_ROOT}/usr" install
diff --git a/chat-libs/libstrophe/DEPENDS b/chat-libs/libstrophe/DEPENDS
index 43c4f1a..e49e09f 100755
--- a/chat-libs/libstrophe/DEPENDS
+++ b/chat-libs/libstrophe/DEPENDS
@@ -1,3 +1,13 @@
-optional_depends expat "" "" "for XML parsing" &&
-optional_depends libxml2 "--with-libxml2" "" "for XML parsing" &&
-optional_depends SSL "" "" "for TLS connections"
+optional_depends libxml2 \
+ "--with-libxml2" \
+ "--without-libxml2" \
+ "to use libxml2 instead of expat for XML parsing" &&
+
+if ! is_depends_enabled ${SPELL} libxml2; then
+ depends expat
+fi &&
+
+optional_depends SSL \
+ "--enable-tls" \
+ "--disable-tls" \
+ "for TLS support"
diff --git a/chat-libs/libstrophe/DETAILS b/chat-libs/libstrophe/DETAILS
index 3e18be9..19c823d 100755
--- a/chat-libs/libstrophe/DETAILS
+++ b/chat-libs/libstrophe/DETAILS
@@ -1,14 +1,27 @@
+. "$GRIMOIRE/FUNCTIONS"
+
SPELL=libstrophe
- VERSION=git
- SOURCE="${SPELL}-${VERSION}.tar.bz2"
+case "${LIBSTROPHE_BRANCH}" in
+ scm)
+ VERSION=$(get_scm_version)
FORCE_DOWNLOAD=on
- SOURCE_IGNORE=volatile
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE_URL[0]=git://github.com/strophe/${SPELL}.git
+ SOURCE_IGNORE=volatile
+ ;;
+ stable)
+ VERSION=0.9.2
+ SOURCE=${SPELL}-${VERSION}.tar.bz2
+
SOURCE_URL=https://github.com/strophe/${SPELL}/releases/download/${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:a1eeb966ef25536144d9cd67fd75f199ef685d9e7e4c03f1d76fe244f29f69409a819656d70374aa6a3a644d4a51bfead4c72500b36c620eaa07f66e11adf1d9
+ ;;
+esac
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://strophe.im/libstrophe/";
- LICENSE[0]=GPL and MIT
+ LICENSE[0]=MIT
+ LICENSE[1]=GPL
ENTERED=20131013
- SHORT="an XMPP library for C"
+ SHORT="minimal XMPP library written in C"
cat << EOF
libstrophe is a minimal XMPP library written in C. It has almost no
external dependencies, only an XML parsing library (expat or libxml are both
diff --git a/chat-libs/libstrophe/HISTORY b/chat-libs/libstrophe/HISTORY
index 3d728cb..6290bb2 100644
--- a/chat-libs/libstrophe/HISTORY
+++ b/chat-libs/libstrophe/HISTORY
@@ -1,3 +1,10 @@
+2019-04-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: added stable branch; updated licenses
+ * PREPARE: added, for multi branch support
+ * DEPENDS: rewritten
+ * PRE_BUILD: apply patch
+ * libressl.patch: added, to fix build against libressl
+
2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: openssl => SSL
diff --git a/chat-libs/libstrophe/PREPARE b/chat-libs/libstrophe/PREPARE
new file mode 100755
index 0000000..c877f27
--- /dev/null
+++ b/chat-libs/libstrophe/PREPARE
@@ -0,0 +1,3 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+
+prepare_select_branch stable scm
diff --git a/chat-libs/libstrophe/PRE_BUILD b/chat-libs/libstrophe/PRE_BUILD
index 6d548c9..8671ce9 100755
--- a/chat-libs/libstrophe/PRE_BUILD
+++ b/chat-libs/libstrophe/PRE_BUILD
@@ -1,3 +1,8 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-./bootstrap.sh
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+patch -p0 < "${SPELL_DIRECTORY}/libressl.patch" &&
+
+if [ ${LIBSTROPHE_BRANCH} = "scm" ]; then
+ ./bootstrap.sh
+fi
diff --git a/chat-libs/libstrophe/libressl.patch
b/chat-libs/libstrophe/libressl.patch
new file mode 100644
index 0000000..bf18a06
--- /dev/null
+++ b/chat-libs/libstrophe/libressl.patch
@@ -0,0 +1,38 @@
+--- src/tls_openssl.c.orig
++++ src/tls_openssl.c
+@@ -52,7 +52,7 @@ static void _tls_dump_cert_info(tls_t *tls);
+
+ void tls_initialize(void)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ SSL_library_init();
+ SSL_load_error_strings();
+ #else
+@@ -67,14 +67,14 @@ void tls_shutdown(void)
+ * openssl after libstrophe finalization. Maybe better leak some fixed
+ * memory rather than cause random crashes of the main program.
+ */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ ERR_free_strings();
+ EVP_cleanup();
+ CRYPTO_cleanup_all_ex_data();
+-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
++#if OPENSSL_VERSION_NUMBER >= 0x10002000L &&
!defined(LIBRESSL_VERSION_NUMBER)
+ SSL_COMP_free_compression_methods();
+ #endif
+-#if OPENSSL_VERSION_NUMBER < 0x10000000L
++#if OPENSSL_VERSION_NUMBER < 0x10000000L || defined(LIBRESSL_VERSION_NUMBER)
+ ERR_remove_state(0);
+ #else
+ ERR_remove_thread_state(NULL);
+@@ -121,7 +121,7 @@ tls_t *tls_new(xmpp_conn_t *conn)
+ /* Trust server's certificate when user sets the flag explicitly. */
+ mode = conn->tls_trust ? SSL_VERIFY_NONE : SSL_VERIFY_PEER;
+ SSL_set_verify(tls->ssl, mode, 0);
+-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
++#if OPENSSL_VERSION_NUMBER >= 0x10002000L &&
!defined(LIBRESSL_VERSION_NUMBER)
+ /* Hostname verification is supported in OpenSSL 1.0.2 and newer. */
+ X509_VERIFY_PARAM *param = SSL_get0_param(tls->ssl);
+
- [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (c8f41703eadd12b39cfba9716f28a6f20c05b677), Vlad Glagolev, 04/18/2019
Archive powered by MHonArc 2.6.24.