From fb895adb0c03f0b364a87f4ecc2334d40f0a1714 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 5 Sep 2009 17:22:01 +0200 Subject: [PATCH 1/7] Updated joe lfs and rootfile --- config/rootfiles/packages/joe | 136 ++++++++++++++++++---------------- lfs/joe | 2 +- 2 files changed, 72 insertions(+), 66 deletions(-) diff --git a/config/rootfiles/packages/joe b/config/rootfiles/packages/joe index ec0e0e26d..164ec79d9 100644 --- a/config/rootfiles/packages/joe +++ b/config/rootfiles/packages/joe @@ -1,71 +1,77 @@ +#usr/bin/jmacs usr/bin/joe +#usr/bin/jpico +#usr/bin/jstar usr/bin/rjoe -usr/share/doc/joe -usr/share/doc/joe/LIST -usr/share/doc/joe/README -usr/share/doc/joe/HINTS -usr/share/doc/joe/ChangeLog -usr/share/doc/joe/HACKING -usr/share/doc/joe/NEWS -usr/share/man/man1/joe.1 -usr/share/man/ru/man1/joe.1 -usr/share/joe -usr/share/joe/lang -usr/share/joe/lang/ru.po -usr/share/joe/lang/de.po -usr/share/joe/lang/fr.po -usr/share/joe/lang/uk.po -usr/share/joe/syntax -usr/share/joe/syntax/c.jsf -usr/share/joe/syntax/perl.jsf -usr/share/joe/syntax/verilog.jsf -usr/share/joe/syntax/conf.jsf -usr/share/joe/syntax/python.jsf -usr/share/joe/syntax/php.jsf -usr/share/joe/syntax/sh.jsf -usr/share/joe/syntax/mail.jsf -usr/share/joe/syntax/pascal.jsf -usr/share/joe/syntax/html.jsf -usr/share/joe/syntax/vhdl.jsf -usr/share/joe/syntax/fortran.jsf -usr/share/joe/syntax/java.jsf -usr/share/joe/syntax/xml.jsf -usr/share/joe/syntax/tcl.jsf -usr/share/joe/syntax/lisp.jsf -usr/share/joe/syntax/csh.jsf -usr/share/joe/syntax/mason.jsf -usr/share/joe/syntax/diff.jsf -usr/share/joe/syntax/asm.jsf -usr/share/joe/syntax/tex.jsf -usr/share/joe/syntax/css.jsf -usr/share/joe/syntax/ocaml.jsf -usr/share/joe/syntax/4gl.jsf -usr/share/joe/syntax/sml.jsf -usr/share/joe/syntax/sql.jsf -usr/share/joe/syntax/awk.jsf -usr/share/joe/syntax/cobol.jsf -usr/share/joe/syntax/sed.jsf -usr/share/joe/syntax/ps.jsf -usr/share/joe/syntax/ada.jsf -usr/share/joe/syntax/troff.jsf -usr/share/joe/syntax/haskell.jsf -usr/share/joe/syntax/rexx.jsf -usr/share/joe/syntax/skill.jsf -usr/share/joe/syntax/lua.jsf -usr/share/joe/syntax/ruby.jsf -usr/share/joe/syntax/m4.jsf -usr/share/joe/syntax/joerc.jsf -usr/share/joe/syntax/spec.jsf -usr/share/joe/syntax/matlab.jsf -usr/share/joe/syntax/jsf.jsf -usr/share/joe/syntax/jsf_check.jsf -usr/share/joe/charmaps -usr/share/joe/charmaps/klingon -usr/etc/joe -usr/etc/joe/joerc +#usr/bin/termidx +#usr/etc/joe +usr/etc/joe/ftyperc usr/etc/joe/jicerc.ru usr/etc/joe/jmacsrc +usr/etc/joe/joerc +usr/etc/joe/jpicorc usr/etc/joe/jstarrc usr/etc/joe/rjoerc -usr/etc/joe/jpicorc -usr/etc/joe/ftyperc +#usr/share/doc/joe +#usr/share/doc/joe/ChangeLog +#usr/share/doc/joe/HACKING +#usr/share/doc/joe/HINTS +#usr/share/doc/joe/LIST +#usr/share/doc/joe/NEWS +#usr/share/doc/joe/README +#usr/share/joe +#usr/share/joe/charmaps +usr/share/joe/charmaps/klingon +#usr/share/joe/lang +usr/share/joe/lang/de.po +#usr/share/joe/lang/fr.po +#usr/share/joe/lang/ru.po +usr/share/joe/lang/uk.po +#usr/share/joe/syntax +usr/share/joe/syntax/4gl.jsf +usr/share/joe/syntax/ada.jsf +usr/share/joe/syntax/asm.jsf +usr/share/joe/syntax/awk.jsf +usr/share/joe/syntax/c.jsf +usr/share/joe/syntax/cobol.jsf +usr/share/joe/syntax/conf.jsf +usr/share/joe/syntax/csh.jsf +usr/share/joe/syntax/css.jsf +usr/share/joe/syntax/diff.jsf +usr/share/joe/syntax/fortran.jsf +usr/share/joe/syntax/haskell.jsf +usr/share/joe/syntax/html.jsf +usr/share/joe/syntax/java.jsf +usr/share/joe/syntax/joerc.jsf +usr/share/joe/syntax/jsf.jsf +usr/share/joe/syntax/jsf_check.jsf +usr/share/joe/syntax/lisp.jsf +usr/share/joe/syntax/lua.jsf +usr/share/joe/syntax/m4.jsf +usr/share/joe/syntax/mail.jsf +usr/share/joe/syntax/mason.jsf +usr/share/joe/syntax/matlab.jsf +usr/share/joe/syntax/ocaml.jsf +usr/share/joe/syntax/pascal.jsf +usr/share/joe/syntax/perl.jsf +usr/share/joe/syntax/php.jsf +usr/share/joe/syntax/ps.jsf +usr/share/joe/syntax/python.jsf +usr/share/joe/syntax/rexx.jsf +usr/share/joe/syntax/ruby.jsf +usr/share/joe/syntax/sed.jsf +usr/share/joe/syntax/sh.jsf +usr/share/joe/syntax/skill.jsf +usr/share/joe/syntax/sml.jsf +usr/share/joe/syntax/spec.jsf +usr/share/joe/syntax/sql.jsf +usr/share/joe/syntax/tcl.jsf +usr/share/joe/syntax/tex.jsf +usr/share/joe/syntax/troff.jsf +usr/share/joe/syntax/verilog.jsf +usr/share/joe/syntax/vhdl.jsf +usr/share/joe/syntax/xml.jsf +usr/share/man/man1/joe.1 +#usr/share/man/ru +#usr/share/man/ru/man1 +#usr/share/man/ru/man1/joe.1 diff --git a/lfs/joe b/lfs/joe index 96b215693..e4cee9528 100644 --- a/lfs/joe +++ b/lfs/joe @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = joe -PAK_VER = 0 +PAK_VER = 1 DEPS = "" From 03ca2036e0a9316d98a60886f362876d818951f5 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 5 Sep 2009 20:06:59 +0200 Subject: [PATCH 2/7] Updated mediatomb to svn2020. --- .../packages/{mediatomb-disabled => mediatomb} | 3 ++- lfs/mediatomb | 10 +++++----- make.sh | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) rename config/rootfiles/packages/{mediatomb-disabled => mediatomb} (99%) diff --git a/config/rootfiles/packages/mediatomb-disabled b/config/rootfiles/packages/mediatomb similarity index 99% rename from config/rootfiles/packages/mediatomb-disabled rename to config/rootfiles/packages/mediatomb index f94df6310..5f08e9152 100644 --- a/config/rootfiles/packages/mediatomb-disabled +++ b/config/rootfiles/packages/mediatomb @@ -3,6 +3,7 @@ usr/bin/mediatomb #usr/share/mediatomb #usr/share/mediatomb/js usr/share/mediatomb/js/common.js +usr/share/mediatomb/js/import-dvd.js usr/share/mediatomb/js/import.js usr/share/mediatomb/js/playlists.js usr/share/mediatomb/mappings.xml @@ -94,9 +95,9 @@ usr/share/mediatomb/web/std_treelook.css usr/share/mediatomb/web/top.html usr/share/mediatomb/web/topleft.html usr/share/mediatomb/web/topright.html +var/ipfire/backup/addons/includes/mediatomb var/ipfire/mediatomb #var/ipfire/mediatomb/config.xml -var/ipfire/backup/addons/includes/mediatomb etc/rc.d/init.d/mediatomb etc/rc.d/rc0.d/K02mediatomb etc/rc.d/rc6.d/K02mediatomb diff --git a/lfs/mediatomb b/lfs/mediatomb index 653d31cf4..73e5c807e 100644 --- a/lfs/mediatomb +++ b/lfs/mediatomb @@ -24,15 +24,15 @@ include Config -VER = 0.11.0 +VER = svn2020 THISAPP = mediatomb-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mediatomb -PAK_VER = 1 +PAK_VER = 2 DEPS = "sqlite taglib" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 661f08933830d920de21436fe122fb15 +$(DL_FILE)_MD5 = 7fb4ef41da88f82eb1d0acb160104874 install : $(TARGET) @@ -76,7 +76,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install diff --git a/make.sh b/make.sh index cf085774c..2f69a4c92 100755 --- a/make.sh +++ b/make.sh @@ -605,7 +605,7 @@ buildipfire() { ipfiremake sshfs ipfiremake sqlite ipfiremake taglib -# ipfiremake mediatomb + ipfiremake mediatomb ipfiremake sslh ipfiremake perl-gettext ipfiremake vdradmin From f3b4e6464130b949acace7e837c62d282582c63e Mon Sep 17 00:00:00 2001 From: Marcus Scholz Date: Sat, 5 Sep 2009 21:55:13 +0200 Subject: [PATCH 3/7] Fixed OpenSwan Route in pppd setups. --- config/rootfiles/core/31/filelists/files | 1 + src/ppp/ip-up | 2 ++ 2 files changed, 3 insertions(+) diff --git a/config/rootfiles/core/31/filelists/files b/config/rootfiles/core/31/filelists/files index 10f4300fe..8e8f97b22 100644 --- a/config/rootfiles/core/31/filelists/files +++ b/config/rootfiles/core/31/filelists/files @@ -1,2 +1,3 @@ etc/system-release boot/grub/grub.conf +etc/ppp/ip-up diff --git a/src/ppp/ip-up b/src/ppp/ip-up index 4ce95a505..02f60a6ba 100644 --- a/src/ppp/ip-up +++ b/src/ppp/ip-up @@ -79,3 +79,5 @@ fi mv /tmp/hosts /etc/hosts [ -e "/var/ipfire/ppp/nobeeps" ] || /etc/rc.d/init.d/beep up + +/sbin/ip route replace default via ${IPREMOTE} From afdcc3c2c7e0672353af323f6edf5399639780fc Mon Sep 17 00:00:00 2001 From: Marcus Scholz Date: Sat, 5 Sep 2009 22:01:06 +0200 Subject: [PATCH 4/7] Fixed OpenSwan Route in pppd setups. Specifying the explicit ppp0 device prevents wrong route setup after reconnect. --- src/ppp/ip-up | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ppp/ip-up b/src/ppp/ip-up index 02f60a6ba..e62ae3fab 100644 --- a/src/ppp/ip-up +++ b/src/ppp/ip-up @@ -80,4 +80,4 @@ mv /tmp/hosts /etc/hosts [ -e "/var/ipfire/ppp/nobeeps" ] || /etc/rc.d/init.d/beep up -/sbin/ip route replace default via ${IPREMOTE} +/sbin/ip route replace default via ${IPREMOTE} dev ppp0 From f21fe8b5ef721807b309d00469ca64d67db188ad Mon Sep 17 00:00:00 2001 From: Marcus Scholz Date: Sat, 5 Sep 2009 22:57:01 +0200 Subject: [PATCH 5/7] Moved the route replace directive before run_subdir ${rc_base} ... This ensures that openwan will be reloaded after the route has been set. --- src/ppp/ip-up | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ppp/ip-up b/src/ppp/ip-up index e62ae3fab..24e472d28 100644 --- a/src/ppp/ip-up +++ b/src/ppp/ip-up @@ -53,6 +53,7 @@ echo -n "$4" > /var/ipfire/red/local-ipaddress echo -n "$5" > /var/ipfire/red/remote-ipaddress touch /var/ipfire/red/active +/sbin/ip route replace default via ${IPREMOTE} dev ppp0 run_subdir ${rc_base}/init.d/networking/red.up/ #Check if gateway has answerd to ping, if not replace with ping.ipfire.org @@ -80,4 +81,3 @@ mv /tmp/hosts /etc/hosts [ -e "/var/ipfire/ppp/nobeeps" ] || /etc/rc.d/init.d/beep up -/sbin/ip route replace default via ${IPREMOTE} dev ppp0 From 39294a2ea5fec07f646cc667e7d54d31c1795b62 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 5 Sep 2009 23:08:15 +0200 Subject: [PATCH 6/7] Fix typo in ip-up --- src/ppp/ip-up | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ppp/ip-up b/src/ppp/ip-up index 24e472d28..683b15504 100644 --- a/src/ppp/ip-up +++ b/src/ppp/ip-up @@ -47,7 +47,7 @@ else echo -n "$DNS1" > /var/ipfire/red/dns1 echo -n "$DNS2" > /var/ipfire/red/dns2 fi -7 + echo -n "$1" > /var/ipfire/red/iface echo -n "$4" > /var/ipfire/red/local-ipaddress echo -n "$5" > /var/ipfire/red/remote-ipaddress From ba2c28203a83257bdf5af6aacd124e1b6a4a220f Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Sun, 6 Sep 2009 00:20:30 +0200 Subject: [PATCH 7/7] Added 2 CGI fixes to core --- config/rootfiles/core/31/filelists/files | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/rootfiles/core/31/filelists/files b/config/rootfiles/core/31/filelists/files index 8e8f97b22..17a477c22 100644 --- a/config/rootfiles/core/31/filelists/files +++ b/config/rootfiles/core/31/filelists/files @@ -1,3 +1,5 @@ +srv/web/ipfire/cgi-bin/chpasswd.cgi +srv/web/ipfire/cgi-bin/urlfilter.cgi etc/system-release boot/grub/grub.conf etc/ppp/ip-up