From: nico Date: Sat, 3 May 2008 02:42:43 +0000 (+0000) Subject: [packages] move packages to a new 'mail' section, cleanup X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=a9f231baf23fc87f40bf0d5febc01dc489476877;p=packages.git [packages] move packages to a new 'mail' section, cleanup git-svn-id: svn://svn.openwrt.org/openwrt/packages@11014 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile new file mode 100644 index 000000000..21c0d00ad --- /dev/null +++ b/mail/dovecot/Makefile @@ -0,0 +1,109 @@ +# +# Copyright (C) 2006-2008 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# $Id$ + +include $(TOPDIR)/rules.mk + +PKG_NAME:=dovecot +PKG_VERSION:=1.0.beta8 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.dovecot.org/releases/ +PKG_MD5SUM:=6a87718a86ee1ae2334c75843dd9a7df + +include $(INCLUDE_DIR)/package.mk + +define Package/dovecot + SECTION:=mail + CATEGORY:=Mail + DEPENDS:=+libopenssl + TITLE:=An IMAP and POP3 daemon + URL:=http://www.dovecot.org/ +endef + +define Package/dovecot/description + Dovecot is a program which provides POP3 and IMAP services. +endef + +define Build/Configure + (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \ + autoconf \ + ); + $(call Build/Configure/Default, \ + --without-gssapi \ + --with-moduledir=/usr/lib/dovecot/modules \ + , \ + ignore_signed_size=1 \ + ) +endef + +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install +endef + +define Package/dovecot/install + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/dovecot.init $(1)/etc/init.d/dovecot + $(INSTALL_DIR) $(1)/etc/dovecot + $(INSTALL_DATA) ./files/dovecot.conf $(1)/etc/dovecot.conf + $(INSTALL_DIR) $(1)/usr/lib/dovecot + $(CP) $(PKG_INSTALL_DIR)/usr/lib/dovecot/* $(1)/usr/lib/dovecot/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ + find $(1)/usr/lib/dovecot/modules/ \ + -name "*.a" -o -name "*.la" | xargs rm +endef + +define Package/dovecot/conffiles +/etc/dovecot.conf +endef + +define Package/dovecot/postinst +#!/bin/sh + +id=59 +name=dovecot +home=/var/run/dovecot +shell=/bin/false + +# do not change below +# check if we are on real system +if [ -z "$${IPKG_INSTROOT}" ]; then + # create copies of passwd and group, if we use squashfs + rootfs=`mount |awk '/root/ { print $$5 }'` + if [ "$$rootfs" = "squashfs" ]; then + if [ -h /etc/group ]; then + rm /etc/group + cp -p /rom/etc/group /etc/group + fi + if [ -h /etc/passwd ]; then + rm /etc/passwd + cp -p /rom/etc/passwd /etc/passwd + fi + fi +fi + +echo "" +if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/group)" ]; then + echo "adding group $$name to /etc/group" + echo "$${name}:x:$${id}:" >> $${IPKG_INSTROOT}/etc/group +fi +if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/passwd)" ]; then + echo "adding user $$name to /etc/passwd" + echo "$${name}:x:$${id}:$${id}:$${name}:$${home}:$${shell}" >> $${IPKG_INSTROOT}/etc/passwd +fi +endef + + +$(eval $(call BuildPackage,dovecot)) + +$(eval $(call RequireCommand,autoconf, \ + $(PKG_NAME) requires GNU autoconf. \ +)) diff --git a/mail/dovecot/files/dovecot.conf b/mail/dovecot/files/dovecot.conf new file mode 100644 index 000000000..161aa1b9e --- /dev/null +++ b/mail/dovecot/files/dovecot.conf @@ -0,0 +1,895 @@ +## Dovecot configuration file + +# '#' character and everything after it is treated as comments. Extra spaces +# and tabs are ignored. If you want to use either of these explicitly, put the +# value inside quotes, eg.: key = "# char and trailing whitespace " + +# Default values are shown after each value, it's not required to uncomment +# any of the lines. Exception to this are paths, they're just examples +# with real defaults being based on configure options. The paths listed here +# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var +# --with-ssldir=/etc/ssl + +# Base directory where to store runtime data. +#base_dir = /var/run/dovecot/ + +# Protocols we want to be serving: +# imap imaps pop3 pop3s +#protocols = imap imaps +protocols = imap + +# IP or host address where to listen in for connections. It's not currently +# possible to specify multiple addresses. "*" listens in all IPv4 interfaces. +# "[::]" listens in all IPv6 interfaces, but may also listen in all IPv4 +# interfaces depending on the operating system. If you want to specify ports +# for each service, you will need to configure these settings inside the +# protocol imap/pop3 { ... } section, so you can specify different ports +# for IMAP/POP3. +#listen = * + +# IP or host address where to listen in for SSL connections. Defaults +# to above if not specified. +#ssl_listen = + +# Disable SSL/TLS support. +#ssl_disable = no +ssl_disable = yes + +# PEM encoded X.509 SSL/TLS certificate and private key. They're opened before +# dropping root privileges, so keep the key file unreadable by anyone but +# root. +#ssl_cert_file = /etc/ssl/certs/ssl-cert-snakeoil.pem +#ssl_key_file = /etc/ssl/private/ssl-cert-snakeoil.key + +# If key file is password protected, give the password here. Alternatively +# give it when starting dovecot with -p parameter. +#ssl_key_password = + +# File containing trusted SSL certificate authorities. Usually not needed. +#ssl_ca_file = + +# Request client to send a certificate. +#ssl_verify_client_cert = no + +# How often to regenerate the SSL parameters file. Generation is quite CPU +# intensive operation. The value is in hours, 0 disables regeneration +# entirely. +#ssl_parameters_regenerate = 168 + +# SSL ciphers to use +#ssl_cipher_list = ALL:!LOW + +# Disable LOGIN command and all other plaintext authentications unless +# SSL/TLS is used (LOGINDISABLED capability). Note that 127.*.*.* and +# IPv6 ::1 addresses are considered secure, this setting has no effect if +# you connect from those addresses. +disable_plaintext_auth = no + +# Use this logfile instead of syslog(). /dev/stderr can be used if you want to +# use stderr for logging (ONLY /dev/stderr - otherwise it is closed). +#log_path = + +# For informational messages, use this logfile instead of the default +#info_log_path = + +# Prefix for each line written to log file. % codes are in strftime(3) +# format. +log_timestamp = "%Y-%m-%d %H:%M:%S " + +# Syslog facility to use if you're logging to syslog. Usually if you don't +# want to use "mail", you'll use local0..local7. Also other standard +# facilities are supported. +#syslog_facility = mail + +## +## Login processes +## + +# Directory where authentication process places authentication UNIX sockets +# which login needs to be able to connect to. The sockets are created when +# running as root, so you don't have to worry about permissions. Note that +# everything in this directory is deleted when Dovecot is started. +#login_dir = /var/run/dovecot/login + +# chroot login process to the login_dir. Only reason not to do this is if you +# wish to run the whole Dovecot without roots. +# http://wiki.dovecot.org/Rootless +#login_chroot = yes + +# User to use for the login process. Create a completely new user for this, +# and don't use it anywhere else. The user must also belong to a group where +# only it has access, it's used to control access for authentication process. +# Note that this user is NOT used to access mails. +# http://wiki.dovecot.org/UserIds +#login_user = dovecot + +# Set max. process size in megabytes. If you don't use +# login_process_per_connection you might need to grow this. +#login_process_size = 32 + +# Should each login be processed in it's own process (yes), or should one +# login process be allowed to process multiple connections (no)? Yes is more +# secure, espcially with SSL/TLS enabled. No is faster since there's no need +# to create processes all the time. +#login_process_per_connection = yes + +# Number of login processes to create. If login_process_per_connection is +# yes, this is the number of extra processes waiting for users to log in. +#login_processes_count = 3 + +# Maximum number of extra login processes to create. The extra process count +# usually stays at login_processes_count, but when multiple users start logging +# in at the same time more extra processes are created. To prevent fork-bombing +# we check only once in a second if new processes should be created - if all +# of them are used at the time, we double their amount until limit set by this +# setting is reached. This setting is used only if login_process_per_use is yes. +#login_max_processes_count = 128 + +# Maximum number of connections allowed in login state. When this limit is +# reached, the oldest connections are dropped. If login_process_per_connection +# is no, this is a per-process value, so the absolute maximum number of users +# logging in actually login_processes_count * max_logging_users. +#login_max_logging_users = 256 + +# Greeting message for clients. +#login_greeting = Dovecot ready. + +# Space-separated list of elements we want to log. The elements which have +# a non-empty variable value are joined together to form a comma-separated +# string. +#login_log_format_elements = user=<%u> method=%m rip=%r lip=%l %c + +# Login log format. %$ contains login_log_format_elements string, %s contains +# the data we want to log. +#login_log_format = %$: %s + +## +## Mail processes +## + +# Maximum number of running mail processes. When this limit is reached, +# new users aren't allowed to log in. +#max_mail_processes = 1024 + +# Show more verbose process titles (in ps). Currently shows user name and +# IP address. Useful for seeing who are actually using the IMAP processes +# (eg. shared mailboxes or if same uid is used for multiple accounts). +#verbose_proctitle = no + +# Show protocol level SSL errors. +#verbose_ssl = no + +# Valid UID range for users, defaults to 500 and above. This is mostly +# to make sure that users can't log in as daemons or other system users. +# Note that denying root logins is hardcoded to dovecot binary and can't +# be done even if first_valid_uid is set to 0. +#first_valid_uid = 500 +#last_valid_uid = 0 + +# Valid GID range for users, defaults to non-root/wheel. Users having +# non-valid GID as primary group ID aren't allowed to log in. If user +# belongs to supplementary groups with non-valid GIDs, those groups are +# not set. +#first_valid_gid = 1 +#last_valid_gid = 0 + +# Grant access to these extra groups for mail processes. Typical use would be +# to give "mail" group write access to /var/mail to be able to create dotlocks. +mail_extra_groups = mail + +# ':' separated list of directories under which chrooting is allowed for mail +# processes (ie. /var/mail will allow chrooting to /var/mail/foo/bar too). +# This setting doesn't affect login_chroot or auth_chroot variables. +# WARNING: Never add directories here which local users can modify, that +# may lead to root exploit. Usually this should be done only if you don't +# allow shell access for users. See +# /usr/share/doc/dovecot-common/configuration.txt for more information. +#valid_chroot_dirs = + +# Default chroot directory for mail processes. This can be overridden for +# specific users in user database by giving /./ in user's home directory +# (eg. /home/./user chroots into /home). Note that usually there is no real +# need to do chrooting, Dovecot doesn't allow users to access files outside +# their mail directory anyway. +#mail_chroot = + +# Enable mail process debugging. This can help you figure out why Dovecot +# isn't finding your mails. +#mail_debug = no + +# Default MAIL environment to use when it's not set. By leaving this empty +# dovecot tries to do some automatic detection as described in +# /usr/share/doc/dovecot-common/mail-storages.txt. There's a few special +# variables you can use, eg.: +# +# %u - username +# %n - user part in user@domain, same as %u if there's no domain +# %d - domain part in user@domain, empty if there's no domain +# %h - home directory +# +# See /usr/share/doc/dovecot-common/variables.txt for full list. Some examples: +# +# default_mail_env = maildir:/var/mail/%1u/%u/Maildir +# default_mail_env = mbox:~/mail/:INBOX=/var/mail/%u +# default_mail_env = mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n +# +#default_mail_env = + +# If you need to set multiple mailbox locations or want to change default +# namespace settings, you can do it by defining namespace sections: +# +# You can have private, shared and public namespaces. The only difference +# between them is how Dovecot announces them to client via NAMESPACE +# extension. Shared namespaces are meant for user-owned mailboxes which are +# shared to other users, while public namespaces are for more globally +# accessible mailboxes. +# +# REMEMBER: If you add any namespaces, the default namespace must be added +# explicitly, ie. default_mail_env does nothing unless you have a namespace +# without a location setting. Default namespace is simply done by having a +# namespace with empty prefix. +#namespace private { + # Hierarchy separator to use. You should use the same separator for all + # namespaces or some clients get confused. '/' is usually a good one. + #separator = / + + # Prefix required to access this namespace. This needs to be different for + # all namespaces. For example "Public/". + #prefix = + + # Physical location of the mailbox. This is in same format as + # default_mail_env, which is also the default for it. + #location = + + # There can be only one INBOX, and this setting defines which namespace + # has it. + #inbox = yes + + # If namespace is hidden, it's not advertised to clients via NAMESPACE + # extension or shown in LIST replies. This is mostly useful when converting + # from another server with different namespaces which you want to depricate + # but still keep working. For example you can create hidden namespaces with + # prefixes "~/mail/", "~%u/mail/" and "mail/". + #hidden = yes +#} + +# Space-separated list of fields to initially save into cache file. Currently +# these fields are allowed: +# +# flags, date.sent, date.received, size.virtual, size.physical +# mime.parts, imap.body, imap.bodystructure +# +# Different IMAP clients work in different ways, so they benefit from +# different cached fields. Some do not benefit from them at all. Caching more +# than necessary generates useless disk I/O, so you don't want to do that +# either. +# +# Dovecot attempts to automatically figure out what client wants and it keeps +# only that. However the first few times a mailbox is opened, Dovecot hasn't +# yet figured out what client needs, so it may not perform optimally. If you +# know what fields the majority of your clients need, it may be useful to set +# these fields by hand. If client doesn't actually use them, Dovecot will +# eventually drop them. +# +# Usually you should just leave this field alone. The potential benefits are +# typically unnoticeable. +#mail_cache_fields = + +# Space-separated list of fields that Dovecot should never save to cache file. +# Useful if you want to save disk space at the cost of more I/O when the fields +# needed. +#mail_never_cache_fields = + +# The minimum number of mails in a mailbox before updates are done to cache +# file. This allows optimizing Dovecot's behavior to do less disk writes at +# the cost of more disk reads. +#mail_cache_min_mail_count = 0 + +# When IDLE command is running, mailbox is checked once in a while to see if +# there are any new mails or other changes. This setting defines the minimum +# time to wait between those checks. Dovecot is however able to use dnotify +# and inotify with Linux to reply immediately after the change occurs. +#mailbox_idle_check_interval = 30 + +# Allow full filesystem access to clients. There's no access checks other than +# what the operating system does for the active UID/GID. It works with both +# maildir and mboxes, allowing you to prefix mailboxes names with eg. /path/ +# or ~user/. +#mail_full_filesystem_access = no + +# Maximum allowed length for mail keyword name. It's only forced when trying +# to create new keywords. +#mail_max_keyword_length = 50 + +# Save mails with CR+LF instead of plain LF. This makes sending those mails +# take less CPU, especially with sendfile() syscall with Linux and FreeBSD. +# But it also creates a bit more disk I/O which may just make it slower. +# Also note that if other software reads the mboxes/maildirs, they may handle +# the extra CRs wrong and cause problems. +#mail_save_crlf = no + +# Use mmap() instead of read() to read mail files. read() seems to be a bit +# faster with my Linux/x86 and it's better with NFS, so that's the default. +# Note that OpenBSD 3.3 and older don't work right with mail_read_mmaped = yes. +#mail_read_mmaped = no + +# Don't use mmap() at all. This is required if you store indexes in remote +# filesystems (NFS or clustered filesystem). +#mmap_disable = no + +# Don't write() to mmaped files. This is required for some operating systems +# which use separate caches for them, such as OpenBSD. +#mmap_no_write = no + +# Locking method for index files. Alternatives are fcntl, flock and dotlock. +# Dotlocking uses some tricks which may create more disk I/O than other locking +# methods. NOTE: If you use NFS, remember to change also mmap_disable setting! +# Solaris doesn't support flock, so Solaris users need to change this to fcntl. +#lock_method = flock + +# By default LIST command returns all entries in maildir beginning with dot. +# Enabling this option makes Dovecot return only entries which are directories. +# This is done by stat()ing each entry, so it causes more disk I/O. +# (For systems setting struct dirent->d_type, this check is free and it's +# done always regardless of this setting) +#maildir_stat_dirs = no + +# Copy mail to another folders using hard links. This is much faster than +# actually copying the file. This is problematic only if something modifies +# the mail in one folder but doesn't want it modified in the others. I don't +# know any MUA which would modify mail files directly. IMAP protocol also +# requires that the mails don't change, so it would be problematic in any case. +# If you care about performance, enable it. +#maildir_copy_with_hardlinks = no + +# Which locking methods to use for locking mbox. There's four available: +# dotlock: Create .lock file. This is the oldest and most NFS-safe +# solution. If you want to use /var/mail/ like directory, the users +# will need write access to that directory. +# fcntl : Use this if possible. Works with NFS too if lockd is used. +# flock : May not exist in all systems. Doesn't work with NFS. +# lockf : May not exist in all systems. Doesn't work with NFS. +# +# You can use multiple locking methods; if you do the order they're declared +# in is important to avoid deadlocks if other MTAs/MUAs are using multiple +# locking methods as well. Some operating systems don't allow using some of +# them simultaneously. +#mbox_read_locks = fcntl +#mbox_write_locks = dotlock fcntl + +# Maximum time in seconds to wait for lock (all of them) before aborting. +#mbox_lock_timeout = 300 + +# If dotlock exists but the mailbox isn't modified in any way, override the +# lock file after this many seconds. +#mbox_dotlock_change_timeout = 30 + +# When mbox changes unexpectedly we have to fully read it to find out what +# changed. If the mbox is large this can take a long time. Since the change +# is usually just a newly appended mail, it'd be faster to simply read the +# new mails. If this setting is enabled, Dovecot does this but still safely +# fallbacks to re-reading the whole mbox file whenever something in mbox isn't +# how it's expected to be. The only real downside to this setting is that if +# some other MUA changes message flags, Dovecot doesn't notice it immediately. +# Note that a full sync is done with SELECT, EXAMINE, EXPUNGE and CHECK +# commands. +#mbox_dirty_syncs = yes + +# Like mbox_dirty_syncs, but don't do full syncs even with SELECT, EXAMINE, +# EXPUNGE or CHECK commands. If this is set, mbox_dirty_syncs is ignored. +#mbox_very_dirty_syncs = no + +# Delay writing mbox headers until doing a full write sync (EXPUNGE and CHECK +# commands and when closing the mailbox). This is especially useful for POP3 +# where clients often delete all mails. The downside is that our changes +# aren't immediately visible to other MUAs. +#mbox_lazy_writes = yes + +# If mbox size is smaller than this (in kilobytes), don't write index files. +# If an index file already exists it's still read, just not updated. +#mbox_min_index_size = 0 + +# Maximum dbox file size in kilobytes until it's rotated. +#dbox_rotate_size = 2048 + +# Minimum dbox file size in kilobytes before it's rotated +# (overrides dbox_rotate_days) +#dbox_rotate_min_size = 16 + +# Maximum dbox file age in days until it's rotated. Day always begins from +# midnight, so 1 = today, 2 = yesterday, etc. 0 = check disabled. +#dbox_rotate_days = 0 + +# umask to use for mail files and directories +#umask = 0077 + +# Drop all privileges before exec()ing the mail process. This is mostly +# meant for debugging, otherwise you don't get core dumps. It could be a small +# security risk if you use single UID for multiple users, as the users could +# ptrace() each others processes then. +#mail_drop_priv_before_exec = no + +# Set max. process size in megabytes. Most of the memory goes to mmap()ing +# files, so it shouldn't harm much even if this limit is set pretty high. +#mail_process_size = 256 + +# Log prefix for mail processes. See +# /usr/share/doc/dovecot-common/variables.txt for list of possible variables +#you can use. +#mail_log_prefix = "%Us(%u): " + +## +## IMAP specific settings +## + +protocol imap { + # Login executable location. + #login_executable = /usr/lib/dovecot/imap-login + + # IMAP executable location. Changing this allows you to execute other + # binaries before the imap process is executed. + # + # This would write rawlogs into ~/dovecot.rawlog/ directory: + # mail_executable = /usr/lib/dovecot/rawlog /usr/lib/dovecot/imap + # + # This would attach gdb into the imap process and write backtraces into + # /tmp/gdbhelper.* files: + # mail_executable = /usr/lib/dovecot/gdbhelper /usr/lib/dovecot/imap + # + #mail_executable = /usr/lib/dovecot/imap + + # Maximum IMAP command line length in bytes. Some clients generate very long + # command lines with huge mailboxes, so you may need to raise this if you get + # "Too long argument" or "IMAP command line too large" errors often. + #imap_max_line_length = 65536 + + # Support for dynamically loadable modules. + #mail_use_modules = no + #mail_modules = /usr/lib/dovecot/modules/imap + + # Send IMAP capabilities in greeting message. This makes it unnecessary for + # clients to request it with CAPABILITY command, so it saves one round-trip. + # Many clients however don't understand it and ask the CAPABILITY anyway. + #login_greeting_capability = no + + # Workarounds for various client bugs: + # delay-newmail: + # Send EXISTS/RECENT new mail notifications only when replying to NOOP + # and CHECK commands. Some clients ignore them otherwise, for example + # OSX Mail. Outlook Express breaks more badly though, without this it + # may show user "Message no longer in server" errors. Note that OE6 still + # breaks even with this workaround if synchronization is set to + # "Headers Only". + # outlook-idle: + # Outlook and Outlook Express never abort IDLE command, so if no mail + # arrives in half a hour, Dovecot closes the connection. This is still + # fine, except Outlook doesn't connect back so you don't see if new mail + # arrives. + # netscape-eoh: + # Netscape 4.x breaks if message headers don't end with the empty "end of + # headers" line. Normally all messages have this, but setting this + # workaround makes sure that Netscape never breaks by adding the line if + # it doesn't exist. This is done only for FETCH BODY[HEADER.FIELDS..] + # commands. Note that RFC says this shouldn't be done. + # tb-extra-mailbox-sep: + # With mbox storage a mailbox can contain either mails or submailboxes, + # but not both. Thunderbird separates these two by forcing server to + # accept '/' suffix in mailbox names in subscriptions list. + # The list is space-separated. + #imap_client_workarounds = outlook-idle +} + +## +## POP3 specific settings +## + +protocol pop3 { + # Login executable location. + #login_executable = /usr/lib/dovecot/pop3-login + + # POP3 executable location + #mail_executable = /usr/lib/dovecot/pop3 + + # Don't try to set mails non-recent or seen with POP3 sessions. This is + # mostly intended to reduce disk I/O. With maildir it doesn't move files + # from new/ to cur/, with mbox it doesn't write Status-header. + #pop3_no_flag_updates = no + + # Support LAST command which exists in old POP3 specs, but has been removed + # from new ones. Some clients still wish to use this though. Enabling this + # makes RSET command clear all \Seen flags from messages. + #pop3_enable_last = no + + # POP3 UIDL format to use. You can use following variables: + # + # %v - Mailbox UIDVALIDITY + # %u - Mail UID + # %m - MD5 sum of the mailbox headers in hex (mbox only) + # %f - filename (maildir only) + # + # If you want UIDL compatibility with other POP3 servers, use: + # UW's ipop3d : %08Xv%08Xu + # Courier version 0 : %f + # Courier version 1 : %u + # Courier version 2 : %v-%u + # Cyrus (<= 2.1.3) : %u + # Cyrus (>= 2.1.4) : %v.%u + # Older Dovecots : %v.%u + # + # Note that Outlook 2003 seems to have problems with %v.%u format which was + # Dovecot's default, so if you're building a new server it would be a good + # idea to change this. %08Xu%08Xv should be pretty fail-safe. + # + # NOTE: Nowadays this is required to be set explicitly, since the old + # default was bad but it couldn't be changed without breaking existing + # installations. %08Xu%08Xv will be the new default, so use it for new + # installations. + # + #pop3_uidl_format = + + # POP3 logout format string: + # %t - number of TOP commands + # %T - number of bytes sent to client as a result of TOP command + # %r - number of RETR commands + # %R - number of bytes sent to client as a result of RETR command + # %d - number of deleted messages + # %m - number of messages (before deletion) + # %s - mailbox size in bytes (before deletion) + #pop3_logout_format = top=%t/%T, retr=%r/%R, del=%d/%m, size=%s + + # Support for dynamically loadable modules. + #mail_use_modules = no + #mail_modules = /usr/lib/dovecot/modules/pop3 + + # Workarounds for various client bugs: + # outlook-no-nuls: + # Outlook and Outlook Express hang if mails contain NUL characters. + # This setting replaces them with 0x80 character. + # oe-ns-eoh: + # Outlook Express and Netscape Mail breaks if end of headers-line is + # missing. This option simply sends it if it's missing. + # The list is space-separated. + #pop3_client_workarounds = +} + +## +## dovecot-lda specific settings +## + +# protocol lda { + # If you wish to use plugins you need to specify plugin directory + # For example quota enforcing is implemented by plugin + #module_dir = /usr/local/lib/dovecot/lda + + # Address from LDA should send MDNs like out of quota + # postmaster_address = postmaster@your.dom + + # If there is no user-specific Sieve-script, global Sieve script is + # executed if set. + #global_script_path = + + # UNIX socket path to master authentication server to find users. + #auth_socket_path = /var/run/dovecot-auth-master +# } + +## +## Authentication processes +## + +# Executable location +#auth_executable = /usr/lib/dovecot/dovecot-auth + +# Set max. process size in megabytes. +#auth_process_size = 256 + +# Authentication cache size in kilobytes. 0 means it's disabled. +# Note that bsdauth, PAM and vpopmail require cache_key to be set for caching +# to be used. Also note that currently auth cache doesn't work very well if +# you're using multiple passdbs with same usernames in them. +#auth_cache_size = 0 +# Time to live in seconds for cached data. After this many seconds the cached +# record is no longer used, *except* if the main database lookup returns +# internal failure. +#auth_cache_ttl = 3600 + +# Space separated list of realms for SASL authentication mechanisms that need +# them. You can leave it empty if you don't want to support multiple realms. +# Many clients simply use the first one listed here, so keep the default realm +# first. +#auth_realms = + +# Default realm/domain to use if none was specified. This is used for both +# SASL realms and appending @domain to username in plaintext logins. +#auth_default_realm = + +# List of allowed characters in username. If the user-given username contains +# a character not listed in here, the login automatically fails. This is just +# an extra check to make sure user can't exploit any potential quote escaping +# vulnerabilities with SQL/LDAP databases. If you want to allow all characters, +# set this value to empty. +#auth_username_chars = abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@ + +# Username character translations before it's looked up from databases. The +# value contains series of from -> to characters. For example "#@/@" means +# that '#' and '/' characters are translated to '@'. +#auth_username_translation = + +# Username to use for users logging in with ANONYMOUS SASL mechanism +#auth_anonymous_username = anonymous + +# More verbose logging. Useful for figuring out why authentication isn't +# working. +#auth_verbose = no + +# Even more verbose logging for debugging purposes. Shows for example SQL +# queries. +#auth_debug = no + +# In case of password mismatches, log the passwords and used scheme so the +# problem can be debugged. Requires auth_debug=yes to be set. +#auth_debug_passwords = no + +# Maximum number of dovecot-auth worker processes. They're used to execute +# blocking passdb and userdb queries (eg. MySQL and PAM). They're +# automatically created and destroyed as needed. +#auth_worker_max_count = 30 + +# Kerberos keytab to use for the GSSAPI mechanism. Will use the system +# default (usually /etc/krb5.keytab) if not specified. +#auth_krb5_keytab = + +auth default { + # Space separated list of wanted authentication mechanisms: + # plain digest-md5 cram-md5 apop anonymous gssapi + mechanisms = plain + + ## + ## dovecot-lda specific settings + ## + # socket listen { + # master { + # path = /var/run/dovecot-auth-master + # mode = 0600 + # user = vmail # User running Dovecot LDA + # #group = mail # Or alternatively mode 0660 + LDA user in this group + # } + # } + + # + # Password database is used to verify user's password (and nothing more). + # You can have multiple passdbs and userdbs. This is useful if you want to + # allow both system users (/etc/passwd) and virtual users to login without + # duplicating the system users into virtual database. + # + # http://wiki.dovecot.org/Authentication + # + + # Users can be temporarily disabled by adding a passdb with deny=yes. + # If the user is found from that database, authentication will fail. + # The deny passdb should always be specified before others, so it gets + # checked first. Here's an example: + #passdb passwd-file { + # File contains a list of usernames, one per line + #args = /etc/dovecot.deny + #deny = yes + #} + + # PAM authentication. Preferred nowadays by most systems. + # Note that PAM can only be used to verify if user's password is correct, + # so it can't be used as userdb. If you don't want to use a separate user + # database (passwd usually), you can use static userdb. +# passdb pam { + # [session=yes] [cache_key=] [] + # + # session=yes makes Dovecot open and immediately close PAM session. Some + # PAM plugins need this to work, such as pam_mkhomedir. + # + # cache_key can be used to enable authentication caching for PAM + # (auth_cache_size also needs to be set). It isn't enabled by default + # because PAM modules can do all kinds of checks besides checking password, + # such as checking IP address. Dovecot can't know about these checks + # without some help. cache_key is simply a list of variables (see + # /usr/share/doc/dovecot-common/variables.txt) which must match for the + # cached data to be used. + # Here are some examples: + # %u - Username must match. Probably sufficient for most uses. + # %u%r - Username and remote IP address must match. + # %u%s - Username and service (ie. IMAP, POP3) must match. + # + # If service name is "*", it means the authenticating service name + # is used, eg. pop3 or imap. + # + # Some examples: + # args = session=yes * + # args = cache_key=%u dovecot + #args = dovecot +# } + + # /etc/passwd or similar, using getpwnam() + # In many systems nowadays this uses Name Service Switch, which is + # configured in /etc/nsswitch.conf. + passdb passwd { + } + + # /etc/shadow or similiar, using getspnam(). Deprecated by PAM nowadays. + #passdb shadow { + #} + + # BSD authentication. Used by at least OpenBSD. + #passdb bsdauth { + # [cache_key=] - See cache_key in PAM for explanation. + #args = + #} + + # passwd-like file with specified location + #passdb passwd-file { + # Path for passwd-file + #args = + #} + + # checkpassword executable authentication + # NOTE: You will probably want to use "userdb prefetch" with this. + #passdb checkpassword { + # Path for checkpassword binary + #args = + #} + + # SQL database + #passdb sql { + # Path for SQL configuration file, see /etc/dovecot/dovecot-sql.conf for + # example + #args = + #} + + # LDAP database + #passdb ldap { + # Path for LDAP configuration file, see /etc/dovecot/dovecot-ldap.conf for + # example + #args = + #} + + # vpopmail authentication + #passdb vpopmail { + # [cache_key=] - See cache_key in PAM for explanation. + #args = + #} + + # + # User database specifies where mails are located and what user/group IDs + # own them. For single-UID configuration use "static". + # + # http://wiki.dovecot.org/Authentication + # http://wiki.dovecot.org/VirtualUsers + # + + # /etc/passwd or similar, using getpwnam() + # In many systems nowadays this uses Name Service Switch, which is + # configured in /etc/nsswitch.conf. + userdb passwd { + } + + # passwd-like file with specified location + #userdb passwd-file { + # Path for passwd-file + #args = + #} + + # static settings generated from template + #userdb static { + # Template for settings. Can return anything a userdb could normally + # return, eg.: uid, gid, home, mail, nice + # + # A few examples: + # + # args = uid=500 gid=500 home=/var/mail/%u + # args = uid=500 gid=500 home=/home/%u mail=mbox:/home/%u/mail nice=10 + # + #args = + #} + + # SQL database + #userdb sql { + # Path for SQL configuration file, see /etc/dovecot/dovecot-sql.conf for + # example + #args = + #} + + # LDAP database + #userdb ldap { + # Path for LDAP configuration file, see /etc/dovecot/dovecot-ldap.conf for + # example + #args = + #} + + # vpopmail + #userdb vpopmail { + #} + + # "prefetch" user database means that the passdb already provided the + # needed information and there's no need to do a separate userdb lookup. + # This can be made to work with SQL and LDAP databases, see their example + # configuration files for more information how to do it. + # http://wiki.dovecot.org/AuthSpecials + #userdb prefetch { + #} + + # User to use for the process. This user needs access to only user and + # password databases, nothing else. Only shadow and pam authentication + # requires roots, so use something else if possible. Note that passwd + # authentication with BSDs internally accesses shadow files, which also + # requires roots. Note that this user is NOT used to access mails. + # That user is specified by userdb above. + user = root + + # Directory where to chroot the process. Most authentication backends don't + # work if this is set, and there's no point chrooting if auth_user is root. + # Note that valid_chroot_dirs isn't needed to use this setting. + #chroot = + + # Number of authentication processes to create + #count = 1 + + # Require a valid SSL client certificate or the authentication fails. + #ssl_require_client_cert = no + + # Take the username from client's SSL certificate, using X509_NAME_oneline() + # which typically uses subject's Distinguished Name. + #ssl_username_from_cert = no +} + +# It's possible to export the authentication interface to other programs, +# for example SMTP server which supports talking to Dovecot. Client socket +# handles the actual authentication - you give it a username and password +# and it returns OK or failure. So it's pretty safe to allow anyone access to +# it. Master socket is used to a) query if given client was successfully +# authenticated, b) userdb lookups. + +# listener sockets will be created by Dovecot's master process using the +# settings given inside the auth section +#auth default_with_listener { +# mechanisms = plain +# passdb pam { +# } +# userdb passwd { +# } +# socket listen { +# master { +# path = /var/run/dovecot-auth-master +# # WARNING: Giving untrusted users access to master socket may be a +# # security risk, don't give too wide permissions to it! +# #mode = 0600 +# # Default user/group is the one who started dovecot-auth (root) +# #user = +# #group = +# } +# client { +# path = /var/run/dovecot-auth-client +# mode = 0660 +# } +# } +#} + +# connect sockets are assumed to be already running, Dovecot's master +# process only tries to connect to them. They don't need any other settings +# than path for the master socket, as the configuration is done elsewhere. +# Note that the client sockets must exist in login_dir. +#auth external { +# socket connect { +# master { +# path = /var/run/dovecot-auth-master +# } +# } +#} + +plugin { + # Here you can give some extra environment variables to mail processes. + # This is mostly meant for passing parameters to plugins. %variable + # expansion is done for all values. + + # Quota plugin + #quota = dirsize:%h/mail + + # Convert plugin. If set, specifies the source storage path which is + # converted to destination storage (default_mail_env). + #convert_mail = mbox:%h/mail +} diff --git a/mail/dovecot/files/dovecot.init b/mail/dovecot/files/dovecot.init new file mode 100644 index 000000000..338652cff --- /dev/null +++ b/mail/dovecot/files/dovecot.init @@ -0,0 +1,16 @@ +#!/bin/sh /etc/rc.common +# Copyright (C) 2006,2007 OpenWrt.org + +START=99 + +RUN_D=/var/run/dovecot +PID_F=$RUN_D/master.pid + +start() { + mkdir -p $RUN_D + dovecot +} + +stop() { + [ -f $PID_F ] && kill $(cat $PID_F) +} diff --git a/mail/dovecot/patches/configure.in.patch b/mail/dovecot/patches/configure.in.patch new file mode 100644 index 000000000..16bb0fa3e --- /dev/null +++ b/mail/dovecot/patches/configure.in.patch @@ -0,0 +1,85 @@ +--- ./configure.in.dovecot 2005-07-30 23:44:48.571463846 +0100 ++++ ./configure.in 2005-07-31 00:22:17.564381142 +0100 +@@ -529,7 +529,22 @@ + echo "..ignoring as requested.." + ],[ + AC_MSG_RESULT(no) +-],[]) ++],[ ++ ++ AC_MSG_RESULT(can't check) ++ ++ echo ++ echo "You are cross compiling so I can't tell if the destination uses a signed" ++ echo "size_t. Dovecot isn't designed to work with a signed size_t, It probably" ++ echo "works just fine, but it's less resistant to buffer overflows." ++ echo "You may want to manually check what your target uses for size_t." ++ echo "To compile Dovecot anyway, set ignore_signed_size=1 environment." ++ ++ if test "$ignore_signed_size" = ""; then ++ AC_MSG_ERROR([aborting]) ++ fi ++ echo "..proceeding as requested.." ++]) + + dnl Note: we check size_t rather than ssize_t here, because on OSX 10.2 + dnl ssize_t = int and size_t = unsigned long. We're mostly concerned about +@@ -659,7 +674,10 @@ + ], [ + AC_MSG_RESULT([check failed, assuming 31]) + max_bits=31 +-],[]) ++],[ ++ AC_MSG_RESULT([cross compiling, assuming 31]) ++ max_bits=31 ++]) + AC_DEFINE_UNQUOTED(TIME_T_MAX_BITS, $max_bits, max. time_t bits gmtime() can handle) + + dnl * do we have struct iovec +@@ -768,6 +786,8 @@ + ], [ + AC_MSG_RESULT(no) + AC_DEFINE(MMAP_CONFLICTS_WRITE,, [Define if shared mmaps don't get updated by write()s]) ++], [ ++ AC_MSG_RESULT(cross-compiling so target PROBABLY isn't the buggy version of OpenBSD) + ]) + + dnl * see if fd passing works +@@ -831,6 +851,9 @@ + if test $i = 2; then + AC_MSG_RESULT(no) + fi ++ ], [ ++ CFLAGS=$old_cflags ++ AC_MSG_RESULT(cross compiling so target probably isn't 64 bit) + ]) + done + +@@ -878,7 +901,7 @@ + dnl *** + + AC_CACHE_CHECK([for an implementation of va_copy()],lib_cv_va_copy,[ +- AC_RUN_IFELSE([AC_LANG_SOURCE([[ ++ AC_LINK_IFELSE([AC_LANG_SOURCE([[ + #include + void f (int i, ...) { + va_list args1, args2; +@@ -896,7 +919,7 @@ + [lib_cv_va_copy=no],[]) + ]) + AC_CACHE_CHECK([for an implementation of __va_copy()],lib_cv___va_copy,[ +- AC_RUN_IFELSE([AC_LANG_SOURCE([[ ++ AC_LINK_IFELSE([AC_LANG_SOURCE([[ + #include + void f (int i, ...) { + va_list args1, args2; +@@ -941,7 +964,8 @@ + return 0; + }]])], + [lib_cv_va_val_copy=yes], +- [lib_cv_va_val_copy=no],[]) ++ [lib_cv_va_val_copy=no], ++ [lib_cv_va_val_copy=yes]) + ]) + + if test "x$lib_cv_va_val_copy" = "xno"; then diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile new file mode 100644 index 000000000..301167913 --- /dev/null +++ b/mail/fetchmail/Makefile @@ -0,0 +1,53 @@ +# +# Copyright (C) 2006-2008 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# $Id$ + +include $(TOPDIR)/rules.mk + +PKG_NAME:=fetchmail +PKG_VERSION:=6.2.5 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.catb.org/~esr/fetchmail/ +PKG_MD5SUM:=9956b30139edaa4f5f77c4d0dbd80225 + +include $(INCLUDE_DIR)/package.mk + +define Package/fetchmail + SECTION:=mail + CATEGORY:=Mail + TITLE:=Remote mail retriever + URL:=http://www.catb.org/~esr/fetchmail/ +endef + +define Package/fetchmail/description + Retrieves remote mail via POP/IMAP. + Very useful in conjunction with mutt. +endef + +define Build/Configure + $(call Build/Configure/Default, \ + --enable-fallback=procmail \ + --without-hesiod \ + , \ + ac_cv_path_procmail=/usr/sbin/procmail \ + ) +endef + +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install +endef + +define Package/fetchmail/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fetchmail $(1)/usr/bin/ +endef + +$(eval $(call BuildPackage,fetchmail)) diff --git a/mail/fetchmail/patches/001-amd64_detection.patch b/mail/fetchmail/patches/001-amd64_detection.patch new file mode 100644 index 000000000..2db43d111 --- /dev/null +++ b/mail/fetchmail/patches/001-amd64_detection.patch @@ -0,0 +1,43 @@ +diff -urN fetchmail-6.2.5/config.sub fetchmail-6.2.5.new/config.sub +--- fetchmail-6.2.5/config.sub 2003-07-17 03:03:20.000000000 +0200 ++++ fetchmail-6.2.5.new/config.sub 2006-03-30 00:36:11.000000000 +0200 +@@ -176,7 +176,7 @@ + | 580 | i960 | h8300 \ + | x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \ + | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ +- | hppa64 \ ++ | hppa64 | x86_64 \ + | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \ + | alphaev6[78] \ + | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \ +@@ -194,7 +194,7 @@ + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. +- i[34567]86) ++ i*86 | x86_64) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. +@@ -209,7 +209,7 @@ + | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ + | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ + | xmp-* | ymp-* \ +- | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \ ++ | x86-* | x86_64-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \ + | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \ + | hppa2.0n-* | hppa64-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \ +@@ -256,6 +256,12 @@ + basic_machine=a29k-none + os=-bsd + ;; ++ amd64) ++ basic_machine=x86_64-pc ++ ;; ++ amd64-*) ++ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + amdahl) + basic_machine=580-amdahl + os=-sysv diff --git a/mail/fetchmail/patches/002-no_rej.patch b/mail/fetchmail/patches/002-no_rej.patch new file mode 100644 index 000000000..64cc7cb7d --- /dev/null +++ b/mail/fetchmail/patches/002-no_rej.patch @@ -0,0 +1,21 @@ +diff -ruN fetchmail-6.2.5-old/po/fr.po.rej fetchmail-6.2.5-new/po/fr.po.rej +--- fetchmail-6.2.5-old/po/fr.po.rej 2003-07-17 03:23:26.000000000 +0200 ++++ fetchmail-6.2.5-new/po/fr.po.rej 1970-01-01 01:00:00.000000000 +0100 +@@ -1,17 +0,0 @@ +-*************** +-*** 2166,2172 **** +- #: rcfile_y.y:433 +- #, fuzzy, c-format +- msgid "File %s must be a regular file.\n" +-- msgstr "Le fichier %s doit etre un lien symbolique.\n" +- +- #: rcfile_y.y:440 +- #, c-format +---- 2166,2172 ---- +- #: rcfile_y.y:433 +- #, fuzzy, c-format +- msgid "File %s must be a regular file.\n" +-+ msgstr "Le fichier %s doit être un fichier normal.\n" +- +- #: rcfile_y.y:440 +- #, c-format diff --git a/mail/imapfilter/Makefile b/mail/imapfilter/Makefile new file mode 100644 index 000000000..c360e5315 --- /dev/null +++ b/mail/imapfilter/Makefile @@ -0,0 +1,58 @@ +# +# Copyright (C) 2006-2008 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# $Id$ + +include $(TOPDIR)/rules.mk + +PKG_NAME:=imapfilter +PKG_VERSION:=1.2.2 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://imapfilter.hellug.gr/source/ +PKG_MD5SUM:=4c1f28dffbb727a4769948f10baccd79 + +include $(INCLUDE_DIR)/package.mk + +define Package/imapfilter + SECTION:=mail + CATEGORY:=Mail + DEPENDS:=+liblua +libopenssl + TITLE:=IMAP server based email filtering + URL:=http://imapfilter.hellug.gr/ +endef + +define Build/Configure + (cd $(PKG_BUILD_DIR); \ + ./configure \ + -d /usr \ + ); +endef + +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR) \ + $(TARGET_CONFIGURE_OPTS) \ + INCDIRS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ + LIBDIRS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ + MYCFLAGS="$(TARGET_CFLAGS)" +endef + +define Package/imapfilter/conffiles +/etc/imapfilter/config.lua +endef + +define Package/imapfilter/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/imapfilter $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/etc/imapfilter + $(INSTALL_CONF) $(PKG_BUILD_DIR)/sample.config.lua $(1)/etc/imapfilter/config.lua + $(INSTALL_DIR) $(1)/usr/share/imapfilter + $(INSTALL_DATA) $(PKG_BUILD_DIR)/interface.lua $(1)/usr/share/imapfilter/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/auxiliary.lua $(1)/usr/share/imapfilter/ +endef + +$(eval $(call BuildPackage,imapfilter)) diff --git a/mail/imapfilter/patches/010-pathnames.patch b/mail/imapfilter/patches/010-pathnames.patch new file mode 100644 index 000000000..85e30e74f --- /dev/null +++ b/mail/imapfilter/patches/010-pathnames.patch @@ -0,0 +1,31 @@ +--- imapfilter-1.2.2/pathnames.h 2006-08-01 14:11:20.000000000 +0200 ++++ imapfilter-1.2.2/pathnames.h 2006-09-07 23:58:12.000000000 +0200 +@@ -3,7 +3,7 @@ + + + /* Program's home directory. */ +-#define PATHNAME_HOME ".imapfilter" ++#define PATHNAME_HOME "/etc/imapfilter" + + /* Program's configuration file. */ + #define PATHNAME_CONFIG PATHNAME_HOME "/config.lua" +@@ -18,7 +18,7 @@ + #define PATHNAME_CERTS PATHNAME_HOME "/certificates" + + /* Debug temporary file template. */ +-#define PATHNAME_DEBUG PATHNAME_HOME "/debug.XXXXXX" ++#define PATHNAME_DEBUG "/tmp/imapfilterdebug.XXXXXX" + + + #endif /* PATHNAMES_H */ +--- imapfilter-1.2.2/imapfilter.c 2006-09-08 00:02:11.000000000 +0200 ++++ imapfilter-1.2.2/imapfilter.c 2006-09-08 00:02:32.000000000 +0200 +@@ -50,7 +50,7 @@ + opts.config = NULL; + opts.oneline = NULL; + +- env.home = getenv("HOME"); ++ env.home = ""; + env.pathmax = -1; + + while ((c = getopt(argc, argv, "Vc:de:il:v?")) != -1) { diff --git a/mail/mini_sendmail/Makefile b/mail/mini_sendmail/Makefile new file mode 100644 index 000000000..ca544a51f --- /dev/null +++ b/mail/mini_sendmail/Makefile @@ -0,0 +1,44 @@ +# +# Copyright (C) 2007-2008 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# $Id$ + +include $(TOPDIR)/rules.mk + +PKG_NAME:=mini-sendmail +PKG_VERSION:=1.3.6 +PKG_RELEASE:=2 + +PKG_SOURCE:=mini_sendmail-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.acme.com/software/mini_sendmail/ +PKG_MD5SUM:=fb1585d2ad81c519a26d83bfd783dee8 + +include $(INCLUDE_DIR)/package.mk + +define Package/mini-sendmail + SECTION:=mail + CATEGORY:=Mail + TITLE:=A small sendmail-compatible mail forwarder + URL:=http://www.acme.com/software/mini_sendmail/ +endef + +define Package/mini-sendmail/description + mini_sendmail reads its standard input up to an end-of-file and sends a + copy of the message found there to all of the addresses listed. + The message is sent by connecting to a local SMTP server. This means + mini_sendmail can be used to send email from inside a chroot(2) area. +endef + +MAKE_FLAGS += \ + OFLAGS="$(TARGET_CFLAGS)" + +define Package/mini-sendmail/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/mini_sendmail $(1)/usr/sbin/ + ln -sf mini_sendmail $(1)/usr/sbin/sendmail +endef + +$(eval $(call BuildPackage,mini-sendmail)) diff --git a/mail/mini_sendmail/patches/200-fullname.patch b/mail/mini_sendmail/patches/200-fullname.patch new file mode 100644 index 000000000..95e19a776 --- /dev/null +++ b/mail/mini_sendmail/patches/200-fullname.patch @@ -0,0 +1,36 @@ +Index: mini_sendmail-1.3.6/mini_sendmail.c +=================================================================== +--- mini_sendmail-1.3.6.orig/mini_sendmail.c 2007-08-28 17:58:37.000000000 +0200 ++++ mini_sendmail-1.3.6/mini_sendmail.c 2007-08-28 17:58:37.000000000 +0200 +@@ -542,6 +542,7 @@ + } + + /* Strip off any angle brackets. */ ++/* + while ( len > 0 && *recipient == '<' ) + { + ++recipient; +@@ -551,6 +552,23 @@ + --len; + + (void) snprintf( buf, sizeof(buf), "RCPT TO:<%.*s>", len, recipient ); ++*/ ++ if (len > 0 && recipient[len-1] == '>' ) ++ { ++ /* "" or: "Full Name " */ ++ while (len > 0 && *recipient != '<' ) ++ { ++ ++recipient; ++ --len; ++ } ++ (void) snprintf( buf, sizeof(buf), "RCPT TO:%.*s", len, recipient ); ++ } ++ else ++ { ++ /* name@domain */ ++ (void) snprintf( buf, sizeof(buf), "RCPT TO:<%.*s>", len, recipient ); ++ } ++ + send_command( buf ); + status = read_response(); + if ( status != 250 && status != 251 ) diff --git a/mail/mini_sendmail/patches/500-flags.patch b/mail/mini_sendmail/patches/500-flags.patch new file mode 100644 index 000000000..39b42b40e --- /dev/null +++ b/mail/mini_sendmail/patches/500-flags.patch @@ -0,0 +1,17 @@ +Index: mini_sendmail-1.3.6/Makefile +=================================================================== +--- mini_sendmail-1.3.6.orig/Makefile 2007-08-28 17:58:37.000000000 +0200 ++++ mini_sendmail-1.3.6/Makefile 2007-08-28 17:58:37.000000000 +0200 +@@ -7,9 +7,10 @@ + BINDIR = /usr/local/sbin + MANDIR = /usr/local/man + CC = gcc +-CFLAGS = -O ++OFLAGS = -O ++CFLAGS = $(OFLAGS) + #CFLAGS = -g +-LDFLAGS = -s -static ++LDFLAGS = + #LDFLAGS = -g -static + LDLIBS = $(SYSV_LIBS) + diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile new file mode 100644 index 000000000..856b58eeb --- /dev/null +++ b/mail/mutt/Makefile @@ -0,0 +1,41 @@ +# +# Copyright (C) 2006-2008 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# $Id$ + +include $(TOPDIR)/rules.mk + +PKG_NAME:=mutt +PKG_VERSION:=1.5.16 +PKG_RELEASE:=2 + +PKG_SOURCE_URL:=@SF/mutt +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_MD5SUM:=10eff7024dbb7ce1f773d688a69ea9db + +include $(INCLUDE_DIR)/package.mk + +define Package/mutt + SECTION:=mail + CATEGORY:=Mail + DEPENDS:=+libopenssl +libncurses + TITLE:=Console mail client + URL:=http://www.mutt.org/ +endef + +CONFIGURE_ARGS += \ + --includedir=$(PKG_BUILD_DIR)/. \ + --oldincludedir=$(PKG_BUILD_DIR)/. \ + --enable-pop \ + --enable-imap \ + --with-ssl + +define Package/mutt/install + $(INSTALL_DIR) $(1)/usr/bin + $(CP) $(PKG_BUILD_DIR)/mutt $(1)/usr/bin/ +endef + +$(eval $(call BuildPackage,mutt)) diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile new file mode 100644 index 000000000..fc3f489b8 --- /dev/null +++ b/mail/procmail/Makefile @@ -0,0 +1,45 @@ +# +# Copyright (C) 2006-2008 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# $Id$ + +include $(TOPDIR)/rules.mk + +PKG_NAME:=procmail +PKG_VERSION:=3.22 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=http://www.procmail.org/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_MD5SUM:=1678ea99b973eb77eda4ecf6acae53f1 + +include $(INCLUDE_DIR)/package.mk + +define Package/procmail + SECTION:=mail + CATEGORY:=Mail + TITLE:=Mail processing tool + URL:=http://www.procmail.org +endef + +define Package/procmail/description + Procmail is able to process and classify incoming mail into + different mail boxes. + Very useful in conjunction with mutt. +endef + +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR)/src -f ../Makefile.openwrt \ + $(TARGET_CONFIGURE_OPTS) +endef + +define Package/procmail/install + $(INSTALL_DIR) $(1)/usr/bin + $(CP) $(PKG_BUILD_DIR)/src/procmail $(1)/usr/bin/ + $(CP) $(PKG_BUILD_DIR)/src/formail $(1)/usr/bin/ +endef + +$(eval $(call BuildPackage,procmail)) diff --git a/mail/procmail/patches/001-procmail_openwrt.patch b/mail/procmail/patches/001-procmail_openwrt.patch new file mode 100644 index 000000000..c33d82605 --- /dev/null +++ b/mail/procmail/patches/001-procmail_openwrt.patch @@ -0,0 +1,51 @@ +This patch is required to make procmail cross compile - it tries to run some automatic tests which +obviously do not work in a cross compiled environment. + + +diff -Naur procmail-3.22_orig/autoconf.h procmail-3.22/autoconf.h +--- procmail-3.22_orig/autoconf.h 1970-01-01 10:00:00.000000000 +1000 ++++ procmail-3.22/autoconf.h 2006-03-23 12:15:36.000000000 +1100 +@@ -0,0 +1,21 @@ ++/* This file was automagically generated by autoconf */ ++ ++/* 5 moves in 64 steps of size 16384 when reallocing */ ++#define NOpw_class ++#define NOstrlcat ++#define NOsetrgid ++#define MAX_argc 7588 ++/* Your system's strstr() is 1.12 times FASTER than my C-routine */ ++#define UDP_protocolno 17 ++#define BIFF_serviceport "512" ++#define IP_localhost {127,0,0,1} ++#define MAILSPOOLDIR "/var/spool/mail/" ++#define SENDMAIL "/usr/sbin/sendmail" ++#define CF_no_procmail_yet ++#define buggy_SENDMAIL ++#define defPATH "PATH=$HOME/bin:/bin:/usr/bin:/usr/local/bin:/usr/bin/X11" ++#define defSPATH "PATH=/bin:/usr/bin:/usr/local/bin:/usr/bin/X11" ++#define PM_VERSION "3.22" ++/* Hotwire LOCKINGTEST=100 */ ++/* Procmail will lock via: dotlocking, fcntl() */ ++/* autoconf completed */ +diff -Naur procmail-3.22_orig/Makefile.openwrt procmail-3.22/Makefile.openwrt +--- procmail-3.22_orig/Makefile.openwrt 1970-01-01 10:00:00.000000000 +1000 ++++ procmail-3.22/Makefile.openwrt 2006-03-23 12:15:36.000000000 +1100 +@@ -0,0 +1,18 @@ ++PM_OBJ=cstdio.o common.o exopen.o goodies.o locking.o \ ++ mailfold.o foldinfo.o misc.o pipes.o regexp.o robust.o \ ++ sublib.o acommon.o mcommon.o lastdirsep.o authenticate.o \ ++ lmtp.o memblk.o variables.o from.o comsat.o ++ ++FM_OBJ=common.o fields.o formisc.o sublib.o ecommon.o \ ++ acommon.o ++ ++LDFLAGS = -lm -lnsl -ldl -lc ++CFLAGS = -Os -DPROCMAIL ++ ++all: procmail formail ++ ++procmail: procmail.o $(PM_OBJ) ++ $(CC) $(CFLAGS) $@.o $(PM_OBJ) -o $@ $(LDFLAGS) ++ ++formail: formail.o $(FM_OBJ) ++ $(CC) $(CFLAGS) $@.o $(FM_OBJ) -o $@ $(LDFLAGS) diff --git a/mail/ssmtp/Makefile b/mail/ssmtp/Makefile new file mode 100644 index 000000000..b481e6d11 --- /dev/null +++ b/mail/ssmtp/Makefile @@ -0,0 +1,55 @@ +# +# Copyright (C) 2007-2008 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# $Id$ + +include $(TOPDIR)/rules.mk + +PKG_NAME:=ssmtp +PKG_VERSION:=2.61 +PKG_RELEASE:=2 + +PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz +PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/s/ssmtp/ +PKG_MD5SUM:=957e6fff08625fe34f4fc33d0925bbc9 + +include $(INCLUDE_DIR)/package.mk + +define Package/ssmtp + SECTION:=mail + CATEGORY:=Mail + DEPENDS:=+libopenssl + TITLE:=A minimal and secure mail sender + URL:=http://packages.debian.org/stable/mail/ssmtp +endef + +define Package/ssmtp/description + A secure, effective and simple way of getting mail off a system to your + mail hub. It contains no suid-binaries or other dangerous things - no + mail spool to poke around in, and no daemons running in the background. + mail is simply forwarded to the configured mailhost. Extremely easy + configuration. +endef + +EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include +EXTRA_LDFLAGS+=-L$(STAGING_DIR)/usr/lib -Wl,-rpath-link,$(STAGING_DIR)/usr/lib + +TARGET_CONFIGURE_OPTS+=\ + CC="$(TARGET_CC) $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)" + +CONFIGURE_ARGS += \ + --enable-ssl + +define Package/ssmtp/install + $(INSTALL_DIR) $(1)/etc/ssmtp + $(INSTALL_DATA) $(PKG_BUILD_DIR)/ssmtp.conf $(1)/etc/ssmtp/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/revaliases $(1)/etc/ssmtp/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/ssmtp $(1)/usr/sbin/ + ln -sf ssmtp $(1)/usr/sbin/sendmail +endef + +$(eval $(call BuildPackage,ssmtp)) diff --git a/mail/ssmtp/patches/500-debian-subset-2.61-2.patch b/mail/ssmtp/patches/500-debian-subset-2.61-2.patch new file mode 100644 index 000000000..db1a7855a --- /dev/null +++ b/mail/ssmtp/patches/500-debian-subset-2.61-2.patch @@ -0,0 +1,254 @@ +Index: ssmtp-2.61/ssmtp.conf +=================================================================== +--- ssmtp-2.61.orig/ssmtp.conf 2007-08-30 20:56:56.000000000 +0200 ++++ ssmtp-2.61/ssmtp.conf 2007-08-30 20:56:56.000000000 +0200 +@@ -36,3 +36,8 @@ + + # Use this RSA certificate. + #TLSCert=/etc/ssl/certs/ssmtp.pem ++ ++# Get enhanced (*really* enhanced) debugging information in the logs ++# If you want to have debugging of the config file parsing, move this option ++# to the top of the config file and uncomment ++#Debug=YES +Index: ssmtp-2.61/ssmtp.c +=================================================================== +--- ssmtp-2.61.orig/ssmtp.c 2007-08-30 20:56:56.000000000 +0200 ++++ ssmtp-2.61/ssmtp.c 2007-08-30 20:56:56.000000000 +0200 +@@ -93,6 +93,7 @@ + static char hextab[]="0123456789abcdef"; + #endif + ++ssize_t outbytes; + + /* + log_event() -- Write event to syslog (or log file if defined) +@@ -129,7 +130,7 @@ + #endif + } + +-void smtp_write(int fd, char *format, ...); ++ssize_t smtp_write(int fd, char *format, ...); + int smtp_read(int fd, char *response); + int smtp_read_all(int fd, char *response); + int smtp_okay(int fd, char *response); +@@ -150,7 +151,7 @@ + if(isatty(fileno(stdin))) { + if(log_level > 0) { + log_event(LOG_ERR, +- "stdin is a TTY - not saving to %s/dead.letter, pw->pw_dir"); ++ "stdin is a TTY - not saving to %s/dead.letter", pw->pw_dir); + } + return; + } +@@ -964,6 +965,17 @@ + log_event(LOG_INFO, "Set AuthMethod=\"%s\"\n", auth_method); + } + } ++ else if (strcasecmp(p, "Debug") == 0) ++ { ++ if (strcasecmp(q, "YES") == 0) ++ { ++ log_level = 1; ++ } ++ else ++ { ++ log_level = 0; ++ } ++ } + else { + log_event(LOG_INFO, "Unable to set %s=\"%s\"\n", p, q); + } +@@ -1232,10 +1244,11 @@ + /* + smtp_write() -- A printf to an fd and append + */ +-void smtp_write(int fd, char *format, ...) ++ssize_t smtp_write(int fd, char *format, ...) + { + char buf[(BUF_SZ + 1)]; + va_list ap; ++ ssize_t outbytes = 0; + + va_start(ap, format); + if(vsnprintf(buf, (BUF_SZ - 2), format, ap) == -1) { +@@ -1252,7 +1265,9 @@ + } + (void)strcat(buf, "\r\n"); + +- (void)fd_puts(fd, buf, strlen(buf)); ++ outbytes = fd_puts(fd, buf, strlen(buf)); ++ ++ return (outbytes >= 0) ? outbytes : 0; + } + + /* +@@ -1282,6 +1297,8 @@ + int i, sock; + uid_t uid; + ++ outbytes = 0; ++ + uid = getuid(); + if((pw = getpwuid(uid)) == (struct passwd *)NULL) { + die("Could not find password entry for UID %d", uid); +@@ -1335,10 +1352,10 @@ + + /* If user supplied username and password, then try ELHO */ + if(auth_user) { +- smtp_write(sock, "EHLO %s", hostname); ++ outbytes += smtp_write(sock, "EHLO %s", hostname); + } + else { +- smtp_write(sock, "HELO %s", hostname); ++ outbytes += smtp_write(sock, "HELO %s", hostname); + } + (void)alarm((unsigned) MEDWAIT); + +@@ -1354,7 +1371,7 @@ + } + + if(strcasecmp(auth_method, "cram-md5") == 0) { +- smtp_write(sock, "AUTH CRAM-MD5"); ++ outbytes += smtp_write(sock, "AUTH CRAM-MD5"); + (void)alarm((unsigned) MEDWAIT); + + if(smtp_read(sock, buf) != 3) { +@@ -1369,7 +1386,7 @@ + #endif + memset(buf, 0, sizeof(buf)); + to64frombits(buf, auth_user, strlen(auth_user)); +- smtp_write(sock, "AUTH LOGIN %s", buf); ++ outbytes += smtp_write(sock, "AUTH LOGIN %s", buf); + + (void)alarm((unsigned) MEDWAIT); + if(smtp_read(sock, buf) != 3) { +@@ -1381,7 +1398,7 @@ + #ifdef MD5AUTH + } + #endif +- smtp_write(sock, "%s", buf); ++ outbytes += smtp_write(sock, "%s", buf); + (void)alarm((unsigned) MEDWAIT); + + if(smtp_okay(sock, buf) == False) { +@@ -1390,7 +1407,7 @@ + } + + /* Send "MAIL FROM:" line */ +- smtp_write(sock, "MAIL FROM:<%s>", uad); ++ outbytes += smtp_write(sock, "MAIL FROM:<%s>", uad); + + (void)alarm((unsigned) MEDWAIT); + +@@ -1408,7 +1425,7 @@ + + while(rt->next) { + p = rcpt_remap(rt->string); +- smtp_write(sock, "RCPT TO:<%s>", p); ++ outbytes += smtp_write(sock, "RCPT TO:<%s>", p); + + (void)alarm((unsigned)MEDWAIT); + +@@ -1425,7 +1442,7 @@ + while(p) { + /* RFC822 Address -> "foo@bar" */ + q = rcpt_remap(addr_parse(p)); +- smtp_write(sock, "RCPT TO:<%s>", q); ++ outbytes += smtp_write(sock, "RCPT TO:<%s>", q); + + (void)alarm((unsigned) MEDWAIT); + +@@ -1439,7 +1456,7 @@ + } + + /* Send DATA */ +- smtp_write(sock, "DATA"); ++ outbytes += smtp_write(sock, "DATA"); + (void)alarm((unsigned) MEDWAIT); + + if(smtp_read(sock, buf) != 3) { +@@ -1447,45 +1464,45 @@ + die("%s", buf); + } + +- smtp_write(sock, ++ outbytes += smtp_write(sock, + "Received: by %s (sSMTP sendmail emulation); %s", hostname, arpadate); + + if(have_from == False) { +- smtp_write(sock, "From: %s", from); ++ outbytes += smtp_write(sock, "From: %s", from); + } + + if(have_date == False) { +- smtp_write(sock, "Date: %s", arpadate); ++ outbytes += smtp_write(sock, "Date: %s", arpadate); + } + + #ifdef HASTO_OPTION + if(have_to == False) { +- smtp_write(sock, "To: postmaster"); ++ outbytes += smtp_write(sock, "To: postmaster"); + } + #endif + + ht = &headers; + while(ht->next) { +- smtp_write(sock, "%s", ht->string); ++ outbytes += smtp_write(sock, "%s", ht->string); + ht = ht->next; + } + + (void)alarm((unsigned) MEDWAIT); + + /* End of headers, start body */ +- smtp_write(sock, ""); ++ outbytes += smtp_write(sock, ""); + + while(fgets(buf, sizeof(buf), stdin)) { + /* Trim off \n, double leading .'s */ + standardise(buf); + +- smtp_write(sock, "%s", buf); ++ outbytes += smtp_write(sock, "%s", buf); + + (void)alarm((unsigned) MEDWAIT); + } + /* End of body */ + +- smtp_write(sock, "."); ++ outbytes += smtp_write(sock, "."); + (void)alarm((unsigned) MAXWAIT); + + if(smtp_okay(sock, buf) == 0) { +@@ -1495,11 +1512,12 @@ + /* Close conection */ + (void)signal(SIGALRM, SIG_IGN); + +- smtp_write(sock, "QUIT"); ++ outbytes += smtp_write(sock, "QUIT"); + (void)smtp_okay(sock, buf); + (void)close(sock); + +- log_event(LOG_INFO, "Sent mail for %s (%s)", from_strip(uad), buf); ++ log_event(LOG_INFO, "Sent mail for %s (%s) uid=%d username=%s outbytes=%d", ++ from_strip(uad), buf, uid, pw->pw_name, outbytes); + + return(0); + } +Index: ssmtp-2.61/configure.in +=================================================================== +--- ssmtp-2.61.orig/configure.in 2007-08-30 20:56:56.000000000 +0200 ++++ ssmtp-2.61/configure.in 2007-08-30 20:56:56.000000000 +0200 +@@ -24,8 +24,8 @@ + AC_STRUCT_TM + + dnl Checks for libraries. +-AC_CHECK_LIB(nsl, gethostname) +-AC_CHECK_LIB(socket, socket) ++AC_SEARCH_LIBS(gethostname, nsl) ++AC_SEARCH_LIBS(socket, socket) + + dnl Checks for library functions. + AC_TYPE_SIGNAL diff --git a/mail/ssmtp/patches/901-strftime_space_padding.patch b/mail/ssmtp/patches/901-strftime_space_padding.patch new file mode 100644 index 000000000..2a5832c93 --- /dev/null +++ b/mail/ssmtp/patches/901-strftime_space_padding.patch @@ -0,0 +1,13 @@ +Index: ssmtp-2.61/arpadate.c +=================================================================== +--- ssmtp-2.61.orig/arpadate.c 2007-08-30 20:56:56.000000000 +0200 ++++ ssmtp-2.61/arpadate.c 2007-08-30 20:56:56.000000000 +0200 +@@ -79,7 +79,7 @@ + time_t now; + + /* RFC822 format string borrowed from GNU shellutils date.c */ +- const char *format = "%a, %_d %b %Y %H:%M:%S %z"; ++ const char *format = "%a, %d %b %Y %H:%M:%S %z"; + + now = time(NULL); + diff --git a/mail/xmail/Makefile b/mail/xmail/Makefile new file mode 100644 index 000000000..8d526c74b --- /dev/null +++ b/mail/xmail/Makefile @@ -0,0 +1,56 @@ +# +# Copyright (C) 2007-2008 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# $Id$ + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xmail +PKG_VERSION:=1.24 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.xmailserver.org/ +PKG_MD5SUM:=106730bdbaa4fda9e90a7c22df024114 + +include $(INCLUDE_DIR)/package.mk + +define Package/xmail + SECTION:=mail + CATEGORY:=Mail + DEPENDS:=+uclibcxx +libopenssl + TITLE:=advanced, fast and reliable ESMTP/POP3 mail server + URL:=http://www.xmailserver.org/ +endef + +define Package/xmail/description + XMail is an Internet mail server featuring an SMTP, POP3 and finger server. + It's incredibly easy to set up and has lots of features including : + multiple domains, virtual users and spam protection. +endef + +define Build/Configure + $(CP) ./files/SysMachine.h $(PKG_BUILD_DIR)/ +endef + +define Build/Compile + CFLAGS="$(TARGET_CFLAGS)" \ + $(MAKE) -C $(PKG_BUILD_DIR) -f Makefile.lnx \ + $(TARGET_CONFIGURE_OPTS) \ + LD="\$$$$(CC)" \ + CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/uClibc++ -fno-builtin -fno-rtti -nostdinc++" \ + LDFLAGS="$(TARGET_LDFLAGS) -nodefaultlibs -lcrypto -lssl -luClibc++ -ldl -lm -lpthread" \ + all +endef + +define Package/xmail/install + $(INSTALL_DIR) $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/* $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/var/MailRoot/ + $(CP) $(PKG_BUILD_DIR)/MailRoot $(1)/var/ +endef + +$(eval $(call BuildPackage,xmail)) diff --git a/mail/xmail/files/SysMachine.h b/mail/xmail/files/SysMachine.h new file mode 100644 index 000000000..c4b142dff --- /dev/null +++ b/mail/xmail/files/SysMachine.h @@ -0,0 +1,24 @@ +#ifndef _MACHDEFS_H +#define _MACHDEFS_H + + +#undef MACH_BIG_ENDIAN_WORDS + +#undef MACH_BIG_ENDIAN_BITFIELD + +typedef signed char MachInt8; +typedef unsigned char MachUInt8; +#define MACH_TYPE_8BIT char + +typedef signed short MachInt16; +typedef unsigned short MachUInt16; +#define MACH_TYPE_16BIT short + +typedef signed int MachInt32; +typedef unsigned int MachUInt32; +#define MACH_TYPE_32BIT int + + + +#endif + diff --git a/mail/xmail/patches/010-Makefile.common.patch b/mail/xmail/patches/010-Makefile.common.patch new file mode 100644 index 000000000..c46f69eb2 --- /dev/null +++ b/mail/xmail/patches/010-Makefile.common.patch @@ -0,0 +1,21 @@ +--- xmail-1.24.orig/Makefile.common 2006-12-31 20:03:59.000000000 +0100 ++++ xmail-1.24/Makefile.common 2007-02-01 20:41:08.000000000 +0100 +@@ -76,15 +76,15 @@ + SENDMAILOBJS = SendMail.o + + %.o : %.cpp +- ${CC} ${CPPFLAGS} ${CFLAGS} -c $*.cpp ++ ${CXX} ${CPPFLAGS} ${CFLAGS} -c $*.cpp + + all: ${OUTDIR} ${MKMACHDEPINC} ${MAILSVR} ${CRTLCLNT} ${XMCRYPT} ${MKUSERS} ${SENDMAIL} + + ${OUTDIR}: + @mkdir ${OUTDIR} + +-${MKMACHDEPINC}: ${MKMACHDEP} +- ./${MKMACHDEP} > ${MKMACHDEPINC} ++#${MKMACHDEPINC}: ${MKMACHDEP} ++# ./${MKMACHDEP} > ${MKMACHDEPINC} + + ${MKMACHDEP}: ${MKMACHDEPOBJS} + ${LD} -o ${MKMACHDEP} ${MKMACHDEPOBJS} ${LDFLAGS} diff --git a/mail/xmail/patches/020-Makefile.lnx.patch b/mail/xmail/patches/020-Makefile.lnx.patch new file mode 100644 index 000000000..7bda0480c --- /dev/null +++ b/mail/xmail/patches/020-Makefile.lnx.patch @@ -0,0 +1,16 @@ +diff -ruaN xmail-1.24.orig/Makefile.lnx xmail-1.24/Makefile.lnx +--- xmail-1.24.orig/Makefile.lnx 2006-12-31 20:03:59.000000000 +0100 ++++ xmail-1.24/Makefile.lnx 2007-02-02 13:11:29.000000000 +0100 +@@ -19,9 +19,9 @@ + # Davide Libenzi + # + SYSTYPE = linux +-CC = g++ +-LD = g++ +-STRIP = strip ++CC = $(CXX) ++LD = $(CXX) ++#STRIP = strip + + ifneq ("$(WITH_SSL_INCLUDE)", "") + CFLAGS := $(CFLAGS) -I$(WITH_SSL_INCLUDE) diff --git a/mail/xmail/patches/030-xmail.patch b/mail/xmail/patches/030-xmail.patch new file mode 100644 index 000000000..520b39760 --- /dev/null +++ b/mail/xmail/patches/030-xmail.patch @@ -0,0 +1,12 @@ +diff -ruaN xmail-1.24.orig/xmail xmail-1.24/xmail +--- xmail-1.24.orig/xmail 2006-12-31 20:03:59.000000000 +0100 ++++ xmail-1.24/xmail 2007-02-02 13:14:39.000000000 +0100 +@@ -19,7 +19,7 @@ + test -f $DAEMON || exit 0 + + set -e +-ulimit -c 20000 ++ulimit -c 10000 + + start_xmail() + { diff --git a/mail/xmail/patches/040-honour_opt_flags.patch b/mail/xmail/patches/040-honour_opt_flags.patch new file mode 100644 index 000000000..5440f321c --- /dev/null +++ b/mail/xmail/patches/040-honour_opt_flags.patch @@ -0,0 +1,16 @@ +diff -ruN xmail-1.24-old/Makefile.common xmail-1.24-new/Makefile.common +--- xmail-1.24-old/Makefile.common 2007-09-01 17:30:57.000000000 +0200 ++++ xmail-1.24-new/Makefile.common 2007-09-01 17:34:00.000000000 +0200 +@@ -24,10 +24,10 @@ + endif + + ifeq ($(XMAIL_DEBUG), 1) +- CFLAGS := $(CFLAGS) -O0 -g ++ CFLAGS := -O0 -g $(CFLAGS) + STRIP = touch + else +- CFLAGS := $(CFLAGS) -O2 ++ CFLAGS := -O2 $(CFLAGS) + endif + + OUTDIR = bin diff --git a/net/dovecot/Makefile b/net/dovecot/Makefile deleted file mode 100644 index a84314408..000000000 --- a/net/dovecot/Makefile +++ /dev/null @@ -1,112 +0,0 @@ -# -# Copyright (C) 2006,2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# $Id$ - -include $(TOPDIR)/rules.mk - -PKG_NAME:=dovecot -PKG_VERSION:=1.0.beta8 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://www.dovecot.org/releases/ -PKG_MD5SUM:=6a87718a86ee1ae2334c75843dd9a7df - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - -include $(INCLUDE_DIR)/package.mk - -define Package/dovecot - SECTION:=net - CATEGORY:=Network - DEPENDS:=+libopenssl - TITLE:=An IMAP and POP3 daemon - URL:=http://www.dovecot.org/ -endef - -define Package/dovecot/description - Dovecot is a program which provides POP3 and IMAP services. -endef - -define Build/Configure - (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \ - autoconf \ - ); - $(call Build/Configure/Default, \ - --without-gssapi \ - --with-moduledir=/usr/lib/dovecot/modules \ - , \ - ignore_signed_size=1 \ - ) -endef - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - all install -endef - -define Package/dovecot/install - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/dovecot.init $(1)/etc/init.d/dovecot - $(INSTALL_DIR) $(1)/etc/dovecot - $(INSTALL_DATA) ./files/dovecot.conf $(1)/etc/dovecot.conf - $(INSTALL_DIR) $(1)/usr/lib/dovecot - $(CP) $(PKG_INSTALL_DIR)/usr/lib/dovecot/* $(1)/usr/lib/dovecot/ - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ - find $(1)/usr/lib/dovecot/modules/ \ - -name "*.a" -o -name "*.la" | xargs rm -endef - -define Package/dovecot/conffiles -/etc/dovecot.conf -endef - -define Package/dovecot/postinst -#!/bin/sh - -id=59 -name=dovecot -home=/var/run/dovecot -shell=/bin/false - -# do not change below -# check if we are on real system -if [ -z "$${IPKG_INSTROOT}" ]; then - # create copies of passwd and group, if we use squashfs - rootfs=`mount |awk '/root/ { print $$5 }'` - if [ "$$rootfs" = "squashfs" ]; then - if [ -h /etc/group ]; then - rm /etc/group - cp -p /rom/etc/group /etc/group - fi - if [ -h /etc/passwd ]; then - rm /etc/passwd - cp -p /rom/etc/passwd /etc/passwd - fi - fi -fi - -echo "" -if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/group)" ]; then - echo "adding group $$name to /etc/group" - echo "$${name}:x:$${id}:" >> $${IPKG_INSTROOT}/etc/group -fi -if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/passwd)" ]; then - echo "adding user $$name to /etc/passwd" - echo "$${name}:x:$${id}:$${id}:$${name}:$${home}:$${shell}" >> $${IPKG_INSTROOT}/etc/passwd -fi -endef - - -$(eval $(call BuildPackage,dovecot)) - -$(eval $(call RequireCommand,autoconf, \ - $(PKG_NAME) requires GNU autoconf. \ -)) diff --git a/net/dovecot/files/dovecot.conf b/net/dovecot/files/dovecot.conf deleted file mode 100644 index 161aa1b9e..000000000 --- a/net/dovecot/files/dovecot.conf +++ /dev/null @@ -1,895 +0,0 @@ -## Dovecot configuration file - -# '#' character and everything after it is treated as comments. Extra spaces -# and tabs are ignored. If you want to use either of these explicitly, put the -# value inside quotes, eg.: key = "# char and trailing whitespace " - -# Default values are shown after each value, it's not required to uncomment -# any of the lines. Exception to this are paths, they're just examples -# with real defaults being based on configure options. The paths listed here -# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var -# --with-ssldir=/etc/ssl - -# Base directory where to store runtime data. -#base_dir = /var/run/dovecot/ - -# Protocols we want to be serving: -# imap imaps pop3 pop3s -#protocols = imap imaps -protocols = imap - -# IP or host address where to listen in for connections. It's not currently -# possible to specify multiple addresses. "*" listens in all IPv4 interfaces. -# "[::]" listens in all IPv6 interfaces, but may also listen in all IPv4 -# interfaces depending on the operating system. If you want to specify ports -# for each service, you will need to configure these settings inside the -# protocol imap/pop3 { ... } section, so you can specify different ports -# for IMAP/POP3. -#listen = * - -# IP or host address where to listen in for SSL connections. Defaults -# to above if not specified. -#ssl_listen = - -# Disable SSL/TLS support. -#ssl_disable = no -ssl_disable = yes - -# PEM encoded X.509 SSL/TLS certificate and private key. They're opened before -# dropping root privileges, so keep the key file unreadable by anyone but -# root. -#ssl_cert_file = /etc/ssl/certs/ssl-cert-snakeoil.pem -#ssl_key_file = /etc/ssl/private/ssl-cert-snakeoil.key - -# If key file is password protected, give the password here. Alternatively -# give it when starting dovecot with -p parameter. -#ssl_key_password = - -# File containing trusted SSL certificate authorities. Usually not needed. -#ssl_ca_file = - -# Request client to send a certificate. -#ssl_verify_client_cert = no - -# How often to regenerate the SSL parameters file. Generation is quite CPU -# intensive operation. The value is in hours, 0 disables regeneration -# entirely. -#ssl_parameters_regenerate = 168 - -# SSL ciphers to use -#ssl_cipher_list = ALL:!LOW - -# Disable LOGIN command and all other plaintext authentications unless -# SSL/TLS is used (LOGINDISABLED capability). Note that 127.*.*.* and -# IPv6 ::1 addresses are considered secure, this setting has no effect if -# you connect from those addresses. -disable_plaintext_auth = no - -# Use this logfile instead of syslog(). /dev/stderr can be used if you want to -# use stderr for logging (ONLY /dev/stderr - otherwise it is closed). -#log_path = - -# For informational messages, use this logfile instead of the default -#info_log_path = - -# Prefix for each line written to log file. % codes are in strftime(3) -# format. -log_timestamp = "%Y-%m-%d %H:%M:%S " - -# Syslog facility to use if you're logging to syslog. Usually if you don't -# want to use "mail", you'll use local0..local7. Also other standard -# facilities are supported. -#syslog_facility = mail - -## -## Login processes -## - -# Directory where authentication process places authentication UNIX sockets -# which login needs to be able to connect to. The sockets are created when -# running as root, so you don't have to worry about permissions. Note that -# everything in this directory is deleted when Dovecot is started. -#login_dir = /var/run/dovecot/login - -# chroot login process to the login_dir. Only reason not to do this is if you -# wish to run the whole Dovecot without roots. -# http://wiki.dovecot.org/Rootless -#login_chroot = yes - -# User to use for the login process. Create a completely new user for this, -# and don't use it anywhere else. The user must also belong to a group where -# only it has access, it's used to control access for authentication process. -# Note that this user is NOT used to access mails. -# http://wiki.dovecot.org/UserIds -#login_user = dovecot - -# Set max. process size in megabytes. If you don't use -# login_process_per_connection you might need to grow this. -#login_process_size = 32 - -# Should each login be processed in it's own process (yes), or should one -# login process be allowed to process multiple connections (no)? Yes is more -# secure, espcially with SSL/TLS enabled. No is faster since there's no need -# to create processes all the time. -#login_process_per_connection = yes - -# Number of login processes to create. If login_process_per_connection is -# yes, this is the number of extra processes waiting for users to log in. -#login_processes_count = 3 - -# Maximum number of extra login processes to create. The extra process count -# usually stays at login_processes_count, but when multiple users start logging -# in at the same time more extra processes are created. To prevent fork-bombing -# we check only once in a second if new processes should be created - if all -# of them are used at the time, we double their amount until limit set by this -# setting is reached. This setting is used only if login_process_per_use is yes. -#login_max_processes_count = 128 - -# Maximum number of connections allowed in login state. When this limit is -# reached, the oldest connections are dropped. If login_process_per_connection -# is no, this is a per-process value, so the absolute maximum number of users -# logging in actually login_processes_count * max_logging_users. -#login_max_logging_users = 256 - -# Greeting message for clients. -#login_greeting = Dovecot ready. - -# Space-separated list of elements we want to log. The elements which have -# a non-empty variable value are joined together to form a comma-separated -# string. -#login_log_format_elements = user=<%u> method=%m rip=%r lip=%l %c - -# Login log format. %$ contains login_log_format_elements string, %s contains -# the data we want to log. -#login_log_format = %$: %s - -## -## Mail processes -## - -# Maximum number of running mail processes. When this limit is reached, -# new users aren't allowed to log in. -#max_mail_processes = 1024 - -# Show more verbose process titles (in ps). Currently shows user name and -# IP address. Useful for seeing who are actually using the IMAP processes -# (eg. shared mailboxes or if same uid is used for multiple accounts). -#verbose_proctitle = no - -# Show protocol level SSL errors. -#verbose_ssl = no - -# Valid UID range for users, defaults to 500 and above. This is mostly -# to make sure that users can't log in as daemons or other system users. -# Note that denying root logins is hardcoded to dovecot binary and can't -# be done even if first_valid_uid is set to 0. -#first_valid_uid = 500 -#last_valid_uid = 0 - -# Valid GID range for users, defaults to non-root/wheel. Users having -# non-valid GID as primary group ID aren't allowed to log in. If user -# belongs to supplementary groups with non-valid GIDs, those groups are -# not set. -#first_valid_gid = 1 -#last_valid_gid = 0 - -# Grant access to these extra groups for mail processes. Typical use would be -# to give "mail" group write access to /var/mail to be able to create dotlocks. -mail_extra_groups = mail - -# ':' separated list of directories under which chrooting is allowed for mail -# processes (ie. /var/mail will allow chrooting to /var/mail/foo/bar too). -# This setting doesn't affect login_chroot or auth_chroot variables. -# WARNING: Never add directories here which local users can modify, that -# may lead to root exploit. Usually this should be done only if you don't -# allow shell access for users. See -# /usr/share/doc/dovecot-common/configuration.txt for more information. -#valid_chroot_dirs = - -# Default chroot directory for mail processes. This can be overridden for -# specific users in user database by giving /./ in user's home directory -# (eg. /home/./user chroots into /home). Note that usually there is no real -# need to do chrooting, Dovecot doesn't allow users to access files outside -# their mail directory anyway. -#mail_chroot = - -# Enable mail process debugging. This can help you figure out why Dovecot -# isn't finding your mails. -#mail_debug = no - -# Default MAIL environment to use when it's not set. By leaving this empty -# dovecot tries to do some automatic detection as described in -# /usr/share/doc/dovecot-common/mail-storages.txt. There's a few special -# variables you can use, eg.: -# -# %u - username -# %n - user part in user@domain, same as %u if there's no domain -# %d - domain part in user@domain, empty if there's no domain -# %h - home directory -# -# See /usr/share/doc/dovecot-common/variables.txt for full list. Some examples: -# -# default_mail_env = maildir:/var/mail/%1u/%u/Maildir -# default_mail_env = mbox:~/mail/:INBOX=/var/mail/%u -# default_mail_env = mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n -# -#default_mail_env = - -# If you need to set multiple mailbox locations or want to change default -# namespace settings, you can do it by defining namespace sections: -# -# You can have private, shared and public namespaces. The only difference -# between them is how Dovecot announces them to client via NAMESPACE -# extension. Shared namespaces are meant for user-owned mailboxes which are -# shared to other users, while public namespaces are for more globally -# accessible mailboxes. -# -# REMEMBER: If you add any namespaces, the default namespace must be added -# explicitly, ie. default_mail_env does nothing unless you have a namespace -# without a location setting. Default namespace is simply done by having a -# namespace with empty prefix. -#namespace private { - # Hierarchy separator to use. You should use the same separator for all - # namespaces or some clients get confused. '/' is usually a good one. - #separator = / - - # Prefix required to access this namespace. This needs to be different for - # all namespaces. For example "Public/". - #prefix = - - # Physical location of the mailbox. This is in same format as - # default_mail_env, which is also the default for it. - #location = - - # There can be only one INBOX, and this setting defines which namespace - # has it. - #inbox = yes - - # If namespace is hidden, it's not advertised to clients via NAMESPACE - # extension or shown in LIST replies. This is mostly useful when converting - # from another server with different namespaces which you want to depricate - # but still keep working. For example you can create hidden namespaces with - # prefixes "~/mail/", "~%u/mail/" and "mail/". - #hidden = yes -#} - -# Space-separated list of fields to initially save into cache file. Currently -# these fields are allowed: -# -# flags, date.sent, date.received, size.virtual, size.physical -# mime.parts, imap.body, imap.bodystructure -# -# Different IMAP clients work in different ways, so they benefit from -# different cached fields. Some do not benefit from them at all. Caching more -# than necessary generates useless disk I/O, so you don't want to do that -# either. -# -# Dovecot attempts to automatically figure out what client wants and it keeps -# only that. However the first few times a mailbox is opened, Dovecot hasn't -# yet figured out what client needs, so it may not perform optimally. If you -# know what fields the majority of your clients need, it may be useful to set -# these fields by hand. If client doesn't actually use them, Dovecot will -# eventually drop them. -# -# Usually you should just leave this field alone. The potential benefits are -# typically unnoticeable. -#mail_cache_fields = - -# Space-separated list of fields that Dovecot should never save to cache file. -# Useful if you want to save disk space at the cost of more I/O when the fields -# needed. -#mail_never_cache_fields = - -# The minimum number of mails in a mailbox before updates are done to cache -# file. This allows optimizing Dovecot's behavior to do less disk writes at -# the cost of more disk reads. -#mail_cache_min_mail_count = 0 - -# When IDLE command is running, mailbox is checked once in a while to see if -# there are any new mails or other changes. This setting defines the minimum -# time to wait between those checks. Dovecot is however able to use dnotify -# and inotify with Linux to reply immediately after the change occurs. -#mailbox_idle_check_interval = 30 - -# Allow full filesystem access to clients. There's no access checks other than -# what the operating system does for the active UID/GID. It works with both -# maildir and mboxes, allowing you to prefix mailboxes names with eg. /path/ -# or ~user/. -#mail_full_filesystem_access = no - -# Maximum allowed length for mail keyword name. It's only forced when trying -# to create new keywords. -#mail_max_keyword_length = 50 - -# Save mails with CR+LF instead of plain LF. This makes sending those mails -# take less CPU, especially with sendfile() syscall with Linux and FreeBSD. -# But it also creates a bit more disk I/O which may just make it slower. -# Also note that if other software reads the mboxes/maildirs, they may handle -# the extra CRs wrong and cause problems. -#mail_save_crlf = no - -# Use mmap() instead of read() to read mail files. read() seems to be a bit -# faster with my Linux/x86 and it's better with NFS, so that's the default. -# Note that OpenBSD 3.3 and older don't work right with mail_read_mmaped = yes. -#mail_read_mmaped = no - -# Don't use mmap() at all. This is required if you store indexes in remote -# filesystems (NFS or clustered filesystem). -#mmap_disable = no - -# Don't write() to mmaped files. This is required for some operating systems -# which use separate caches for them, such as OpenBSD. -#mmap_no_write = no - -# Locking method for index files. Alternatives are fcntl, flock and dotlock. -# Dotlocking uses some tricks which may create more disk I/O than other locking -# methods. NOTE: If you use NFS, remember to change also mmap_disable setting! -# Solaris doesn't support flock, so Solaris users need to change this to fcntl. -#lock_method = flock - -# By default LIST command returns all entries in maildir beginning with dot. -# Enabling this option makes Dovecot return only entries which are directories. -# This is done by stat()ing each entry, so it causes more disk I/O. -# (For systems setting struct dirent->d_type, this check is free and it's -# done always regardless of this setting) -#maildir_stat_dirs = no - -# Copy mail to another folders using hard links. This is much faster than -# actually copying the file. This is problematic only if something modifies -# the mail in one folder but doesn't want it modified in the others. I don't -# know any MUA which would modify mail files directly. IMAP protocol also -# requires that the mails don't change, so it would be problematic in any case. -# If you care about performance, enable it. -#maildir_copy_with_hardlinks = no - -# Which locking methods to use for locking mbox. There's four available: -# dotlock: Create .lock file. This is the oldest and most NFS-safe -# solution. If you want to use /var/mail/ like directory, the users -# will need write access to that directory. -# fcntl : Use this if possible. Works with NFS too if lockd is used. -# flock : May not exist in all systems. Doesn't work with NFS. -# lockf : May not exist in all systems. Doesn't work with NFS. -# -# You can use multiple locking methods; if you do the order they're declared -# in is important to avoid deadlocks if other MTAs/MUAs are using multiple -# locking methods as well. Some operating systems don't allow using some of -# them simultaneously. -#mbox_read_locks = fcntl -#mbox_write_locks = dotlock fcntl - -# Maximum time in seconds to wait for lock (all of them) before aborting. -#mbox_lock_timeout = 300 - -# If dotlock exists but the mailbox isn't modified in any way, override the -# lock file after this many seconds. -#mbox_dotlock_change_timeout = 30 - -# When mbox changes unexpectedly we have to fully read it to find out what -# changed. If the mbox is large this can take a long time. Since the change -# is usually just a newly appended mail, it'd be faster to simply read the -# new mails. If this setting is enabled, Dovecot does this but still safely -# fallbacks to re-reading the whole mbox file whenever something in mbox isn't -# how it's expected to be. The only real downside to this setting is that if -# some other MUA changes message flags, Dovecot doesn't notice it immediately. -# Note that a full sync is done with SELECT, EXAMINE, EXPUNGE and CHECK -# commands. -#mbox_dirty_syncs = yes - -# Like mbox_dirty_syncs, but don't do full syncs even with SELECT, EXAMINE, -# EXPUNGE or CHECK commands. If this is set, mbox_dirty_syncs is ignored. -#mbox_very_dirty_syncs = no - -# Delay writing mbox headers until doing a full write sync (EXPUNGE and CHECK -# commands and when closing the mailbox). This is especially useful for POP3 -# where clients often delete all mails. The downside is that our changes -# aren't immediately visible to other MUAs. -#mbox_lazy_writes = yes - -# If mbox size is smaller than this (in kilobytes), don't write index files. -# If an index file already exists it's still read, just not updated. -#mbox_min_index_size = 0 - -# Maximum dbox file size in kilobytes until it's rotated. -#dbox_rotate_size = 2048 - -# Minimum dbox file size in kilobytes before it's rotated -# (overrides dbox_rotate_days) -#dbox_rotate_min_size = 16 - -# Maximum dbox file age in days until it's rotated. Day always begins from -# midnight, so 1 = today, 2 = yesterday, etc. 0 = check disabled. -#dbox_rotate_days = 0 - -# umask to use for mail files and directories -#umask = 0077 - -# Drop all privileges before exec()ing the mail process. This is mostly -# meant for debugging, otherwise you don't get core dumps. It could be a small -# security risk if you use single UID for multiple users, as the users could -# ptrace() each others processes then. -#mail_drop_priv_before_exec = no - -# Set max. process size in megabytes. Most of the memory goes to mmap()ing -# files, so it shouldn't harm much even if this limit is set pretty high. -#mail_process_size = 256 - -# Log prefix for mail processes. See -# /usr/share/doc/dovecot-common/variables.txt for list of possible variables -#you can use. -#mail_log_prefix = "%Us(%u): " - -## -## IMAP specific settings -## - -protocol imap { - # Login executable location. - #login_executable = /usr/lib/dovecot/imap-login - - # IMAP executable location. Changing this allows you to execute other - # binaries before the imap process is executed. - # - # This would write rawlogs into ~/dovecot.rawlog/ directory: - # mail_executable = /usr/lib/dovecot/rawlog /usr/lib/dovecot/imap - # - # This would attach gdb into the imap process and write backtraces into - # /tmp/gdbhelper.* files: - # mail_executable = /usr/lib/dovecot/gdbhelper /usr/lib/dovecot/imap - # - #mail_executable = /usr/lib/dovecot/imap - - # Maximum IMAP command line length in bytes. Some clients generate very long - # command lines with huge mailboxes, so you may need to raise this if you get - # "Too long argument" or "IMAP command line too large" errors often. - #imap_max_line_length = 65536 - - # Support for dynamically loadable modules. - #mail_use_modules = no - #mail_modules = /usr/lib/dovecot/modules/imap - - # Send IMAP capabilities in greeting message. This makes it unnecessary for - # clients to request it with CAPABILITY command, so it saves one round-trip. - # Many clients however don't understand it and ask the CAPABILITY anyway. - #login_greeting_capability = no - - # Workarounds for various client bugs: - # delay-newmail: - # Send EXISTS/RECENT new mail notifications only when replying to NOOP - # and CHECK commands. Some clients ignore them otherwise, for example - # OSX Mail. Outlook Express breaks more badly though, without this it - # may show user "Message no longer in server" errors. Note that OE6 still - # breaks even with this workaround if synchronization is set to - # "Headers Only". - # outlook-idle: - # Outlook and Outlook Express never abort IDLE command, so if no mail - # arrives in half a hour, Dovecot closes the connection. This is still - # fine, except Outlook doesn't connect back so you don't see if new mail - # arrives. - # netscape-eoh: - # Netscape 4.x breaks if message headers don't end with the empty "end of - # headers" line. Normally all messages have this, but setting this - # workaround makes sure that Netscape never breaks by adding the line if - # it doesn't exist. This is done only for FETCH BODY[HEADER.FIELDS..] - # commands. Note that RFC says this shouldn't be done. - # tb-extra-mailbox-sep: - # With mbox storage a mailbox can contain either mails or submailboxes, - # but not both. Thunderbird separates these two by forcing server to - # accept '/' suffix in mailbox names in subscriptions list. - # The list is space-separated. - #imap_client_workarounds = outlook-idle -} - -## -## POP3 specific settings -## - -protocol pop3 { - # Login executable location. - #login_executable = /usr/lib/dovecot/pop3-login - - # POP3 executable location - #mail_executable = /usr/lib/dovecot/pop3 - - # Don't try to set mails non-recent or seen with POP3 sessions. This is - # mostly intended to reduce disk I/O. With maildir it doesn't move files - # from new/ to cur/, with mbox it doesn't write Status-header. - #pop3_no_flag_updates = no - - # Support LAST command which exists in old POP3 specs, but has been removed - # from new ones. Some clients still wish to use this though. Enabling this - # makes RSET command clear all \Seen flags from messages. - #pop3_enable_last = no - - # POP3 UIDL format to use. You can use following variables: - # - # %v - Mailbox UIDVALIDITY - # %u - Mail UID - # %m - MD5 sum of the mailbox headers in hex (mbox only) - # %f - filename (maildir only) - # - # If you want UIDL compatibility with other POP3 servers, use: - # UW's ipop3d : %08Xv%08Xu - # Courier version 0 : %f - # Courier version 1 : %u - # Courier version 2 : %v-%u - # Cyrus (<= 2.1.3) : %u - # Cyrus (>= 2.1.4) : %v.%u - # Older Dovecots : %v.%u - # - # Note that Outlook 2003 seems to have problems with %v.%u format which was - # Dovecot's default, so if you're building a new server it would be a good - # idea to change this. %08Xu%08Xv should be pretty fail-safe. - # - # NOTE: Nowadays this is required to be set explicitly, since the old - # default was bad but it couldn't be changed without breaking existing - # installations. %08Xu%08Xv will be the new default, so use it for new - # installations. - # - #pop3_uidl_format = - - # POP3 logout format string: - # %t - number of TOP commands - # %T - number of bytes sent to client as a result of TOP command - # %r - number of RETR commands - # %R - number of bytes sent to client as a result of RETR command - # %d - number of deleted messages - # %m - number of messages (before deletion) - # %s - mailbox size in bytes (before deletion) - #pop3_logout_format = top=%t/%T, retr=%r/%R, del=%d/%m, size=%s - - # Support for dynamically loadable modules. - #mail_use_modules = no - #mail_modules = /usr/lib/dovecot/modules/pop3 - - # Workarounds for various client bugs: - # outlook-no-nuls: - # Outlook and Outlook Express hang if mails contain NUL characters. - # This setting replaces them with 0x80 character. - # oe-ns-eoh: - # Outlook Express and Netscape Mail breaks if end of headers-line is - # missing. This option simply sends it if it's missing. - # The list is space-separated. - #pop3_client_workarounds = -} - -## -## dovecot-lda specific settings -## - -# protocol lda { - # If you wish to use plugins you need to specify plugin directory - # For example quota enforcing is implemented by plugin - #module_dir = /usr/local/lib/dovecot/lda - - # Address from LDA should send MDNs like out of quota - # postmaster_address = postmaster@your.dom - - # If there is no user-specific Sieve-script, global Sieve script is - # executed if set. - #global_script_path = - - # UNIX socket path to master authentication server to find users. - #auth_socket_path = /var/run/dovecot-auth-master -# } - -## -## Authentication processes -## - -# Executable location -#auth_executable = /usr/lib/dovecot/dovecot-auth - -# Set max. process size in megabytes. -#auth_process_size = 256 - -# Authentication cache size in kilobytes. 0 means it's disabled. -# Note that bsdauth, PAM and vpopmail require cache_key to be set for caching -# to be used. Also note that currently auth cache doesn't work very well if -# you're using multiple passdbs with same usernames in them. -#auth_cache_size = 0 -# Time to live in seconds for cached data. After this many seconds the cached -# record is no longer used, *except* if the main database lookup returns -# internal failure. -#auth_cache_ttl = 3600 - -# Space separated list of realms for SASL authentication mechanisms that need -# them. You can leave it empty if you don't want to support multiple realms. -# Many clients simply use the first one listed here, so keep the default realm -# first. -#auth_realms = - -# Default realm/domain to use if none was specified. This is used for both -# SASL realms and appending @domain to username in plaintext logins. -#auth_default_realm = - -# List of allowed characters in username. If the user-given username contains -# a character not listed in here, the login automatically fails. This is just -# an extra check to make sure user can't exploit any potential quote escaping -# vulnerabilities with SQL/LDAP databases. If you want to allow all characters, -# set this value to empty. -#auth_username_chars = abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@ - -# Username character translations before it's looked up from databases. The -# value contains series of from -> to characters. For example "#@/@" means -# that '#' and '/' characters are translated to '@'. -#auth_username_translation = - -# Username to use for users logging in with ANONYMOUS SASL mechanism -#auth_anonymous_username = anonymous - -# More verbose logging. Useful for figuring out why authentication isn't -# working. -#auth_verbose = no - -# Even more verbose logging for debugging purposes. Shows for example SQL -# queries. -#auth_debug = no - -# In case of password mismatches, log the passwords and used scheme so the -# problem can be debugged. Requires auth_debug=yes to be set. -#auth_debug_passwords = no - -# Maximum number of dovecot-auth worker processes. They're used to execute -# blocking passdb and userdb queries (eg. MySQL and PAM). They're -# automatically created and destroyed as needed. -#auth_worker_max_count = 30 - -# Kerberos keytab to use for the GSSAPI mechanism. Will use the system -# default (usually /etc/krb5.keytab) if not specified. -#auth_krb5_keytab = - -auth default { - # Space separated list of wanted authentication mechanisms: - # plain digest-md5 cram-md5 apop anonymous gssapi - mechanisms = plain - - ## - ## dovecot-lda specific settings - ## - # socket listen { - # master { - # path = /var/run/dovecot-auth-master - # mode = 0600 - # user = vmail # User running Dovecot LDA - # #group = mail # Or alternatively mode 0660 + LDA user in this group - # } - # } - - # - # Password database is used to verify user's password (and nothing more). - # You can have multiple passdbs and userdbs. This is useful if you want to - # allow both system users (/etc/passwd) and virtual users to login without - # duplicating the system users into virtual database. - # - # http://wiki.dovecot.org/Authentication - # - - # Users can be temporarily disabled by adding a passdb with deny=yes. - # If the user is found from that database, authentication will fail. - # The deny passdb should always be specified before others, so it gets - # checked first. Here's an example: - #passdb passwd-file { - # File contains a list of usernames, one per line - #args = /etc/dovecot.deny - #deny = yes - #} - - # PAM authentication. Preferred nowadays by most systems. - # Note that PAM can only be used to verify if user's password is correct, - # so it can't be used as userdb. If you don't want to use a separate user - # database (passwd usually), you can use static userdb. -# passdb pam { - # [session=yes] [cache_key=] [] - # - # session=yes makes Dovecot open and immediately close PAM session. Some - # PAM plugins need this to work, such as pam_mkhomedir. - # - # cache_key can be used to enable authentication caching for PAM - # (auth_cache_size also needs to be set). It isn't enabled by default - # because PAM modules can do all kinds of checks besides checking password, - # such as checking IP address. Dovecot can't know about these checks - # without some help. cache_key is simply a list of variables (see - # /usr/share/doc/dovecot-common/variables.txt) which must match for the - # cached data to be used. - # Here are some examples: - # %u - Username must match. Probably sufficient for most uses. - # %u%r - Username and remote IP address must match. - # %u%s - Username and service (ie. IMAP, POP3) must match. - # - # If service name is "*", it means the authenticating service name - # is used, eg. pop3 or imap. - # - # Some examples: - # args = session=yes * - # args = cache_key=%u dovecot - #args = dovecot -# } - - # /etc/passwd or similar, using getpwnam() - # In many systems nowadays this uses Name Service Switch, which is - # configured in /etc/nsswitch.conf. - passdb passwd { - } - - # /etc/shadow or similiar, using getspnam(). Deprecated by PAM nowadays. - #passdb shadow { - #} - - # BSD authentication. Used by at least OpenBSD. - #passdb bsdauth { - # [cache_key=] - See cache_key in PAM for explanation. - #args = - #} - - # passwd-like file with specified location - #passdb passwd-file { - # Path for passwd-file - #args = - #} - - # checkpassword executable authentication - # NOTE: You will probably want to use "userdb prefetch" with this. - #passdb checkpassword { - # Path for checkpassword binary - #args = - #} - - # SQL database - #passdb sql { - # Path for SQL configuration file, see /etc/dovecot/dovecot-sql.conf for - # example - #args = - #} - - # LDAP database - #passdb ldap { - # Path for LDAP configuration file, see /etc/dovecot/dovecot-ldap.conf for - # example - #args = - #} - - # vpopmail authentication - #passdb vpopmail { - # [cache_key=] - See cache_key in PAM for explanation. - #args = - #} - - # - # User database specifies where mails are located and what user/group IDs - # own them. For single-UID configuration use "static". - # - # http://wiki.dovecot.org/Authentication - # http://wiki.dovecot.org/VirtualUsers - # - - # /etc/passwd or similar, using getpwnam() - # In many systems nowadays this uses Name Service Switch, which is - # configured in /etc/nsswitch.conf. - userdb passwd { - } - - # passwd-like file with specified location - #userdb passwd-file { - # Path for passwd-file - #args = - #} - - # static settings generated from template - #userdb static { - # Template for settings. Can return anything a userdb could normally - # return, eg.: uid, gid, home, mail, nice - # - # A few examples: - # - # args = uid=500 gid=500 home=/var/mail/%u - # args = uid=500 gid=500 home=/home/%u mail=mbox:/home/%u/mail nice=10 - # - #args = - #} - - # SQL database - #userdb sql { - # Path for SQL configuration file, see /etc/dovecot/dovecot-sql.conf for - # example - #args = - #} - - # LDAP database - #userdb ldap { - # Path for LDAP configuration file, see /etc/dovecot/dovecot-ldap.conf for - # example - #args = - #} - - # vpopmail - #userdb vpopmail { - #} - - # "prefetch" user database means that the passdb already provided the - # needed information and there's no need to do a separate userdb lookup. - # This can be made to work with SQL and LDAP databases, see their example - # configuration files for more information how to do it. - # http://wiki.dovecot.org/AuthSpecials - #userdb prefetch { - #} - - # User to use for the process. This user needs access to only user and - # password databases, nothing else. Only shadow and pam authentication - # requires roots, so use something else if possible. Note that passwd - # authentication with BSDs internally accesses shadow files, which also - # requires roots. Note that this user is NOT used to access mails. - # That user is specified by userdb above. - user = root - - # Directory where to chroot the process. Most authentication backends don't - # work if this is set, and there's no point chrooting if auth_user is root. - # Note that valid_chroot_dirs isn't needed to use this setting. - #chroot = - - # Number of authentication processes to create - #count = 1 - - # Require a valid SSL client certificate or the authentication fails. - #ssl_require_client_cert = no - - # Take the username from client's SSL certificate, using X509_NAME_oneline() - # which typically uses subject's Distinguished Name. - #ssl_username_from_cert = no -} - -# It's possible to export the authentication interface to other programs, -# for example SMTP server which supports talking to Dovecot. Client socket -# handles the actual authentication - you give it a username and password -# and it returns OK or failure. So it's pretty safe to allow anyone access to -# it. Master socket is used to a) query if given client was successfully -# authenticated, b) userdb lookups. - -# listener sockets will be created by Dovecot's master process using the -# settings given inside the auth section -#auth default_with_listener { -# mechanisms = plain -# passdb pam { -# } -# userdb passwd { -# } -# socket listen { -# master { -# path = /var/run/dovecot-auth-master -# # WARNING: Giving untrusted users access to master socket may be a -# # security risk, don't give too wide permissions to it! -# #mode = 0600 -# # Default user/group is the one who started dovecot-auth (root) -# #user = -# #group = -# } -# client { -# path = /var/run/dovecot-auth-client -# mode = 0660 -# } -# } -#} - -# connect sockets are assumed to be already running, Dovecot's master -# process only tries to connect to them. They don't need any other settings -# than path for the master socket, as the configuration is done elsewhere. -# Note that the client sockets must exist in login_dir. -#auth external { -# socket connect { -# master { -# path = /var/run/dovecot-auth-master -# } -# } -#} - -plugin { - # Here you can give some extra environment variables to mail processes. - # This is mostly meant for passing parameters to plugins. %variable - # expansion is done for all values. - - # Quota plugin - #quota = dirsize:%h/mail - - # Convert plugin. If set, specifies the source storage path which is - # converted to destination storage (default_mail_env). - #convert_mail = mbox:%h/mail -} diff --git a/net/dovecot/files/dovecot.init b/net/dovecot/files/dovecot.init deleted file mode 100644 index 338652cff..000000000 --- a/net/dovecot/files/dovecot.init +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2006,2007 OpenWrt.org - -START=99 - -RUN_D=/var/run/dovecot -PID_F=$RUN_D/master.pid - -start() { - mkdir -p $RUN_D - dovecot -} - -stop() { - [ -f $PID_F ] && kill $(cat $PID_F) -} diff --git a/net/dovecot/patches/configure.in.patch b/net/dovecot/patches/configure.in.patch deleted file mode 100644 index 16bb0fa3e..000000000 --- a/net/dovecot/patches/configure.in.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- ./configure.in.dovecot 2005-07-30 23:44:48.571463846 +0100 -+++ ./configure.in 2005-07-31 00:22:17.564381142 +0100 -@@ -529,7 +529,22 @@ - echo "..ignoring as requested.." - ],[ - AC_MSG_RESULT(no) --],[]) -+],[ -+ -+ AC_MSG_RESULT(can't check) -+ -+ echo -+ echo "You are cross compiling so I can't tell if the destination uses a signed" -+ echo "size_t. Dovecot isn't designed to work with a signed size_t, It probably" -+ echo "works just fine, but it's less resistant to buffer overflows." -+ echo "You may want to manually check what your target uses for size_t." -+ echo "To compile Dovecot anyway, set ignore_signed_size=1 environment." -+ -+ if test "$ignore_signed_size" = ""; then -+ AC_MSG_ERROR([aborting]) -+ fi -+ echo "..proceeding as requested.." -+]) - - dnl Note: we check size_t rather than ssize_t here, because on OSX 10.2 - dnl ssize_t = int and size_t = unsigned long. We're mostly concerned about -@@ -659,7 +674,10 @@ - ], [ - AC_MSG_RESULT([check failed, assuming 31]) - max_bits=31 --],[]) -+],[ -+ AC_MSG_RESULT([cross compiling, assuming 31]) -+ max_bits=31 -+]) - AC_DEFINE_UNQUOTED(TIME_T_MAX_BITS, $max_bits, max. time_t bits gmtime() can handle) - - dnl * do we have struct iovec -@@ -768,6 +786,8 @@ - ], [ - AC_MSG_RESULT(no) - AC_DEFINE(MMAP_CONFLICTS_WRITE,, [Define if shared mmaps don't get updated by write()s]) -+], [ -+ AC_MSG_RESULT(cross-compiling so target PROBABLY isn't the buggy version of OpenBSD) - ]) - - dnl * see if fd passing works -@@ -831,6 +851,9 @@ - if test $i = 2; then - AC_MSG_RESULT(no) - fi -+ ], [ -+ CFLAGS=$old_cflags -+ AC_MSG_RESULT(cross compiling so target probably isn't 64 bit) - ]) - done - -@@ -878,7 +901,7 @@ - dnl *** - - AC_CACHE_CHECK([for an implementation of va_copy()],lib_cv_va_copy,[ -- AC_RUN_IFELSE([AC_LANG_SOURCE([[ -+ AC_LINK_IFELSE([AC_LANG_SOURCE([[ - #include - void f (int i, ...) { - va_list args1, args2; -@@ -896,7 +919,7 @@ - [lib_cv_va_copy=no],[]) - ]) - AC_CACHE_CHECK([for an implementation of __va_copy()],lib_cv___va_copy,[ -- AC_RUN_IFELSE([AC_LANG_SOURCE([[ -+ AC_LINK_IFELSE([AC_LANG_SOURCE([[ - #include - void f (int i, ...) { - va_list args1, args2; -@@ -941,7 +964,8 @@ - return 0; - }]])], - [lib_cv_va_val_copy=yes], -- [lib_cv_va_val_copy=no],[]) -+ [lib_cv_va_val_copy=no], -+ [lib_cv_va_val_copy=yes]) - ]) - - if test "x$lib_cv_va_val_copy" = "xno"; then diff --git a/net/imapfilter/Makefile b/net/imapfilter/Makefile deleted file mode 100644 index aca0f98d2..000000000 --- a/net/imapfilter/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -# -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# $Id$ - -include $(TOPDIR)/rules.mk - -PKG_NAME:=imapfilter -PKG_VERSION:=1.2.2 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://imapfilter.hellug.gr/source/ -PKG_MD5SUM:=4c1f28dffbb727a4769948f10baccd79 - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - -include $(INCLUDE_DIR)/package.mk - -define Package/imapfilter - SECTION:=net - CATEGORY:=Network - DEPENDS:=+liblua +libopenssl - TITLE:=IMAP server based email filtering - URL:=http://imapfilter.hellug.gr/ -endef - -define Build/Configure - (cd $(PKG_BUILD_DIR); \ - ./configure \ - -d /usr \ - ); -endef - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - INCDIRS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ - LIBDIRS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ - MYCFLAGS="$(TARGET_CFLAGS)" -endef - -define Package/imapfilter/conffiles -/etc/imapfilter/config.lua -endef - -define Package/imapfilter/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/imapfilter $(1)/usr/bin/ - $(INSTALL_DIR) $(1)/etc/imapfilter - $(INSTALL_CONF) $(PKG_BUILD_DIR)/sample.config.lua $(1)/etc/imapfilter/config.lua - $(INSTALL_DIR) $(1)/usr/share/imapfilter - $(INSTALL_DATA) $(PKG_BUILD_DIR)/interface.lua $(1)/usr/share/imapfilter/ - $(INSTALL_DATA) $(PKG_BUILD_DIR)/auxiliary.lua $(1)/usr/share/imapfilter/ -endef - -$(eval $(call BuildPackage,imapfilter)) diff --git a/net/imapfilter/patches/010-pathnames.patch b/net/imapfilter/patches/010-pathnames.patch deleted file mode 100644 index 85e30e74f..000000000 --- a/net/imapfilter/patches/010-pathnames.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- imapfilter-1.2.2/pathnames.h 2006-08-01 14:11:20.000000000 +0200 -+++ imapfilter-1.2.2/pathnames.h 2006-09-07 23:58:12.000000000 +0200 -@@ -3,7 +3,7 @@ - - - /* Program's home directory. */ --#define PATHNAME_HOME ".imapfilter" -+#define PATHNAME_HOME "/etc/imapfilter" - - /* Program's configuration file. */ - #define PATHNAME_CONFIG PATHNAME_HOME "/config.lua" -@@ -18,7 +18,7 @@ - #define PATHNAME_CERTS PATHNAME_HOME "/certificates" - - /* Debug temporary file template. */ --#define PATHNAME_DEBUG PATHNAME_HOME "/debug.XXXXXX" -+#define PATHNAME_DEBUG "/tmp/imapfilterdebug.XXXXXX" - - - #endif /* PATHNAMES_H */ ---- imapfilter-1.2.2/imapfilter.c 2006-09-08 00:02:11.000000000 +0200 -+++ imapfilter-1.2.2/imapfilter.c 2006-09-08 00:02:32.000000000 +0200 -@@ -50,7 +50,7 @@ - opts.config = NULL; - opts.oneline = NULL; - -- env.home = getenv("HOME"); -+ env.home = ""; - env.pathmax = -1; - - while ((c = getopt(argc, argv, "Vc:de:il:v?")) != -1) { diff --git a/net/mini_sendmail/Makefile b/net/mini_sendmail/Makefile deleted file mode 100644 index d243d82fb..000000000 --- a/net/mini_sendmail/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# -# Copyright (C) 2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# $Id$ - -include $(TOPDIR)/rules.mk - -PKG_NAME:=mini-sendmail -PKG_VERSION:=1.3.6 -PKG_RELEASE:=2 - -PKG_SOURCE:=mini_sendmail-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://www.acme.com/software/mini_sendmail/ -PKG_MD5SUM:=fb1585d2ad81c519a26d83bfd783dee8 - -PKG_BUILD_DIR:=$(BUILD_DIR)/mini_sendmail-$(PKG_VERSION) - -include $(INCLUDE_DIR)/package.mk - -define Package/mini-sendmail - SECTION:=net - CATEGORY:=Network - TITLE:=A small sendmail-compatible mail forwarder - URL:=http://www.acme.com/software/mini_sendmail/ -endef - -define Package/mini-sendmail/description - mini_sendmail reads its standard input up to an end-of-file and sends a - copy of the message found there to all of the addresses listed. - The message is sent by connecting to a local SMTP server. This means - mini_sendmail can be used to send email from inside a chroot(2) area. -endef - -MAKE_FLAGS += \ - OFLAGS="$(TARGET_CFLAGS)" - -define Package/mini-sendmail/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/mini_sendmail $(1)/usr/sbin/ - ln -sf mini_sendmail $(1)/usr/sbin/sendmail -endef - -$(eval $(call BuildPackage,mini-sendmail)) diff --git a/net/mini_sendmail/patches/200-fullname.patch b/net/mini_sendmail/patches/200-fullname.patch deleted file mode 100644 index 95e19a776..000000000 --- a/net/mini_sendmail/patches/200-fullname.patch +++ /dev/null @@ -1,36 +0,0 @@ -Index: mini_sendmail-1.3.6/mini_sendmail.c -=================================================================== ---- mini_sendmail-1.3.6.orig/mini_sendmail.c 2007-08-28 17:58:37.000000000 +0200 -+++ mini_sendmail-1.3.6/mini_sendmail.c 2007-08-28 17:58:37.000000000 +0200 -@@ -542,6 +542,7 @@ - } - - /* Strip off any angle brackets. */ -+/* - while ( len > 0 && *recipient == '<' ) - { - ++recipient; -@@ -551,6 +552,23 @@ - --len; - - (void) snprintf( buf, sizeof(buf), "RCPT TO:<%.*s>", len, recipient ); -+*/ -+ if (len > 0 && recipient[len-1] == '>' ) -+ { -+ /* "" or: "Full Name " */ -+ while (len > 0 && *recipient != '<' ) -+ { -+ ++recipient; -+ --len; -+ } -+ (void) snprintf( buf, sizeof(buf), "RCPT TO:%.*s", len, recipient ); -+ } -+ else -+ { -+ /* name@domain */ -+ (void) snprintf( buf, sizeof(buf), "RCPT TO:<%.*s>", len, recipient ); -+ } -+ - send_command( buf ); - status = read_response(); - if ( status != 250 && status != 251 ) diff --git a/net/mini_sendmail/patches/500-flags.patch b/net/mini_sendmail/patches/500-flags.patch deleted file mode 100644 index 39b42b40e..000000000 --- a/net/mini_sendmail/patches/500-flags.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: mini_sendmail-1.3.6/Makefile -=================================================================== ---- mini_sendmail-1.3.6.orig/Makefile 2007-08-28 17:58:37.000000000 +0200 -+++ mini_sendmail-1.3.6/Makefile 2007-08-28 17:58:37.000000000 +0200 -@@ -7,9 +7,10 @@ - BINDIR = /usr/local/sbin - MANDIR = /usr/local/man - CC = gcc --CFLAGS = -O -+OFLAGS = -O -+CFLAGS = $(OFLAGS) - #CFLAGS = -g --LDFLAGS = -s -static -+LDFLAGS = - #LDFLAGS = -g -static - LDLIBS = $(SYSV_LIBS) - diff --git a/net/ssmtp/Makefile b/net/ssmtp/Makefile deleted file mode 100644 index 3bacab583..000000000 --- a/net/ssmtp/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# -# Copyright (C) 2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# $Id$ - -include $(TOPDIR)/rules.mk - -PKG_NAME:=ssmtp -PKG_VERSION:=2.61 -PKG_RELEASE:=2 - -PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz -PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/s/ssmtp/ -PKG_MD5SUM:=957e6fff08625fe34f4fc33d0925bbc9 - -include $(INCLUDE_DIR)/package.mk - -define Package/ssmtp - SECTION:=net - CATEGORY:=Network - DEPENDS:=+libopenssl - TITLE:=A minimal and secure mail sender - URL:=http://packages.debian.org/stable/mail/ssmtp -endef - -define Package/ssmtp/description - A secure, effective and simple way of getting mail off a system to your - mail hub. It contains no suid-binaries or other dangerous things - no - mail spool to poke around in, and no daemons running in the background. - mail is simply forwarded to the configured mailhost. Extremely easy - configuration. -endef - -EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -EXTRA_LDFLAGS+=-L$(STAGING_DIR)/usr/lib -Wl,-rpath-link,$(STAGING_DIR)/usr/lib - -TARGET_CONFIGURE_OPTS+=\ - CC="$(TARGET_CC) $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)" - -CONFIGURE_ARGS += \ - --enable-ssl - -define Package/ssmtp/install - $(INSTALL_DIR) $(1)/etc/ssmtp - $(INSTALL_DATA) $(PKG_BUILD_DIR)/ssmtp.conf $(1)/etc/ssmtp/ - $(INSTALL_DATA) $(PKG_BUILD_DIR)/revaliases $(1)/etc/ssmtp/ - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/ssmtp $(1)/usr/sbin/ - ln -sf ssmtp $(1)/usr/sbin/sendmail -endef - -$(eval $(call BuildPackage,ssmtp)) diff --git a/net/ssmtp/patches/500-debian-subset-2.61-2.patch b/net/ssmtp/patches/500-debian-subset-2.61-2.patch deleted file mode 100644 index db1a7855a..000000000 --- a/net/ssmtp/patches/500-debian-subset-2.61-2.patch +++ /dev/null @@ -1,254 +0,0 @@ -Index: ssmtp-2.61/ssmtp.conf -=================================================================== ---- ssmtp-2.61.orig/ssmtp.conf 2007-08-30 20:56:56.000000000 +0200 -+++ ssmtp-2.61/ssmtp.conf 2007-08-30 20:56:56.000000000 +0200 -@@ -36,3 +36,8 @@ - - # Use this RSA certificate. - #TLSCert=/etc/ssl/certs/ssmtp.pem -+ -+# Get enhanced (*really* enhanced) debugging information in the logs -+# If you want to have debugging of the config file parsing, move this option -+# to the top of the config file and uncomment -+#Debug=YES -Index: ssmtp-2.61/ssmtp.c -=================================================================== ---- ssmtp-2.61.orig/ssmtp.c 2007-08-30 20:56:56.000000000 +0200 -+++ ssmtp-2.61/ssmtp.c 2007-08-30 20:56:56.000000000 +0200 -@@ -93,6 +93,7 @@ - static char hextab[]="0123456789abcdef"; - #endif - -+ssize_t outbytes; - - /* - log_event() -- Write event to syslog (or log file if defined) -@@ -129,7 +130,7 @@ - #endif - } - --void smtp_write(int fd, char *format, ...); -+ssize_t smtp_write(int fd, char *format, ...); - int smtp_read(int fd, char *response); - int smtp_read_all(int fd, char *response); - int smtp_okay(int fd, char *response); -@@ -150,7 +151,7 @@ - if(isatty(fileno(stdin))) { - if(log_level > 0) { - log_event(LOG_ERR, -- "stdin is a TTY - not saving to %s/dead.letter, pw->pw_dir"); -+ "stdin is a TTY - not saving to %s/dead.letter", pw->pw_dir); - } - return; - } -@@ -964,6 +965,17 @@ - log_event(LOG_INFO, "Set AuthMethod=\"%s\"\n", auth_method); - } - } -+ else if (strcasecmp(p, "Debug") == 0) -+ { -+ if (strcasecmp(q, "YES") == 0) -+ { -+ log_level = 1; -+ } -+ else -+ { -+ log_level = 0; -+ } -+ } - else { - log_event(LOG_INFO, "Unable to set %s=\"%s\"\n", p, q); - } -@@ -1232,10 +1244,11 @@ - /* - smtp_write() -- A printf to an fd and append - */ --void smtp_write(int fd, char *format, ...) -+ssize_t smtp_write(int fd, char *format, ...) - { - char buf[(BUF_SZ + 1)]; - va_list ap; -+ ssize_t outbytes = 0; - - va_start(ap, format); - if(vsnprintf(buf, (BUF_SZ - 2), format, ap) == -1) { -@@ -1252,7 +1265,9 @@ - } - (void)strcat(buf, "\r\n"); - -- (void)fd_puts(fd, buf, strlen(buf)); -+ outbytes = fd_puts(fd, buf, strlen(buf)); -+ -+ return (outbytes >= 0) ? outbytes : 0; - } - - /* -@@ -1282,6 +1297,8 @@ - int i, sock; - uid_t uid; - -+ outbytes = 0; -+ - uid = getuid(); - if((pw = getpwuid(uid)) == (struct passwd *)NULL) { - die("Could not find password entry for UID %d", uid); -@@ -1335,10 +1352,10 @@ - - /* If user supplied username and password, then try ELHO */ - if(auth_user) { -- smtp_write(sock, "EHLO %s", hostname); -+ outbytes += smtp_write(sock, "EHLO %s", hostname); - } - else { -- smtp_write(sock, "HELO %s", hostname); -+ outbytes += smtp_write(sock, "HELO %s", hostname); - } - (void)alarm((unsigned) MEDWAIT); - -@@ -1354,7 +1371,7 @@ - } - - if(strcasecmp(auth_method, "cram-md5") == 0) { -- smtp_write(sock, "AUTH CRAM-MD5"); -+ outbytes += smtp_write(sock, "AUTH CRAM-MD5"); - (void)alarm((unsigned) MEDWAIT); - - if(smtp_read(sock, buf) != 3) { -@@ -1369,7 +1386,7 @@ - #endif - memset(buf, 0, sizeof(buf)); - to64frombits(buf, auth_user, strlen(auth_user)); -- smtp_write(sock, "AUTH LOGIN %s", buf); -+ outbytes += smtp_write(sock, "AUTH LOGIN %s", buf); - - (void)alarm((unsigned) MEDWAIT); - if(smtp_read(sock, buf) != 3) { -@@ -1381,7 +1398,7 @@ - #ifdef MD5AUTH - } - #endif -- smtp_write(sock, "%s", buf); -+ outbytes += smtp_write(sock, "%s", buf); - (void)alarm((unsigned) MEDWAIT); - - if(smtp_okay(sock, buf) == False) { -@@ -1390,7 +1407,7 @@ - } - - /* Send "MAIL FROM:" line */ -- smtp_write(sock, "MAIL FROM:<%s>", uad); -+ outbytes += smtp_write(sock, "MAIL FROM:<%s>", uad); - - (void)alarm((unsigned) MEDWAIT); - -@@ -1408,7 +1425,7 @@ - - while(rt->next) { - p = rcpt_remap(rt->string); -- smtp_write(sock, "RCPT TO:<%s>", p); -+ outbytes += smtp_write(sock, "RCPT TO:<%s>", p); - - (void)alarm((unsigned)MEDWAIT); - -@@ -1425,7 +1442,7 @@ - while(p) { - /* RFC822 Address -> "foo@bar" */ - q = rcpt_remap(addr_parse(p)); -- smtp_write(sock, "RCPT TO:<%s>", q); -+ outbytes += smtp_write(sock, "RCPT TO:<%s>", q); - - (void)alarm((unsigned) MEDWAIT); - -@@ -1439,7 +1456,7 @@ - } - - /* Send DATA */ -- smtp_write(sock, "DATA"); -+ outbytes += smtp_write(sock, "DATA"); - (void)alarm((unsigned) MEDWAIT); - - if(smtp_read(sock, buf) != 3) { -@@ -1447,45 +1464,45 @@ - die("%s", buf); - } - -- smtp_write(sock, -+ outbytes += smtp_write(sock, - "Received: by %s (sSMTP sendmail emulation); %s", hostname, arpadate); - - if(have_from == False) { -- smtp_write(sock, "From: %s", from); -+ outbytes += smtp_write(sock, "From: %s", from); - } - - if(have_date == False) { -- smtp_write(sock, "Date: %s", arpadate); -+ outbytes += smtp_write(sock, "Date: %s", arpadate); - } - - #ifdef HASTO_OPTION - if(have_to == False) { -- smtp_write(sock, "To: postmaster"); -+ outbytes += smtp_write(sock, "To: postmaster"); - } - #endif - - ht = &headers; - while(ht->next) { -- smtp_write(sock, "%s", ht->string); -+ outbytes += smtp_write(sock, "%s", ht->string); - ht = ht->next; - } - - (void)alarm((unsigned) MEDWAIT); - - /* End of headers, start body */ -- smtp_write(sock, ""); -+ outbytes += smtp_write(sock, ""); - - while(fgets(buf, sizeof(buf), stdin)) { - /* Trim off \n, double leading .'s */ - standardise(buf); - -- smtp_write(sock, "%s", buf); -+ outbytes += smtp_write(sock, "%s", buf); - - (void)alarm((unsigned) MEDWAIT); - } - /* End of body */ - -- smtp_write(sock, "."); -+ outbytes += smtp_write(sock, "."); - (void)alarm((unsigned) MAXWAIT); - - if(smtp_okay(sock, buf) == 0) { -@@ -1495,11 +1512,12 @@ - /* Close conection */ - (void)signal(SIGALRM, SIG_IGN); - -- smtp_write(sock, "QUIT"); -+ outbytes += smtp_write(sock, "QUIT"); - (void)smtp_okay(sock, buf); - (void)close(sock); - -- log_event(LOG_INFO, "Sent mail for %s (%s)", from_strip(uad), buf); -+ log_event(LOG_INFO, "Sent mail for %s (%s) uid=%d username=%s outbytes=%d", -+ from_strip(uad), buf, uid, pw->pw_name, outbytes); - - return(0); - } -Index: ssmtp-2.61/configure.in -=================================================================== ---- ssmtp-2.61.orig/configure.in 2007-08-30 20:56:56.000000000 +0200 -+++ ssmtp-2.61/configure.in 2007-08-30 20:56:56.000000000 +0200 -@@ -24,8 +24,8 @@ - AC_STRUCT_TM - - dnl Checks for libraries. --AC_CHECK_LIB(nsl, gethostname) --AC_CHECK_LIB(socket, socket) -+AC_SEARCH_LIBS(gethostname, nsl) -+AC_SEARCH_LIBS(socket, socket) - - dnl Checks for library functions. - AC_TYPE_SIGNAL diff --git a/net/ssmtp/patches/901-strftime_space_padding.patch b/net/ssmtp/patches/901-strftime_space_padding.patch deleted file mode 100644 index 2a5832c93..000000000 --- a/net/ssmtp/patches/901-strftime_space_padding.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: ssmtp-2.61/arpadate.c -=================================================================== ---- ssmtp-2.61.orig/arpadate.c 2007-08-30 20:56:56.000000000 +0200 -+++ ssmtp-2.61/arpadate.c 2007-08-30 20:56:56.000000000 +0200 -@@ -79,7 +79,7 @@ - time_t now; - - /* RFC822 format string borrowed from GNU shellutils date.c */ -- const char *format = "%a, %_d %b %Y %H:%M:%S %z"; -+ const char *format = "%a, %d %b %Y %H:%M:%S %z"; - - now = time(NULL); - diff --git a/net/xmail/Makefile b/net/xmail/Makefile deleted file mode 100644 index 04dbe94e8..000000000 --- a/net/xmail/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -# -# Copyright (C) 2007 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# $Id$ - -include $(TOPDIR)/rules.mk - -PKG_NAME:=xmail -PKG_VERSION:=1.24 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://www.xmailserver.org/ -PKG_MD5SUM:=106730bdbaa4fda9e90a7c22df024114 - -include $(INCLUDE_DIR)/package.mk - -define Package/xmail - SECTION:=net - CATEGORY:=Network - DEPENDS:=+uclibcxx +libopenssl - TITLE:=advanced, fast and reliable ESMTP/POP3 mail server - URL:=http://www.xmailserver.org/ -endef - -define Package/xmail/description - XMail is an Internet mail server featuring an SMTP, POP3 and finger server. - It's incredibly easy to set up and has lots of features including : - multiple domains, virtual users and spam protection. -endef - -define Build/Configure - $(CP) ./files/SysMachine.h $(PKG_BUILD_DIR)/ -endef - -define Build/Compile - CFLAGS="$(TARGET_CFLAGS)" \ - $(MAKE) -C $(PKG_BUILD_DIR) -f Makefile.lnx \ - $(TARGET_CONFIGURE_OPTS) \ - LD="\$$$$(CC)" \ - CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/uClibc++ -fno-builtin -fno-rtti -nostdinc++" \ - LDFLAGS="$(TARGET_LDFLAGS) -nodefaultlibs -lcrypto -lssl -luClibc++ -ldl -lm -lpthread" \ - all -endef - -define Package/xmail/install - $(INSTALL_DIR) $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/* $(1)/usr/bin/ - $(INSTALL_DIR) $(1)/var/MailRoot/ - $(CP) $(PKG_BUILD_DIR)/MailRoot $(1)/var/ -endef - -$(eval $(call BuildPackage,xmail)) diff --git a/net/xmail/files/SysMachine.h b/net/xmail/files/SysMachine.h deleted file mode 100644 index c4b142dff..000000000 --- a/net/xmail/files/SysMachine.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef _MACHDEFS_H -#define _MACHDEFS_H - - -#undef MACH_BIG_ENDIAN_WORDS - -#undef MACH_BIG_ENDIAN_BITFIELD - -typedef signed char MachInt8; -typedef unsigned char MachUInt8; -#define MACH_TYPE_8BIT char - -typedef signed short MachInt16; -typedef unsigned short MachUInt16; -#define MACH_TYPE_16BIT short - -typedef signed int MachInt32; -typedef unsigned int MachUInt32; -#define MACH_TYPE_32BIT int - - - -#endif - diff --git a/net/xmail/patches/010-Makefile.common.patch b/net/xmail/patches/010-Makefile.common.patch deleted file mode 100644 index c46f69eb2..000000000 --- a/net/xmail/patches/010-Makefile.common.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- xmail-1.24.orig/Makefile.common 2006-12-31 20:03:59.000000000 +0100 -+++ xmail-1.24/Makefile.common 2007-02-01 20:41:08.000000000 +0100 -@@ -76,15 +76,15 @@ - SENDMAILOBJS = SendMail.o - - %.o : %.cpp -- ${CC} ${CPPFLAGS} ${CFLAGS} -c $*.cpp -+ ${CXX} ${CPPFLAGS} ${CFLAGS} -c $*.cpp - - all: ${OUTDIR} ${MKMACHDEPINC} ${MAILSVR} ${CRTLCLNT} ${XMCRYPT} ${MKUSERS} ${SENDMAIL} - - ${OUTDIR}: - @mkdir ${OUTDIR} - --${MKMACHDEPINC}: ${MKMACHDEP} -- ./${MKMACHDEP} > ${MKMACHDEPINC} -+#${MKMACHDEPINC}: ${MKMACHDEP} -+# ./${MKMACHDEP} > ${MKMACHDEPINC} - - ${MKMACHDEP}: ${MKMACHDEPOBJS} - ${LD} -o ${MKMACHDEP} ${MKMACHDEPOBJS} ${LDFLAGS} diff --git a/net/xmail/patches/020-Makefile.lnx.patch b/net/xmail/patches/020-Makefile.lnx.patch deleted file mode 100644 index 7bda0480c..000000000 --- a/net/xmail/patches/020-Makefile.lnx.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ruaN xmail-1.24.orig/Makefile.lnx xmail-1.24/Makefile.lnx ---- xmail-1.24.orig/Makefile.lnx 2006-12-31 20:03:59.000000000 +0100 -+++ xmail-1.24/Makefile.lnx 2007-02-02 13:11:29.000000000 +0100 -@@ -19,9 +19,9 @@ - # Davide Libenzi - # - SYSTYPE = linux --CC = g++ --LD = g++ --STRIP = strip -+CC = $(CXX) -+LD = $(CXX) -+#STRIP = strip - - ifneq ("$(WITH_SSL_INCLUDE)", "") - CFLAGS := $(CFLAGS) -I$(WITH_SSL_INCLUDE) diff --git a/net/xmail/patches/030-xmail.patch b/net/xmail/patches/030-xmail.patch deleted file mode 100644 index 520b39760..000000000 --- a/net/xmail/patches/030-xmail.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruaN xmail-1.24.orig/xmail xmail-1.24/xmail ---- xmail-1.24.orig/xmail 2006-12-31 20:03:59.000000000 +0100 -+++ xmail-1.24/xmail 2007-02-02 13:14:39.000000000 +0100 -@@ -19,7 +19,7 @@ - test -f $DAEMON || exit 0 - - set -e --ulimit -c 20000 -+ulimit -c 10000 - - start_xmail() - { diff --git a/net/xmail/patches/040-honour_opt_flags.patch b/net/xmail/patches/040-honour_opt_flags.patch deleted file mode 100644 index 5440f321c..000000000 --- a/net/xmail/patches/040-honour_opt_flags.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ruN xmail-1.24-old/Makefile.common xmail-1.24-new/Makefile.common ---- xmail-1.24-old/Makefile.common 2007-09-01 17:30:57.000000000 +0200 -+++ xmail-1.24-new/Makefile.common 2007-09-01 17:34:00.000000000 +0200 -@@ -24,10 +24,10 @@ - endif - - ifeq ($(XMAIL_DEBUG), 1) -- CFLAGS := $(CFLAGS) -O0 -g -+ CFLAGS := -O0 -g $(CFLAGS) - STRIP = touch - else -- CFLAGS := $(CFLAGS) -O2 -+ CFLAGS := -O2 $(CFLAGS) - endif - - OUTDIR = bin diff --git a/utils/fetchmail/Makefile b/utils/fetchmail/Makefile deleted file mode 100644 index d6d0812f5..000000000 --- a/utils/fetchmail/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# $Id$ - -include $(TOPDIR)/rules.mk - -PKG_NAME:=fetchmail -PKG_VERSION:=6.2.5 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://www.catb.org/~esr/fetchmail/ -PKG_MD5SUM:=9956b30139edaa4f5f77c4d0dbd80225 - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - -include $(INCLUDE_DIR)/package.mk - -define Package/fetchmail - SECTION:=utils - CATEGORY:=Utilities - TITLE:=Remote mail retriever - URL:=http://www.catb.org/~esr/fetchmail/ - SUBMENU:=mail -endef - -define Package/fetchmail/description - Retrieves remote mail via POP/IMAP. - Very useful in conjunction with mutt. -endef - -define Build/Configure - $(call Build/Configure/Default, \ - --enable-fallback=procmail \ - --without-hesiod \ - , \ - ac_cv_path_procmail=/usr/sbin/procmail \ - ) -endef - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - all install -endef - -define Package/fetchmail/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fetchmail $(1)/usr/bin/ -endef - -$(eval $(call BuildPackage,fetchmail)) diff --git a/utils/fetchmail/patches/001-amd64_detection.patch b/utils/fetchmail/patches/001-amd64_detection.patch deleted file mode 100644 index 2db43d111..000000000 --- a/utils/fetchmail/patches/001-amd64_detection.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -urN fetchmail-6.2.5/config.sub fetchmail-6.2.5.new/config.sub ---- fetchmail-6.2.5/config.sub 2003-07-17 03:03:20.000000000 +0200 -+++ fetchmail-6.2.5.new/config.sub 2006-03-30 00:36:11.000000000 +0200 -@@ -176,7 +176,7 @@ - | 580 | i960 | h8300 \ - | x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \ - | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ -- | hppa64 \ -+ | hppa64 | x86_64 \ - | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \ - | alphaev6[78] \ - | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \ -@@ -194,7 +194,7 @@ - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. -- i[34567]86) -+ i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. -@@ -209,7 +209,7 @@ - | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ - | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ - | xmp-* | ymp-* \ -- | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \ -+ | x86-* | x86_64-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \ - | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \ - | hppa2.0n-* | hppa64-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \ -@@ -256,6 +256,12 @@ - basic_machine=a29k-none - os=-bsd - ;; -+ amd64) -+ basic_machine=x86_64-pc -+ ;; -+ amd64-*) -+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - amdahl) - basic_machine=580-amdahl - os=-sysv diff --git a/utils/fetchmail/patches/002-no_rej.patch b/utils/fetchmail/patches/002-no_rej.patch deleted file mode 100644 index 64cc7cb7d..000000000 --- a/utils/fetchmail/patches/002-no_rej.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ruN fetchmail-6.2.5-old/po/fr.po.rej fetchmail-6.2.5-new/po/fr.po.rej ---- fetchmail-6.2.5-old/po/fr.po.rej 2003-07-17 03:23:26.000000000 +0200 -+++ fetchmail-6.2.5-new/po/fr.po.rej 1970-01-01 01:00:00.000000000 +0100 -@@ -1,17 +0,0 @@ --*************** --*** 2166,2172 **** -- #: rcfile_y.y:433 -- #, fuzzy, c-format -- msgid "File %s must be a regular file.\n" --- msgstr "Le fichier %s doit etre un lien symbolique.\n" -- -- #: rcfile_y.y:440 -- #, c-format ----- 2166,2172 ---- -- #: rcfile_y.y:433 -- #, fuzzy, c-format -- msgid "File %s must be a regular file.\n" --+ msgstr "Le fichier %s doit être un fichier normal.\n" -- -- #: rcfile_y.y:440 -- #, c-format diff --git a/utils/mutt/Makefile b/utils/mutt/Makefile deleted file mode 100644 index 5bd502472..000000000 --- a/utils/mutt/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# $Id$ - -include $(TOPDIR)/rules.mk - -PKG_NAME:=mutt -PKG_VERSION:=1.5.16 -PKG_RELEASE:=2 - -PKG_SOURCE_URL:=@SF/mutt -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_MD5SUM:=10eff7024dbb7ce1f773d688a69ea9db - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) - -include $(INCLUDE_DIR)/package.mk - -define Package/mutt - SECTION:=utils - CATEGORY:=Utilities - DEPENDS:=+libopenssl +libncurses - TITLE:=Console mail client - URL:=http://www.mutt.org/ - SUBMENU:=mail -endef - -CONFIGURE_ARGS += \ - --includedir=$(PKG_BUILD_DIR)/. \ - --oldincludedir=$(PKG_BUILD_DIR)/. \ - --enable-pop \ - --enable-imap \ - --with-ssl - -define Package/mutt/install - $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_BUILD_DIR)/mutt $(1)/usr/bin/ -endef - -$(eval $(call BuildPackage,mutt)) diff --git a/utils/procmail/Makefile b/utils/procmail/Makefile deleted file mode 100644 index 1e37c645e..000000000 --- a/utils/procmail/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -# $Id$ - -include $(TOPDIR)/rules.mk - -PKG_NAME:=procmail -PKG_VERSION:=3.22 -PKG_RELEASE:=1 - -PKG_SOURCE_URL:=http://www.procmail.org/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_MD5SUM:=1678ea99b973eb77eda4ecf6acae53f1 - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) - -include $(INCLUDE_DIR)/package.mk - -define Package/procmail - SECTION:=utils - CATEGORY:=Utilities - TITLE:=Mail processing tool - URL:=http://www.procmail.org - SUBMENU:=mail -endef - -define Package/procmail/description - Procmail is able to process and classify incoming mail into - different mail boxes. - Very useful in conjunction with mutt. -endef - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR)/src -f ../Makefile.openwrt \ - $(TARGET_CONFIGURE_OPTS) -endef - -define Package/procmail/install - $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_BUILD_DIR)/src/procmail $(1)/usr/bin/ - $(CP) $(PKG_BUILD_DIR)/src/formail $(1)/usr/bin/ -endef - -$(eval $(call BuildPackage,procmail)) diff --git a/utils/procmail/patches/001-procmail_openwrt.patch b/utils/procmail/patches/001-procmail_openwrt.patch deleted file mode 100644 index c33d82605..000000000 --- a/utils/procmail/patches/001-procmail_openwrt.patch +++ /dev/null @@ -1,51 +0,0 @@ -This patch is required to make procmail cross compile - it tries to run some automatic tests which -obviously do not work in a cross compiled environment. - - -diff -Naur procmail-3.22_orig/autoconf.h procmail-3.22/autoconf.h ---- procmail-3.22_orig/autoconf.h 1970-01-01 10:00:00.000000000 +1000 -+++ procmail-3.22/autoconf.h 2006-03-23 12:15:36.000000000 +1100 -@@ -0,0 +1,21 @@ -+/* This file was automagically generated by autoconf */ -+ -+/* 5 moves in 64 steps of size 16384 when reallocing */ -+#define NOpw_class -+#define NOstrlcat -+#define NOsetrgid -+#define MAX_argc 7588 -+/* Your system's strstr() is 1.12 times FASTER than my C-routine */ -+#define UDP_protocolno 17 -+#define BIFF_serviceport "512" -+#define IP_localhost {127,0,0,1} -+#define MAILSPOOLDIR "/var/spool/mail/" -+#define SENDMAIL "/usr/sbin/sendmail" -+#define CF_no_procmail_yet -+#define buggy_SENDMAIL -+#define defPATH "PATH=$HOME/bin:/bin:/usr/bin:/usr/local/bin:/usr/bin/X11" -+#define defSPATH "PATH=/bin:/usr/bin:/usr/local/bin:/usr/bin/X11" -+#define PM_VERSION "3.22" -+/* Hotwire LOCKINGTEST=100 */ -+/* Procmail will lock via: dotlocking, fcntl() */ -+/* autoconf completed */ -diff -Naur procmail-3.22_orig/Makefile.openwrt procmail-3.22/Makefile.openwrt ---- procmail-3.22_orig/Makefile.openwrt 1970-01-01 10:00:00.000000000 +1000 -+++ procmail-3.22/Makefile.openwrt 2006-03-23 12:15:36.000000000 +1100 -@@ -0,0 +1,18 @@ -+PM_OBJ=cstdio.o common.o exopen.o goodies.o locking.o \ -+ mailfold.o foldinfo.o misc.o pipes.o regexp.o robust.o \ -+ sublib.o acommon.o mcommon.o lastdirsep.o authenticate.o \ -+ lmtp.o memblk.o variables.o from.o comsat.o -+ -+FM_OBJ=common.o fields.o formisc.o sublib.o ecommon.o \ -+ acommon.o -+ -+LDFLAGS = -lm -lnsl -ldl -lc -+CFLAGS = -Os -DPROCMAIL -+ -+all: procmail formail -+ -+procmail: procmail.o $(PM_OBJ) -+ $(CC) $(CFLAGS) $@.o $(PM_OBJ) -o $@ $(LDFLAGS) -+ -+formail: formail.o $(FM_OBJ) -+ $(CC) $(CFLAGS) $@.o $(FM_OBJ) -o $@ $(LDFLAGS)