]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
Merge remote-tracking branch 'stevee/core67-merge' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 3 Mar 2013 22:11:17 +0000 (23:11 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 3 Mar 2013 22:11:17 +0000 (23:11 +0100)
Conflicts:
make.sh

60 files changed:
config/avahi/avahi [new file with mode: 0755]
config/avahi/smb.service [new file with mode: 0644]
config/backup/includes/avahi [new file with mode: 0644]
config/backup/includes/nginx [new file with mode: 0644]
config/nginx/nginx [new file with mode: 0755]
config/rootfiles/common/compat-drivers [moved from config/rootfiles/common/compat-wireless with 100% similarity]
config/rootfiles/core/67/exclude [new file with mode: 0644]
config/rootfiles/core/67/filelists/compat-drivers [new symlink]
config/rootfiles/core/67/filelists/files [new file with mode: 0644]
config/rootfiles/core/67/filelists/fireinfo [new symlink]
config/rootfiles/core/67/filelists/i586/compat-drivers-modules [new file with mode: 0644]
config/rootfiles/core/67/filelists/i586/compat-drivers-modules-pae [new file with mode: 0644]
config/rootfiles/core/67/filelists/i586/compat-drivers-modules-pae-xen [new file with mode: 0644]
config/rootfiles/core/67/filelists/squid [new symlink]
config/rootfiles/core/67/meta [new file with mode: 0644]
config/rootfiles/core/67/update.sh [new file with mode: 0644]
config/rootfiles/installer/network-modules
config/rootfiles/packages/avahi [new file with mode: 0644]
config/rootfiles/packages/check_mk_agent [new file with mode: 0644]
config/rootfiles/packages/libdaemon [new file with mode: 0644]
config/rootfiles/packages/nginx [new file with mode: 0644]
doc/language_issues.es
doc/language_issues.fr
doc/language_issues.nl
doc/language_issues.pl
doc/language_issues.ru
doc/language_missings
html/cgi-bin/proxy.cgi
html/cgi-bin/samba.cgi
html/cgi-bin/wlanap.cgi
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl
langs/es/cgi-bin/es.pl
langs/nl/cgi-bin/nl.pl
langs/pl/cgi-bin/pl.pl
langs/ru/cgi-bin/ru.pl
lfs/avahi [new file with mode: 0644]
lfs/check_mk_agent [new file with mode: 0644]
lfs/compat-drivers [moved from lfs/compat-wireless with 87% similarity]
lfs/fireinfo
lfs/hostapd
lfs/libdaemon [new file with mode: 0644]
lfs/mISDN
lfs/nginx [new file with mode: 0644]
lfs/squid
make.sh
src/install+setup/install/mountdest.sh
src/paks/avahi/install.sh [new file with mode: 0644]
src/paks/avahi/uninstall.sh [new file with mode: 0644]
src/paks/avahi/update.sh [new file with mode: 0644]
src/paks/check_mk_agent/install.sh [new file with mode: 0644]
src/paks/check_mk_agent/uninstall.sh [new file with mode: 0644]
src/paks/check_mk_agent/update.sh [new file with mode: 0644]
src/paks/libdaemon/install.sh [new file with mode: 0644]
src/paks/libdaemon/uninstall.sh [new file with mode: 0644]
src/paks/libdaemon/update.sh [new file with mode: 0644]
src/paks/nginx/install.sh [new file with mode: 0644]
src/paks/nginx/uninstall.sh [new file with mode: 0644]
src/paks/nginx/update.sh [new file with mode: 0644]
src/patches/compat-wireless-3.6.8-remove_3.1_cpufreq_backport.patch [deleted file]

diff --git a/config/avahi/avahi b/config/avahi/avahi
new file mode 100755 (executable)
index 0000000..206146a
--- /dev/null
@@ -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 (file)
index 0000000..d895354
--- /dev/null
@@ -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 (file)
index 0000000..7f32af6
--- /dev/null
@@ -0,0 +1 @@
+/etc/avahi/avahi-daemon.conf
diff --git a/config/backup/includes/nginx b/config/backup/includes/nginx
new file mode 100644 (file)
index 0000000..db8e6ed
--- /dev/null
@@ -0,0 +1 @@
+/etc/nginx/nginx.conf
diff --git a/config/nginx/nginx b/config/nginx/nginx
new file mode 100755 (executable)
index 0000000..67f757d
--- /dev/null
@@ -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/rootfiles/core/67/exclude b/config/rootfiles/core/67/exclude
new file mode 100644 (file)
index 0000000..18141fd
--- /dev/null
@@ -0,0 +1,16 @@
+srv/web/ipfire/html/proxy.pac
+etc/udev/rules.d/30-persistent-network.rules
+etc/collectd.custom
+etc/shadow
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+var/log/cache
+var/updatecache
+etc/localtime
+var/ipfire/ovpn
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
+var/state/dhcp/dhcpd.leases
diff --git a/config/rootfiles/core/67/filelists/compat-drivers b/config/rootfiles/core/67/filelists/compat-drivers
new file mode 120000 (symlink)
index 0000000..0d2a611
--- /dev/null
@@ -0,0 +1 @@
+../../../common/compat-drivers
\ No newline at end of file
diff --git a/config/rootfiles/core/67/filelists/files b/config/rootfiles/core/67/filelists/files
new file mode 100644 (file)
index 0000000..ba0d5cc
--- /dev/null
@@ -0,0 +1,4 @@
+etc/system-release
+etc/issue
+srv/web/ipfire/cgi-bin/proxy.cgi
+var/ipfire/langs
diff --git a/config/rootfiles/core/67/filelists/fireinfo b/config/rootfiles/core/67/filelists/fireinfo
new file mode 120000 (symlink)
index 0000000..c461155
--- /dev/null
@@ -0,0 +1 @@
+../../../common/fireinfo
\ No newline at end of file
diff --git a/config/rootfiles/core/67/filelists/i586/compat-drivers-modules b/config/rootfiles/core/67/filelists/i586/compat-drivers-modules
new file mode 100644 (file)
index 0000000..967056c
--- /dev/null
@@ -0,0 +1,146 @@
+lib/modules/KVER-ipfire/kernel/compat/compat.ko
+lib/modules/KVER-ipfire/kernel/compat/sch_codel.ko
+lib/modules/KVER-ipfire/kernel/compat/sch_fq_codel.ko
+lib/modules/KVER-ipfire/kernel/drivers/bcma/bcma.ko
+lib/modules/KVER-ipfire/kernel/drivers/bluetooth/ath3k.ko
+lib/modules/KVER-ipfire/kernel/drivers/bluetooth/bcm203x.ko
+lib/modules/KVER-ipfire/kernel/drivers/bluetooth/bfusb.ko
+lib/modules/KVER-ipfire/kernel/drivers/bluetooth/bluecard_cs.ko
+lib/modules/KVER-ipfire/kernel/drivers/bluetooth/bpa10x.ko
+lib/modules/KVER-ipfire/kernel/drivers/bluetooth/bt3c_cs.ko
+lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btmrvl.ko
+lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btmrvl_sdio.ko
+lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btsdio.ko
+lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btuart_cs.ko
+lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btusb.ko
+lib/modules/KVER-ipfire/kernel/drivers/bluetooth/btwilink.ko
+lib/modules/KVER-ipfire/kernel/drivers/bluetooth/dtl1_cs.ko
+lib/modules/KVER-ipfire/kernel/drivers/bluetooth/hci_uart.ko
+lib/modules/KVER-ipfire/kernel/drivers/bluetooth/hci_vhci.ko
+lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/drm.ko
+lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/drm_kms_helper.ko
+lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/i915/i915.ko
+lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/radeon/radeon.ko
+lib/modules/KVER-ipfire/kernel/drivers/gpu/drm/ttm/ttm.ko
+lib/modules/KVER-ipfire/kernel/drivers/misc/eeprom/eeprom_93cx6.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/atheros/alx/alx.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/atheros/atl1c/atl1c.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/atheros/atl1e/atl1e.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/atheros/atlx/atl1.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/atheros/atlx/atl2.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/broadcom/b44.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/usb/asix.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/usb/catc.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/usb/cdc_eem.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/usb/cdc_ether.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/usb/cdc_ncm.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/usb/cdc_subset.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/usb/cx82310_eth.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/usb/dm9601.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/usb/gl620a.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/usb/hso.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/usb/int51x1.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/usb/kalmia.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/usb/kaweth.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/usb/lg-vl600.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/usb/mcs7830.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/usb/net1080.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/usb/pegasus.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/usb/plusb.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/usb/rndis_host.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/usb/rtl8150.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/usb/sierra_net.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/usb/smsc75xx.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/usb/smsc95xx.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/usb/usbnet.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/usb/zaurus.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/adm8211.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/at76c50x-usb.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/ar5523/ar5523.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/ath.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/ath6kl/ath6kl_core.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/ath6kl/ath6kl_sdio.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/ath6kl/ath6kl_usb.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_htc.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/carl9170/carl9170.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/wil6210/wil6210.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/b43/b43.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/b43legacy/b43legacy.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/brcm80211/brcmfmac/brcmfmac.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/brcm80211/brcmsmac/brcmsmac.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/brcm80211/brcmutil/brcmutil.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ipw2x00/libipw.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/iwlegacy/iwl3945.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/iwlegacy/iwl4965.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/iwlegacy/iwlegacy.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/iwlwifi/dvm/iwldvm.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/iwlwifi/iwlwifi.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas/libertas.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas/libertas_cs.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas/libertas_sdio.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas/usb8xxx.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas_uap/uap8xxx.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/mac80211_hwsim.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/mwifiex/mwifiex.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/mwifiex/mwifiex_pcie.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/mwifiex/mwifiex_sdio.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/mwifiex/mwifiex_usb.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/mwl8k.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco/orinoco.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_usb.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/p54/p54common.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/p54/p54pci.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/p54/p54usb.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rndis_wlan.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rt2x00/rt61pci.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rt2x00/rt73usb.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rtl818x/rtl8180/rtl8180.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rtl818x/rtl8187/rtl8187.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rtlwifi/rtl8192c/rtl8192c-common.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192ce.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rtlwifi/rtl8192cu/rtl8192cu.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rtlwifi/rtl8192de/rtl8192de.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rtlwifi/rtl8192se/rtl8192se.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rtlwifi/rtl8723ae/rtl8723ae.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/rtlwifi/rtlwifi.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ti/wl1251/wl1251.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ti/wl12xx/wl12xx.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ti/wl18xx/wl18xx.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ti/wlcore/wlcore.ko
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
+lib/modules/KVER-ipfire/kernel/drivers/ssb/ssb.ko
+lib/modules/KVER-ipfire/kernel/net/bluetooth/bluetooth.ko
+lib/modules/KVER-ipfire/kernel/net/bluetooth/bnep/bnep.ko
+lib/modules/KVER-ipfire/kernel/net/bluetooth/cmtp/cmtp.ko
+lib/modules/KVER-ipfire/kernel/net/bluetooth/hidp/hidp.ko
+lib/modules/KVER-ipfire/kernel/net/bluetooth/rfcomm/rfcomm.ko
+lib/modules/KVER-ipfire/kernel/net/mac80211/mac80211.ko
+lib/modules/KVER-ipfire/kernel/net/rfkill/rfkill-regulator.ko
+lib/modules/KVER-ipfire/kernel/net/wireless/cfg80211.ko
+lib/modules/KVER-ipfire/kernel/net/wireless/lib80211.ko
+lib/modules/KVER-ipfire/kernel/net/wireless/lib80211_crypt_ccmp.ko
+lib/modules/KVER-ipfire/kernel/net/wireless/lib80211_crypt_tkip.ko
+lib/modules/KVER-ipfire/kernel/net/wireless/lib80211_crypt_wep.ko
diff --git a/config/rootfiles/core/67/filelists/i586/compat-drivers-modules-pae b/config/rootfiles/core/67/filelists/i586/compat-drivers-modules-pae
new file mode 100644 (file)
index 0000000..ca544a2
--- /dev/null
@@ -0,0 +1,146 @@
+lib/modules/KVER-ipfire-pae/kernel/compat/compat.ko
+lib/modules/KVER-ipfire-pae/kernel/compat/sch_codel.ko
+lib/modules/KVER-ipfire-pae/kernel/compat/sch_fq_codel.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/bcma/bcma.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/ath3k.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/bcm203x.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/bfusb.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/bluecard_cs.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/bpa10x.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/bt3c_cs.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/btmrvl.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/btmrvl_sdio.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/btsdio.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/btuart_cs.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/btusb.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/btwilink.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/dtl1_cs.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/hci_uart.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/bluetooth/hci_vhci.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/drm.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/drm_kms_helper.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/i915/i915.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/radeon/radeon.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/gpu/drm/ttm/ttm.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/misc/eeprom/eeprom_93cx6.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/ethernet/atheros/alx/alx.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/ethernet/atheros/atl1c/atl1c.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/ethernet/atheros/atl1e/atl1e.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/ethernet/atheros/atlx/atl1.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/ethernet/atheros/atlx/atl2.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/ethernet/broadcom/b44.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/asix.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/catc.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/cdc_eem.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/cdc_ether.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/cdc_ncm.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/cdc_subset.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/cx82310_eth.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/dm9601.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/gl620a.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/hso.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/int51x1.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/kalmia.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/kaweth.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/lg-vl600.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/mcs7830.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/net1080.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/pegasus.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/plusb.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/rndis_host.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/rtl8150.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/sierra_net.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/smsc75xx.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/smsc95xx.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/usbnet.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/usb/zaurus.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/adm8211.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/at76c50x-usb.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/ar5523/ar5523.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/ath.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/ath6kl/ath6kl_core.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/ath6kl/ath6kl_sdio.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/ath6kl/ath6kl_usb.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k/ath9k_htc.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/carl9170/carl9170.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/wil6210/wil6210.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/b43/b43.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/b43legacy/b43legacy.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/brcm80211/brcmfmac/brcmfmac.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/brcm80211/brcmsmac/brcmsmac.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/brcm80211/brcmutil/brcmutil.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ipw2x00/libipw.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/iwlegacy/iwl3945.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/iwlegacy/iwl4965.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/iwlegacy/iwlegacy.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/iwlwifi/dvm/iwldvm.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/iwlwifi/iwlwifi.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas/libertas.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas/libertas_cs.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas/libertas_sdio.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas/usb8xxx.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/libertas_uap/uap8xxx.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/mac80211_hwsim.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/mwifiex/mwifiex.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/mwifiex/mwifiex_pcie.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/mwifiex/mwifiex_sdio.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/mwifiex/mwifiex_usb.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/mwl8k.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/orinoco/orinoco_usb.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/p54/p54common.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/p54/p54pci.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/p54/p54usb.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rndis_wlan.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt61pci.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rt2x00/rt73usb.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rtl818x/rtl8180/rtl8180.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rtl818x/rtl8187/rtl8187.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtl8192c/rtl8192c-common.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192ce.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtl8192cu/rtl8192cu.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtl8192de/rtl8192de.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtl8192se/rtl8192se.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtl8723ae/rtl8723ae.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/rtlwifi/rtlwifi.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ti/wl1251/wl1251.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ti/wl12xx/wl12xx.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ti/wl18xx/wl18xx.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ti/wlcore/wlcore.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
+lib/modules/KVER-ipfire-pae/kernel/drivers/ssb/ssb.ko
+lib/modules/KVER-ipfire-pae/kernel/net/bluetooth/bluetooth.ko
+lib/modules/KVER-ipfire-pae/kernel/net/bluetooth/bnep/bnep.ko
+lib/modules/KVER-ipfire-pae/kernel/net/bluetooth/cmtp/cmtp.ko
+lib/modules/KVER-ipfire-pae/kernel/net/bluetooth/hidp/hidp.ko
+lib/modules/KVER-ipfire-pae/kernel/net/bluetooth/rfcomm/rfcomm.ko
+lib/modules/KVER-ipfire-pae/kernel/net/mac80211/mac80211.ko
+lib/modules/KVER-ipfire-pae/kernel/net/rfkill/rfkill-regulator.ko
+lib/modules/KVER-ipfire-pae/kernel/net/wireless/cfg80211.ko
+lib/modules/KVER-ipfire-pae/kernel/net/wireless/lib80211.ko
+lib/modules/KVER-ipfire-pae/kernel/net/wireless/lib80211_crypt_ccmp.ko
+lib/modules/KVER-ipfire-pae/kernel/net/wireless/lib80211_crypt_tkip.ko
+lib/modules/KVER-ipfire-pae/kernel/net/wireless/lib80211_crypt_wep.ko
diff --git a/config/rootfiles/core/67/filelists/i586/compat-drivers-modules-pae-xen b/config/rootfiles/core/67/filelists/i586/compat-drivers-modules-pae-xen
new file mode 100644 (file)
index 0000000..a93b06e
--- /dev/null
@@ -0,0 +1,137 @@
+lib/modules/2.6.32.60-ipfire-xen/kernel/compat/compat.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/compat/sch_codel.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/compat/sch_fq_codel.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/bcma/bcma.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/bluetooth/ath3k.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/bluetooth/bcm203x.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/bluetooth/bfusb.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/bluetooth/bluecard_cs.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/bluetooth/bpa10x.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/bluetooth/bt3c_cs.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/bluetooth/btmrvl.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/bluetooth/btmrvl_sdio.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/bluetooth/btsdio.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/bluetooth/btuart_cs.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/bluetooth/btusb.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/bluetooth/dtl1_cs.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/bluetooth/hci_uart.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/bluetooth/hci_vhci.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/gpu/drm/drm.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/gpu/drm/drm_kms_helper.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/gpu/drm/i915/i915.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/gpu/drm/radeon/radeon.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/gpu/drm/ttm/ttm.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/misc/eeprom/eeprom_93cx6.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/ethernet/atheros/alx/alx.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/ethernet/atheros/atl1c/atl1c.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/ethernet/atheros/atl1e/atl1e.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/ethernet/atheros/atlx/atl1.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/ethernet/atheros/atlx/atl2.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/ethernet/broadcom/b44.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/asix.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/catc.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/cdc_eem.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/cdc_ether.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/cdc_subset.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/dm9601.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/gl620a.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/hso.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/int51x1.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/kaweth.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/mcs7830.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/net1080.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/pegasus.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/plusb.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/rndis_host.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/rtl8150.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/smsc95xx.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/usbnet.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/usb/zaurus.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/adm8211.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/at76c50x-usb.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ath/ar5523/ar5523.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ath/ath.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ath/ath6kl/ath6kl_core.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ath/ath6kl/ath6kl_sdio.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ath/ath6kl/ath6kl_usb.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_htc.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ath/carl9170/carl9170.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ath/wil6210/wil6210.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/b43/b43.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/b43legacy/b43legacy.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/brcm80211/brcmfmac/brcmfmac.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/brcm80211/brcmsmac/brcmsmac.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/brcm80211/brcmutil/brcmutil.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/libipw.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/iwlegacy/iwl3945.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/iwlegacy/iwl4965.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/iwlegacy/iwlegacy.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/dvm/iwldvm.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwlwifi.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas_cs.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas_sdio.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/libertas/usb8xxx.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/mac80211_hwsim.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/mwifiex/mwifiex.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/mwifiex/mwifiex_pcie.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/mwifiex/mwifiex_sdio.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/mwifiex/mwifiex_usb.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/mwl8k.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_usb.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/p54/p54common.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/p54/p54pci.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/p54/p54usb.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rndis_wlan.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800lib.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800pci.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt61pci.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt73usb.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8180/rtl8180.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8187/rtl8187.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtl8192c/rtl8192c-common.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192ce.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtl8192cu/rtl8192cu.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtl8192de/rtl8192de.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtl8192se/rtl8192se.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtl8723ae/rtl8723ae.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/rtlwifi/rtlwifi.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ti/wl1251/wl1251.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ti/wl12xx/wl12xx.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ti/wl18xx/wl18xx.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/ti/wlcore/wlcore.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/drivers/ssb/ssb.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/net/bluetooth/bluetooth.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/net/bluetooth/bnep/bnep.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/net/bluetooth/cmtp/cmtp.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/net/bluetooth/hidp/hidp.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/net/bluetooth/rfcomm/rfcomm.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/net/mac80211/mac80211.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/net/wireless/cfg80211.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/net/wireless/lib80211.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/net/wireless/lib80211_crypt_ccmp.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/net/wireless/lib80211_crypt_tkip.ko
+lib/modules/2.6.32.60-ipfire-xen/kernel/net/wireless/lib80211_crypt_wep.ko
diff --git a/config/rootfiles/core/67/filelists/squid b/config/rootfiles/core/67/filelists/squid
new file mode 120000 (symlink)
index 0000000..2dc8372
--- /dev/null
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/67/meta b/config/rootfiles/core/67/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/67/update.sh b/config/rootfiles/core/67/update.sh
new file mode 100644 (file)
index 0000000..caaf3c9
--- /dev/null
@@ -0,0 +1,91 @@
+#!/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 3 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) 2013 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+#
+# Remove old core updates from pakfire cache to save space...
+core=67
+for (( i=1; i<=$core; i++ ))
+do
+       rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+#
+#Stop services
+/etc/init.d/squid stop
+
+#
+#Extract files
+extract_files
+
+#
+#Start services
+/etc/init.d/squid start
+
+#
+#Update Language cache
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+#remove wrong mISDN modules
+rm -rf /lib/modules/*-ipfire*/kernel/drivers/isdn/mISDN
+rm -rf /lib/modules/*-ipfire*/kernel/drivers/isdn/hardware/mISDN
+
+#remove pae kernel from pakfire cache to force reload if it should reinstalled
+rm -rf /var/cache/pakfire/linux-pae*.ipfire
+
+#Rebuild module dep's
+arch=`uname -m`
+if [ ${arch::3} == "arm" ]; then
+       depmod -a 3.2.38-ipfire-kirkwood >/dev/null 2>&1
+       depmod -a 3.2.38-ipfire-omap >/dev/null 2>&1
+       depmod -a 3.2.38-ipfire-rpi >/dev/null 2>&1
+else
+       depmod -a 3.2.38-ipfire     >/dev/null 2>&1
+       depmod -a 3.2.38-ipfire-pae >/dev/null 2>&1
+       depmod -a 2.6.32.60-ipfire-xen >/dev/null 2>&1
+fi
+
+#Rebuild initrd's
+#if [ -e /boot/ipfirerd-3.2.38.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-3.2.38.img 3.2.38-ipfire
+#fi
+#if [ -e /boot/ipfirerd-3.2.38-pae.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-3.2.38-pae.img 3.2.38-ipfire-pae
+#fi
+#if [ -e /boot/ipfirerd-2.6.32.60-xen.img ]; then
+#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.60-xen.img 2.6.32.60-ipfire-xen
+#fi
+
+sync
+
+# This update need a reboot...
+touch /var/run/need_reboot
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0
index 50c2179c2ad055c2f7b51023a8dfc035daf8ea7d..6dabddfeb47664a7760f83ce27ba219e9fa6b5ac 100644 (file)
@@ -1,176 +1 @@
-lib/modules/KVER-ipfire/kernel/drivers/net/3c501.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/3c503.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/3c505.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/3c507.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/3c509.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/3c515.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/3c523.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/3c527.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/3c59x.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/8139cp.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/8139too.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/82596.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/8390.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/8390p.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/ac3200.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/acenic.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/amd8111e.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/at1700.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/atl1c/atl1c.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/atl1e/atl1e.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/atlx/atl1.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/atlx/atl2.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/atp.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/b44.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/benet/be2net.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/bnx2.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/bnx2x.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/bsd_comp.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/cassini.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/chelsio/cxgb.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/cnic.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/cs89x0.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/cxgb3/cxgb3.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/de600.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/de620.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/depca.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/dl2k.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/dnet.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/dummy.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/e100.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/e1000/e1000.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/e1000e/e1000e.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/e2100.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/eepro.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/eexpress.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/enic/enic.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/epic100.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/eql.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/es3210.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/eth16i.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/ethoc.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/ewrk3.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/fealnx.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/forcedeth.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/hamachi.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/hp-plus.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/hp.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/hp100.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/ibmlana.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/ifb.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/igb/igb.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/igbvf/igbvf.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/imq.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/ipg.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/ixgb/ixgb.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/ixgbe/ixgbe.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/jme.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/ks8842.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/ks8851_mll.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/lance.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/lne390.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/lp486e.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/macvlan.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/mdio.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/mii.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/mlx4/mlx4_core.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/mlx4/mlx4_en.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/myri10ge/myri10ge.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/natsemi.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/ne.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/ne2.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/ne2k-pci.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/ne3210.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/netxen/netxen_nic.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/ni52.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/ni65.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/niu.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/ns83820.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/pcmcia/3c574_cs.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/pcmcia/3c589_cs.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/pcmcia/axnet_cs.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/pcmcia/fmvj18x_cs.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/pcmcia/nmclan_cs.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/pcmcia/pcnet_cs.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/pcmcia/smc91c92_cs.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/pcmcia/xirc2ps_cs.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/pcnet32.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/phy/broadcom.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/phy/cicada.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/phy/davicom.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/phy/et1011c.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/phy/icplus.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/phy/lxt.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/phy/marvell.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/phy/mdio-bitbang.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/phy/national.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/phy/qsemi.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/phy/realtek.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/phy/smsc.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/phy/ste10Xp.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/phy/vitesse.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/qla3xxx.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/qlge/qlge.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/r6040.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/r8169.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/s2io.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/sb1000.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/sc92031.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/seeq8005.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/sfc/sfc.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/sis190.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/sis900.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/skge.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/sky2.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/slhc.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/smc-mca.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/smc-ultra.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/smc-ultra32.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/smc9194.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/smsc9420.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/starfire.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/sundance.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/sungem.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/sungem_phy.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/sunhme.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/tehuti.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/tg3.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/tlan.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/tulip/de2104x.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/tulip/de4x5.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/tulip/dmfe.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/tulip/tulip.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/tulip/uli526x.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/tulip/winbond-840.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/tulip/xircom_cb.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/typhoon.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/usb/asix.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/usb/catc.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/usb/cdc-phonet.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/usb/cdc_eem.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/usb/cdc_ether.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/usb/cdc_subset.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/usb/dm9601.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/usb/gl620a.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/usb/hso.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/usb/int51x1.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/usb/kaweth.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/usb/mcs7830.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/usb/net1080.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/usb/pegasus.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/usb/plusb.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/usb/rndis_host.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/usb/rtl8150.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/usb/smsc95xx.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/usb/usbnet.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/usb/zaurus.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/veth.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/via-rhine.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/via-velocity.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/virtio_net.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/vmxnet3/vmxnet3.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/vxge/vxge.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/wd.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/yellowfin.ko
-lib/modules/KVER-ipfire/kernel/drivers/net/znet.ko
-lib/modules/KVER-ipfire/kernel/drivers/staging/et131x/et131x.ko
+lib/modules/KVER-ipfire/kernel/drivers/net
diff --git a/config/rootfiles/packages/avahi b/config/rootfiles/packages/avahi
new file mode 100644 (file)
index 0000000..dc2c56d
--- /dev/null
@@ -0,0 +1,164 @@
+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
+#usr/var/run
+etc/rc.d/init.d/avahi
diff --git a/config/rootfiles/packages/check_mk_agent b/config/rootfiles/packages/check_mk_agent
new file mode 100644 (file)
index 0000000..073b483
--- /dev/null
@@ -0,0 +1,2 @@
+usr/bin/check_mk_agent
+usr/bin/waitmax
diff --git a/config/rootfiles/packages/libdaemon b/config/rootfiles/packages/libdaemon
new file mode 100644 (file)
index 0000000..d22e694
--- /dev/null
@@ -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 (file)
index 0000000..5ecb241
--- /dev/null
@@ -0,0 +1,24 @@
+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
+etc/rc.d/init.d/nginx
+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
index 78a02226687c86282549937b48c619b2a2498e6f..2468981ea950cce53f5e82f42b82e0a6b8051ffb 100644 (file)
@@ -506,6 +506,7 @@ WARNING: translation string unused: yearly firewallhits
 WARNING: untranslated string: Async logging enabled
 WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: Set time on boot
+WARNING: untranslated string: advproxy cache-digest
 WARNING: untranslated string: advproxy errmsg cache
 WARNING: untranslated string: advproxy errmsg invalid upstream proxy
 WARNING: untranslated string: attention
index 4c185286ccc7097dcf377be00d61f8dde30bb782..70dbdc1e4dbe0aff5aaad06cedc2b3e645ea8c08 100644 (file)
@@ -505,6 +505,7 @@ WARNING: translation string unused: xtaccess bad transfert
 WARNING: translation string unused: year-graph
 WARNING: translation string unused: yearly firewallhits
 WARNING: untranslated string: Scan for Songs
+WARNING: untranslated string: advproxy cache-digest
 WARNING: untranslated string: advproxy errmsg cache
 WARNING: untranslated string: advproxy errmsg invalid upstream proxy
 WARNING: untranslated string: attention
index 5a23c69c6ab1d68bc024a8737ecb0a05d5acf875..f17d07d758ca0b8349465ff203c6c88decc329ed 100644 (file)
@@ -507,6 +507,7 @@ WARNING: translation string unused: xtaccess bad transfert
 WARNING: translation string unused: year-graph
 WARNING: translation string unused: yearly firewallhits
 WARNING: untranslated string: Scan for Songs
+WARNING: untranslated string: advproxy cache-digest
 WARNING: untranslated string: bytes
 WARNING: untranslated string: ccd iroute2
 WARNING: untranslated string: new
index 78a02226687c86282549937b48c619b2a2498e6f..2468981ea950cce53f5e82f42b82e0a6b8051ffb 100644 (file)
@@ -506,6 +506,7 @@ WARNING: translation string unused: yearly firewallhits
 WARNING: untranslated string: Async logging enabled
 WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: Set time on boot
+WARNING: untranslated string: advproxy cache-digest
 WARNING: untranslated string: advproxy errmsg cache
 WARNING: untranslated string: advproxy errmsg invalid upstream proxy
 WARNING: untranslated string: attention
index 0196084cb458b3af22b610698ebee5e04f1fc772..d59f4f6dc4aec2acc0ca84e425503ccc4196c5f7 100644 (file)
@@ -497,6 +497,7 @@ WARNING: translation string unused: yearly firewallhits
 WARNING: untranslated string: Add a route
 WARNING: untranslated string: Edit an existing route
 WARNING: untranslated string: Scan for Songs
+WARNING: untranslated string: advproxy cache-digest
 WARNING: untranslated string: advproxy errmsg cache
 WARNING: untranslated string: advproxy errmsg invalid upstream proxy
 WARNING: untranslated string: attention
index a4eebcd70a296ca791ea7e868c04c6abe6b49bf0..ac650b3305f408cad645143bf5f71a74dc746260 100644 (file)
@@ -11,6 +11,7 @@
 ############################################################################
 # Checking cgi-bin translations for language: fr                           #
 ############################################################################
+< advproxy cache-digest
 < advproxy errmsg cache
 < advproxy errmsg invalid upstream proxy
 < attention
 ############################################################################
 # Checking cgi-bin translations for language: es                           #
 ############################################################################
+< advproxy cache-digest
 < advproxy errmsg cache
 < advproxy errmsg invalid upstream proxy
 < Async logging enabled
 ############################################################################
 # Checking cgi-bin translations for language: pl                           #
 ############################################################################
+< advproxy cache-digest
 < advproxy errmsg cache
 < advproxy errmsg invalid upstream proxy
 < attention
 # Checking cgi-bin translations for language: ru                           #
 ############################################################################
 < Add a route
+< advproxy cache-digest
 < advproxy errmsg cache
 < advproxy errmsg invalid upstream proxy
 < attention
index cc7416a9439ba86fb54bc8d41f3fa8e4e2dfb738..901ed7250466d84a2aa6a0c043a3b3745d5e6098 100644 (file)
@@ -221,6 +221,7 @@ $proxysettings{'MEM_POLICY'} = 'LRU';
 $proxysettings{'CACHE_POLICY'} = 'LRU';
 $proxysettings{'L1_DIRS'} = '16';
 $proxysettings{'OFFLINE_MODE'} = 'off';
+$proxysettings{'CACHE_DIGESTS'} = 'off';
 $proxysettings{'CLASSROOM_EXT'} = 'off';
 $proxysettings{'SUPERVISOR_PASSWORD'} = '';
 $proxysettings{'NO_PROXY_LOCAL'} = 'off';
@@ -737,6 +738,9 @@ $selected{'L1_DIRS'}{$proxysettings{'L1_DIRS'}} = "selected='selected'";
 $checked{'OFFLINE_MODE'}{'off'} = '';
 $checked{'OFFLINE_MODE'}{'on'} = '';
 $checked{'OFFLINE_MODE'}{$proxysettings{'OFFLINE_MODE'}} = "checked='checked'";
+$checked{'CACHE_DIGESTS'}{'off'} = '';
+$checked{'CACHE_DIGESTS'}{'on'} = '';
+$checked{'CACHE_DIGESTS'}{$proxysettings{'CACHE_DIGESTS'}} = "checked='checked'";
 
 $checked{'LOGGING'}{'off'} = '';
 $checked{'LOGGING'}{'on'} = '';
@@ -1170,6 +1174,10 @@ print <<END
        <td class='base'>$Lang::tr{'advproxy offline mode'}:</td>
        <td><input type='checkbox' name='OFFLINE_MODE' $checked{'OFFLINE_MODE'}{'on'} /></td>
 </tr>
+<tr>
+       <td class='base'>$Lang::tr{'advproxy cache-digest'}:</td>
+        <td><input type='checkbox' name='CACHE_DIGESTS' $checked{'CACHE_DIGESTS'}{'on'} /></td>
+</tr>
 </table>
 <hr size='1'>
 <table width='100%'>
@@ -3097,7 +3105,8 @@ END
        print FILE "error_directory $errordir/$proxysettings{'ERR_LANGUAGE'}\n\n";
 
        if ($proxysettings{'OFFLINE_MODE'} eq 'on') {  print FILE "offline_mode on\n\n"; }
-
+       if ($proxysettings{'CACHE_DIGESTS'} eq 'on') {  print FILE "digest_generation on\n\n"; } else {  print FILE "digest_generation off\n\n"; }
+       
        if ((!($proxysettings{'MEM_POLICY'} eq 'LRU')) || (!($proxysettings{'CACHE_POLICY'} eq 'LRU')))
        {
                if (!($proxysettings{'MEM_POLICY'} eq 'LRU'))
index 27856cab9ba00f6d14c886e9104c35ec82d0c018..b3da32c3c2e2c70f12f76186c79903013c5122a2 100644 (file)
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2005-2012  IPFire Team  <info@ipfire.org>                     #
+# 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        #
@@ -92,7 +92,7 @@ $sambasettings{'REMOTESYNC'} = '';
 $sambasettings{'PASSWORDSYNC'} = 'off';
 $sambasettings{'OTHERINTERFACES'} = '127.0.0.1';
 $sambasettings{'GUESTACCOUNT'} = 'samba';
-$sambasettings{'MAPTOGUEST'} = 'Never';
+$sambasettings{'MAPTOGUEST'} = 'Bad User';
 $sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:5 winbind:2';
 $sambasettings{'SYSLOGLEVEL'} = '1';
 $sambasettings{'SYSLOGONLY'} = 'on';
@@ -164,7 +164,7 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes')
        $sambasettings{'PASSWORDSYNC'} = 'off';
        $sambasettings{'OTHERINTERFACES'} = '127.0.0.1';
        $sambasettings{'GUESTACCOUNT'} = 'samba';
-       $sambasettings{'MAPTOGUEST'} = 'Never';
+       $sambasettings{'MAPTOGUEST'} = 'Bad User';
        $sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:5 winbind:2';
        $sambasettings{'SYSLOGLEVEL'} = '1';
        $sambasettings{'SYSLOGONLY'} = 'on';
@@ -427,6 +427,9 @@ $checked{'VPN'}{'off'} = '';
 $checked{'VPN'}{'on'} = '';
 $checked{'VPN'}{$sambasettings{'VPN'}} = "checked='checked'";
 
+if ( $sambasettings{'MAPTOGUEST'} eq "Never" ) {
+       $sambasettings{'MAPTOGUEST'}="Bad User";
+}
 $selected{'MAPTOGUEST'}{$sambasettings{'MAPTOGUEST'}} = "selected='selected'";
 $selected{'SECURITY'}{$sambasettings{'SECURITY'}} = "selected='selected'";
 
@@ -530,7 +533,6 @@ print <<END
                                                                                                                                                                <option value='server' $selected{'SECURITY'}{'server'}>Server</option>
                                                                                                                                                                </select></td></tr>
 <tr><td align='left' width='40%'>$Lang::tr{'map to guest'}</td><td align='left'><select name='MAPTOGUEST' style="width: 165px">
-                                                                                                                                                                               <option value='Never' $selected{'MAPTOGUEST'}{'Never'}>Never</option>
                                                                                                                                                                                <option value='Bad User' $selected{'MAPTOGUEST'}{'Bad User'}>Bad User</option>
                                                                                                                                                                                <option value='Bad Password' $selected{'MAPTOGUEST'}{'Bad Password'}>Bad Password</option>
                                                                                                                                                                                </select></td></tr>
index 83d65dbdb478efb5f2c3baf6774ae701fc3c8b79..58c6376feac996a2bdb018370bdc0e63ce9cf48e 100644 (file)
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2005-2012  IPFire Team  <info@ipfire.org>                     #
+# 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        #
@@ -124,11 +124,16 @@ if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'wlanap del interface'}" ){
 }
 
 if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'save'}" ){
-       # verify WPA Passphrase, must be 8 .. 63 characters - only wiht enabled enc
+       # verify WPA Passphrase - only with enabled enc
        if (($wlanapsettings{'ENC'} eq "wpa1") || ($wlanapsettings{'ENC'} eq "wpa2") || ($wlanapsettings{'ENC'} eq "wpa1+2")){
+               # must be 8 .. 63 characters
                if ( (length($wlanapsettings{'PWD'}) < 8) || (length($wlanapsettings{'PWD'}) > 63)){
                        $errormessage .= "$Lang::tr{'wlanap invalid wpa'}<br />";
                }
+               # only ASCII alowed
+               if ( !($wlanapsettings{'PWD'} !~ /[^\x00-\x7f]/) ){
+                       $errormessage .= "$Lang::tr{'wlanap invalid wpa'}<br />";
+               }
        }
 
        if ( $errormessage eq '' ){
@@ -251,7 +256,7 @@ $selected{'HW_MODE'}{$wlanapsettings{'HW_MODE'}} = "selected='selected'";
 $selected{'MACMODE'}{$wlanapsettings{'MACMODE'}} = "selected='selected'";
 
 my $monwlaninterface = $wlanapsettings{'INTERFACE'};
-if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){
+if ( -d '/sys/class/net/mon.'.$wlanapsettings{'INTERFACE'} ) {
        $monwlaninterface =  'mon.'.$wlanapsettings{'INTERFACE'};
 }
 
@@ -391,16 +396,29 @@ print <<END
                <option value='wpa1+2' $selected{'ENC'}{'wpa1+2'}>WPA1+2</option>
        </select>
 </td></tr>
+END
+;
+
+if ( scalar @channellist > 0 ){
+       print <<END
 <tr><td width='25%' class='base'>$Lang::tr{'wlanap channel'}:&nbsp;</td><td class='base' colspan='3'>
        <select name='CHANNEL'>
 END
 ;
-foreach $channel (@channellist){
-       print "<option $selected{'CHANNEL'}{$channel}>$channel</option>";
+       foreach $channel (@channellist){
+               print "<option $selected{'CHANNEL'}{$channel}>$channel</option>";
+       }
+       print "</select></td></tr>"
+} else {
+       print <<END
+<tr><td width='25%' class='base'>$Lang::tr{'wlanap channel'}:&nbsp;</td><td class='base' colspan='3'>
+<input type='text' name='CHANNEL' size='10' value='$wlanapsettings{'CHANNEL'}' />
+</td></tr>
+END
+;
 }
 
 print <<END
-</select></td></tr>
 <tr><td width='25%' class='base'>$Lang::tr{'wlanap country'}:&nbsp;</td><td class='base' colspan='3'>
        <select name='COUNTRY'>
 END
@@ -511,10 +529,12 @@ sub WriteConfig_hostapd{
 
        open (CONFIGFILE, ">/var/ipfire/wlanap/hostapd.conf");
        print CONFIGFILE <<END
+driver=$wlanapsettings{'DRIVER_HOSTAPD'}
 ######################### basic hostapd configuration ##########################
 #
 interface=$wlanapsettings{'INTERFACE'}
-driver=$wlanapsettings{'DRIVER_HOSTAPD'}
+country_code=$wlanapsettings{'COUNTRY'}
+ieee80211d=1
 channel=$wlanapsettings{'CHANNEL'}
 END
 ;
index f9405d7be7a32e43ca475d125fc5f1f6b05ac1c7..2c01256b9dc64b3098e45e7ec7211d3f8a82fce9 100644 (file)
 'advproxy banned mac clients' => 'Gesperrte MAC-Adressen (eine pro Zeile)',
 'advproxy cache management' => 'Cacheverwaltung',
 'advproxy cache replacement policy' => 'Cache Ersetzungsrichtlinie',
+'advproxy cache-digest' => 'Cache-Digest-Erstellung aktivieren',
 'advproxy chgwebpwd ERROR' => 'F E H L E R :',
 'advproxy chgwebpwd SUCCESS' => 'E R F O L G :',
 'advproxy chgwebpwd change password' => 'Passwort Ã¤ndern',
 'wlanap encryption' => 'Verschlüsselung',
 'wlanap informations' => 'Informationen',
 'wlanap interface' => 'Interface Ã¼bernehmen',
-'wlanap invalid wpa' => 'Ungültige Länge in WPA-Passphrase. Muss zwischen 8 und 63 Zeichen lang sein.',
+'wlanap invalid wpa' => 'Ungültige Länge in WPA-Passphrase. Muss zwischen 8 und 63 ASCII-Zeichen lang sein.',
 'wlanap link dhcp' => 'Wireless Lan DHCP-Einstellungen',
 'wlanap link wireless' => 'Wireless Lan Clients freischalten',
 'wlanap no interface' => 'Ausgewähltes Interface ist keine WLAN-Karte!',
index 46076fd6c264bfa11c07143aa8b7c8974a531441..17b117fdd32fa7d3b17037881ed0401210447ec4 100644 (file)
 'advproxy banned mac clients' => 'Banned MAC addresses (one per line)',
 'advproxy cache management' => 'Cache management',
 'advproxy cache replacement policy' => 'Cache replacement policy',
+'advproxy cache-digest' => 'Enable Cache-Digest Generation',
 'advproxy chgwebpwd ERROR' => 'E R R O R :',
 'advproxy chgwebpwd SUCCESS' => 'S U C C E S S :',
 'advproxy chgwebpwd change password' => 'Change password',
 'wlanap encryption' => 'Encryption',
 'wlanap informations' => 'Informations',
 'wlanap interface' => 'Select interface',
-'wlanap invalid wpa' => 'Invalid length in WPA Passphrase. Must be between 8 and 63 characters.',
+'wlanap invalid wpa' => 'Invalid length in WPA Passphrase. Must be between 8 and 63 ascii characters.',
 'wlanap link dhcp' => 'Wireless lan DHCP configuration',
 'wlanap link wireless' => 'Activate wireless lan clients',
 'wlanap no interface' => 'Selected interface is not a wirless lan card!',
index 365630a6e4d47e111446a44d441b7000190d987d..1c43e33b17f4803e0c6472e3e94dd23732e4c7d3 100644 (file)
 'wlanap encryption' => 'Encriptación',
 'wlanap informations' => 'Información',
 'wlanap interface' => 'Seleccione la interface',
-'wlanap invalid wpa' => 'Longitud inválida en la frase WPA. Debe ser entre 8 y 63 caracteres.',
+'wlanap invalid wpa' => 'Longitud inválida en la frase WPA. Debe ser entre 8 y 63 ascii caracteres.',
 'wlanap link dhcp' => 'Configuración DHCP de la red inalámbrica.',
 'wlanap link wireless' => 'Activar clientes de red inalámbricos',
 'wlanap no interface' => '¡La interfaz seleccionada no es una tarjeta de red inalámbrica!',
index 462cdfa9ff2c3f27144a657a8d0c87a34add2cb8..0c45a0bfcb074142120d71efb0c189cac24e8ad8 100644 (file)
 'wlanap encryption' => 'Encryptie',
 'wlanap informations' => 'Informatie',
 'wlanap interface' => 'Selecteer interface',
-'wlanap invalid wpa' => 'Ongeldige lengte voor WPA wachtwoord. Moet tussen de 8 en 63 tekens zijn.',
+'wlanap invalid wpa' => 'Ongeldige lengte voor WPA wachtwoord. Moet tussen de 8 en 63 tekens ascii zijn.',
 'wlanap link dhcp' => 'Draadloze LAN DHCP configuratie',
 'wlanap link wireless' => 'Activeer draadloze LAN clients',
 'wlanap no interface' => 'Geselecteerde interface is geen draadloze LAN kaart!',
index 12439e4453581406710825c77940ab676bda9ba1..d85a90a0daed25ecd1c1d53ffabc568c80ff822e 100644 (file)
 'wlanap encryption' => 'Szyfrowanie',
 'wlanap informations' => 'Informacje',
 'wlanap interface' => 'Wybierz interfejs',
-'wlanap invalid wpa' => 'Niepoprawna dÅ‚ugość klucza WPA. Klucz musi zawierać od 8 do 63 znaków.',
+'wlanap invalid wpa' => 'Niepoprawna dÅ‚ugość klucza WPA. Klucz musi zawierać od 8 do 63 ascii znaków.',
 'wlanap link dhcp' => 'Konfiguracja DHCP dla sieci bezprzewodowej',
 'wlanap link wireless' => 'Aktywuj klientów sieci bezprzewodowej',
 'wlanap no interface' => 'Wybrany interfejs nie jest kartÄ… bezprzewodowÄ…!',
index 4619983a401f7df2d1e35d9d8301c97d40c817c8..0b22f697482fa20ca2f91e475537ae7236114b70 100644 (file)
 'wlanap encryption' => 'Encryption',
 'wlanap informations' => 'Informations',
 'wlanap interface' => 'Select interface',
-'wlanap invalid wpa' => 'Invalid length in WPA Passphrase. Must be between 8 and 63 characters.',
+'wlanap invalid wpa' => 'Invalid length in WPA Passphrase. Must be between 8 and 63 ascii characters.',
 'wlanap link dhcp' => 'Wireless lan DHCP configuration',
 'wlanap link wireless' => 'Activate wireless lan clients',
 'wlanap no interface' => 'Selected interface is not a wirless lan card!',
diff --git a/lfs/avahi b/lfs/avahi
new file mode 100644 (file)
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/check_mk_agent b/lfs/check_mk_agent
new file mode 100644 (file)
index 0000000..c0f70d1
--- /dev/null
@@ -0,0 +1,84 @@
+###############################################################################
+#                                                                             #
+# 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.2.0p3
+
+THISAPP    = check_mk_agent-$(VER)
+DL_FILE    = check_mk-${VER}.tar.gz
+DL_FROM    = http://mathias-kettner.de/download
+DIR_APP    = $(DIR_SRC)/check_mk-${VER}
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = check_mk_agent
+PAK_VER    = 2
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 2c0f27fe8b6e3455557ecb30954d8a79
+
+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 xzf agents.tar.gz
+       cd $(DIR_APP) && install -v -m 755 check_mk_agent.linux /usr/bin/check_mk_agent
+       cd $(DIR_APP) && gcc $(CFLAGS) waitmax.c -o waitmax
+       cd $(DIR_APP) && install -v -m 755 waitmax /usr/bin/waitmax
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
similarity index 87%
rename from lfs/compat-wireless
rename to lfs/compat-drivers
index 9ce6f07593c81698f6ce1427e4eb34c5166e94cc..bd8ea71dd5fe7f0bdeb2c277661eaed104ea01cb 100644 (file)
@@ -1,7 +1,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        #
@@ -26,14 +26,14 @@ include Config
 
 VERSUFIX=ipfire$(KCFG)
 
-VER        = 3.6.8-1-snp
+VER        = 3.8-1-u
 
 ifeq "$(KCFG)" "-xen"
        KVER = 2.6.32.60
 endif
 
-THISAPP    = compat-wireless-$(VER)
-DL_FILE    = compat-wireless-$(VER).tar.bz2
+THISAPP    = compat-drivers-$(VER)
+DL_FILE    = compat-drivers-$(VER).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
@@ -42,13 +42,13 @@ TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) asix-4.4.0.tar.xz
+objects = $(DL_FILE) asix-4.5.0a.tar.xz
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-asix-4.4.0.tar.xz = $(DL_FROM)/asix-4.4.0.tar.xz
+asix-4.5.0a.tar.xz = $(DL_FROM)/asix-4.5.0a.tar.xz
 
-$(DL_FILE)_MD5 = 4120bc9841d6a1b5b92af34103f16a06
-asix-4.4.0.tar.xz_MD5=633609e889de41554826e0e2cd7bffde
+$(DL_FILE)_MD5 = 557e3099c642455ec272d9ddf46de484
+asix-4.5.0a.tar.xz_MD5=4219ce7c0cae4fdb580f30ea50cad8e0
 
 install : $(TARGET)
 
@@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
 
        # kfifo has no license info and taints kernel
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-2.6.39_kfifo_module_info.patch
@@ -85,9 +85,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # Codel patches
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless_codel-avoid-a-nul-rec_inv_sqrt.patch
 
-       # compat-3.1 include a bogus cpufreq_backort
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-3.6.8-remove_3.1_cpufreq_backport.patch
-
        # Build ath5k only if target has pci
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-3.5-build_ath5k_only_with_pci.patch
 
@@ -100,7 +97,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-2.6.34-usbnet_compile.patch
 
        # Build Updated asix usb-lan driver
-       cd $(DIR_APP)/drivers/net/usb && tar xvJf $(DIR_DL)/asix-4.4.0.tar.xz
+       cd $(DIR_APP)/drivers/net/usb && tar xvJf $(DIR_DL)/asix-4.5.0a.tar.xz
 
        # Add libartas uAP driver
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-3.5-libertas_uap.patch
index c2e72389383c0b4d42f804b7cc28c243ae328db1..133111cdbd7466ea2617843085b6cdd3969a597d 100644 (file)
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.1.6
+VER        = 2.1.7
 
 THISAPP    = fireinfo-v$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ff8eb520af49c0bf00722aac167070cd
+$(DL_FILE)_MD5 = 97f6744c1ff61eb104a9278df12451c8
 
 install : $(TARGET)
 
index 2ce9c21868be06bf401587f5a25db52865615113..ff02a1991404dd901b3398d0aab80d2e4206757c 100644 (file)
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hostapd
-PAK_VER    = 24
+PAK_VER    = 26
 
 DEPS       = ""
 
diff --git a/lfs/libdaemon b/lfs/libdaemon
new file mode 100644 (file)
index 0000000..0804b45
--- /dev/null
@@ -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)
index 0fe76ec3758e82480ff9a688ab678e54fe7f36e6..57db77fa1e0b12372b238b174e93ac50fb155828 100644 (file)
--- a/lfs/mISDN
+++ b/lfs/mISDN
@@ -111,5 +111,9 @@ ifneq "$(XEN)" "1"
        sed -i -e "s|.ko||g" /etc/modprobe.d/mISDN
 endif
 
+       # Remove mISDN modules that was shipped with the kernel
+       rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN
+       rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN
+
        @rm -rf $(DIR_SRC)/mISDN*
        @$(POSTBUILD)
diff --git a/lfs/nginx b/lfs/nginx
new file mode 100644 (file)
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)
index d06aedeb519fe9a7693cda9d1597deb38d28c4e9..3ede976109819caa9d673c7cdeecc3c7e39027c8 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -99,7 +99,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
           --enable-epoll \
           --disable-kqueue \
           --enable-select \
-          --disable-cache-digests \
+          --enable-cache-digests \
           --enable-forw-via-db \
           --enable-htcp \
           --enable-ipf-transparent \
diff --git a/make.sh b/make.sh
index b92d47a5d24ce93b9b3a55677ccc77ad7eb92850..e427929dc7a54a64ed96c015c984f6473999b308 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.13"                                                 # Version number
-CORE="66"                                                      # Core Level (Filename)
+CORE="67"                                                      # 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
@@ -384,7 +384,7 @@ buildipfire() {
     ipfiremake v4l-dvb                 KCFG="-xen"
     ipfiremake mISDN                   KCFG="-xen"
     ipfiremake cryptodev               KCFG="-xen"
-    ipfiremake compat-wireless         KCFG="-xen"
+    ipfiremake compat-drivers          KCFG="-xen"
     ipfiremake r8169                   KCFG="-xen"
     ipfiremake r8168                   KCFG="-xen"
     ipfiremake r8101                   KCFG="-xen"
@@ -398,7 +398,7 @@ buildipfire() {
     ipfiremake v4l-dvb                 KCFG="-pae"
     ipfiremake mISDN                   KCFG="-pae"
     ipfiremake cryptodev               KCFG="-pae"
-    ipfiremake compat-wireless         KCFG="-pae"
+    ipfiremake compat-drivers          KCFG="-pae"
     ipfiremake r8169                   KCFG="-pae"
     ipfiremake r8168                   KCFG="-pae"
     ipfiremake r8101                   KCFG="-pae"
@@ -411,7 +411,7 @@ buildipfire() {
     ipfiremake v4l-dvb                 KCFG=""
     ipfiremake mISDN                   KCFG=""
     ipfiremake cryptodev               KCFG=""
-    ipfiremake compat-wireless         KCFG=""
+    ipfiremake compat-drivers          KCFG=""
     ipfiremake r8169                   KCFG=""
     ipfiremake r8168                   KCFG=""
     ipfiremake r8101                   KCFG=""
@@ -424,21 +424,21 @@ buildipfire() {
     ipfiremake v4l-dvb                 KCFG="-rpi"
     ipfiremake mISDN                   KCFG="-rpi" NOPCI=1
     ipfiremake cryptodev               KCFG="-rpi"
-    ipfiremake compat-wireless         KCFG="-rpi"
+    ipfiremake compat-drivers          KCFG="-rpi"
 
     # arm-omap (Panda Board) kernel build
     ipfiremake linux                   KCFG="-omap"
     ipfiremake v4l-dvb                 KCFG="-omap"
     ipfiremake mISDN                   KCFG="-omap" NOPCI=1
     ipfiremake cryptodev               KCFG="-omap"
-    ipfiremake compat-wireless         KCFG="-omap"
+    ipfiremake compat-drivers          KCFG="-omap"
 
     # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
     ipfiremake linux                   KCFG="-kirkwood"
     ipfiremake v4l-dvb                 KCFG="-kirkwood"
     ipfiremake mISDN                   KCFG="-kirkwood"
     ipfiremake cryptodev               KCFG="-kirkwood"
-    ipfiremake compat-wireless         KCFG="-kirkwood"
+    ipfiremake compat-drivers          KCFG="-kirkwood"
     ipfiremake r8169                   KCFG="-kirkwood"
     ipfiremake r8168                   KCFG="-kirkwood"
     ipfiremake r8101                   KCFG="-kirkwood"
@@ -755,6 +755,10 @@ buildipfire() {
   ipfiremake libstatgrab
   ipfiremake sarg
   ipfiremake fstrim
+  ipfiremake check_mk_agent
+  ipfiremake libdaemon
+  ipfiremake avahi
+  ipfiremake nginx
   ipfiremake sendEmail
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
index e28a0689bd1c5a98e3bd8c81a1478bedb2fa17d0..16cf6ed4d3a6aa79fcc8a039dc4105a47dd73016 100644 (file)
@@ -111,11 +111,15 @@ for path in /sys/block/*; do
        echo "  OK, this is it..."
        echo -n "${device_}" > /tmp/dest_device
 
-       # Disk size to GiB.
-       device_size=$(( ${device_size} / 2097152 ))
-
-       # Build string with drive details
-       device_str="/dev/${device_} - ${device_size} GiB -"
+       if [ ${device_size} -gt 0 ]; then
+               # Disk size to GiB.
+               device_size=$(( ${device_size} / 2097152 ))
+
+               # Build string with drive details
+               device_str="/dev/${device_} - ${device_size} GiB -"
+       else
+               device_str="/dev/${device_} -"
+       fi
        device_str="${device_str} $(cat /sys/block/${device}/device/vendor)"
        device_str="${device_str} $(cat /sys/block/${device}/device/model)"
 
diff --git a/src/paks/avahi/install.sh b/src/paks/avahi/install.sh
new file mode 100644 (file)
index 0000000..bcbb631
--- /dev/null
@@ -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 (file)
index 0000000..1c8e67c
--- /dev/null
@@ -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 (file)
index 0000000..89c40d0
--- /dev/null
@@ -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/check_mk_agent/install.sh b/src/paks/check_mk_agent/install.sh
new file mode 100644 (file)
index 0000000..682363b
--- /dev/null
@@ -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
+extract_files
+restore_backup ${NAME}
diff --git a/src/paks/check_mk_agent/uninstall.sh b/src/paks/check_mk_agent/uninstall.sh
new file mode 100644 (file)
index 0000000..66f4344
--- /dev/null
@@ -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/check_mk_agent/update.sh b/src/paks/check_mk_agent/update.sh
new file mode 100644 (file)
index 0000000..89c40d0
--- /dev/null
@@ -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 (file)
index 0000000..2df1ecd
--- /dev/null
@@ -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 (file)
index 0000000..66f4344
--- /dev/null
@@ -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 (file)
index 0000000..89c40d0
--- /dev/null
@@ -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 (file)
index 0000000..d5cb155
--- /dev/null
@@ -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 (file)
index 0000000..ded53f0
--- /dev/null
@@ -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 (file)
index 0000000..89c40d0
--- /dev/null
@@ -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/patches/compat-wireless-3.6.8-remove_3.1_cpufreq_backport.patch b/src/patches/compat-wireless-3.6.8-remove_3.1_cpufreq_backport.patch
deleted file mode 100644 (file)
index 602c153..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Naur compat-wireless-3.6.8-1-snp.org/compat/compat-3.1.c compat-wireless-3.6.8-1-snp/compat/compat-3.1.c
---- compat-wireless-3.6.8-1-snp.org/compat/compat-3.1.c        2012-11-29 06:03:45.000000000 +0100
-+++ compat-wireless-3.6.8-1-snp/compat/compat-3.1.c    2013-01-18 16:50:08.799491784 +0100
-@@ -9,30 +9,6 @@
-  */
- #include <linux/idr.h>
--#include <linux/cpufreq.h>
--
--/* This backports:
-- * commit 3d73710880afa3d61cf57b5d4eb192e812eb7e4f
-- * Author: Jesse Barnes <jbarnes@virtuousgeek.org>
-- * Date:   Tue Jun 28 10:59:12 2011 -0700
-- *
-- *    cpufreq: expose a cpufreq_quick_get_max routine
-- */
--
--unsigned int compat_cpufreq_quick_get_max(unsigned int cpu)
--{
--      struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);
--      unsigned int ret_freq = 0;
--
--      if (policy) {
--              ret_freq = policy->max;
--              cpufreq_cpu_put(policy);
--      }
--
--      return ret_freq;
--}
--EXPORT_SYMBOL(compat_cpufreq_quick_get_max);
--
- static DEFINE_SPINLOCK(compat_simple_ida_lock);
-diff -Naur compat-wireless-3.6.8-1-snp.org/include/linux/compat-3.1.h compat-wireless-3.6.8-1-snp/include/linux/compat-3.1.h
---- compat-wireless-3.6.8-1-snp.org/include/linux/compat-3.1.h 2012-10-24 15:22:50.000000000 +0200
-+++ compat-wireless-3.6.8-1-snp/include/linux/compat-3.1.h     2013-01-18 16:52:04.106154741 +0100
-@@ -111,10 +111,6 @@
- void ida_simple_remove(struct ida *ida, unsigned int id);
--/* mask cpufreq_quick_get_max as RHEL6 backports this */
--#define cpufreq_quick_get_max(a) compat_cpufreq_quick_get_max(a)
--
--unsigned int cpufreq_quick_get_max(unsigned int cpu);
- #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)) */
- #endif /* LINUX_3_1_COMPAT_H */