Hinzugefuegt:

  * MySQL 5.0.24a
Geaendert:
  * Konsolentyp umgestellt fuer MC.

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

diff --git a/config/etc/group b/config/etc/group
index b9db915ecce9421aff129d85fd78292d2f97b9c8..4235e24e1bf4f8bb95ffeb7b5ce01c75626bddbe 100644 (file)
--- a/config/etc/group
+++ b/config/etc/group
@@ -35,3 +35,4 @@ postdrop:x:108:
 clamav:x:109:
 amavis:x:110:
 mldonkey:x:111:
 clamav:x:109:
 amavis:x:110:
 mldonkey:x:111:

+mysql:x:41:

diff --git a/config/etc/passwd b/config/etc/passwd
index 42e8fc3e715a8329072abb3fa3ee58a0992d6edd..09ef1bd9c496a1870b3531d2ccf276ed1d11fe99 100644 (file)
--- a/config/etc/passwd
+++ b/config/etc/passwd
@@ -20,3 +20,4 @@ amavis:x:110:110:Amavisd-new user:/var/amavis:
 cyrus:x:111:12:Cyrus user:/usr/cyrus:
 filter:x:112:12:Spam user:/home/filter:/bin/false
 mldonkey:x:113:111:Mldonkey user:/opt/mldonkey:/bin/false
 cyrus:x:111:12:Cyrus user:/usr/cyrus:
 filter:x:112:12:Spam user:/home/filter:/bin/false
 mldonkey:x:113:111:Mldonkey user:/opt/mldonkey:/bin/false

+mysql:x:41:41:MySQL Server:/dev/null:/bin/false

diff --git a/config/etc/profile b/config/etc/profile
index d6e398171c9808821b7edc404ce3b7aa952bdd42..6804fc42fc13a304e445dca1c89c65594f26387b 100644 (file)
--- a/config/etc/profile
+++ b/config/etc/profile
@@ -45,4 +45,5 @@ PS1='\[\033[1;33m\]\u\[\033[1;37m\]@\[\033[1;32m\]\h\[\033[1;37m\]:\[\033[1;31m\
 echo -n -e '\033%G'
 
 export LANG PS1
 echo -n -e '\033%G'
 
 export LANG PS1

-export TERM=xterm-color
+export TERM=linux
+export COLORTERM=1

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 76aec76988b2d0299902ceb12dc370d5c9e24c2f..d73b90e5a6db53615830adc945481a6fd3256fb4 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,4 +1,8 @@
 ------------------------------------------------------------------------
 ------------------------------------------------------------------------

+r269 | ms | 2006-09-11 15:46:05 +0200 (Mon, 11 Sep 2006) | 1 line
+
+QoS-Improvements.
+------------------------------------------------------------------------

 r268 | ms | 2006-09-10 21:52:20 +0200 (Sun, 10 Sep 2006) | 5 lines
 
 Geaendert:
 r268 | ms | 2006-09-10 21:52:20 +0200 (Sun, 10 Sep 2006) | 5 lines
 
 Geaendert:

diff --git a/lfs/mysql b/lfs/mysql
new file mode 100644 (file)
index 0000000..d119e43
--- /dev/null
+++ b/lfs/mysql
@@ -0,0 +1,102 @@
+###############################################################################
+# 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        = 5.0.24a
+
+THISAPP    = mysql-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = mysql
+PAK_VER    = 1
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 6b07546389f75c52611adb7af38c3667
+
+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)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && C_EXTRA_FLAGS=-fno-strict-aliasing
+       cd $(DIR_APP) && ./configure --prefix=/usr \
+                           --sysconfdir=/etc \
+                           --libexecdir=/usr/sbin \
+                           --localstatedir=/srv/mysql \
+                           --enable-thread-safe-client \
+                           --enable-assembler \
+                           --enable-local-infile \
+                           --with-unix-socket-path=/var/run/mysql/mysql.sock \
+                           --without-debug \
+                           --without-bench \
+                           --with-berkeley-db \
+                           --with-extra-charsets=all
+       cd $(DIR_APP) && make testdir=/tmp/mysql
+       cd $(DIR_APP) && make testdir=/tmp/mysql install
+       rm -rf /tmp/mysql
+       cd /usr/lib && ln -v -sf mysql/libmysqlclient{,_r}.so* .
+       install -v -m644 /usr/share/mysql/my-medium.cnf /etc/my.cnf
+       mysql_install_db --user=mysql --force
+       chgrp -v mysql /srv/mysql{,/test,/mysql}
+       install -v -m755 -o mysql -g mysql -d /var/run/mysql
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/postfix b/lfs/postfix
index f9ddba0f4cb0a0340d0366bbf8c9f2d7b421cf17..5f8a2e51ac19ebf7c395cfc60b9f9ece33a1667f 100644 (file)
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -26,7 +26,7 @@
 
 include Config
 
 
 include Config
 

-VER        = 2.2.10
+VER        = 2.2.11

 
 THISAPP    = postfix-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 
 THISAPP    = postfix-$(VER)
 DL_FILE    = $(THISAPP).tar.gz


@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 

-$(DL_FILE)_MD5 = 440a4702182a79ac2f51e8974fb742c9
+$(DL_FILE)_MD5 = 03f416410110bf46352004dcae67a5fe

 
 install : $(TARGET)
 
 
 install : $(TARGET)
 

diff --git a/src/paks/mysql/ROOTFILES b/src/paks/mysql/ROOTFILES
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/paks/mysql/install.sh b/src/paks/mysql/install.sh
new file mode 100644 (file)
index 0000000..3a9ce55
--- /dev/null
+++ b/src/paks/mysql/install.sh
@@ -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/mysql/uninstall.sh b/src/paks/mysql/uninstall.sh
new file mode 100644 (file)
index 0000000..ad61226
--- /dev/null
+++ b/src/paks/mysql/uninstall.sh
@@ -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