From f5679937b82bfce56f7d9599a072e838133e21fa Mon Sep 17 00:00:00 2001 From: ms Date: Fri, 31 Aug 2007 12:09:23 +0000 Subject: [PATCH] Amavisd-new und PHP aktualisiert. Neues Startscript fuer den Applejuice. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@865 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/rootfiles/common/initscripts | 2 + doc/packages-list.txt | 1 + lfs/amavisd | 4 +- lfs/php | 51 +++++++++++++++++--- src/initscripts/init.d/applejuice | 75 ++++++++++++++++++----------- 5 files changed, 97 insertions(+), 36 deletions(-) diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts index 3ad08890f7..99bc14cbf0 100644 --- a/config/rootfiles/common/initscripts +++ b/config/rootfiles/common/initscripts @@ -14,6 +14,7 @@ etc/rc.d/init.d/cleanfs etc/rc.d/init.d/connectd etc/rc.d/init.d/console #etc/rc.d/init.d/cups +#etc/rc.d/init.d/cyrus-imapd #etc/rc.d/init.d/cyrus-sasl etc/rc.d/init.d/dhcp etc/rc.d/init.d/dnsmasq @@ -58,6 +59,7 @@ etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl #etc/rc.d/init.d/nfs-server etc/rc.d/init.d/ntp #etc/rc.d/init.d/portmap +#etc/rc.d/init.d/postfix etc/rc.d/init.d/random etc/rc.d/init.d/rc etc/rc.d/init.d/reboot diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 99dcddc4cf..a7f6d720d4 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -34,6 +34,7 @@ * XML-Parser-2.34 * alsa-lib-1.0.13 * amavisd-new-2.4.1 +* amavisd-new-2.5.2 * applejuice-0.30 * arping-2.05 * as86-0.16.17 diff --git a/lfs/amavisd b/lfs/amavisd index 45b5cf176a..35b483be02 100644 --- a/lfs/amavisd +++ b/lfs/amavisd @@ -24,7 +24,7 @@ include Config -VER = 2.4.1 +VER = 2.5.2 THISAPP = amavisd-new-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = bf770a3c7eee8a9c93932a04485e6a35 +$(DL_FILE)_MD5 = 52d227d442fac64916488b83d79806d7 install : $(TARGET) diff --git a/lfs/php b/lfs/php index c7df30b628..10218029d8 100644 --- a/lfs/php +++ b/lfs/php @@ -24,7 +24,7 @@ include Config -VER = 4.4.4 +VER = 5.2.4 THISAPP = php-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = bc6fa8908e2ac36e93bab9f7d42cda3a +$(DL_FILE)_MD5 = 55c97a671fdabf462cc7a82971a656d2 install : $(TARGET) @@ -74,14 +74,51 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && sed -i 's/const char \*errpfx,/const DB_ENV *dbenv, & const/' ext/dba/dba_db4.c - cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \ - --with-apxs2 --with-config-file-path=/etc \ - --with-zlib --with-bz2 --enable-ftp --with-gettext \ - --with-iconv --with-mysql=/usr --with-ncurses + cd $(DIR_APP) && ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --with-apxs2 \ + --enable-force-cgi-redirect \ + --enable-discard-path \ + --enable-fastcgi \ + --with-config-file-path=/etc \ + --with-openssl \ + --with-kerberos \ + --with-pcre-regex=/usr \ + --with-zlib \ + --enable-bcmath \ + --with-bz2 \ + --enable-calendar \ + --with-curl \ + --with-curlwrappers \ + --enable-dba=shared \ + --with-gdbm \ + --with-db4 \ + --with-inifile \ + --with-flatfile \ + --enable-exif \ + --enable-ftp \ + --with-openssl-dir=/usr \ + --with-gd=/usr \ + --with-jpeg-dir=/usr \ + --with-png-dir=/usr \ + --with-zlib-dir=/usr \ + --with-freetype-dir=/usr \ + --with-gettext \ + --with-gmp \ + --enable-mbstring \ + --with-mysql \ + --with-mysql-sock=/var/run/mysql \ + --with-ncurses \ + --with-pdo-mysql \ + --without-pdo-sqlite \ + --with-readline \ + --enable-sockets \ + --with-xsl \ + --with-iconv cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install cd $(DIR_APP) && install -v -m644 php.ini-recommended /etc/php.ini - grep -v libphp4.so < /etc/httpd/conf/httpd.conf > /etc/httpd/conf/httpd.conf.bak + grep -v libphp5.so < /etc/httpd/conf/httpd.conf > /etc/httpd/conf/httpd.conf.bak mv -f /etc/httpd/conf/httpd.conf.bak /etc/httpd/conf/httpd.conf @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/initscripts/init.d/applejuice b/src/initscripts/init.d/applejuice index 5ea1227b0d..d8bbc8c50e 100644 --- a/src/initscripts/init.d/applejuice +++ b/src/initscripts/init.d/applejuice @@ -1,32 +1,53 @@ -#!/bin/bash -HOME=/opt/applejuice -JAVA=/usr/bin/java +#!/bin/sh +######################################################################## +# Begin $rc_base/init.d/applejuice +# +# Description : Applejuice Init script +# +# Authors : Michael Tremer - www.ipfire.org +# +# Version : 01.00 +# +# Notes : +# +######################################################################## + +. /etc/sysconfig/rc +. ${rc_functions} eval $(/usr/local/bin/readhash /var/ipfire/applejuice/settings) -case "$1" in - start) - cd $HOME - screen -dmS ajcore $JAVA -Xmx${RAMSIZE}m -Djava.library.path=. -jar ajcore.jar - echo -e "Applejuice is running!"; logger -t ipfire "Applejuice started!" - ;; - stop) - killall -9 java - echo -e "Applejuice is stopped!"; logger -t ipfire "Applejuice stopped!" - ;; - status) - if pidof java > /dev/null ; then - echo -e "Applejuice is running!" - exit 0 - else - echo -e "Applejuice is not running!" +case "${1}" in + start) + boot_mesg "Starting Applejuice Core..." + cd /opt/applejuice + screen -dmS ajcore /usr/bin/java -Xmx${RAMSIZE} -Djava.library.path=. -jar ajcore.jar + evaluate_retval + ;; + + stop) + boot_mesg "Stopping Applejuice Core..." + killproc /usr/bin/java + ;; + + restart) + ${0} stop + sleep 1 + ${0} start + ;; + + status) + statusproc /usr/bin/java + ;; + + core) + screen -x ajcore + ;; + + *) + echo "Usage: ${0} {start|stop|restart|status|core}" exit 1 - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo -e "Usage: $0 (start|stop|restart|status)" + ;; esac + +# End $rc_base/init.d/applejuice -- 2.39.2