diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/eggdrop/APKBUILD | 121 | ||||
| -rw-r--r-- | main/eggdrop/eggdrop-installer | 84 | ||||
| -rw-r--r-- | main/eggdrop/eggdrop-langdir.patch | 15 | ||||
| -rw-r--r-- | main/eggdrop/gseen.mod.patch | 108 | ||||
| -rw-r--r-- | main/eggdrop/logs2html.mod.patch | 64 |
5 files changed, 186 insertions, 206 deletions
diff --git a/main/eggdrop/APKBUILD b/main/eggdrop/APKBUILD index 842b9a6d8..7c0735434 100644 --- a/main/eggdrop/APKBUILD +++ b/main/eggdrop/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=eggdrop -pkgver=1.6.20 +pkgver=1.6.21 pkgrel=0 pkgdesc="World's most popular Open Source IRC bot" url="http://www.eggheads.org/" @@ -8,61 +8,110 @@ arch="all" license='GPL-2' depends="tcl" makedepends="tcl-dev !bind-libs" -install="$pkgname.post-install" -subpackages="$pkgname-logs2html $pkgname-gseen" +install= +subpackages="$pkgname-doc $pkgname-logs2html $pkgname-gseen" source="ftp://ftp.eggheads.org/pub/eggdrop/GNU/1.6/${pkgname}${pkgver}.tar.bz2 -eggdrop-installer -gseen.mod.patch -logs2html.mod.patch" + eggdrop-langdir.patch + gseen.mod.patch + logs2html.mod.patch" -build() { - cd "$srcdir/${pkgname}${pkgver}" - - for i in "$srcdir"/*.patch; do - msg "Applying ${i}" - patch -p0 -i $i || return 1 +_builddir="$srcdir/${pkgname}${pkgver}" + +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac done +} +build() { + cd "$_builddir" ./configure --prefix=/usr make config || return 1 - make || return 1 - mkdir -p $pkgdir/opt/eggdrop - make -j1 DEST="$pkgdir/opt/eggdrop" install - install -Dm755 "$srcdir"/eggdrop-installer "$pkgdir"/usr/bin/eggdrop-installer || return 1 + make -j1 || return 1 +} + +package() { + cd "$_builddir" + make -j1 INSTALL="install -p" DEST="$pkgdir"/usr/share/eggdrop install \ + || return 1 + rm -rf "$pkgdir"/usr/share/eggdrop/README \ + "$pkgdir"/usr/share/eggdrop/doc \ + "$pkgdir"/usr/share/eggdrop/eggdrop* \ + "$pkgdir"/usr/share/eggdrop/filesys \ + "$pkgdir"/usr/share/eggdrop/logs \ + "$pkgdir"/usr/share/eggdrop/modules \ + "$pkgdir"/usr/share/eggdrop/scripts/CONTENTS \ + || return 1 + install -D -m 755 eggdrop "$pkgdir"/usr/bin/eggdrop || return 1 + install -D -m 644 doc/man1/eggdrop.1 \ + "$pkgdir"/usr/share/man/man1/eggdrop.1 || return 1 + + #move modules to /usr/lib + mkdir "$pkgdir"/usr/lib + mv "$pkgdir"/usr/share/eggdrop/modules-* \ + "$pkgdir"/usr/lib/eggdrop || return 1 + + + # Fix paths of example eggdrop.conf + sed -i -e '2d' -e '1s@^.*@#!/usr/bin/eggdrop@' \ + -e 's@scripts/@/usr/share/eggdrop/scripts/@g' \ + -e 's@help/@/usr/share/eggdrop/help/@g' \ + -e 's@modules/@/usr/lib/eggdrop/@g' \ + eggdrop.conf + + mkdir -p "$pkgdir"/usr/share/doc/eggdrop + cp -a \ + COPYING FEATURES NEWS README doc/Changes1.6 eggdrop.conf \ + doc/ABOUT doc/BANS doc/BOTNET doc/BUG-REPORT doc/FIRST-SCRIPT \ + doc/MODULES doc/PARTYLINE doc/TEXT-SUBSTITUTIONS doc/TRICKS \ + doc/USERS doc/WEIRD-MESSAGES doc/tcl-commands.doc doc/settings \ + doc/html \ + "$pkgdir"/usr/share/doc/eggdrop } logs2html() { + pkgdesc="logs2html module for eggdrop" install="" - cd "$srcdir/${pkgname}${pkgver}" + cd "$_builddir" - for dirs in language help; do - mkdir -p "$subpkgdir"/opt/eggdrop/${dirs} - mv "$pkgdir"/opt/eggdrop/${dirs}/logs2html.* "$subpkgdir"/opt/eggdrop/${dirs}/ || return 1 + for dir in language help; do + mkdir -p "$subpkgdir"/usr/share/eggdrop/$dir + mv "$pkgdir"/usr/share/eggdrop/$dir/logs2html.* "$subpkgdir"/usr/share/eggdrop/$dir/ || return 1 done - mkdir -p "$subpkgdir"/opt/eggdrop/modules/ - mv "$pkgdir"/opt/eggdrop/modules/logs2html.so "$subpkgdir"/opt/eggdrop/modules/ || return 1 - mkdir -p "$subpkgdir"/opt/eggdrop/log2html + mkdir -p "$subpkgdir"/usr/lib/eggdrop + mv "$pkgdir"/usr/lib/eggdrop/logs2html.so \ + "$subpkgdir"/usr/lib/eggdrop/ || return 1 + + mkdir -p "$subpkgdir"/usr/share/eggdrop/log2html for files in logs2html.conf top100.tpl user.css readme.txt chan.list; do - cp src/mod/logs2html.mod/${files} "$subpkgdir"/opt/eggdrop/log2html/ || return 1 + cp src/mod/logs2html.mod/${files} "$subpkgdir"/usr/share/eggdrop/log2html/ || return 1 done } gseen() { + pkgdesc="gseen module for eggdrop" install="" - cd "$srcdir/${pkgname}${pkgver}" - mkdir -p "$subpkgdir"/opt/eggdrop/language - mv "$pkgdir"/opt/eggdrop/language/gseen.* "$subpkgdir"/opt/eggdrop/language/ || return 1 - mkdir -p "$subpkgdir"/opt/eggdrop/modules/ - mv "$pkgdir"/opt/eggdrop/modules/gseen.so "$subpkgdir"/opt/eggdrop/modules/ || return 1 - mkdir -p "$subpkgdir"/opt/eggdrop/gseen - cp src/mod/gseen.mod/gseen.conf "$subpkgdir"/opt/eggdrop/gseen/ || return 1 - cp src/mod/gseen.mod/README "$subpkgdir"/opt/eggdrop/gseen/ || return 1 + cd "$_builddir" + mkdir -p "$subpkgdir"/usr/share/eggdrop/language + mv "$pkgdir"/usr/share/eggdrop/language/gseen.* \ + "$subpkgdir"/usr/share/eggdrop/language/ || return 1 + mkdir -p "$subpkgdir"/usr/lib/eggdrop + mv "$pkgdir"/usr/lib/eggdrop/gseen.so \ + "$subpkgdir"/usr/lib/eggdrop/ || return 1 + mkdir -p "$subpkgdir"/usr/share/eggdrop/gseen + cp src/mod/gseen.mod/gseen.conf "$subpkgdir"/usr/share/eggdrop/gseen/ \ + || return 1 + cp src/mod/gseen.mod/README "$subpkgdir"/usr/share/eggdrop/gseen/ \ + || return 1 } -md5sums="f6887c045dba11fa2755a6a9e40380a3 eggdrop1.6.20.tar.bz2 -d5214dc16c07c55edff22f495c9c367b eggdrop-installer -37b82f60413913758cd4161dbc2e7849 gseen.mod.patch -490ffd522d5058413c96b8325d19b838 logs2html.mod.patch" +md5sums="5663b2daecc790e6e9237e1d5a2caa50 eggdrop1.6.21.tar.bz2 +fdc2a01f611f14a8132225c8294f5039 eggdrop-langdir.patch +853a8526472ee964a8c94046cb9ae8b8 gseen.mod.patch +8b12435d0944b47898758d74bb227778 logs2html.mod.patch" diff --git a/main/eggdrop/eggdrop-installer b/main/eggdrop/eggdrop-installer deleted file mode 100644 index 69faa00dc..000000000 --- a/main/eggdrop/eggdrop-installer +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/sh -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/net-irc/eggdrop/files/eggdrop-installer,v 1.10 2007/03/14 17:52:24 drac Exp $ - -source /sbin/functions.sh || { - echo "${0}: Could not source /etc/init.d/functions.sh!" - exit 1 -} - -# Checks to see if user is trying to install eggdrop as root. -root_check() { - if [ "${HOME}" = "/root" ] || [ "$(whoami)" = "root" ] - then - ewarn "You should not be installing eggdrop as root." - ewarn - ewarn "Installing eggdrop as root leaves your computer vulnerable" - ewarn "to attack from other irc clients. Please use the eggdrop-installer" - ewarn "script as the user who you wish to run eggdrop with" - exit 1 - fi -} - -# Usage information -usage() { - cat <<USAGE_END -Usage: eggdrop-installer <bot-name> -Install eggdrop for a specific user, creating the directories and files -needed for eggdrop to run securely and safely. -USAGE_END - exit 1 -} - -# Install eggdrop -install_eggdrop() { - einfo "Installing Eggdrop" - einfo - - root_check - - if [ -d "${bot_dir}" ] - then - einfo "Already found a bot home directory for ${bot_name}" - exit 1 - fi - - einfo "Creating directories for your eggdrop..." - for dir in logs filesys/incoming text tmp scripts var - do - mkdir -p "${bot_dir}/${dir}" - done - - einfo "Creating symlinks to required files for your bot to run..." - for file in help language modules eggdrop - do - ln -s "/opt/eggdrop/${file}" "${bot_dir}/${file}" - done - - einfo "Copying motd, banner, scripts and config file..." - cp /opt/eggdrop/text/* "${bot_dir}/text" - cp /opt/eggdrop/scripts/* "${bot_dir}/scripts" - cp /opt/eggdrop/eggdrop.conf "${bot_dir}/eggdrop.conf" - - einfo "Finished..." - einfo - einfo "Please edit your ${bot_dir}/eggdrop.conf!" - einfo - einfo "The bot needs to be run from the ${bot_dir} directory." - einfo "Run 'cd ${bot_dir} && ./eggdrop -m eggdrop.conf'" - einfo "to create the user file and then remove the -m command line option" - einfo "to start your eggdrop bot." - einfo - einfo "If you need any help please refer to the man page, or" - einfo "eggdrop website at http://www.egghelp.org/" -} - -if [ -z "${1}" ] -then - usage -else - bot_name="${1}" - bot_dir="${HOME}/.eggdrop/${bot_name}" - install_eggdrop -fi diff --git a/main/eggdrop/eggdrop-langdir.patch b/main/eggdrop/eggdrop-langdir.patch new file mode 100644 index 000000000..5f2db8662 --- /dev/null +++ b/main/eggdrop/eggdrop-langdir.patch @@ -0,0 +1,15 @@ +Patch by Robert Scheck <robert@fedoraproject.org> for eggdrop >= 1.6.17, +which replaces the hardcoded language directory path to avoid the use of +EGG_LANGDIR environment variable per default (#194481 #c6-c9). + +--- eggdrop1.6.17/src/eggdrop.h 2004-07-25 13:17:34.000000000 +0200 ++++ eggdrop1.6.17/src/eggdrop.h.langdir 2006-06-18 01:19:23.000000000 +0200 +@@ -75,7 +75,7 @@ + + + /* Language stuff */ +-#define LANGDIR "./language" /* language file directory */ ++#define LANGDIR "/usr/share/eggdrop/language" /* language file directory */ + #define BASELANG "english" /* language which always gets loaded before + all other languages. You do not want to + change this. */ diff --git a/main/eggdrop/gseen.mod.patch b/main/eggdrop/gseen.mod.patch index e70aef887..9f3beda35 100644 --- a/main/eggdrop/gseen.mod.patch +++ b/main/eggdrop/gseen.mod.patch @@ -1,6 +1,6 @@ diff -Nur src/mod/gseen.mod/Makefile src/mod/gseen.mod/Makefile ---- src/mod/gseen.mod/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ src/mod/gseen.mod/Makefile 2002-10-26 13:17:44.000000000 +0200 +--- ./src/mod/gseen.mod/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/mod/gseen.mod/Makefile 2002-10-26 13:17:44.000000000 +0200 @@ -0,0 +1,28 @@ +# Makefile for src/mod/gseen.mod/ + @@ -31,8 +31,8 @@ diff -Nur src/mod/gseen.mod/Makefile src/mod/gseen.mod/Makefile + +#safety hash diff -Nur src/mod/gseen.mod/README src/mod/gseen.mod/README ---- src/mod/gseen.mod/README 1970-01-01 01:00:00.000000000 +0100 -+++ src/mod/gseen.mod/README 2002-10-26 13:17:45.000000000 +0200 +--- ./src/mod/gseen.mod/README 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/mod/gseen.mod/README 2002-10-26 13:17:45.000000000 +0200 @@ -0,0 +1,140 @@ +Description: +------------ @@ -175,8 +175,8 @@ diff -Nur src/mod/gseen.mod/README src/mod/gseen.mod/README +most powerful seen script, so if you want something that's easier to use than +a module, get a copy of bseen.tcl. diff -Nur src/mod/gseen.mod/UPDATES src/mod/gseen.mod/UPDATES ---- src/mod/gseen.mod/UPDATES 1970-01-01 01:00:00.000000000 +0100 -+++ src/mod/gseen.mod/UPDATES 2002-10-26 13:17:46.000000000 +0200 +--- ./src/mod/gseen.mod/UPDATES 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/mod/gseen.mod/UPDATES 2002-10-26 13:17:46.000000000 +0200 @@ -0,0 +1,55 @@ +Changes in gseen.mod: (since v1.0.0) +-------------------- @@ -234,8 +234,8 @@ diff -Nur src/mod/gseen.mod/UPDATES src/mod/gseen.mod/UPDATES +1.0.0 +- release :) diff -Nur src/mod/gseen.mod/addons/gseen.selectlang.1.0.0.tcl src/mod/gseen.mod/addons/gseen.selectlang.1.0.0.tcl ---- src/mod/gseen.mod/addons/gseen.selectlang.1.0.0.tcl 1970-01-01 01:00:00.000000000 +0100 -+++ src/mod/gseen.mod/addons/gseen.selectlang.1.0.0.tcl 2002-10-26 13:18:14.000000000 +0200 +--- ./src/mod/gseen.mod/addons/gseen.selectlang.1.0.0.tcl 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/mod/gseen.mod/addons/gseen.selectlang.1.0.0.tcl 2002-10-26 13:18:14.000000000 +0200 @@ -0,0 +1,80 @@ +#####################################################################
+#
@@ -319,8 +319,8 @@ diff -Nur src/mod/gseen.mod/addons/gseen.selectlang.1.0.0.tcl src/mod/gseen.mod/ +} \ No newline at end of file diff -Nur src/mod/gseen.mod/ai.c src/mod/gseen.mod/ai.c ---- src/mod/gseen.mod/ai.c 1970-01-01 01:00:00.000000000 +0100 -+++ src/mod/gseen.mod/ai.c 2002-10-26 13:17:47.000000000 +0200 +--- ./src/mod/gseen.mod/ai.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/mod/gseen.mod/ai.c 2002-10-26 13:17:47.000000000 +0200 @@ -0,0 +1,151 @@ +/* + * Copyright (C) 2000,2001 Florian Sander @@ -474,8 +474,8 @@ diff -Nur src/mod/gseen.mod/ai.c src/mod/gseen.mod/ai.c + return 0; +} diff -Nur src/mod/gseen.mod/datahandling.c src/mod/gseen.mod/datahandling.c ---- src/mod/gseen.mod/datahandling.c 1970-01-01 01:00:00.000000000 +0100 -+++ src/mod/gseen.mod/datahandling.c 2002-10-26 13:17:48.000000000 +0200 +--- ./src/mod/gseen.mod/datahandling.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/mod/gseen.mod/datahandling.c 2002-10-26 13:17:48.000000000 +0200 @@ -0,0 +1,151 @@ +/* + * Copyright (C) 2000,2001 Florian Sander @@ -629,8 +629,8 @@ diff -Nur src/mod/gseen.mod/datahandling.c src/mod/gseen.mod/datahandling.c + } +} diff -Nur src/mod/gseen.mod/do_seen.c src/mod/gseen.mod/do_seen.c ---- src/mod/gseen.mod/do_seen.c 1970-01-01 01:00:00.000000000 +0100 -+++ src/mod/gseen.mod/do_seen.c 2002-10-26 13:17:50.000000000 +0200 +--- ./src/mod/gseen.mod/do_seen.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/mod/gseen.mod/do_seen.c 2002-10-26 13:17:50.000000000 +0200 @@ -0,0 +1,840 @@ +/* + * Copyright (C) 2000,2001 Florian Sander @@ -1473,8 +1473,8 @@ diff -Nur src/mod/gseen.mod/do_seen.c src/mod/gseen.mod/do_seen.c + glob_total_queries++; +} diff -Nur src/mod/gseen.mod/generic_binary_tree.c src/mod/gseen.mod/generic_binary_tree.c ---- src/mod/gseen.mod/generic_binary_tree.c 1970-01-01 01:00:00.000000000 +0100 -+++ src/mod/gseen.mod/generic_binary_tree.c 2002-10-26 13:17:51.000000000 +0200 +--- ./src/mod/gseen.mod/generic_binary_tree.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/mod/gseen.mod/generic_binary_tree.c 2002-10-26 13:17:51.000000000 +0200 @@ -0,0 +1,311 @@ +/* + * Copyright (C) 2000,2001 Florian Sander @@ -1788,8 +1788,8 @@ diff -Nur src/mod/gseen.mod/generic_binary_tree.c src/mod/gseen.mod/generic_bina +} +#endif diff -Nur src/mod/gseen.mod/global_vars.c src/mod/gseen.mod/global_vars.c ---- src/mod/gseen.mod/global_vars.c 1970-01-01 01:00:00.000000000 +0100 -+++ src/mod/gseen.mod/global_vars.c 2002-10-26 13:18:09.000000000 +0200 +--- ./src/mod/gseen.mod/global_vars.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/mod/gseen.mod/global_vars.c 2002-10-26 13:18:09.000000000 +0200 @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2000,2001 Florian Sander @@ -1826,8 +1826,8 @@ diff -Nur src/mod/gseen.mod/global_vars.c src/mod/gseen.mod/global_vars.c + glob_seenrequests = glob_totalnicks = glob_totalbytes = 0; +} diff -Nur src/mod/gseen.mod/gseen.c src/mod/gseen.mod/gseen.c ---- src/mod/gseen.mod/gseen.c 1970-01-01 01:00:00.000000000 +0100 -+++ src/mod/gseen.mod/gseen.c 2002-10-26 14:24:48.000000000 +0200 +--- ./src/mod/gseen.mod/gseen.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/mod/gseen.mod/gseen.c 2002-10-26 14:24:48.000000000 +0200 @@ -0,0 +1,328 @@ +/* + * Copyright (C) 2000,2001 Florian Sander @@ -2158,8 +2158,8 @@ diff -Nur src/mod/gseen.mod/gseen.c src/mod/gseen.mod/gseen.c + return NULL; +} diff -Nur src/mod/gseen.mod/gseen.conf src/mod/gseen.mod/gseen.conf ---- src/mod/gseen.mod/gseen.conf 1970-01-01 01:00:00.000000000 +0100 -+++ src/mod/gseen.mod/gseen.conf 2002-10-26 13:17:54.000000000 +0200 +--- ./src/mod/gseen.mod/gseen.conf 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/mod/gseen.mod/gseen.conf 2002-10-26 13:17:54.000000000 +0200 @@ -0,0 +1,147 @@ + +###### @@ -2309,8 +2309,8 @@ diff -Nur src/mod/gseen.mod/gseen.conf src/mod/gseen.mod/gseen.conf + } +} diff -Nur src/mod/gseen.mod/language/gseen.de.lang src/mod/gseen.mod/language/gseen.de.lang ---- src/mod/gseen.mod/language/gseen.de.lang 1970-01-01 01:00:00.000000000 +0100 -+++ src/mod/gseen.mod/language/gseen.de.lang 2002-10-26 13:18:12.000000000 +0200 +--- ./src/mod/gseen.mod/language/gseen.de.lang 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/mod/gseen.mod/language/gseen.de.lang 2002-10-26 13:18:12.000000000 +0200 @@ -0,0 +1,131 @@ +##################################################################### +# @@ -2444,8 +2444,8 @@ diff -Nur src/mod/gseen.mod/language/gseen.de.lang src/mod/gseen.mod/language/gs +180 Momentan sind <?totalnicks/?> Nicks in meiner Datenbank. Gesamter Speicherverbrauch: <?totalbytes/?> Bytes +180 In meiner Datenbank befinden sich <?totalnicks/?> Nicks und verbrauchen <?totalbytes/?> Bytes Speicher. diff -Nur src/mod/gseen.mod/language/gseen.en.lang src/mod/gseen.mod/language/gseen.en.lang ---- src/mod/gseen.mod/language/gseen.en.lang 1970-01-01 01:00:00.000000000 +0100 -+++ src/mod/gseen.mod/language/gseen.en.lang 2002-10-26 13:18:13.000000000 +0200 +--- ./src/mod/gseen.mod/language/gseen.en.lang 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/mod/gseen.mod/language/gseen.en.lang 2002-10-26 13:18:13.000000000 +0200 @@ -0,0 +1,131 @@ +##################################################################### +# @@ -2579,8 +2579,8 @@ diff -Nur src/mod/gseen.mod/language/gseen.en.lang src/mod/gseen.mod/language/gs +# +180 I'm currently tracking <?totalnicks/?> nicks using <?totalbytes/?> bytes. diff -Nur src/mod/gseen.mod/gseen.h src/mod/gseen.mod/gseen.h ---- src/mod/gseen.mod/gseen.h 1970-01-01 01:00:00.000000000 +0100 -+++ src/mod/gseen.mod/gseen.h 2002-10-26 13:17:55.000000000 +0200 +--- ./src/mod/gseen.mod/gseen.h 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/mod/gseen.mod/gseen.h 2002-10-26 13:17:55.000000000 +0200 @@ -0,0 +1,157 @@ +/* + * Copyright (C) 2000,2001 Florian Sander @@ -2740,8 +2740,8 @@ diff -Nur src/mod/gseen.mod/gseen.h src/mod/gseen.mod/gseen.h + +#endif diff -Nur src/mod/gseen.mod/gseencmds.c src/mod/gseen.mod/gseencmds.c ---- src/mod/gseen.mod/gseencmds.c 1970-01-01 01:00:00.000000000 +0100 -+++ src/mod/gseen.mod/gseencmds.c 2002-10-26 13:17:56.000000000 +0200 +--- ./src/mod/gseen.mod/gseencmds.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/mod/gseen.mod/gseencmds.c 2002-10-26 13:17:56.000000000 +0200 @@ -0,0 +1,420 @@ +/* + * Copyright (C) 2000,2001 Florian Sander @@ -3164,8 +3164,8 @@ diff -Nur src/mod/gseen.mod/gseencmds.c src/mod/gseen.mod/gseencmds.c + {0, 0, 0, 0} +}; diff -Nur src/mod/gseen.mod/misc.c src/mod/gseen.mod/misc.c ---- src/mod/gseen.mod/misc.c 1970-01-01 01:00:00.000000000 +0100 -+++ src/mod/gseen.mod/misc.c 2002-10-26 13:17:57.000000000 +0200 +--- ./src/mod/gseen.mod/misc.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/mod/gseen.mod/misc.c 2002-10-26 13:17:57.000000000 +0200 @@ -0,0 +1,116 @@ +/* + * Copyright (C) 2000,2001 Florian Sander @@ -3284,8 +3284,8 @@ diff -Nur src/mod/gseen.mod/misc.c src/mod/gseen.mod/misc.c + } +} diff -Nur src/mod/gseen.mod/seenlang.h src/mod/gseen.mod/seenlang.h ---- src/mod/gseen.mod/seenlang.h 1970-01-01 01:00:00.000000000 +0100 -+++ src/mod/gseen.mod/seenlang.h 2002-10-26 13:17:58.000000000 +0200 +--- ./src/mod/gseen.mod/seenlang.h 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/mod/gseen.mod/seenlang.h 2002-10-26 13:17:58.000000000 +0200 @@ -0,0 +1,61 @@ +/* + * Copyright (C) 2000,2001 Florian Sander @@ -3349,8 +3349,8 @@ diff -Nur src/mod/gseen.mod/seenlang.h src/mod/gseen.mod/seenlang.h + +#define SLSEENSTATS getslang(180) diff -Nur src/mod/gseen.mod/seentree.c src/mod/gseen.mod/seentree.c ---- src/mod/gseen.mod/seentree.c 1970-01-01 01:00:00.000000000 +0100 -+++ src/mod/gseen.mod/seentree.c 2002-10-26 13:18:10.000000000 +0200 +--- ./src/mod/gseen.mod/seentree.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/mod/gseen.mod/seentree.c 2002-10-26 13:18:10.000000000 +0200 @@ -0,0 +1,213 @@ +/* + * Copyright (C) 2000,2001 Florian Sander @@ -3566,8 +3566,8 @@ diff -Nur src/mod/gseen.mod/seentree.c src/mod/gseen.mod/seentree.c + {0, 0} +}; diff -Nur src/mod/gseen.mod/sensors.c src/mod/gseen.mod/sensors.c ---- src/mod/gseen.mod/sensors.c 1970-01-01 01:00:00.000000000 +0100 -+++ src/mod/gseen.mod/sensors.c 2002-10-26 13:18:00.000000000 +0200 +--- ./src/mod/gseen.mod/sensors.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/mod/gseen.mod/sensors.c 2002-10-26 13:18:00.000000000 +0200 @@ -0,0 +1,273 @@ +/* + * Copyright (C) 2000,2001 Florian Sander @@ -3843,8 +3843,8 @@ diff -Nur src/mod/gseen.mod/sensors.c src/mod/gseen.mod/sensors.c + {0, 0, 0, 0} +}; diff -Nur src/mod/gseen.mod/slang.c src/mod/gseen.mod/slang.c ---- src/mod/gseen.mod/slang.c 1970-01-01 01:00:00.000000000 +0100 -+++ src/mod/gseen.mod/slang.c 2002-10-26 13:18:03.000000000 +0200 +--- ./src/mod/gseen.mod/slang.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/mod/gseen.mod/slang.c 2002-10-26 13:18:03.000000000 +0200 @@ -0,0 +1,309 @@ +/* + * Copyright (C) 2000,2001 Florian Sander @@ -4156,8 +4156,8 @@ diff -Nur src/mod/gseen.mod/slang.c src/mod/gseen.mod/slang.c +} +#endif diff -Nur src/mod/gseen.mod/slang_chanlang.c src/mod/gseen.mod/slang_chanlang.c ---- src/mod/gseen.mod/slang_chanlang.c 1970-01-01 01:00:00.000000000 +0100 -+++ src/mod/gseen.mod/slang_chanlang.c 2002-10-26 13:18:02.000000000 +0200 +--- ./src/mod/gseen.mod/slang_chanlang.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/mod/gseen.mod/slang_chanlang.c 2002-10-26 13:18:02.000000000 +0200 @@ -0,0 +1,113 @@ +/* + * Copyright (C) 2000,2001 Florian Sander @@ -4273,8 +4273,8 @@ diff -Nur src/mod/gseen.mod/slang_chanlang.c src/mod/gseen.mod/slang_chanlang.c + return slang_find(where, default_slang); +} diff -Nur src/mod/gseen.mod/slang_duration.c src/mod/gseen.mod/slang_duration.c ---- src/mod/gseen.mod/slang_duration.c 1970-01-01 01:00:00.000000000 +0100 -+++ src/mod/gseen.mod/slang_duration.c 2002-10-26 13:18:01.000000000 +0200 +--- ./src/mod/gseen.mod/slang_duration.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/mod/gseen.mod/slang_duration.c 2002-10-26 13:18:01.000000000 +0200 @@ -0,0 +1,82 @@ +/* + * Copyright (C) 2000,2001 Florian Sander @@ -4359,8 +4359,8 @@ diff -Nur src/mod/gseen.mod/slang_duration.c src/mod/gseen.mod/slang_duration.c + return where->durs[idx]; +} diff -Nur src/mod/gseen.mod/slang_gseen_commands.c src/mod/gseen.mod/slang_gseen_commands.c ---- src/mod/gseen.mod/slang_gseen_commands.c 1970-01-01 01:00:00.000000000 +0100 -+++ src/mod/gseen.mod/slang_gseen_commands.c 2002-10-26 13:18:06.000000000 +0200 +--- ./src/mod/gseen.mod/slang_gseen_commands.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/mod/gseen.mod/slang_gseen_commands.c 2002-10-26 13:18:06.000000000 +0200 @@ -0,0 +1,235 @@ +static void slang_send_botnick() +{ @@ -4598,8 +4598,8 @@ diff -Nur src/mod/gseen.mod/slang_gseen_commands.c src/mod/gseen.mod/slang_gseen + {0, 0} +}; diff -Nur src/mod/gseen.mod/slang_ids.c src/mod/gseen.mod/slang_ids.c ---- src/mod/gseen.mod/slang_ids.c 1970-01-01 01:00:00.000000000 +0100 -+++ src/mod/gseen.mod/slang_ids.c 2002-10-26 13:18:04.000000000 +0200 +--- ./src/mod/gseen.mod/slang_ids.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/mod/gseen.mod/slang_ids.c 2002-10-26 13:18:04.000000000 +0200 @@ -0,0 +1,104 @@ +/* + * Copyright (C) 2000,2001 Florian Sander @@ -4706,8 +4706,8 @@ diff -Nur src/mod/gseen.mod/slang_ids.c src/mod/gseen.mod/slang_ids.c +} +#endif diff -Nur src/mod/gseen.mod/slang_multitext.c src/mod/gseen.mod/slang_multitext.c ---- src/mod/gseen.mod/slang_multitext.c 1970-01-01 01:00:00.000000000 +0100 -+++ src/mod/gseen.mod/slang_multitext.c 2002-10-26 13:18:05.000000000 +0200 +--- ./src/mod/gseen.mod/slang_multitext.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/mod/gseen.mod/slang_multitext.c 2002-10-26 13:18:05.000000000 +0200 @@ -0,0 +1,151 @@ +/* + * Copyright (C) 2000,2001 Florian Sander @@ -4861,8 +4861,8 @@ diff -Nur src/mod/gseen.mod/slang_multitext.c src/mod/gseen.mod/slang_multitext. +} +#endif diff -Nur src/mod/gseen.mod/slang_text.c src/mod/gseen.mod/slang_text.c ---- src/mod/gseen.mod/slang_text.c 1970-01-01 01:00:00.000000000 +0100 -+++ src/mod/gseen.mod/slang_text.c 2002-10-26 13:18:07.000000000 +0200 +--- ./src/mod/gseen.mod/slang_text.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/mod/gseen.mod/slang_text.c 2002-10-26 13:18:07.000000000 +0200 @@ -0,0 +1,200 @@ +/* + * Copyright (C) 2000,2001 Florian Sander @@ -5065,8 +5065,8 @@ diff -Nur src/mod/gseen.mod/slang_text.c src/mod/gseen.mod/slang_text.c + putlog(LOG_MISC, "*", "ERROR! Unknown slang-command: '%s'", cmd); +} diff -Nur src/mod/gseen.mod/tclcmds.c src/mod/gseen.mod/tclcmds.c ---- src/mod/gseen.mod/tclcmds.c 1970-01-01 01:00:00.000000000 +0100 -+++ src/mod/gseen.mod/tclcmds.c 2002-10-26 13:18:08.000000000 +0200 +--- ./src/mod/gseen.mod/tclcmds.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./src/mod/gseen.mod/tclcmds.c 2002-10-26 13:18:08.000000000 +0200 @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2000,2001 Florian Sander diff --git a/main/eggdrop/logs2html.mod.patch b/main/eggdrop/logs2html.mod.patch index 8ea2e94e6..25ad9366c 100644 --- a/main/eggdrop/logs2html.mod.patch +++ b/main/eggdrop/logs2html.mod.patch @@ -1,6 +1,6 @@ diff -urpN eggdrop1.6.19-orig/src/mod/logs2html.mod/Makefile eggdrop1.6.19/src/mod/logs2html.mod/Makefile ---- src/mod/logs2html.mod/Makefile 1970-01-01 00:00:00.000000000 +0000 -+++ src/mod/logs2html.mod/Makefile 2009-03-28 01:32:21.000000000 +0000 +--- ./src/mod/logs2html.mod/Makefile 1970-01-01 00:00:00.000000000 +0000 ++++ ./src/mod/logs2html.mod/Makefile 2009-03-28 01:32:21.000000000 +0000 @@ -0,0 +1,42 @@ +# Makefile for src/mod/logs2html.mod/ + @@ -45,8 +45,8 @@ diff -urpN eggdrop1.6.19-orig/src/mod/logs2html.mod/Makefile eggdrop1.6.19/src/m + ../../../src/compat/memcpy.h ../../../src/compat/strcasecmp.h \ + ../../../src/compat/strftime.h ../../../src/mod/modvals.h diff -urpN eggdrop1.6.19-orig/src/mod/logs2html.mod/chan.list eggdrop1.6.19/src/mod/logs2html.mod/chan.list ---- src/mod/logs2html.mod/chan.list 1970-01-01 00:00:00.000000000 +0000 -+++ src/mod/logs2html.mod/chan.list 2009-03-28 01:43:40.000000000 +0000 +--- ./src/mod/logs2html.mod/chan.list 1970-01-01 00:00:00.000000000 +0000 ++++ ./src/mod/logs2html.mod/chan.list 2009-03-28 01:43:40.000000000 +0000 @@ -0,0 +1,22 @@ +# Add your channels here. The format is: +# addlogs2htmlchan channel output-path main-page-name main-page-title logs-page-prefix logs-page-title @@ -71,8 +71,8 @@ diff -urpN eggdrop1.6.19-orig/src/mod/logs2html.mod/chan.list eggdrop1.6.19/src/ +# with ". + diff -urpN eggdrop1.6.19-orig/src/mod/logs2html.mod/fileoperations.c eggdrop1.6.19/src/mod/logs2html.mod/fileoperations.c ---- src/mod/logs2html.mod/fileoperations.c 1970-01-01 00:00:00.000000000 +0000 -+++ src/mod/logs2html.mod/fileoperations.c 2009-03-28 01:45:19.000000000 +0000 +--- ./src/mod/logs2html.mod/fileoperations.c 1970-01-01 00:00:00.000000000 +0000 ++++ ./src/mod/logs2html.mod/fileoperations.c 2009-03-28 01:45:19.000000000 +0000 @@ -0,0 +1,142 @@ +/* + * fileoperations.c -- part of logs2html.mod @@ -217,8 +217,8 @@ diff -urpN eggdrop1.6.19-orig/src/mod/logs2html.mod/fileoperations.c eggdrop1.6. +/****************************************************************************/ + diff -urpN eggdrop1.6.19-orig/src/mod/logs2html.mod/help/logs2html.help eggdrop1.6.19/src/mod/logs2html.mod/help/logs2html.help ---- src/mod/logs2html.mod/help/logs2html.help 1970-01-01 00:00:00.000000000 +0000 -+++ src/mod/logs2html.mod/help/logs2html.help 2009-03-28 01:32:21.000000000 +0000 +--- ./src/mod/logs2html.mod/help/logs2html.help 1970-01-01 00:00:00.000000000 +0000 ++++ ./src/mod/logs2html.mod/help/logs2html.help 2009-03-28 01:32:21.000000000 +0000 @@ -0,0 +1,22 @@ +%{help=convertalllogs}%{+n} +### %bconvertalllogs%b @@ -243,8 +243,8 @@ diff -urpN eggdrop1.6.19-orig/src/mod/logs2html.mod/help/logs2html.help eggdrop1 +%{+n} + %bconvertalllogs makemainpage%b diff -urpN eggdrop1.6.19-orig/src/mod/logs2html.mod/language/logs2html.english.lang eggdrop1.6.19/src/mod/logs2html.mod/language/logs2html.english.lang ---- src/mod/logs2html.mod/language/logs2html.english.lang 1970-01-01 00:00:00.000000000 +0000 -+++ src/mod/logs2html.mod/language/logs2html.english.lang 2009-03-28 01:32:53.000000000 +0000 +--- ./src/mod/logs2html.mod/language/logs2html.english.lang 1970-01-01 00:00:00.000000000 +0000 ++++ ./src/mod/logs2html.mod/language/logs2html.english.lang 2009-03-28 01:32:53.000000000 +0000 @@ -0,0 +1,38 @@ +# logs2html.english.lang +# language messages for the logs2html module @@ -285,8 +285,8 @@ diff -urpN eggdrop1.6.19-orig/src/mod/logs2html.mod/language/logs2html.english.l +0xe022,Fr +0xe023,St diff -urpN eggdrop1.6.19-orig/src/mod/logs2html.mod/language/logs2html.french.lang eggdrop1.6.19/src/mod/logs2html.mod/language/logs2html.french.lang ---- src/mod/logs2html.mod/language/logs2html.french.lang 1970-01-01 00:00:00.000000000 +0000 -+++ src/mod/logs2html.mod/language/logs2html.french.lang 2009-03-28 01:32:53.000000000 +0000 +--- ./src/mod/logs2html.mod/language/logs2html.french.lang 1970-01-01 00:00:00.000000000 +0000 ++++ ./src/mod/logs2html.mod/language/logs2html.french.lang 2009-03-28 01:32:53.000000000 +0000 @@ -0,0 +1,38 @@ +# logs2html.french.lang +# language messages for the logs2html module @@ -327,8 +327,8 @@ diff -urpN eggdrop1.6.19-orig/src/mod/logs2html.mod/language/logs2html.french.la +0xe022,Ve +0xe023,Sa diff -urpN eggdrop1.6.19-orig/src/mod/logs2html.mod/language/logs2html.russian.lang eggdrop1.6.19/src/mod/logs2html.mod/language/logs2html.russian.lang ---- src/mod/logs2html.mod/language/logs2html.russian.lang 1970-01-01 00:00:00.000000000 +0000 -+++ src/mod/logs2html.mod/language/logs2html.russian.lang 2009-03-28 01:32:21.000000000 +0000 +--- ./src/mod/logs2html.mod/language/logs2html.russian.lang 1970-01-01 00:00:00.000000000 +0000 ++++ ./src/mod/logs2html.mod/language/logs2html.russian.lang 2009-03-28 01:32:21.000000000 +0000 @@ -0,0 +1,38 @@ +# logs2html.ru.lang +# language messages for the logs2html module @@ -369,8 +369,8 @@ diff -urpN eggdrop1.6.19-orig/src/mod/logs2html.mod/language/logs2html.russian.l +0xe022,Ος +0xe023,Ρα diff -urpN eggdrop1.6.19-orig/src/mod/logs2html.mod/language.h eggdrop1.6.19/src/mod/logs2html.mod/language.h ---- src/mod/logs2html.mod/language.h 1970-01-01 00:00:00.000000000 +0000 -+++ src/mod/logs2html.mod/language.h 2009-03-28 01:32:21.000000000 +0000 +--- ./src/mod/logs2html.mod/language.h 1970-01-01 00:00:00.000000000 +0000 ++++ ./src/mod/logs2html.mod/language.h 2009-03-28 01:32:21.000000000 +0000 @@ -0,0 +1,51 @@ +/* + * language.h -- part of logs2html.mod @@ -424,8 +424,8 @@ diff -urpN eggdrop1.6.19-orig/src/mod/logs2html.mod/language.h eggdrop1.6.19/src +#define LOGS2HTML_SATURDAY get_language(0xe023) + diff -urpN eggdrop1.6.19-orig/src/mod/logs2html.mod/logs2html.c eggdrop1.6.19/src/mod/logs2html.mod/logs2html.c ---- src/mod/logs2html.mod/logs2html.c 1970-01-01 00:00:00.000000000 +0000 -+++ src/mod/logs2html.mod/logs2html.c 2009-03-28 01:32:53.000000000 +0000 +--- ./src/mod/logs2html.mod/logs2html.c 1970-01-01 00:00:00.000000000 +0000 ++++ ./src/mod/logs2html.mod/logs2html.c 2009-03-28 01:32:53.000000000 +0000 @@ -0,0 +1,1572 @@ +/* + * logs2html.c -- part of logs2html.mod @@ -2000,8 +2000,8 @@ diff -urpN eggdrop1.6.19-orig/src/mod/logs2html.mod/logs2html.c eggdrop1.6.19/sr +} +/****************************************************************************/ diff -urpN eggdrop1.6.19-orig/src/mod/logs2html.mod/logs2html.conf eggdrop1.6.19/src/mod/logs2html.mod/logs2html.conf ---- src/mod/logs2html.mod/logs2html.conf 1970-01-01 00:00:00.000000000 +0000 -+++ src/mod/logs2html.mod/logs2html.conf 2009-03-28 01:43:58.000000000 +0000 +--- ./src/mod/logs2html.mod/logs2html.conf 1970-01-01 00:00:00.000000000 +0000 ++++ ./src/mod/logs2html.mod/logs2html.conf 2009-03-28 01:43:58.000000000 +0000 @@ -0,0 +1,38 @@ +###### +##### @@ -2042,8 +2042,8 @@ diff -urpN eggdrop1.6.19-orig/src/mod/logs2html.mod/logs2html.conf eggdrop1.6.19 +# now load the module +loadmodule logs2html diff -urpN eggdrop1.6.19-orig/src/mod/logs2html.mod/logs2html.h eggdrop1.6.19/src/mod/logs2html.mod/logs2html.h ---- src/mod/logs2html.mod/logs2html.h 1970-01-01 00:00:00.000000000 +0000 -+++ src/mod/logs2html.mod/logs2html.h 2009-03-28 01:46:28.000000000 +0000 +--- ./src/mod/logs2html.mod/logs2html.h 1970-01-01 00:00:00.000000000 +0000 ++++ ./src/mod/logs2html.mod/logs2html.h 2009-03-28 01:46:28.000000000 +0000 @@ -0,0 +1,76 @@ +/* + * logs2html.h -- part of logs2html.mod @@ -2122,21 +2122,21 @@ diff -urpN eggdrop1.6.19-orig/src/mod/logs2html.mod/logs2html.h eggdrop1.6.19/sr +static patternkind whatisit(char *pattern); + diff -urpN eggdrop1.6.19-orig/src/mod/logs2html.mod/logs2html.mod.desc eggdrop1.6.19/src/mod/logs2html.mod/logs2html.mod.desc ---- src/mod/logs2html.mod/logs2html.mod.desc 1970-01-01 00:00:00.000000000 +0000 -+++ src/mod/logs2html.mod/logs2html.mod.desc 2009-03-28 01:46:37.000000000 +0000 +--- ./src/mod/logs2html.mod/logs2html.mod.desc 1970-01-01 00:00:00.000000000 +0000 ++++ ./src/mod/logs2html.mod/logs2html.mod.desc 2009-03-28 01:46:37.000000000 +0000 @@ -0,0 +1 @@ +This module convert all existing log files (and those, that will be created after module installation) of your eggdrop for givving channel to their html representation to be show in the web. and also the calendar page with links to that converted files. diff -urpN eggdrop1.6.19-orig/src/mod/logs2html.mod/modinfo eggdrop1.6.19/src/mod/logs2html.mod/modinfo ---- src/mod/logs2html.mod/modinfo 1970-01-01 00:00:00.000000000 +0000 -+++ src/mod/logs2html.mod/modinfo 2009-03-28 01:32:21.000000000 +0000 +--- ./src/mod/logs2html.mod/modinfo 1970-01-01 00:00:00.000000000 +0000 ++++ ./src/mod/logs2html.mod/modinfo 2009-03-28 01:32:21.000000000 +0000 @@ -0,0 +1,4 @@ +DESC:This module convert all existing log files (and those, that will be +DESC:created after module installation) of your eggdrop for givving channel +DESC:to their html representation to be show in the web. and also the +DESC:calendar page with links to that converted files. diff -urpN eggdrop1.6.19-orig/src/mod/logs2html.mod/readme.txt eggdrop1.6.19/src/mod/logs2html.mod/readme.txt ---- src/mod/logs2html.mod/readme.txt 1970-01-01 00:00:00.000000000 +0000 -+++ src/mod/logs2html.mod/readme.txt 2009-03-28 01:44:20.000000000 +0000 +--- ./src/mod/logs2html.mod/readme.txt 1970-01-01 00:00:00.000000000 +0000 ++++ ./src/mod/logs2html.mod/readme.txt 2009-03-28 01:44:20.000000000 +0000 @@ -0,0 +1,85 @@ +logs2html.mod v.2.3.4 by Alexander Fedotov aka Gray_Angel aka Shmupsik #ircnet.ru +e-mail: shurikvz@mail.ru @@ -2224,8 +2224,8 @@ diff -urpN eggdrop1.6.19-orig/src/mod/logs2html.mod/readme.txt eggdrop1.6.19/src +P.S. Sorry for my bad english + diff -urpN eggdrop1.6.19-orig/src/mod/logs2html.mod/top100.tpl eggdrop1.6.19/src/mod/logs2html.mod/top100.tpl ---- src/mod/logs2html.mod/top100.tpl 1970-01-01 00:00:00.000000000 +0000 -+++ src/mod/logs2html.mod/top100.tpl 2009-03-28 01:43:24.000000000 +0000 +--- ./src/mod/logs2html.mod/top100.tpl 1970-01-01 00:00:00.000000000 +0000 ++++ ./src/mod/logs2html.mod/top100.tpl 2009-03-28 01:43:24.000000000 +0000 @@ -0,0 +1,50 @@ + +<p align="center"> @@ -2278,8 +2278,8 @@ diff -urpN eggdrop1.6.19-orig/src/mod/logs2html.mod/top100.tpl eggdrop1.6.19/src +<!--end of Top100 code--> +</p> diff -urpN eggdrop1.6.19-orig/src/mod/logs2html.mod/user.css eggdrop1.6.19/src/mod/logs2html.mod/user.css ---- src/mod/logs2html.mod/user.css 1970-01-01 00:00:00.000000000 +0000 -+++ src/mod/logs2html.mod/user.css 2009-03-28 01:32:53.000000000 +0000 +--- ./src/mod/logs2html.mod/user.css 1970-01-01 00:00:00.000000000 +0000 ++++ ./src/mod/logs2html.mod/user.css 2009-03-28 01:32:53.000000000 +0000 @@ -0,0 +1,121 @@ +BODY { +font-family: serif; |