Geändert:

  * Asterisk mit H323
Neue Versionen:
  * OpenVPN
  * pwlib
  * openh323
Fixed:
  * Menü im Webinterface

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

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index d54273df578c6b41ed76ee89f83827e562b2a8fe..9c6ed7b265bbb3d68290c0e898a2e8c0c235e3e9 100644 (file)
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -167,7 +167,7 @@ sub genmenu {
                                'caption' => $tr{'backup'},
                                'uri' => '/cgi-bin/backup.cgi',
                                'title' => "$tr{'backup'} / $tr{'restore'}",
-                               'enabled' => 1,
+                               'enabled' => 0,
                                };
     $subsystem->{'08.shutdown'} = {
                                  'caption' => $tr{'shutdown'},

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index b2ab7cd2837b0d22d6c63ecdbe7340b91da2cd39..33e23d07a15ac0e64ae5a4b69fdd75c8afd8e566 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -50,6 +50,7 @@
   * eagle-usb-2.3.2
   * eciadsl-usermode-0.11
   * ed-0.2
+  * edonkeyclc_1.3.0_i386
   * ethtool-3
   * expat-1.95.7
   * ez-ipupdate-3.0.11b8
@@ -127,12 +128,12 @@
   * noip_updater_v1.6
   * ntp-4.2.0
   * oinkmaster-1.2
-  * openh323_1.12.2
+  * openh323-Mimas_patch2
   * openldap-2.3.20
   * openssh-3.9p1
   * openssl-0.9.7i
   * openswan-1.0.10
-  * openvpn-2.0.6
+  * openvpn-2.0.7
   * pam_mysql-0.7RC1
   * patch-2.5.4
   * pciutils-2.1.11
@@ -148,7 +149,7 @@
   * procps-3.2.5
   * psmisc-21.4
   * pulsar-4.0.19
-  * pwlib_1.5.2
+  * pwlib-Mimas_patch2
   * rp-pppoe-3.5
   * rrdtool-1.0.49
   * samba-3.0.22
@@ -181,5 +182,4 @@
   * wireless_tools.27
   * xampp-linux-1.5.1
   * xinetd-2.3.14
-  * zaptel-1.2.3_1st
   * zlib-1.2.3

diff --git a/lfs/asterisk b/lfs/asterisk
index 8c4bf7a839602f8f94dd827288932fcd75f0f224..7045408b88194544971cd2b7037f64eefa4c348b 100644 (file)
--- a/lfs/asterisk
+++ b/lfs/asterisk
@@ -39,6 +39,7 @@ ZAPTEL     = zaptel-1.2.3
 BRISTUFF   = bristuff-0.3.0-PRE-1l
 LIBPRI     = libpri-1.2.2
 SPANDSP    = spandsp-0.0.2pre25
+OH323      = asterisk-oh323-0.7.3
 
 ###############################################################################
 # Top-level Rules
@@ -48,6 +49,7 @@ objects = $(DL_FILE) \
           $(ZAPTEL).tar.gz \
           $(BRISTUFF).tar.gz \
           $(LIBPRI).tar.gz \
+          $(OH323).tar.gz \
           app_rxfax.c \
           app_txfax.c \
           apps_Makefile.patch
@@ -59,6 +61,7 @@ $(LIBPRI).tar.gz = http://www.asterisk-support.de/mirror/libpri/$(LIBPRI).tar.gz
 app_rxfax.c = http://soft-switch.org/downloads/spandsp/$(SPANDSP)/asterisk-1.2.x/app_rxfax.c
 app_txfax.c = http://soft-switch.org/downloads/spandsp/$(SPANDSP)/asterisk-1.2.x/app_txfax.c
 apps_Makefile.patch = http://soft-switch.org/downloads/spandsp/$(SPANDSP)/asterisk-1.2.x/apps_Makefile.patch
+$(OH323).tar.gz = http://www.inaccessnetworks.com/projects/asterisk-oh323/download/$(OH323).tar.gz
 
 $(DL_FILE)_MD5 = 14721abdc85fc3381db275b61dffce2d
 $(ZAPTEL).tar.gz_MD5 = 9bcb705458f9b20a9644310298a9cd4d
@@ -67,6 +70,7 @@ $(LIBPRI).tar.gz_MD5 = efce9c3699110588df5e4cf09eae01d9
 app_rxfax.c_MD5 = ab6983b51c412883545b36993d704999
 app_txfax.c_MD5 = 8c8fcb263b76897022b4c28052a7b439
 apps_Makefile.patch_MD5 = 6b0faa7a7cf8613962b17c23ee5a1583
+$(OH323).tar.gz_MD5 = 66dc098a20ac11f098edbbaed307c085
 
 install : $(TARGET)
 
@@ -105,7 +109,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_SRC)/$(BRISTUFF) && \
        tar xfz $(DIR_DL)/$(ZAPTEL).tar.gz && \
        tar xfz $(DIR_DL)/$(LIBPRI).tar.gz && \
-       tar xfz $(DIR_DL)/$(ASTERISK).tar.gz
+       tar xfz $(DIR_DL)/$(ASTERISK).tar.gz && \
+       tar xfz $(DIR_DL)/$(OH323).tar.gz
        # Build Zaptel
        cd $(DIR_SRC)/$(BRISTUFF)/$(ZAPTEL) && \
        patch -Np1 < $(DIR_SRC)/src/patches/asterisk-1.2.4-zaptel-$(BRISTUFF).patch && \
@@ -134,12 +139,16 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-iax2-$(BRISTUFF).patch && \
        cp -fv $(DIR_DL)/app_{r,t}xfax.c $(DIR_SRC)/$(BRISTUFF)/$(ASTERISK)/apps && \
        cd $(DIR_SRC)/$(BRISTUFF)/$(ASTERISK)/apps && \
-       patch -Np1 < $(DIR_DL)/apps_Makefile.patch && \
+       patch < $(DIR_DL)/apps_Makefile.patch && \
        cd $(DIR_SRC)/$(BRISTUFF)/$(ASTERISK) && \
        make clean && \
        make all && \
        make install && \
        make samples
-       @rm -rf $(DIR_SRC)/$(BRISTUFF)
+       # Build OH323
+       cd $(DIR_SRC)/$(BRISTUFF)/$(OH323) && \
+       make ASTERISKINCDIR=$(DIR_SRC)/$(BRISTUFF)/$(ASTERISK)/include OH323WRAPLIBDIR=/usr/lib && \
+       make install ASTERISKINCDIR=$(DIR_SRC)/$(BRISTUFF)/$(ASTERISK)/include OH323WRAPLIBDIR=/usr/lib
+       @rm -rf $(DIR_SRC)/$(BRISTUFF) $(DIR_SRC)/{pwlib,openh323}
        @$(POSTBUILD)
 

diff --git a/lfs/oh323 b/lfs/oh323
new file mode 100644 (file)
index 0000000..b92f78b
--- /dev/null
+++ b/lfs/oh323
@@ -0,0 +1,92 @@
+###############################################################################
+# 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>                        #
+#                                                                             #
+# Modifications by:                                                           #
+# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
+#          - Modified Makefile for IPCop build                                #
+#                                                                             #
+# $Id: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 2.2.9
+
+THISAPP    = postfix-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = ftp://netmirror.org/postfix.org/official
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = be78631bd9b6bf7735e43abfa54d69f6
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       make-packages.sh postfix $(THISAPP)-ipfire-beta-1
+
+###############################################################################
+# 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) && make -f Makefile.init makefiles \
+                               'CCARGS=-DDEF_DAEMON_DIR=\"/usr/lib/postfix\" -DDEF_MANPAGE_DIR=\"/usr/share/man\" -DUSE_TLS -DUSE_SALS_AUTH -DHAS_PGSQL -I/usr/include/openssl -DHAS_MYSQL -I/opt/lampp/include/mysql -I/usr/include/sasl -I/opt/lampp/include' \
+                               'AUXLIBS=-L/usr/lib -L/opt/lampp/lib/mysql -L/opt/lampp/lib -lmysqlclient -lz -lm -lssl -lsasl2 -lcrypto -lpq'
+       cd $(DIR_APP) && make
+       cd $(DIR_APP) && sh postfix-install -non-interactive
+       cp -v /usr/src/config/etc/aliases /etc/aliases
+       cd /etc/ && postmap aliases
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
\ No newline at end of file

diff --git a/lfs/openh323 b/lfs/openh323
index 3710cdc998c3f38b62c08d84259adc2cc9d53171..cecb78a1414ef854546321aa59e7b332fe45bf7d 100644 (file)
--- a/lfs/openh323
+++ b/lfs/openh323
@@ -32,11 +32,11 @@
 
 include Config
 
-VER        = 1.12.2
+VER        = Mimas_patch2
 
-THISAPP    = openh323_$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://www.openh323.org/bin
+THISAPP    = openh323-$(VER)
+DL_FILE    = $(THISAPP)-src-tar.gz
+DL_FROM    = $(URL_SFNET)/openh323
 DIR_APP    = $(DIR_SRC)/openh323
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 15f0b12b60769d03eca9e498050776f3
+$(DL_FILE)_MD5 = 2cf48eb8b8bb3d54843cbf0951f31cbf
 
 install : $(TARGET)
 
@@ -78,8 +78,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       mv -f $(DIR_SRC)/openh323* $(DIR_SRC)/openh323
        cd $(DIR_APP) && ./configure --prefix=/usr
        cd $(DIR_APP) && make opt PWLIBDIR=/usr/src/pwlib && make install PWLIBDIR=/usr/src/pwlib
-       @rm -rf $(DIR_APP)
-       @rm -rf /usr/src/pwlib
        @$(POSTBUILD)

diff --git a/lfs/openvpn b/lfs/openvpn
index 3d839a86c92df0d3fa8c18887de704c46c7fe9bb..7a04ed5206ed02e01746d31ed71632faac08cc40 100644 (file)
--- a/lfs/openvpn
+++ b/lfs/openvpn
@@ -32,7 +32,7 @@
 
 include Config
 
-VER        = 2.0.6
+VER        = 2.0.7
 
 THISAPP    = openvpn-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8d2f95fa825e58363a676b25d4815aa7
+$(DL_FILE)_MD5 = 93528233f1f6d02fc18e2c00f82e0aca
 
 install : $(TARGET)
 

diff --git a/lfs/pwlib b/lfs/pwlib
index dfdbfbbf9fe99505ea3609d93987ebed4be3ebed..836ebebf3332e692bbdc9e7472b59a5d31692042 100644 (file)
--- a/lfs/pwlib
+++ b/lfs/pwlib
@@ -18,11 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $
 #                                                                             #
 ###############################################################################
 
@@ -32,11 +27,11 @@
 
 include Config
 
-VER        = 1.5.2
+VER        = Mimas_patch2-src-tar
 
-THISAPP    = pwlib_$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://www.openh323.org/bin
+THISAPP    = pwlib-$(VER)
+DL_FILE    = $(THISAPP).gz
+DL_FROM    = $(URL_SFNET)/openh323
 DIR_APP    = $(DIR_SRC)/pwlib
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -48,7 +43,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0fa33ba1b32b254abe0b731a52c0f2f9
+$(DL_FILE)_MD5 = 90edee9d894558f98f840c1972205218
 
 install : $(TARGET)
 
@@ -77,9 +72,11 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       mv /usr/include/ldap.h /
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
+       ln -sf -v $(DIR_SRC)/pwlib* $(DIR_APP)
+#      mv -f $(DIR_SRC)/pwlib* $(DIR_SRC)/pwlib
+#      mv -f /usr/include/ldap.h /
        cd $(DIR_APP) && ./configure --prefix=/usr
-       mv /ldap.h /usr/include 
+#      mv -f /ldap.h /usr/include      
        cd $(DIR_APP) && make opt && make install
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 40b49da9ad5cdf2b4d2e528c250dea56f5ca547f..31c5a4cc72635fe2c51ea1411d654bbf12bd1a79 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -655,6 +655,7 @@ buildipcop() {
   ipcopmake lzo
   ipcopmake pkg-config
   ipcopmake glib
+  ipcopmake xampp
   ipcopmake pam
   ipcopmake pammysql
   ipcopmake sudo
@@ -663,7 +664,6 @@ buildipcop() {
   ipcopmake openh323
   ipcopmake xinetd
   ipcopmake wget
-  ipcopmake xampp
   ipcopmake bridge-utils
   ipcopmake saslauthd PASS=1
   ipcopmake openldap

diff --git a/src/ROOTFILES.i386 b/src/ROOTFILES.i386
index 745a406f8cb2fb6210e950de719b9587f32938ab..a102c56db775dc9f2ce1245b8dfd1d3a3e0fa3d2 100644 (file)
--- a/src/ROOTFILES.i386
+++ b/src/ROOTFILES.i386
@@ -30350,11 +30350,25 @@ usr/lib/libpt_linux_x86_r.so.1.5.2
 #usr/include/openh323/x880.h
 usr/lib/libh323_linux_x86_r.so
 usr/lib/libh323_linux_x86_r.so.1
-usr/lib/libh323_linux_x86_r.so.1.12
-usr/lib/libh323_linux_x86_r.so.1.12.2
+usr/lib/libh323_linux_x86_r.so.1.15
+usr/lib/libh323_linux_x86_r.so.1.15.6
 usr/lib/libopenh323.so
 #usr/share/openh323
 #usr/share/openh323/openh323u.mak
+#usr/include/openh323/h323pluginmgr.h
+#usr/include/openh323/h4503.h
+#usr/include/openh323/h460.h
+#usr/include/openh323/opalplugin.h
+#usr/include/openh323/rfc2190avcodec.h
+usr/lib/pwlib
+usr/lib/pwlib/codecs
+usr/lib/pwlib/codecs/audio
+usr/lib/pwlib/codecs/audio/g726_audio_pwplugin.so
+usr/lib/pwlib/codecs/audio/gsm0610_audio_pwplugin.so
+usr/lib/pwlib/codecs/audio/ilbc_audio_pwplugin.so
+usr/lib/pwlib/codecs/audio/ima_adpcm_audio_pwplugin.so
+usr/lib/pwlib/codecs/audio/lpc10_audio_pwplugin.so
+usr/lib/pwlib/codecs/audio/speex_audio_pwplugin.so
 ##
 ## CYRUS-SASLAUTHD
 ##