[eggdrop] Upgrade to 1.6.21 (#771492)
Robert Scheck
robert at fedoraproject.org
Sun Jan 8 20:12:53 UTC 2012
commit 3203f72294177deb2302c8ad6397bab06365c245
Author: Robert Scheck <robert at fedoraproject.org>
Date: Sun Jan 8 21:12:38 2012 +0100
Upgrade to 1.6.21 (#771492)
.gitignore | 2 +-
..._libdns.patch => eggdrop-1.6.21-no_libdns.patch | 24 +++---
...p0010.patch => eggdrop-1.6.21-suzi_sp0011.patch | 91 ++++++++++----------
eggdrop.spec | 11 ++-
sources | 2 +-
5 files changed, 66 insertions(+), 64 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 56ac9fd..2f8a4d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-eggdrop1.6.20.tar.bz2
+eggdrop1.6.21.tar.bz2
diff --git a/eggdrop-1.6.20-no_libdns.patch b/eggdrop-1.6.21-no_libdns.patch
similarity index 76%
rename from eggdrop-1.6.20-no_libdns.patch
rename to eggdrop-1.6.21-no_libdns.patch
index 791c23e..0f22dc1 100644
--- a/eggdrop-1.6.20-no_libdns.patch
+++ b/eggdrop-1.6.21-no_libdns.patch
@@ -1,4 +1,4 @@
-Patch by Robert Scheck <robert at fedoraproject.org> for eggdrop >= 1.6.20,
+Patch by Robert Scheck <robert at fedoraproject.org> for eggdrop >= 1.6.21,
which makes the configure script looking for gethostbyname() in libc rather
in libdns. The problem especially comes up, once bind-devel gets added into
buildroot at the build system (#433111). In difference to the suggestion by
@@ -6,9 +6,9 @@ Adam Tkac <atkac at redhat.com>, the configure script itself gets patched, as
autoconf, as shipped with Red Hat Enterprise Linux 4 (including downstreams
and derivates), is unfortunately too old since eggdrop >= 1.6.20.
---- eggdrop1.6.20/aclocal.m4 2008-04-19 06:21:20.000000000 +0200
-+++ eggdrop1.6.19/aclocal.m4.no_libdns 2008-04-22 19:59:44.000000000 +0200
-@@ -764,7 +764,7 @@
+--- eggdrop1.6.21/aclocal.m4 2011-10-26 04:00:10.000000000 +0200
++++ eggdrop1.6.21/aclocal.m4.no_libdns 2012-01-08 20:47:11.000000000 +0100
+@@ -808,7 +808,7 @@
else
AC_CHECK_LIB(socket, socket)
AC_CHECK_LIB(nsl, connect)
@@ -17,18 +17,18 @@ and derivates), is unfortunately too old since eggdrop >= 1.6.20.
AC_CHECK_LIB(dl, dlopen)
AC_CHECK_LIB(m, tan, EGG_MATH_LIB="-lm")
---- eggdrop1.6.20/configure 2010-07-24 03:16:46.000000000 +0200
-+++ eggdrop1.6.20/configure.no_libdns 2010-12-28 00:41:46.108939946 +0100
-@@ -4608,13 +4608,13 @@
+--- eggdrop1.6.21/configure 2011-10-26 04:00:10.000000000 +0200
++++ eggdrop1.6.21/configure.no_libdns 2012-01-08 20:50:39.000000000 +0100
+@@ -4642,13 +4642,13 @@
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -ldns" >&5
-$as_echo_n "checking for gethostbyname in -ldns... " >&6; }
--if test "${ac_cv_lib_dns_gethostbyname+set}" = set; then :
+-if ${ac_cv_lib_dns_gethostbyname+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lc" >&5
+$as_echo_n "checking for gethostbyname in -lc... " >&6; }
-+if test "${ac_cv_lib_c_gethostbyname+set}" = set; then :
++if ${ac_cv_lib_c_gethostbyname+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -37,7 +37,7 @@ and derivates), is unfortunately too old since eggdrop >= 1.6.20.
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -4634,22 +4634,22 @@
+@@ -4668,22 +4668,22 @@
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
@@ -53,10 +53,10 @@ and derivates), is unfortunately too old since eggdrop >= 1.6.20.
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dns_gethostbyname" >&5
-$as_echo "$ac_cv_lib_dns_gethostbyname" >&6; }
--if test "x$ac_cv_lib_dns_gethostbyname" = x""yes; then :
+-if test "x$ac_cv_lib_dns_gethostbyname" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_gethostbyname" >&5
+$as_echo "$ac_cv_lib_c_gethostbyname" >&6; }
-+if test "x$ac_cv_lib_c_gethostbyname" = x""yes; then :
++if test "x$ac_cv_lib_c_gethostbyname" = xyes; then :
cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBDNS 1
+#define HAVE_LIBC 1
diff --git a/eggdrop-1.6.20-suzi_sp0010.patch b/eggdrop-1.6.21-suzi_sp0011.patch
similarity index 91%
rename from eggdrop-1.6.20-suzi_sp0010.patch
rename to eggdrop-1.6.21-suzi_sp0011.patch
index 165f5a1..960adf5 100644
--- a/eggdrop-1.6.20-suzi_sp0010.patch
+++ b/eggdrop-1.6.21-suzi_sp0011.patch
@@ -1,5 +1,5 @@
---- eggdrop1.6.20/SUZI 1970-01-01 01:00:00.000000000 +0100
-+++ eggdrop1.6.20/SUZI.suzi_sp0010 2006-08-04 20:24:59.000000000 +0200
+--- eggdrop1.6.21/SUZI 1970-01-01 01:00:00.000000000 +0100
++++ eggdrop1.6.21/SUZI.suzi_sp0011 2006-08-04 20:24:59.000000000 +0200
@@ -0,0 +1,237 @@
+ Eggdrop and non-latin characters.
+
@@ -238,26 +238,26 @@
+Author: Anastasia Zemina a.k.a. lynxy (WeNet irc.wenet.ru:6667, #eggtest), Suzi project team
+Thanks to: ZemIn, Buster, Yxaaaaaaa.
+URL: Forum (russian): http://xirc.ru/plugins/forum/forum_viewforum.php?15
---- eggdrop1.6.20/src/mod/module.h 2010-07-08 23:23:06.000000000 +0400
-+++ eggdrop1.6.20/src/mod/module.h.suzi_sp0010 2010-07-24 16:10:56.000000000 +0400
-@@ -485,6 +485,15 @@
- #define check_conflags ((int (*) (struct flag_record *, int))global[296])
+--- eggdrop1.6.21/src/mod/module.h 2011-07-09 19:07:48.000000000 +0400
++++ eggdrop1.6.21/src/mod/module.h.suzi_sp0011 2011-11-03 11:03:02.000000000 +0400
+@@ -490,6 +490,15 @@
#define increase_socks_max ((int (*)(void))global[297])
#define LOG_TS ((char *)(global[298]))
+ #define nstrdup(x) (((char *(*)())global[299])((x),MODULE_NAME,__FILE__,__LINE__))
+#ifdef USE_TCL_BYTE_ARRAYS
-+#define Tcl_EggSetVar ((CONST char *(*) (Tcl_Interp *, CONST char *, CONST char *newValue, int))global[299])
-+#define Tcl_EggSetVar2 ((CONST char *(*) (Tcl_Interp *, CONST char *, CONST char *, CONST char *, int))global[300])
-+#define Tcl_EggAppendResult ((void (*) TCL_VARARGS_DEF(Tcl_Interp *,arg1))global[301])
-+#define Tcl_EggAppendElement ((void (*) (Tcl_Interp *, CONST char *))global[302])
-+#define Tcl_EggEval ((int (*) (Tcl_Interp *interp, CONST char *script))global[303])
-+#define Tcl_EggGlobalEval ((int (*) (Tcl_Interp *interp, CONST char *script))global[304])
-+#define Tcl_EggNewStringObj ((Tcl_Obj *(*) (CONST char *bytes, int length))global[305])
++#define Tcl_EggSetVar ((CONST char *(*) (Tcl_Interp *, CONST char *, CONST char *newValue, int))global[300])
++#define Tcl_EggSetVar2 ((CONST char *(*) (Tcl_Interp *, CONST char *, CONST char *, CONST char *, int))global[301])
++#define Tcl_EggAppendResult ((void (*) TCL_VARARGS_DEF(Tcl_Interp *,arg1))global[302])
++#define Tcl_EggAppendElement ((void (*) (Tcl_Interp *, CONST char *))global[303])
++#define Tcl_EggEval ((int (*) (Tcl_Interp *interp, CONST char *script))global[304])
++#define Tcl_EggGlobalEval ((int (*) (Tcl_Interp *interp, CONST char *script))global[305])
++#define Tcl_EggNewStringObj ((Tcl_Obj *(*) (CONST char *bytes, int length))global[306])
+#endif /* USE_TCL_BYTE_ARRAYS */
/* hostmasking */
#define maskhost(a,b) maskaddr((a),(b),3)
---- eggdrop1.6.20/src/mod/server.mod/server.c 2010-07-12 20:18:09.000000000 +0400
-+++ eggdrop1.6.20/src/mod/server.mod/server.c.suzi_sp0010 2010-07-24 16:08:03.000000000 +0400
+--- eggdrop1.6.21/src/mod/server.mod/server.c 2011-10-25 20:45:08.000000000 +0400
++++ eggdrop1.6.21/src/mod/server.mod/server.c.suzi_sp0011 2011-11-03 11:08:13.000000000 +0400
@@ -1164,7 +1164,16 @@
Tcl_TraceVar(irp, name1, TCL_TRACE_READS | TCL_TRACE_WRITES |
TCL_TRACE_UNSETS, nick_change, cdata);
@@ -313,37 +313,37 @@
Tcl_TraceVar(interp, "nick",
TCL_TRACE_READS | TCL_TRACE_WRITES | TCL_TRACE_UNSETS,
nick_change, NULL);
---- eggdrop1.6.20/src/modules.c 2010-07-08 23:23:06.000000000 +0400
-+++ eggdrop1.6.20/src/modules.c.suzi_sp0010 2010-07-24 16:02:59.000000000 +0400
-@@ -576,7 +576,24 @@
- /* 296 - 299 */
+--- eggdrop1.6.21/src/modules.c 2011-07-09 19:07:48.000000000 +0400
++++ eggdrop1.6.21/src/modules.c.suzi_sp0011 2011-11-03 11:10:05.000000000 +0400
+@@ -577,7 +577,24 @@
(Function) check_conflags,
(Function) increase_socks_max,
-- (Function) log_ts
-+ (Function) log_ts,
+ (Function) log_ts,
+- (Function) mod_strdup
++ (Function) mod_strdup,
+#ifdef USE_TCL_BYTE_ARRAYS
-+ (Function) Tcl_EggSetVar, /* 299 */
-+ (Function) Tcl_EggSetVar2, /* 300 */
-+ (Function) Tcl_EggAppendResult, /* 301 */
-+ (Function) Tcl_EggAppendElement, /* 302 */
-+ (Function) Tcl_EggEval, /* 303 */
-+ (Function) Tcl_EggGlobalEval, /* 304 */
-+ (Function) Tcl_EggNewStringObj /* 305 */
++ (Function) Tcl_EggSetVar, /* 300 */
++ (Function) Tcl_EggSetVar2, /* 301 */
++ (Function) Tcl_EggAppendResult, /* 302 */
++ (Function) Tcl_EggAppendElement, /* 303 */
++ (Function) Tcl_EggEval, /* 304 */
++ (Function) Tcl_EggGlobalEval, /* 305 */
++ (Function) Tcl_EggNewStringObj /* 306 */
+#else
-+ (Function) 0, /* 299 */
+ (Function) 0, /* 300 */
+ (Function) 0, /* 301 */
+ (Function) 0, /* 302 */
+ (Function) 0, /* 303 */
+ (Function) 0, /* 304 */
-+ (Function) 0 /* 305 */
++ (Function) 0, /* 305 */
++ (Function) 0 /* 306 */
+#endif /* USE_TCL_BYTE_ARRAYS */
};
void init_modules(void)
---- eggdrop1.6.20/src/tcl.c 2010-07-12 19:40:52.000000000 +0400
-+++ eggdrop1.6.20/src/tcl.c.suzi_sp0010 2010-07-24 15:49:26.000000000 +0400
-@@ -275,17 +275,31 @@
+--- eggdrop1.6.21/src/tcl.c 2011-09-10 01:37:53.000000000 +0400
++++ eggdrop1.6.21/src/tcl.c.suzi_sp0011 2011-11-03 11:20:40.000000000 +0400
+@@ -279,17 +279,31 @@
Tcl_Obj *obj;
unsigned char *bytes;
int len;
@@ -378,7 +378,7 @@
}
#else
s = (char *) Tcl_GetVar2(interp, name1, name2, 0);
-@@ -329,6 +343,8 @@
+@@ -333,6 +347,8 @@
void **callback_data;
Function func;
ClientData cd;
@@ -387,7 +387,7 @@
objc += 5;
strings = (char **) nmalloc(sizeof(char *) * objc);
-@@ -337,11 +353,23 @@
+@@ -341,11 +357,23 @@
utftot += sizeof(char *) * objc;
objc -= 5;
for (i = 0; i < objc; i++) {
@@ -412,22 +412,21 @@
}
callback_data = (void **) cdata;
func = (Function) callback_data[0];
-@@ -501,6 +529,7 @@
+@@ -505,6 +533,7 @@
{"logfile-suffix", logfile_suffix, 20, 0},
{"timestamp-format",log_ts, 32, 0},
{"pidfile", pid_file, 120, STR_PROTECT},
-+ {"sp_version", "0010", 0, 0},
++ {"sp_version", "0011", 0, 0},
{NULL, NULL, 0, 0}
};
---- eggdrop1.6.20/src/tclhash.c 2010-06-29 19:52:24.000000000 +0400
-+++ eggdrop1.6.20/src/tclhash.c.suzi_sp0010 2010-07-24 16:16:53.000000000 +0400
-@@ -717,7 +717,22 @@
+--- eggdrop1.6.21/src/tclhash.c 2011-07-09 19:07:48.000000000 +0400
++++ eggdrop1.6.21/src/tclhash.c.suzi_sp0011 2011-11-03 11:27:54.000000000 +0400
+@@ -717,7 +717,21 @@
*/
Tcl_SetVar(interp, "lastbind", (char *) mask, TCL_GLOBAL_ONLY);
- x = Tcl_VarEval(interp, proc, param, NULL);
-+ // x = Tcl_VarEval(interp, proc, param, NULL);
+ {
+ char *cstr;
+ int len0 = proc ? strlen(proc) : 0;
@@ -446,7 +445,7 @@
Context;
if (x == TCL_ERROR) {
-@@ -1019,8 +1034,19 @@
+@@ -1024,8 +1038,19 @@
if (x == BIND_EXECUTED || x == BIND_EXEC_LOG) {
if (tcl_resultempty())
return "";
@@ -467,7 +466,7 @@
} else
return text;
}
-@@ -1289,3 +1315,104 @@
+@@ -1294,3 +1319,104 @@
nfree(l);
}
}
@@ -520,7 +519,7 @@
+}
+
+CONST char *Tcl_EggSetVar2(Tcl_Interp *interp, CONST char *part1, CONST char *part2,
-+ CONST char *newValue, int flags)
++ CONST char *newValue, int flags)
+{
+ Tcl_DString ds;
+ char *ret;
@@ -572,8 +571,8 @@
+#define Tcl_NewStringObj Tcl_EggNewStringObj
+
+#endif /* USE_TCL_BYTE_ARRAYS */
---- eggdrop1.6.20/src/tclhash.h 2010-07-12 19:40:52.000000000 +0400
-+++ eggdrop1.6.20/src/tclhash.h.suzi_sp0010 2010-07-24 15:59:35.000000000 +0400
+--- eggdrop1.6.21/src/tclhash.h 2011-08-01 00:15:06.000000000 +0400
++++ eggdrop1.6.21/src/tclhash.h.suzi_sp0011 2011-11-03 11:28:29.000000000 +0400
@@ -25,6 +25,25 @@
#ifndef _EGG_TCLHASH_H
#define _EGG_TCLHASH_H
diff --git a/eggdrop.spec b/eggdrop.spec
index e846958..bb45fdb 100644
--- a/eggdrop.spec
+++ b/eggdrop.spec
@@ -1,14 +1,14 @@
Summary: The world's most popular Open Source IRC bot
Name: eggdrop
-Version: 1.6.20
-Release: 2%{?dist}
+Version: 1.6.21
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Communications
URL: http://www.eggheads.org/
Source: ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/%{name}%{version}.tar.bz2
Patch0: eggdrop-1.6.17-langdir.patch
-Patch1: eggdrop-1.6.20-no_libdns.patch
-Patch2: eggdrop-1.6.20-suzi_sp0010.patch
+Patch1: eggdrop-1.6.21-no_libdns.patch
+Patch2: eggdrop-1.6.21-suzi_sp0011.patch
BuildRequires: tcl-devel >= 8.3, zlib-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man?/%{name}*
%changelog
+* Sun Jan 08 2012 Robert Scheck <robert at fedoraproject.org> 1.6.21-1
+- Upgrade to 1.6.21 (#771492)
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.20-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 10777c4..266cf9e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f6887c045dba11fa2755a6a9e40380a3 eggdrop1.6.20.tar.bz2
+5663b2daecc790e6e9237e1d5a2caa50 eggdrop1.6.21.tar.bz2
More information about the scm-commits
mailing list