Skip to Content.
Sympa Menu

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

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 (e11069fa130509e8fd44caa57bca50b3eb259408)
  • Date: Wed, 9 Nov 2011 10:59:07 -0600

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

ChangeLog | 4 ++
chat-irc/ircd-ratbox/BUILD | 4 --
chat-irc/ircd-ratbox/CONFIGURE | 7 ----
chat-irc/ircd-ratbox/DEPENDS | 8 +----
chat-irc/ircd-ratbox/DETAILS | 2 -
chat-irc/ircd-ratbox/HISTORY | 7 ++++
chat-irc/ircd-ratbox/PRE_BUILD | 14 +--------
chat-irc/ircd-ratbox/setuid-2.patch | 55
------------------------------------
chat-irc/ratbox.gpg |binary
9 files changed, 19 insertions(+), 82 deletions(-)

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

added public key 201FF57E (Aaron Sethman <androsyn AT ratbox.org>)

commit 4344836afa06fa459d2a3c60d303f879a61a0a63
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ircd-ratbox: => 3.0.7 (stable)

diff --git a/ChangeLog b/ChangeLog
index e2035de..4faaa4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * chat-irc/ratbox.gpg: added public key 201FF57E (Aaron Sethman
+ <androsyn AT ratbox.org>)
+
2011-11-08 Ismael Luceno <ismael AT sourcemage.org>
* emacs-lisp/fill-column-indicator: new spell, An Emacs minor mode
that
graphically indicates the fill column
diff --git a/chat-irc/ircd-ratbox/BUILD b/chat-irc/ircd-ratbox/BUILD
index c5f6b48..5303693 100755
--- a/chat-irc/ircd-ratbox/BUILD
+++ b/chat-irc/ircd-ratbox/BUILD
@@ -9,10 +9,6 @@ OPTS="--with-confdir=$INSTALL_ROOT/etc/$SPELL \
$IRCD_RATBOX_OPTS \
$OPTS" &&

-if [[ $IRCD_RATBOX_RELEASE == stable ]]; then
- OPTS="--with-topiclen=$IRCD_RATBOX_TOPICLEN $OPTS"
-fi &&
-
make_single &&
default_build &&
make_normal
diff --git a/chat-irc/ircd-ratbox/CONFIGURE b/chat-irc/ircd-ratbox/CONFIGURE
index b248386..725b181 100755
--- a/chat-irc/ircd-ratbox/CONFIGURE
+++ b/chat-irc/ircd-ratbox/CONFIGURE
@@ -11,9 +11,4 @@ config_query_option IRCD_RATBOX_OPTS "Enable small network
optimizations?" n \
"--disable-small-net" &&

config_query_string IRCD_RATBOX_NICKLEN "Set the nick length (max 50):" \
- 9 &&
-
-if [[ $IRCD_RATBOX_RELEASE == stable ]]; then
- config_query_string IRCD_RATBOX_TOPICLEN "Set the max topic length (max
390):" \
- 160
-fi
+ 9
diff --git a/chat-irc/ircd-ratbox/DEPENDS b/chat-irc/ircd-ratbox/DEPENDS
index 569ce55..25f8c57 100755
--- a/chat-irc/ircd-ratbox/DEPENDS
+++ b/chat-irc/ircd-ratbox/DEPENDS
@@ -10,11 +10,9 @@ optional_depends openssl \
"--disable-openssl" \
"for OpenSSL support" &&

-if [[ $IRCD_RATBOX_RELEASE == testing ]]; then
- optional_depends sqlite \
- "--with-sqlite3=$INSTALL_ROOT/usr" "" \
- "to use system SQLite3 library"
-fi &&
+optional_depends sqlite \
+ "--with-sqlite3=$INSTALL_ROOT/usr" "" \
+ "to use system SQLite3 library" &&

if list_find "$IRCD_RATBOX_OPTS" "--enable-services"; then
suggest_depends ratbox-services "" "" "to install native services package"
diff --git a/chat-irc/ircd-ratbox/DETAILS b/chat-irc/ircd-ratbox/DETAILS
index cefab9e..1ba885f 100755
--- a/chat-irc/ircd-ratbox/DETAILS
+++ b/chat-irc/ircd-ratbox/DETAILS
@@ -5,7 +5,7 @@ if [[ $IRCD_RATBOX_RELEASE == testing ]]; then
SOURCE_URL[0]=http://www.ratbox.org/download/testing/$SOURCE
SOURCE_URL[1]=ftp://ftp.parodius.com/pub/$SPELL/testing/$SOURCE
else
- VERSION=2.2.9
+ VERSION=3.0.7
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://www.ratbox.org/download/$SOURCE
SOURCE_URL[1]=ftp://ftp.parodius.com/pub/$SPELL/$SOURCE
diff --git a/chat-irc/ircd-ratbox/HISTORY b/chat-irc/ircd-ratbox/HISTORY
index 9b4cdcd..ab16667 100644
--- a/chat-irc/ircd-ratbox/HISTORY
+++ b/chat-irc/ircd-ratbox/HISTORY
@@ -1,3 +1,10 @@
+2011-11-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.0.7 (stable)
+ * BUILD, CONFIGURE: removed deprecated options
+ * DEPENDS: removed deprecated selection
+ * PRE_BUILD: apply setuid and ltdl patches with no condition
+ * setuid-2.patch: removed
+
2010-11-25 Vlad Glagolev <stealth AT sourcemage.org>
* {PRE_,}BUILD, CONF{IGURE,LICTS}, DETAILS, DEPENDS, INSTALL, PREPARE,
init.d/ratbox, {libltdl,rundir,setuid-{2,3}}.patch: spell created
diff --git a/chat-irc/ircd-ratbox/PRE_BUILD b/chat-irc/ircd-ratbox/PRE_BUILD
index 0a2ca98..ad3fa67 100755
--- a/chat-irc/ircd-ratbox/PRE_BUILD
+++ b/chat-irc/ircd-ratbox/PRE_BUILD
@@ -2,18 +2,10 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

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

-if [[ $IRCD_RATBOX_RELEASE == testing ]]; then
- patch -p0 < "$SPELL_DIRECTORY/setuid-3.patch"
-else
- patch -p0 < "$SPELL_DIRECTORY/setuid-2.patch"
-fi &&
-
-if [[ $IRCD_RATBOX_RELEASE == testing ]]; then
- patch -p0 < "$SPELL_DIRECTORY/libltdl.patch"
-fi &&
-
-autoreconf -i &&
+autoreconf -fi &&

# post-reconfiguration replace
sed -i "s:@LIBLTDL@:-L@libdir@ -lltdl:" Makefile.in src/Makefile.in
diff --git a/chat-irc/ircd-ratbox/setuid-2.patch
b/chat-irc/ircd-ratbox/setuid-2.patch
deleted file mode 100644
index 547d1e1..0000000
--- a/chat-irc/ircd-ratbox/setuid-2.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- src/ircd.c.orig
-+++ src/ircd.c
-@@ -242,7 +242,6 @@ make_daemon(void)
- }
- else if(pid > 0)
- {
-- print_startup(pid);
- exit(EXIT_SUCCESS);
- }
-
-@@ -510,8 +511,17 @@
- /* Check to see if the user is running us as root, which is a nono */
- if(geteuid() == 0)
- {
-- fprintf(stderr, "Don't run ircd as root!!!\n");
-- return -1;
-+ struct passwd *pw;
-+
-+ if ((pw = getpwnam(IRCD_USER)) == NULL) {
-+ fprintf(stderr, "Don't run ircd as root!!!\n");
-+ exit(EXIT_FAILURE);
-+ }
-+
-+ if (seteuid(pw->pw_uid) < 0) {
-+ fprintf(stderr, "Can's set effective user ID to
%s!\n", IRCD_USER);
-+ exit(EXIT_FAILURE);
-+ }
- }
-
- /*
---- include/stdinc.h.orig
-+++ include/stdinc.h
-@@ -85,6 +85,8 @@ char *alloca();
- #include <stdarg.h>
- #include <signal.h>
- #include <ctype.h>
-+#include <unistd.h>
-+#include <pwd.h>
-
- #include <limits.h>
-
---- include/config.h.orig
-+++ include/config.h
-@@ -45,6 +45,11 @@
- * AUTOMODPATH = directory for autoloaded modules
- */
-
-+/* users */
-+#ifndef IRCD_USER
-+#define IRCD_USER "ratbox"
-+#endif
-+
- /* dirs */
- #define DPATH IRCD_PREFIX
- #define BINPATH IRCD_PREFIX "/bin/"
diff --git a/chat-irc/ratbox.gpg b/chat-irc/ratbox.gpg
index 9ff7aec..3c983e8 100644
Binary files a/chat-irc/ratbox.gpg and b/chat-irc/ratbox.gpg differ



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (e11069fa130509e8fd44caa57bca50b3eb259408), Vlad Glagolev, 11/09/2011

Archive powered by MHonArc 2.6.24.

Top of Page