[cvslog] (2002-09-09 23:14:33 UTC) Module eggdrop1.6: Change committed

cvslog cvs at tsss.org
Mon Sep 9 18:15:00 CST 2002


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2002-09-09 23:14:33 UTC
Commited by: Will Buckner <wcc at techmonkeys.org>

Modified files:
     doc/UPDATES1.6 misc/modconfig src/patch.h

Log message:

* Fixed a missing escape in some regexps in misc/modconfig. Patch by darko``.
* Gave credit to the right person in UPDATES1.6 for the invite_fix patch.

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.403 eggdrop1.6/doc/UPDATES1.6:1.404
--- eggdrop1.6/doc/UPDATES1.6:1.403	Sun Sep  1 00:17:39 2002
+++ eggdrop1.6/doc/UPDATES1.6	Mon Sep  9 18:14:23 2002
@@ -1,15 +1,16 @@
-$Id: UPDATES1.6,v 1.403 2002/09/01 05:17:39 wcc Exp $
+$Id: UPDATES1.6,v 1.404 2002/09/09 23:14:23 wcc Exp $
 
 Changes in Eggdrop: (since v1.6.0)
 ----------------------------------
 
 1.6.13
 Found by  Fixed by  What...
+          darko``   fixed a missing escape in some regexps in misc/modconfig
 [sL]      Wcc       channel set #chan chanmode $var corrupted $var in Tcl8.x
           blaster^  don't log "joined #chan but didn't want to" in certain cases where
                     the channel was newly removed or set inactive
           Wcc       cosmetic changes to share_stick_[exempt/invite/ban]
-          TaKeDa    msg_key and msg_invite did not work properly for !channels
+J Lehto   TaKeDa    msg_key and msg_invite did not work properly for !channels
           BarkerJr  show the number of hops in .trace's output
           Mo-Ize    use the proper dynamic lib extention on Mac OSX
           Wiktor    return 5 from dccsend if the file exists in the temp directory and
Index: eggdrop1.6/misc/modconfig
diff -u eggdrop1.6/misc/modconfig:1.9 eggdrop1.6/misc/modconfig:1.10
--- eggdrop1.6/misc/modconfig:1.9	Sun Feb 24 01:37:01 2002
+++ eggdrop1.6/misc/modconfig	Mon Sep  9 18:14:23 2002
@@ -19,7 +19,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-# $Id: modconfig,v 1.9 2002/02/24 07:37:01 guppy Exp $
+# $Id: modconfig,v 1.10 2002/09/09 23:14:23 wcc Exp $
 
 
 mc_pn=`echo $0 | sed -e 's/^.*\///'`
@@ -258,12 +258,12 @@
 		#  Do we have an existing configuration?
 		if (test "${mc_mods_configured}" = yes); then
 			#  Is the module active?
-			if (grep "^${mc_mod}.mod\$" ${mc_fmodules} 1>&7 2>&1)
+			if (grep "^${mc_mod}\.mod\$" ${mc_fmodules} 1>&7 2>&1)
 			then
 				mc_new_mod_state=enabled
 			else
 				#  Was it configured before?
-				if (grep "^${mc_mod}.mod\$" ${mc_fknownmods} 1>&7 2>&1); then
+				if (grep "^${mc_mod}\.mod\$" ${mc_fknownmods} 1>&7 2>&1); then
 					:
 				else
 					mc_new_mod_state=enabled
@@ -309,8 +309,8 @@
 		exit 1
 	fi
 
-	mc_mod_objs=`echo ${mc_sel_modules} | sed -e 's/.mod/.mod_o/g'`
-	mc_mod_libs=`echo ${mc_sel_modules} | sed -e 's/.mod/.mod_so/g'`
+	mc_mod_objs=`echo ${mc_sel_modules} | sed -e 's/\.mod/.mod_o/g'`
+	mc_mod_libs=`echo ${mc_sel_modules} | sed -e 's/\.mod/.mod_so/g'`
 
 	if test ! -f ${mc_fMakefile}; then
 		echo "failed." 1>&6
@@ -347,7 +347,7 @@
 		echo "${mc_pn}: error: no modules selected. You did not run \`make config' yet." 1>&2;
 		exit 1
 	fi
-	mc_sel_modules=`cat ${mc_fmodules} | sed -e 's/.mod//g'`
+	mc_sel_modules=`cat ${mc_fmodules} | sed -e 's/\.mod//g'`
 
 
 	#  Note:  All data is written to `src/mod/static.h' which is
@@ -402,16 +402,16 @@
 	mc_nfmodules="${mc_fmodules}_new"
 
 	#  Remove trailing `.mod'
-	mc_mods=`echo ${mc_paras} | sed -e 's/.mod//g'`
+	mc_mods=`echo ${mc_paras} | sed -e 's/\.mod//g'`
 	for mc_mod in ${mc_mods}; do
 		#  Remove any path information
 		mc_mod=`echo ${mc_mod} | sed -e 's/.*\///'`
 		echo "${mc_pn}: disabling eggdrop module: ${mc_mod}" 1>&6
 
 		#  Add module to the list of known modules.
-		if grep "^${mc_mod}.mod$" ${mc_fknownmods} 1>&7 2>&7; then
+		if grep "^${mc_mod}\.mod$" ${mc_fknownmods} 1>&7 2>&7; then
 			if test ! -d ${mc_mod_dir}/${mc_mod}.mod; then
-				grep -v "^${mc_mod}.mod$" ${mc_fknownmods} \
+				grep -v "^${mc_mod}\.mod$" ${mc_fknownmods} \
 					> ${mc_fknownmods}_new
 				mv ${mc_fknownmods}_new ${mc_fknownmods}
 			fi
@@ -426,7 +426,7 @@
 		# In case there are any active modules ...
 		if test -r ${mc_fmodules}; then
 			#  Remove module from list of active modules.
-			if grep -v "^${mc_mod}.mod$" ${mc_fmodules} \
+			if grep -v "^${mc_mod}\.mod$" ${mc_fmodules} \
 				1> ${mc_nfmodules}
 			then
 				:
@@ -451,15 +451,15 @@
 	fi
 
 	#  Remove trailing `.mod'
-	mc_mods=`echo ${mc_paras} | sed -e 's/.mod//g'`
+	mc_mods=`echo ${mc_paras} | sed -e 's/\.mod//g'`
 	for mc_mod in ${mc_mods}; do
 		#  Remove any path information
 		mc_mod=`echo ${mc_mod} | sed -e 's/.*\///'`
 
 		#  Add module to the list of known modules.
-		if grep "^${mc_mod}.mod$" ${mc_fknownmods} 1>&7 2>&7; then
+		if grep "^${mc_mod}\.mod$" ${mc_fknownmods} 1>&7 2>&7; then
 			if test ! -d ${mc_mod_dir}/${mc_mod}.mod; then
-				grep -v "^${mc_mod}.mod$" ${mc_fknownmods} \
+				grep -v "^${mc_mod}\.mod$" ${mc_fknownmods} \
 					> ${mc_fknownmods}_new
 				mv ${mc_fknownmods}_new ${mc_fknownmods}
 			fi
@@ -472,7 +472,7 @@
 		fi
 
 		#  Add module to the list of active modules.
-		if grep "^${mc_mod}.mod$" ${mc_fmodules} 1>&7 2>&7; then
+		if grep "^${mc_mod}\.mod$" ${mc_fmodules} 1>&7 2>&7; then
 			:
 		else
 			if test ! -d ${mc_mod_dir}/${mc_mod}.mod; then
@@ -629,7 +629,7 @@
 		fi
 
 		#  Remove .mod ending
-		mc_modname=`echo ${mc_mod} | sed -e 's/.mod//g'`
+		mc_modname=`echo ${mc_mod} | sed -e 's/\.mod//g'`
 
 		#  Note: We need to make sure that we only catch module names
 		#        that match _exactly_. e.g. don't mix bseen and seen.
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.816 eggdrop1.6/src/patch.h:1.817
--- eggdrop1.6/src/patch.h:1.816	Sun Sep  1 00:07:51 2002
+++ eggdrop1.6/src/patch.h	Mon Sep  9 18:14:23 2002
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.816 2002/09/01 05:07:51 wcc Exp $
+ * $Id: patch.h,v 1.817 2002/09/09 23:14:23 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1030856653");		/* current unixtime */
+patch("1031612795");		/* current unixtime */
 /*
  *
  *
  */
-patch("chanset-corruption");
+patch("modconfig");
 /*
  *
  *
----------------------- End of diff -----------------------



More information about the Changes mailing list