Foomatic ist gegen die libtiff gelinkt.

Der Dump der Maildatenbank muss die Datenbank noch anlegen.
Die Adresse der server.met soll nicht funktionieren. Ausgetauscht.
Initscript fuer Asterisk geschrieben.
Der Pakfire macht ein Update, wenn sich die Maschine einwaehlt (Ohne --force).
Die Beep-Melodie ein bisschen schneller gemacht, weil der rowie die nicht mag. ;)
Das applejuice-Paket startet nun den Client von allein.
...und somit wird es dann bald Zeit fuer einen Release Candidate...

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

diff --git a/config/mldonkey/downloads.ini b/config/mldonkey/downloads.ini
index 94eab8a4b5c10efb2bdee0d95f6a76580a5dac05..fb050a05e1a423800e9eeaf14c8f8e1acc34342b 100644 (file)
--- a/config/mldonkey/downloads.ini
+++ b/config/mldonkey/downloads.ini
@@ -200,7 +200,7 @@
          IMPORTANT: Put the URL and the kind between quotes.
          EXAMPLE:
            web_infos = [
-           ("server.met", 0, "http://www.gruk.org/server.met.gz");
+           ("server.met", 0, "http://ed2k.2x4u.de/u581miei/max/server.met");
            ("hublist", 0, "http://dchublist.com/hublist.config.bz2");
            ("guarding.p2p", 96, "http://www.bluetack.co.uk/config/level1.gz");
            ("ocl", 24, "http://members.lycos.co.uk/appbyhp2/FlockHelpApp/contact-files/contact.ocl");

diff --git a/config/openmailadmin/mail.dump b/config/openmailadmin/mail.dump
index b65fdb9b9cf01aef6c5bee5c019301e81948f44b..d42ec8cf215d8c7245560749abdc045cd0982179 100644 (file)
--- a/config/openmailadmin/mail.dump
+++ b/config/openmailadmin/mail.dump
@@ -15,6 +15,15 @@
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 
+--
+-- Database: `mail`
+--
+
+CREATE DATABASE `mail`;
+USE `mail`;
+
+-- --------------------------------------------------------
+
 --
 -- Table structure for table `domains`
 --

diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts
index 5d34769d9e0f8c05ccffe2bfda63967175ea9248..e061435c5cfd40e81756a0cfdc70eeeee32e6660 100644 (file)
--- a/config/rootfiles/common/initscripts
+++ b/config/rootfiles/common/initscripts
@@ -59,6 +59,7 @@ etc/rc.d/init.d/networking/red.up/40-ipac
 etc/rc.d/init.d/networking/red.up/50-ipsec
 etc/rc.d/init.d/networking/red.up/50-ovpn
 etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl
+etc/rc.d/init.d/networking/red.up/99-pakfire-update
 #etc/rc.d/init.d/nfs-server
 etc/rc.d/init.d/ntp
 #etc/rc.d/init.d/portmap

diff --git a/config/rootfiles/packages/asterisk b/config/rootfiles/packages/asterisk
index e22630fcc67199c9da049d54e95c001e24809e8e..de9a8427f9782db9971fc21559b87df3f5a6e397 100644 (file)
--- a/config/rootfiles/packages/asterisk
+++ b/config/rootfiles/packages/asterisk
@@ -1,3 +1,4 @@
+etc/init.d/asterisk
 #usr/include/asterisk
 #usr/include/asterisk.h
 #usr/include/asterisk/abstract_jb.h

diff --git a/lfs/foomatic b/lfs/foomatic
index ac4ec78bc148ab1dc13fc645229d66c4d1a063b7..7450805a8d2b14f4e70a8e8ecea7af07d3475a48 100644 (file)
--- a/lfs/foomatic
+++ b/lfs/foomatic
@@ -35,7 +35,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = foomatic
 PAK_VER    = 1
 
-DEPS       = "cups ghostscript"
+DEPS       = "cups ghostscript libtiff"
 
 ###############################################################################
 # Top-level Rules

diff --git a/make.sh b/make.sh
index 89c7be3a8a691a3549c907995cfd38e0bb50bcda..60047ba7f176f21ed2ca330394ff0a3e97fb6781 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name
-VERSION="2.0rc1t"                                                              # Version number
+VERSION="2.0rc1"                                                               # Version number
 SLOGAN="www.ipfire.org"                                        # Software slogan
 CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir
 NICE=10                                                                                                        # Nice level

diff --git a/src/initscripts/init.d/asterisk b/src/initscripts/init.d/asterisk
new file mode 100644 (file)
index 0000000..223c016
--- /dev/null
+++ b/src/initscripts/init.d/asterisk
@@ -0,0 +1,52 @@
+#!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/asterisk
+#
+# Description : Asterisk Script
+#
+# Authors     : Michael Tremer (mitch@ipfire.org)
+#
+# Version     : 01.00
+#
+# Notes       :
+#
+########################################################################
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+case "${1}" in
+       start)
+               boot_mesg "Starting Asterisk PBX..."
+               loadproc /usr/sbin/asterisk
+               ;;
+
+       stop)
+               boot_mesg "Stopping Asterisk PBX..."
+               asterisk -rx "stop gracefully" >/dev/null 2>&1
+               evaluate_retval
+               ;;
+
+       reload)
+               boot_mesg "Reloading Asterisk PBX..."
+               asterisk -rx "reload" >/dev/null 2>&1
+               evaluate_retval
+               ;;
+
+       restart)
+               ${0} stop
+               sleep 1
+               ${0} start
+               ;;
+
+       status)
+               statusproc /usr/sbin/asterisk
+               ;;
+
+       *)
+               echo "Usage: ${0} {start|stop|reload|restart|status}"
+               exit 1
+               ;;
+esac
+
+# End $rc_base/init.d/asterisk

diff --git a/src/initscripts/init.d/beep b/src/initscripts/init.d/beep
index cee6548e362829da6c6ea907cd6d994cdae9ecf4..de6666edf404c84ba8053d28d2b95f0427407c9a 100644 (file)
--- a/src/initscripts/init.d/beep
+++ b/src/initscripts/init.d/beep
@@ -15,7 +15,7 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
-LENGTH=80
+LENGTH=40
 
 play () {
 

diff --git a/src/initscripts/init.d/networking/red.up/99-pakfire-update b/src/initscripts/init.d/networking/red.up/99-pakfire-update
new file mode 100644 (file)
index 0000000..2f2f980
--- /dev/null
+++ b/src/initscripts/init.d/networking/red.up/99-pakfire-update
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/opt/pakfire/pakfire update >/dev/null 2>&1

diff --git a/src/initscripts/sysconfig/modules b/src/initscripts/sysconfig/modules
index 1c8493d4587e6ce0b117ec87af2b5837a29d50e0..56fa0420c2f47a0dfbb6fc42bb7e58333e94a244 100644 (file)
--- a/src/initscripts/sysconfig/modules
+++ b/src/initscripts/sysconfig/modules
@@ -15,4 +15,7 @@
 # a space or a tab.
 ########################################################################
 
+parport_pc
+lp
+
 # End /etc/sysconfig/modules

diff --git a/src/paks/applejuice/install.sh b/src/paks/applejuice/install.sh
new file mode 100644 (file)
index 0000000..d4d7476
--- /dev/null
+++ b/src/paks/applejuice/install.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+. /opt/pakfire/lib/functions.sh
+
+extract_files
+
+sleep 60 && /etc/init.d/applejuice start &
+
+ln -svf ../init.d/applejuice /etc/rc.d/rc0.d/K05applejuice
+ln -svf ../init.d/applejuice /etc/rc.d/rc3.d/S98applejuice
+ln -svf ../init.d/applejuice /etc/rc.d/rc6.d/K05applejuice
+
+/etc/init.d/apache restart

diff --git a/src/paks/applejuice/uninstall.sh b/src/paks/applejuice/uninstall.sh
new file mode 100644 (file)
index 0000000..25df458
--- /dev/null
+++ b/src/paks/applejuice/uninstall.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+/etc/init.d/applejuice stop
+
+rm -rf /etc/rc.d/rc*.d/*applejuice

diff --git a/src/paks/applejuice/update.sh b/src/paks/applejuice/update.sh
new file mode 100644 (file)
index 0000000..a47a783
--- /dev/null
+++ b/src/paks/applejuice/update.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+. /opt/pakfire/lib/functions.sh
+
+extract_files

diff --git a/src/paks/mysql/install.sh b/src/paks/mysql/install.sh
index ba5027576d0467e4195a8cc97aafac3366283899..40787bd51a2d5623b5011eca2c27593c98a67c02 100644 (file)
--- a/src/paks/mysql/install.sh
+++ b/src/paks/mysql/install.sh
@@ -9,4 +9,6 @@ ln -svf  ../init.d/mysql /etc/rc.d/rc6.d/K26mysql
 
 /etc/init.d/mysql start
 
+sleep 10
+
 mysqladmin -u root --password='' password 'mysqlfire'

diff --git a/src/paks/openmailadmin/install.sh b/src/paks/openmailadmin/install.sh
index 9af05b118103a04f81968ae8e769526865f88a2e..1b6f8c31dc3f262a561aae50b2f199c4b48877ff 100644 (file)
--- a/src/paks/openmailadmin/install.sh
+++ b/src/paks/openmailadmin/install.sh
@@ -3,4 +3,6 @@
 
 extract_files
 
-mysql -u root mail < /srv/web/openmailadmin/mail.dump
+mysql < /srv/web/openmailadmin/mail.dump
+
+/etc/init.d/apache restart

diff --git a/src/paks/postfix/install.sh b/src/paks/postfix/install.sh
index 6a0227da4c14da0ff57c986b0a18ab9a02b2aaaa..886b573e73ea1df46d82a4315a14067c80e5c0b8 100644 (file)
--- a/src/paks/postfix/install.sh
+++ b/src/paks/postfix/install.sh
@@ -7,3 +7,5 @@ postalias /etc/aliases
 
 # Set postfix's hostname
 postconf -e "myhostname=$(hostname -f)"
+
+/etc/init.d/postfix start