diff --git a/config/mldonkey/downloads.ini b/config/mldonkey/downloads.ini index 94eab8a4b..fb050a05e 100644 --- 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 b65fdb9b9..d42ec8cf2 100644 --- 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 5d34769d9..e061435c5 100644 --- 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 e22630fcc..de9a8427f 100644 --- 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 ac4ec78bc..7450805a8 100644 --- 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 89c7be3a8..60047ba7f 100755 --- 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 index 000000000..223c01688 --- /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 cee6548e3..de6666edf 100644 --- 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 index 000000000..2f2f980a2 --- /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 1c8493d45..56fa0420c 100644 --- 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 index 000000000..d4d747687 --- /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 index 000000000..25df45818 --- /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 index 000000000..a47a7831d --- /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 ba5027576..40787bd51 100644 --- 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 9af05b118..1b6f8c31d 100644 --- 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 6a0227da4..886b573e7 100644 --- 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