Remove applejuice.

diff --git a/config/rootfiles/packages/applejuice b/config/rootfiles/packages/applejuice
deleted file mode 100644 (file)
index ca14dee..0000000
--- a/config/rootfiles/packages/applejuice
+++ /dev/null
@@ -1,141 +0,0 @@
-etc/httpd/conf/vhosts.d/phpaj.conf
-etc/rc.d/init.d/applejuice
-opt/applejuice
-opt/applejuice/ajcore.jar
-opt/applejuice/libajnetmask.so
-srv/web/phpaj
-srv/web/phpaj/export
-srv/web/phpaj/export/Default.php
-srv/web/phpaj/export/ajl.php
-srv/web/phpaj/export/bb.php
-srv/web/phpaj/export/html.php
-srv/web/phpaj/index.php
-srv/web/phpaj/language
-srv/web/phpaj/language/deutsch.xml
-srv/web/phpaj/language/english.xml
-srv/web/phpaj/main
-srv/web/phpaj/main/classes
-srv/web/phpaj/main/classes/class_core.php
-srv/web/phpaj/main/classes/class_downloads.php
-srv/web/phpaj/main/classes/class_icons.php
-srv/web/phpaj/main/classes/class_search.php
-srv/web/phpaj/main/classes/class_server.php
-srv/web/phpaj/main/classes/class_share.php
-srv/web/phpaj/main/classes/class_uploads.php
-srv/web/phpaj/main/directory.php
-srv/web/phpaj/main/dl_parts.php
-srv/web/phpaj/main/dl_users.php
-srv/web/phpaj/main/downloads.php
-srv/web/phpaj/main/extras.php
-srv/web/phpaj/main/index.php
-srv/web/phpaj/main/progressbar.php
-srv/web/phpaj/main/search.php
-srv/web/phpaj/main/server.php
-srv/web/phpaj/main/settings.php
-srv/web/phpaj/main/shareexport.php
-srv/web/phpaj/main/sharefiles.php
-srv/web/phpaj/main/shares.php
-srv/web/phpaj/main/showparts.php
-srv/web/phpaj/main/start.php
-srv/web/phpaj/main/status.php
-srv/web/phpaj/main/subs.php
-srv/web/phpaj/main/top.php
-srv/web/phpaj/main/uploads.php
-srv/web/phpaj/minigui
-srv/web/phpaj/minigui/downloads.php
-srv/web/phpaj/minigui/index.php
-srv/web/phpaj/minigui/minigui.php
-srv/web/phpaj/plugins
-srv/web/phpaj/plugins/ajl
-srv/web/phpaj/plugins/ajl/ajl.php
-srv/web/phpaj/plugins/ajl/icon.gif
-srv/web/phpaj/plugins/ajl/info.php
-srv/web/phpaj/plugins/register.php
-srv/web/phpaj/plugins/sharestats
-srv/web/phpaj/plugins/sharestats/info.php
-srv/web/phpaj/plugins/sharestats/sharestats.php
-srv/web/phpaj/plugins/versionchecker
-srv/web/phpaj/plugins/versionchecker/info.php
-srv/web/phpaj/plugins/versionchecker/versionchecker.php
-srv/web/phpaj/plugins/wizard
-srv/web/phpaj/plugins/wizard/icon.gif
-srv/web/phpaj/plugins/wizard/info.php
-srv/web/phpaj/plugins/wizard/wizard.php
-srv/web/phpaj/plugins/wizard/wizard.xml
-srv/web/phpaj/style
-srv/web/phpaj/style/default
-srv/web/phpaj/style/default/default_blue.css
-srv/web/phpaj/style/default/default_green.css
-srv/web/phpaj/style/default/default_grey.css
-srv/web/phpaj/style/default/info.png
-srv/web/phpaj/style/default/minus.png
-srv/web/phpaj/style/default/os
-srv/web/phpaj/style/default/os/bsd.png
-srv/web/phpaj/style/default/os/linux.png
-srv/web/phpaj/style/default/os/mac.png
-srv/web/phpaj/style/default/os/na.png
-srv/web/phpaj/style/default/os/netware.png
-srv/web/phpaj/style/default/os/os2.png
-srv/web/phpaj/style/default/os/solaris.png
-srv/web/phpaj/style/default/os/win.png
-srv/web/phpaj/style/default/plus.png
-srv/web/phpaj/style/default/server
-srv/web/phpaj/style/default/server/alt.gif
-srv/web/phpaj/style/default/server/neu.gif
-srv/web/phpaj/style/default/server/verbinde.gif
-srv/web/phpaj/style/default/server/verbunden.gif
-srv/web/phpaj/style/default/stop.png
-srv/web/phpaj/style/default/tabs
-srv/web/phpaj/style/default/tabs/download.gif
-srv/web/phpaj/style/default/tabs/extras.gif
-srv/web/phpaj/style/default/tabs/kill.gif
-srv/web/phpaj/style/default/tabs/logout.gif
-srv/web/phpaj/style/default/tabs/meinshare.gif
-srv/web/phpaj/style/default/tabs/optionen.gif
-srv/web/phpaj/style/default/tabs/server.gif
-srv/web/phpaj/style/default/tabs/start.gif
-srv/web/phpaj/style/default/tabs/suchen.gif
-srv/web/phpaj/style/default/tabs/upload.gif
-srv/web/phpaj/style/default/user
-srv/web/phpaj/style/default/user/direct.png
-srv/web/phpaj/style/default/user/indirect.png
-srv/web/phpaj/style/default/user/tryindirect.png
-srv/web/phpaj/style/default/user/unknown.png
-srv/web/phpaj/style/default/warnung.gif
-srv/web/phpaj/style/default/x.png
-srv/web/phpaj/style/default_blue.php
-srv/web/phpaj/style/default_green.php
-srv/web/phpaj/style/default_grey.php
-srv/web/phpaj/style/new
-srv/web/phpaj/style/new.php
-srv/web/phpaj/style/new/bg.png
-srv/web/phpaj/style/new/new.css
-srv/web/phpaj/style/tango
-srv/web/phpaj/style/tango.php
-srv/web/phpaj/style/tango/bg.png
-srv/web/phpaj/style/tango/icons
-srv/web/phpaj/style/tango/icons/direct.png
-srv/web/phpaj/style/tango/icons/down.png
-srv/web/phpaj/style/tango/icons/empty.png
-srv/web/phpaj/style/tango/icons/extras.png
-srv/web/phpaj/style/tango/icons/home.png
-srv/web/phpaj/style/tango/icons/indirect.png
-srv/web/phpaj/style/tango/icons/info.png
-srv/web/phpaj/style/tango/icons/kill.png
-srv/web/phpaj/style/tango/icons/logout.png
-srv/web/phpaj/style/tango/icons/minus.png
-srv/web/phpaj/style/tango/icons/plus.png
-srv/web/phpaj/style/tango/icons/preferences.png
-srv/web/phpaj/style/tango/icons/search.png
-srv/web/phpaj/style/tango/icons/server.png
-srv/web/phpaj/style/tango/icons/share.png
-srv/web/phpaj/style/tango/icons/stop.png
-srv/web/phpaj/style/tango/icons/up.png
-srv/web/phpaj/style/tango/icons/warning.png
-srv/web/phpaj/style/tango/icons/x.png
-srv/web/phpaj/style/tango/tango.css
-srv/web/phpaj/vars.php
-usr/local/bin/applejuicectrl
-var/ipfire/applejuice
-var/ipfire/applejuice/settings
-#usr/lib/libajnetmask.so

diff --git a/lfs/applejuice b/lfs/applejuice
deleted file mode 100644 (file)
index 12e58a6..0000000
--- a/lfs/applejuice
+++ /dev/null
@@ -1,90 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# This program 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 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 0.31
-
-THISAPP    = applejuice-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = applejuice
-PAK_VER    = 2
-
-DEPS       = "java"
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = dc4ac444ff9ec9e1e841e856564d0234
-
-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) && mkdir -p /opt/applejuice && mv -fv ajcore.jar /opt/applejuice
-       cd $(DIR_APP) && mv -fv libajnetmask.so /opt/applejuice
-       ln -svf ../../opt/applejuice/libajnetmask.so /usr/lib
-       cd $(DIR_APP) && cp -afv phpaj /srv/web
-       chown nobody.nobody /srv/web/phpaj -Rv
-       -mkdir /var/ipfire/applejuice
-       echo "RAMSIZE=64M" > /var/ipfire/applejuice/settings
-       chown nobody.nobody /var/ipfire/applejuice -Rv
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index b79e8e8df68bc020a2fc5f4e3237e0bb30f4f4a5..ff818eaeda2d5d0fa1992674138a834c66d06556 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -543,7 +543,6 @@ buildipfire() {
   ipfiremake iptables
   ipfiremake libupnp
   ipfiremake ipaddr
-  ipfiremake iptstate
   ipfiremake iputils
   ipfiremake l7-protocols
   ipfiremake mISDNuser
@@ -645,7 +644,6 @@ buildipfire() {
   ipfiremake cmake
   ipfiremake gnump3d
   ipfiremake libsigc++
-  ipfiremake applejuice
   ipfiremake libtorrent
   ipfiremake rtorrent
   ipfiremake ipfireseeder

diff --git a/src/paks/applejuice/install.sh b/src/paks/applejuice/install.sh
deleted file mode 100644 (file)
index 92cd67f..0000000
--- a/src/paks/applejuice/install.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-############################################################################
-#                                                                          #
-# This file is part of the IPFire Firewall.                                #
-#                                                                          #
-# IPFire 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.                                      #
-#                                                                          #
-# IPFire 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 IPFire; if not, write to the Free Software                    #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
-#                                                                          #
-# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
-#                                                                          #
-############################################################################
-#
-. /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 reload

diff --git a/src/paks/applejuice/uninstall.sh b/src/paks/applejuice/uninstall.sh
deleted file mode 100644 (file)
index e14e422..0000000
--- a/src/paks/applejuice/uninstall.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-############################################################################
-#                                                                          #
-# This file is part of the IPFire Firewall.                                #
-#                                                                          #
-# IPFire 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.                                      #
-#                                                                          #
-# IPFire 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 IPFire; if not, write to the Free Software                    #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
-#                                                                          #
-# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
-#                                                                          #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-/etc/init.d/applejuice stop
-remove_files
-rm -rf /etc/rc.d/rc*.d/*applejuice

diff --git a/src/paks/applejuice/update.sh b/src/paks/applejuice/update.sh
deleted file mode 100644 (file)
index 89c40d0..0000000
--- a/src/paks/applejuice/update.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-############################################################################
-#                                                                          #
-# This file is part of the IPFire Firewall.                                #
-#                                                                          #
-# IPFire 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.                                      #
-#                                                                          #
-# IPFire 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 IPFire; if not, write to the Free Software                    #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
-#                                                                          #
-# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
-#                                                                          #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-./uninstall.sh
-./install.sh