From: ms Date: Thu, 15 Jun 2006 17:43:14 +0000 (+0000) Subject: Geändert: X-Git-Tag: v2.3-beta1~1075 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=5ebf3d3ecf6b9feb73d114345ffcb0988bfe2c41 Geändert: * Postfix - PostgreSQL-Unterstützung herausgenommen. * HDDTemp-Bezeichnung gekürzt - Dank an masa oder wer das nochmal war :D * Konfigurationen der Mailer in die Pakete gepackt. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@179 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- diff --git a/doc/packages-list.txt b/doc/packages-list.txt index a2476f5201..a890fe2b85 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -193,9 +193,7 @@ * razor-agents-2.81 * rp-pppoe-3.5 * rrdtool-1.0.49 - * rsync-2.6.8 * samba-3.0.22 - * sane-backends-1.0.17 * screen-4.0.2 * sed-4.0.9 * setserial-2.17 @@ -227,6 +225,5 @@ * wget-1.10.2 * wput-0.6 * xampp-linux-1.5.3a - * xampp-linux-1.5.3a_old * xinetd-2.3.14 * zlib-1.2.3 diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 2ed318a3b7..e6e05694c6 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1276,7 +1276,7 @@ 'empty profile' => 'Unbenannt', 'HDD temperature' => 'HDD-Temperatur', 'harddisk temperature' => 'Festplattentemperatur', -'harddisk temperature graphs' => 'Festplattentemperatur-Diagramme', +'harddisk temperature graphs' => 'HDD-Temperatur-Diagramme', 'hdd temperature in' => 'Festplattentemperatur in', 'ipts' => 'IPTables', 'iptable rules' => 'IPTable-Regeln', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index d9e66c47e6..1c52301d42 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1309,7 +1309,7 @@ 'empty profile' => 'empty', 'HDD temperature' => 'HDD temperature', 'harddisk temperature' => 'Harddisk temperature', -'harddisk temperature graphs' => 'harddisk temperature graphs', +'harddisk temperature graphs' => 'hdd temperature graphs', 'hdd temperature in' => 'Harddisk temperature in', 'ipts' => 'IPTables', 'iptable rules' => 'IPTable rules', diff --git a/lfs/cyrusimap b/lfs/cyrusimap index 7cd93f996c..743501d5d5 100644 --- a/lfs/cyrusimap +++ b/lfs/cyrusimap @@ -93,7 +93,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -mkdir -p /var/ipfire/cyrusimap cp -f $(DIR_SRC)/config/cyrusimap/* /var/ipfire/cyrusimap cp -f $(DIR_APP)/tools/mkimap /usr/bin - /usr/bin/mkimap # Diese Funktion ist noch nicht getestet. + #/usr/bin/mkimap # Diese Funktion ist noch nicht getestet. # Wenn das Dateisystem ext2 ist... # cd /var/imap && chattr +S user quota user/* quota/* && chattr +S /var/spool/imap /var/spool/imap/* @rm -rf $(DIR_APP) diff --git a/lfs/postfix b/lfs/postfix index 3a39197e89..3bce5044d6 100644 --- a/lfs/postfix +++ b/lfs/postfix @@ -82,10 +82,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) -DDEF_MANPAGE_DIR=\"/usr/share/man\" \ -DUSE_TLS -I/usr/include/openssl \ -DUSE_SALS_AUTH -I/usr/include/sasl \ - -DHAS_PGSQL -I/opt/lampp/include \ + -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 -lpq -L/opt/lampp/lib' + -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 diff --git a/src/ROOTFILES.i386 b/src/ROOTFILES.i386 index 7f6a96b796..20fb3920d2 100644 --- a/src/ROOTFILES.i386 +++ b/src/ROOTFILES.i386 @@ -24688,6 +24688,11 @@ etc/security/group.conf etc/security/limits.conf etc/security/pam_env.conf etc/security/time.conf +#etc/pam.d +etc/pam.d/imap +etc/pam.d/pop +etc/pam.d/sieve +etc/pam.d/smtp lib/libpam.so.0 lib/libpam.so.0.81.2 lib/libpam_misc.so.0 diff --git a/src/paks/cyrusimap/ROOTFILES b/src/paks/cyrusimap/ROOTFILES index 8ed29a5527..e1690d923a 100644 --- a/src/paks/cyrusimap/ROOTFILES +++ b/src/paks/cyrusimap/ROOTFILES @@ -136,4 +136,7 @@ usr/lib/perl5/site_perl/5.8.5/i386-linux/auto/Cyrus/SIEVE/managesieve/managesiev #usr/share/man/man8/squatter.8 #usr/share/man/man8/syncnews.8 #usr/share/man/man8/timsieved.8 -#usr/share/man/man8/tls_prune.8 \ No newline at end of file +#usr/share/man/man8/tls_prune.8 +var/imap +var/log/imap +usr/sieve \ No newline at end of file diff --git a/src/paks/postfix/ROOTFILES b/src/paks/postfix/ROOTFILES index 6411101d21..9efbe6821e 100644 --- a/src/paks/postfix/ROOTFILES +++ b/src/paks/postfix/ROOTFILES @@ -1,5 +1,5 @@ etc/aliases -etc/postfix +#etc/postfix etc/postfix/LICENSE etc/postfix/TLS_LICENSE etc/postfix/access @@ -15,6 +15,9 @@ etc/postfix/postfix-script etc/postfix/relocated etc/postfix/transport etc/postfix/virtual +etc/postfix/mysql-canonical.cf +etc/postfix/mysql-mydestination.cf +etc/postfix/mysql-virtual.cf usr/bin/mailq usr/bin/newaliases #usr/lib/postfix diff --git a/src/paks/procmail/ROOTFILES b/src/paks/procmail/ROOTFILES index 2236b3e2c2..2429f51918 100644 --- a/src/paks/procmail/ROOTFILES +++ b/src/paks/procmail/ROOTFILES @@ -1,3 +1,4 @@ +etc/procmailrc usr/bin/formail usr/bin/lockfile usr/bin/mailstat