SOURCES: eggdrop-autobotchk.patch, eggdrop-bz-463.patch, eggdrop-config_enc...

duddits duddits at pld-linux.org
Tue Sep 23 12:07:34 CEST 2008 

Author: duddits                      Date: Tue Sep 23 10:07:34 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated to work with 1.6.19

---- Files affected:
SOURCES:
   eggdrop-autobotchk.patch (1.1 -> 1.2) , eggdrop-bz-463.patch (1.2 -> 1.3) , eggdrop-config_encryption.patch (1.2 -> 1.3) , eggdrop-FHS.patch (1.4 -> 1.5) , eggdrop-ssl.patch (1.3 -> 1.4) , eggdrop-topicprot.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/eggdrop-autobotchk.patch
diff -u SOURCES/eggdrop-autobotchk.patch:1.1 SOURCES/eggdrop-autobotchk.patch:1.2
--- SOURCES/eggdrop-autobotchk.patch:1.1	Tue May  6 15:40:54 2003
+++ SOURCES/eggdrop-autobotchk.patch	Tue Sep 23 12:07:26 2008
@@ -1,7 +1,7 @@
-diff -urN eggdrop1.6.15/scripts/autobotchk eggdrop1.6.15-autobotchk/scripts/autobotchk
---- eggdrop1.6.15/scripts/autobotchk	Mon May  5 00:05:32 2003
-+++ eggdrop1.6.15-autobotchk/scripts/autobotchk	Tue May  6 15:38:37 2003
-@@ -99,7 +99,7 @@
+diff -burNp eggdrop1.6.19/scripts/autobotchk eggdrop1.6.19.new/scripts/autobotchk
+--- eggdrop1.6.19/scripts/autobotchk	2003-04-15 19:41:57.000000000 +0200
++++ eggdrop1.6.19.new/scripts/autobotchk	2008-09-22 12:38:36.447797899 +0200
+@@ -99,7 +99,7 @@ set delay 10
  set email 1
  
  # If you renamed your eggdrop binary, you should change this variable
@@ -10,7 +10,7 @@
  
  while {[set opt [newsplit argv]] != ""} {
    switch -- $opt {
-@@ -143,16 +143,6 @@
+@@ -143,16 +143,6 @@ if {[string match "*/scripts" $dir]} {
  
  set dir [string trimright $dir /]
  

================================================================
Index: SOURCES/eggdrop-bz-463.patch
diff -u SOURCES/eggdrop-bz-463.patch:1.2 SOURCES/eggdrop-bz-463.patch:1.3
--- SOURCES/eggdrop-bz-463.patch:1.2	Sun Mar  9 21:28:39 2008
+++ SOURCES/eggdrop-bz-463.patch	Tue Sep 23 12:07:26 2008
@@ -1,6 +1,7 @@
---- src/tcl.c.org	2008-03-09 12:56:37.212570719 +0100
-+++ src/tcl.c	2008-03-09 12:56:59.183621062 +0100
-@@ -292,7 +292,7 @@
+diff -burNp eggdrop1.6.19/src/tcl.c eggdrop1.6.19-new/src/tcl.c
+--- eggdrop1.6.19/src/tcl.c	2008-02-16 22:41:04.000000000 +0100
++++ eggdrop1.6.19-new/src/tcl.c	2008-09-22 16:45:55.460597054 +0200
+@@ -282,7 +282,7 @@ static char *tcl_eggstr(ClientData cdata
        if (!obj)
          return NULL;
        len = 0;
@@ -9,7 +10,7 @@
        if (!bytes)
          return NULL;
        s = malloc(len + 1);
-@@ -350,7 +350,7 @@
+@@ -339,7 +339,7 @@ static int utf_converter(ClientData cdat
    utftot += sizeof(char *) * objc;
    objc -= 5;
    for (i = 0; i < objc; i++) {

================================================================
Index: SOURCES/eggdrop-config_encryption.patch
diff -u SOURCES/eggdrop-config_encryption.patch:1.2 SOURCES/eggdrop-config_encryption.patch:1.3
--- SOURCES/eggdrop-config_encryption.patch:1.2	Tue May  6 15:45:15 2003
+++ SOURCES/eggdrop-config_encryption.patch	Tue Sep 23 12:07:27 2008
@@ -1,8 +1,8 @@
-diff -urN eggdrop1.6.15/eggdrop.conf eggdrop1.6.15-config_encryption/eggdrop.conf
---- eggdrop1.6.15/eggdrop.conf	Mon May  5 00:05:32 2003
-+++ eggdrop1.6.15-config_encryption/eggdrop.conf	Tue May  6 15:44:42 2003
-@@ -1273,15 +1273,18 @@
- #loadmodule seen
+diff -burNp eggdrop1.6.19/eggdrop.conf eggdrop1.6.19-new/eggdrop.conf
+--- eggdrop1.6.19/eggdrop.conf	2008-02-16 21:15:30.000000000 +0100
++++ eggdrop1.6.19-new/eggdrop.conf	2008-09-23 11:32:44.879761861 +0200
+@@ -422,14 +422,19 @@ die "Please make sure you edit your conf
+ set mod-path "modules/"
  
  
 -#### BLOWFISH MODULE ####
@@ -13,12 +13,13 @@
  # Please note that when you change your encryption method later (i.e.
  # using other modules like a md5 module), you can't use your current
  # userfile anymore. Eggdrop will not start without an encryption module.
-+# Choose only one of the following
- #loadmodule blowfish
--
+-loadmodule blowfish
++# WARNING! rijndael temporarily disabled, do not use it.
++# # Choose only one of the following:
++#loadmodule blowfish
 +#loadmodule idea
 +#loadmodule twofish
-+#loadmodule rijndael
++#loadmodule rijndael (do not use it, needs fixing)
  
- #### ASSOC MODULE ####
  
+ #### DNS MODULE ####

================================================================
Index: SOURCES/eggdrop-FHS.patch
diff -u SOURCES/eggdrop-FHS.patch:1.4 SOURCES/eggdrop-FHS.patch:1.5
--- SOURCES/eggdrop-FHS.patch:1.4	Mon Oct 18 00:47:50 2004
+++ SOURCES/eggdrop-FHS.patch	Tue Sep 23 12:07:27 2008
@@ -1,16 +1,17 @@
-diff -burN eggdrop1.6.17.orig/configure eggdrop1.6.17/configure
---- eggdrop1.6.17.orig/configure	2004-10-18 00:15:56.795954240 +0200
-+++ eggdrop1.6.17/configure	2004-10-18 00:23:38.287796816 +0200
-@@ -315,7 +315,7 @@
+diff -burNp eggdrop1.6.19/configure eggdrop1.6.19.new/configure
+--- eggdrop1.6.19/configure	2008-04-19 06:21:20.000000000 +0200
++++ eggdrop1.6.19.new/configure	2008-09-22 09:29:38.000000000 +0200
+@@ -315,7 +315,8 @@ ac_includes_default="\
  # include <unistd.h>
  #endif"
  
 -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS egg_ac_parameters CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE RANLIB ac_ct_RANLIB LN_S HEAD_1 STRIP AWK BASENAME UNAME DEFAULT_MAKE MOD_EXT MODULE_XLIBS MOD_LD MOD_CC MOD_STRIP SHLIB_LD SHLIB_CC SHLIB_STRIP EGGEXEC TCLLIB TCLLIBFN TCLINC TCLINCFN TCL_REQS TCL_LIBS EGGVERSION DEST MOD_UPDIR LIBOBJS LTLIBOBJS'
 +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS egg_ac_parameters CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE RANLIB ac_ct_RANLIB LN_S HEAD_1 STRIP AWK BASENAME UNAME DEFAULT_MAKE MOD_EXT MODULE_XLIBS MOD_LD MOD_CC MOD_STRIP SHLIB_LD SHLIB_CC SHLIB_STRIP EGGEXEC TCLLIB TCLLIBFN TCLINC TCLINCFN TCL_REQS TCL_LIBS EGGVERSION DESTDIR MOD_UPDIR LIBOBJS LTLIBOBJS'
++
  ac_subst_files=''
  
  # Initialize some variables set by options.
-@@ -10113,8 +10113,8 @@
+@@ -10129,8 +10130,8 @@ _ACEOF
  
  
  
@@ -21,7 +22,7 @@
    fi
  
  
-@@ -10812,7 +10812,7 @@
+@@ -10828,7 +10829,7 @@ s, at TCLINCFN@,$TCLINCFN,;t t
  s, at TCL_REQS@,$TCL_REQS,;t t
  s, at TCL_LIBS@,$TCL_LIBS,;t t
  s, at EGGVERSION@,$EGGVERSION,;t t
@@ -30,9 +31,9 @@
  s, at MOD_UPDIR@,$MOD_UPDIR,;t t
  s, at LIBOBJS@,$LIBOBJS,;t t
  s, at LTLIBOBJS@,$LTLIBOBJS,;t t
-diff -burN eggdrop1.6.17.orig/doc/html/compiling.html eggdrop1.6.17/doc/html/compiling.html
---- eggdrop1.6.17.orig/doc/html/compiling.html	2004-10-18 00:15:56.620980840 +0200
-+++ eggdrop1.6.17/doc/html/compiling.html	2004-10-18 00:24:19.855477568 +0200
+diff -burNp eggdrop1.6.19/doc/html/compiling.html eggdrop1.6.19.new/doc/html/compiling.html
+--- eggdrop1.6.19/doc/html/compiling.html	2008-02-16 22:40:58.000000000 +0100
++++ eggdrop1.6.19.new/doc/html/compiling.html	2008-09-22 09:32:52.000000000 +0200
 @@ -147,7 +147,7 @@
  
          <blockquote>
@@ -42,7 +43,7 @@
  </pre>
          </blockquote>
  
-@@ -155,7 +155,7 @@
+@@ -155,7 +155,7 @@ make install DEST=&lt;directory&gt;
  
          <blockquote>
  <pre>
@@ -51,7 +52,7 @@
  </pre>
          </blockquote>
        </ol>
-@@ -255,7 +255,7 @@
+@@ -255,7 +255,7 @@ sh5 ./configure --with-tclinc=&#39;&lt;f
  
            <blockquote>
  <pre>
@@ -60,7 +61,7 @@
  </pre>
            </blockquote>
  
-@@ -263,7 +263,7 @@
+@@ -263,7 +263,7 @@ gmake install DEST=&#39;directory&#39;
  
            <blockquote>
  <pre>
@@ -69,7 +70,7 @@
  </pre>
            </blockquote></li>
          </ol>
-@@ -389,14 +389,14 @@
+@@ -389,14 +389,14 @@ tar -zxf eggdrop1.6.19.tar.gz
  
            <li>Compile the bot using &#39;make eggdrop&#39;.<br><br></li>
  
@@ -86,9 +87,9 @@
  </pre>
            </blockquote>
  
-diff -burN eggdrop1.6.17.orig/doc/html/faqs.html eggdrop1.6.17/doc/html/faqs.html
---- eggdrop1.6.17.orig/doc/html/faqs.html	2004-10-18 00:15:56.612982056 +0200
-+++ eggdrop1.6.17/doc/html/faqs.html	2004-10-18 00:24:19.882473464 +0200
+diff -burNp eggdrop1.6.19/doc/html/faqs.html eggdrop1.6.19.new/doc/html/faqs.html
+--- eggdrop1.6.19/doc/html/faqs.html	2008-02-16 22:40:58.000000000 +0100
++++ eggdrop1.6.19.new/doc/html/faqs.html	2008-09-22 09:36:32.000000000 +0200
 @@ -254,7 +254,7 @@
  
            <li>
@@ -98,9 +99,9 @@
              and install your bot.</p>
            </li>
  
-diff -burN eggdrop1.6.17.orig/doc/html/install.html eggdrop1.6.17/doc/html/install.html
---- eggdrop1.6.17.orig/doc/html/install.html	2004-10-18 00:15:56.623980384 +0200
-+++ eggdrop1.6.17/doc/html/install.html	2004-10-18 00:24:19.894471640 +0200
+diff -burNp eggdrop1.6.19/doc/html/install.html eggdrop1.6.19.new/doc/html/install.html
+--- eggdrop1.6.19/doc/html/install.html	2008-02-16 22:40:58.000000000 +0100
++++ eggdrop1.6.19.new/doc/html/install.html	2008-09-22 09:39:15.000000000 +0200
 @@ -100,13 +100,13 @@
         <p>If you want to install to a different directory, use:</p>
  
@@ -117,9 +118,9 @@
         </blockquote>
  
         <p>Note that you must use full path for every file to be correctly
-diff -burN eggdrop1.6.17.orig/doc/html/readme.html eggdrop1.6.17/doc/html/readme.html
---- eggdrop1.6.17.orig/doc/html/readme.html	2004-10-18 00:15:56.632979016 +0200
-+++ eggdrop1.6.17/doc/html/readme.html	2004-10-18 00:24:19.979458720 +0200
+diff -burNp eggdrop1.6.19/doc/html/readme.html eggdrop1.6.19.new/doc/html/readme.html
+--- eggdrop1.6.19/doc/html/readme.html	2008-02-16 22:40:59.000000000 +0100
++++ eggdrop1.6.19.new/doc/html/readme.html	2008-09-22 09:39:49.000000000 +0200
 @@ -261,7 +261,7 @@
      <blockquote>
        <p>If you followed <a href="install.html">Compilation and
@@ -129,9 +130,9 @@
        this will be pretty easy. Just upload the new eggdrop1.6.x.tar.gz file
        to your home dir on your shell, gunzip and untar it, and type &#39;cd
        ~/eggdrop1.6.x&#39;. Next, type &#39;./configure&#39;, &#39;make
-diff -burN eggdrop1.6.17.orig/doc/html/starting.html eggdrop1.6.17/doc/html/starting.html
---- eggdrop1.6.17.orig/doc/html/starting.html	2004-10-18 00:15:56.613981904 +0200
-+++ eggdrop1.6.17/doc/html/starting.html	2004-10-18 00:24:19.983458112 +0200
+diff -burNp eggdrop1.6.19/doc/html/starting.html eggdrop1.6.19.new/doc/html/starting.html
+--- eggdrop1.6.19/doc/html/starting.html	2008-02-16 22:40:59.000000000 +0100
++++ eggdrop1.6.19.new/doc/html/starting.html	2008-09-22 09:42:21.000000000 +0200
 @@ -97,7 +97,7 @@
      Eggdrop, you just have to do:</p>
  
@@ -141,10 +142,10 @@
      </blockquote>
  
      <p>and it will copy all the necessary files.</p>
-diff -burN eggdrop1.6.17.orig/doc/Makefile.in eggdrop1.6.17/doc/Makefile.in
---- eggdrop1.6.17.orig/doc/Makefile.in	2004-10-18 00:15:56.638978104 +0200
-+++ eggdrop1.6.17/doc/Makefile.in	2004-10-18 00:23:49.173141992 +0200
-@@ -34,39 +34,39 @@
+diff -burNp eggdrop1.6.19/doc/Makefile.in eggdrop1.6.19.new/doc/Makefile.in
+--- eggdrop1.6.19/doc/Makefile.in	2004-08-08 20:17:00.000000000 +0200
++++ eggdrop1.6.19.new/doc/Makefile.in	2008-09-22 09:45:18.000000000 +0200
+@@ -34,39 +34,39 @@ clean:
  	@rm -f *~
  
  install:
@@ -197,16 +198,16 @@
 +			$(INSTALL_DATA) $$i $(DESTDIR)/doc/html/; \
  		done; \
  	fi
-diff -burN eggdrop1.6.17.orig/eggdrop.conf eggdrop1.6.17/eggdrop.conf
---- eggdrop1.6.17.orig/eggdrop.conf	2004-10-18 00:15:56.808952264 +0200
-+++ eggdrop1.6.17/eggdrop.conf	2004-10-18 00:26:48.348903136 +0200
+diff -burNp eggdrop1.6.19/eggdrop.conf eggdrop1.6.19.new/eggdrop.conf
+--- eggdrop1.6.19/eggdrop.conf	2008-02-16 21:15:30.000000000 +0100
++++ eggdrop1.6.19.new/eggdrop.conf	2008-09-22 09:52:43.000000000 +0200
 @@ -1,4 +1,4 @@
 -#! /path/to/executable/eggdrop
 +#! /usr/bin/eggdrop
  # ^- This should contain a fully qualified path to your Eggdrop executable.
  #
  # $Id$
-@@ -185,22 +185,22 @@
+@@ -185,22 +185,22 @@ set sort-users 0
  
  # Specify here where Eggdrop should look for help files. Don't modify this
  # setting unless you know what you're doing!
@@ -233,7 +234,7 @@
  
  # This specifies what permissions the user, channel, and notes files should
  # be set to. The octal values are the same as for the chmod system command.
-@@ -420,7 +420,7 @@
+@@ -419,7 +419,7 @@ die "Please make sure you edit your conf
  # If you run the bot from the compilation directory, you will want to set
  # this to "". If you use 'make install' (like all good kiddies do ;), this
  # is a fine default. Otherwise, use your head :)
@@ -241,22 +242,22 @@
 +set mod-path "/usr/lib/eggdrop/modules/"
  
  
- #### DNS MODULE ####
-@@ -1327,17 +1327,17 @@
+ #### BLOWFISH MODULE ####
+@@ -1334,19 +1334,19 @@ loadmodule uptime
  # directory. All scripts should be put there, although you can place them where
  # you like as long as you can supply a fully qualified path to them.
  #
 -# source scripts/script.tcl
-+# source /usr/share/eggdrop/scripts/script.tcl
++# /usr/share/eggdrop/scripts/script.tcl
  
 -source scripts/alltools.tcl
 -source scripts/action.fix.tcl
 +source /usr/share/eggdrop/scripts/alltools.tcl
 +source /usr/share/eggdrop/scripts/action.fix.tcl
  
- # Use this script for Tcl and Eggdrop downwards compatibility.
+ # Use this script for Tcl and Eggdrop backwards compatibility.
  # NOTE: This can also cause problems with some newer scripts.
--source scripts/compat.tcl
+-#source scripts/compat.tcl
 +source /usr/share/eggdrop/scripts/compat.tcl
  
  # This script provides many useful informational functions, like setting
@@ -265,10 +266,12 @@
 -source scripts/userinfo.tcl
 +source /usr/share/eggdrop/scripts/userinfo.tcl
  loadhelp userinfo.help
-diff -burN eggdrop1.6.17.orig/INSTALL eggdrop1.6.17/INSTALL
---- eggdrop1.6.17.orig/INSTALL	2004-10-18 00:15:56.820950440 +0200
-+++ eggdrop1.6.17/INSTALL	2004-10-18 00:21:41.065617296 +0200
-@@ -66,11 +66,11 @@
+ 
+ # A few IRC networks (EFnet and Undernet) have added some simple checks to
+diff -burNp eggdrop1.6.19/INSTALL eggdrop1.6.19.new/INSTALL
+--- eggdrop1.6.19/INSTALL	2008-02-16 22:40:54.000000000 +0100
++++ eggdrop1.6.19.new/INSTALL	2008-09-22 09:53:40.000000000 +0200
+@@ -66,11 +66,11 @@ Last revised: July 24, 2004
  
           If you want to install to a different directory, use:
  
@@ -282,10 +285,10 @@
  
           Note that you must use full path for every file to be correctly
           installed.
-diff -burN eggdrop1.6.17.orig/Makefile.in eggdrop1.6.17/Makefile.in
---- eggdrop1.6.17.orig/Makefile.in	2004-10-18 00:15:56.809952112 +0200
-+++ eggdrop1.6.17/Makefile.in	2004-10-18 00:22:54.704422496 +0200
-@@ -11,7 +11,7 @@
+diff -burNp eggdrop1.6.19/Makefile.in eggdrop1.6.19.new/Makefile.in
+--- eggdrop1.6.19/Makefile.in	2004-08-28 08:43:21.000000000 +0200
++++ eggdrop1.6.19.new/Makefile.in	2008-09-22 09:56:26.000000000 +0200
+@@ -11,7 +11,7 @@ VPATH = @srcdir@
  
  @SET_MAKE@
  prefix = @prefix@
@@ -294,7 +297,7 @@
  EGGEXEC = @EGGEXEC@
  EGGVERSION = @EGGVERSION@
  
-@@ -120,7 +120,7 @@
+@@ -119,7 +119,7 @@ MAKE_DEPEND = $(MAKE) 'MAKE=$(MAKE)' 'CC
  
  MAKE_CONFIG = $(MAKE) 'MAKE=$(MAKE)'
  
@@ -303,7 +306,7 @@
  
  all: @DEFAULT_MAKE@
  
-@@ -309,109 +309,109 @@
+@@ -308,109 +308,109 @@ install-start:
  		echo ""; \
  		exit 1; \
  	fi
@@ -456,7 +459,7 @@
  		done; \
  	fi
  	@cd src/mod/ && $(MAKE_INSTALL) install-help
-@@ -419,25 +419,25 @@
+@@ -418,25 +418,25 @@ install-help:
  install-language:
  	@echo "Copying language files."
  	@if test ! "x`echo $(srcdir)/language/*.lang`" = "x$(srcdir)/language/*.lang"; then \
@@ -489,7 +492,7 @@
  	@cd doc/ && $(MAKE_INSTALL) install
  
  install-scripts:
-@@ -450,7 +450,7 @@
+@@ -449,7 +449,7 @@ install-end:
  	@echo "You MUST ensure that you edit/verify your configuration file."
  	@echo "An example configuration file, eggdrop.conf, is distributed with Eggdrop."
  	@echo ""
@@ -498,10 +501,10 @@
  	@echo ""
  
  #safety hash
-diff -burN eggdrop1.6.17.orig/scripts/Makefile.in eggdrop1.6.17/scripts/Makefile.in
---- eggdrop1.6.17.orig/scripts/Makefile.in	2004-10-18 00:15:56.805952720 +0200
-+++ eggdrop1.6.17/scripts/Makefile.in	2004-10-18 00:27:06.471148136 +0200
-@@ -31,44 +31,44 @@
+diff -burNp eggdrop1.6.19/scripts/Makefile.in eggdrop1.6.19.new/scripts/Makefile.in
+--- eggdrop1.6.19/scripts/Makefile.in	2008-02-16 07:00:17.000000000 +0100
++++ eggdrop1.6.19.new/scripts/Makefile.in	2008-09-22 09:58:28.000000000 +0200
+@@ -32,44 +32,44 @@ clean:
  	@rm -f *~
  
  install:
@@ -560,9 +563,9 @@
  			done; \
  		fi; \
  	fi
-diff -burN eggdrop1.6.17.orig/src/eggdrop.h eggdrop1.6.17/src/eggdrop.h
---- eggdrop1.6.17.orig/src/eggdrop.h	2004-10-18 00:15:56.762959256 +0200
-+++ eggdrop1.6.17/src/eggdrop.h	2004-10-18 00:27:26.368123336 +0200
+diff -burNp eggdrop1.6.19/src/eggdrop.h eggdrop1.6.19.new/src/eggdrop.h
+--- eggdrop1.6.19/src/eggdrop.h	2008-02-16 22:41:03.000000000 +0100
++++ eggdrop1.6.19.new/src/eggdrop.h	2008-09-22 10:00:48.000000000 +0200
 @@ -75,7 +75,7 @@
  
  
@@ -572,10 +575,10 @@
  #define BASELANG "english"    /* language which always gets loaded before
                                   all other languages. You do not want to
                                   change this.                              */
-diff -burN eggdrop1.6.17.orig/src/mod/Makefile.in eggdrop1.6.17/src/mod/Makefile.in
---- eggdrop1.6.17.orig/src/mod/Makefile.in	2004-10-18 00:15:56.711967008 +0200
-+++ eggdrop1.6.17/src/mod/Makefile.in	2004-10-18 00:27:34.444895480 +0200
-@@ -121,50 +121,50 @@
+diff -burNp eggdrop1.6.19/src/mod/Makefile.in eggdrop1.6.19.new/src/mod/Makefile.in
+--- eggdrop1.6.19/src/mod/Makefile.in	2004-08-28 08:43:22.000000000 +0200
++++ eggdrop1.6.19.new/src/mod/Makefile.in	2008-09-22 10:02:45.000000000 +0200
+@@ -123,50 +123,50 @@ install: install-help install-language
  
  install-help:
  	@echo "Copying module help files."

================================================================
Index: SOURCES/eggdrop-ssl.patch
diff -u SOURCES/eggdrop-ssl.patch:1.3 SOURCES/eggdrop-ssl.patch:1.4
--- SOURCES/eggdrop-ssl.patch:1.3	Sun Mar  6 17:06:36 2005
+++ SOURCES/eggdrop-ssl.patch	Tue Sep 23 12:07:28 2008
@@ -1,10 +1,10 @@
-diff -burN eggdrop1.6.17.orig/aclocal.m4 eggdrop1.6.17/aclocal.m4
---- eggdrop1.6.17.orig/aclocal.m4	2004-11-01 14:40:44.093457768 +0100
-+++ eggdrop1.6.17/aclocal.m4	2004-11-01 14:41:51.767169800 +0100
-@@ -37,6 +37,64 @@
+diff -burNp eggdrop1.6.19/aclocal.m4 eggdrop1.6.19.new/aclocal.m4
+--- eggdrop1.6.19/aclocal.m4	2008-04-19 06:21:20.000000000 +0200
++++ eggdrop1.6.19.new/aclocal.m4	2008-09-22 14:03:38.304371902 +0200
+@@ -36,6 +36,63 @@ AC_DEFUN([EGG_MSG_CONFIGURE_START],
+   AC_MSG_RESULT
  ])
  
- 
 +dnl  EGG_SSL_CRAP()
 +dnl
 +AC_DEFUN(EGG_SSL_CRAP, [dnl
@@ -62,14 +62,13 @@
 +#end of ssl checks - hoe (.16 by poci)
 +])dnl
 +
-+
+ 
  dnl EGG_MSG_CONFIGURE_END()
  dnl
- AC_DEFUN([EGG_MSG_CONFIGURE_END],
-diff -burN eggdrop1.6.17.orig/config.h.in eggdrop1.6.17/config.h.in
---- eggdrop1.6.17.orig/config.h.in	2004-11-01 14:40:44.110455184 +0100
-+++ eggdrop1.6.17/config.h.in	2004-11-01 14:41:51.769169496 +0100
-@@ -30,6 +30,9 @@
+diff -burNp eggdrop1.6.19/config.h.in eggdrop1.6.19.new/config.h.in
+--- eggdrop1.6.19/config.h.in	2006-11-20 12:38:25.000000000 +0100
++++ eggdrop1.6.19.new/config.h.in	2008-09-22 14:07:26.990831137 +0200
+@@ -33,6 +33,9 @@
  /* Define to 1 if you have the `clock' function. */
  #undef HAVE_CLOCK
  
@@ -79,19 +78,10 @@
  /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
     */
  #undef HAVE_DIRENT_H
-diff -burN eggdrop1.6.17.orig/configure eggdrop1.6.17/configure
---- eggdrop1.6.17.orig/configure	2004-11-01 14:40:44.098457008 +0100
-+++ eggdrop1.6.17/configure	2004-11-01 14:43:30.021232912 +0100
-@@ -315,7 +315,7 @@
- # include <unistd.h>
- #endif"
- 
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS egg_ac_parameters CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE RANLIB ac_ct_RANLIB LN_S HEAD_1 STRIP AWK BASENAME UNAME DEFAULT_MAKE MOD_EXT MODULE_XLIBS MOD_LD MOD_CC MOD_STRIP SHLIB_LD SHLIB_CC SHLIB_STRIP EGGEXEC TCLLIB TCLLIBFN TCLINC TCLINCFN TCL_REQS TCL_LIBS EGGVERSION DESTDIR MOD_UPDIR LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS egg_ac_parameters CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE RANLIB ac_ct_RANLIB LN_S HEAD_1 STRIP AWK BASENAME UNAME DEFAULT_MAKE MOD_EXT MODULE_XLIBS MOD_LD MOD_CC MOD_STRIP SHLIB_LD SHLIB_CC SHLIB_STRIP EGGEXEC TCLLIB TCLLIBFN TCLINC TCLINCFN TCL_REQS TCL_LIBS SSL_LIBS SSL_INCLUDE EGGVERSION DESTDIR MOD_UPDIR LIBOBJS LTLIBOBJS'
- ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -856,6 +856,7 @@
+diff -burNp eggdrop1.6.19/configure eggdrop1.6.19.new/configure
+--- eggdrop1.6.19/configure	2008-04-19 06:21:20.000000000 +0200
++++ eggdrop1.6.19.new/configure	2008-09-22 14:22:28.610498567 +0200
+@@ -856,6 +857,7 @@ Optional Packages:
    --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
    --with-tcllib=PATH      full path to Tcl library
    --with-tclinc=PATH      full path to Tcl header
@@ -99,9 +89,9 @@
  
  Some influential environment variables:
    CC          C compiler command
-@@ -10100,6 +10101,374 @@
- 
+@@ -10113,8 +10115,372 @@ EOF
  
+             ac_config_commands="$ac_config_commands replace-if-changed"
  
 +#ssl checks - hoe
 +echo "$as_me:$LINENO: checking whether to include SSL support" >&5
@@ -407,7 +397,7 @@
 +rm -f conftest.err conftest.$ac_ext
 +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6
-+
+ 
 +# So?  What about this header?
 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 +  yes:no: )
@@ -467,37 +457,34 @@
 +
 +
 +fi;
-+
+ 
 +#end of ssl checks - hoe (.16 by poci)
-+
-+
  
- # Substitute Makefile variables.
  
-@@ -10811,6 +11180,8 @@
+ # Substitute Makefile variables.
+@@ -10827,6 +11193,8 @@ s, at TCLINC@,$TCLINC,;t t
  s, at TCLINCFN@,$TCLINCFN,;t t
  s, at TCL_REQS@,$TCL_REQS,;t t
  s, at TCL_LIBS@,$TCL_LIBS,;t t
 +s, at SSL_LIBS@,$SSL_LIBS,;t t
 +s, at SSL_INCLUDE@,$SSL_INCLUDE,;t t
  s, at EGGVERSION@,$EGGVERSION,;t t
- s, at DESTDIR@,$DESTDIR,;t t
+ s, at DEST@,$DEST,;t t
  s, at MOD_UPDIR@,$MOD_UPDIR,;t t
-diff -burN eggdrop1.6.17.orig/configure.ac eggdrop1.6.17/configure.ac
---- eggdrop1.6.17.orig/configure.ac	2004-11-01 14:40:44.109455336 +0100
-+++ eggdrop1.6.17/configure.ac	2004-11-01 14:41:51.866154752 +0100
-@@ -148,6 +148,8 @@
+diff -burNp eggdrop1.6.19/configure.ac eggdrop1.6.19.new/configure.ac
+--- eggdrop1.6.19/configure.ac	2008-02-18 23:25:33.000000000 +0100
++++ eggdrop1.6.19.new/configure.ac	2008-09-22 14:23:32.432890637 +0200
+@@ -150,6 +150,7 @@ EGG_TCL_CHECK_THREADS
  EGG_TCL_LIB_REQS
  EGG_TCL_LUSH
  
 +EGG_SSL_CRAP
-+
  
  # Substitute Makefile variables.
  EGG_SUBST_EGGVERSION
-diff -burN eggdrop1.6.17.orig/disabled_modules eggdrop1.6.17/disabled_modules
---- eggdrop1.6.17.orig/disabled_modules	2004-11-01 14:40:44.110455184 +0100
-+++ eggdrop1.6.17/disabled_modules	1970-01-01 01:00:00.000000000 +0100
+diff -burNp eggdrop1.6.19/disabled_modules eggdrop1.6.19.new/disabled_modules
+--- eggdrop1.6.19/disabled_modules	2002-06-04 07:11:10.000000000 +0200
++++ eggdrop1.6.19.new/disabled_modules	2008-09-22 14:25:14.439395696 +0200
 @@ -1,12 +0,0 @@
 -#  disabled_modules -- File which lists all Eggdrop modules that are
 -#                      disabled by default.
@@ -511,9 +498,9 @@
 -# Woobie only serves as an example for module programming. No need to
 -# compile it for normal bots ...
 -woobie
-diff -burN eggdrop1.6.17.orig/Makefile eggdrop1.6.17/Makefile
---- eggdrop1.6.17.orig/Makefile	2004-11-01 14:40:44.093457768 +0100
-+++ eggdrop1.6.17/Makefile	1970-01-01 01:00:00.000000000 +0100
+diff -burNp eggdrop1.6.19/Makefile eggdrop1.6.19.new/Makefile
+--- eggdrop1.6.19/Makefile	2008-04-19 06:21:34.000000000 +0200
++++ eggdrop1.6.19.new/Makefile	2008-09-22 14:25:56.388522764 +0200
 @@ -1,8 +0,0 @@
 -all:
 -	@echo ""
@@ -523,10 +510,10 @@
 -	@echo " % ./configure"
 -	@echo ""
 -
-diff -burN eggdrop1.6.17.orig/Makefile.in eggdrop1.6.17/Makefile.in
---- eggdrop1.6.17.orig/Makefile.in	2004-11-01 14:40:44.109455336 +0100
-+++ eggdrop1.6.17/Makefile.in	2004-11-01 14:41:51.766169952 +0100
-@@ -57,6 +57,8 @@
+diff -burNp eggdrop1.6.19/Makefile.in eggdrop1.6.19.new/Makefile.in
+--- eggdrop1.6.19/Makefile.in	2004-08-28 08:43:21.000000000 +0200
++++ eggdrop1.6.19.new/Makefile.in	2008-09-22 14:29:11.247383482 +0200
+@@ -57,6 +57,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
  RANLIB = @RANLIB@
  MOD_EXT = @MOD_EXT@
  XREQS = @TCL_REQS@
@@ -535,7 +522,7 @@
  TCLLIB = @TCLLIB@
  TCLLIBFN = @TCLLIBFN@
  
-@@ -89,7 +91,8 @@
+@@ -89,7 +91,8 @@ egg_install_msg =  echo "" && \
  MAKE_MODEGG = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(MOD_CC)' 'LD=$(MOD_LD)' \
  'STRIP=$(MOD_STRIP)' 'RANLIB=$(RANLIB)' 'CFLGS=$(CFLGS)' \
  'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' \
@@ -545,7 +532,7 @@
  
  MAKE_MODULES = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(SHLIB_CC)' 'LD=$(SHLIB_LD)' \
  'STRIP=$(SHLIB_STRIP)' 'CFLGS=$(CFLGS)' 'XLIBS=$(XLIBS)' 'MOD_EXT=$(MOD_EXT)' \
-@@ -99,12 +102,13 @@
+@@ -99,12 +102,13 @@ MAKE_STATIC = $(MAKE) 'MAKE=$(MAKE)' 'CC
  'STRIP=$(STRIP)' 'RANLIB=$(RANLIB)' 'CFLGS=$(CFLGS) -DSTATIC' \
  'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' \
  'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(static version)' \
@@ -561,7 +548,7 @@
  
  MAKE_DEBMODULES = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(SHLIB_CC)' 'LD=$(SHLIB_LD)' \
  'XLIBS=$(XLIBS)' 'STRIP=touch' 'CFLGS=-g3 $(DEBCFLAGS) $(CFLGS)' \
-@@ -113,7 +117,8 @@
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/eggdrop-autobotchk.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/eggdrop-bz-463.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/eggdrop-config_encryption.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/eggdrop-FHS.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/eggdrop-ssl.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/eggdrop-topicprot.patch?r1=1.3&r2=1.4&f=u

More information about the pld-cvs-commit mailing list