Skip to Content.
Sympa Menu

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

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 (3667a1b27de79f732fadf8d9ae76d8c627b1a64c)
  • Date: Sat, 23 Mar 2013 03:27:50 -0500

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

chat-irc/znc/CONFIGURE | 22 +++++++++++++++++++---
chat-irc/znc/DEPENDS | 49
++++++++++++++++++++++++-------------------------
chat-irc/znc/DETAILS | 4 ++--
chat-irc/znc/HISTORY | 7 +++++++
chat-irc/znc/znc.gpg |binary
dev/null |binary
6 files changed, 52 insertions(+), 30 deletions(-)

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

znc: => 1.0

diff --git a/chat-irc/znc/CB8FCB06.gpg b/chat-irc/znc/CB8FCB06.gpg
deleted file mode 100644
index a67956d..0000000
Binary files a/chat-irc/znc/CB8FCB06.gpg and /dev/null differ
diff --git a/chat-irc/znc/CONFIGURE b/chat-irc/znc/CONFIGURE
index cbacfb0..e4f1912 100755
--- a/chat-irc/znc/CONFIGURE
+++ b/chat-irc/znc/CONFIGURE
@@ -1,3 +1,19 @@
-config_query_option ZNC_OPTS "Build some extra modules?" y \
- "--enable-extra" \
- "--disable-extra"
+# remove obsolete options from ZNC_OPTS
+list_remove ZNC_OTS "--enable-extra" &&
+list_remove ZNC_OTS "--disable-extra" &&
+
+config_query_option ZNC_OPTS "Enable threads usage for DNS resolving?" y \
+ "--enable-tdns" \
+ "--disable-tdns" &&
+
+config_query_option ZNC_OPTS "Enable ipv6 support?" y \
+ "--enable-ipv6" \
+ "--disable-ipv6" &&
+
+config_query_option ZNC_OPTS "Use select() instead of poll()?" n \
+ "--disable-poll" \
+ "--enable-poll" &&
+
+config_query_option ZNC_OPTS "Enable debugging?" n \
+ "--enable-debug" \
+ "--disable-debug"
diff --git a/chat-irc/znc/DEPENDS b/chat-irc/znc/DEPENDS
index 491572e..5074274 100755
--- a/chat-irc/znc/DEPENDS
+++ b/chat-irc/znc/DEPENDS
@@ -2,16 +2,10 @@

depends -sub CXX gcc &&

-message "NOTE: ZNC needs swig enabled for modperl/modpython support" &&
-
optional_depends perl \
"--enable-perl" \
"--disable-perl" \
- "to use perl" &&
-
-if is_depends_enabled $SPELL perl; then
- depends -sub PERL swig '--enable-swig'
-fi &&
+ "to use Perl" &&

if spell_ok python3; then
local PYTHON3_BRANCH=$(installed_version python3 | cut -d. -f1,2)
@@ -24,12 +18,27 @@ optional_depends python3 \
"--disable-python" \
"to use Python" &&

-if is_depends_enabled $SPELL python3; then
- depends -sub PYTHON3 swig '--enable-swig' &&
+if is_depends_enabled $SPELL perl || is_depends_enabled $SPELL python3; then
+ optional_depends swig \
+ "--enable-swig" \
+ "--disable-swig" \
+ "for automatic generation of source files needed for
modperl/modpython" &&
+
+ if is_depends_enabled $SPELL swig; then
+ if is_depends_enabled $SPELL perl; then
+ depends -sub PERL swig
+ fi &&
+
+ if is_depends_enabled $SPELL python3; then
+ depends -sub PYTHON3 swig
+ fi &&

- if spell_ok swig && is_version_less $(installed_version swig) 2.0.4; then
- force_depends swig
+ if spell_ok swig && is_version_less $(installed_version swig) 2.0.4; then
+ force_depends swig
+ fi
fi
+else
+ list_add ZNC_OPTS "--disable-swig"
fi &&

optional_depends tcl \
@@ -37,20 +46,10 @@ optional_depends tcl \
"--disable-tcl" \
"to use TCL" &&

-if is_depends_enabled $SPELL tcl && list_find "--disable-extra" "$ZNC_OPTS";
then
- message "Requested TCL support, forcing build of extra modules" &&
- ZNC_OPTS="--enable-extra $ZNC_OPTS"
-fi &&
-
-optional_depends cyrus-sasl \
- "--enable-sasl" \
- "--disable-sasl" \
- "for SASL support" &&
-
-optional_depends c-ares \
- "--enable-c-ares" \
- "--disable-c-ares" \
- "for c-ares usage" &&
+optional_depends LIBSASL \
+ "--enable-cyrus" \
+ "--disable-cyrus" \
+ "for SASL support via cyrus" &&

optional_depends openssl \
"--enable-openssl" \
diff --git a/chat-irc/znc/DETAILS b/chat-irc/znc/DETAILS
index c14047b..25b0190 100755
--- a/chat-irc/znc/DETAILS
+++ b/chat-irc/znc/DETAILS
@@ -1,11 +1,11 @@
SPELL=znc
- VERSION=0.206
+ VERSION=1.0
SECURITY_PATCH=3
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=http://znc.in/releases/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
- SOURCE_GPG=CB8FCB06.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE_GPG=znc.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://en.znc.in/
diff --git a/chat-irc/znc/HISTORY b/chat-irc/znc/HISTORY
index 9736877..413ea2f 100644
--- a/chat-irc/znc/HISTORY
+++ b/chat-irc/znc/HISTORY
@@ -1,3 +1,10 @@
+2013-03-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.0
+ * DEPENDS: renewed dependencies and flags
+ * CONFIGURE: added missing options; removed obsolete options
+ * CB8FCB06.gpg: dropped
+ * znc.gpg: added 0209989E public key (Alexey Sokolov
<ktonibud AT gmail.com>)
+
2012-04-14 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.206

diff --git a/chat-irc/znc/znc.gpg b/chat-irc/znc/znc.gpg
new file mode 100644
index 0000000..5ef2d1c
Binary files /dev/null and b/chat-irc/znc/znc.gpg differ



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (3667a1b27de79f732fadf8d9ae76d8c627b1a64c), Vlad Glagolev, 03/23/2013

Archive powered by MHonArc 2.6.24.

Top of Page