ircd-ratbox: => 3.0.9 [security]

5 files changed, 18 insertions, 68 deletions

diff --git a/chat-irc/ircd-ratbox/DEPENDS b/chat-irc/ircd-ratbox/DEPENDS
index 4799acb9ad..1ac4947afd 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 89cd0839fd..ab85eb9b6d 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 e7d5d1b9fd..399704d15b 100644
--- a/chat-irc/ircd-ratbox/HISTORY
+++ b/chat-irc/ircd-ratbox/HISTORY
@@ -1,5 +1,12 @@
-2014-08-19  Treeve Jelbert <treeve@sourcemage.org>
-        * DEPENDS: openssl => SSL
+2015-12-16 Vlad Glagolev <stealth@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@sourcemage.org>
+	* DEPENDS: openssl => SSL
 
 2013-01-28 Vlad Glagolev <stealth@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 ad3fa6793f..023b346443 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 6f1fa16ee9..0000000000
--- 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)
- 
-