]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
Hinzugefügt:
authorms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Thu, 29 Jun 2006 20:38:22 +0000 (20:38 +0000)
committerms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Thu, 29 Jun 2006 20:38:22 +0000 (20:38 +0000)
  * Kernel trägt den Namen ipfire.
  * Perl-Modul für Spamassassin
  * Web-Cyradm
Geändert:
  * Postfix kompilierte nicht mit SASL2-Support
  * GLIB ohne NLS.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@184 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

19 files changed:
config/cyrusimap/cyrus.conf
config/cyrusimap/imapd.conf
config/postfix/aliases
doc/packages-list.txt
lfs/Text-Tabs+Wrap [new file with mode: 0644]
lfs/configroot
lfs/cyrusimap
lfs/glib
lfs/linux
lfs/postfix
lfs/web-cyradm [new file with mode: 0644]
make.sh
src/ROOTFILES.i386
src/paks/cyrusimap/install.sh
src/paks/spamassassin/ROOTFILES
src/paks/web-cyradm/ROOTFILES [new file with mode: 0644]
src/paks/web-cyradm/install.sh [new file with mode: 0644]
src/paks/web-cyradm/uninstall.sh [new file with mode: 0644]
src/patches/linux-2.4.31-ipfire.patch [new file with mode: 0644]

index d9adbd9d03ad663ab038039bb0bcceaf6578d440..f8c58e7849c408283c48b75518faaedf8a382e99 100644 (file)
@@ -3,7 +3,7 @@ START {
   recover       cmd="ctl_cyrusdb -r"
 
   # this is only necessary if using idled for IMAP IDLE
-#  idled                cmd="idled"
+  idled                cmd="idled"
 }
 
 # UNIX sockets start with a slash and are put into /var/imap/socket
index d7b8ece9c7de1c814832f28ff448d9b33a88320e..9c73979814d94975e9ae75c9d2cb1d5f11a24b6d 100644 (file)
@@ -6,9 +6,7 @@ allowanonymouslogin: no
 allowplaintext: yes
 sasl_mech_list: PLAIN
 servername: localhost
-autocreatequota: 10000
-autocreateinboxfolders: INBOX | INBOX.Trash | INBOX.Sent | INBOX.Drafts
-autosubscribeinboxfolders: INBOX | INBOX.Trash | INBOX.Sent | INBOX.Drafts
+autocreatequota: 20000
 reject8bit: no
 quotawarn: 90
 timeout: 30
index 6738a155da4baadbbc227f8ce925c4fe2fc4d6a9..07d432a9fd79fc32f76889fa1dbcc29914d97f6c 100644 (file)
@@ -1,218 +1,7 @@
-#
-# Sample aliases file. Install in the location as specified by the
-# output from the command "postconf alias_maps". Typical path names
-# are /etc/aliases or /etc/mail/aliases.
-#
-#      >>>>>>>>>>      The program "newaliases" must be run after
-#      >> NOTE >>      this file is updated for any changes to
-#      >>>>>>>>>>      show through to Postfix.
-#
+# Begin /etc/aliases
 
-# Person who should get root's mail. Don't receive mail as root!
-#root:         you
+MAILER-DAEMON     postmaster
+postmaster        root
 
-# Basic system aliases -- these MUST be present
-MAILER-DAEMON: postmaster
-postmaster:    root
-
-# General redirections for pseudo accounts
-bin:           root
-daemon:                root
-named:         root
-nobody:                root
-uucp:          root
-www:           root
-ftp-bugs:      root
-postfix:       root
-
-# Put your local aliases here.
-
-# Well-known aliases
-manager:       root
-dumper:                root
-operator:      root
-abuse:         postmaster
-
-# trap decode to catch security attacks
-decode:                root
-
-# ALIASES(5)                                             ALIASES(5)
-# 
-# NAME
-#        aliases - Postfix local alias database format
-# 
-# SYNOPSIS
-#        newaliases
-# 
-# DESCRIPTION
-#        The  aliases(5)  table provides a system-wide mechanism to
-#        redirect mail for local recipients. The  redirections  are
-#        processed by the Postfix local(8) delivery agent.
-# 
-#        Normally, the aliases(5) table is specified as a text file
-#        that serves as input  to  the  postalias(1)  command.  The
-#        result,  an  indexed file in dbm or db format, is used for
-#        fast lookup  by  the  mail  system.  Execute  the  command
-#        newaliases  in  order  to  rebuild  the indexed file after
-#        changing the Postfix alias database.
-# 
-#        The input and output file formats are expected to be  com-
-#        patible  with  Sendmail  version 8, and are expected to be
-#        suitable for the use as NIS maps.
-# 
-#        Users can control delivery of their own mail by setting up
-#        .forward files in their home directory.  Lines in per-user
-#        .forward files have the same syntax as the right-hand side
-#        of aliases(5) entries.
-# 
-#        The format of the alias database input file is as follows:
-# 
-#        o      An alias definition has the form
-# 
-#                    name: value1, value2, ...
-# 
-#        o      Empty lines and whitespace-only lines are  ignored,
-#               as  are  lines whose first non-whitespace character
-#               is a `#'.
-# 
-#        o      A logical line starts with non-whitespace  text.  A
-#               line  that starts with whitespace continues a logi-
-#               cal line.
-# 
-#        The name is a local address (no domain part).  Use  double
-#        quotes  when the name contains any special characters such
-#        as whitespace, `#', `:', or `@'. The  name  is  folded  to
-#        lowercase, in order to make database lookups case insensi-
-#        tive.
-# 
-#        In addition, when an alias exists for owner-name, delivery
-#        diagnostics  are  directed  to that address, instead of to
-#        the originator.  This is typically used to direct delivery
-#        errors  to the owner of a mailing list, who is in a better
-#        position to deal with mailing list delivery problems  than
-#        the originator of the undelivered mail.
-# 
-#        The value contains one or more of the following:
-# 
-#        address
-#               Mail  is  forwarded to address, which is compatible
-#               with the RFC 822 standard.
-# 
-#        /file/name
-#               Mail is appended to /file/name.  See  local(8)  for
-#               details  of delivery to file.  Delivery is not lim-
-#               ited to regular files.  For example, to dispose  of
-#               unwanted mail, deflect it to /dev/null.
-# 
-#        |command
-#               Mail  is  piped into command. Commands that contain
-#               special characters, such as whitespace,  should  be
-#               enclosed  between  double  quotes. See local(8) for
-#               details of delivery to command.
-# 
-#               When the command fails, a limited amount of command
-#               output  is  mailed  back  to  the sender.  The file
-#               /usr/include/sysexits.h defines the  expected  exit
-#               status  codes. For example, use |"exit 67" to simu-
-#               late a "user  unknown"  error,  and  |"exit  0"  to
-#               implement an expensive black hole.
-# 
-#        :include:/file/name
-#               Mail  is  sent  to  the  destinations listed in the
-#               named file.  Lines in :include: files have the same
-#               syntax as the right-hand side of alias entries.
-# 
-#               A  destination  can  be  any  destination  that  is
-#               described in this manual page. However, delivery to
-#               "|command" and /file/name is disallowed by default.
-#               To  enable,  edit  the  allow_mail_to_commands  and
-#               allow_mail_to_files configuration parameters.
-# 
-# ADDRESS EXTENSION
-#        When alias database search fails, and the recipient local-
-#        part contains  the  optional  recipient  delimiter  (e.g.,
-#        user+foo),  the  search  is  repeated  for  the unextended
-#        address (e.g., user).
-# 
-#        The  propagate_unmatched_extensions   parameter   controls
-#        whether  an  unmatched  address extension (+foo) is propa-
-#        gated to the result of table lookup.
-# 
-# SECURITY
-#        The local(8) delivery agent disallows  regular  expression
-#        substitution  of $1 etc. in alias_maps, because that would
-#        open a security hole.
-# 
-#        The local(8) delivery agent will silently ignore  requests
-#        to  use  the proxymap(8) server within alias_maps. Instead
-#        it will open the table directly.  Before  Postfix  version
-#        2.2,  the  local(8)  delivery  agent will terminate with a
-#        fatal error.
-# 
-# CONFIGURATION PARAMETERS
-#        The following main.cf parameters are especially  relevant.
-#        The  text  below  provides  only  a parameter summary. See
-#        postconf(5) for more details including examples.
-# 
-#        alias_database
-#               List of alias databases that  are  updated  by  the
-#               newaliases(1) command.
-# 
-#        alias_maps
-#               List  of  alias  databases  queried by the local(8)
-#               delivery agent.
-# 
-#        allow_mail_to_commands
-#               Restrict the usage of  mail  delivery  to  external
-#               command.
-# 
-#        allow_mail_to_files
-#               Restrict  the  usage  of  mail delivery to external
-#               file.
-# 
-#        expand_owner_alias
-#               When delivering to an alias that has an owner- com-
-#               panion  alias,  set  the envelope sender address to
-#               the right-hand side of  the  owner  alias,  instead
-#               using of the left-hand side address.
-# 
-#        propagate_unmatched_extensions
-#               A  list  of  address rewriting or forwarding mecha-
-#               nisms that propagate an address extension from  the
-#               original  address  to  the  result. Specify zero or
-#               more  of  canonical,   virtual,   alias,   forward,
-#               include, or generic.
-# 
-#        owner_request_special
-#               Give  special treatment to owner-listname and list-
-#               name-request addresses.
-# 
-#        recipient_delimiter
-#               Delimiter that separates  recipients  from  address
-#               extensions.
-# 
-# STANDARDS
-#        RFC 822 (ARPA Internet Text Messages)
-# 
-# SEE ALSO
-#        local(8), local delivery agent
-#        newaliases(1), create/update alias database
-#        postalias(1), create/update alias database
-#        postconf(5), configuration parameters
-# 
-# README FILES
-#        Use  "postconf  readme_directory" or "postconf html_direc-
-#        tory" to locate this information.
-#        DATABASE_README, Postfix lookup table overview
-# 
-# LICENSE
-#        The Secure Mailer license must be  distributed  with  this
-#        software.
-# 
-# AUTHOR(S)
-#        Wietse Venema
-#        IBM T.J. Watson Research
-#        P.O. Box 704
-#        Yorktown Heights, NY 10598, USA
-# 
-#                                                        ALIASES(5)
+root              LOGIN
+# End /etc/aliases
index 8fea85b3c89c49a45f178616ac55a2e037993e3e..3cfdc4ca7b428760694f506752545ba3ad176929 100644 (file)
@@ -26,6 +26,7 @@
   * Net-Server-0.93
   * Net_SSLeay.pm-1.25
   * Python-2.3.4
+  * Text-Tabs+Wrap-2005.0824
   * URI-1.35
   * Unix-Syslog-0.100
   * amavisd-new-2.4.1
@@ -55,7 +56,6 @@
   * cups-1.1.23-source
   * cxacru-2003-10-05
   * cyrus-imapd-2.2.12
-  * cyrus-imapd-2.2.13
   * cyrus-sasl-2.1.21
   * cyrus-sasl-2.1.21-ldap
   * db-4.4.20
@@ -94,6 +94,7 @@
   * gdbm-1.8.3
   * gettext-0.14.1
   * glib-2.9.6
+  * glib-2.9.6_old
   * glibc-2.3.3-lfs-5.1
   * gmp-4.1.2
   * gnump3d-2.9.8
   * popt-1.7
   * portmap_5beta
   * postfix-2.2.10
+  * postfix-2.2.10_old
   * ppp-2.4.2
   * pptp-1.6.0
   * procinfo-18
   * util-linux-2.12r
   * vim-6.3
   * vlan.1.9
+  * web-cyradm-0.5.5-CVS-for-ipfire
   * wget-1.10.2
   * wput-0.6
   * xampp-linux-1.5.3a
diff --git a/lfs/Text-Tabs+Wrap b/lfs/Text-Tabs+Wrap
new file mode 100644 (file)
index 0000000..009b8c4
--- /dev/null
@@ -0,0 +1,79 @@
+###############################################################################
+# This file is part of the IPCop Firewall.                                    #
+#                                                                             #
+# IPCop is free software; you can redistribute it and/or modify               #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation; either version 2 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# IPCop is distributed in the hope that it will be useful,                    #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with IPCop; if not, write to the Free Software                        #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
+#                                                                             #
+# Makefiles are based on LFSMake, which is                                    #
+# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 2005.0824
+
+THISAPP    = Text-Tabs+Wrap-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 99c061630027de809beca99d0b71f689
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && perl Makefile.PL
+       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
index 4287110d4541e4685d483c09111fb09acdec5c6b..978ccc36698ba75c426bfd34bfcaa78c39c82f5c 100644 (file)
@@ -62,7 +62,7 @@ $(TARGET) :
            dhcp/fixleases dhcp/advoptions dmzholes/config ethernet/aliases ethernet/settings \
            isdn/settings main/hosts main/settings optionsfw/settings pakfire/settings patches/available patches/installed \
            portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
-           ppp/settings-5 ppp/settings proxy/settings remote/settings qos/settings \
+           ppp/settings-5 ppp/settings proxy/settings remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
            snort/settings vpn/config vpn/settings vpn/ipsec.conf \
            vpn/ipsec.secrets vpn/caconfig wireless/config wireless/settings; do \
                touch $(CONFIG_ROOT)/$$i; \
index a8059a815d7722ff10d8ce8596be62efe6b3e416..3b0aecad9e23a66b52e4b24ecf3574fa461c235d 100644 (file)
@@ -89,7 +89,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-acceptinvalidfrom.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-2.3.3-deleteacl_invalid_identifier_fix.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-notify_sms.patch
-       cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-gcc4.patch
+       cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-gcc4.patch
        cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/timsieved_reset_sasl_conn.patch
        cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/allow_auth_plain_proxying.patch
        cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/authid_normalize.patch
@@ -115,12 +115,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        -mkdir /usr/sieve
        chown cyrus:mail /usr/sieve
        chmod 750 /usr/sieve
-       -mkdir -p /var/ipfire/cyrusimap
+       -mkdir /var/ipfire/cyrusimap
        cp -f $(DIR_SRC)/config/cyrusimap/* /var/ipfire/cyrusimap
        cp -f $(DIR_APP)/tools/mkimap /usr/bin
        sudo -u cyrus /usr/bin/mkimap /var/ipfire/cyrusimap/imapd.conf
        chown cyrus.mail /var/imap/socket
-       # Wenn das Dateisystem ext2 wäre...
+       # Wenn das Dateisystem ext2 waere...
        # cd /var/imap && chattr +S user quota user/* quota/* && chattr +S /var/spool/imap /var/spool/imap/*
        @rm -rf $(DIR_APP) /usr/include/com_err.h
        @$(POSTBUILD)
index 4a2158e61ba397005b07cf35e470ff6334c1aeb2..0e7fc99dc357438845b7f7c56f1ea702975bfdaf 100644 (file)
--- a/lfs/glib
+++ b/lfs/glib
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -36,7 +30,7 @@ VER        = 2.9.6
 
 THISAPP    = glib-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = ftp://ftp.gtk.org/pub/gtk/v2.9
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -58,9 +52,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-#dist: 
-#      make-packages.sh glib $(THISAPP)
-
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -81,7 +72,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr
+       cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
index c1d4fb10b4fc5801b8be3b7eff8c041e69bcc4d2..32c794cad21f4821db22f536e553ff6128cc4ff7 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -156,6 +156,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # ip_conntrack permissions from 440 to 444
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ip_conntrack_standalone-patch-for-ipfire.patch
 
+       # give kernel the name ipfire
+       cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/linux-2.4.31-ipfire.patch
+
 ifeq "$(SMP)" ""
        # Only do this once on the non-SMP pass
        cd $(DIR_SRC) && tar czf $(DIR_DL)/iptables-fixed.tar.gz iptables-1.3.5
index 3bce5044d6a6de7197801980b5064eeca68f948a..f9ddba0f4cb0a0340d0366bbf8c9f2d7b421cf17 100644 (file)
@@ -78,14 +78,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && make -f Makefile.init makefiles \
-                               'CCARGS=-DDEF_DAEMON_DIR=\"/usr/lib/postfix\" \
-                               -DDEF_MANPAGE_DIR=\"/usr/share/man\" \
-                               -DUSE_TLS -I/usr/include/openssl \
-                               -DUSE_SALS_AUTH -I/usr/include/sasl \
-                               -I/opt/lampp/include \
-                               -DHAS_MYSQL -I/opt/lampp/include/mysql' \
-                               'AUXLIBS=-L/usr/lib -lz -lm  -lssl -lcrypto \
-                               -lmysqlclient -L/opt/lampp/lib/mysql -lsasl2 -L/opt/lampp/lib'
+                               'CCARGS=-DDEF_DAEMON_DIR=\"/usr/lib/postfix\" -DDEF_MANPAGE_DIR=\"/usr/share/man\" -DUSE_TLS -I/usr/include/openssl -DUSE_SALS_AUTH -I/usr/include/sasl -I/opt/lampp/include -DHAS_MYSQL -I/opt/lampp/include/mysql' \
+                               'AUXLIBS=-L/usr/lib -L/usr/lib/sasl2 -lz -lm  -lssl -lcrypto -lmysqlclient -L/opt/lampp/lib/mysql -lsasl2 -L/opt/lampp/lib'
        cd $(DIR_APP) && make
        cd $(DIR_APP) && sh postfix-install -non-interactive
        ## Install configuration
@@ -93,4 +87,4 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cp -vf $(DIR_CONF)/postfix/* /etc/postfix
        mv -vf /etc/postfix/aliases /etc/aliases
        @rm -rf $(DIR_APP)
-       @$(POSTBUILD)
\ No newline at end of file
+       @$(POSTBUILD)
diff --git a/lfs/web-cyradm b/lfs/web-cyradm
new file mode 100644 (file)
index 0000000..31c603e
--- /dev/null
@@ -0,0 +1,83 @@
+###############################################################################
+# This file is part of the IPCop Firewall.                                    #
+#                                                                             #
+# IPCop is free software; you can redistribute it and/or modify               #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation; either version 2 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# IPCop is distributed in the hope that it will be useful,                    #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with IPCop; if not, write to the Free Software                        #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
+#                                                                             #
+# Makefiles are based on LFSMake, which is                                    #
+# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 0.5.5-CVS-for-ipfire
+
+THISAPP    = web-cyradm-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = web-cyradm
+PAK_VER    = ipfire-beta1
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE) mail-db-mysql.tar.gz
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+mail-db-mysql.tar.gz = $(DL_FROM)/mail-db-mysql.tar.gz
+
+$(DL_FILE)_MD5 = 4764e91fd422edc9bbe9d63ed9f07d01
+mail-db-mysql.tar.gz_MD5 = 789ebf5ab48a430c77ca7c1a47a04281
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -C /opt/lampp/htdocs
+       cd $(DIR_SRC) && tar zxf $(DIR_DL)/mail-db-mysql.tar.gz -C /opt/lampp/var/mysql
+       @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index d31bb13a190f6d978a09979044059387c3fad0ee..9dbea0d9d3cb98a960a5736b8c6178411b49b3b4 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -637,6 +637,7 @@ buildipcop() {
   ipcopmake Convert-UUlib
   ipcopmake Archive-Tar
   ipcopmake Archive-Zip
+  ipcopmake Text-Tabs+Wrap
   ipcopmake Locale-Country
   ipcopmake GeoIP
   ipcopmake fwhits
@@ -702,11 +703,12 @@ buildipcop() {
   ipcopmake procmail
   ipcopmake fetchmail
   ipcopmake cyrusimap
+  ipcopmake web-cyradm
   ipcopmake mailx
   ipcopmake clamav
   ipcopmake razor
   ipcopmake spamassassin
-  ipcopmake amavisd
+#  ipcopmake amavisd
   echo -ne "`date -u '+%b %e %T'`: Building ### VoIP-Server ### \n" | tee -a $LOGFILE
   ipcopmake stund
   ipcopmake asterisk
@@ -859,6 +861,7 @@ ipfirepackages() {
   ipfiredist procmail
   ipfiredist samba
   ipfiredist spamassassin
+  ipfiredist web-cyradm
   ipfiredist xampp
   ipfiredist xinetd
   test -d $BASEDIR/packages || mkdir $BASEDIR/packages
@@ -978,7 +981,6 @@ newpak)
                cp $BASEDIR/lfs/postfix $BASEDIR/lfs/$2
 
                touch ROOTFILES
-               touch CONFFILES
                touch {,un}install.sh
        ## install.sh
                echo '#!/bin/bash' > install.sh
index e4ab441a0409999a1c5a312b03e9f26cfb86d030..7da8d788ae60e2ecd8647ba58e436e6ad1878596 100644 (file)
@@ -26698,6 +26698,8 @@ usr/lib/perl5/site_perl/5.8.5/IO/WrapTie.pm
 #usr/share/man/man3/IO::Stringy.3
 #usr/share/man/man3/IO::Wrap.3
 #usr/share/man/man3/IO::WrapTie.3
+usr/lib/perl5/5.8.5/i386-linux/auto/Text
+#usr/lib/perl5/5.8.5/i386-linux/auto/Text/.packlist
 ##
 ## htop
 ##
index 3a9ce551bfec4c48fea6d4d5c4ef4b35eb5d518c..11b2c421a8a92645b21985ac88bd0af3c78b0207 100644 (file)
@@ -6,6 +6,22 @@
 #                                                               #
 #################################################################
 #
+CONFIGDIR=/var/ipfire/cyrusimap
+#
 # Extract the files
 tar xfz files.tgz -C /
 cp -f ROOTFILES /opt/pakfire/installed/ROOTFILES.$2
+
+
+
+if [ ! -f $CONFIGDIR/server.pm ]; then
+       cd /tmp && openssl req -new -nodes -out req.pem -keyout key.pem
+       cd /tmp && openssl rsa -in key.pem -out new.key.pem
+       cd /tmp && openssl x509 -in req.pem -out ca-cert -req -signkey new.key.pem -days 999
+       
+       cd /tmp && cp new.key.pem $CONFIGDIR/server.pem
+       cd /tmp && rm new.key.pem
+       cd /tmp && cat ca-cert >> $CONFIGDIR/server.pem
+       chown cyrus:mail $CONFIGDIR/server.pem
+       chmod 600 $CONFIGDIR/server.pem # Your key should be protected
+fi
index e547c6408e9ad190a727078ca7e246ab37bafb8d..e4ce75a2821657167fba434be30fc2b1c167e193 100644 (file)
@@ -90,7 +90,7 @@ usr/lib/perl5/site_perl/5.8.5/Mail/SpamAssassin/Util.pm
 usr/lib/perl5/site_perl/5.8.5/Mail/SpamAssassin/Util/DependencyInfo.pm
 usr/lib/perl5/site_perl/5.8.5/Mail/SpamAssassin/Util/Progress.pm
 usr/lib/perl5/site_perl/5.8.5/Mail/SpamAssassin/Util/RegistrarBoundaries.pm
-#usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/Mail/SpamAssassin
+usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/Mail/SpamAssassin
 #usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/Mail/SpamAssassin/.packlist
 usr/lib/perl5/site_perl/5.8.5/spamassassin-run.pod
 #usr/share/man/man1/sa-learn.1
@@ -197,4 +197,18 @@ usr/share/spamassassin/60_whitelist_subject.cf
 usr/share/spamassassin/languages
 usr/share/spamassassin/sa-update-pubkey.txt
 usr/share/spamassassin/triplets.txt
-usr/share/spamassassin/user_prefs.template
\ No newline at end of file
+usr/share/spamassassin/user_prefs.template
+usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/Digest/SHA1/SHA1.so
+usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/Digest/SHA1/SHA1.bs
+usr/lib/perl5/5.8.5/IPC
+usr/lib/perl5/5.8.5/Text
+usr/lib/perl5/site_perl/5.8.5/i386-linux/HTML
+usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/HTML/Parser/Parser.bs
+usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/HTML/Parser/Parser.so
+usr/lib/perl5/5.8.5/Pod/Usage.pm
+usr/lib/perl5/5.8.5/Pod/Text
+usr/lib/perl5/5.8.5/Pod/Text.pm
+usr/lib/perl5/5.8.5/Pod/ParseLink.pm
+usr/lib/perl5/5.8.5/Pod/Select.pm
+usr/lib/perl5/5.8.5/Pod/Parser.pm
+usr/lib/perl5/5.8.5/Pod/InputObjects.pm
diff --git a/src/paks/web-cyradm/ROOTFILES b/src/paks/web-cyradm/ROOTFILES
new file mode 100644 (file)
index 0000000..d1cedd1
--- /dev/null
@@ -0,0 +1,471 @@
+#opt/lampp/htdocs/web-cyradm
+#opt/lampp/htdocs/web-cyradm/.cvsignore
+#opt/lampp/htdocs/web-cyradm/COPYRIGHT
+#opt/lampp/htdocs/web-cyradm/CVS
+#opt/lampp/htdocs/web-cyradm/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/CVS/Entries.Log
+#opt/lampp/htdocs/web-cyradm/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/CVS/Root
+#opt/lampp/htdocs/web-cyradm/ChangeLog
+#opt/lampp/htdocs/web-cyradm/INSTALL
+#opt/lampp/htdocs/web-cyradm/README
+#opt/lampp/htdocs/web-cyradm/README.translations
+#opt/lampp/htdocs/web-cyradm/TO-BE-DONE
+opt/lampp/htdocs/web-cyradm/adminuser.php
+opt/lampp/htdocs/web-cyradm/aliases.php
+opt/lampp/htdocs/web-cyradm/auth.inc.php
+opt/lampp/htdocs/web-cyradm/browse.php
+opt/lampp/htdocs/web-cyradm/browseaccounts.php
+opt/lampp/htdocs/web-cyradm/catchall.php
+opt/lampp/htdocs/web-cyradm/change_password.php
+opt/lampp/htdocs/web-cyradm/changeadminpasswd.php
+#opt/lampp/htdocs/web-cyradm/config
+#opt/lampp/htdocs/web-cyradm/config/.cvsignore
+#opt/lampp/htdocs/web-cyradm/config/CVS
+#opt/lampp/htdocs/web-cyradm/config/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/config/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/config/CVS/Root
+opt/lampp/htdocs/web-cyradm/config/conf.php
+#opt/lampp/htdocs/web-cyradm/css
+#opt/lampp/htdocs/web-cyradm/css/CVS
+#opt/lampp/htdocs/web-cyradm/css/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/css/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/css/CVS/Root
+opt/lampp/htdocs/web-cyradm/css/default.css
+opt/lampp/htdocs/web-cyradm/css/green.css
+opt/lampp/htdocs/web-cyradm/delete_catchall.php
+opt/lampp/htdocs/web-cyradm/deleteaccount.php
+opt/lampp/htdocs/web-cyradm/deleteadminuser.php
+opt/lampp/htdocs/web-cyradm/deletealias.php
+opt/lampp/htdocs/web-cyradm/deletedomain.php
+opt/lampp/htdocs/web-cyradm/deleteemail.php
+opt/lampp/htdocs/web-cyradm/display.php
+#opt/lampp/htdocs/web-cyradm/doc
+#opt/lampp/htdocs/web-cyradm/doc/CVS
+#opt/lampp/htdocs/web-cyradm/doc/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/doc/CVS/Entries.Log
+#opt/lampp/htdocs/web-cyradm/doc/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/doc/CVS/Root
+#opt/lampp/htdocs/web-cyradm/doc/Postfix-Cyrus-Web-cyradm-HOWTO.sgml
+#opt/lampp/htdocs/web-cyradm/doc/Postfix-Cyrus-Web-cyradm-HOWTO.txt
+#opt/lampp/htdocs/web-cyradm/doc/html
+#opt/lampp/htdocs/web-cyradm/doc/html/CVS
+#opt/lampp/htdocs/web-cyradm/doc/html/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/doc/html/CVS/Entries.Log
+#opt/lampp/htdocs/web-cyradm/doc/html/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/doc/html/CVS/Root
+#opt/lampp/htdocs/web-cyradm/doc/html/HTML.manifest
+#opt/lampp/htdocs/web-cyradm/doc/html/big-picture.png
+#opt/lampp/htdocs/web-cyradm/doc/html/cyrus-config.html
+#opt/lampp/htdocs/web-cyradm/doc/html/docbook.css
+#opt/lampp/htdocs/web-cyradm/doc/html/faq.html
+#opt/lampp/htdocs/web-cyradm/doc/html/home.png
+#opt/lampp/htdocs/web-cyradm/doc/html/imap-account.png
+#opt/lampp/htdocs/web-cyradm/doc/html/imap-tls.png
+#opt/lampp/htdocs/web-cyradm/doc/html/index.html
+#opt/lampp/htdocs/web-cyradm/doc/html/install.html
+#opt/lampp/htdocs/web-cyradm/doc/html/installing-anti-spam.html
+#opt/lampp/htdocs/web-cyradm/doc/html/intro.html
+#opt/lampp/htdocs/web-cyradm/doc/html/moreinfo.html
+#opt/lampp/htdocs/web-cyradm/doc/html/mysql-config.html
+#opt/lampp/htdocs/web-cyradm/doc/html/pam-config.html
+#opt/lampp/htdocs/web-cyradm/doc/html/postfix-config.html
+#opt/lampp/htdocs/web-cyradm/doc/html/spam-and-virus-intro.html
+#opt/lampp/htdocs/web-cyradm/doc/html/stylesheet-images
+#opt/lampp/htdocs/web-cyradm/doc/html/stylesheet-images/CVS
+#opt/lampp/htdocs/web-cyradm/doc/html/stylesheet-images/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/doc/html/stylesheet-images/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/doc/html/stylesheet-images/CVS/Root
+#opt/lampp/htdocs/web-cyradm/doc/html/stylesheet-images/caution.gif
+#opt/lampp/htdocs/web-cyradm/doc/html/stylesheet-images/home.gif
+#opt/lampp/htdocs/web-cyradm/doc/html/stylesheet-images/important.gif
+#opt/lampp/htdocs/web-cyradm/doc/html/stylesheet-images/next.gif
+#opt/lampp/htdocs/web-cyradm/doc/html/stylesheet-images/note.gif
+#opt/lampp/htdocs/web-cyradm/doc/html/stylesheet-images/prev.gif
+#opt/lampp/htdocs/web-cyradm/doc/html/stylesheet-images/tip.gif
+#opt/lampp/htdocs/web-cyradm/doc/html/stylesheet-images/toc-blank.gif
+#opt/lampp/htdocs/web-cyradm/doc/html/stylesheet-images/toc-minus.gif
+#opt/lampp/htdocs/web-cyradm/doc/html/stylesheet-images/toc-plus.gif
+#opt/lampp/htdocs/web-cyradm/doc/html/stylesheet-images/up.gif
+#opt/lampp/htdocs/web-cyradm/doc/html/stylesheet-images/warning.gif
+#opt/lampp/htdocs/web-cyradm/doc/html/t1.html
+#opt/lampp/htdocs/web-cyradm/doc/html/tech.html
+#opt/lampp/htdocs/web-cyradm/doc/html/test.html
+#opt/lampp/htdocs/web-cyradm/doc/html/web-cyradm-config.html
+#opt/lampp/htdocs/web-cyradm/doc/web-cyradm-redhat.txt
+opt/lampp/htdocs/web-cyradm/editaccount.php
+opt/lampp/htdocs/web-cyradm/editadminuser.php
+opt/lampp/htdocs/web-cyradm/editalias.php
+opt/lampp/htdocs/web-cyradm/editdomain.php
+opt/lampp/htdocs/web-cyradm/editemail.php
+opt/lampp/htdocs/web-cyradm/editservices.php
+opt/lampp/htdocs/web-cyradm/failed.php
+opt/lampp/htdocs/web-cyradm/footer.inc.php
+opt/lampp/htdocs/web-cyradm/forwardaccount.php
+opt/lampp/htdocs/web-cyradm/forwardalias.php
+opt/lampp/htdocs/web-cyradm/header.inc.php
+#opt/lampp/htdocs/web-cyradm/images
+#opt/lampp/htdocs/web-cyradm/images/CVS
+#opt/lampp/htdocs/web-cyradm/images/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/images/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/images/CVS/Root
+opt/lampp/htdocs/web-cyradm/images/arrow_sort_desc.png
+opt/lampp/htdocs/web-cyradm/images/banner.gif
+opt/lampp/htdocs/web-cyradm/images/checked.png
+opt/lampp/htdocs/web-cyradm/images/false.png
+opt/lampp/htdocs/web-cyradm/index.php
+opt/lampp/htdocs/web-cyradm/init.php
+#opt/lampp/htdocs/web-cyradm/lib
+#opt/lampp/htdocs/web-cyradm/lib/CVS
+#opt/lampp/htdocs/web-cyradm/lib/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/lib/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/lib/CVS/Root
+opt/lampp/htdocs/web-cyradm/lib/crypto.php
+opt/lampp/htdocs/web-cyradm/lib/cyradm.php
+opt/lampp/htdocs/web-cyradm/lib/log.php
+opt/lampp/htdocs/web-cyradm/lib/nls.php
+opt/lampp/htdocs/web-cyradm/lib/poppassd.php
+opt/lampp/htdocs/web-cyradm/lib/sieve-php.lib
+opt/lampp/htdocs/web-cyradm/lib/sieve_strs.php
+#opt/lampp/htdocs/web-cyradm/locale
+#opt/lampp/htdocs/web-cyradm/locale/CVS
+#opt/lampp/htdocs/web-cyradm/locale/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/CVS/Entries.Log
+#opt/lampp/htdocs/web-cyradm/locale/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/CVS/Root
+#opt/lampp/htdocs/web-cyradm/locale/cs
+#opt/lampp/htdocs/web-cyradm/locale/cs/CVS
+#opt/lampp/htdocs/web-cyradm/locale/cs/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/cs/CVS/Entries.Log
+#opt/lampp/htdocs/web-cyradm/locale/cs/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/cs/CVS/Root
+#opt/lampp/htdocs/web-cyradm/locale/cs/LC_MESSAGES
+#opt/lampp/htdocs/web-cyradm/locale/cs/LC_MESSAGES/CVS
+#opt/lampp/htdocs/web-cyradm/locale/cs/LC_MESSAGES/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/cs/LC_MESSAGES/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/cs/LC_MESSAGES/CVS/Root
+opt/lampp/htdocs/web-cyradm/locale/cs/LC_MESSAGES/web-cyradm.mo
+opt/lampp/htdocs/web-cyradm/locale/cs/LC_MESSAGES/web-cyradm.po
+#opt/lampp/htdocs/web-cyradm/locale/da
+#opt/lampp/htdocs/web-cyradm/locale/da/CVS
+#opt/lampp/htdocs/web-cyradm/locale/da/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/da/CVS/Entries.Log
+#opt/lampp/htdocs/web-cyradm/locale/da/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/da/CVS/Root
+#opt/lampp/htdocs/web-cyradm/locale/da/LC_MESSAGES
+#opt/lampp/htdocs/web-cyradm/locale/da/LC_MESSAGES/CVS
+#opt/lampp/htdocs/web-cyradm/locale/da/LC_MESSAGES/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/da/LC_MESSAGES/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/da/LC_MESSAGES/CVS/Root
+opt/lampp/htdocs/web-cyradm/locale/da/LC_MESSAGES/web-cyradm.mo
+opt/lampp/htdocs/web-cyradm/locale/da/LC_MESSAGES/web-cyradm.po
+#opt/lampp/htdocs/web-cyradm/locale/de
+#opt/lampp/htdocs/web-cyradm/locale/de/CVS
+#opt/lampp/htdocs/web-cyradm/locale/de/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/de/CVS/Entries.Log
+#opt/lampp/htdocs/web-cyradm/locale/de/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/de/CVS/Root
+#opt/lampp/htdocs/web-cyradm/locale/de/LC_MESSAGES
+#opt/lampp/htdocs/web-cyradm/locale/de/LC_MESSAGES/CVS
+#opt/lampp/htdocs/web-cyradm/locale/de/LC_MESSAGES/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/de/LC_MESSAGES/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/de/LC_MESSAGES/CVS/Root
+opt/lampp/htdocs/web-cyradm/locale/de/LC_MESSAGES/web-cyradm.mo
+opt/lampp/htdocs/web-cyradm/locale/de/LC_MESSAGES/web-cyradm.po
+#opt/lampp/htdocs/web-cyradm/locale/en
+#opt/lampp/htdocs/web-cyradm/locale/en/CVS
+#opt/lampp/htdocs/web-cyradm/locale/en/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/en/CVS/Entries.Log
+#opt/lampp/htdocs/web-cyradm/locale/en/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/en/CVS/Root
+#opt/lampp/htdocs/web-cyradm/locale/en/LC_MESSAGES
+#opt/lampp/htdocs/web-cyradm/locale/en/LC_MESSAGES/CVS
+#opt/lampp/htdocs/web-cyradm/locale/en/LC_MESSAGES/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/en/LC_MESSAGES/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/en/LC_MESSAGES/CVS/Root
+opt/lampp/htdocs/web-cyradm/locale/en/LC_MESSAGES/web-cyradm.mo
+opt/lampp/htdocs/web-cyradm/locale/en/LC_MESSAGES/web-cyradm.po
+#opt/lampp/htdocs/web-cyradm/locale/es
+#opt/lampp/htdocs/web-cyradm/locale/es/CVS
+#opt/lampp/htdocs/web-cyradm/locale/es/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/es/CVS/Entries.Log
+#opt/lampp/htdocs/web-cyradm/locale/es/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/es/CVS/Root
+#opt/lampp/htdocs/web-cyradm/locale/es/LC_MESSAGES
+#opt/lampp/htdocs/web-cyradm/locale/es/LC_MESSAGES/CVS
+#opt/lampp/htdocs/web-cyradm/locale/es/LC_MESSAGES/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/es/LC_MESSAGES/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/es/LC_MESSAGES/CVS/Root
+opt/lampp/htdocs/web-cyradm/locale/es/LC_MESSAGES/web-cyradm.mo
+opt/lampp/htdocs/web-cyradm/locale/es/LC_MESSAGES/web-cyradm.po
+#opt/lampp/htdocs/web-cyradm/locale/fr
+#opt/lampp/htdocs/web-cyradm/locale/fr/CVS
+#opt/lampp/htdocs/web-cyradm/locale/fr/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/fr/CVS/Entries.Log
+#opt/lampp/htdocs/web-cyradm/locale/fr/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/fr/CVS/Root
+#opt/lampp/htdocs/web-cyradm/locale/fr/LC_MESSAGES
+#opt/lampp/htdocs/web-cyradm/locale/fr/LC_MESSAGES/CVS
+#opt/lampp/htdocs/web-cyradm/locale/fr/LC_MESSAGES/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/fr/LC_MESSAGES/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/fr/LC_MESSAGES/CVS/Root
+opt/lampp/htdocs/web-cyradm/locale/fr/LC_MESSAGES/web-cyradm.mo
+opt/lampp/htdocs/web-cyradm/locale/fr/LC_MESSAGES/web-cyradm.po
+#opt/lampp/htdocs/web-cyradm/locale/hu
+#opt/lampp/htdocs/web-cyradm/locale/hu/CVS
+#opt/lampp/htdocs/web-cyradm/locale/hu/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/hu/CVS/Entries.Log
+#opt/lampp/htdocs/web-cyradm/locale/hu/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/hu/CVS/Root
+#opt/lampp/htdocs/web-cyradm/locale/hu/LC_MESSAGES
+#opt/lampp/htdocs/web-cyradm/locale/hu/LC_MESSAGES/CVS
+#opt/lampp/htdocs/web-cyradm/locale/hu/LC_MESSAGES/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/hu/LC_MESSAGES/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/hu/LC_MESSAGES/CVS/Root
+opt/lampp/htdocs/web-cyradm/locale/hu/LC_MESSAGES/web-cyradm.mo
+opt/lampp/htdocs/web-cyradm/locale/hu/LC_MESSAGES/web-cyradm.po
+#opt/lampp/htdocs/web-cyradm/locale/it
+#opt/lampp/htdocs/web-cyradm/locale/it/CVS
+#opt/lampp/htdocs/web-cyradm/locale/it/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/it/CVS/Entries.Log
+#opt/lampp/htdocs/web-cyradm/locale/it/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/it/CVS/Root
+#opt/lampp/htdocs/web-cyradm/locale/it/LC_MESSAGES
+#opt/lampp/htdocs/web-cyradm/locale/it/LC_MESSAGES/CVS
+#opt/lampp/htdocs/web-cyradm/locale/it/LC_MESSAGES/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/it/LC_MESSAGES/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/it/LC_MESSAGES/CVS/Root
+opt/lampp/htdocs/web-cyradm/locale/it/LC_MESSAGES/web-cyradm.mo
+opt/lampp/htdocs/web-cyradm/locale/it/LC_MESSAGES/web-cyradm.po
+#opt/lampp/htdocs/web-cyradm/locale/nb_NO
+#opt/lampp/htdocs/web-cyradm/locale/nb_NO/CVS
+#opt/lampp/htdocs/web-cyradm/locale/nb_NO/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/nb_NO/CVS/Entries.Log
+#opt/lampp/htdocs/web-cyradm/locale/nb_NO/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/nb_NO/CVS/Root
+#opt/lampp/htdocs/web-cyradm/locale/nb_NO/LC_MESSAGES
+#opt/lampp/htdocs/web-cyradm/locale/nb_NO/LC_MESSAGES/CVS
+#opt/lampp/htdocs/web-cyradm/locale/nb_NO/LC_MESSAGES/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/nb_NO/LC_MESSAGES/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/nb_NO/LC_MESSAGES/CVS/Root
+opt/lampp/htdocs/web-cyradm/locale/nb_NO/LC_MESSAGES/web-cyradm.mo
+opt/lampp/htdocs/web-cyradm/locale/nb_NO/LC_MESSAGES/web-cyradm.po
+#opt/lampp/htdocs/web-cyradm/locale/nl
+#opt/lampp/htdocs/web-cyradm/locale/nl/CVS
+#opt/lampp/htdocs/web-cyradm/locale/nl/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/nl/CVS/Entries.Log
+#opt/lampp/htdocs/web-cyradm/locale/nl/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/nl/CVS/Root
+#opt/lampp/htdocs/web-cyradm/locale/nl/LC_MESSAGES
+#opt/lampp/htdocs/web-cyradm/locale/nl/LC_MESSAGES/CVS
+#opt/lampp/htdocs/web-cyradm/locale/nl/LC_MESSAGES/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/nl/LC_MESSAGES/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/nl/LC_MESSAGES/CVS/Root
+opt/lampp/htdocs/web-cyradm/locale/nl/LC_MESSAGES/web-cyradm.mo
+opt/lampp/htdocs/web-cyradm/locale/nl/LC_MESSAGES/web-cyradm.po
+#opt/lampp/htdocs/web-cyradm/locale/no
+#opt/lampp/htdocs/web-cyradm/locale/no/CVS
+#opt/lampp/htdocs/web-cyradm/locale/no/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/no/CVS/Entries.Log
+#opt/lampp/htdocs/web-cyradm/locale/no/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/no/CVS/Root
+#opt/lampp/htdocs/web-cyradm/locale/no/LC_MESSAGES
+#opt/lampp/htdocs/web-cyradm/locale/no/LC_MESSAGES/CVS
+#opt/lampp/htdocs/web-cyradm/locale/no/LC_MESSAGES/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/no/LC_MESSAGES/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/no/LC_MESSAGES/CVS/Root
+#opt/lampp/htdocs/web-cyradm/locale/pl
+#opt/lampp/htdocs/web-cyradm/locale/pl/CVS
+#opt/lampp/htdocs/web-cyradm/locale/pl/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/pl/CVS/Entries.Log
+#opt/lampp/htdocs/web-cyradm/locale/pl/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/pl/CVS/Root
+#opt/lampp/htdocs/web-cyradm/locale/pl/LC_MESSAGES
+#opt/lampp/htdocs/web-cyradm/locale/pl/LC_MESSAGES/CVS
+#opt/lampp/htdocs/web-cyradm/locale/pl/LC_MESSAGES/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/pl/LC_MESSAGES/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/pl/LC_MESSAGES/CVS/Root
+opt/lampp/htdocs/web-cyradm/locale/pl/LC_MESSAGES/web-cyradm.mo
+opt/lampp/htdocs/web-cyradm/locale/pl/LC_MESSAGES/web-cyradm.po
+#opt/lampp/htdocs/web-cyradm/locale/pt
+#opt/lampp/htdocs/web-cyradm/locale/pt/CVS
+#opt/lampp/htdocs/web-cyradm/locale/pt/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/pt/CVS/Entries.Log
+#opt/lampp/htdocs/web-cyradm/locale/pt/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/pt/CVS/Root
+#opt/lampp/htdocs/web-cyradm/locale/pt/LC_MESSAGES
+#opt/lampp/htdocs/web-cyradm/locale/pt/LC_MESSAGES/CVS
+#opt/lampp/htdocs/web-cyradm/locale/pt/LC_MESSAGES/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/pt/LC_MESSAGES/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/pt/LC_MESSAGES/CVS/Root
+opt/lampp/htdocs/web-cyradm/locale/pt/LC_MESSAGES/web-cyradm.mo
+opt/lampp/htdocs/web-cyradm/locale/pt/LC_MESSAGES/web-cyradm.po
+#opt/lampp/htdocs/web-cyradm/locale/ro
+#opt/lampp/htdocs/web-cyradm/locale/ro/CVS
+#opt/lampp/htdocs/web-cyradm/locale/ro/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/ro/CVS/Entries.Log
+#opt/lampp/htdocs/web-cyradm/locale/ro/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/ro/CVS/Root
+#opt/lampp/htdocs/web-cyradm/locale/ro/LC_MESSAGES
+#opt/lampp/htdocs/web-cyradm/locale/ro/LC_MESSAGES/CVS
+#opt/lampp/htdocs/web-cyradm/locale/ro/LC_MESSAGES/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/ro/LC_MESSAGES/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/ro/LC_MESSAGES/CVS/Root
+opt/lampp/htdocs/web-cyradm/locale/ro/LC_MESSAGES/web-cyradm.mo
+opt/lampp/htdocs/web-cyradm/locale/ro/LC_MESSAGES/web-cyradm.po
+#opt/lampp/htdocs/web-cyradm/locale/ru
+#opt/lampp/htdocs/web-cyradm/locale/ru/CVS
+#opt/lampp/htdocs/web-cyradm/locale/ru/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/ru/CVS/Entries.Log
+#opt/lampp/htdocs/web-cyradm/locale/ru/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/ru/CVS/Root
+#opt/lampp/htdocs/web-cyradm/locale/ru/LC_MESSAGES
+#opt/lampp/htdocs/web-cyradm/locale/ru/LC_MESSAGES/CVS
+#opt/lampp/htdocs/web-cyradm/locale/ru/LC_MESSAGES/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/ru/LC_MESSAGES/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/ru/LC_MESSAGES/CVS/Root
+opt/lampp/htdocs/web-cyradm/locale/ru/LC_MESSAGES/web-cyradm.mo
+opt/lampp/htdocs/web-cyradm/locale/ru/LC_MESSAGES/web-cyradm.po
+#opt/lampp/htdocs/web-cyradm/locale/sl
+#opt/lampp/htdocs/web-cyradm/locale/sl/CVS
+#opt/lampp/htdocs/web-cyradm/locale/sl/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/sl/CVS/Entries.Log
+#opt/lampp/htdocs/web-cyradm/locale/sl/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/sl/CVS/Root
+#opt/lampp/htdocs/web-cyradm/locale/sl/LC_MESSAGES
+#opt/lampp/htdocs/web-cyradm/locale/sl/LC_MESSAGES/CVS
+#opt/lampp/htdocs/web-cyradm/locale/sl/LC_MESSAGES/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/sl/LC_MESSAGES/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/sl/LC_MESSAGES/CVS/Root
+opt/lampp/htdocs/web-cyradm/locale/sl/LC_MESSAGES/web-cyradm.mo
+opt/lampp/htdocs/web-cyradm/locale/sl/LC_MESSAGES/web-cyradm.po
+#opt/lampp/htdocs/web-cyradm/locale/sv
+#opt/lampp/htdocs/web-cyradm/locale/sv/CVS
+#opt/lampp/htdocs/web-cyradm/locale/sv/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/sv/CVS/Entries.Log
+#opt/lampp/htdocs/web-cyradm/locale/sv/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/sv/CVS/Root
+#opt/lampp/htdocs/web-cyradm/locale/sv/LC_MESSAGES
+#opt/lampp/htdocs/web-cyradm/locale/sv/LC_MESSAGES/CVS
+#opt/lampp/htdocs/web-cyradm/locale/sv/LC_MESSAGES/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/sv/LC_MESSAGES/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/sv/LC_MESSAGES/CVS/Root
+opt/lampp/htdocs/web-cyradm/locale/sv/LC_MESSAGES/web-cyradm.mo
+opt/lampp/htdocs/web-cyradm/locale/sv/LC_MESSAGES/web-cyradm.po
+#opt/lampp/htdocs/web-cyradm/locale/teamnames
+#opt/lampp/htdocs/web-cyradm/locale/templates
+#opt/lampp/htdocs/web-cyradm/locale/templates/CVS
+#opt/lampp/htdocs/web-cyradm/locale/templates/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/templates/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/templates/CVS/Root
+opt/lampp/htdocs/web-cyradm/locale/templates/web-cyradm.pot
+#opt/lampp/htdocs/web-cyradm/locale/tr
+#opt/lampp/htdocs/web-cyradm/locale/tr/CVS
+#opt/lampp/htdocs/web-cyradm/locale/tr/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/tr/CVS/Entries.Log
+#opt/lampp/htdocs/web-cyradm/locale/tr/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/tr/CVS/Root
+#opt/lampp/htdocs/web-cyradm/locale/tr/LC_MESSAGES
+#opt/lampp/htdocs/web-cyradm/locale/tr/LC_MESSAGES/CVS
+#opt/lampp/htdocs/web-cyradm/locale/tr/LC_MESSAGES/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/tr/LC_MESSAGES/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/tr/LC_MESSAGES/CVS/Root
+opt/lampp/htdocs/web-cyradm/locale/tr/LC_MESSAGES/web-cyradm.mo
+opt/lampp/htdocs/web-cyradm/locale/tr/LC_MESSAGES/web-cyradm.po
+#opt/lampp/htdocs/web-cyradm/locale/uk
+#opt/lampp/htdocs/web-cyradm/locale/uk/CVS
+#opt/lampp/htdocs/web-cyradm/locale/uk/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/uk/CVS/Entries.Log
+#opt/lampp/htdocs/web-cyradm/locale/uk/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/uk/CVS/Root
+#opt/lampp/htdocs/web-cyradm/locale/uk/LC_MESSAGES
+#opt/lampp/htdocs/web-cyradm/locale/uk/LC_MESSAGES/CVS
+#opt/lampp/htdocs/web-cyradm/locale/uk/LC_MESSAGES/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/uk/LC_MESSAGES/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/uk/LC_MESSAGES/CVS/Root
+opt/lampp/htdocs/web-cyradm/locale/uk/LC_MESSAGES/web-cyradm.mo
+opt/lampp/htdocs/web-cyradm/locale/uk/LC_MESSAGES/web-cyradm.po
+#opt/lampp/htdocs/web-cyradm/locale/zh_CN
+#opt/lampp/htdocs/web-cyradm/locale/zh_CN/CVS
+#opt/lampp/htdocs/web-cyradm/locale/zh_CN/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/zh_CN/CVS/Entries.Log
+#opt/lampp/htdocs/web-cyradm/locale/zh_CN/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/zh_CN/CVS/Root
+#opt/lampp/htdocs/web-cyradm/locale/zh_CN/LC_MESSAGES
+#opt/lampp/htdocs/web-cyradm/locale/zh_CN/LC_MESSAGES/CVS
+#opt/lampp/htdocs/web-cyradm/locale/zh_CN/LC_MESSAGES/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/locale/zh_CN/LC_MESSAGES/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/locale/zh_CN/LC_MESSAGES/CVS/Root
+opt/lampp/htdocs/web-cyradm/locale/zh_CN/LC_MESSAGES/web-cyradm.mo
+opt/lampp/htdocs/web-cyradm/locale/zh_CN/LC_MESSAGES/web-cyradm.po
+opt/lampp/htdocs/web-cyradm/login.php
+opt/lampp/htdocs/web-cyradm/logout.php
+opt/lampp/htdocs/web-cyradm/manageaccount.php
+opt/lampp/htdocs/web-cyradm/menu.inc.php
+#opt/lampp/htdocs/web-cyradm/migrate.php-dist
+opt/lampp/htdocs/web-cyradm/newaccount.php
+opt/lampp/htdocs/web-cyradm/newadminuser.php
+opt/lampp/htdocs/web-cyradm/newalias.php
+opt/lampp/htdocs/web-cyradm/newdomain.php
+opt/lampp/htdocs/web-cyradm/newemail.php
+#opt/lampp/htdocs/web-cyradm/scripts
+#opt/lampp/htdocs/web-cyradm/scripts/CVS
+#opt/lampp/htdocs/web-cyradm/scripts/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/scripts/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/scripts/CVS/Root
+#opt/lampp/htdocs/web-cyradm/scripts/create_mysql.sql
+#opt/lampp/htdocs/web-cyradm/scripts/create_pgsql.sql
+opt/lampp/htdocs/web-cyradm/scripts/imap2imap-copy.php
+#opt/lampp/htdocs/web-cyradm/scripts/insertuser_mysql.sql
+#opt/lampp/htdocs/web-cyradm/scripts/insertuser_pgsql.sql
+opt/lampp/htdocs/web-cyradm/scripts/php2pot
+opt/lampp/htdocs/web-cyradm/scripts/pot2po
+#opt/lampp/htdocs/web-cyradm/scripts/upgrade-0.5.2-to-0.5.3_mysql.sql
+#opt/lampp/htdocs/web-cyradm/scripts/upgrade-0.5.3-to-0.5.4_mysql.sql
+#opt/lampp/htdocs/web-cyradm/scripts/upgrade-0.5.3-to-0.5.4_pgsql.sql
+#opt/lampp/htdocs/web-cyradm/scripts/upgrade-0.5.4-to-0.5.5_mysql.sql
+#opt/lampp/htdocs/web-cyradm/scripts/upgrade-0.5.4-to-0.5.5_pgsql.sql
+opt/lampp/htdocs/web-cyradm/search.php
+opt/lampp/htdocs/web-cyradm/session.php
+opt/lampp/htdocs/web-cyradm/setquota.php
+opt/lampp/htdocs/web-cyradm/settings.php
+#opt/lampp/htdocs/web-cyradm/setup
+#opt/lampp/htdocs/web-cyradm/setup/CVS
+#opt/lampp/htdocs/web-cyradm/setup/CVS/Entries
+#opt/lampp/htdocs/web-cyradm/setup/CVS/Repository
+#opt/lampp/htdocs/web-cyradm/setup/CVS/Root
+opt/lampp/htdocs/web-cyradm/setup/index.php
+opt/lampp/htdocs/web-cyradm/setup/populate.php
+opt/lampp/htdocs/web-cyradm/timeout.php
+opt/lampp/htdocs/web-cyradm/vacation.php
+opt/lampp/htdocs/web-cyradm/validate.inc.php
+opt/lampp/htdocs/web-cyradm/welcome.php
+#opt/lampp/var/mysql/mail
+opt/lampp/var/mysql/mail/accountuser.MYD
+opt/lampp/var/mysql/mail/accountuser.MYI
+opt/lampp/var/mysql/mail/accountuser.frm
+opt/lampp/var/mysql/mail/adminuser.MYD
+opt/lampp/var/mysql/mail/adminuser.MYI
+opt/lampp/var/mysql/mail/adminuser.frm
+opt/lampp/var/mysql/mail/alias.MYD
+opt/lampp/var/mysql/mail/alias.MYI
+opt/lampp/var/mysql/mail/alias.frm
+opt/lampp/var/mysql/mail/db.opt
+opt/lampp/var/mysql/mail/domain.MYD
+opt/lampp/var/mysql/mail/domain.MYI
+opt/lampp/var/mysql/mail/domain.frm
+opt/lampp/var/mysql/mail/domainadmin.MYD
+opt/lampp/var/mysql/mail/domainadmin.MYI
+opt/lampp/var/mysql/mail/domainadmin.frm
+opt/lampp/var/mysql/mail/log.MYD
+opt/lampp/var/mysql/mail/log.MYI
+opt/lampp/var/mysql/mail/log.frm
+opt/lampp/var/mysql/mail/search.MYD
+opt/lampp/var/mysql/mail/search.MYI
+opt/lampp/var/mysql/mail/search.frm
+opt/lampp/var/mysql/mail/settings.MYD
+opt/lampp/var/mysql/mail/settings.MYI
+opt/lampp/var/mysql/mail/settings.frm
+opt/lampp/var/mysql/mail/virtual.MYD
+opt/lampp/var/mysql/mail/virtual.MYI
+opt/lampp/var/mysql/mail/virtual.frm
diff --git a/src/paks/web-cyradm/install.sh b/src/paks/web-cyradm/install.sh
new file mode 100644 (file)
index 0000000..3a9ce55
--- /dev/null
@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+#################################################################
+#                                                               #
+# This file belongs to IPFire Firewall - GPLv2 - www.ipfire.org #
+#                                                               #
+#################################################################
+#
+# Extract the files
+tar xfz files.tgz -C /
+cp -f ROOTFILES /opt/pakfire/installed/ROOTFILES.$2
diff --git a/src/paks/web-cyradm/uninstall.sh b/src/paks/web-cyradm/uninstall.sh
new file mode 100644 (file)
index 0000000..ad61226
--- /dev/null
@@ -0,0 +1,10 @@
+#!/bin/bash
+#################################################################
+#                                                               #
+# This file belongs to IPFire Firewall - GPLv2 - www.ipfire.org #
+#                                                               #
+#################################################################
+#
+# Delete the files
+## Befehl fehlt noch
+rm -f /opt/pakfire/installed/ROOTFILES.$2
diff --git a/src/patches/linux-2.4.31-ipfire.patch b/src/patches/linux-2.4.31-ipfire.patch
new file mode 100644 (file)
index 0000000..c16f8d4
--- /dev/null
@@ -0,0 +1,11 @@
+--- Makefile~  2006-06-28 17:13:56.576988264 +0200
++++ Makefile   2006-06-29 18:09:22.000000000 +0200
+@@ -1,7 +1,7 @@
+ VERSION = 2
+ PATCHLEVEL = 4
+ SUBLEVEL = 31
+-EXTRAVERSION =
++EXTRAVERSION = -ipfire
+ KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)