Skip to Content.
Sympa Menu

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

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 (32b9ee958b88eaccb0f443ccbccb0e7b7d9a9fd6)
  • Date: Wed, 16 Dec 2015 18:39:48 +0000

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

chat-irc/ircd-ratbox/DEPENDS | 9 +++--
chat-irc/ircd-ratbox/DETAILS | 4 +-
chat-irc/ircd-ratbox/HISTORY | 11 +++++--
chat-irc/ircd-ratbox/PRE_BUILD | 6 ---
chat-irc/ircd-ratbox/libltdl.patch | 56
-------------------------------------
5 files changed, 18 insertions(+), 68 deletions(-)

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

ircd-ratbox: => 3.0.9 [security]

diff --git a/chat-irc/ircd-ratbox/DEPENDS b/chat-irc/ircd-ratbox/DEPENDS
index 4799acb..1ac4947 100755
--- a/chat-irc/ircd-ratbox/DEPENDS
+++ b/chat-irc/ircd-ratbox/DEPENDS
@@ -1,4 +1,7 @@
-depends libtool &&
+optional_depends libtool \
+ "--without-included-ltdl" \
+ "--with-included-ltdl" \
+ "to use system ltdl" &&

optional_depends zlib \
"--enable-zlib" \
@@ -6,8 +9,8 @@ optional_depends zlib \
"for ziplinks support" &&

optional_depends SSL \
- "--enable-SSL" \
- "--disable-SSL" \
+ "--enable-openssl" \
+ "--disable-openssl" \
"for OpenSSL support" &&

optional_depends sqlite \
diff --git a/chat-irc/ircd-ratbox/DETAILS b/chat-irc/ircd-ratbox/DETAILS
index 89cd083..ab85eb9 100755
--- a/chat-irc/ircd-ratbox/DETAILS
+++ b/chat-irc/ircd-ratbox/DETAILS
@@ -5,8 +5,8 @@ if [[ $IRCD_RATBOX_RELEASE == testing ]]; then
SOURCE_URL[0]=http://www.ratbox.org/download/testing/$SOURCE
SOURCE_URL[1]=http://mirrors.gigenet.com/ratbox/testing/$SOURCE
else
- VERSION=3.0.8
- SECURITY_PATCH=1
+ VERSION=3.0.9
+ SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://www.ratbox.org/download/$SOURCE
SOURCE_URL[1]=http://mirrors.gigenet.com/ratbox/$SOURCE
diff --git a/chat-irc/ircd-ratbox/HISTORY b/chat-irc/ircd-ratbox/HISTORY
index e7d5d1b..399704d 100644
--- a/chat-irc/ircd-ratbox/HISTORY
+++ b/chat-irc/ircd-ratbox/HISTORY
@@ -1,5 +1,12 @@
-2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: openssl => SSL
+2015-12-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.0.9 (stable); SECURITY_PATCH++
+ (CVE-2015-5290)
+ * DEPENDS: made libtool optional; fixed SSL configure flags
+ * PRE_BUILD: updated for current release
+ * libltdl.patch: dropped, fixed by upstream
+
+2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: openssl => SSL

2013-01-28 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: SECURITY_PATCH=1 (CVE-2012-6084)
diff --git a/chat-irc/ircd-ratbox/PRE_BUILD b/chat-irc/ircd-ratbox/PRE_BUILD
index ad3fa67..023b346 100755
--- a/chat-irc/ircd-ratbox/PRE_BUILD
+++ b/chat-irc/ircd-ratbox/PRE_BUILD
@@ -3,9 +3,5 @@ cd "$SOURCE_DIRECTORY" &&

patch -p0 < "$SPELL_DIRECTORY/rundir.patch" &&
patch -p0 < "$SPELL_DIRECTORY/setuid-3.patch" &&
-patch -p0 < "$SPELL_DIRECTORY/libltdl.patch" &&

-autoreconf -fi &&
-
-# post-reconfiguration replace
-sed -i "s:@LIBLTDL@:-L@libdir@ -lltdl:" Makefile.in src/Makefile.in
+autoreconf -fi
diff --git a/chat-irc/ircd-ratbox/libltdl.patch
b/chat-irc/ircd-ratbox/libltdl.patch
deleted file mode 100644
index 6f1fa16..0000000
--- a/chat-irc/ircd-ratbox/libltdl.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- Makefile.in.orig
-+++ Makefile.in
-@@ -102,7 +102,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=
- distdir dist dist-all distcheck
- ETAGS = etags
- CTAGS = ctags
--DIST_SUBDIRS = libratbox libltdl src modules tools doc help bandb ssld \
-+DIST_SUBDIRS = libratbox src modules tools doc help bandb ssld \
- resolver
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
-@@ -295,10 +295,10 @@ servicesdir = @moduledir@/autoload
- AM_CFLAGS = $(WARNFLAGS)
- ircd_SOURCES = main.c
- @MINGW_TRUE@EXTRA_FLAGS = -no-undefined -Wl,--enable-runtime-pseudo-reloc
-export-symbols-regex '*'
--@STATIC_MODULES_FALSE@SUBDIRS = libratbox libltdl src modules tools doc
help bandb ssld resolver
--@STATIC_MODULES_TRUE@SUBDIRS = libratbox libltdl modules src tools doc help
bandb ssld resolver
--@STATIC_MODULES_FALSE@ircd_LDADD = libratbox/src/libratbox.la
src/libcore.la $(LIBLTDL)
--@STATIC_MODULES_TRUE@ircd_LDADD = libratbox/src/libratbox.la
modules/libmodules.la src/libcore.la modules/static_modules.o $(LIBLTDL)
$(DLOPEN)
-+@STATIC_MODULES_FALSE@SUBDIRS = libratbox src modules tools doc help bandb
ssld resolver
-+@STATIC_MODULES_TRUE@SUBDIRS = libratbox modules src tools doc help bandb
ssld resolver
-+@STATIC_MODULES_FALSE@ircd_LDADD = libratbox/src/libratbox.la src/libcore.la
-+@STATIC_MODULES_TRUE@ircd_LDADD = libratbox/src/libratbox.la
modules/libmodules.la src/libcore.la modules/static_modules.o $(DLOPEN)
- @STATIC_MODULES_FALSE@ircd_LDFLAGS = $(EXTRA_FLAGS) -dlopen self
- all: all-recursive
-
---- configure.ac.orig
-+++ configure.ac
-@@ -109,7 +109,7 @@ done
-
- LIBTOOL="$LIBTOOL --silent"
-
--AC_CONFIG_SUBDIRS(libltdl libratbox)
-+AC_CONFIG_SUBDIRS(libratbox)
-
- case "$host_os" in
- *cygwin*)
---- Makefile.am.orig
-+++ Makefile.am
-@@ -24,14 +24,14 @@
-
- if !STATIC_MODULES
-
--SUBDIRS = libratbox libltdl src modules tools doc help bandb ssld resolver
-+SUBDIRS = libratbox src modules tools doc help bandb ssld resolver
-
- ircd_LDADD = libratbox/src/libratbox.la src/libcore.la $(LIBLTDL)
- ircd_LDFLAGS = $(EXTRA_FLAGS) -dlopen self
-
- else
-
--SUBDIRS = libratbox libltdl modules src tools doc help bandb ssld resolver
-+SUBDIRS = libratbox modules src tools doc help bandb ssld resolver
- ircd_LDADD = libratbox/src/libratbox.la modules/libmodules.la
src/libcore.la modules/static_modules.o $(LIBLTDL) $(DLOPEN)
-
-



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (32b9ee958b88eaccb0f443ccbccb0e7b7d9a9fd6), Vlad Glagolev, 12/16/2015

Archive powered by MHonArc 2.6.24.

Top of Page