This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via b860c9ad97fdb0a6af5494005c98219cb2e34b98 (commit) via 03d7921767007aecaeea64b9f2b805611f1ead6c (commit) via e2db294b022a6c62a333fe84450044babcf3dc6f (commit) via 2ad0c24a00c26a1b3ee84f189a774d0263dc6bd1 (commit) via 2950a55ca44c453df12b60174396f00b69210423 (commit) via c3ad835aed82e405d433509dff0b9a98fcfef76b (commit) via 346502448b34ccff6220fdc4059f2a724da2abad (commit) via b530bbba9eb2ec961789f78995fb1c5f11cadb75 (commit) via ecf97bd2128207f6a9843f27679bd293e513ca31 (commit) via eb7fff99fc287ed76ed39a3d408006bbcf0aabd4 (commit) via 2e8b71ca698238b679cc5098fb9f0def8ebf716b (commit) via 3b1dbfba60fcfdbe4da096676f8aa32a863e084d (commit) via 3ab685b34bd439f77c2f90f4c8214b025eb99e1c (commit) via 2de6c6499478531367c663b5d8f7410fe49af3aa (commit) via b34fdcae83378e193a89e7a3ea6329321c5dab08 (commit) via 37dd0cd2a2fcfa7c2b65c53ab5627cb7a4a37b40 (commit) via 71c7c484036dfe750e19de685fce66d25ff0398c (commit) via 01d65373cb723e755be5ba235185bea580bfb439 (commit) via 29f8b91f1de79768dc996216f1b8c05c22e24339 (commit) via d8de94bdc7620a133ce707362ae43e568fbd5d36 (commit) via a70dcf912922dabcfe883a7145eeeb381ab02b92 (commit) via 6d6e1571af68a1595164c43c163daf3b2734932f (commit) via 7a7465d6e7a6575cc63b680a95f705475923d551 (commit) via c5246e621a4d9774147978f80825ab5f1c3fd8b0 (commit) via 9724e602b07ec1246eaa3e0370e371035510d4bf (commit) via a2fd324e6d5e591acbb3c509c31b5e8a1d47df60 (commit) from fd88f2ee298f63440e81b37680ca2c0a48790ce2 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit b860c9ad97fdb0a6af5494005c98219cb2e34b98 Merge: 03d7921 2950a55 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Feb 17 13:15:34 2013 +0100

Merge remote-tracking branch 'origin/core66' into next

commit 03d7921767007aecaeea64b9f2b805611f1ead6c Merge: c3ad835 e2db294 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Feb 17 13:15:14 2013 +0100

Merge remote-tracking branch 'trikolon/next' into next

commit e2db294b022a6c62a333fe84450044babcf3dc6f Author: Ben Schweikert trikolon@ipfire.org Date: Sun Feb 17 09:08:12 2013 +0100

Nginx: Minor Bugfixes.

commit 2ad0c24a00c26a1b3ee84f189a774d0263dc6bd1 Merge: 71c7c48 fd88f2e Author: Ben Schweikert trikolon@ipfire.org Date: Sat Feb 16 20:25:05 2013 +0100

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

commit c3ad835aed82e405d433509dff0b9a98fcfef76b Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 16 15:26:31 2013 +0100

Add nginx, avahi and libdaemon to make.sh.

commit 346502448b34ccff6220fdc4059f2a724da2abad Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 16 14:34:14 2013 +0100

Fix rootfiles of libdaemon and avahi.

commit b530bbba9eb2ec961789f78995fb1c5f11cadb75 Merge: ecf97bd 71c7c48 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 16 14:32:30 2013 +0100

Merge remote-tracking branch 'trikolon/next' into next

commit ecf97bd2128207f6a9843f27679bd293e513ca31 Merge: fd88f2e eb7fff9 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 16 14:29:26 2013 +0100

Merge remote-tracking branch 'origin/core66' into next

commit 71c7c484036dfe750e19de685fce66d25ff0398c Author: Ben Schweikert trikolon@ipfire.org Date: Mon Jan 21 17:48:04 2013 +0100

Nginx: Bugfixed rootfile.

commit 01d65373cb723e755be5ba235185bea580bfb439 Author: Ben Schweikert trikolon@ipfire.org Date: Sun Jan 20 17:59:14 2013 +0100

Nginx: Bug fixes in lfs file.

commit 29f8b91f1de79768dc996216f1b8c05c22e24339 Author: Ben Schweikert trikolon@ipfire.org Date: Fri Jan 18 18:39:00 2013 +0100

Avahi: Fixes in Rootfile.

Nginx: Fixes in Rootfile.

commit d8de94bdc7620a133ce707362ae43e568fbd5d36 Author: Ben Schweikert trikolon@ipfire.org Date: Fri Jan 18 18:33:30 2013 +0100

Avahi: Fixed lfs file.

commit a70dcf912922dabcfe883a7145eeeb381ab02b92 Author: Ben Schweikert trikolon@ipfire.org Date: Fri Jan 18 17:26:23 2013 +0100

Nginx: fixes for rootfile.

commit 6d6e1571af68a1595164c43c163daf3b2734932f Author: Ben Schweikert trikolon@ipfire.org Date: Thu Jan 17 21:27:21 2013 +0100

Avahi: Changes on rootfile.

commit 7a7465d6e7a6575cc63b680a95f705475923d551 Author: Ben Schweikert trikolon@ipfire.org Date: Wed Jan 16 20:20:50 2013 +0100

Bugfixes: Various bugfixes in all three packages.

commit c5246e621a4d9774147978f80825ab5f1c3fd8b0 Author: Ben Schweikert trikolon@ipfire.org Date: Tue Jan 15 17:49:53 2013 +0100

Avahi: Added backup.

commit 9724e602b07ec1246eaa3e0370e371035510d4bf Author: Ben Schweikert trikolon@ipfire.org Date: Tue Jan 15 17:48:43 2013 +0100

Nginx: New package. Version 1.3.11.

commit a2fd324e6d5e591acbb3c509c31b5e8a1d47df60 Author: Ben Schweikert trikolon@ipfire.org Date: Mon Jan 14 21:46:22 2013 +0100

Avahi: New package. Can be used as mdns-responder for airplay.

Libdaemon: New package. Needed for avahi.

-----------------------------------------------------------------------

Summary of changes: .../init.d/xinetd => config/avahi/avahi | 18 +-- config/avahi/smb.service | 9 ++ config/backup/includes/avahi | 1 + config/backup/includes/nginx | 1 + .../init.d/xinetd => config/nginx/nginx | 18 +-- config/qos/makeqosscripts.pl | 2 +- config/rootfiles/core/66/filelists/files | 1 + config/rootfiles/packages/avahi | 163 +++++++++++++++++++++ config/rootfiles/packages/libdaemon | 17 +++ config/rootfiles/packages/nginx | 23 +++ html/cgi-bin/backup.cgi | 10 +- html/cgi-bin/proxy.cgi | 10 +- lfs/{sshfs => avahi} | 17 ++- lfs/{sshfs => libdaemon} | 8 +- lfs/{directfb => nginx} | 52 ++++--- make.sh | 9 +- src/install+setup/install/main.c | 8 +- src/paks/{fetchmail => avahi}/install.sh | 3 + src/paks/{fetchmail => avahi}/uninstall.sh | 1 + src/paks/{apcupsd => avahi}/update.sh | 0 src/paks/{git => libdaemon}/install.sh | 0 .../{check_mk_agent => libdaemon}/uninstall.sh | 0 src/paks/{apcupsd => libdaemon}/update.sh | 0 src/paks/{pound => nginx}/install.sh | 6 +- src/paks/{nut => nginx}/uninstall.sh | 2 +- src/paks/{apcupsd => nginx}/update.sh | 0 src/scripts/backupiso | 46 ++++-- src/scripts/readhash | 2 +- 28 files changed, 345 insertions(+), 82 deletions(-) copy src/initscripts/init.d/xinetd => config/avahi/avahi (54%) mode change 100644 => 100755 create mode 100644 config/avahi/smb.service create mode 100644 config/backup/includes/avahi create mode 100644 config/backup/includes/nginx copy src/initscripts/init.d/xinetd => config/nginx/nginx (60%) mode change 100644 => 100755 create mode 100644 config/rootfiles/packages/avahi create mode 100644 config/rootfiles/packages/libdaemon create mode 100644 config/rootfiles/packages/nginx mode change 100755 => 100644 html/cgi-bin/ovpnmain.cgi copy lfs/{sshfs => avahi} (85%) copy lfs/{sshfs => libdaemon} (95%) copy lfs/{directfb => nginx} (69%) copy src/paks/{fetchmail => avahi}/install.sh (92%) copy src/paks/{fetchmail => avahi}/uninstall.sh (98%) copy src/paks/{apcupsd => avahi}/update.sh (100%) copy src/paks/{git => libdaemon}/install.sh (100%) copy src/paks/{check_mk_agent => libdaemon}/uninstall.sh (100%) copy src/paks/{apcupsd => libdaemon}/update.sh (100%) copy src/paks/{pound => nginx}/install.sh (92%) copy src/paks/{nut => nginx}/uninstall.sh (98%) copy src/paks/{apcupsd => nginx}/update.sh (100%)

Difference in files: diff --git a/config/avahi/avahi b/config/avahi/avahi new file mode 100755 index 0000000..206146a --- /dev/null +++ b/config/avahi/avahi @@ -0,0 +1,45 @@ +#!/bin/sh +# Begin $rc_base/init.d/avahi + +# Based on sysklogd script from LFS-3.1 and earlier. +# Rewritten by Gerard Beekmans - gerard@linuxfromscratch.org + +#$LastChangedBy: bdubbs $ +#$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $ + +. /etc/sysconfig/rc +. $rc_functions + +case "$1" in + start) + boot_mesg "Starting avahi..." + loadproc /usr/sbin/avahi-daemon -f /etc/avahi/avahi-daemon.conf -D + ;; + + stop) + boot_mesg "Stopping avahi..." + killproc /usr/sbin/avahi-daemon -k + ;; + + reload) + boot_mesg "Reloading avahi..." + reloadproc /usr/sbin/avahi-daemon -f /etc/avahi/avahi-daemon.conf -D + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + status) + statusproc /usr/sbin/avahi-daemon -c + ;; + + *) + echo "Usage: $0 {start|stop|reload|restart|status}" + exit 1 + ;; +esac + +# End $rc_base/init.d/avahi diff --git a/config/avahi/smb.service b/config/avahi/smb.service new file mode 100644 index 0000000..d895354 --- /dev/null +++ b/config/avahi/smb.service @@ -0,0 +1,9 @@ +<?xml version="1.0" standalone='no'?> +<!DOCTYPE service-group SYSTEM "avahi-service.dtd"> +<service-group> + <name replace-wildcards="yes">Samba Shares on %h</name> + <service> + <type>_smb._tcp</type> + <port>139</port> + </service> +</service-group> diff --git a/config/backup/includes/avahi b/config/backup/includes/avahi new file mode 100644 index 0000000..7f32af6 --- /dev/null +++ b/config/backup/includes/avahi @@ -0,0 +1 @@ +/etc/avahi/avahi-daemon.conf diff --git a/config/backup/includes/nginx b/config/backup/includes/nginx new file mode 100644 index 0000000..db8e6ed --- /dev/null +++ b/config/backup/includes/nginx @@ -0,0 +1 @@ +/etc/nginx/nginx.conf diff --git a/config/nginx/nginx b/config/nginx/nginx new file mode 100755 index 0000000..67f757d --- /dev/null +++ b/config/nginx/nginx @@ -0,0 +1,45 @@ +#!/bin/sh +# Begin $rc_base/init.d/nginx + +# Based on sysklogd script from LFS-3.1 and earlier. +# Rewritten by Gerard Beekmans - gerard@linuxfromscratch.org + +#$LastChangedBy: bdubbs $ +#$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $ + +. /etc/sysconfig/rc +. $rc_functions + +case "$1" in + start) + boot_mesg "Starting nginx Server..." + loadproc /usr/sbin/nginx + ;; + + stop) + boot_mesg "Stopping nginx Server..." + killproc /usr/sbin/nginx + ;; + + reload) + boot_mesg "Reloading nginx Server..." + reloadproc /usr/sbin/nginx + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + status) + statusproc /usr/sbin/nginx + ;; + + *) + echo "Usage: $0 {start|stop|reload|restart|status}" + exit 1 + ;; +esac + +# End $rc_base/init.d/nginx diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl index 8c4f77c..b623cbe 100644 --- a/config/qos/makeqosscripts.pl +++ b/config/qos/makeqosscripts.pl @@ -58,7 +58,7 @@ my $subclassfile = "/var/ipfire/qos/subclasses"; my $level7file = "/var/ipfire/qos/level7config"; my $portfile = "/var/ipfire/qos/portconfig"; my $tosfile = "/var/ipfire/qos/tosconfig"; -my $fqcodel_options = "noecn limit 800 quantum 500"; +my $fqcodel_options = "limit 800 quantum 500";

&General::readhash("${General::swroot}/ethernet/settings", %netsettings);

diff --git a/config/rootfiles/core/66/filelists/files b/config/rootfiles/core/66/filelists/files index a7f3664..e139bb0 100644 --- a/config/rootfiles/core/66/filelists/files +++ b/config/rootfiles/core/66/filelists/files @@ -38,6 +38,7 @@ srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/cgi-bin/updatexlrator.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi usr/bin/watch +usr/local/bin/backupiso usr/local/bin/makegraphs usr/local/bin/readhash usr/local/bin/scanhd diff --git a/config/rootfiles/packages/avahi b/config/rootfiles/packages/avahi new file mode 100644 index 0000000..af1d3d9 --- /dev/null +++ b/config/rootfiles/packages/avahi @@ -0,0 +1,163 @@ +etc/avahi +etc/avahi/avahi-autoipd.action +etc/avahi/avahi-daemon.conf +etc/avahi/avahi-dnsconfd.action +etc/avahi/hosts +etc/avahi/services +etc/avahi/services/sftp-ssh.service +etc/avahi/services/smb.service +etc/avahi/services/ssh.service +#etc/dbus-1/system.d/avahi-dbus.conf +etc/rc.d/init.d/avahi +usr/bin/avahi-browse +usr/bin/avahi-browse-domains +usr/bin/avahi-publish +usr/bin/avahi-publish-address +usr/bin/avahi-publish-service +usr/bin/avahi-resolve +usr/bin/avahi-resolve-address +usr/bin/avahi-resolve-host-name +usr/bin/avahi-set-host-name +#usr/include/avahi-client +#usr/include/avahi-client/client.h +#usr/include/avahi-client/lookup.h +#usr/include/avahi-client/publish.h +#usr/include/avahi-common +#usr/include/avahi-common/address.h +#usr/include/avahi-common/alternative.h +#usr/include/avahi-common/cdecl.h +#usr/include/avahi-common/defs.h +#usr/include/avahi-common/domain.h +#usr/include/avahi-common/error.h +#usr/include/avahi-common/gccmacro.h +#usr/include/avahi-common/llist.h +#usr/include/avahi-common/malloc.h +#usr/include/avahi-common/rlist.h +#usr/include/avahi-common/simple-watch.h +#usr/include/avahi-common/strlst.h +#usr/include/avahi-common/thread-watch.h +#usr/include/avahi-common/timeval.h +#usr/include/avahi-common/watch.h +#usr/include/avahi-core +#usr/include/avahi-core/core.h +#usr/include/avahi-core/log.h +#usr/include/avahi-core/lookup.h +#usr/include/avahi-core/publish.h +#usr/include/avahi-core/rr.h +#usr/include/avahi-glib +#usr/include/avahi-glib/glib-malloc.h +#usr/include/avahi-glib/glib-watch.h +#usr/include/avahi-gobject +#usr/include/avahi-gobject/ga-client.h +#usr/include/avahi-gobject/ga-entry-group.h +#usr/include/avahi-gobject/ga-enums.h +#usr/include/avahi-gobject/ga-error.h +#usr/include/avahi-gobject/ga-record-browser.h +#usr/include/avahi-gobject/ga-service-browser.h +#usr/include/avahi-gobject/ga-service-resolver.h +#usr/lib/avahi +usr/lib/avahi/service-types.db +#usr/lib/libavahi-client.a +#usr/lib/libavahi-client.la +#usr/lib/libavahi-client.so +usr/lib/libavahi-client.so.3 +usr/lib/libavahi-client.so.3.2.9 +#usr/lib/libavahi-common.a +#usr/lib/libavahi-common.la +#usr/lib/libavahi-common.so +usr/lib/libavahi-common.so.3 +usr/lib/libavahi-common.so.3.5.3 +#usr/lib/libavahi-core.a +#usr/lib/libavahi-core.la +#usr/lib/libavahi-core.so +usr/lib/libavahi-core.so.7 +usr/lib/libavahi-core.so.7.0.2 +#usr/lib/libavahi-glib.a +#usr/lib/libavahi-glib.la +#usr/lib/libavahi-glib.so +usr/lib/libavahi-glib.so.1 +usr/lib/libavahi-glib.so.1.0.2 +#usr/lib/libavahi-gobject.a +#usr/lib/libavahi-gobject.la +#usr/lib/libavahi-gobject.so +usr/lib/libavahi-gobject.so.0 +usr/lib/libavahi-gobject.so.0.0.4 +#usr/lib/pkgconfig/avahi-client.pc +#usr/lib/pkgconfig/avahi-core.pc +#usr/lib/pkgconfig/avahi-glib.pc +#usr/lib/pkgconfig/avahi-gobject.pc +usr/lib/python2.7/site-packages/avahi +usr/lib/python2.7/site-packages/avahi/ServiceTypeDatabase.py +usr/sbin/avahi-autoipd +usr/sbin/avahi-daemon +usr/sbin/avahi-dnsconfd +usr/share/avahi +usr/share/avahi/avahi-service.dtd +usr/share/avahi/service-types +#usr/share/dbus-1/interfaces +#usr/share/dbus-1/interfaces/org.freedesktop.Avahi.AddressResolver.xml +#usr/share/dbus-1/interfaces/org.freedesktop.Avahi.DomainBrowser.xml +#usr/share/dbus-1/interfaces/org.freedesktop.Avahi.EntryGroup.xml +#usr/share/dbus-1/interfaces/org.freedesktop.Avahi.HostNameResolver.xml +#usr/share/dbus-1/interfaces/org.freedesktop.Avahi.RecordBrowser.xml +#usr/share/dbus-1/interfaces/org.freedesktop.Avahi.Server.xml +#usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceBrowser.xml +#usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceResolver.xml +#usr/share/dbus-1/interfaces/org.freedesktop.Avahi.ServiceTypeBrowser.xml +#usr/share/dbus-1/system-services +#usr/share/locale/bg/LC_MESSAGES/avahi.mo +#usr/share/locale/ca/LC_MESSAGES/avahi.mo +#usr/share/locale/cs/LC_MESSAGES/avahi.mo +#usr/share/locale/da/LC_MESSAGES/avahi.mo +#usr/share/locale/de/LC_MESSAGES/avahi.mo +#usr/share/locale/el/LC_MESSAGES/avahi.mo +#usr/share/locale/en_AU/LC_MESSAGES/avahi.mo +#usr/share/locale/en_CA/LC_MESSAGES/avahi.mo +#usr/share/locale/en_GB/LC_MESSAGES/avahi.mo +#usr/share/locale/en_NZ +#usr/share/locale/en_NZ/LC_MESSAGES +#usr/share/locale/en_NZ/LC_MESSAGES/avahi.mo +#usr/share/locale/es/LC_MESSAGES/avahi.mo +#usr/share/locale/fi/LC_MESSAGES/avahi.mo +#usr/share/locale/fo +#usr/share/locale/fo/LC_MESSAGES +#usr/share/locale/fo/LC_MESSAGES/avahi.mo +#usr/share/locale/fr/LC_MESSAGES/avahi.mo +#usr/share/locale/gl/LC_MESSAGES/avahi.mo +#usr/share/locale/he/LC_MESSAGES/avahi.mo +#usr/share/locale/hu/LC_MESSAGES/avahi.mo +#usr/share/locale/id/LC_MESSAGES/avahi.mo +#usr/share/locale/it/LC_MESSAGES/avahi.mo +#usr/share/locale/ja/LC_MESSAGES/avahi.mo +#usr/share/locale/ms/LC_MESSAGES/avahi.mo +#usr/share/locale/nl/LC_MESSAGES/avahi.mo +#usr/share/locale/pl/LC_MESSAGES/avahi.mo +#usr/share/locale/pt_BR/LC_MESSAGES/avahi.mo +#usr/share/locale/ro/LC_MESSAGES/avahi.mo +#usr/share/locale/ru/LC_MESSAGES/avahi.mo +#usr/share/locale/sl/LC_MESSAGES/avahi.mo +#usr/share/locale/sr/LC_MESSAGES/avahi.mo +#usr/share/locale/sr@latin/LC_MESSAGES/avahi.mo +#usr/share/locale/sv/LC_MESSAGES/avahi.mo +#usr/share/locale/uk/LC_MESSAGES/avahi.mo +#usr/share/locale/zh_CN/LC_MESSAGES/avahi.mo +#usr/share/locale/zh_TW/LC_MESSAGES/avahi.mo +#usr/share/man/man1/avahi-bookmarks.1 +#usr/share/man/man1/avahi-browse-domains.1 +#usr/share/man/man1/avahi-browse.1 +#usr/share/man/man1/avahi-publish-address.1 +#usr/share/man/man1/avahi-publish-service.1 +#usr/share/man/man1/avahi-publish.1 +#usr/share/man/man1/avahi-resolve-address.1 +#usr/share/man/man1/avahi-resolve-host-name.1 +#usr/share/man/man1/avahi-resolve.1 +#usr/share/man/man1/avahi-set-host-name.1 +#usr/share/man/man5/avahi-daemon.conf.5 +#usr/share/man/man5/avahi.hosts.5 +#usr/share/man/man5/avahi.service.5 +#usr/share/man/man8/avahi-autoipd.8 +#usr/share/man/man8/avahi-autoipd.action.8 +#usr/share/man/man8/avahi-daemon.8 +#usr/share/man/man8/avahi-dnsconfd.8 +#usr/share/man/man8/avahi-dnsconfd.action.8 +etc/init.d/avahi diff --git a/config/rootfiles/packages/libdaemon b/config/rootfiles/packages/libdaemon new file mode 100644 index 0000000..d22e694 --- /dev/null +++ b/config/rootfiles/packages/libdaemon @@ -0,0 +1,17 @@ +#usr/include/libdaemon +#usr/include/libdaemon/daemon.h +#usr/include/libdaemon/dexec.h +#usr/include/libdaemon/dfork.h +#usr/include/libdaemon/dlog.h +#usr/include/libdaemon/dnonblock.h +#usr/include/libdaemon/dpid.h +#usr/include/libdaemon/dsignal.h +#usr/lib/libdaemon.a +#usr/lib/libdaemon.la +#usr/lib/libdaemon.so +usr/lib/libdaemon.so.0 +usr/lib/libdaemon.so.0.5.0 +#usr/lib/pkgconfig/libdaemon.pc +#usr/share/doc/libdaemon +#usr/share/doc/libdaemon/README.html +#usr/share/doc/libdaemon/style.css diff --git a/config/rootfiles/packages/nginx b/config/rootfiles/packages/nginx new file mode 100644 index 0000000..ce98205 --- /dev/null +++ b/config/rootfiles/packages/nginx @@ -0,0 +1,23 @@ +etc/nginx +etc/nginx/fastcgi.conf +etc/nginx/fastcgi.conf.default +etc/nginx/fastcgi_params +etc/nginx/fastcgi_params.default +etc/nginx/koi-utf +etc/nginx/koi-win +etc/nginx/mime.types +etc/nginx/mime.types.default +etc/nginx/nginx.conf +etc/nginx/nginx.conf.default +etc/nginx/scgi_params +etc/nginx/scgi_params.default +etc/nginx/uwsgi_params +etc/nginx/uwsgi_params.default +etc/nginx/win-utf +usr/sbin/nginx +usr/share/nginx +usr/share/nginx/html +usr/share/nginx/html/50x.html +usr/share/nginx/html/index.html +var/log/nginx +var/spool/nginx diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi index 8c93814..830775d 100644 --- a/html/cgi-bin/backup.cgi +++ b/html/cgi-bin/backup.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2005-2010 IPFire Team # +# Copyright (C) 2005-2013 IPFire Team info@ipfire.org # # # # 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 # @@ -176,7 +176,13 @@ print <<END <td align='left'> <input type='radio' name='BACKUPLOGS' value='include'/> $Lang::tr{'include logfiles'}<br/> <input type='radio' name='BACKUPLOGS' value='exclude' checked='checked'/> $Lang::tr{'exclude logfiles'}<br/> - <input type='radio' name='BACKUPLOGS' value='iso' /> $Lang::tr{'generate iso'} +END +; +my $MACHINE=`uname -m`; +if ( ! ( $MACHINE =~ "arm" )) { + print" <input type='radio' name='BACKUPLOGS' value='iso' /> $Lang::tr{'generate iso'}<br/>" +} +print <<END </td> </tr> <tr><td align='center' colspan='2'> diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi old mode 100755 new mode 100644 diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 0b28c2a..cc7416a 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2013 IPFire Team info@ipfire.org # # # # 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 # @@ -3556,15 +3556,15 @@ if ($delaypools) {

if ($proxysettings{'NO_PROXY_LOCAL'} eq 'on') { - print FILE "#Prevent internal proxy access to Green\n"; - print FILE "http_access deny IPFire_green_servers !IPFire_green_network\n\n"; + print FILE "#Prevent internal proxy access to Green except IPFire itself\n"; + print FILE "http_access deny IPFire_green_servers !IPFire_ips !IPFire_green_network\n\n"; }

if ($proxysettings{'NO_PROXY_LOCAL_BLUE'} eq 'on') { - print FILE "#Prevent internal proxy access from Blue\n"; + print FILE "#Prevent internal proxy access from Blue except IPFire itself\n"; print FILE "http_access allow IPFire_blue_network IPFire_blue_servers\n"; - print FILE "http_access deny IPFire_blue_network IPFire_servers\n\n"; + print FILE "http_access deny IPFire_blue_network !IPFire_ips IPFire_servers\n\n"; }

print FILE <<END diff --git a/lfs/avahi b/lfs/avahi new file mode 100644 index 0000000..88263a1 --- /dev/null +++ b/lfs/avahi @@ -0,0 +1,89 @@ +############################################################################### +# # +# 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.6.31 + +THISAPP = avahi-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = avahi +PAK_VER = 3 + +DEPS = "libdaemon" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 2f22745b8f7368ad5a0a3fddac343f2d + +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) && ./configure --prefix=/usr --with-avahi-user=avahi \ + --disable-qt3 --disable-qt4 --disable-gtk --disable-gtk3 \ + --disable-pygtk --disable-python-dbus --disable-mono \ + --disable-monodoc --with-distro=none --sysconfdir=/etc + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + cp -avf $(DIR_SRC)/config/avahi/avahi /etc/init.d/ + cp -avf $(DIR_SRC)/config/avahi/smb.service /etc/avahi/services/smb.service + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/libdaemon b/lfs/libdaemon new file mode 100644 index 0000000..0804b45 --- /dev/null +++ b/lfs/libdaemon @@ -0,0 +1,82 @@ +############################################################################### +# # +# 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.14 + +THISAPP = libdaemon-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = libdaemon +PAK_VER = 1 + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 509dc27107c21bcd9fbf2f95f5669563 + +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) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/nginx b/lfs/nginx new file mode 100644 index 0000000..2b7e626 --- /dev/null +++ b/lfs/nginx @@ -0,0 +1,108 @@ +############################################################################### +# # +# 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 = 1.3.11 + +THISAPP = nginx-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = nginx +PAK_VER = 1 + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 4d299999bca4d2cecfbe48e51684a345 + +objects += nginx_tcp_proxy_module.tar.bz2 +nginx_tcp_proxy_module.tar.bz2 = $(DL_FROM)/nginx_tcp_proxy_module.tar.bz2 +nginx_tcp_proxy_module.tar.bz2_MD5 = f07898b5b783ef65d416019b51cb1de8 + +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) && tar xvf $(DIR_SRC)/cache/nginx_tcp_proxy_module.tar.bz2 -C $(DIR_APP) + cd $(DIR_APP) && patch -p1 < nginx_tcp_proxy_module/tcp.patch + cd $(DIR_APP) && ./configure \ + --prefix=/usr/share/nginx/ \ + --conf-path=/etc/nginx/nginx.conf \ + --sbin-path=/usr/sbin/nginx \ + --pid-path=/var/run/nginx.pid \ + --lock-path=/var/lock/nginx.lock \ + --http-client-body-temp-path=/var/spool/nginx/client_body_temp \ + --http-proxy-temp-path=/var/spool/nginx/proxy_temp \ + --http-fastcgi-temp-path=/var/spool/nginx/fastcgi_temp \ + --http-log-path=/var/log/nginx/access.log \ + --error-log-path=/var/log/nginx/error.log \ + --user=nobody \ + --group=nobody \ + --with-imap --with-imap_ssl_module --with-http_ssl_module \ + --with-http_stub_status_module \ + --with-http_dav_module \ + --with-http_sub_module \ + --add-module=nginx_tcp_proxy_module/ + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + mkdir -p /var/log/nginx /var/spool/nginx + cp /usr/src/config/nginx/nginx /etc/init.d/ +# chown http:http /var/log/nginx +# @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index da3349b..54fb812 100755 --- a/make.sh +++ b/make.sh @@ -24,9 +24,9 @@

NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.13rc2" # Version number -CORE="65" # Core Level (Filename) -PAKFIRE_CORE="65" # Core Level (PAKFIRE) +VERSION="2.13" # Version number +CORE="66" # Core Level (Filename) +PAKFIRE_CORE="66" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir @@ -755,6 +755,9 @@ buildipfire() { ipfiremake sarg ipfiremake fstrim ipfiremake check_mk_agent + ipfiremake libdaemon + ipfiremake avahi + ipfiremake nginx echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index 14139b5..bf0a356 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -277,7 +277,7 @@ int main(int argc, char *argv[]) ctr[TR_CANCEL], NULL); } else { rc = 1; - fstype = EXT3; + fstype = EXT4; } if (rc == 2) goto EXIT; @@ -596,12 +596,6 @@ EXIT: fclose(flog); newtFinished();

- if (unattended) { - // Remove Setup autorun after boot - if (system("rm -f /harddisk/etc/rc.d/rcsysinit.d/S75firstsetup")) - printf("Unable to disable setup autorun.\n"); - } - if (system("/bin/umount /harddisk/proc")) printf("Unable to umount /harddisk/proc.\n"); } else { diff --git a/src/paks/avahi/install.sh b/src/paks/avahi/install.sh new file mode 100644 index 0000000..bcbb631 --- /dev/null +++ b/src/paks/avahi/install.sh @@ -0,0 +1,30 @@ +#!/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 +ln -svf ../init.d/avahi /etc/rc.d/rc3.d/S65avahi +ln -svf ../init.d/avahi /etc/rc.d/rc0.d/K35avahi +ln -svf ../init.d/avahi /etc/rc.d/rc6.d/K35avahi +restore_backup ${NAME} +start_service --background ${NAME} diff --git a/src/paks/avahi/uninstall.sh b/src/paks/avahi/uninstall.sh new file mode 100644 index 0000000..1c8e67c --- /dev/null +++ b/src/paks/avahi/uninstall.sh @@ -0,0 +1,28 @@ +#!/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 +stop_service ${NAME} +make_backup ${NAME} +remove_files +rm -rf /etc/rc.d/rc*.d/*avahi diff --git a/src/paks/avahi/update.sh b/src/paks/avahi/update.sh new file mode 100644 index 0000000..89c40d0 --- /dev/null +++ b/src/paks/avahi/update.sh @@ -0,0 +1,26 @@ +#!/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 diff --git a/src/paks/libdaemon/install.sh b/src/paks/libdaemon/install.sh new file mode 100644 index 0000000..2df1ecd --- /dev/null +++ b/src/paks/libdaemon/install.sh @@ -0,0 +1,25 @@ +#!/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 diff --git a/src/paks/libdaemon/uninstall.sh b/src/paks/libdaemon/uninstall.sh new file mode 100644 index 0000000..66f4344 --- /dev/null +++ b/src/paks/libdaemon/uninstall.sh @@ -0,0 +1,26 @@ +#!/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 +make_backup ${NAME} +remove_files diff --git a/src/paks/libdaemon/update.sh b/src/paks/libdaemon/update.sh new file mode 100644 index 0000000..89c40d0 --- /dev/null +++ b/src/paks/libdaemon/update.sh @@ -0,0 +1,26 @@ +#!/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 diff --git a/src/paks/nginx/install.sh b/src/paks/nginx/install.sh new file mode 100644 index 0000000..d5cb155 --- /dev/null +++ b/src/paks/nginx/install.sh @@ -0,0 +1,32 @@ +#!/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 +restore_backup ${NAME} + +ln -svf ../init.d/nginx /etc/rc.d/rc0.d/K20nginx +ln -svf ../init.d/nginx /etc/rc.d/rc3.d/S40nginx +ln -svf ../init.d/nginx /etc/rc.d/rc6.d/K20nginx + +start_service --background ${NAME} diff --git a/src/paks/nginx/uninstall.sh b/src/paks/nginx/uninstall.sh new file mode 100644 index 0000000..ded53f0 --- /dev/null +++ b/src/paks/nginx/uninstall.sh @@ -0,0 +1,29 @@ +#!/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 +stop_service ${NAME} +make_backup ${NAME} +remove_files + +rm -rf /etc/rc.d/rc*.d/*nginx diff --git a/src/paks/nginx/update.sh b/src/paks/nginx/update.sh new file mode 100644 index 0000000..89c40d0 --- /dev/null +++ b/src/paks/nginx/update.sh @@ -0,0 +1,26 @@ +#!/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 diff --git a/src/scripts/backupiso b/src/scripts/backupiso index 6bea855..30616a4 100644 --- a/src/scripts/backupiso +++ b/src/scripts/backupiso @@ -1,11 +1,11 @@ #!/bin/sh

-COREVER=`cat /opt/pakfire/db/core/mine` +COREVER=$(cat /opt/pakfire/db/core/mine) # FIXME: edit this lines before release -URL=http://download.ipfire.org/releases/ipfire-2.x/2.11-core$COREVER/ -ISO=ipfire-2.11.i586-full-core$COREVER.iso +URL="http://download.ipfire.org/releases/ipfire-2.x/2.13-core$COREVER/" +ISO="ipfire-2.13.i586-full-core$COREVER.iso"

-if [ -z "$1" ]; then +if [ -z $1 ]; then echo usage: $0 backup-file exit fi @@ -15,22 +15,36 @@ TS=$1 mkdir -p /var/tmp/backupiso cd /var/tmp/backupiso

-echo "Fetching ${URL}${ISO}" -wget --quiet -c ${URL}${ISO} -echo "Fetching ${URL}md5sums.txt" +if [ ! -e ${ISO} ] +then + echo "Fetching ${URL}${ISO}" + wget --quiet -c ${URL}${ISO} +fi + +echo "Fetching ${URL}${ISO}.md5" wget --quiet -O ${ISO}.md5 ${URL}${ISO}.md5

echo "Checking md5 of ${ISO}" md5sum --status -c ${ISO}.md5 -RETVAR="$?" -if [ $RETVAR -eq 0 -o $RETVAR -eq 24 ] - then - echo "md5 is OK" - else - echo "md5 mismatch" - echo "Fetching again ${URL}${ISO}" - wget --quiet -O ${ISO} ${URL}${ISO} +if [ $? -eq 0 -o $? -eq 24 ] +then + echo "md5 is OK" +else + echo "md5 mismatch" + echo "Fetching again ${URL}${ISO}" + wget --quiet -O ${ISO} ${URL}${ISO} + echo "Checking again md5 of ${ISO}" + md5sum --status -c ${ISO}.md5 + if [ $? -eq 0 -o $? -eq 24 ] + then + echo "md5 is OK" + else + echo "md5 mismatch" + echo "aborting backup because md5 mismatch" + exit 1 + fi fi +rm ${ISO}.md5

echo "Remastering iso" mkdir -p backupiso.tmp.${TS} @@ -45,7 +59,7 @@ cp /var/ipfire/backup/${TS}.ipf backupiso.${TS} echo "Running mkisofs" mkisofs -J -r -V "ipfire backup ${TS}" \ -b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \ - -c boot/isolinux/boot.catalog backupiso.${TS} > `basename ${ISO} .iso`-${TS}.iso + -c boot/isolinux/boot.catalog backupiso.${TS} > $(basename ${ISO} .iso)-${TS}.iso

echo "Cleaning up" rm -rf backupiso.${TS} diff --git a/src/scripts/readhash b/src/scripts/readhash index cc063a7..bffc93f 100644 --- a/src/scripts/readhash +++ b/src/scripts/readhash @@ -13,7 +13,7 @@ VARNAME='[A-Za-z_][A-Za-z0-9_]*'

# For the assigned value we only accept a limited number of characters - none # of which are shell metachars -VARCHARS='A-Za-z0-9=/,.:_@#+-' +VARCHARS='A-Za-z0-9=/,.:%_@#+-' VARVAL="[${VARCHARS}]*"

sed -ne "s/(${VARNAME})=(${VARVAL})$/\1=\2/p" $1

hooks/post-receive -- IPFire 2.x development tree