Author: glen                         Date: Sun Mar  6 16:06:41 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- remove chunks against inexesistent .orig files

---- Files affected:
SOURCES:
   eggdrop-ssl.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/eggdrop-ssl.patch
diff -u SOURCES/eggdrop-ssl.patch:1.2 SOURCES/eggdrop-ssl.patch:1.3
--- SOURCES/eggdrop-ssl.patch:1.2       Mon Nov  1 14:50:05 2004
+++ SOURCES/eggdrop-ssl.patch   Sun Mar  6 17:06:36 2005
@@ -511,1363 +511,6 @@
 -# Woobie only serves as an example for module programming. No need to
 -# compile it for normal bots ...
 -woobie
-diff -burN eggdrop1.6.17.orig/eggdrop.conf.orig eggdrop1.6.17/eggdrop.conf.orig
---- eggdrop1.6.17.orig/eggdrop.conf.orig       2004-11-01 14:40:44.107455640 
+0100
-+++ eggdrop1.6.17/eggdrop.conf.orig    1970-01-01 01:00:00.000000000 +0100
-@@ -1,1353 +0,0 @@
--#! /usr/bin/eggdrop
--# ^- This should contain a fully qualified path to your Eggdrop executable.
--#
--# $Id$
--#
--# This is a sample Eggdrop configuration file which includes all possible
--# settings that can be used to configure your bot.
--#
--# The pound signs (#) that you see at the beginning of some lines mean that
--# the remainder of that line is a comment, or just for your information. By
--# adding or deleting pound signs, you can comment or uncomment a setting,
--# respectively.
--#
--# Arguments for a command or setting may be inclosed in <>'s or []'s in the
--# example/description. Arguments in <>'s are required, while [] means 
optional.
--#
--# More detailed descriptions of all these settings can be found in
--# doc/settings/.
--
--
--
--##### BASIC SETTINGS #####
--
--# This setting defines the username the bot uses on IRC. This setting has
--# no effect if an ident daemon is running on your bot's machine.
--set username "lamest"
--
--# This setting defines which contact person should be shown in .status,
--# /msg help, and other places. You really should include this information.
--set admin "Lamer <email: [EMAIL PROTECTED]>"
--
--# This setting is used only for info to share with others on your botnet.
--# Set this to the IRC network your bot is connected to.
--set network "I.didn't.edit.my.config.file.net"
--
--# This setting defines the timezone is your bot in. It's used for internal
--# routines as well as for logfile timestamping and scripting purposes.
--# The timezone string specifies the name of the timezone and must be three
--# or more alphabetic characters. For example, Central European Time(UTC+1)
--# should be "CET".
--set timezone "EST"
--
--# The offset setting specifies the time value to be added to the local
--# time to get Coordinated Universal Time (UTC aka GMT). The offset is
--# positive if the local timezone is west of the Prime Meridian and
--# negative if it is east. The value (in hours) must be between -23 and
--# 23. For example, if the timezone is UTC+1, the offset is -1.
--set offset "5"
--
--# If you don't want to use the timezone setting for scripting purposes only,
--# but instead everywhere possible, un-comment the following line.
--#set env(TZ) "$timezone $offset"
--
--# If you're using virtual hosting (your machine has more than 1 IP), you
--# may want to specify the particular IP to bind to. You can specify either
--# by hostname or by IP. You may also want to set the hostname here if
--# Eggdrop has trouble detecting it when it starts up.
--#set my-hostname "virtual.host.com"
--#set my-ip "99.99.0.0"
--
--# If you want to have your Eggdrop messages displayed in a language other
--# than English, change this setting to match your preference. An alternative
--# would be to set the environment variable EGG_LANG to that value.
--#
--# Languages included with Eggdrop: Danish, English, French, Finnish, German.
--#addlang "english"
--
--
--##### LOG FILES #####
--
--# Eggdrop is capable of logging various things, from channel chatter to
--# commands people use on the bot and file transfers. Logfiles are normally
--# kept for 24 hours. Afterwards, they will be renamed to 
"(logfile).yesterday".
--# After 48 hours, they will be overwritten by the logfile of the next day.
--#
--# Events are logged by certain categories. This way, you can specify
--# exactly what kind of events you want sent to various logfiles.
--#
--# Logfile flags:
--#   b - information about bot linking and userfile sharing
--#   c - commands
--#   d - misc debug information
--#   h - raw share traffic
--#   j - joins, parts, quits, and netsplits on the channel
--#   k - kicks, bans, and mode changes on the channel
--#   m - private msgs, notices and ctcps to the bot
--#   o - misc info, errors, etc (IMPORTANT STUFF)
--#   p - public text on the channel
--#   r - raw incoming server traffic
--#   s - server connects, disconnects, and notices
--#   t - raw botnet traffic
--#   v - raw outgoing server traffic
--#   w - wallops (make sure the bot sets +w in init-server)
--#   x - file transfers and file-area commands
--#
--# Note that modes d, h, r, t, and v can fill disk quotas quickly. There are
--# also eight user-defined levels (1-8) which can be used by Tcl scripts.
--#
--# Each logfile belongs to a certain channel. Events of type 'k', 'j', and 'p'
--# are logged to whatever channel they happened on. Most other events are
--# currently logged to every channel. You can make a logfile belong to all
--# channels by assigning it to channel "*".
--
--# This is the maximum number of logfiles allowed. This setting can be
--# increased; however, don't decrease it.
--set max-logs 5
--
--# This is the maximum size of your logfiles. Set it to 0 to disable.
--# This value is in kilobytes, so '550' would mean cycle logs when it
--# reaches the size of 550 kilobytes. Note that this only works if you
--# have keep-all-logs 0 (OFF).
--set max-logsize 0
--
--# This could be good if you have had problem with the logfile filling
--# your quota/hard disk or if you log +p and publish it to the web and
--# need more up-to-date info. Note that this setting might increase the
--# CPU usage of your bot (on the other hand it will decrease your mem usage).
--set quick-logs 0
--
--# This setting allows you the logging of raw incoming server traffic via
--# console/log flag 'r', raw outgoing server traffic via console/log mode 'v',
--# raw botnet traffic via console/log mode 't', and raw share traffic via
--# console/log mode 'h'. These flags can create a large security hole,
--# allowing people to see user passwords. This is now restricted to +n users
--# only. Please choose your owners with care.
--set raw-log 0
--
--# This creates a logfile named eggdrop.log containing private msgs/ctcps,
--# commands, errors, and misc. info from any channel.
--logfile mco * "logs/eggdrop.log"
--
--# This creates a logfile named lamest.log containing joins, parts,
--# netsplits, kicks, bans, mode changes, and public chat on the
--# channel #lamest.
--logfile jpk #lamest "logs/lamest.log"
--
--# Use this feature to timestamp entries in the log file.
--set log-time 1
--
--# If you want to keep your logfiles forever, turn this setting on. All
--# logfiles will get suffix ".[day, 2 digits][month, 3 letters][year, 4 
digits]".
--# Note that your quota/hard-disk might be filled by this, so check your
--# logfiles often and download them.
--set keep-all-logs 0
--
--# If keep-all-logs is 1, this setting will define the suffix of the logfiles.
--# The default will result in a suffix like "04May2000". "%Y%m%d" will produce
--# the often used yyyymmdd format. Read the strftime manpages for more options.
--# NOTE: On systems which don't support strftime, the default format will
--# be used _always_.
--set logfile-suffix ".%d%b%Y"
--
--# You can specify when Eggdrop should switch logfiles and start fresh. You
--# must use military time for this setting. 300 is the default, and describes
--# 03:00 (AM).
--set switch-logfiles-at 300
--
--# "Writing user file..." and "Writing channel file..." messages won't be
--# logged anymore if this option is enabled.
--set quiet-save 0
--
--
--##### CONSOLE #####
--
--# This is the default console mode. It uses the same event flags as the log
--# files do. The console channel is automatically set to your "primary" 
channel,
--# which is set in the modules section of the config file. Masters can change
--# their console channel and modes with the '.console' command.
--
--set console "mkcobxs"
--
--
--##### FILES AND DIRECTORIES #####
--
--# Specify here the filename your userfile should be saved as.
--set userfile "LamestBot.user"
--
--# Specify here the filename Eggdrop will save its pid to. If no pidfile is
--# specified, pid.(botnet-nick) will be used.
--#set pidfile "pid.LamestBot"
--
--# If you want your userfile to be sorted upon saving, enable this setting.
--# This causes the bot to use bit more CPU when saving the usefile.
--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!
--set help-path "/usr/share/eggdrop/help/"
--
--# Specify here where Eggdrop should look for text files. This is used for
--# certain Tcl and DCC commands.
--set text-path "/usr/share/eggdrop/"
--
--# Set here a place to store temporary files.
--set temp-path "/tmp"
--
--# The MOTD (Message Of The day) is displayed when people dcc chat or telnet
--# to the bot. Look at doc/TEXT-SUBSTITUTIONS for options.
--set motd "/usr/share/eggdrop/motd"
--
--# This banner will be displayed on telnet connections. Look at
--# doc/TEXT-SUBSTITUTIONS for options.
--set telnet-banner "/usr/share/eggdrop/banner"
--
--# 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.
--#
--# To remind you:
--#
--#          u  g  o           u  g  o           u  g  o
--#    0600  rw-------   0400  r--------   0200  -w-------    u - user
--#    0660  rw-rw----   0440  r--r-----   0220  -w--w----    g - group
--#    0666  rw-rw-rw-   0444  r--r--r--   0222  -w--w--w-    o - others
--#
--# Note that the default 0600 is the most secure one and should only be changed
--# if you need your files for shell scripting or other external applications.
--set userfile-perm 0600
--
--
--##### BOTNET/DCC/TELNET #####
--
--# Settings in this section should be unimportant for you until you deal
--# with botnets (multiple Eggdrops connected together to maximize efficiency).
--# You should read doc/BOTNET before modifying these settings.
--
--# If you want to use a different nickname on the botnet than you use on
--# IRC (i.e. if you're on an un-trusted botnet), un-comment the next line
--# and set it to the nick you would like to use.
--#set botnet-nick "LlamaBot"
--
--# This opens a telnet port by which you and other bots can interact with the
--# Eggdrop by telneting in.
--#
--# There are more options for the listen command in doc/tcl-commands.doc. Note
--# that if you are running more than one bot on the same machine, you will want
--# to space the telnet ports at LEAST 5 apart, although 10 is even better.
--#
--# Valid ports are typically anything between 1025 and 65535 assuming the
--# port is not already in use.
--#
--# If you would like the bot to listen for users and bots in separate ports,
--# use the following format:
--#
--#   listen 3333 bots
--#   listen 4444 users
--#
--# If you wish to use only one port, use this format:
--#
--#   listen 3333 all
--#
--# You need to un-comment this line and change the port number in order to open
--# the listen port. You should not keep this set to 3333.
--#listen 3333 all
--
--# This setting defines whether or not people can boot users on the Eggdrop
--# from other bots in your botnet. Valid settings are:
--#   0 - allow *no* outside boots
--#   1 - allow boots from sharebots
--#   2 - allow any boots
--set remote-boots 2
--
--# This setting prohibits remote bots from telling your Eggdrop to unlink from
--# share bots.
--set share-unlinks 1
--
--# This setting will drop telnet connections not matching a known host. It
--# greatly improves protection from IRCops, but makes it impossible to add
--# hosts on limbo (NOIRC) bots or have NEW as a valid login.
--set protect-telnet 0
--
--# This setting will make the bot ignore DCC chat requests which appear to
--# have bogus information on the grounds that the user may have been trying
--# to make the bot connect to somewhere that will get it into trouble, or
--# that the user has a broken client (like mIRC tends to do), in which case
--# the connect wouldn't work anyway. It's suggested that you turn this on.
--set dcc-sanitycheck 0
--
--# This settings defines a time in seconds that the bot should wait before
--# a dcc chat, telnet, or relay connection times out.
--set ident-timeout 5
--
--# Define here whether or not a +o user still needs the +p flag to dcc the bot.
--set require-p 0
--
--# If you want people allow to telnet in and type 'NEW' to become a new user,
--# set this to 1. This is similar to the 'hello' msg command. The 
protect-telnet
--# setting must be set to 0 to use this.
--set open-telnets 0
--
--# If you don't want Eggdrop to identify itself as an eggdrop on a telnet
--# connection, set this setting to 1. Eggdrop will display 'Nickname' instead.
--set stealth-telnets 0
--
--# If you want Eggdrop to display a banner when telneting in, set this setting
--# to 1. The telnet banner is set by 'set telnet-banner'.
--set use-telnet-banner 0
--
--# This settings defines a time in seconds that the bot should wait before
--# a dcc chat, telnet, or relay connection times out.
--set connect-timeout 15
--
--# Specify here the number of lines to accept from a user on the partyline
--# within 1 second before they are considered to be flooding and therefore
--# get booted.
--set dcc-flood-thr 3
--
--# Define here how many telnet connection attempts in how many seconds from
--# the same host constitute a flood. The correct format is Attempts:Seconds.
--set telnet-flood 5:60
--
--# If you want telnet-flood to apply even to +f users, set this setting to 1.
--set paranoid-telnet-flood 1
--
--# Set here the amount of seconds before giving up on hostname/address
--# lookup (you might want to increase this if you are on a slow network).
--set resolve-timeout 15
--
--
--##### MORE ADVANCED SETTINGS #####
--
--# Set this to your socks host if your Eggdrop sits behind a firewall. If
--# you use a Sun "telnet passthru" firewall, prefix the host with a '!'.
--#set firewall "!sun-barr.ebay:3666"
--
--# If you have a NAT firewall (you box has an IP in one of the following
--# ranges: 192.168.0.0-192.168.255.255, 172.16.0.0-172.31.255.255,
--# 10.0.0.0-10.255.255.255 and your firewall transparently changes your
--# address to a unique address for your box) or you have IP masquerading
--# between you and the rest of the world, and /dcc chat, /ctcp chat or
--# userfile sharing aren't working, enter your outside IP here. Do not
--# enter anything for my-ip or my-hostname if you use this setting.
--#set nat-ip "127.0.0.1"
--
--# If you want all dcc file transfers to use a particular portrange either
--# because you're behind a firewall, or for other security reasons, set it
--# here.
--#set reserved-portrange 2010:2020
--
--# Set the time in minutes that temporary ignores should last.
--set ignore-time 15
--
--# Define here what Eggdrop considers 'hourly'. All calls to it, including such
--# things as note notifying or userfile saving, are affected by this.
--# For example:
--#
--#   set hourly-updates 15
--#
--# The bot will save its userfile 15 minutes past every hour.
--set hourly-updates 00
--
--# Un-comment the next line and set the list of owners of the bot.
--# You NEED to change this setting.
--#set owner "MrLame, MrsLame"
--
--# Who should a note be sent to when new users are learned?
--set notify-newusers "$owner"
--
--# Enter the flags that all new users should get by default. See '.help whois'
--# on the partyline for a list of flags and their descriptions.
--set default-flags "hp"
--
--# Enter all user-defined fields that should be displayed in a '.whois'.
--# This will only be shown if the user has one of these extra fields.
--# You might prefer to comment this out and use the userinfo1.0.tcl script
--# which provides commands for changing all of these.
--set whois-fields "url birthday"
--
--# Enable this setting if you want your Eggdrop to die upon receiving a SIGHUP
--# kill signal. Otherwise, the Eggdrop will just save its userfile and rehash.
--set die-on-sighup 0
--
--# Enable this setting if you want your Eggdrop to die upon receiving a SIGTERM
--# kill signal. Otherwise, the Eggdrop will just save its userfile and rehash.
--set die-on-sigterm 1
--
--# Comment these two lines if you wish to enable the .tcl and .set commands.
--# If you select your owners wisely, you should be okay enabling these.
--unbind dcc n tcl *dcc:tcl
--unbind dcc n set *dcc:set
--
--# If you enable this setting, only permanent owners (owner setting) will be
--# able to use .tcl and .set. Moreover, if you want only let permanent owners
--# use .dump, then set this to 2.
--set must-be-owner 1
--
--# Comment out this line to add the 'simul' partyline command (owners can
--# manipulate other people on the party line). Please select owners wisely
--# and use this command ethically!
--unbind dcc n simul *dcc:simul
--
--# Set here the maximum number of dcc connections you will allow. You can
--# increase this later, but never decrease it.
--set max-dcc 50
--
--# Enable this setting if you want +d & +k users to use commands bound as -|-.
--set allow-dk-cmds 1
--
--# If your Eggdrop rejects bots that actually have already disconnected from
--# another hub, but the disconnect information has not yet spread over the
--# botnet due to lag, use this setting. The bot will wait dupwait-timeout
--# seconds before it checks again and then finally reject the bot.
--set dupwait-timeout 5
--
--# You MUST remove this line for your bot to start. This has been added to
--# prevent you from starting up a bot that is not fully configured. Bots
--# that have not been fully configured may join the wrong IRC network, the
--# wrong channels, or generally do things that you do not want. Please make
--# sure that you have double-checked every setting. There's also a similar line
--# lower down, just to make sure you're reading :)
--die "Please make sure you edit your config file completely."
--
--
--##### MODULES #####
--
--# Below are various settings for the modules included with Eggdrop.
--# PLEASE READ AND EDIT THEM CAREFULLY, even if you're an old hand at
--# Eggdrop, things change.
--
--# This path specifies the path were Eggdrop should look for its modules.
--# 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 :)
--set mod-path "/usr/lib/eggdrop/modules/"
--
--
--#### DNS MODULE ####
--
--# This module provides asynchronous dns support. This will avoid long
--# periods where the bot just hangs there, waiting for a hostname to
--# resolve, which will often let it timeout on all other connections.
--loadmodule dns
--
--
--#### CHANNELS MODULE ####
--
--# This module provides channel related support for the bot. Without it,
--# you won't be able to make the bot join a channel or save channel
--# specific userfile information.
--loadmodule channels
--
--# Enter here the filename where dynamic channel settings are stored.
--set chanfile "LamestBot.chan"
--
--# Set this setting to 1 if you want your bot to expire bans/exempts/invites 
set
--# by other opped bots on the channel.
--set force-expire 0
--
--# Set this setting to 1 if you want your bot to share user greets with other
--# bots on the channel if sharing user data.
--set share-greet 0
--
--# Set this setting to 1 if you want to allow users to store an info line.
--set use-info 1
--
--# The following settings are used as default values when you .+chan #chan or 
.tcl
--# channel add #chan. Look in the section below for explanation of every 
option.
--
--set global-flood-chan 10:60
--set global-flood-deop 3:10
--set global-flood-kick 3:10
--set global-flood-join 5:60
--set global-flood-ctcp 3:60
--set global-flood-nick 5:60
--set global-aop-delay 5:30
--set global-idle-kick 0
--set global-chanmode "nt"
--set global-stopnethack-mode 0
--set global-revenge-mode 0
--set global-ban-time 120
--set global-exempt-time 60
--set global-invite-time 60
--
--set global-chanset {
--        -autoop         -autovoice
--        -bitch          +cycle
--        +dontkickops    +dynamicbans
--        +dynamicexempts +dynamicinvites
--        -enforcebans    +greet
--        -inactive       -nodesynch
--        -protectfriends +protectops
--        -revenge        -revengebot
--        -secret         -seen
--        +shared         +statuslog
--        +userbans       +userexempts
--        +userinvites    -protecthalfops
--        -autohalfop
--}
--
--# Add each static channel you want your bot to sit in using the following
--# command. There are many different possible settings you can insert into
--# this command, which are explained below.
--#
--#    channel add #lamest {
--#      chanmode "+nt-likm"
--#      idle-kick 0
--#      stopnethack-mode 0
--#      revenge-mode 0
--#      ban-time 120
--#      exempt-time 60
--#      invite-time 60
--#      aop-delay 5:30
--#      need-op { putserv "PRIVMSG #lamest :op me cos i'm lame!" }
--#      need-invite { putserv "PRIVMSG #lamest :let me in!" }
--#      need-key { putserv "PRIVMSG #lamest :let me in!" }
--#      need-unban { putserv "PRIVMSG #lamest :let me in!" }
--#      need-limit { putserv "PRIVMSG #lamest :let me in!" }
--#      flood-chan 10:60
--#      flood-deop 3:10
--#      flood-kick 3:10
--#      flood-join 5:60
--#      flood-ctcp 3:60
--#      flood-nick 5:60
--#    }
--#
--# chanmode +/-<modes>
--#    This setting makes the bot enforce channel modes. It will always add
--#    the +<modes> and remove the -<modes> modes.
--# idle-kick 0
--#    This setting will make the bot check every minute for idle
--#    users. Set this to 0 to disable idle check.
--#
--# stopnethack-mode 0
--#    This setting will make the bot de-op anyone who enters the channel
--#    with serverops. There are seven different modes for this settings:
--#       0 turn off,
--#      1 isoptest (allow serverop if registered op)
--#      2 wasoptest (allow serverop if op before split)
--#      3 allow serverop if isop or wasop
--#      4 allow serverop if isop and wasop.
--#      5 If the channel is -bitch, see stopnethack-mode 3
--#        If the channel is +bitch, see stopnethack-mode 1
--#      6 If the channel is -bitch, see stopnethack-mode 2
--#        If the channel is +bitch, see stopnethack-mode 4
--#
--# revenge-mode 0
--#   This settings defines how the bot should punish bad users when
--#   revenging. There are four possible settings:
--#     0 Deop the user.
--#     1 Deop the user and give them the +d flag for the channel.
--#     2 Deop the user, give them the +d flag for the channel, and kick them.
--#     3 Deop the user, give them the +d flag for the channel, kick, and ban 
them.
--#
--# ban-time 120
--#   Set here how long temporary bans will last (in minutes). If you
--#   set this setting to 0, the bot will never remove them.
--#
--# exempt-time 60
--#   Set here how long temporary exempts will last (in minutes). If you
--#   set this setting to 0, the bot will never remove them. The bot will
--#   check the exempts every X minutes, but will not remove the exempt if
--#   a ban is set on the channel that matches that exempt. Once the ban is
--#   removed, then the exempt will be removed the next time the bot checks.
--#   Please note that this is an IRCnet feature.
--#
--# invite-time 60
--#   Set here how long temporary invites will last (in minutes). If you
--#   set this setting to 0, the bot will never remove them. The bot will
--#   check the invites every X minutes, but will not remove the invite if
--#   a channel is set to +i. Once the channel is -i then the invite will be
--#   removed the next time the bot checks. Please note that this is an IRCnet
--#   feature.
--#
--# aop-delay (minimum:maximum)
--# This is used for autoop, autohalfop, autovoice. If an op or voice joins a
--# channel while another op or voice is pending, the bot will attempt to put
--# both modes on one line.
--#   aop-delay 0   No delay is used.
--#   aop-delay X   An X second delay is used.
--#   aop-delay X:Y A random delay between X and Y is used.
--#
--# need-op { putserv "PRIVMSG #lamest :op me cos i'm lame!" }
--#    This setting will make the bot run the script enclosed in brackets
--#    if it does not have ops. This must be shorter than 120 characters.
--#    If you use scripts like getops.tcl or botnetop.tcl, you don't need
--#    to set this setting.
--#
--# need-invite { putserv "PRIVMSG #lamest :let me in!" }
--#    This setting will make the bot run the script enclosed in brackets
--#    if it needs an invite to the channel. This must be shorter than 120
--#    characters. If you use scripts like getops.tcl or botnetop.tcl, you
--#    don't need to set this setting.
--#
--# need-key { putserv "PRIVMSG #lamest :let me in!" }
--#    This setting will make the bot run the script enclosed in brackets
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/eggdrop-ssl.patch?r1=1.2&r2=1.3&f=u


_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to