[git.ipfire.org] IPFire 3.x development tree branch, master, updated. e63ec62158eedb421dfa8ed67908e9ccd7666015
by git＠ipfire.org 31 Dec '14
by git＠ipfire.org 31 Dec '14
31 Dec '14
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via e63ec62158eedb421dfa8ed67908e9ccd7666015 (commit)
via a97b100339b934a2baa687f6d800aed677aa1211 (commit)
from cba4ea7b3e10ef8b96bb386389d947aa3e7763bd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e63ec62158eedb421dfa8ed67908e9ccd7666015
Merge: a97b100 cba4ea7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Dec 31 14:20:26 2014 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit a97b100339b934a2baa687f6d800aed677aa1211
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Dec 31 14:18:27 2014 +0100
grub: Fix build with -fstack-protector-strong
-----------------------------------------------------------------------
Summary of changes:
grub/grub.nm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Difference in files:
diff --git a/grub/grub.nm b/grub/grub.nm
index b109a2a..cd39743 100644
--- a/grub/grub.nm
+++ b/grub/grub.nm
@@ -5,7 +5,7 @@
name = grub
version = 2.00
-release = 5
+release = 5.1
sup_arches = x86_64 i686
groups = System/Boot
@@ -60,6 +60,7 @@ build
--disable-werror \
CFLAGS="$(echo %{CFLAGS} | sed \
-e 's/-Wp,-D_FORTIFY_SOURCE=2//g' \
+ -e 's/-fstack-protector-strong//g' \
-e 's/-fstack-protector-all//g' \
-e 's/-fstack-protector//g' \
-e 's/-fPIC//g' \
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 91e56a59a4adc968b3fed8a95a9a3f569230f145
by git＠ipfire.org 31 Dec '14
by git＠ipfire.org 31 Dec '14
31 Dec '14
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via 91e56a59a4adc968b3fed8a95a9a3f569230f145 (commit)
from 4d7f5ead1657438247e1f0ce378e259cc04aef48 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 91e56a59a4adc968b3fed8a95a9a3f569230f145
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Dec 31 08:48:56 2014 +0100
kernel: add backports 3.18.1-1.
-----------------------------------------------------------------------
Summary of changes:
lfs/{igb => backports} | 53 +-
make.sh | 5 +
src/patches/backports-3.18.1-1-grsecurity.patch | 3806 ++++++++++++++++++++
src/patches/backports-3.18.1-1-ipfire-build.patch | 34 +
...h => backports-3.18.1-1_add_libertas_uap.patch} | 109 +-
5 files changed, 3930 insertions(+), 77 deletions(-)
copy lfs/{igb => backports} (54%)
create mode 100644 src/patches/backports-3.18.1-1-grsecurity.patch
create mode 100644 src/patches/backports-3.18.1-1-ipfire-build.patch
copy src/patches/{linux-3.10.39-add_libertas_uap.patch => backports-3.18.1-1_add_libertas_uap.patch} (97%)
Difference in files:
diff --git a/lfs/backports b/lfs/backports
new file mode 100644
index 0000000..c5aae66
--- /dev/null
+++ b/lfs/backports
@@ -0,0 +1,116 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2014 IPFire Team <info(a)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 #
+# 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
+
+VERSUFIX = ipfire$(KCFG)
+
+VER = 3.18.1-1
+
+THISAPP = backports-$(VER)
+DL_FILE = $(THISAPP).tar.xz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 6cef5f2c800e12441d2cba9fa42b6a5b
+
+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 Jxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1-ipfire-build.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1-grsecurity.patch
+
+ # DVB patches
+ cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/v4l-dvb_fix_tua6034_pll.patch
+
+ # Wlan patches
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-drivers-3.8.3-ath_ignore_eeprom_regdomain.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-iwlwifi-noibss_only_on_radar_chan.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.37-rt2800usb_add_dlink_dwa137_usbid.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1_add_libertas_uap.patch
+
+ # generate config
+ cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX)/ allmodconfig
+
+ # Disable some settings
+ cd $(DIR_APP) && sed -i -e "s/CPTCFG_CFG80211_DEVELOPER_WARNINGS=y/# CPTCFG_CFG80211_DEVELOPER_WARNINGS is not set/g" .config
+ cd $(DIR_APP) && sed -i -e "s/CPTCFG_CFG80211_CERTIFICATION_ONUS=y/# CPTCFG_CFG80211_CERTIFICATION_ONUS is not set/g" .config
+ cd $(DIR_APP) && sed -i -e "s/CPTCFG_CFG80211_REG_CELLULAR_HINTS=y/# CPTCFG_CFG80211_REG_CELLULAR_HINTS is not set/g" .config
+ cd $(DIR_APP) && sed -i -e "s/CPTCFG_CFG80211_REG_RELAX_NO_IR=y/# CPTCFG_CFG80211_REG_RELAX_NO_IR is not set/g" .config
+ cd $(DIR_APP) && sed -i -e "s/CPTCFG_CFG80211_INTERNAL_REGDB=y/# CPTCFG_CFG80211_INTERNAL_REGDB is not set/g" .config
+ cd $(DIR_APP) && sed -i -e "s/CPTCFG_CFG80211_DEFAULT_PS=y/# CPTCFG_CFG80211_DEFAULT_PS is not set/g" .config
+ cd $(DIR_APP) && sed -i -e "s/CPTCFG_NFC=m/# CPTCFG_NFC is not set/g" .config
+
+ # Disable some modules (build fail)
+ cd $(DIR_APP) && sed -i -e "s/CPTCFG_VIDEO_VIA_CAMERA=m/# CPTCFG_VIDEO_VIA_CAMERA is not set/g" .config
+
+ # Disable DEBUG
+ cd $(DIR_APP) && sed -i -e "s/.*DEBUG=y/# & is not set/g" .config
+ cd $(DIR_APP) && sed -i -e "s/.*DEBUGFS=y/# & is not set/g" .config
+ cd $(DIR_APP) && sed -i -e "s/=y is not set/ is not set/g" .config
+
+ cd $(DIR_APP) && make $(MAKETUNING) KLIB=/lib/modules/$(KVER)-$(VERSUFIX)/ install
+
+ # Remove vsp1 module (not mach to our platforms)
+ rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/media/platform/vsp1
+
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index fa7fb55..18ac3da 100755
--- a/make.sh
+++ b/make.sh
@@ -408,6 +408,7 @@ buildipfire() {
i586)
# x86-pae (Native and new XEN) kernel build
ipfiremake linux KCFG="-pae"
+ ipfiremake backports KCFG="-pae"
ipfiremake cryptodev KCFG="-pae"
ipfiremake e1000e KCFG="-pae"
ipfiremake igb KCFG="-pae"
@@ -416,6 +417,7 @@ buildipfire() {
# x86 kernel build
ipfiremake linux KCFG=""
+ ipfiremake backports KCFG=""
ipfiremake cryptodev KCFG=""
ipfiremake e1000e KCFG=""
ipfiremake igb KCFG=""
@@ -426,11 +428,13 @@ buildipfire() {
armv5tel)
# arm-rpi (Raspberry Pi) kernel build
ipfiremake linux KCFG="-rpi"
+ ipfiremake backports KCFG="-rpi"
ipfiremake cryptodev KCFG="-rpi"
ipfiremake linux-initrd KCFG="-rpi"
# arm multi platform (Panda, Wandboard ...) kernel build
ipfiremake linux KCFG="-multi"
+ ipfiremake backports KCFG="-multi"
ipfiremake cryptodev KCFG="-multi"
ipfiremake e1000e KCFG="-multi"
ipfiremake igb KCFG="-multi"
@@ -439,6 +443,7 @@ buildipfire() {
# arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
ipfiremake linux KCFG="-kirkwood"
+ ipfiremake backports KCFG="-kirkwood"
ipfiremake cryptodev KCFG="-kirkwood"
ipfiremake e1000e KCFG="-kirkwood"
ipfiremake igb KCFG="-kirkwood"
diff --git a/src/patches/backports-3.18.1-1-grsecurity.patch b/src/patches/backports-3.18.1-1-grsecurity.patch
new file mode 100644
index 0000000..711f2e3
--- /dev/null
+++ b/src/patches/backports-3.18.1-1-grsecurity.patch
@@ -0,0 +1,3806 @@
+diff -Naur backports-3.18.1-1.org/drivers/bluetooth/btwilink.c backports-3.18.1-1/drivers/bluetooth/btwilink.c
+--- backports-3.18.1-1.org/drivers/bluetooth/btwilink.c 2014-12-21 22:37:15.000000000 +0100
++++ backports-3.18.1-1/drivers/bluetooth/btwilink.c 2014-12-28 14:10:09.480888533 +0100
+@@ -288,7 +288,7 @@
+
+ static int bt_ti_probe(struct platform_device *pdev)
+ {
+- static struct ti_st *hst;
++ struct ti_st *hst;
+ struct hci_dev *hdev;
+ int err;
+
+diff -Naur backports-3.18.1-1.org/drivers/media/dvb-core/dvbdev.c backports-3.18.1-1/drivers/media/dvb-core/dvbdev.c
+--- backports-3.18.1-1.org/drivers/media/dvb-core/dvbdev.c 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/media/dvb-core/dvbdev.c 2014-12-28 14:10:09.528888772 +0100
+@@ -185,7 +185,7 @@
+ const struct dvb_device *template, void *priv, int type)
+ {
+ struct dvb_device *dvbdev;
+- struct file_operations *dvbdevfops;
++ file_operations_no_const *dvbdevfops;
+ struct device *clsdev;
+ int minor;
+ int id;
+diff -Naur backports-3.18.1-1.org/drivers/media/dvb-frontends/af9033.h backports-3.18.1-1/drivers/media/dvb-frontends/af9033.h
+--- backports-3.18.1-1.org/drivers/media/dvb-frontends/af9033.h 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/media/dvb-frontends/af9033.h 2014-12-28 14:10:09.528888772 +0100
+@@ -96,6 +96,6 @@
+ int (*pid_filter_ctrl)(struct dvb_frontend *fe, int onoff);
+ int (*pid_filter)(struct dvb_frontend *fe, int index, u16 pid,
+ int onoff);
+-};
++} __no_const;
+
+ #endif /* AF9033_H */
+diff -Naur backports-3.18.1-1.org/drivers/media/dvb-frontends/dib3000.h backports-3.18.1-1/drivers/media/dvb-frontends/dib3000.h
+--- backports-3.18.1-1.org/drivers/media/dvb-frontends/dib3000.h 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/media/dvb-frontends/dib3000.h 2014-12-28 14:10:09.528888772 +0100
+@@ -39,7 +39,7 @@
+ int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
+ int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
+ int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
+-};
++} __no_const;
+
+ #if IS_ENABLED(CPTCFG_DVB_DIB3000MB)
+ extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
+diff -Naur backports-3.18.1-1.org/drivers/media/dvb-frontends/dib7000p.h backports-3.18.1-1/drivers/media/dvb-frontends/dib7000p.h
+--- backports-3.18.1-1.org/drivers/media/dvb-frontends/dib7000p.h 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/media/dvb-frontends/dib7000p.h 2014-12-28 14:10:09.528888772 +0100
+@@ -64,7 +64,7 @@
+ int (*get_adc_power)(struct dvb_frontend *fe);
+ int (*slave_reset)(struct dvb_frontend *fe);
+ struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000p_config *cfg);
+-};
++} __no_const;
+
+ #if IS_ENABLED(CPTCFG_DVB_DIB7000P)
+ void *dib7000p_attach(struct dib7000p_ops *ops);
+diff -Naur backports-3.18.1-1.org/drivers/media/dvb-frontends/dib8000.h backports-3.18.1-1/drivers/media/dvb-frontends/dib8000.h
+--- backports-3.18.1-1.org/drivers/media/dvb-frontends/dib8000.h 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/media/dvb-frontends/dib8000.h 2014-12-28 14:10:09.528888772 +0100
+@@ -61,7 +61,7 @@
+ int (*pid_filter_ctrl)(struct dvb_frontend *fe, u8 onoff);
+ int (*pid_filter)(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff);
+ struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib8000_config *cfg);
+-};
++} __no_const;
+
+ #if IS_ENABLED(CPTCFG_DVB_DIB8000)
+ void *dib8000_attach(struct dib8000_ops *ops);
+diff -Naur backports-3.18.1-1.org/drivers/media/pci/cx88/cx88-video.c backports-3.18.1-1/drivers/media/pci/cx88/cx88-video.c
+--- backports-3.18.1-1.org/drivers/media/pci/cx88/cx88-video.c 2014-12-21 22:37:13.000000000 +0100
++++ backports-3.18.1-1/drivers/media/pci/cx88/cx88-video.c 2014-12-28 14:10:09.528888772 +0100
+@@ -50,9 +50,9 @@
+
+ /* ------------------------------------------------------------------ */
+
+-static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
+-static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
+-static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
++static int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
++static int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
++static int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
+
+ module_param_array(video_nr, int, NULL, 0444);
+ module_param_array(vbi_nr, int, NULL, 0444);
+diff -Naur backports-3.18.1-1.org/drivers/media/pci/ivtv/ivtv-driver.c backports-3.18.1-1/drivers/media/pci/ivtv/ivtv-driver.c
+--- backports-3.18.1-1.org/drivers/media/pci/ivtv/ivtv-driver.c 2014-12-21 22:37:13.000000000 +0100
++++ backports-3.18.1-1/drivers/media/pci/ivtv/ivtv-driver.c 2014-12-28 14:10:09.528888772 +0100
+@@ -83,7 +83,7 @@
+ MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
+
+ /* ivtv instance counter */
+-static atomic_t ivtv_instance = ATOMIC_INIT(0);
++static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
+
+ /* Parameter declarations */
+ static int cardtype[IVTV_MAX_CARDS];
+diff -Naur backports-3.18.1-1.org/drivers/media/pci/solo6x10/solo6x10-core.c backports-3.18.1-1/drivers/media/pci/solo6x10/solo6x10-core.c
+--- backports-3.18.1-1.org/drivers/media/pci/solo6x10/solo6x10-core.c 2014-12-21 22:37:13.000000000 +0100
++++ backports-3.18.1-1/drivers/media/pci/solo6x10/solo6x10-core.c 2014-12-28 14:10:09.528888772 +0100
+@@ -424,7 +424,7 @@
+
+ static int solo_sysfs_init(struct solo_dev *solo_dev)
+ {
+- struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
++ bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
+ struct device *dev = &solo_dev->dev;
+ const char *driver;
+ int i;
+diff -Naur backports-3.18.1-1.org/drivers/media/pci/solo6x10/solo6x10-g723.c backports-3.18.1-1/drivers/media/pci/solo6x10/solo6x10-g723.c
+--- backports-3.18.1-1.org/drivers/media/pci/solo6x10/solo6x10-g723.c 2014-12-21 22:37:13.000000000 +0100
++++ backports-3.18.1-1/drivers/media/pci/solo6x10/solo6x10-g723.c 2014-12-28 14:10:09.528888772 +0100
+@@ -351,7 +351,7 @@
+
+ int solo_g723_init(struct solo_dev *solo_dev)
+ {
+- static struct snd_device_ops ops = { NULL };
++ static struct snd_device_ops ops = { };
+ struct snd_card *card;
+ struct snd_kcontrol_new kctl;
+ char name[32];
+diff -Naur backports-3.18.1-1.org/drivers/media/pci/solo6x10/solo6x10.h backports-3.18.1-1/drivers/media/pci/solo6x10/solo6x10.h
+--- backports-3.18.1-1.org/drivers/media/pci/solo6x10/solo6x10.h 2014-12-21 22:37:13.000000000 +0100
++++ backports-3.18.1-1/drivers/media/pci/solo6x10/solo6x10.h 2014-12-28 14:10:09.532888798 +0100
+@@ -219,7 +219,7 @@
+
+ /* P2M DMA Engine */
+ struct solo_p2m_dev p2m_dev[SOLO_NR_P2M];
+- atomic_t p2m_count;
++ atomic_unchecked_t p2m_count;
+ int p2m_jiffies;
+ unsigned int p2m_timeouts;
+
+diff -Naur backports-3.18.1-1.org/drivers/media/pci/solo6x10/solo6x10-p2m.c backports-3.18.1-1/drivers/media/pci/solo6x10/solo6x10-p2m.c
+--- backports-3.18.1-1.org/drivers/media/pci/solo6x10/solo6x10-p2m.c 2014-12-21 22:37:13.000000000 +0100
++++ backports-3.18.1-1/drivers/media/pci/solo6x10/solo6x10-p2m.c 2014-12-28 14:10:09.532888798 +0100
+@@ -73,7 +73,7 @@
+
+ /* Get next ID. According to Softlogic, 6110 has problems on !=0 P2M */
+ if (solo_dev->type != SOLO_DEV_6110 && multi_p2m) {
+- p2m_id = atomic_inc_return(&solo_dev->p2m_count) % SOLO_NR_P2M;
++ p2m_id = atomic_inc_return_unchecked(&solo_dev->p2m_count) % SOLO_NR_P2M;
+ if (p2m_id < 0)
+ p2m_id = -p2m_id;
+ }
+diff -Naur backports-3.18.1-1.org/drivers/media/platform/omap/omap_vout.c backports-3.18.1-1/drivers/media/platform/omap/omap_vout.c
+--- backports-3.18.1-1.org/drivers/media/platform/omap/omap_vout.c 2014-12-21 22:37:13.000000000 +0100
++++ backports-3.18.1-1/drivers/media/platform/omap/omap_vout.c 2014-12-28 14:10:09.532888798 +0100
+@@ -63,7 +63,6 @@
+ OMAP_VIDEO2,
+ };
+
+-static struct videobuf_queue_ops video_vbq_ops;
+ /* Variables configurable through module params*/
+ static u32 video1_numbuffers = 3;
+ static u32 video2_numbuffers = 3;
+@@ -1012,6 +1011,12 @@
+ {
+ struct videobuf_queue *q;
+ struct omap_vout_device *vout = NULL;
++ static struct videobuf_queue_ops video_vbq_ops = {
++ .buf_setup = omap_vout_buffer_setup,
++ .buf_prepare = omap_vout_buffer_prepare,
++ .buf_release = omap_vout_buffer_release,
++ .buf_queue = omap_vout_buffer_queue,
++ };
+
+ vout = video_drvdata(file);
+ v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
+@@ -1029,10 +1034,6 @@
+ vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
+
+ q = &vout->vbq;
+- video_vbq_ops.buf_setup = omap_vout_buffer_setup;
+- video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
+- video_vbq_ops.buf_release = omap_vout_buffer_release;
+- video_vbq_ops.buf_queue = omap_vout_buffer_queue;
+ spin_lock_init(&vout->vbq_lock);
+
+ videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
+diff -Naur backports-3.18.1-1.org/drivers/media/platform/s5p-tv/mixer_grp_layer.c backports-3.18.1-1/drivers/media/platform/s5p-tv/mixer_grp_layer.c
+--- backports-3.18.1-1.org/drivers/media/platform/s5p-tv/mixer_grp_layer.c 2014-12-21 22:37:13.000000000 +0100
++++ backports-3.18.1-1/drivers/media/platform/s5p-tv/mixer_grp_layer.c 2014-12-28 14:10:09.532888798 +0100
+@@ -235,7 +235,7 @@
+ {
+ struct mxr_layer *layer;
+ int ret;
+- struct mxr_layer_ops ops = {
++ static struct mxr_layer_ops ops = {
+ .release = mxr_graph_layer_release,
+ .buffer_set = mxr_graph_buffer_set,
+ .stream_set = mxr_graph_stream_set,
+diff -Naur backports-3.18.1-1.org/drivers/media/platform/s5p-tv/mixer.h backports-3.18.1-1/drivers/media/platform/s5p-tv/mixer.h
+--- backports-3.18.1-1.org/drivers/media/platform/s5p-tv/mixer.h 2014-12-21 22:37:13.000000000 +0100
++++ backports-3.18.1-1/drivers/media/platform/s5p-tv/mixer.h 2014-12-28 14:10:09.532888798 +0100
+@@ -156,7 +156,7 @@
+ /** layer index (unique identifier) */
+ int idx;
+ /** callbacks for layer methods */
+- struct mxr_layer_ops ops;
++ struct mxr_layer_ops *ops;
+ /** format array */
+ const struct mxr_format **fmt_array;
+ /** size of format array */
+diff -Naur backports-3.18.1-1.org/drivers/media/platform/s5p-tv/mixer_reg.c backports-3.18.1-1/drivers/media/platform/s5p-tv/mixer_reg.c
+--- backports-3.18.1-1.org/drivers/media/platform/s5p-tv/mixer_reg.c 2014-12-21 22:37:13.000000000 +0100
++++ backports-3.18.1-1/drivers/media/platform/s5p-tv/mixer_reg.c 2014-12-28 14:10:09.532888798 +0100
+@@ -276,7 +276,7 @@
+ layer->update_buf = next;
+ }
+
+- layer->ops.buffer_set(layer, layer->update_buf);
++ layer->ops->buffer_set(layer, layer->update_buf);
+
+ if (done && done != layer->shadow_buf)
+ vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
+diff -Naur backports-3.18.1-1.org/drivers/media/platform/s5p-tv/mixer_video.c backports-3.18.1-1/drivers/media/platform/s5p-tv/mixer_video.c
+--- backports-3.18.1-1.org/drivers/media/platform/s5p-tv/mixer_video.c 2014-12-21 22:37:13.000000000 +0100
++++ backports-3.18.1-1/drivers/media/platform/s5p-tv/mixer_video.c 2014-12-28 14:10:09.532888798 +0100
+@@ -210,7 +210,7 @@
+ layer->geo.src.height = layer->geo.src.full_height;
+
+ mxr_geometry_dump(mdev, &layer->geo);
+- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
++ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
+ mxr_geometry_dump(mdev, &layer->geo);
+ }
+
+@@ -228,7 +228,7 @@
+ layer->geo.dst.full_width = mbus_fmt.width;
+ layer->geo.dst.full_height = mbus_fmt.height;
+ layer->geo.dst.field = mbus_fmt.field;
+- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
++ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
+
+ mxr_geometry_dump(mdev, &layer->geo);
+ }
+@@ -334,7 +334,7 @@
+ /* set source size to highest accepted value */
+ geo->src.full_width = max(geo->dst.full_width, pix->width);
+ geo->src.full_height = max(geo->dst.full_height, pix->height);
+- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
++ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
+ mxr_geometry_dump(mdev, &layer->geo);
+ /* set cropping to total visible screen */
+ geo->src.width = pix->width;
+@@ -342,12 +342,12 @@
+ geo->src.x_offset = 0;
+ geo->src.y_offset = 0;
+ /* assure consistency of geometry */
+- layer->ops.fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
++ layer->ops->fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
+ mxr_geometry_dump(mdev, &layer->geo);
+ /* set full size to lowest possible value */
+ geo->src.full_width = 0;
+ geo->src.full_height = 0;
+- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
++ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
+ mxr_geometry_dump(mdev, &layer->geo);
+
+ /* returning results */
+@@ -474,7 +474,7 @@
+ target->width = s->r.width;
+ target->height = s->r.height;
+
+- layer->ops.fix_geometry(layer, stage, s->flags);
++ layer->ops->fix_geometry(layer, stage, s->flags);
+
+ /* retrieve update selection rectangle */
+ res.left = target->x_offset;
+@@ -954,13 +954,13 @@
+ mxr_output_get(mdev);
+
+ mxr_layer_update_output(layer);
+- layer->ops.format_set(layer);
++ layer->ops->format_set(layer);
+ /* enabling layer in hardware */
+ spin_lock_irqsave(&layer->enq_slock, flags);
+ layer->state = MXR_LAYER_STREAMING;
+ spin_unlock_irqrestore(&layer->enq_slock, flags);
+
+- layer->ops.stream_set(layer, MXR_ENABLE);
++ layer->ops->stream_set(layer, MXR_ENABLE);
+ mxr_streamer_get(mdev);
+
+ return 0;
+@@ -1030,7 +1030,7 @@
+ spin_unlock_irqrestore(&layer->enq_slock, flags);
+
+ /* disabling layer in hardware */
+- layer->ops.stream_set(layer, MXR_DISABLE);
++ layer->ops->stream_set(layer, MXR_DISABLE);
+ /* remove one streamer */
+ mxr_streamer_put(mdev);
+ /* allow changes in output configuration */
+@@ -1068,8 +1068,8 @@
+
+ void mxr_layer_release(struct mxr_layer *layer)
+ {
+- if (layer->ops.release)
+- layer->ops.release(layer);
++ if (layer->ops->release)
++ layer->ops->release(layer);
+ }
+
+ void mxr_base_layer_release(struct mxr_layer *layer)
+@@ -1095,7 +1095,7 @@
+
+ layer->mdev = mdev;
+ layer->idx = idx;
+- layer->ops = *ops;
++ layer->ops = ops;
+
+ spin_lock_init(&layer->enq_slock);
+ INIT_LIST_HEAD(&layer->enq_list);
+diff -Naur backports-3.18.1-1.org/drivers/media/platform/s5p-tv/mixer_vp_layer.c backports-3.18.1-1/drivers/media/platform/s5p-tv/mixer_vp_layer.c
+--- backports-3.18.1-1.org/drivers/media/platform/s5p-tv/mixer_vp_layer.c 2014-12-21 22:37:13.000000000 +0100
++++ backports-3.18.1-1/drivers/media/platform/s5p-tv/mixer_vp_layer.c 2014-12-28 14:10:09.532888798 +0100
+@@ -206,7 +206,7 @@
+ {
+ struct mxr_layer *layer;
+ int ret;
+- struct mxr_layer_ops ops = {
++ static struct mxr_layer_ops ops = {
+ .release = mxr_vp_layer_release,
+ .buffer_set = mxr_vp_buffer_set,
+ .stream_set = mxr_vp_stream_set,
+diff -Naur backports-3.18.1-1.org/drivers/media/radio/radio-cadet.c backports-3.18.1-1/drivers/media/radio/radio-cadet.c
+--- backports-3.18.1-1.org/drivers/media/radio/radio-cadet.c 2014-12-21 22:37:13.000000000 +0100
++++ backports-3.18.1-1/drivers/media/radio/radio-cadet.c 2014-12-28 14:10:09.532888798 +0100
+@@ -333,6 +333,8 @@
+ unsigned char readbuf[RDS_BUFFER];
+ int i = 0;
+
++ if (count > RDS_BUFFER)
++ return -EFAULT;
+ mutex_lock(&dev->lock);
+ if (dev->rdsstat == 0)
+ cadet_start_rds(dev);
+@@ -349,8 +351,9 @@
+ readbuf[i++] = dev->rdsbuf[dev->rdsout++];
+ mutex_unlock(&dev->lock);
+
+- if (i && copy_to_user(data, readbuf, i))
+- return -EFAULT;
++ if (i > sizeof(readbuf) || (i && copy_to_user(data, readbuf, i)))
++ i = -EFAULT;
++
+ return i;
+ }
+
+diff -Naur backports-3.18.1-1.org/drivers/media/radio/radio-maxiradio.c backports-3.18.1-1/drivers/media/radio/radio-maxiradio.c
+--- backports-3.18.1-1.org/drivers/media/radio/radio-maxiradio.c 2014-12-21 22:37:13.000000000 +0100
++++ backports-3.18.1-1/drivers/media/radio/radio-maxiradio.c 2014-12-28 14:10:09.532888798 +0100
+@@ -61,7 +61,7 @@
+ /* TEA5757 pin mappings */
+ static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16;
+
+-static atomic_t maxiradio_instance = ATOMIC_INIT(0);
++static atomic_unchecked_t maxiradio_instance = ATOMIC_INIT(0);
+
+ #define PCI_VENDOR_ID_GUILLEMOT 0x5046
+ #define PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO 0x1001
+diff -Naur backports-3.18.1-1.org/drivers/media/radio/radio-shark2.c backports-3.18.1-1/drivers/media/radio/radio-shark2.c
+--- backports-3.18.1-1.org/drivers/media/radio/radio-shark2.c 2014-12-21 22:37:13.000000000 +0100
++++ backports-3.18.1-1/drivers/media/radio/radio-shark2.c 2014-12-28 14:10:09.532888798 +0100
+@@ -74,7 +74,7 @@
+ u8 *transfer_buffer;
+ };
+
+-static atomic_t shark_instance = ATOMIC_INIT(0);
++static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
+
+ static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
+ {
+diff -Naur backports-3.18.1-1.org/drivers/media/radio/radio-shark.c backports-3.18.1-1/drivers/media/radio/radio-shark.c
+--- backports-3.18.1-1.org/drivers/media/radio/radio-shark.c 2014-12-21 22:37:13.000000000 +0100
++++ backports-3.18.1-1/drivers/media/radio/radio-shark.c 2014-12-28 14:10:09.532888798 +0100
+@@ -79,7 +79,7 @@
+ u32 last_val;
+ };
+
+-static atomic_t shark_instance = ATOMIC_INIT(0);
++static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
+
+ static void shark_write_val(struct snd_tea575x *tea, u32 val)
+ {
+diff -Naur backports-3.18.1-1.org/drivers/media/radio/radio-si476x.c backports-3.18.1-1/drivers/media/radio/radio-si476x.c
+--- backports-3.18.1-1.org/drivers/media/radio/radio-si476x.c 2014-12-21 22:37:13.000000000 +0100
++++ backports-3.18.1-1/drivers/media/radio/radio-si476x.c 2014-12-28 14:10:09.532888798 +0100
+@@ -1445,7 +1445,7 @@
+ struct si476x_radio *radio;
+ struct v4l2_ctrl *ctrl;
+
+- static atomic_t instance = ATOMIC_INIT(0);
++ static atomic_unchecked_t instance = ATOMIC_INIT(0);
+
+ radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL);
+ if (!radio)
+diff -Naur backports-3.18.1-1.org/drivers/media/usb/dvb-usb/cinergyT2-core.c backports-3.18.1-1/drivers/media/usb/dvb-usb/cinergyT2-core.c
+--- backports-3.18.1-1.org/drivers/media/usb/dvb-usb/cinergyT2-core.c 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/media/usb/dvb-usb/cinergyT2-core.c 2014-12-28 14:10:09.532888798 +0100
+@@ -50,29 +50,73 @@
+
+ static int cinergyt2_streaming_ctrl(struct dvb_usb_adapter *adap, int enable)
+ {
+- char buf[] = { CINERGYT2_EP1_CONTROL_STREAM_TRANSFER, enable ? 1 : 0 };
+- char result[64];
+- return dvb_usb_generic_rw(adap->dev, buf, sizeof(buf), result,
+- sizeof(result), 0);
++ char *buf;
++ char *result;
++ int retval;
++
++ buf = kmalloc(2, GFP_KERNEL);
++ if (buf == NULL)
++ return -ENOMEM;
++ result = kmalloc(64, GFP_KERNEL);
++ if (result == NULL) {
++ kfree(buf);
++ return -ENOMEM;
++ }
++
++ buf[0] = CINERGYT2_EP1_CONTROL_STREAM_TRANSFER;
++ buf[1] = enable ? 1 : 0;
++
++ retval = dvb_usb_generic_rw(adap->dev, buf, 2, result, 64, 0);
++
++ kfree(buf);
++ kfree(result);
++ return retval;
+ }
+
+ static int cinergyt2_power_ctrl(struct dvb_usb_device *d, int enable)
+ {
+- char buf[] = { CINERGYT2_EP1_SLEEP_MODE, enable ? 0 : 1 };
+- char state[3];
+- return dvb_usb_generic_rw(d, buf, sizeof(buf), state, sizeof(state), 0);
++ char *buf;
++ char *state;
++ int retval;
++
++ buf = kmalloc(2, GFP_KERNEL);
++ if (buf == NULL)
++ return -ENOMEM;
++ state = kmalloc(3, GFP_KERNEL);
++ if (state == NULL) {
++ kfree(buf);
++ return -ENOMEM;
++ }
++
++ buf[0] = CINERGYT2_EP1_SLEEP_MODE;
++ buf[1] = enable ? 1 : 0;
++
++ retval = dvb_usb_generic_rw(d, buf, 2, state, 3, 0);
++
++ kfree(buf);
++ kfree(state);
++ return retval;
+ }
+
+ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
+ {
+- char query[] = { CINERGYT2_EP1_GET_FIRMWARE_VERSION };
+- char state[3];
++ char *query;
++ char *state;
+ int ret;
++ query = kmalloc(1, GFP_KERNEL);
++ if (query == NULL)
++ return -ENOMEM;
++ state = kmalloc(3, GFP_KERNEL);
++ if (state == NULL) {
++ kfree(query);
++ return -ENOMEM;
++ }
++
++ query[0] = CINERGYT2_EP1_GET_FIRMWARE_VERSION;
+
+ adap->fe_adap[0].fe = cinergyt2_fe_attach(adap->dev);
+
+- ret = dvb_usb_generic_rw(adap->dev, query, sizeof(query), state,
+- sizeof(state), 0);
++ ret = dvb_usb_generic_rw(adap->dev, query, 1, state, 3, 0);
+ if (ret < 0) {
+ deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep "
+ "state info\n");
+@@ -80,7 +124,8 @@
+
+ /* Copy this pointer as we are gonna need it in the release phase */
+ cinergyt2_usb_device = adap->dev;
+-
++ kfree(query);
++ kfree(state);
+ return 0;
+ }
+
+@@ -141,12 +186,23 @@
+ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
+ {
+ struct cinergyt2_state *st = d->priv;
+- u8 key[5] = {0, 0, 0, 0, 0}, cmd = CINERGYT2_EP1_GET_RC_EVENTS;
++ u8 *key, *cmd;
+ int i;
+
++ cmd = kmalloc(1, GFP_KERNEL);
++ if (cmd == NULL)
++ return -EINVAL;
++ key = kzalloc(5, GFP_KERNEL);
++ if (key == NULL) {
++ kfree(cmd);
++ return -EINVAL;
++ }
++
++ cmd[0] = CINERGYT2_EP1_GET_RC_EVENTS;
++
+ *state = REMOTE_NO_KEY_PRESSED;
+
+- dvb_usb_generic_rw(d, &cmd, 1, key, sizeof(key), 0);
++ dvb_usb_generic_rw(d, cmd, 1, key, 5, 0);
+ if (key[4] == 0xff) {
+ /* key repeat */
+ st->rc_counter++;
+@@ -157,12 +213,12 @@
+ *event = d->last_event;
+ deb_rc("repeat key, event %x\n",
+ *event);
+- return 0;
++ goto out;
+ }
+ }
+ deb_rc("repeated key (non repeatable)\n");
+ }
+- return 0;
++ goto out;
+ }
+
+ /* hack to pass checksum on the custom field */
+@@ -174,6 +230,9 @@
+
+ deb_rc("key: %*ph\n", 5, key);
+ }
++out:
++ kfree(cmd);
++ kfree(key);
+ return 0;
+ }
+
+diff -Naur backports-3.18.1-1.org/drivers/media/usb/dvb-usb/cinergyT2-fe.c backports-3.18.1-1/drivers/media/usb/dvb-usb/cinergyT2-fe.c
+--- backports-3.18.1-1.org/drivers/media/usb/dvb-usb/cinergyT2-fe.c 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/media/usb/dvb-usb/cinergyT2-fe.c 2014-12-28 14:10:09.532888798 +0100
+@@ -145,103 +145,176 @@
+ fe_status_t *status)
+ {
+ struct cinergyt2_fe_state *state = fe->demodulator_priv;
+- struct dvbt_get_status_msg result;
+- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
++ struct dvbt_get_status_msg *result;
++ u8 *cmd;
+ int ret;
+
+- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&result,
+- sizeof(result), 0);
++ cmd = kmalloc(1, GFP_KERNEL);
++ if (cmd == NULL)
++ return -ENOMEM;
++ result = kmalloc(sizeof(*result), GFP_KERNEL);
++ if (result == NULL) {
++ kfree(cmd);
++ return -ENOMEM;
++ }
++
++ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
++
++ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)result,
++ sizeof(*result), 0);
+ if (ret < 0)
+- return ret;
++ goto out;
+
+ *status = 0;
+
+- if (0xffff - le16_to_cpu(result.gain) > 30)
++ if (0xffff - le16_to_cpu(result->gain) > 30)
+ *status |= FE_HAS_SIGNAL;
+- if (result.lock_bits & (1 << 6))
++ if (result->lock_bits & (1 << 6))
+ *status |= FE_HAS_LOCK;
+- if (result.lock_bits & (1 << 5))
++ if (result->lock_bits & (1 << 5))
+ *status |= FE_HAS_SYNC;
+- if (result.lock_bits & (1 << 4))
++ if (result->lock_bits & (1 << 4))
+ *status |= FE_HAS_CARRIER;
+- if (result.lock_bits & (1 << 1))
++ if (result->lock_bits & (1 << 1))
+ *status |= FE_HAS_VITERBI;
+
+ if ((*status & (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC)) !=
+ (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC))
+ *status &= ~FE_HAS_LOCK;
+
+- return 0;
++out:
++ kfree(cmd);
++ kfree(result);
++ return ret;
+ }
+
+ static int cinergyt2_fe_read_ber(struct dvb_frontend *fe, u32 *ber)
+ {
+ struct cinergyt2_fe_state *state = fe->demodulator_priv;
+- struct dvbt_get_status_msg status;
+- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
++ struct dvbt_get_status_msg *status;
++ char *cmd;
+ int ret;
+
+- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
+- sizeof(status), 0);
++ cmd = kmalloc(1, GFP_KERNEL);
++ if (cmd == NULL)
++ return -ENOMEM;
++ status = kmalloc(sizeof(*status), GFP_KERNEL);
++ if (status == NULL) {
++ kfree(cmd);
++ return -ENOMEM;
++ }
++
++ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
++
++ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
++ sizeof(*status), 0);
+ if (ret < 0)
+- return ret;
++ goto out;
+
+- *ber = le32_to_cpu(status.viterbi_error_rate);
++ *ber = le32_to_cpu(status->viterbi_error_rate);
++out:
++ kfree(cmd);
++ kfree(status);
+ return 0;
+ }
+
+ static int cinergyt2_fe_read_unc_blocks(struct dvb_frontend *fe, u32 *unc)
+ {
+ struct cinergyt2_fe_state *state = fe->demodulator_priv;
+- struct dvbt_get_status_msg status;
+- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
++ struct dvbt_get_status_msg *status;
++ u8 *cmd;
+ int ret;
+
+- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&status,
+- sizeof(status), 0);
++ cmd = kmalloc(1, GFP_KERNEL);
++ if (cmd == NULL)
++ return -ENOMEM;
++ status = kmalloc(sizeof(*status), GFP_KERNEL);
++ if (status == NULL) {
++ kfree(cmd);
++ return -ENOMEM;
++ }
++
++ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
++
++ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)status,
++ sizeof(*status), 0);
+ if (ret < 0) {
+ err("cinergyt2_fe_read_unc_blocks() Failed! (Error=%d)\n",
+ ret);
+- return ret;
++ goto out;
+ }
+- *unc = le32_to_cpu(status.uncorrected_block_count);
+- return 0;
++ *unc = le32_to_cpu(status->uncorrected_block_count);
++
++out:
++ kfree(cmd);
++ kfree(status);
++ return ret;
+ }
+
+ static int cinergyt2_fe_read_signal_strength(struct dvb_frontend *fe,
+ u16 *strength)
+ {
+ struct cinergyt2_fe_state *state = fe->demodulator_priv;
+- struct dvbt_get_status_msg status;
+- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
++ struct dvbt_get_status_msg *status;
++ char *cmd;
+ int ret;
+
+- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
+- sizeof(status), 0);
++ cmd = kmalloc(1, GFP_KERNEL);
++ if (cmd == NULL)
++ return -ENOMEM;
++ status = kmalloc(sizeof(*status), GFP_KERNEL);
++ if (status == NULL) {
++ kfree(cmd);
++ return -ENOMEM;
++ }
++
++ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
++
++ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
++ sizeof(*status), 0);
+ if (ret < 0) {
+ err("cinergyt2_fe_read_signal_strength() Failed!"
+ " (Error=%d)\n", ret);
+- return ret;
++ goto out;
+ }
+- *strength = (0xffff - le16_to_cpu(status.gain));
++ *strength = (0xffff - le16_to_cpu(status->gain));
++
++out:
++ kfree(cmd);
++ kfree(status);
+ return 0;
+ }
+
+ static int cinergyt2_fe_read_snr(struct dvb_frontend *fe, u16 *snr)
+ {
+ struct cinergyt2_fe_state *state = fe->demodulator_priv;
+- struct dvbt_get_status_msg status;
+- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
++ struct dvbt_get_status_msg *status;
++ char *cmd;
+ int ret;
+
+- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
+- sizeof(status), 0);
++ cmd = kmalloc(1, GFP_KERNEL);
++ if (cmd == NULL)
++ return -ENOMEM;
++ status = kmalloc(sizeof(*status), GFP_KERNEL);
++ if (status == NULL) {
++ kfree(cmd);
++ return -ENOMEM;
++ }
++
++ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
++
++ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
++ sizeof(*status), 0);
+ if (ret < 0) {
+ err("cinergyt2_fe_read_snr() Failed! (Error=%d)\n", ret);
+- return ret;
++ goto out;
+ }
+- *snr = (status.snr << 8) | status.snr;
+- return 0;
++ *snr = (status->snr << 8) | status->snr;
++
++out:
++ kfree(cmd);
++ kfree(status);
++ return ret;
+ }
+
+ static int cinergyt2_fe_init(struct dvb_frontend *fe)
+@@ -266,35 +339,46 @@
+ {
+ struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
+ struct cinergyt2_fe_state *state = fe->demodulator_priv;
+- struct dvbt_set_parameters_msg param;
+- char result[2];
++ struct dvbt_set_parameters_msg *param;
++ char *result;
+ int err;
+
+- param.cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
+- param.tps = cpu_to_le16(compute_tps(fep));
+- param.freq = cpu_to_le32(fep->frequency / 1000);
+- param.flags = 0;
++ result = kmalloc(2, GFP_KERNEL);
++ if (result == NULL)
++ return -ENOMEM;
++ param = kmalloc(sizeof(*param), GFP_KERNEL);
++ if (param == NULL) {
++ kfree(result);
++ return -ENOMEM;
++ }
++
++ param->cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
++ param->tps = cpu_to_le16(compute_tps(fep));
++ param->freq = cpu_to_le32(fep->frequency / 1000);
++ param->flags = 0;
+
+ switch (fep->bandwidth_hz) {
+ default:
+ case 8000000:
+- param.bandwidth = 8;
++ param->bandwidth = 8;
+ break;
+ case 7000000:
+- param.bandwidth = 7;
++ param->bandwidth = 7;
+ break;
+ case 6000000:
+- param.bandwidth = 6;
++ param->bandwidth = 6;
+ break;
+ }
+
+ err = dvb_usb_generic_rw(state->d,
+- (char *)¶m, sizeof(param),
+- result, sizeof(result), 0);
++ (char *)param, sizeof(*param),
++ result, 2, 0);
+ if (err < 0)
+ err("cinergyt2_fe_set_frontend() Failed! err=%d\n", err);
+
+- return (err < 0) ? err : 0;
++ kfree(result);
++ kfree(param);
++ return err;
+ }
+
+ static void cinergyt2_fe_release(struct dvb_frontend *fe)
+diff -Naur backports-3.18.1-1.org/drivers/media/usb/dvb-usb/dvb-usb-firmware.c backports-3.18.1-1/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
+--- backports-3.18.1-1.org/drivers/media/usb/dvb-usb/dvb-usb-firmware.c 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/media/usb/dvb-usb/dvb-usb-firmware.c 2014-12-28 14:10:09.532888798 +0100
+@@ -35,42 +35,57 @@
+
+ int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type)
+ {
+- struct hexline hx;
+- u8 reset;
++ struct hexline *hx;
++ u8 *reset;
+ int ret,pos=0;
+
++ reset = kmalloc(1, GFP_KERNEL);
++ if (reset == NULL)
++ return -ENOMEM;
++
++ hx = kmalloc(sizeof(struct hexline), GFP_KERNEL);
++ if (hx == NULL) {
++ kfree(reset);
++ return -ENOMEM;
++ }
++
+ /* stop the CPU */
+- reset = 1;
+- if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1)) != 1)
++ reset[0] = 1;
++ if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1)) != 1)
+ err("could not stop the USB controller CPU.");
+
+- while ((ret = dvb_usb_get_hexline(fw,&hx,&pos)) > 0) {
+- deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx.addr,hx.len,hx.chk);
+- ret = usb_cypress_writemem(udev,hx.addr,hx.data,hx.len);
++ while ((ret = dvb_usb_get_hexline(fw,hx,&pos)) > 0) {
++ deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx->addr,hx->len,hx->chk);
++ ret = usb_cypress_writemem(udev,hx->addr,hx->data,hx->len);
+
+- if (ret != hx.len) {
++ if (ret != hx->len) {
+ err("error while transferring firmware "
+ "(transferred size: %d, block size: %d)",
+- ret,hx.len);
++ ret,hx->len);
+ ret = -EINVAL;
+ break;
+ }
+ }
+ if (ret < 0) {
+ err("firmware download failed at %d with %d",pos,ret);
++ kfree(reset);
++ kfree(hx);
+ return ret;
+ }
+
+ if (ret == 0) {
+ /* restart the CPU */
+- reset = 0;
+- if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1) != 1) {
++ reset[0] = 0;
++ if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1) != 1) {
+ err("could not restart the USB controller CPU.");
+ ret = -EINVAL;
+ }
+ } else
+ ret = -EIO;
+
++ kfree(reset);
++ kfree(hx);
++
+ return ret;
+ }
+ EXPORT_SYMBOL(usb_cypress_load_firmware);
+diff -Naur backports-3.18.1-1.org/drivers/media/usb/dvb-usb/dw2102.c backports-3.18.1-1/drivers/media/usb/dvb-usb/dw2102.c
+--- backports-3.18.1-1.org/drivers/media/usb/dvb-usb/dw2102.c 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/media/usb/dvb-usb/dw2102.c 2014-12-28 14:10:09.536888811 +0100
+@@ -118,7 +118,7 @@
+
+ struct s6x0_state {
+ int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
+-};
++} __no_const;
+
+ /* debug */
+ static int dvb_usb_dw2102_debug;
+diff -Naur backports-3.18.1-1.org/drivers/media/usb/dvb-usb/technisat-usb2.c backports-3.18.1-1/drivers/media/usb/dvb-usb/technisat-usb2.c
+--- backports-3.18.1-1.org/drivers/media/usb/dvb-usb/technisat-usb2.c 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/media/usb/dvb-usb/technisat-usb2.c 2014-12-28 14:10:09.536888811 +0100
+@@ -87,8 +87,11 @@
+ static int technisat_usb2_i2c_access(struct usb_device *udev,
+ u8 device_addr, u8 *tx, u8 txlen, u8 *rx, u8 rxlen)
+ {
+- u8 b[64];
+- int ret, actual_length;
++ u8 *b = kmalloc(64, GFP_KERNEL);
++ int ret, actual_length, error = 0;
++
++ if (b == NULL)
++ return -ENOMEM;
+
+ deb_i2c("i2c-access: %02x, tx: ", device_addr);
+ debug_dump(tx, txlen, deb_i2c);
+@@ -121,7 +124,8 @@
+
+ if (ret < 0) {
+ err("i2c-error: out failed %02x = %d", device_addr, ret);
+- return -ENODEV;
++ error = -ENODEV;
++ goto out;
+ }
+
+ ret = usb_bulk_msg(udev,
+@@ -129,7 +133,8 @@
+ b, 64, &actual_length, 1000);
+ if (ret < 0) {
+ err("i2c-error: in failed %02x = %d", device_addr, ret);
+- return -ENODEV;
++ error = -ENODEV;
++ goto out;
+ }
+
+ if (b[0] != I2C_STATUS_OK) {
+@@ -137,8 +142,10 @@
+ /* handle tuner-i2c-nak */
+ if (!(b[0] == I2C_STATUS_NAK &&
+ device_addr == 0x60
+- /* && device_is_technisat_usb2 */))
+- return -ENODEV;
++ /* && device_is_technisat_usb2 */)) {
++ error = -ENODEV;
++ goto out;
++ }
+ }
+
+ deb_i2c("status: %d, ", b[0]);
+@@ -152,7 +159,9 @@
+
+ deb_i2c("\n");
+
+- return 0;
++out:
++ kfree(b);
++ return error;
+ }
+
+ static int technisat_usb2_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msg,
+@@ -224,14 +233,16 @@
+ {
+ int ret;
+
+- u8 led[8] = {
+- red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
+- 0
+- };
++ u8 *led = kzalloc(8, GFP_KERNEL);
++
++ if (led == NULL)
++ return -ENOMEM;
+
+ if (disable_led_control && state != TECH_LED_OFF)
+ return 0;
+
++ led[0] = red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST;
++
+ switch (state) {
+ case TECH_LED_ON:
+ led[1] = 0x82;
+@@ -263,16 +274,22 @@
+ red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
+ USB_TYPE_VENDOR | USB_DIR_OUT,
+ 0, 0,
+- led, sizeof(led), 500);
++ led, 8, 500);
+
+ mutex_unlock(&d->i2c_mutex);
++
++ kfree(led);
++
+ return ret;
+ }
+
+ static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 green)
+ {
+ int ret;
+- u8 b = 0;
++ u8 *b = kzalloc(1, GFP_KERNEL);
++
++ if (b == NULL)
++ return -ENOMEM;
+
+ if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
+ return -EAGAIN;
+@@ -281,10 +298,12 @@
+ SET_LED_TIMER_DIVIDER_VENDOR_REQUEST,
+ USB_TYPE_VENDOR | USB_DIR_OUT,
+ (red << 8) | green, 0,
+- &b, 1, 500);
++ b, 1, 500);
+
+ mutex_unlock(&d->i2c_mutex);
+
++ kfree(b);
++
+ return ret;
+ }
+
+@@ -328,7 +347,7 @@
+ struct dvb_usb_device_description **desc, int *cold)
+ {
+ int ret;
+- u8 version[3];
++ u8 *version = kmalloc(3, GFP_KERNEL);
+
+ /* first select the interface */
+ if (usb_set_interface(udev, 0, 1) != 0)
+@@ -338,11 +357,14 @@
+
+ *cold = 0; /* by default do not download a firmware - just in case something is wrong */
+
++ if (version == NULL)
++ return 0;
++
+ ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
+ GET_VERSION_INFO_VENDOR_REQUEST,
+ USB_TYPE_VENDOR | USB_DIR_IN,
+ 0, 0,
+- version, sizeof(version), 500);
++ version, 3, 500);
+
+ if (ret < 0)
+ *cold = 1;
+@@ -351,6 +373,8 @@
+ *cold = 0;
+ }
+
++ kfree(version);
++
+ return 0;
+ }
+
+@@ -591,10 +615,15 @@
+
+ static int technisat_usb2_get_ir(struct dvb_usb_device *d)
+ {
+- u8 buf[62], *b;
++ u8 *buf, *b;
+ int ret;
+ struct ir_raw_event ev;
+
++ buf = kmalloc(62, GFP_KERNEL);
++
++ if (buf == NULL)
++ return -ENOMEM;
++
+ buf[0] = GET_IR_DATA_VENDOR_REQUEST;
+ buf[1] = 0x08;
+ buf[2] = 0x8f;
+@@ -617,16 +646,20 @@
+ GET_IR_DATA_VENDOR_REQUEST,
+ USB_TYPE_VENDOR | USB_DIR_IN,
+ 0x8080, 0,
+- buf, sizeof(buf), 500);
++ buf, 62, 500);
+
+ unlock:
+ mutex_unlock(&d->i2c_mutex);
+
+- if (ret < 0)
++ if (ret < 0) {
++ kfree(buf);
+ return ret;
++ }
+
+- if (ret == 1)
++ if (ret == 1) {
++ kfree(buf);
+ return 0; /* no key pressed */
++ }
+
+ /* decoding */
+ b = buf+1;
+@@ -653,6 +686,8 @@
+
+ ir_raw_event_handle(d->rc_dev);
+
++ kfree(buf);
++
+ return 1;
+ }
+
+diff -Naur backports-3.18.1-1.org/drivers/media/v4l2-core/v4l2-device.c backports-3.18.1-1/drivers/media/v4l2-core/v4l2-device.c
+--- backports-3.18.1-1.org/drivers/media/v4l2-core/v4l2-device.c 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/media/v4l2-core/v4l2-device.c 2014-12-28 14:10:09.536888811 +0100
+@@ -75,9 +75,9 @@
+ EXPORT_SYMBOL_GPL(v4l2_device_put);
+
+ int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
+- atomic_t *instance)
++ atomic_unchecked_t *instance)
+ {
+- int num = atomic_inc_return(instance) - 1;
++ int num = atomic_inc_return_unchecked(instance) - 1;
+ int len = strlen(basename);
+
+ if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
+diff -Naur backports-3.18.1-1.org/drivers/media/v4l2-core/v4l2-ioctl.c backports-3.18.1-1/drivers/media/v4l2-core/v4l2-ioctl.c
+--- backports-3.18.1-1.org/drivers/media/v4l2-core/v4l2-ioctl.c 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/media/v4l2-core/v4l2-ioctl.c 2014-12-28 14:10:09.536888811 +0100
+@@ -2142,7 +2142,8 @@
+ struct file *file, void *fh, void *p);
+ } u;
+ void (*debug)(const void *arg, bool write_only);
+-};
++} __do_const;
++typedef struct v4l2_ioctl_info __no_const v4l2_ioctl_info_no_const;
+
+ /* This control needs a priority check */
+ #define INFO_FL_PRIO (1 << 0)
+@@ -2326,7 +2327,7 @@
+ struct video_device *vfd = video_devdata(file);
+ const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
+ bool write_only = false;
+- struct v4l2_ioctl_info default_info;
++ v4l2_ioctl_info_no_const default_info;
+ const struct v4l2_ioctl_info *info;
+ void *fh = file->private_data;
+ struct v4l2_fh *vfh = NULL;
+@@ -2413,7 +2414,7 @@
+ ret = -EINVAL;
+ break;
+ }
+- *user_ptr = (void __user *)buf->m.planes;
++ *user_ptr = (void __force_user *)buf->m.planes;
+ *kernel_ptr = (void **)&buf->m.planes;
+ *array_size = sizeof(struct v4l2_plane) * buf->length;
+ ret = 1;
+@@ -2430,7 +2431,7 @@
+ ret = -EINVAL;
+ break;
+ }
+- *user_ptr = (void __user *)edid->edid;
++ *user_ptr = (void __force_user *)edid->edid;
+ *kernel_ptr = (void **)&edid->edid;
+ *array_size = edid->blocks * 128;
+ ret = 1;
+@@ -2448,7 +2449,7 @@
+ ret = -EINVAL;
+ break;
+ }
+- *user_ptr = (void __user *)ctrls->controls;
++ *user_ptr = (void __force_user *)ctrls->controls;
+ *kernel_ptr = (void **)&ctrls->controls;
+ *array_size = sizeof(struct v4l2_ext_control)
+ * ctrls->count;
+@@ -2549,7 +2550,7 @@
+ }
+
+ if (has_array_args) {
+- *kernel_ptr = (void __force *)user_ptr;
++ *kernel_ptr = (void __force_kernel *)user_ptr;
+ if (copy_to_user(user_ptr, mbuf, array_size))
+ err = -EFAULT;
+ goto out_array_args;
+diff -Naur backports-3.18.1-1.org/drivers/net/ieee802154/fakehard.c backports-3.18.1-1/drivers/net/ieee802154/fakehard.c
+--- backports-3.18.1-1.org/drivers/net/ieee802154/fakehard.c 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/net/ieee802154/fakehard.c 2014-12-28 14:10:09.556888909 +0100
+@@ -365,7 +365,7 @@
+ phy->transmit_power = 0xbf;
+
+ dev->netdev_ops = &fake_ops;
+- dev->ml_priv = &fake_mlme;
++ dev->ml_priv = (void *)&fake_mlme;
+
+ priv = netdev_priv(dev);
+ priv->phy = phy;
+diff -Naur backports-3.18.1-1.org/drivers/net/usb/sierra_net.c backports-3.18.1-1/drivers/net/usb/sierra_net.c
+--- backports-3.18.1-1.org/drivers/net/usb/sierra_net.c 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/net/usb/sierra_net.c 2014-12-28 14:10:09.560888936 +0100
+@@ -51,7 +51,7 @@
+ /* atomic counter partially included in MAC address to make sure 2 devices
+ * do not end up with the same MAC - concept breaks in case of > 255 ifaces
+ */
+-static atomic_t iface_counter = ATOMIC_INIT(0);
++static atomic_unchecked_t iface_counter = ATOMIC_INIT(0);
+
+ /*
+ * SYNC Timer Delay definition used to set the expiry time
+@@ -697,7 +697,7 @@
+ dev->net->netdev_ops = &sierra_net_device_ops;
+
+ /* change MAC addr to include, ifacenum, and to be unique */
+- dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return(&iface_counter);
++ dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return_unchecked(&iface_counter);
+ dev->net->dev_addr[ETH_ALEN-1] = ifacenum;
+
+ /* we will have to manufacture ethernet headers, prepare template */
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/at76c50x-usb.c backports-3.18.1-1/drivers/net/wireless/at76c50x-usb.c
+--- backports-3.18.1-1.org/drivers/net/wireless/at76c50x-usb.c 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/at76c50x-usb.c 2014-12-28 14:10:09.560888936 +0100
+@@ -353,7 +353,7 @@
+ }
+
+ /* Convert timeout from the DFU status to jiffies */
+-static inline unsigned long at76_get_timeout(struct dfu_status *s)
++static inline unsigned long __intentional_overflow(-1) at76_get_timeout(struct dfu_status *s)
+ {
+ return msecs_to_jiffies((s->poll_timeout[2] << 16)
+ | (s->poll_timeout[1] << 8)
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/ath/ath10k/htc.c backports-3.18.1-1/drivers/net/wireless/ath/ath10k/htc.c
+--- backports-3.18.1-1.org/drivers/net/wireless/ath/ath10k/htc.c 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/ath/ath10k/htc.c 2014-12-28 14:10:09.560888936 +0100
+@@ -848,7 +848,10 @@
+ /* registered target arrival callback from the HIF layer */
+ int ath10k_htc_init(struct ath10k *ar)
+ {
+- struct ath10k_hif_cb htc_callbacks;
++ static struct ath10k_hif_cb htc_callbacks = {
++ .rx_completion = ath10k_htc_rx_completion_handler,
++ .tx_completion = ath10k_htc_tx_completion_handler,
++ };
+ struct ath10k_htc_ep *ep = NULL;
+ struct ath10k_htc *htc = &ar->htc;
+
+@@ -857,8 +860,6 @@
+ ath10k_htc_reset_endpoint_states(htc);
+
+ /* setup HIF layer callbacks */
+- htc_callbacks.rx_completion = ath10k_htc_rx_completion_handler;
+- htc_callbacks.tx_completion = ath10k_htc_tx_completion_handler;
+ htc->ar = ar;
+
+ /* Get HIF default pipe for HTC message exchange */
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/ath/ath10k/htc.h backports-3.18.1-1/drivers/net/wireless/ath/ath10k/htc.h
+--- backports-3.18.1-1.org/drivers/net/wireless/ath/ath10k/htc.h 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/ath/ath10k/htc.h 2014-12-28 14:10:09.560888936 +0100
+@@ -270,13 +270,13 @@
+
+ struct ath10k_htc_ops {
+ void (*target_send_suspend_complete)(struct ath10k *ar);
+-};
++} __no_const;
+
+ struct ath10k_htc_ep_ops {
+ void (*ep_tx_complete)(struct ath10k *, struct sk_buff *);
+ void (*ep_rx_complete)(struct ath10k *, struct sk_buff *);
+ void (*ep_tx_credits)(struct ath10k *);
+-};
++} __no_const;
+
+ /* service connection information */
+ struct ath10k_htc_svc_conn_req {
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/ath/ath9k/ar9002_mac.c backports-3.18.1-1/drivers/net/wireless/ath/ath9k/ar9002_mac.c
+--- backports-3.18.1-1.org/drivers/net/wireless/ath/ath9k/ar9002_mac.c 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/ath/ath9k/ar9002_mac.c 2014-12-28 14:10:09.560888936 +0100
+@@ -220,8 +220,8 @@
+ ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
+ ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
+
+- ACCESS_ONCE(ads->ds_link) = i->link;
+- ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
++ ACCESS_ONCE_RW(ads->ds_link) = i->link;
++ ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
+
+ ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
+ ctl6 = SM(i->keytype, AR_EncrType);
+@@ -235,26 +235,26 @@
+
+ if ((i->is_first || i->is_last) &&
+ i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
+- ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
++ ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
+ | set11nTries(i->rates, 1)
+ | set11nTries(i->rates, 2)
+ | set11nTries(i->rates, 3)
+ | (i->dur_update ? AR_DurUpdateEna : 0)
+ | SM(0, AR_BurstDur);
+
+- ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
++ ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
+ | set11nRate(i->rates, 1)
+ | set11nRate(i->rates, 2)
+ | set11nRate(i->rates, 3);
+ } else {
+- ACCESS_ONCE(ads->ds_ctl2) = 0;
+- ACCESS_ONCE(ads->ds_ctl3) = 0;
++ ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
++ ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
+ }
+
+ if (!i->is_first) {
+- ACCESS_ONCE(ads->ds_ctl0) = 0;
+- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
+- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
++ ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
++ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
++ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
+ return;
+ }
+
+@@ -279,7 +279,7 @@
+ break;
+ }
+
+- ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
++ ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
+ | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
+ | SM(i->txpower, AR_XmitPower0)
+ | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
+@@ -289,27 +289,27 @@
+ | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
+ (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
+
+- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
+- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
++ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
++ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
+
+ if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
+ return;
+
+- ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
++ ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
+ | set11nPktDurRTSCTS(i->rates, 1);
+
+- ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
++ ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
+ | set11nPktDurRTSCTS(i->rates, 3);
+
+- ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
++ ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
+ | set11nRateFlags(i->rates, 1)
+ | set11nRateFlags(i->rates, 2)
+ | set11nRateFlags(i->rates, 3)
+ | SM(i->rtscts_rate, AR_RTSCTSRate);
+
+- ACCESS_ONCE(ads->ds_ctl9) = SM(i->txpower, AR_XmitPower1);
+- ACCESS_ONCE(ads->ds_ctl10) = SM(i->txpower, AR_XmitPower2);
+- ACCESS_ONCE(ads->ds_ctl11) = SM(i->txpower, AR_XmitPower3);
++ ACCESS_ONCE_RW(ads->ds_ctl9) = SM(i->txpower, AR_XmitPower1);
++ ACCESS_ONCE_RW(ads->ds_ctl10) = SM(i->txpower, AR_XmitPower2);
++ ACCESS_ONCE_RW(ads->ds_ctl11) = SM(i->txpower, AR_XmitPower3);
+ }
+
+ static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/ath/ath9k/ar9003_mac.c backports-3.18.1-1/drivers/net/wireless/ath/ath9k/ar9003_mac.c
+--- backports-3.18.1-1.org/drivers/net/wireless/ath/ath9k/ar9003_mac.c 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/ath/ath9k/ar9003_mac.c 2014-12-28 14:10:09.560888936 +0100
+@@ -39,47 +39,47 @@
+ (i->qcu << AR_TxQcuNum_S) | desc_len;
+
+ checksum += val;
+- ACCESS_ONCE(ads->info) = val;
++ ACCESS_ONCE_RW(ads->info) = val;
+
+ checksum += i->link;
+- ACCESS_ONCE(ads->link) = i->link;
++ ACCESS_ONCE_RW(ads->link) = i->link;
+
+ checksum += i->buf_addr[0];
+- ACCESS_ONCE(ads->data0) = i->buf_addr[0];
++ ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
+ checksum += i->buf_addr[1];
+- ACCESS_ONCE(ads->data1) = i->buf_addr[1];
++ ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
+ checksum += i->buf_addr[2];
+- ACCESS_ONCE(ads->data2) = i->buf_addr[2];
++ ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
+ checksum += i->buf_addr[3];
+- ACCESS_ONCE(ads->data3) = i->buf_addr[3];
++ ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
+
+ checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
+- ACCESS_ONCE(ads->ctl3) = val;
++ ACCESS_ONCE_RW(ads->ctl3) = val;
+ checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
+- ACCESS_ONCE(ads->ctl5) = val;
++ ACCESS_ONCE_RW(ads->ctl5) = val;
+ checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
+- ACCESS_ONCE(ads->ctl7) = val;
++ ACCESS_ONCE_RW(ads->ctl7) = val;
+ checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
+- ACCESS_ONCE(ads->ctl9) = val;
++ ACCESS_ONCE_RW(ads->ctl9) = val;
+
+ checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
+- ACCESS_ONCE(ads->ctl10) = checksum;
++ ACCESS_ONCE_RW(ads->ctl10) = checksum;
+
+ if (i->is_first || i->is_last) {
+- ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
++ ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
+ | set11nTries(i->rates, 1)
+ | set11nTries(i->rates, 2)
+ | set11nTries(i->rates, 3)
+ | (i->dur_update ? AR_DurUpdateEna : 0)
+ | SM(0, AR_BurstDur);
+
+- ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
++ ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
+ | set11nRate(i->rates, 1)
+ | set11nRate(i->rates, 2)
+ | set11nRate(i->rates, 3);
+ } else {
+- ACCESS_ONCE(ads->ctl13) = 0;
+- ACCESS_ONCE(ads->ctl14) = 0;
++ ACCESS_ONCE_RW(ads->ctl13) = 0;
++ ACCESS_ONCE_RW(ads->ctl14) = 0;
+ }
+
+ ads->ctl20 = 0;
+@@ -89,17 +89,17 @@
+
+ ctl17 = SM(i->keytype, AR_EncrType);
+ if (!i->is_first) {
+- ACCESS_ONCE(ads->ctl11) = 0;
+- ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
+- ACCESS_ONCE(ads->ctl15) = 0;
+- ACCESS_ONCE(ads->ctl16) = 0;
+- ACCESS_ONCE(ads->ctl17) = ctl17;
+- ACCESS_ONCE(ads->ctl18) = 0;
+- ACCESS_ONCE(ads->ctl19) = 0;
++ ACCESS_ONCE_RW(ads->ctl11) = 0;
++ ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
++ ACCESS_ONCE_RW(ads->ctl15) = 0;
++ ACCESS_ONCE_RW(ads->ctl16) = 0;
++ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
++ ACCESS_ONCE_RW(ads->ctl18) = 0;
++ ACCESS_ONCE_RW(ads->ctl19) = 0;
+ return;
+ }
+
+- ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
++ ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
+ | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
+ | SM(i->txpower, AR_XmitPower0)
+ | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
+@@ -135,26 +135,26 @@
+ val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
+ ctl12 |= SM(val, AR_PAPRDChainMask);
+
+- ACCESS_ONCE(ads->ctl12) = ctl12;
+- ACCESS_ONCE(ads->ctl17) = ctl17;
++ ACCESS_ONCE_RW(ads->ctl12) = ctl12;
++ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
+
+- ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
++ ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
+ | set11nPktDurRTSCTS(i->rates, 1);
+
+- ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
++ ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
+ | set11nPktDurRTSCTS(i->rates, 3);
+
+- ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
++ ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
+ | set11nRateFlags(i->rates, 1)
+ | set11nRateFlags(i->rates, 2)
+ | set11nRateFlags(i->rates, 3)
+ | SM(i->rtscts_rate, AR_RTSCTSRate);
+
+- ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
++ ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
+
+- ACCESS_ONCE(ads->ctl20) = SM(i->txpower, AR_XmitPower1);
+- ACCESS_ONCE(ads->ctl21) = SM(i->txpower, AR_XmitPower2);
+- ACCESS_ONCE(ads->ctl22) = SM(i->txpower, AR_XmitPower3);
++ ACCESS_ONCE_RW(ads->ctl20) = SM(i->txpower, AR_XmitPower1);
++ ACCESS_ONCE_RW(ads->ctl21) = SM(i->txpower, AR_XmitPower2);
++ ACCESS_ONCE_RW(ads->ctl22) = SM(i->txpower, AR_XmitPower3);
+ }
+
+ static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/ath/ath9k/hw.h backports-3.18.1-1/drivers/net/wireless/ath/ath9k/hw.h
+--- backports-3.18.1-1.org/drivers/net/wireless/ath/ath9k/hw.h 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/ath/ath9k/hw.h 2014-12-28 14:10:09.564888946 +0100
+@@ -630,7 +630,7 @@
+
+ /* ANI */
+ void (*ani_cache_ini_regs)(struct ath_hw *ah);
+-};
++} __no_const;
+
+ /**
+ * struct ath_spec_scan - parameters for Atheros spectral scan
+@@ -708,7 +708,7 @@
+ #ifdef CPTCFG_ATH9K_BTCOEX_SUPPORT
+ void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
+ #endif
+-};
++} __no_const;
+
+ struct ath_nf_limits {
+ s16 max;
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/ath/ath9k/main.c backports-3.18.1-1/drivers/net/wireless/ath/ath9k/main.c
+--- backports-3.18.1-1.org/drivers/net/wireless/ath/ath9k/main.c 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/ath/ath9k/main.c 2014-12-28 14:24:49.169250593 +0100
+@@ -2454,16 +2454,18 @@
+ if (!ath9k_is_chanctx_enabled())
+ return;
+
+- ath9k_ops.hw_scan = ath9k_hw_scan;
+- ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
+- ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
+- ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
+- ath9k_ops.add_chanctx = ath9k_add_chanctx;
+- ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
+- ath9k_ops.change_chanctx = ath9k_change_chanctx;
+- ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
+- ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
+- ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
++ pax_open_kernel();
++ *(void **)&ath9k_ops.hw_scan = ath9k_hw_scan;
++ *(void **)&ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
++ *(void **)&ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
++ *(void **)&ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
++ *(void **)&ath9k_ops.add_chanctx = ath9k_add_chanctx;
++ *(void **)&ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
++ *(void **)&ath9k_ops.change_chanctx = ath9k_change_chanctx;
++ *(void **)&ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
++ *(void **)&ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
++ *(void **)&ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
++ pax_close_kernel();
+ }
+
+ #endif
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/b43/phy_lp.c backports-3.18.1-1/drivers/net/wireless/b43/phy_lp.c
+--- backports-3.18.1-1.org/drivers/net/wireless/b43/phy_lp.c 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/b43/phy_lp.c 2014-12-28 14:10:09.564888946 +0100
+@@ -2502,7 +2502,7 @@
+ {
+ struct ssb_bus *bus = dev->dev->sdev->bus;
+
+- static const struct b206x_channel *chandata = NULL;
++ const struct b206x_channel *chandata = NULL;
+ u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
+ u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count;
+ u16 old_comm15, scale;
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/iwlegacy/3945-mac.c backports-3.18.1-1/drivers/net/wireless/iwlegacy/3945-mac.c
+--- backports-3.18.1-1.org/drivers/net/wireless/iwlegacy/3945-mac.c 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/iwlegacy/3945-mac.c 2014-12-28 14:10:09.564888946 +0100
+@@ -3633,7 +3633,9 @@
+ */
+ if (il3945_mod_params.disable_hw_scan) {
+ D_INFO("Disabling hw_scan\n");
+- il3945_mac_ops.hw_scan = NULL;
++ pax_open_kernel();
++ *(void **)&il3945_mac_ops.hw_scan = NULL;
++ pax_close_kernel();
+ }
+
+ D_INFO("*** LOAD DRIVER ***\n");
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/iwlwifi/dvm/debugfs.c backports-3.18.1-1/drivers/net/wireless/iwlwifi/dvm/debugfs.c
+--- backports-3.18.1-1.org/drivers/net/wireless/iwlwifi/dvm/debugfs.c 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/iwlwifi/dvm/debugfs.c 2014-12-28 14:10:09.564888946 +0100
+@@ -188,7 +188,7 @@
+ {
+ struct iwl_priv *priv = file->private_data;
+ char buf[64];
+- int buf_size;
++ size_t buf_size;
+ u32 offset, len;
+
+ memset(buf, 0, sizeof(buf));
+@@ -458,7 +458,7 @@
+ struct iwl_priv *priv = file->private_data;
+
+ char buf[8];
+- int buf_size;
++ size_t buf_size;
+ u32 reset_flag;
+
+ memset(buf, 0, sizeof(buf));
+@@ -539,7 +539,7 @@
+ {
+ struct iwl_priv *priv = file->private_data;
+ char buf[8];
+- int buf_size;
++ size_t buf_size;
+ int ht40;
+
+ memset(buf, 0, sizeof(buf));
+@@ -591,7 +591,7 @@
+ {
+ struct iwl_priv *priv = file->private_data;
+ char buf[8];
+- int buf_size;
++ size_t buf_size;
+ int value;
+
+ memset(buf, 0, sizeof(buf));
+@@ -683,10 +683,10 @@
+ DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
+ DEBUGFS_READ_FILE_OPS(current_sleep_command);
+
+-static const char *fmt_value = " %-30s %10u\n";
+-static const char *fmt_hex = " %-30s 0x%02X\n";
+-static const char *fmt_table = " %-30s %10u %10u %10u %10u\n";
+-static const char *fmt_header =
++static const char fmt_value[] = " %-30s %10u\n";
++static const char fmt_hex[] = " %-30s 0x%02X\n";
++static const char fmt_table[] = " %-30s %10u %10u %10u %10u\n";
++static const char fmt_header[] =
+ "%-32s current cumulative delta max\n";
+
+ static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
+@@ -1856,7 +1856,7 @@
+ {
+ struct iwl_priv *priv = file->private_data;
+ char buf[8];
+- int buf_size;
++ size_t buf_size;
+ int clear;
+
+ memset(buf, 0, sizeof(buf));
+@@ -1901,7 +1901,7 @@
+ {
+ struct iwl_priv *priv = file->private_data;
+ char buf[8];
+- int buf_size;
++ size_t buf_size;
+ int trace;
+
+ memset(buf, 0, sizeof(buf));
+@@ -1972,7 +1972,7 @@
+ {
+ struct iwl_priv *priv = file->private_data;
+ char buf[8];
+- int buf_size;
++ size_t buf_size;
+ int missed;
+
+ memset(buf, 0, sizeof(buf));
+@@ -2013,7 +2013,7 @@
+
+ struct iwl_priv *priv = file->private_data;
+ char buf[8];
+- int buf_size;
++ size_t buf_size;
+ int plcp;
+
+ memset(buf, 0, sizeof(buf));
+@@ -2073,7 +2073,7 @@
+
+ struct iwl_priv *priv = file->private_data;
+ char buf[8];
+- int buf_size;
++ size_t buf_size;
+ int flush;
+
+ memset(buf, 0, sizeof(buf));
+@@ -2163,7 +2163,7 @@
+
+ struct iwl_priv *priv = file->private_data;
+ char buf[8];
+- int buf_size;
++ size_t buf_size;
+ int rts;
+
+ if (!priv->cfg->ht_params)
+@@ -2204,7 +2204,7 @@
+ {
+ struct iwl_priv *priv = file->private_data;
+ char buf[8];
+- int buf_size;
++ size_t buf_size;
+
+ memset(buf, 0, sizeof(buf));
+ buf_size = min(count, sizeof(buf) - 1);
+@@ -2238,7 +2238,7 @@
+ struct iwl_priv *priv = file->private_data;
+ u32 event_log_flag;
+ char buf[8];
+- int buf_size;
++ size_t buf_size;
+
+ /* check that the interface is up */
+ if (!iwl_is_ready(priv))
+@@ -2292,7 +2292,7 @@
+ struct iwl_priv *priv = file->private_data;
+ char buf[8];
+ u32 calib_disabled;
+- int buf_size;
++ size_t buf_size;
+
+ memset(buf, 0, sizeof(buf));
+ buf_size = min(count, sizeof(buf) - 1);
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/iwlwifi/pcie/trans.c backports-3.18.1-1/drivers/net/wireless/iwlwifi/pcie/trans.c
+--- backports-3.18.1-1.org/drivers/net/wireless/iwlwifi/pcie/trans.c 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/iwlwifi/pcie/trans.c 2014-12-28 14:10:09.564888946 +0100
+@@ -1689,7 +1689,7 @@
+ struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
+
+ char buf[8];
+- int buf_size;
++ size_t buf_size;
+ u32 reset_flag;
+
+ memset(buf, 0, sizeof(buf));
+@@ -1710,7 +1710,7 @@
+ {
+ struct iwl_trans *trans = file->private_data;
+ char buf[8];
+- int buf_size;
++ size_t buf_size;
+ int csr;
+
+ memset(buf, 0, sizeof(buf));
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/mac80211_hwsim.c backports-3.18.1-1/drivers/net/wireless/mac80211_hwsim.c
+--- backports-3.18.1-1.org/drivers/net/wireless/mac80211_hwsim.c 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/mac80211_hwsim.c 2014-12-28 14:10:09.568888967 +0100
+@@ -2578,20 +2578,20 @@
+ if (channels < 1)
+ return -EINVAL;
+
+- mac80211_hwsim_mchan_ops = mac80211_hwsim_ops;
+- mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
+- mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
+- mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
+- mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
+- mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
+- mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
+- mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
+- mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
+- mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
+- mac80211_hwsim_mchan_ops.assign_vif_chanctx =
+- mac80211_hwsim_assign_vif_chanctx;
+- mac80211_hwsim_mchan_ops.unassign_vif_chanctx =
+- mac80211_hwsim_unassign_vif_chanctx;
++ pax_open_kernel();
++ memcpy((void *)&mac80211_hwsim_mchan_ops, &mac80211_hwsim_ops, sizeof mac80211_hwsim_mchan_ops);
++ *(void **)&mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
++ *(void **)&mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
++ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
++ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
++ *(void **)&mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
++ *(void **)&mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
++ *(void **)&mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
++ *(void **)&mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
++ *(void **)&mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
++ *(void **)&mac80211_hwsim_mchan_ops.assign_vif_chanctx = mac80211_hwsim_assign_vif_chanctx;
++ *(void **)&mac80211_hwsim_mchan_ops.unassign_vif_chanctx = mac80211_hwsim_unassign_vif_chanctx;
++ pax_close_kernel();
+
+ spin_lock_init(&hwsim_radio_lock);
+ INIT_LIST_HEAD(&hwsim_radios);
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/rndis_wlan.c backports-3.18.1-1/drivers/net/wireless/rndis_wlan.c
+--- backports-3.18.1-1.org/drivers/net/wireless/rndis_wlan.c 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/rndis_wlan.c 2014-12-28 14:10:09.568888967 +0100
+@@ -1236,7 +1236,7 @@
+
+ netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
+
+- if (rts_threshold < 0 || rts_threshold > 2347)
++ if (rts_threshold > 2347)
+ rts_threshold = 2347;
+
+ tmp = cpu_to_le32(rts_threshold);
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/rt2x00/rt2x00.h backports-3.18.1-1/drivers/net/wireless/rt2x00/rt2x00.h
+--- backports-3.18.1-1.org/drivers/net/wireless/rt2x00/rt2x00.h 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/rt2x00/rt2x00.h 2014-12-28 14:10:09.568888967 +0100
+@@ -375,7 +375,7 @@
+ * for hardware which doesn't support hardware
+ * sequence counting.
+ */
+- atomic_t seqno;
++ atomic_unchecked_t seqno;
+ };
+
+ static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/rt2x00/rt2x00queue.c backports-3.18.1-1/drivers/net/wireless/rt2x00/rt2x00queue.c
+--- backports-3.18.1-1.org/drivers/net/wireless/rt2x00/rt2x00queue.c 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/rt2x00/rt2x00queue.c 2014-12-28 14:10:09.568888967 +0100
+@@ -224,9 +224,9 @@
+ * sequence counter given by mac80211.
+ */
+ if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
+- seqno = atomic_add_return(0x10, &intf->seqno);
++ seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
+ else
+- seqno = atomic_read(&intf->seqno);
++ seqno = atomic_read_unchecked(&intf->seqno);
+
+ hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
+ hdr->seq_ctrl |= cpu_to_le16(seqno);
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/ti/wl1251/sdio.c backports-3.18.1-1/drivers/net/wireless/ti/wl1251/sdio.c
+--- backports-3.18.1-1.org/drivers/net/wireless/ti/wl1251/sdio.c 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/ti/wl1251/sdio.c 2014-12-28 14:10:09.568888967 +0100
+@@ -282,13 +282,17 @@
+
+ irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
+
+- wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
+- wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
++ pax_open_kernel();
++ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
++ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
++ pax_close_kernel();
+
+ wl1251_info("using dedicated interrupt line");
+ } else {
+- wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
+- wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
++ pax_open_kernel();
++ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
++ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
++ pax_close_kernel();
+
+ wl1251_info("using SDIO interrupt");
+ }
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/ti/wl12xx/main.c backports-3.18.1-1/drivers/net/wireless/ti/wl12xx/main.c
+--- backports-3.18.1-1.org/drivers/net/wireless/ti/wl12xx/main.c 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/ti/wl12xx/main.c 2014-12-28 14:10:09.568888967 +0100
+@@ -656,7 +656,9 @@
+ sizeof(wl->conf.mem));
+
+ /* read data preparation is only needed by wl127x */
+- wl->ops->prepare_read = wl127x_prepare_read;
++ pax_open_kernel();
++ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
++ pax_close_kernel();
+
+ wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
+ WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
+@@ -681,7 +683,9 @@
+ sizeof(wl->conf.mem));
+
+ /* read data preparation is only needed by wl127x */
+- wl->ops->prepare_read = wl127x_prepare_read;
++ pax_open_kernel();
++ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
++ pax_close_kernel();
+
+ wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
+ WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/ti/wl18xx/main.c backports-3.18.1-1/drivers/net/wireless/ti/wl18xx/main.c
+--- backports-3.18.1-1.org/drivers/net/wireless/ti/wl18xx/main.c 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/ti/wl18xx/main.c 2014-12-28 14:10:09.568888967 +0100
+@@ -1916,8 +1916,10 @@
+ }
+
+ if (!checksum_param) {
+- wl18xx_ops.set_rx_csum = NULL;
+- wl18xx_ops.init_vif = NULL;
++ pax_open_kernel();
++ *(void **)&wl18xx_ops.set_rx_csum = NULL;
++ *(void **)&wl18xx_ops.init_vif = NULL;
++ pax_close_kernel();
+ }
+
+ /* Enable 11a Band only if we have 5G antennas */
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/zd1211rw/zd_usb.c backports-3.18.1-1/drivers/net/wireless/zd1211rw/zd_usb.c
+--- backports-3.18.1-1.org/drivers/net/wireless/zd1211rw/zd_usb.c 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/zd1211rw/zd_usb.c 2014-12-28 14:10:09.568888967 +0100
+@@ -385,7 +385,7 @@
+ {
+ struct zd_usb *usb = urb->context;
+ struct zd_usb_interrupt *intr = &usb->intr;
+- int len;
++ unsigned int len;
+ u16 int_num;
+
+ ZD_ASSERT(in_interrupt());
+diff -Naur backports-3.18.1-1.org/drivers/nfc/nfcwilink.c backports-3.18.1-1/drivers/nfc/nfcwilink.c
+--- backports-3.18.1-1.org/drivers/nfc/nfcwilink.c 2014-12-21 22:37:14.000000000 +0100
++++ backports-3.18.1-1/drivers/nfc/nfcwilink.c 2014-12-28 14:10:09.568888967 +0100
+@@ -497,7 +497,7 @@
+
+ static int nfcwilink_probe(struct platform_device *pdev)
+ {
+- static struct nfcwilink *drv;
++ struct nfcwilink *drv;
+ int rc;
+ __u32 protocols;
+
+diff -Naur backports-3.18.1-1.org/include/linux/gracl_compat.h backports-3.18.1-1/include/linux/gracl_compat.h
+--- backports-3.18.1-1.org/include/linux/gracl_compat.h 1970-01-01 01:00:00.000000000 +0100
++++ backports-3.18.1-1/include/linux/gracl_compat.h 2014-12-28 14:10:09.684889542 +0100
+@@ -0,0 +1,156 @@
++#ifndef GR_ACL_COMPAT_H
++#define GR_ACL_COMPAT_H
++
++#include <linux/resource.h>
++#include <asm/resource.h>
++
++struct sprole_pw_compat {
++ compat_uptr_t rolename;
++ unsigned char salt[GR_SALT_LEN];
++ unsigned char sum[GR_SHA_LEN];
++};
++
++struct gr_hash_struct_compat {
++ compat_uptr_t table;
++ compat_uptr_t nametable;
++ compat_uptr_t first;
++ __u32 table_size;
++ __u32 used_size;
++ int type;
++};
++
++struct acl_subject_label_compat {
++ compat_uptr_t filename;
++ compat_ino_t inode;
++ __u32 device;
++ __u32 mode;
++ kernel_cap_t cap_mask;
++ kernel_cap_t cap_lower;
++ kernel_cap_t cap_invert_audit;
++
++ struct compat_rlimit res[GR_NLIMITS];
++ __u32 resmask;
++
++ __u8 user_trans_type;
++ __u8 group_trans_type;
++ compat_uptr_t user_transitions;
++ compat_uptr_t group_transitions;
++ __u16 user_trans_num;
++ __u16 group_trans_num;
++
++ __u32 sock_families[2];
++ __u32 ip_proto[8];
++ __u32 ip_type;
++ compat_uptr_t ips;
++ __u32 ip_num;
++ __u32 inaddr_any_override;
++
++ __u32 crashes;
++ compat_ulong_t expires;
++
++ compat_uptr_t parent_subject;
++ compat_uptr_t hash;
++ compat_uptr_t prev;
++ compat_uptr_t next;
++
++ compat_uptr_t obj_hash;
++ __u32 obj_hash_size;
++ __u16 pax_flags;
++};
++
++struct role_allowed_ip_compat {
++ __u32 addr;
++ __u32 netmask;
++
++ compat_uptr_t prev;
++ compat_uptr_t next;
++};
++
++struct role_transition_compat {
++ compat_uptr_t rolename;
++
++ compat_uptr_t prev;
++ compat_uptr_t next;
++};
++
++struct acl_role_label_compat {
++ compat_uptr_t rolename;
++ uid_t uidgid;
++ __u16 roletype;
++
++ __u16 auth_attempts;
++ compat_ulong_t expires;
++
++ compat_uptr_t root_label;
++ compat_uptr_t hash;
++
++ compat_uptr_t prev;
++ compat_uptr_t next;
++
++ compat_uptr_t transitions;
++ compat_uptr_t allowed_ips;
++ compat_uptr_t domain_children;
++ __u16 domain_child_num;
++
++ umode_t umask;
++
++ compat_uptr_t subj_hash;
++ __u32 subj_hash_size;
++};
++
++struct user_acl_role_db_compat {
++ compat_uptr_t r_table;
++ __u32 num_pointers;
++ __u32 num_roles;
++ __u32 num_domain_children;
++ __u32 num_subjects;
++ __u32 num_objects;
++};
++
++struct acl_object_label_compat {
++ compat_uptr_t filename;
++ compat_ino_t inode;
++ __u32 device;
++ __u32 mode;
++
++ compat_uptr_t nested;
++ compat_uptr_t globbed;
++
++ compat_uptr_t prev;
++ compat_uptr_t next;
++};
++
++struct acl_ip_label_compat {
++ compat_uptr_t iface;
++ __u32 addr;
++ __u32 netmask;
++ __u16 low, high;
++ __u8 mode;
++ __u32 type;
++ __u32 proto[8];
++
++ compat_uptr_t prev;
++ compat_uptr_t next;
++};
++
++struct gr_arg_compat {
++ struct user_acl_role_db_compat role_db;
++ unsigned char pw[GR_PW_LEN];
++ unsigned char salt[GR_SALT_LEN];
++ unsigned char sum[GR_SHA_LEN];
++ unsigned char sp_role[GR_SPROLE_LEN];
++ compat_uptr_t sprole_pws;
++ __u32 segv_device;
++ compat_ino_t segv_inode;
++ uid_t segv_uid;
++ __u16 num_sprole_pws;
++ __u16 mode;
++};
++
++struct gr_arg_wrapper_compat {
++ compat_uptr_t arg;
++ __u32 version;
++ __u32 size;
++};
++
++#endif
+diff -Naur backports-3.18.1-1.org/include/linux/gracl.h backports-3.18.1-1/include/linux/gracl.h
+--- backports-3.18.1-1.org/include/linux/gracl.h 1970-01-01 01:00:00.000000000 +0100
++++ backports-3.18.1-1/include/linux/gracl.h 2014-12-28 14:10:09.684889542 +0100
+@@ -0,0 +1,340 @@
++#ifndef GR_ACL_H
++#define GR_ACL_H
++
++#include <linux/grdefs.h>
++#include <linux/resource.h>
++#include <linux/capability.h>
++#include <linux/dcache.h>
++#include <asm/resource.h>
++
++/* Major status information */
++
++#define GR_VERSION "grsecurity 3.0"
++#define GRSECURITY_VERSION 0x3000
++
++enum {
++ GR_SHUTDOWN = 0,
++ GR_ENABLE = 1,
++ GR_SPROLE = 2,
++ GR_OLDRELOAD = 3,
++ GR_SEGVMOD = 4,
++ GR_STATUS = 5,
++ GR_UNSPROLE = 6,
++ GR_PASSSET = 7,
++ GR_SPROLEPAM = 8,
++ GR_RELOAD = 9,
++};
++
++/* Password setup definitions
++ * kernel/grhash.c */
++enum {
++ GR_PW_LEN = 128,
++ GR_SALT_LEN = 16,
++ GR_SHA_LEN = 32,
++};
++
++enum {
++ GR_SPROLE_LEN = 64,
++};
++
++enum {
++ GR_NO_GLOB = 0,
++ GR_REG_GLOB,
++ GR_CREATE_GLOB
++};
++
++#define GR_NLIMITS 32
++
++/* Begin Data Structures */
++
++struct sprole_pw {
++ unsigned char *rolename;
++ unsigned char salt[GR_SALT_LEN];
++ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
++};
++
++struct name_entry {
++ __u32 key;
++ ino_t inode;
++ dev_t device;
++ char *name;
++ __u16 len;
++ __u8 deleted;
++ struct name_entry *prev;
++ struct name_entry *next;
++};
++
++struct inodev_entry {
++ struct name_entry *nentry;
++ struct inodev_entry *prev;
++ struct inodev_entry *next;
++};
++
++struct acl_role_db {
++ struct acl_role_label **r_hash;
++ __u32 r_size;
++};
++
++struct inodev_db {
++ struct inodev_entry **i_hash;
++ __u32 i_size;
++};
++
++struct name_db {
++ struct name_entry **n_hash;
++ __u32 n_size;
++};
++
++struct crash_uid {
++ uid_t uid;
++ unsigned long expires;
++};
++
++struct gr_hash_struct {
++ void **table;
++ void **nametable;
++ void *first;
++ __u32 table_size;
++ __u32 used_size;
++ int type;
++};
++
++/* Userspace Grsecurity ACL data structures */
++
++struct acl_subject_label {
++ char *filename;
++ ino_t inode;
++ dev_t device;
++ __u32 mode;
++ kernel_cap_t cap_mask;
++ kernel_cap_t cap_lower;
++ kernel_cap_t cap_invert_audit;
++
++ struct rlimit res[GR_NLIMITS];
++ __u32 resmask;
++
++ __u8 user_trans_type;
++ __u8 group_trans_type;
++ uid_t *user_transitions;
++ gid_t *group_transitions;
++ __u16 user_trans_num;
++ __u16 group_trans_num;
++
++ __u32 sock_families[2];
++ __u32 ip_proto[8];
++ __u32 ip_type;
++ struct acl_ip_label **ips;
++ __u32 ip_num;
++ __u32 inaddr_any_override;
++
++ __u32 crashes;
++ unsigned long expires;
++
++ struct acl_subject_label *parent_subject;
++ struct gr_hash_struct *hash;
++ struct acl_subject_label *prev;
++ struct acl_subject_label *next;
++
++ struct acl_object_label **obj_hash;
++ __u32 obj_hash_size;
++ __u16 pax_flags;
++};
++
++struct role_allowed_ip {
++ __u32 addr;
++ __u32 netmask;
++
++ struct role_allowed_ip *prev;
++ struct role_allowed_ip *next;
++};
++
++struct role_transition {
++ char *rolename;
++
++ struct role_transition *prev;
++ struct role_transition *next;
++};
++
++struct acl_role_label {
++ char *rolename;
++ uid_t uidgid;
++ __u16 roletype;
++
++ __u16 auth_attempts;
++ unsigned long expires;
++
++ struct acl_subject_label *root_label;
++ struct gr_hash_struct *hash;
++
++ struct acl_role_label *prev;
++ struct acl_role_label *next;
++
++ struct role_transition *transitions;
++ struct role_allowed_ip *allowed_ips;
++ uid_t *domain_children;
++ __u16 domain_child_num;
++
++ umode_t umask;
++
++ struct acl_subject_label **subj_hash;
++ __u32 subj_hash_size;
++};
++
++struct user_acl_role_db {
++ struct acl_role_label **r_table;
++ __u32 num_pointers; /* Number of allocations to track */
++ __u32 num_roles; /* Number of roles */
++ __u32 num_domain_children; /* Number of domain children */
++ __u32 num_subjects; /* Number of subjects */
++ __u32 num_objects; /* Number of objects */
++};
++
++struct acl_object_label {
++ char *filename;
++ ino_t inode;
++ dev_t device;
++ __u32 mode;
++
++ struct acl_subject_label *nested;
++ struct acl_object_label *globbed;
++
++ /* next two structures not used */
++
++ struct acl_object_label *prev;
++ struct acl_object_label *next;
++};
++
++struct acl_ip_label {
++ char *iface;
++ __u32 addr;
++ __u32 netmask;
++ __u16 low, high;
++ __u8 mode;
++ __u32 type;
++ __u32 proto[8];
++
++ /* next two structures not used */
++
++ struct acl_ip_label *prev;
++ struct acl_ip_label *next;
++};
++
++struct gr_arg {
++ struct user_acl_role_db role_db;
++ unsigned char pw[GR_PW_LEN];
++ unsigned char salt[GR_SALT_LEN];
++ unsigned char sum[GR_SHA_LEN];
++ unsigned char sp_role[GR_SPROLE_LEN];
++ struct sprole_pw *sprole_pws;
++ dev_t segv_device;
++ ino_t segv_inode;
++ uid_t segv_uid;
++ __u16 num_sprole_pws;
++ __u16 mode;
++};
++
++struct gr_arg_wrapper {
++ struct gr_arg *arg;
++ __u32 version;
++ __u32 size;
++};
++
++struct subject_map {
++ struct acl_subject_label *user;
++ struct acl_subject_label *kernel;
++ struct subject_map *prev;
++ struct subject_map *next;
++};
++
++struct acl_subj_map_db {
++ struct subject_map **s_hash;
++ __u32 s_size;
++};
++
++struct gr_policy_state {
++ struct sprole_pw **acl_special_roles;
++ __u16 num_sprole_pws;
++ struct acl_role_label *kernel_role;
++ struct acl_role_label *role_list;
++ struct acl_role_label *default_role;
++ struct acl_role_db acl_role_set;
++ struct acl_subj_map_db subj_map_set;
++ struct name_db name_set;
++ struct inodev_db inodev_set;
++};
++
++struct gr_alloc_state {
++ unsigned long alloc_stack_next;
++ unsigned long alloc_stack_size;
++ void **alloc_stack;
++};
++
++struct gr_reload_state {
++ struct gr_policy_state oldpolicy;
++ struct gr_alloc_state oldalloc;
++ struct gr_policy_state newpolicy;
++ struct gr_alloc_state newalloc;
++ struct gr_policy_state *oldpolicy_ptr;
++ struct gr_alloc_state *oldalloc_ptr;
++ unsigned char oldmode;
++};
++
++/* End Data Structures Section */
++
++/* Hash functions generated by empirical testing by Brad Spengler
++ Makes good use of the low bits of the inode. Generally 0-1 times
++ in loop for successful match. 0-3 for unsuccessful match.
++ Shift/add algorithm with modulus of table size and an XOR*/
++
++static __inline__ unsigned int
++gr_rhash(const uid_t uid, const __u16 type, const unsigned int sz)
++{
++ return ((((uid + type) << (16 + type)) ^ uid) % sz);
++}
++
++ static __inline__ unsigned int
++gr_shash(const struct acl_subject_label *userp, const unsigned int sz)
++{
++ return ((const unsigned long)userp % sz);
++}
++
++static __inline__ unsigned int
++gr_fhash(const ino_t ino, const dev_t dev, const unsigned int sz)
++{
++ return (((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9))) % sz);
++}
++
++static __inline__ unsigned int
++gr_nhash(const char *name, const __u16 len, const unsigned int sz)
++{
++ return full_name_hash((const unsigned char *)name, len) % sz;
++}
++
++#define FOR_EACH_SUBJECT_START(role,subj,iter) \
++ subj = NULL; \
++ iter = 0; \
++ while (iter < role->subj_hash_size) { \
++ if (subj == NULL) \
++ subj = role->subj_hash[iter]; \
++ if (subj == NULL) { \
++ iter++; \
++ continue; \
++ }
++
++#define FOR_EACH_SUBJECT_END(subj,iter) \
++ subj = subj->next; \
++ if (subj == NULL) \
++ iter++; \
++ }
++
++
++#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
++ subj = role->hash->first; \
++ while (subj != NULL) {
++
++#define FOR_EACH_NESTED_SUBJECT_END(subj) \
++ subj = subj->next; \
++ }
++
++#endif
++
+diff -Naur backports-3.18.1-1.org/include/linux/gralloc.h backports-3.18.1-1/include/linux/gralloc.h
+--- backports-3.18.1-1.org/include/linux/gralloc.h 1970-01-01 01:00:00.000000000 +0100
++++ backports-3.18.1-1/include/linux/gralloc.h 2014-12-28 14:10:09.684889542 +0100
+@@ -0,0 +1,9 @@
++#ifndef __GRALLOC_H
++#define __GRALLOC_H
++
++void acl_free_all(void);
++int acl_alloc_stack_init(unsigned long size);
++void *acl_alloc(unsigned long len);
++void *acl_alloc_num(unsigned long num, unsigned long len);
++
++#endif
+diff -Naur backports-3.18.1-1.org/include/linux/grdefs.h backports-3.18.1-1/include/linux/grdefs.h
+--- backports-3.18.1-1.org/include/linux/grdefs.h 1970-01-01 01:00:00.000000000 +0100
++++ backports-3.18.1-1/include/linux/grdefs.h 2014-12-28 14:10:09.688889562 +0100
+@@ -0,0 +1,140 @@
++#ifndef GRDEFS_H
++#define GRDEFS_H
++
++/* Begin grsecurity status declarations */
++
++enum {
++ GR_READY = 0x01,
++ GR_STATUS_INIT = 0x00 // disabled state
++};
++
++/* Begin ACL declarations */
++
++/* Role flags */
++
++enum {
++ GR_ROLE_USER = 0x0001,
++ GR_ROLE_GROUP = 0x0002,
++ GR_ROLE_DEFAULT = 0x0004,
++ GR_ROLE_SPECIAL = 0x0008,
++ GR_ROLE_AUTH = 0x0010,
++ GR_ROLE_NOPW = 0x0020,
++ GR_ROLE_GOD = 0x0040,
++ GR_ROLE_LEARN = 0x0080,
++ GR_ROLE_TPE = 0x0100,
++ GR_ROLE_DOMAIN = 0x0200,
++ GR_ROLE_PAM = 0x0400,
++ GR_ROLE_PERSIST = 0x0800
++};
++
++/* ACL Subject and Object mode flags */
++enum {
++ GR_DELETED = 0x80000000
++};
++
++/* ACL Object-only mode flags */
++enum {
++ GR_READ = 0x00000001,
++ GR_APPEND = 0x00000002,
++ GR_WRITE = 0x00000004,
++ GR_EXEC = 0x00000008,
++ GR_FIND = 0x00000010,
++ GR_INHERIT = 0x00000020,
++ GR_SETID = 0x00000040,
++ GR_CREATE = 0x00000080,
++ GR_DELETE = 0x00000100,
++ GR_LINK = 0x00000200,
++ GR_AUDIT_READ = 0x00000400,
++ GR_AUDIT_APPEND = 0x00000800,
++ GR_AUDIT_WRITE = 0x00001000,
++ GR_AUDIT_EXEC = 0x00002000,
++ GR_AUDIT_FIND = 0x00004000,
++ GR_AUDIT_INHERIT= 0x00008000,
++ GR_AUDIT_SETID = 0x00010000,
++ GR_AUDIT_CREATE = 0x00020000,
++ GR_AUDIT_DELETE = 0x00040000,
++ GR_AUDIT_LINK = 0x00080000,
++ GR_PTRACERD = 0x00100000,
++ GR_NOPTRACE = 0x00200000,
++ GR_SUPPRESS = 0x00400000,
++ GR_NOLEARN = 0x00800000,
++ GR_INIT_TRANSFER= 0x01000000
++};
++
++#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
++ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
++ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
++
++/* ACL subject-only mode flags */
++enum {
++ GR_KILL = 0x00000001,
++ GR_VIEW = 0x00000002,
++ GR_PROTECTED = 0x00000004,
++ GR_LEARN = 0x00000008,
++ GR_OVERRIDE = 0x00000010,
++ /* just a placeholder, this mode is only used in userspace */
++ GR_DUMMY = 0x00000020,
++ GR_PROTSHM = 0x00000040,
++ GR_KILLPROC = 0x00000080,
++ GR_KILLIPPROC = 0x00000100,
++ /* just a placeholder, this mode is only used in userspace */
++ GR_NOTROJAN = 0x00000200,
++ GR_PROTPROCFD = 0x00000400,
++ GR_PROCACCT = 0x00000800,
++ GR_RELAXPTRACE = 0x00001000,
++ //GR_NESTED = 0x00002000,
++ GR_INHERITLEARN = 0x00004000,
++ GR_PROCFIND = 0x00008000,
++ GR_POVERRIDE = 0x00010000,
++ GR_KERNELAUTH = 0x00020000,
++ GR_ATSECURE = 0x00040000,
++ GR_SHMEXEC = 0x00080000
++};
++
++enum {
++ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
++ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
++ GR_PAX_ENABLE_MPROTECT = 0x0004,
++ GR_PAX_ENABLE_RANDMMAP = 0x0008,
++ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
++ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
++ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
++ GR_PAX_DISABLE_MPROTECT = 0x0400,
++ GR_PAX_DISABLE_RANDMMAP = 0x0800,
++ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
++};
++
++enum {
++ GR_ID_USER = 0x01,
++ GR_ID_GROUP = 0x02,
++};
++
++enum {
++ GR_ID_ALLOW = 0x01,
++ GR_ID_DENY = 0x02,
++};
++
++#define GR_CRASH_RES 31
++#define GR_UIDTABLE_MAX 500
++
++/* begin resource learning section */
++enum {
++ GR_RLIM_CPU_BUMP = 60,
++ GR_RLIM_FSIZE_BUMP = 50000,
++ GR_RLIM_DATA_BUMP = 10000,
++ GR_RLIM_STACK_BUMP = 1000,
++ GR_RLIM_CORE_BUMP = 10000,
++ GR_RLIM_RSS_BUMP = 500000,
++ GR_RLIM_NPROC_BUMP = 1,
++ GR_RLIM_NOFILE_BUMP = 5,
++ GR_RLIM_MEMLOCK_BUMP = 50000,
++ GR_RLIM_AS_BUMP = 500000,
++ GR_RLIM_LOCKS_BUMP = 2,
++ GR_RLIM_SIGPENDING_BUMP = 5,
++ GR_RLIM_MSGQUEUE_BUMP = 10000,
++ GR_RLIM_NICE_BUMP = 1,
++ GR_RLIM_RTPRIO_BUMP = 1,
++ GR_RLIM_RTTIME_BUMP = 1000000
++};
++
++#endif
+diff -Naur backports-3.18.1-1.org/include/linux/grinternal.h backports-3.18.1-1/include/linux/grinternal.h
+--- backports-3.18.1-1.org/include/linux/grinternal.h 1970-01-01 01:00:00.000000000 +0100
++++ backports-3.18.1-1/include/linux/grinternal.h 2014-12-28 14:10:09.688889562 +0100
+@@ -0,0 +1,229 @@
++#ifndef __GRINTERNAL_H
++#define __GRINTERNAL_H
++
++#ifdef CONFIG_GRKERNSEC
++
++#include <linux/fs.h>
++#include <linux/mnt_namespace.h>
++#include <linux/nsproxy.h>
++#include <linux/gracl.h>
++#include <linux/grdefs.h>
++#include <linux/grmsg.h>
++
++void gr_add_learn_entry(const char *fmt, ...)
++ __attribute__ ((format (printf, 1, 2)));
++__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
++ const struct vfsmount *mnt);
++__u32 gr_check_create(const struct dentry *new_dentry,
++ const struct dentry *parent,
++ const struct vfsmount *mnt, const __u32 mode);
++int gr_check_protected_task(const struct task_struct *task);
++__u32 to_gr_audit(const __u32 reqmode);
++int gr_set_acls(const int type);
++int gr_acl_is_enabled(void);
++char gr_roletype_to_char(void);
++
++void gr_handle_alertkill(struct task_struct *task);
++char *gr_to_filename(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++char *gr_to_filename1(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++char *gr_to_filename2(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++char *gr_to_filename3(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++
++extern int grsec_enable_ptrace_readexec;
++extern int grsec_enable_harden_ptrace;
++extern int grsec_enable_link;
++extern int grsec_enable_fifo;
++extern int grsec_enable_execve;
++extern int grsec_enable_shm;
++extern int grsec_enable_execlog;
++extern int grsec_enable_signal;
++extern int grsec_enable_audit_ptrace;
++extern int grsec_enable_forkfail;
++extern int grsec_enable_time;
++extern int grsec_enable_rofs;
++extern int grsec_deny_new_usb;
++extern int grsec_enable_chroot_shmat;
++extern int grsec_enable_chroot_mount;
++extern int grsec_enable_chroot_double;
++extern int grsec_enable_chroot_pivot;
++extern int grsec_enable_chroot_chdir;
++extern int grsec_enable_chroot_chmod;
++extern int grsec_enable_chroot_mknod;
++extern int grsec_enable_chroot_fchdir;
++extern int grsec_enable_chroot_nice;
++extern int grsec_enable_chroot_execlog;
++extern int grsec_enable_chroot_caps;
++extern int grsec_enable_chroot_sysctl;
++extern int grsec_enable_chroot_unix;
++extern int grsec_enable_symlinkown;
++extern kgid_t grsec_symlinkown_gid;
++extern int grsec_enable_tpe;
++extern kgid_t grsec_tpe_gid;
++extern int grsec_enable_tpe_all;
++extern int grsec_enable_tpe_invert;
++extern int grsec_enable_socket_all;
++extern kgid_t grsec_socket_all_gid;
++extern int grsec_enable_socket_client;
++extern kgid_t grsec_socket_client_gid;
++extern int grsec_enable_socket_server;
++extern kgid_t grsec_socket_server_gid;
++extern kgid_t grsec_audit_gid;
++extern int grsec_enable_group;
++extern int grsec_enable_log_rwxmaps;
++extern int grsec_enable_mount;
++extern int grsec_enable_chdir;
++extern int grsec_resource_logging;
++extern int grsec_enable_blackhole;
++extern int grsec_lastack_retries;
++extern int grsec_enable_brute;
++extern int grsec_enable_harden_ipc;
++extern int grsec_lock;
++
++extern spinlock_t grsec_alert_lock;
++extern unsigned long grsec_alert_wtime;
++extern unsigned long grsec_alert_fyet;
++
++extern spinlock_t grsec_audit_lock;
++
++extern rwlock_t grsec_exec_file_lock;
++
++#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
++ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
++ (tsk)->exec_file->f_path.mnt) : "/")
++
++#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
++ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
++ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
++
++#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
++ gr_to_filename((tsk)->exec_file->f_path.dentry, \
++ (tsk)->exec_file->f_path.mnt) : "/")
++
++#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
++ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
++ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
++
++#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
++
++#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
++
++static inline bool gr_is_same_file(const struct file *file1, const struct file *file2)
++{
++ if (file1 && file2) {
++ const struct inode *inode1 = file1->f_path.dentry->d_inode;
++ const struct inode *inode2 = file2->f_path.dentry->d_inode;
++ if (inode1->i_ino == inode2->i_ino && inode1->i_sb->s_dev == inode2->i_sb->s_dev)
++ return true;
++ }
++
++ return false;
++}
++
++#define GR_CHROOT_CAPS {{ \
++ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
++ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
++ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
++ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
++ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
++ CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
++ CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
++
++#define security_learn(normal_msg,args...) \
++({ \
++ read_lock(&grsec_exec_file_lock); \
++ gr_add_learn_entry(normal_msg "\n", ## args); \
++ read_unlock(&grsec_exec_file_lock); \
++})
++
++enum {
++ GR_DO_AUDIT,
++ GR_DONT_AUDIT,
++ /* used for non-audit messages that we shouldn't kill the task on */
++ GR_DONT_AUDIT_GOOD
++};
++
++enum {
++ GR_TTYSNIFF,
++ GR_RBAC,
++ GR_RBAC_STR,
++ GR_STR_RBAC,
++ GR_RBAC_MODE2,
++ GR_RBAC_MODE3,
++ GR_FILENAME,
++ GR_SYSCTL_HIDDEN,
++ GR_NOARGS,
++ GR_ONE_INT,
++ GR_ONE_INT_TWO_STR,
++ GR_ONE_STR,
++ GR_STR_INT,
++ GR_TWO_STR_INT,
++ GR_TWO_INT,
++ GR_TWO_U64,
++ GR_THREE_INT,
++ GR_FIVE_INT_TWO_STR,
++ GR_TWO_STR,
++ GR_THREE_STR,
++ GR_FOUR_STR,
++ GR_STR_FILENAME,
++ GR_FILENAME_STR,
++ GR_FILENAME_TWO_INT,
++ GR_FILENAME_TWO_INT_STR,
++ GR_TEXTREL,
++ GR_PTRACE,
++ GR_RESOURCE,
++ GR_CAP,
++ GR_SIG,
++ GR_SIG2,
++ GR_CRASH1,
++ GR_CRASH2,
++ GR_PSACCT,
++ GR_RWXMAP,
++ GR_RWXMAPVMA
++};
++
++#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
++#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
++#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
++#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
++#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
++#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
++#define gr_log_fs_rbac_mode3(audit, msg, dentry, mnt, str1, str2, str3) gr_log_varargs(audit, msg, GR_RBAC_MODE3, dentry, mnt, str1, str2, str3)
++#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
++#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
++#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
++#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
++#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
++#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
++#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
++#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
++#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
++#define gr_log_int5_str2(audit, msg, num1, num2, str1, str2) gr_log_varargs(audit, msg, GR_FIVE_INT_TWO_STR, num1, num2, str1, str2)
++#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
++#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
++#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
++#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
++#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
++#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
++#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
++#define gr_log_fs_int2_str(audit, msg, dentry, mnt, num1, num2, str) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT_STR, dentry, mnt, num1, num2, str)
++#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
++#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
++#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
++#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
++#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
++#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
++#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
++#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
++#define gr_log_procacct(audit, msg, task, num1, num2, num3, num4, num5, num6, num7, num8, num9) gr_log_varargs(audit, msg, GR_PSACCT, task, num1, num2, num3, num4, num5, num6, num7, num8, num9)
++#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
++#define gr_log_rwxmap_vma(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAPVMA, str)
++
++void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
++
++#endif
++
++#endif
+diff -Naur backports-3.18.1-1.org/include/linux/grmsg.h backports-3.18.1-1/include/linux/grmsg.h
+--- backports-3.18.1-1.org/include/linux/grmsg.h 1970-01-01 01:00:00.000000000 +0100
++++ backports-3.18.1-1/include/linux/grmsg.h 2014-12-28 14:10:09.688889562 +0100
+@@ -0,0 +1,117 @@
++#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u"
++#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u"
++#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
++#define GR_STOPMOD_MSG "denied modification of module state by "
++#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
++#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
++#define GR_IOPERM_MSG "denied use of ioperm() by "
++#define GR_IOPL_MSG "denied use of iopl() by "
++#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
++#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
++#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
++#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
++#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
++#define GR_LEARN_AUDIT_MSG "%s\t%u\t%u\t%u\t%.4095s\t%.4095s\t%lu\t%lu\t%.4095s\t%lu\t%pI4"
++#define GR_ID_LEARN_MSG "%s\t%u\t%u\t%u\t%.4095s\t%.4095s\t%c\t%d\t%d\t%d\t%pI4"
++#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
++#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
++#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
++#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
++#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
++#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
++#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
++#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
++#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
++#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
++#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
++#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
++#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
++#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
++#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
++#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
++#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
++#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
++#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
++#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
++#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
++#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
++#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
++#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
++#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
++#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
++#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
++#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
++#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
++#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
++#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
++#define GR_CHROOT_FHANDLE_MSG "denied use of file handles inside chroot by "
++#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
++#define GR_SETXATTR_ACL_MSG "%s setting extended attribute of %.950s by "
++#define GR_REMOVEXATTR_ACL_MSG "%s removing extended attribute of %.950s by "
++#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
++#define GR_INITF_ACL_MSG "init_variables() failed %s by "
++#define GR_DISABLED_ACL_MSG "Error loading %s, trying to run kernel with acls disabled. To disable acls at startup use <kernel image name> gracl=off from your boot loader"
++#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
++#define GR_SHUTS_ACL_MSG "shutdown auth success for "
++#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
++#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
++#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
++#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
++#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
++#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
++#define GR_ENABLEF_ACL_MSG "unable to load %s for "
++#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
++#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
++#define GR_RELOADF_ACL_MSG "failed reload of %s for "
++#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
++#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
++#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
++#define GR_SPROLEF_ACL_MSG "special role %s failure for "
++#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
++#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
++#define GR_INVMODE_ACL_MSG "invalid mode %d by "
++#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
++#define GR_FAILFORK_MSG "failed fork with errno %s by "
++#define GR_NICE_CHROOT_MSG "denied priority change by "
++#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
++#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
++#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
++#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
++#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
++#define GR_TIME_MSG "time set by "
++#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
++#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
++#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
++#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
++#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
++#define GR_BIND_MSG "denied bind() by "
++#define GR_CONNECT_MSG "denied connect() by "
++#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
++#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
++#define GR_IP_LEARN_MSG "%s\t%u\t%u\t%u\t%.4095s\t%.4095s\t%pI4\t%u\t%u\t%u\t%u\t%pI4"
++#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
++#define GR_CAP_ACL_MSG "use of %s denied for "
++#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
++#define GR_CAP_ACL_MSG2 "use of %s permitted for "
++#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
++#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
++#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
++#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
++#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
++#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
++#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
++#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
++#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
++#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
++#define GR_TEXTREL_AUDIT_MSG "denied text relocation in %.950s, VMA:0x%08lx 0x%08lx by "
++#define GR_PTGNUSTACK_MSG "denied marking stack executable as requested by PT_GNU_STACK marking in %.950s by "
++#define GR_VM86_MSG "denied use of vm86 by "
++#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
++#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
++#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
++#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
++#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
++#define GR_BRUTE_DAEMON_MSG "bruteforce prevention initiated for the next 30 minutes or until service restarted, stalling each fork 30 seconds. Please investigate the crash report for "
++#define GR_BRUTE_SUID_MSG "bruteforce prevention initiated due to crash of %.950s against uid %u, banning suid/sgid execs for %u minutes. Please investigate the crash report for "
++#define GR_IPC_DENIED_MSG "denied %s of overly-permissive IPC object with creator uid %u by "
++#define GR_MSRWRITE_MSG "denied write to CPU MSR by "
+diff -Naur backports-3.18.1-1.org/include/linux/grsecurity.h backports-3.18.1-1/include/linux/grsecurity.h
+--- backports-3.18.1-1.org/include/linux/grsecurity.h 1970-01-01 01:00:00.000000000 +0100
++++ backports-3.18.1-1/include/linux/grsecurity.h 2014-12-28 14:10:09.688889562 +0100
+@@ -0,0 +1,254 @@
++#ifndef GR_SECURITY_H
++#define GR_SECURITY_H
++#include <linux/fs.h>
++#include <linux/fs_struct.h>
++#include <linux/binfmts.h>
++#include <linux/gracl.h>
++
++/* notify of brain-dead configs */
++#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
++#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
++#endif
++#if defined(CONFIG_GRKERNSEC_PROC) && !defined(CONFIG_GRKERNSEC_PROC_USER) && !defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
++#error "CONFIG_GRKERNSEC_PROC enabled, but neither CONFIG_GRKERNSEC_PROC_USER nor CONFIG_GRKERNSEC_PROC_USERGROUP enabled"
++#endif
++#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
++#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
++#endif
++#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
++#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
++#endif
++#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
++#error "CONFIG_PAX enabled, but no PaX options are enabled."
++#endif
++
++int gr_handle_new_usb(void);
++
++void gr_handle_brute_attach(int dumpable);
++void gr_handle_brute_check(void);
++void gr_handle_kernel_exploit(void);
++
++char gr_roletype_to_char(void);
++
++int gr_proc_is_restricted(void);
++
++int gr_acl_enable_at_secure(void);
++
++int gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs);
++int gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs);
++
++int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap);
++
++void gr_del_task_from_ip_table(struct task_struct *p);
++
++int gr_pid_is_chrooted(struct task_struct *p);
++int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
++int gr_handle_chroot_nice(void);
++int gr_handle_chroot_sysctl(const int op);
++int gr_handle_chroot_setpriority(struct task_struct *p,
++ const int niceval);
++int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
++int gr_chroot_fhandle(void);
++int gr_handle_chroot_chroot(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++void gr_handle_chroot_chdir(const struct path *path);
++int gr_handle_chroot_chmod(const struct dentry *dentry,
++ const struct vfsmount *mnt, const int mode);
++int gr_handle_chroot_mknod(const struct dentry *dentry,
++ const struct vfsmount *mnt, const int mode);
++int gr_handle_chroot_mount(const struct dentry *dentry,
++ const struct vfsmount *mnt,
++ const char *dev_name);
++int gr_handle_chroot_pivot(void);
++int gr_handle_chroot_unix(const pid_t pid);
++
++int gr_handle_rawio(const struct inode *inode);
++
++void gr_handle_ioperm(void);
++void gr_handle_iopl(void);
++void gr_handle_msr_write(void);
++
++umode_t gr_acl_umask(void);
++
++int gr_tpe_allow(const struct file *file);
++
++void gr_set_chroot_entries(struct task_struct *task, const struct path *path);
++void gr_clear_chroot_entries(struct task_struct *task);
++
++void gr_log_forkfail(const int retval);
++void gr_log_timechange(void);
++void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
++void gr_log_chdir(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++void gr_log_chroot_exec(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++void gr_log_remount(const char *devname, const int retval);
++void gr_log_unmount(const char *devname, const int retval);
++void gr_log_mount(const char *from, const char *to, const int retval);
++void gr_log_textrel(struct vm_area_struct *vma);
++void gr_log_ptgnustack(struct file *file);
++void gr_log_rwxmmap(struct file *file);
++void gr_log_rwxmprotect(struct vm_area_struct *vma);
++
++int gr_handle_follow_link(const struct inode *parent,
++ const struct inode *inode,
++ const struct dentry *dentry,
++ const struct vfsmount *mnt);
++int gr_handle_fifo(const struct dentry *dentry,
++ const struct vfsmount *mnt,
++ const struct dentry *dir, const int flag,
++ const int acc_mode);
++int gr_handle_hardlink(const struct dentry *dentry,
++ const struct vfsmount *mnt,
++ struct inode *inode,
++ const int mode, const struct filename *to);
++
++int gr_is_capable(const int cap);
++int gr_is_capable_nolog(const int cap);
++int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
++int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
++
++void gr_copy_label(struct task_struct *tsk);
++void gr_handle_crash(struct task_struct *task, const int sig);
++int gr_handle_signal(const struct task_struct *p, const int sig);
++int gr_check_crash_uid(const kuid_t uid);
++int gr_check_protected_task(const struct task_struct *task);
++int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
++int gr_acl_handle_mmap(const struct file *file,
++ const unsigned long prot);
++int gr_acl_handle_mprotect(const struct file *file,
++ const unsigned long prot);
++int gr_check_hidden_task(const struct task_struct *tsk);
++__u32 gr_acl_handle_truncate(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++__u32 gr_acl_handle_utime(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++__u32 gr_acl_handle_access(const struct dentry *dentry,
++ const struct vfsmount *mnt, const int fmode);
++__u32 gr_acl_handle_chmod(const struct dentry *dentry,
++ const struct vfsmount *mnt, umode_t *mode);
++__u32 gr_acl_handle_chown(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++__u32 gr_acl_handle_removexattr(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++int gr_handle_ptrace(struct task_struct *task, const long request);
++int gr_handle_proc_ptrace(struct task_struct *task);
++__u32 gr_acl_handle_execve(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++int gr_check_crash_exec(const struct file *filp);
++int gr_acl_is_enabled(void);
++void gr_set_role_label(struct task_struct *task, const kuid_t uid,
++ const kgid_t gid);
++int gr_set_proc_label(const struct dentry *dentry,
++ const struct vfsmount *mnt,
++ const int unsafe_flags);
++__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++__u32 gr_acl_handle_open(const struct dentry *dentry,
++ const struct vfsmount *mnt, int acc_mode);
++__u32 gr_acl_handle_creat(const struct dentry *dentry,
++ const struct dentry *p_dentry,
++ const struct vfsmount *p_mnt,
++ int open_flags, int acc_mode, const int imode);
++void gr_handle_create(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++void gr_handle_proc_create(const struct dentry *dentry,
++ const struct inode *inode);
++__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
++ const struct dentry *parent_dentry,
++ const struct vfsmount *parent_mnt,
++ const int mode);
++__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
++ const struct dentry *parent_dentry,
++ const struct vfsmount *parent_mnt);
++__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++void gr_handle_delete(const ino_t ino, const dev_t dev);
++__u32 gr_acl_handle_unlink(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
++ const struct dentry *parent_dentry,
++ const struct vfsmount *parent_mnt,
++ const struct filename *from);
++__u32 gr_acl_handle_link(const struct dentry *new_dentry,
++ const struct dentry *parent_dentry,
++ const struct vfsmount *parent_mnt,
++ const struct dentry *old_dentry,
++ const struct vfsmount *old_mnt, const struct filename *to);
++int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
++int gr_acl_handle_rename(struct dentry *new_dentry,
++ struct dentry *parent_dentry,
++ const struct vfsmount *parent_mnt,
++ struct dentry *old_dentry,
++ struct inode *old_parent_inode,
++ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags);
++void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
++ struct dentry *old_dentry,
++ struct dentry *new_dentry,
++ struct vfsmount *mnt, const __u8 replace, unsigned int flags);
++__u32 gr_check_link(const struct dentry *new_dentry,
++ const struct dentry *parent_dentry,
++ const struct vfsmount *parent_mnt,
++ const struct dentry *old_dentry,
++ const struct vfsmount *old_mnt);
++int gr_acl_handle_filldir(const struct file *file, const char *name,
++ const unsigned int namelen, const ino_t ino);
++
++__u32 gr_acl_handle_unix(const struct dentry *dentry,
++ const struct vfsmount *mnt);
++void gr_acl_handle_exit(void);
++void gr_acl_handle_psacct(struct task_struct *task, const long code);
++int gr_acl_handle_procpidmem(const struct task_struct *task);
++int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
++int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
++void gr_audit_ptrace(struct task_struct *task);
++dev_t gr_get_dev_from_dentry(struct dentry *dentry);
++void gr_put_exec_file(struct task_struct *task);
++
++int gr_ptrace_readexec(struct file *file, int unsafe_flags);
++
++#if defined(CONFIG_GRKERNSEC) && (defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC))
++extern void gr_learn_resource(const struct task_struct *task, const int res,
++ const unsigned long wanted, const int gt);
++#else
++static inline void gr_learn_resource(const struct task_struct *task, const int res,
++ const unsigned long wanted, const int gt)
++{
++}
++#endif
++
++#ifdef CONFIG_GRKERNSEC_RESLOG
++extern void gr_log_resource(const struct task_struct *task, const int res,
++ const unsigned long wanted, const int gt);
++#else
++static inline void gr_log_resource(const struct task_struct *task, const int res,
++ const unsigned long wanted, const int gt)
++{
++}
++#endif
++
++#ifdef CONFIG_GRKERNSEC
++void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
++void gr_handle_vm86(void);
++void gr_handle_mem_readwrite(u64 from, u64 to);
++
++void gr_log_badprocpid(const char *entry);
++
++extern int grsec_enable_dmesg;
++extern int grsec_disable_privio;
++
++#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
++extern kgid_t grsec_proc_gid;
++#endif
++
++#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
++extern int grsec_enable_chroot_findtask;
++#endif
++#ifdef CONFIG_GRKERNSEC_SETXID
++extern int grsec_enable_setxid;
++#endif
++#endif
++
++#endif
+diff -Naur backports-3.18.1-1.org/include/linux/grsock.h backports-3.18.1-1/include/linux/grsock.h
+--- backports-3.18.1-1.org/include/linux/grsock.h 1970-01-01 01:00:00.000000000 +0100
++++ backports-3.18.1-1/include/linux/grsock.h 2014-12-28 14:10:09.688889562 +0100
+@@ -0,0 +1,19 @@
++#ifndef __GRSOCK_H
++#define __GRSOCK_H
++
++extern void gr_attach_curr_ip(const struct sock *sk);
++extern int gr_handle_sock_all(const int family, const int type,
++ const int protocol);
++extern int gr_handle_sock_server(const struct sockaddr *sck);
++extern int gr_handle_sock_server_other(const struct sock *sck);
++extern int gr_handle_sock_client(const struct sockaddr *sck);
++extern int gr_search_connect(struct socket * sock,
++ struct sockaddr_in * addr);
++extern int gr_search_bind(struct socket * sock,
++ struct sockaddr_in * addr);
++extern int gr_search_listen(struct socket * sock);
++extern int gr_search_accept(struct socket * sock);
++extern int gr_search_socket(const int domain, const int type,
++ const int protocol);
++
++#endif
+diff -Naur backports-3.18.1-1.org/include/linux/unaligned/access_ok.h backports-3.18.1-1/include/linux/unaligned/access_ok.h
+--- backports-3.18.1-1.org/include/linux/unaligned/access_ok.h 2014-12-21 22:37:13.000000000 +0100
++++ backports-3.18.1-1/include/linux/unaligned/access_ok.h 2014-12-28 14:10:09.712889681 +0100
+@@ -4,34 +4,34 @@
+ #include <linux/kernel.h>
+ #include <asm/byteorder.h>
+
+-static inline u16 get_unaligned_le16(const void *p)
++static inline u16 __intentional_overflow(-1) get_unaligned_le16(const void *p)
+ {
+- return le16_to_cpup((__le16 *)p);
++ return le16_to_cpup((const __le16 *)p);
+ }
+
+-static inline u32 get_unaligned_le32(const void *p)
++static inline u32 __intentional_overflow(-1) get_unaligned_le32(const void *p)
+ {
+- return le32_to_cpup((__le32 *)p);
++ return le32_to_cpup((const __le32 *)p);
+ }
+
+-static inline u64 get_unaligned_le64(const void *p)
++static inline u64 __intentional_overflow(-1) get_unaligned_le64(const void *p)
+ {
+- return le64_to_cpup((__le64 *)p);
++ return le64_to_cpup((const __le64 *)p);
+ }
+
+-static inline u16 get_unaligned_be16(const void *p)
++static inline u16 __intentional_overflow(-1) get_unaligned_be16(const void *p)
+ {
+- return be16_to_cpup((__be16 *)p);
++ return be16_to_cpup((const __be16 *)p);
+ }
+
+-static inline u32 get_unaligned_be32(const void *p)
++static inline u32 __intentional_overflow(-1) get_unaligned_be32(const void *p)
+ {
+- return be32_to_cpup((__be32 *)p);
++ return be32_to_cpup((const __be32 *)p);
+ }
+
+-static inline u64 get_unaligned_be64(const void *p)
++static inline u64 __intentional_overflow(-1) get_unaligned_be64(const void *p)
+ {
+- return be64_to_cpup((__be64 *)p);
++ return be64_to_cpup((const __be64 *)p);
+ }
+
+ static inline void put_unaligned_le16(u16 val, void *p)
+diff -Naur backports-3.18.1-1.org/include/media/v4l2-dev.h backports-3.18.1-1/include/media/v4l2-dev.h
+--- backports-3.18.1-1.org/include/media/v4l2-dev.h 2014-12-21 22:37:13.000000000 +0100
++++ backports-3.18.1-1/include/media/v4l2-dev.h 2014-12-28 14:10:09.716889709 +0100
+@@ -75,7 +75,7 @@
+ int (*mmap) (struct file *, struct vm_area_struct *);
+ int (*open) (struct file *);
+ int (*release) (struct file *);
+-};
++} __do_const;
+
+ /*
+ * Newer version of video_device, handled by videodev2.c
+diff -Naur backports-3.18.1-1.org/include/media/v4l2-device.h backports-3.18.1-1/include/media/v4l2-device.h
+--- backports-3.18.1-1.org/include/media/v4l2-device.h 2014-12-21 22:37:13.000000000 +0100
++++ backports-3.18.1-1/include/media/v4l2-device.h 2014-12-28 14:10:09.716889709 +0100
+@@ -95,7 +95,7 @@
+ this function returns 0. If the name ends with a digit (e.g. cx18),
+ then the name will be set to cx18-0 since cx180 looks really odd. */
+ int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
+- atomic_t *instance);
++ atomic_unchecked_t *instance);
+
+ /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
+ Since the parent disappears this ensures that v4l2_dev doesn't have an
+diff -Naur backports-3.18.1-1.org/include/net/bluetooth/l2cap.h backports-3.18.1-1/include/net/bluetooth/l2cap.h
+--- backports-3.18.1-1.org/include/net/bluetooth/l2cap.h 2014-12-21 22:37:13.000000000 +0100
++++ backports-3.18.1-1/include/net/bluetooth/l2cap.h 2014-12-28 14:10:09.716889709 +0100
+@@ -608,7 +608,7 @@
+ unsigned char *kdata,
+ struct iovec *iov,
+ int len);
+-};
++} __do_const;
+
+ struct l2cap_conn {
+ struct hci_conn *hcon;
+diff -Naur backports-3.18.1-1.org/include/net/mac80211.h backports-3.18.1-1/include/net/mac80211.h
+--- backports-3.18.1-1.org/include/net/mac80211.h 2014-12-21 22:37:13.000000000 +0100
++++ backports-3.18.1-1/include/net/mac80211.h 2014-12-28 14:10:09.724889743 +0100
+@@ -4648,7 +4648,7 @@
+ void (*remove_sta_debugfs)(void *priv, void *priv_sta);
+
+ u32 (*get_expected_throughput)(void *priv_sta);
+-};
++} __do_const;
+
+ static inline int rate_supported(struct ieee80211_sta *sta,
+ enum ieee80211_band band,
+diff -Naur backports-3.18.1-1.org/include/trace/events/fs.h backports-3.18.1-1/include/trace/events/fs.h
+--- backports-3.18.1-1.org/include/trace/events/fs.h 1970-01-01 01:00:00.000000000 +0100
++++ backports-3.18.1-1/include/trace/events/fs.h 2014-12-28 14:10:09.728889769 +0100
+@@ -0,0 +1,53 @@
++#undef TRACE_SYSTEM
++#define TRACE_SYSTEM fs
++
++#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
++#define _TRACE_FS_H
++
++#include <linux/fs.h>
++#include <linux/tracepoint.h>
++
++TRACE_EVENT(do_sys_open,
++
++ TP_PROTO(const char *filename, int flags, int mode),
++
++ TP_ARGS(filename, flags, mode),
++
++ TP_STRUCT__entry(
++ __string( filename, filename )
++ __field( int, flags )
++ __field( int, mode )
++ ),
++
++ TP_fast_assign(
++ __assign_str(filename, filename);
++ __entry->flags = flags;
++ __entry->mode = mode;
++ ),
++
++ TP_printk("\"%s\" %x %o",
++ __get_str(filename), __entry->flags, __entry->mode)
++);
++
++TRACE_EVENT(open_exec,
++
++ TP_PROTO(const char *filename),
++
++ TP_ARGS(filename),
++
++ TP_STRUCT__entry(
++ __string( filename, filename )
++ ),
++
++ TP_fast_assign(
++ __assign_str(filename, filename);
++ ),
++
++ TP_printk("\"%s\"",
++ __get_str(filename))
++);
++
++#endif /* _TRACE_FS_H */
++
++/* This part must be outside protection */
++#include <trace/define_trace.h>
+diff -Naur backports-3.18.1-1.org/net/bluetooth/6lowpan.c backports-3.18.1-1/net/bluetooth/6lowpan.c
+--- backports-3.18.1-1.org/net/bluetooth/6lowpan.c 2014-12-21 22:37:15.000000000 +0100
++++ backports-3.18.1-1/net/bluetooth/6lowpan.c 2014-12-28 14:10:09.784890034 +0100
+@@ -367,7 +367,6 @@
+
+ drop:
+ dev->stats.rx_dropped++;
+- kfree_skb(skb);
+ return NET_RX_DROP;
+ }
+
+diff -Naur backports-3.18.1-1.org/net/bluetooth/bnep/core.c backports-3.18.1-1/net/bluetooth/bnep/core.c
+--- backports-3.18.1-1.org/net/bluetooth/bnep/core.c 2014-12-21 22:37:15.000000000 +0100
++++ backports-3.18.1-1/net/bluetooth/bnep/core.c 2014-12-28 14:10:09.784890034 +0100
+@@ -533,6 +533,9 @@
+
+ BT_DBG("");
+
++ if (!l2cap_is_socket(sock))
++ return -EBADFD;
++
+ baswap((void *) dst, &l2cap_pi(sock->sk)->chan->dst);
+ baswap((void *) src, &l2cap_pi(sock->sk)->chan->src);
+
+diff -Naur backports-3.18.1-1.org/net/bluetooth/cmtp/core.c backports-3.18.1-1/net/bluetooth/cmtp/core.c
+--- backports-3.18.1-1.org/net/bluetooth/cmtp/core.c 2014-12-21 22:37:15.000000000 +0100
++++ backports-3.18.1-1/net/bluetooth/cmtp/core.c 2014-12-28 14:10:09.784890034 +0100
+@@ -334,6 +334,9 @@
+
+ BT_DBG("");
+
++ if (!l2cap_is_socket(sock))
++ return -EBADFD;
++
+ session = kzalloc(sizeof(struct cmtp_session), GFP_KERNEL);
+ if (!session)
+ return -ENOMEM;
+diff -Naur backports-3.18.1-1.org/net/bluetooth/hci_sock.c backports-3.18.1-1/net/bluetooth/hci_sock.c
+--- backports-3.18.1-1.org/net/bluetooth/hci_sock.c 2014-12-21 22:37:15.000000000 +0100
++++ backports-3.18.1-1/net/bluetooth/hci_sock.c 2014-12-28 14:10:09.784890034 +0100
+@@ -1067,7 +1067,7 @@
+ uf.event_mask[1] = *((u32 *) f->event_mask + 1);
+ }
+
+- len = min_t(unsigned int, len, sizeof(uf));
++ len = min((size_t)len, sizeof(uf));
+ if (copy_from_user(&uf, optval, len)) {
+ err = -EFAULT;
+ break;
+diff -Naur backports-3.18.1-1.org/net/bluetooth/hidp/core.c backports-3.18.1-1/net/bluetooth/hidp/core.c
+--- backports-3.18.1-1.org/net/bluetooth/hidp/core.c 2014-12-21 22:37:15.000000000 +0100
++++ backports-3.18.1-1/net/bluetooth/hidp/core.c 2014-12-28 14:10:09.784890034 +0100
+@@ -1322,13 +1322,14 @@
+ {
+ struct hidp_session *session;
+ struct l2cap_conn *conn;
+- struct l2cap_chan *chan = l2cap_pi(ctrl_sock->sk)->chan;
++ struct l2cap_chan *chan;
+ int ret;
+
+ ret = hidp_verify_sockets(ctrl_sock, intr_sock);
+ if (ret)
+ return ret;
+
++ chan = l2cap_pi(ctrl_sock->sk)->chan;
+ conn = NULL;
+ l2cap_chan_lock(chan);
+ if (chan->conn)
+diff -Naur backports-3.18.1-1.org/net/bluetooth/l2cap_core.c backports-3.18.1-1/net/bluetooth/l2cap_core.c
+--- backports-3.18.1-1.org/net/bluetooth/l2cap_core.c 2014-12-21 22:37:15.000000000 +0100
++++ backports-3.18.1-1/net/bluetooth/l2cap_core.c 2014-12-28 14:10:09.784890034 +0100
+@@ -3512,8 +3512,10 @@
+ break;
+
+ case L2CAP_CONF_RFC:
+- if (olen == sizeof(rfc))
+- memcpy(&rfc, (void *)val, olen);
++ if (olen != sizeof(rfc))
++ break;
++
++ memcpy(&rfc, (void *)val, olen);
+
+ if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
+ rfc.mode != chan->mode)
+diff -Naur backports-3.18.1-1.org/net/bluetooth/l2cap_sock.c backports-3.18.1-1/net/bluetooth/l2cap_sock.c
+--- backports-3.18.1-1.org/net/bluetooth/l2cap_sock.c 2014-12-21 22:37:15.000000000 +0100
++++ backports-3.18.1-1/net/bluetooth/l2cap_sock.c 2014-12-28 14:10:09.788890064 +0100
+@@ -628,7 +628,8 @@
+ struct sock *sk = sock->sk;
+ struct l2cap_chan *chan = l2cap_pi(sk)->chan;
+ struct l2cap_options opts;
+- int len, err = 0;
++ int err = 0;
++ size_t len = optlen;
+ u32 opt;
+
+ BT_DBG("sk %p", sk);
+@@ -655,7 +656,7 @@
+ opts.max_tx = chan->max_tx;
+ opts.txwin_size = chan->tx_win;
+
+- len = min_t(unsigned int, sizeof(opts), optlen);
++ len = min(sizeof(opts), len);
+ if (copy_from_user((char *) &opts, optval, len)) {
+ err = -EFAULT;
+ break;
+@@ -742,7 +743,8 @@
+ struct bt_security sec;
+ struct bt_power pwr;
+ struct l2cap_conn *conn;
+- int len, err = 0;
++ int err = 0;
++ size_t len = optlen;
+ u32 opt;
+
+ BT_DBG("sk %p", sk);
+@@ -766,7 +768,7 @@
+
+ sec.level = BT_SECURITY_LOW;
+
+- len = min_t(unsigned int, sizeof(sec), optlen);
++ len = min(sizeof(sec), len);
+ if (copy_from_user((char *) &sec, optval, len)) {
+ err = -EFAULT;
+ break;
+@@ -862,7 +864,7 @@
+
+ pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
+
+- len = min_t(unsigned int, sizeof(pwr), optlen);
++ len = min(sizeof(pwr), len);
+ if (copy_from_user((char *) &pwr, optval, len)) {
+ err = -EFAULT;
+ break;
+diff -Naur backports-3.18.1-1.org/net/bluetooth/rfcomm/sock.c backports-3.18.1-1/net/bluetooth/rfcomm/sock.c
+--- backports-3.18.1-1.org/net/bluetooth/rfcomm/sock.c 2014-12-21 22:37:15.000000000 +0100
++++ backports-3.18.1-1/net/bluetooth/rfcomm/sock.c 2014-12-28 14:10:09.788890064 +0100
+@@ -695,7 +695,7 @@
+ struct sock *sk = sock->sk;
+ struct bt_security sec;
+ int err = 0;
+- size_t len;
++ size_t len = optlen;
+ u32 opt;
+
+ BT_DBG("sk %p", sk);
+@@ -717,7 +717,7 @@
+
+ sec.level = BT_SECURITY_LOW;
+
+- len = min_t(unsigned int, sizeof(sec), optlen);
++ len = min(sizeof(sec), len);
+ if (copy_from_user((char *) &sec, optval, len)) {
+ err = -EFAULT;
+ break;
+diff -Naur backports-3.18.1-1.org/net/bluetooth/rfcomm/tty.c backports-3.18.1-1/net/bluetooth/rfcomm/tty.c
+--- backports-3.18.1-1.org/net/bluetooth/rfcomm/tty.c 2014-12-21 22:37:15.000000000 +0100
++++ backports-3.18.1-1/net/bluetooth/rfcomm/tty.c 2014-12-28 14:10:09.788890064 +0100
+@@ -752,7 +752,7 @@
+ BT_DBG("tty %p id %d", tty, tty->index);
+
+ BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
+- dev->channel, dev->port.count);
++ dev->channel, atomic_read(&dev->port.count));
+
+ err = tty_port_open(&dev->port, tty, filp);
+ if (err)
+@@ -775,7 +775,7 @@
+ struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
+
+ BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
+- dev->port.count);
++ atomic_read(&dev->port.count));
+
+ tty_port_close(&dev->port, tty, filp);
+ }
+diff -Naur backports-3.18.1-1.org/net/ieee802154/6lowpan_rtnl.c backports-3.18.1-1/net/ieee802154/6lowpan_rtnl.c
+--- backports-3.18.1-1.org/net/ieee802154/6lowpan_rtnl.c 2014-12-21 22:37:15.000000000 +0100
++++ backports-3.18.1-1/net/ieee802154/6lowpan_rtnl.c 2014-12-28 14:10:09.796890100 +0100
+@@ -639,7 +639,7 @@
+ dev_put(real_dev);
+ }
+
+-static struct rtnl_link_ops lowpan_link_ops __read_mostly = {
++static struct rtnl_link_ops lowpan_link_ops = {
+ .kind = "lowpan",
+ .priv_size = sizeof(struct lowpan_dev_info),
+ .setup = lowpan_setup,
+diff -Naur backports-3.18.1-1.org/net/ieee802154/reassembly.c backports-3.18.1-1/net/ieee802154/reassembly.c
+--- backports-3.18.1-1.org/net/ieee802154/reassembly.c 2014-12-21 22:37:15.000000000 +0100
++++ backports-3.18.1-1/net/ieee802154/reassembly.c 2014-12-28 14:10:09.796890100 +0100
+@@ -460,14 +460,13 @@
+
+ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
+ {
+- struct ctl_table *table;
++ ctl_table_no_const *table = NULL;
+ struct ctl_table_header *hdr;
+ struct netns_ieee802154_lowpan *ieee802154_lowpan =
+ net_ieee802154_lowpan(net);
+
+- table = lowpan_frags_ns_ctl_table;
+ if (!net_eq(net, &init_net)) {
+- table = kmemdup(table, sizeof(lowpan_frags_ns_ctl_table),
++ table = kmemdup(lowpan_frags_ns_ctl_table, sizeof(lowpan_frags_ns_ctl_table),
+ GFP_KERNEL);
+ if (table == NULL)
+ goto err_alloc;
+@@ -494,8 +493,7 @@
+ return 0;
+
+ err_reg:
+- if (!net_eq(net, &init_net))
+- kfree(table);
++ kfree(table);
+ err_alloc:
+ return -ENOMEM;
+ }
+diff -Naur backports-3.18.1-1.org/net/mac80211/cfg.c backports-3.18.1-1/net/mac80211/cfg.c
+--- backports-3.18.1-1.org/net/mac80211/cfg.c 2014-12-21 22:37:15.000000000 +0100
++++ backports-3.18.1-1/net/mac80211/cfg.c 2014-12-28 14:10:09.812890175 +0100
+@@ -541,7 +541,7 @@
+ ret = ieee80211_vif_use_channel(sdata, chandef,
+ IEEE80211_CHANCTX_EXCLUSIVE);
+ }
+- } else if (local->open_count == local->monitors) {
++ } else if (local_read(&local->open_count) == local->monitors) {
+ local->_oper_chandef = *chandef;
+ ieee80211_hw_config(local, 0);
+ }
+@@ -3326,7 +3326,7 @@
+ else
+ local->probe_req_reg--;
+
+- if (!local->open_count)
++ if (!local_read(&local->open_count))
+ break;
+
+ ieee80211_queue_work(&local->hw, &local->reconfig_filter);
+@@ -3460,8 +3460,8 @@
+ if (chanctx_conf) {
+ *chandef = sdata->vif.bss_conf.chandef;
+ ret = 0;
+- } else if (local->open_count > 0 &&
+- local->open_count == local->monitors &&
++ } else if (local_read(&local->open_count) > 0 &&
++ local_read(&local->open_count) == local->monitors &&
+ sdata->vif.type == NL80211_IFTYPE_MONITOR) {
+ if (local->use_chanctx)
+ *chandef = local->monitor_chandef;
+diff -Naur backports-3.18.1-1.org/net/mac80211/ieee80211_i.h backports-3.18.1-1/net/mac80211/ieee80211_i.h
+--- backports-3.18.1-1.org/net/mac80211/ieee80211_i.h 2014-12-21 22:37:15.000000000 +0100
++++ backports-3.18.1-1/net/mac80211/ieee80211_i.h 2014-12-28 14:10:09.812890175 +0100
+@@ -29,6 +29,7 @@
+ #include <net/ieee80211_radiotap.h>
+ #include <net/cfg80211.h>
+ #include <net/mac80211.h>
++#include <asm/local.h>
+ #include "key.h"
+ #include "sta_info.h"
+ #include "debug.h"
+@@ -1057,7 +1058,7 @@
+ /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
+ spinlock_t queue_stop_reason_lock;
+
+- int open_count;
++ local_t open_count;
+ int monitors, cooked_mntrs;
+ /* number of interfaces with corresponding FIF_ flags */
+ int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
+diff -Naur backports-3.18.1-1.org/net/mac80211/iface.c backports-3.18.1-1/net/mac80211/iface.c
+--- backports-3.18.1-1.org/net/mac80211/iface.c 2014-12-21 22:37:15.000000000 +0100
++++ backports-3.18.1-1/net/mac80211/iface.c 2014-12-28 14:10:09.812890175 +0100
+@@ -532,7 +532,7 @@
+ break;
+ }
+
+- if (local->open_count == 0) {
++ if (local_read(&local->open_count) == 0) {
+ res = drv_start(local);
+ if (res)
+ goto err_del_bss;
+@@ -579,7 +579,7 @@
+ res = drv_add_interface(local, sdata);
+ if (res)
+ goto err_stop;
+- } else if (local->monitors == 0 && local->open_count == 0) {
++ } else if (local->monitors == 0 && local_read(&local->open_count) == 0) {
+ res = ieee80211_add_virtual_monitor(local);
+ if (res)
+ goto err_stop;
+@@ -688,7 +688,7 @@
+ atomic_inc(&local->iff_promiscs);
+
+ if (coming_up)
+- local->open_count++;
++ local_inc(&local->open_count);
+
+ if (hw_reconf_flags)
+ ieee80211_hw_config(local, hw_reconf_flags);
+@@ -726,7 +726,7 @@
+ err_del_interface:
+ drv_remove_interface(local, sdata);
+ err_stop:
+- if (!local->open_count)
++ if (!local_read(&local->open_count))
+ drv_stop(local);
+ err_del_bss:
+ sdata->bss = NULL;
+@@ -892,7 +892,7 @@
+ }
+
+ if (going_down)
+- local->open_count--;
++ local_dec(&local->open_count);
+
+ switch (sdata->vif.type) {
+ case NL80211_IFTYPE_AP_VLAN:
+@@ -954,7 +954,7 @@
+ }
+ spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
+
+- if (local->open_count == 0)
++ if (local_read(&local->open_count) == 0)
+ ieee80211_clear_tx_pending(local);
+
+ /*
+@@ -997,7 +997,7 @@
+ if (cancel_scan)
+ flush_delayed_work(&local->scan_work);
+
+- if (local->open_count == 0) {
++ if (local_read(&local->open_count) == 0) {
+ ieee80211_stop_device(local);
+
+ /* no reconfiguring after stop! */
+@@ -1008,7 +1008,7 @@
+ ieee80211_configure_filter(local);
+ ieee80211_hw_config(local, hw_reconf_flags);
+
+- if (local->monitors == local->open_count)
++ if (local->monitors == local_read(&local->open_count))
+ ieee80211_add_virtual_monitor(local);
+ }
+
+diff -Naur backports-3.18.1-1.org/net/mac80211/main.c backports-3.18.1-1/net/mac80211/main.c
+--- backports-3.18.1-1.org/net/mac80211/main.c 2014-12-21 22:37:15.000000000 +0100
++++ backports-3.18.1-1/net/mac80211/main.c 2014-12-28 14:10:09.812890175 +0100
+@@ -175,7 +175,7 @@
+ changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
+ IEEE80211_CONF_CHANGE_POWER);
+
+- if (changed && local->open_count) {
++ if (changed && local_read(&local->open_count)) {
+ ret = drv_config(local, changed);
+ /*
+ * Goal:
+diff -Naur backports-3.18.1-1.org/net/mac80211/pm.c backports-3.18.1-1/net/mac80211/pm.c
+--- backports-3.18.1-1.org/net/mac80211/pm.c 2014-12-21 22:37:15.000000000 +0100
++++ backports-3.18.1-1/net/mac80211/pm.c 2014-12-28 14:10:09.812890175 +0100
+@@ -12,7 +12,7 @@
+ struct ieee80211_sub_if_data *sdata;
+ struct sta_info *sta;
+
+- if (!local->open_count)
++ if (!local_read(&local->open_count))
+ goto suspend;
+
+ ieee80211_scan_cancel(local);
+@@ -59,7 +59,7 @@
+ cancel_work_sync(&local->dynamic_ps_enable_work);
+ del_timer_sync(&local->dynamic_ps_timer);
+
+- local->wowlan = wowlan && local->open_count;
++ local->wowlan = wowlan && local_read(&local->open_count);
+ if (local->wowlan) {
+ int err = drv_suspend(local, wowlan);
+ if (err < 0) {
+@@ -125,7 +125,7 @@
+ WARN_ON(!list_empty(&local->chanctx_list));
+
+ /* stop hardware - this must stop RX */
+- if (local->open_count)
++ if (local_read(&local->open_count))
+ ieee80211_stop_device(local);
+
+ suspend:
+diff -Naur backports-3.18.1-1.org/net/mac80211/rate.c backports-3.18.1-1/net/mac80211/rate.c
+--- backports-3.18.1-1.org/net/mac80211/rate.c 2014-12-21 22:37:15.000000000 +0100
++++ backports-3.18.1-1/net/mac80211/rate.c 2014-12-28 14:10:09.812890175 +0100
+@@ -720,7 +720,7 @@
+
+ ASSERT_RTNL();
+
+- if (local->open_count)
++ if (local_read(&local->open_count))
+ return -EBUSY;
+
+ if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
+diff -Naur backports-3.18.1-1.org/net/mac80211/util.c backports-3.18.1-1/net/mac80211/util.c
+--- backports-3.18.1-1.org/net/mac80211/util.c 2014-12-21 22:37:15.000000000 +0100
++++ backports-3.18.1-1/net/mac80211/util.c 2014-12-28 14:10:09.816890209 +0100
+@@ -1669,7 +1669,7 @@
+ }
+ #endif
+ /* everything else happens only if HW was up & running */
+- if (!local->open_count)
++ if (!local_read(&local->open_count))
+ goto wake_up;
+
+ /*
+@@ -1895,7 +1895,7 @@
+ local->in_reconfig = false;
+ barrier();
+
+- if (local->monitors == local->open_count && local->monitors > 0)
++ if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
+ ieee80211_add_virtual_monitor(local);
+
+ /*
+diff -Naur backports-3.18.1-1.org/net/wireless/wext-core.c backports-3.18.1-1/net/wireless/wext-core.c
+--- backports-3.18.1-1.org/net/wireless/wext-core.c 2014-12-21 22:37:15.000000000 +0100
++++ backports-3.18.1-1/net/wireless/wext-core.c 2014-12-28 14:10:09.832890290 +0100
+@@ -748,8 +748,7 @@
+ */
+
+ /* Support for very large requests */
+- if ((descr->flags & IW_DESCR_FLAG_NOMAX) &&
+- (user_length > descr->max_tokens)) {
++ if (user_length > descr->max_tokens) {
+ /* Allow userspace to GET more than max so
+ * we can support any size GET requests.
+ * There is still a limit : -ENOMEM.
+@@ -788,22 +787,6 @@
+ }
+ }
+
+- if (IW_IS_GET(cmd) && !(descr->flags & IW_DESCR_FLAG_NOMAX)) {
+- /*
+- * If this is a GET, but not NOMAX, it means that the extra
+- * data is not bounded by userspace, but by max_tokens. Thus
+- * set the length to max_tokens. This matches the extra data
+- * allocation.
+- * The driver should fill it with the number of tokens it
+- * provided, and it may check iwp->length rather than having
+- * knowledge of max_tokens. If the driver doesn't change the
+- * iwp->length, this ioctl just copies back max_token tokens
+- * filled with zeroes. Hopefully the driver isn't claiming
+- * them to be valid data.
+- */
+- iwp->length = descr->max_tokens;
+- }
+-
+ err = handler(dev, info, (union iwreq_data *) iwp, extra);
+
+ iwp->length += essid_compat;
diff --git a/src/patches/backports-3.18.1-1-ipfire-build.patch b/src/patches/backports-3.18.1-1-ipfire-build.patch
new file mode 100644
index 0000000..0b2998e
--- /dev/null
+++ b/src/patches/backports-3.18.1-1-ipfire-build.patch
@@ -0,0 +1,34 @@
+diff -Naur backports-3.18.1-1.org/Makefile backports-3.18.1-1/Makefile
+--- backports-3.18.1-1.org/Makefile 2014-12-21 22:37:13.000000000 +0100
++++ backports-3.18.1-1/Makefile 2014-12-29 15:51:19.358111370 +0100
+@@ -8,9 +8,9 @@
+ SHELL := /bin/bash
+ BACKPORT_PWD := $(shell pwd)
+
+-KMODDIR ?= updates
++KMODDIR ?= kernel
+ ifneq ($(origin KLIB), undefined)
+-KMODPATH_ARG := "INSTALL_MOD_PATH=$(KLIB)"
++KMODPATH_ARG :=
+ else
+ KLIB := /lib/modules/$(shell uname -r)/
+ KMODPATH_ARG :=
+diff -Naur backports-3.18.1-1.org/Makefile.real backports-3.18.1-1/Makefile.real
+--- backports-3.18.1-1.org/Makefile.real 2014-12-21 22:37:13.000000000 +0100
++++ backports-3.18.1-1/Makefile.real 2014-12-29 15:51:40.934780933 +0100
+@@ -92,11 +92,11 @@
+ @$(MAKE) -C $(KLIB_BUILD) M=$(BACKPORT_PWD) \
+ INSTALL_MOD_DIR=$(KMODDIR) $(KMODPATH_ARG) \
+ modules_install
+- @./scripts/blacklist.sh $(KLIB)/ $(KLIB)/$(KMODDIR)
++# @./scripts/blacklist.sh $(KLIB)/ $(KLIB)/$(KMODDIR)
+ @./scripts/compress_modules.sh $(KLIB)/$(KMODDIR)
+- @./scripts/check_depmod.sh
+- @/sbin/depmod -a
+- @./scripts/update-initramfs.sh $(KLIB)
++# @./scripts/check_depmod.sh
++# @/sbin/depmod -a
++# @./scripts/update-initramfs.sh $(KLIB)
+ @echo
+ @echo Your backported driver modules should be installed now.
+ @echo Reboot.
diff --git a/src/patches/backports-3.18.1-1_add_libertas_uap.patch b/src/patches/backports-3.18.1-1_add_libertas_uap.patch
new file mode 100644
index 0000000..9a5b01b
--- /dev/null
+++ b/src/patches/backports-3.18.1-1_add_libertas_uap.patch
@@ -0,0 +1,5058 @@
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/Kconfig backports-3.18.1-1/drivers/net/wireless/Kconfig
+--- backports-3.18.1-1.org/drivers/net/wireless/Kconfig 2014-12-21 22:37:15.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/Kconfig 2014-12-29 20:37:43.945764119 +0100
+@@ -55,6 +55,14 @@
+ ---help---
+ A driver for Marvell Libertas 8388 USB devices using thinfirm.
+
++config LIBERTAS_UAP
++ tristate "Marvell 8xxx Libertas UAP"
++ depends on MAC80211
++ depends on MMC
++ select FW_LOADER
++ ---help---
++ Driver for Marvell Libertas 8xxx micro AP.
++
+ config AIRO
+ depends on n
+ tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards"
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/libertas_uap/Makefile backports-3.18.1-1/drivers/net/wireless/libertas_uap/Makefile
+--- backports-3.18.1-1.org/drivers/net/wireless/libertas_uap/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/libertas_uap/Makefile 2014-12-29 20:41:50.975778546 +0100
+@@ -0,0 +1,6 @@
++obj-$(CPTCFG_LIBERTAS_UAP) += uap8xxx.o
++
++uap8xxx-y += uap_main.o uap_sdio_mmc.o
++uap8xxx-$(CPTCFG_PROC_FS) += uap_proc.o uap_debug.o
++
++EXTRA_CFLAGS += -DFPNUM='"52"' -DPXA3XX_DMA_ALIGN -DDEBUG_LEVEL1
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/libertas_uap/uap_debug.c backports-3.18.1-1/drivers/net/wireless/libertas_uap/uap_debug.c
+--- backports-3.18.1-1.org/drivers/net/wireless/libertas_uap/uap_debug.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/libertas_uap/uap_debug.c 2014-12-29 20:37:43.949097590 +0100
+@@ -0,0 +1,260 @@
++/** @file uap_debug.c
++ * @brief This file contains functions for debug proc file.
++ *
++ * Copyright (C) 2008-2009, Marvell International Ltd.
++ *
++ * This software file (the "File") is distributed by Marvell International
++ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
++ * (the "License"). You may use, redistribute and/or modify this File in
++ * accordance with the terms and conditions of the License, a copy of which
++ * is available along with the File in the gpl.txt file or by writing to
++ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ * 02111-1307 or on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
++ *
++ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
++ * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
++ * this warranty disclaimer.
++ *
++ */
++#ifdef CONFIG_PROC_FS
++#include "uap_headers.h"
++
++/********************************************************
++ Local Variables
++********************************************************/
++
++#define item_size(n) (sizeof ((uap_adapter *)0)->n)
++#define item_addr(n) ((u32) &((uap_adapter *)0)->n)
++
++#define item_dbg_size(n) (sizeof (((uap_adapter *)0)->dbg.n))
++#define item_dbg_addr(n) ((u32) &(((uap_adapter *)0)->dbg.n))
++
++#define item_dev_size(n) (sizeof ((uap_dev_t *)0)->n)
++#define item_dev_addr(n) ((u32) &((uap_dev_t *)0)->n)
++
++/** MicroAp device offset */
++#define OFFSET_UAP_DEV 0x01
++/** Bluetooth adapter offset */
++#define OFFSET_UAP_ADAPTER 0x02
++
++struct debug_data
++{
++ /** Name */
++ char name[32];
++ /** Size */
++ u32 size;
++ /** Address */
++ u32 addr;
++ /** Offset */
++ u32 offset;
++ /** Flag */
++ u32 flag;
++};
++
++/* To debug any member of uap_adapter, simply add one line here.
++ */
++static struct debug_data items[] = {
++ {"cmd_sent", item_dev_size(cmd_sent), 0, item_dev_addr(cmd_sent),
++ OFFSET_UAP_DEV},
++ {"data_sent", item_dev_size(data_sent), 0, item_dev_addr(data_sent),
++ OFFSET_UAP_DEV},
++ {"IntCounter", item_size(IntCounter), 0, item_addr(IntCounter),
++ OFFSET_UAP_ADAPTER},
++ {"cmd_pending", item_size(cmd_pending), 0, item_addr(cmd_pending),
++ OFFSET_UAP_ADAPTER},
++ {"num_cmd_h2c_fail", item_dbg_size(num_cmd_host_to_card_failure), 0,
++ item_dbg_addr(num_cmd_host_to_card_failure), OFFSET_UAP_ADAPTER},
++ {"num_tx_h2c_fail", item_dbg_size(num_tx_host_to_card_failure), 0,
++ item_dbg_addr(num_tx_host_to_card_failure), OFFSET_UAP_ADAPTER},
++ {"psmode", item_size(psmode), 0, item_addr(psmode), OFFSET_UAP_ADAPTER},
++ {"ps_state", item_size(ps_state), 0, item_addr(ps_state),
++ OFFSET_UAP_ADAPTER},
++#ifdef DEBUG_LEVEL1
++ {"drvdbg", sizeof(drvdbg), (u32) & drvdbg, 0, 0}
++#endif
++};
++
++static int num_of_items = sizeof(items) / sizeof(items[0]);
++
++/********************************************************
++ Global Variables
++********************************************************/
++
++/********************************************************
++ Local Functions
++********************************************************/
++/**
++ * @brief proc read function
++ *
++ * @param page pointer to buffer
++ * @param s read data starting position
++ * @param off offset
++ * @param cnt counter
++ * @param eof end of file flag
++ * @param data data to output
++ * @return number of output data
++ */
++static int uap_debug_proc_show(struct seq_file *s, void *data) {
++ int val = 0;
++ int i;
++
++ struct debug_data *d = (struct debug_data *)s->private;
++
++ if (MODULE_GET == 0)
++ return UAP_STATUS_FAILURE;
++
++ for (i = 0; i < num_of_items; i++) {
++ if (d[i].size == 1)
++ val = *((u8 *) d[i].addr);
++ else if (d[i].size == 2)
++ val = *((u16 *) d[i].addr);
++ else if (d[i].size == 4)
++ val = *((u32 *) d[i].addr);
++
++ seq_printf(s, "%s=%d\n", d[i].name, val);
++ }
++ MODULE_PUT;
++ return 0;
++}
++
++static int uap_debug_proc_open(struct inode* inode, struct file* file) {
++ return single_open(file, uap_debug_proc_show, PDE_DATA(inode));
++}
++
++/**
++ * @brief proc write function
++ *
++ * @param f file pointer
++ * @param buf pointer to data buffer
++ * @param cnt data number to write
++ * @param data data to write
++ * @return number of data
++ */
++static ssize_t uap_debug_proc_write(struct file *f, const char __user *buf, size_t cnt, loff_t *data) {
++ int r, i;
++ char *pdata;
++ char *p;
++ char *p0;
++ char *p1;
++ char *p2;
++ struct debug_data *d = (struct debug_data *)PDE_DATA(file_inode(f));
++
++ if (MODULE_GET == 0)
++ return UAP_STATUS_FAILURE;
++
++ pdata = (char *) kmalloc(cnt, GFP_KERNEL);
++ if (pdata == NULL) {
++ MODULE_PUT;
++ return 0;
++ }
++
++ if (copy_from_user(pdata, buf, cnt)) {
++ PRINTM(INFO, "Copy from user failed\n");
++ kfree(pdata);
++ MODULE_PUT;
++ return 0;
++ }
++
++ p0 = pdata;
++ for (i = 0; i < num_of_items; i++) {
++ do {
++ p = strstr(p0, d[i].name);
++ if (p == NULL)
++ break;
++ p1 = strchr(p, '\n');
++ if (p1 == NULL)
++ break;
++ p0 = p1++;
++ p2 = strchr(p, '=');
++ if (!p2)
++ break;
++ p2++;
++ r = string_to_number(p2);
++ if (d[i].size == 1)
++ *((u8 *) d[i].addr) = (u8) r;
++ else if (d[i].size == 2)
++ *((u16 *) d[i].addr) = (u16) r;
++ else if (d[i].size == 4)
++ *((u32 *) d[i].addr) = (u32) r;
++ break;
++ } while (TRUE);
++ }
++ kfree(pdata);
++#ifdef DEBUG_LEVEL1
++ printk(KERN_ALERT "drvdbg = 0x%x\n", drvdbg);
++ printk(KERN_ALERT "INFO (%08lx) %s\n", DBG_INFO,
++ (drvdbg & DBG_INFO) ? "X" : "");
++ printk(KERN_ALERT "WARN (%08lx) %s\n", DBG_WARN,
++ (drvdbg & DBG_WARN) ? "X" : "");
++ printk(KERN_ALERT "ENTRY (%08lx) %s\n", DBG_ENTRY,
++ (drvdbg & DBG_ENTRY) ? "X" : "");
++ printk(KERN_ALERT "CMD_D (%08lx) %s\n", DBG_CMD_D,
++ (drvdbg & DBG_CMD_D) ? "X" : "");
++ printk(KERN_ALERT "DAT_D (%08lx) %s\n", DBG_DAT_D,
++ (drvdbg & DBG_DAT_D) ? "X" : "");
++ printk(KERN_ALERT "CMND (%08lx) %s\n", DBG_CMND,
++ (drvdbg & DBG_CMND) ? "X" : "");
++ printk(KERN_ALERT "DATA (%08lx) %s\n", DBG_DATA,
++ (drvdbg & DBG_DATA) ? "X" : "");
++ printk(KERN_ALERT "ERROR (%08lx) %s\n", DBG_ERROR,
++ (drvdbg & DBG_ERROR) ? "X" : "");
++ printk(KERN_ALERT "FATAL (%08lx) %s\n", DBG_FATAL,
++ (drvdbg & DBG_FATAL) ? "X" : "");
++ printk(KERN_ALERT "MSG (%08lx) %s\n", DBG_MSG,
++ (drvdbg & DBG_MSG) ? "X" : "");
++#endif
++ MODULE_PUT;
++ return cnt;
++}
++
++static const struct file_operations uap_debug_proc_fops = {
++ .owner = THIS_MODULE,
++ .open = uap_debug_proc_open,
++ .read = seq_read,
++ .llseek = seq_lseek,
++ .release = single_release,
++ .write = uap_debug_proc_write,
++};
++
++/********************************************************
++ Global Functions
++********************************************************/
++/**
++ * @brief create debug proc file
++ *
++ * @param priv pointer uap_private
++ * @param dev pointer net_device
++ * @return N/A
++ */
++void
++uap_debug_entry(uap_private * priv, struct net_device *dev)
++{
++ int i;
++
++ if (priv->proc_entry == NULL)
++ return;
++
++ for (i = 0; i < num_of_items; i++) {
++ if (items[i].flag & OFFSET_UAP_ADAPTER)
++ items[i].addr = items[i].offset + (u32) priv->adapter;
++ if (items[i].flag & OFFSET_UAP_DEV)
++ items[i].addr = items[i].offset + (u32) & priv->uap_dev;
++ }
++ proc_create_data("debug", 0644, priv->proc_entry, &uap_debug_proc_fops,
++ &items[0]);
++}
++
++/**
++ * @brief remove proc file
++ *
++ * @param priv pointer uap_private
++ * @return N/A
++ */
++void
++uap_debug_remove(uap_private * priv)
++{
++ remove_proc_entry("debug", priv->proc_entry);
++}
++
++#endif
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/libertas_uap/uap_drv.h backports-3.18.1-1/drivers/net/wireless/libertas_uap/uap_drv.h
+--- backports-3.18.1-1.org/drivers/net/wireless/libertas_uap/uap_drv.h 1970-01-01 01:00:00.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/libertas_uap/uap_drv.h 2014-12-29 20:37:43.949097590 +0100
+@@ -0,0 +1,667 @@
++/** @file uap_drv.h
++ * @brief This file contains Linux OS related definitions and
++ * declarations, uAP driver
++ *
++ * Copyright (C) 2008-2009, Marvell International Ltd.
++ *
++ * This software file (the "File") is distributed by Marvell International
++ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
++ * (the "License"). You may use, redistribute and/or modify this File in
++ * accordance with the terms and conditions of the License, a copy of which
++ * is available along with the File in the gpl.txt file or by writing to
++ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ * 02111-1307 or on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
++ *
++ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
++ * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
++ * this warranty disclaimer.
++ *
++ */
++
++#ifndef _UAP_DRV_H
++#define _UAP_DRV_H
++
++/** Driver release version */
++#define DRIVER_VERSION "26146"
++
++/** True */
++#ifndef TRUE
++#define TRUE 1
++#endif
++/** False */
++#ifndef FALSE
++#define FALSE 0
++#endif
++
++/** Bit definitions */
++#ifndef BIT
++#define BIT(x) (1UL << (x))
++#endif
++
++/** Dma addresses are 32-bits wide. */
++#ifndef __ATTRIB_ALIGN__
++#define __ATTRIB_ALIGN__ __attribute__((aligned(4)))
++#endif
++
++/** attribute pack */
++#ifndef __ATTRIB_PACK__
++#define __ATTRIB_PACK__ __attribute__ ((packed))
++#endif
++
++/** Debug Macro definition*/
++#ifdef DEBUG_LEVEL1
++
++extern u32 drvdbg;
++
++/** Debug message control bit definition for drvdbg */
++/** Debug message */
++#define DBG_MSG BIT(0)
++/** Debug fatal message */
++#define DBG_FATAL BIT(1)
++/** Debug error message */
++#define DBG_ERROR BIT(2)
++/** Debug data message */
++#define DBG_DATA BIT(3)
++/** Debug command message */
++#define DBG_CMND BIT(4)
++
++/** Debug data */
++#define DBG_DAT_D BIT(16)
++/** Debug command */
++#define DBG_CMD_D BIT(17)
++
++/** Debug entry */
++#define DBG_ENTRY BIT(28)
++/** Debug warning */
++#define DBG_WARN BIT(29)
++/** Debug info */
++#define DBG_INFO BIT(30)
++
++/** Print info */
++#define PRINTM_INFO(msg...) {if (drvdbg & DBG_INFO) printk(KERN_DEBUG msg);}
++/** Print warn message */
++#define PRINTM_WARN(msg...) {if (drvdbg & DBG_WARN) printk(KERN_DEBUG msg);}
++/** Print entry */
++#define PRINTM_ENTRY(msg...) {if (drvdbg & DBG_ENTRY) printk(KERN_DEBUG msg);}
++/** Print cmd_d */
++#define PRINTM_CMD_D(msg...) {if (drvdbg & DBG_CMD_D) printk(KERN_DEBUG msg);}
++/** Print data_d */
++#define PRINTM_DAT_D(msg...) {if (drvdbg & DBG_DAT_D) printk(KERN_DEBUG msg);}
++/** Print command */
++#define PRINTM_CMND(msg...) {if (drvdbg & DBG_CMND) printk(KERN_DEBUG msg);}
++/** Print data */
++#define PRINTM_DATA(msg...) {if (drvdbg & DBG_DATA) printk(KERN_DEBUG msg);}
++/** Print error message */
++#define PRINTM_ERROR(msg...) {if (drvdbg & DBG_ERROR) printk(KERN_DEBUG msg);}
++/** Print fatal message */
++#define PRINTM_FATAL(msg...) {if (drvdbg & DBG_FATAL) printk(KERN_DEBUG msg);}
++/** Print message */
++#define PRINTM_MSG(msg...) {if (drvdbg & DBG_MSG) printk(KERN_ALERT msg);}
++/** Print level */
++#define PRINTM(level,msg...) PRINTM_##level(msg)
++
++#else
++
++#define PRINTM(level,msg...) do {} while (0)
++
++#endif /* DEBUG_LEVEL1 */
++
++/** Wait until a condition becomes true */
++#define ASSERT(cond) \
++do { \
++ if (!(cond)) \
++ PRINTM(INFO, "ASSERT: %s, %s:%i\n", \
++ __FUNCTION__, __FILE__, __LINE__); \
++} while(0)
++
++/** Log enrty point for debugging */
++#define ENTER() PRINTM(ENTRY, "Enter: %s, %s:%i\n", __FUNCTION__, \
++ __FILE__, __LINE__)
++/** Log exit point for debugging */
++#define LEAVE() PRINTM(ENTRY, "Leave: %s, %s:%i\n", __FUNCTION__, \
++ __FILE__, __LINE__)
++
++#ifdef DEBUG_LEVEL1
++/** Dump buffer length */
++#define DBG_DUMP_BUF_LEN 64
++/** Maximum dump per line */
++#define MAX_DUMP_PER_LINE 16
++/** Data dump length */
++#define DATA_DUMP_LEN 32
++
++static inline void
++hexdump(char *prompt, u8 * buf, int len)
++{
++ int i;
++ char dbgdumpbuf[DBG_DUMP_BUF_LEN];
++ char *ptr = dbgdumpbuf;
++
++ printk(KERN_DEBUG "%s:\n", prompt);
++ for (i = 1; i <= len; i++) {
++ ptr += sprintf(ptr, "%02x ", *buf);
++ buf++;
++ if (i % MAX_DUMP_PER_LINE == 0) {
++ *ptr = 0;
++ printk(KERN_DEBUG "%s\n", dbgdumpbuf);
++ ptr = dbgdumpbuf;
++ }
++ }
++ if (len % MAX_DUMP_PER_LINE) {
++ *ptr = 0;
++ printk(KERN_DEBUG "%s\n", dbgdumpbuf);
++ }
++}
++
++/** Debug command */
++#define DBG_HEXDUMP_CMD_D(x,y,z) {if (drvdbg & DBG_CMD_D) hexdump(x,y,z);}
++/** Debug data */
++#define DBG_HEXDUMP_DAT_D(x,y,z) {if (drvdbg & DBG_DAT_D) hexdump(x,y,z);}
++/** Debug hexdump */
++#define DBG_HEXDUMP(level,x,y,z) DBG_HEXDUMP_##level(x,y,z)
++/** hexdump */
++#define HEXDUMP(x,y,z) {if (drvdbg & DBG_INFO) hexdump(x,y,z);}
++#else
++/** Do nothing since debugging is not turned on */
++#define DBG_HEXDUMP(level,x,y,z) do {} while (0)
++/** Do nothing since debugging is not turned on */
++#define HEXDUMP(x,y,z) do {} while (0)
++#endif
++
++/**
++ * Typedefs
++ */
++/** Unsigned char */
++typedef u8 BOOLEAN;
++
++/*
++ * OS macro definitions
++ */
++/** OS macro to get time */
++#define os_time_get() jiffies
++
++/** OS macro to update transfer start time */
++#define UpdateTransStart(dev) { \
++ dev->trans_start = jiffies; \
++}
++
++/** Try to get a reference to the module */
++#define MODULE_GET try_module_get(THIS_MODULE)
++/** Decrease module reference count */
++#define MODULE_PUT module_put(THIS_MODULE)
++
++/** OS macro to initialize semaphore */
++#define OS_INIT_SEMAPHORE(x) sema_init(x,1)
++/** OS macro to acquire blocking semaphore */
++#define OS_ACQ_SEMAPHORE_BLOCK(x) down_interruptible(x)
++/** OS macro to acquire non-blocking semaphore */
++#define OS_ACQ_SEMAPHORE_NOBLOCK(x) down_trylock(x)
++/** OS macro to release semaphore */
++#define OS_REL_SEMAPHORE(x) up(x)
++
++static inline void
++os_sched_timeout(u32 millisec)
++{
++ set_current_state(TASK_INTERRUPTIBLE);
++ schedule_timeout((millisec * HZ) / 1000);
++}
++
++/** Maximum size of ethernet packet */
++#define MRVDRV_MAXIMUM_ETH_PACKET_SIZE 1514
++
++/** Maximum size of multicast list */
++#define MRVDRV_MAX_MULTICAST_LIST_SIZE 32
++
++/** Find minimum */
++#ifndef MIN
++#define MIN(a,b) ((a) < (b) ? (a) : (b))
++#endif
++
++/** Find maximum */
++#ifndef MAX
++#define MAX(a,b) ((a) > (b) ? (a) : (b))
++#endif
++
++/** Find number of elements */
++#ifndef NELEMENTS
++#define NELEMENTS(x) (sizeof(x)/sizeof(x[0]))
++#endif
++
++/** Buffer Constants */
++
++/** Size of command buffer */
++#define MRVDRV_SIZE_OF_CMD_BUFFER (2 * 1024)
++
++/** Length of device length */
++#define DEV_NAME_LEN 32
++
++/** Length of ethernet address */
++#ifndef ETH_ALEN
++#define ETH_ALEN 6
++#endif
++
++/** Default watchdog timeout */
++#define MRVDRV_DEFAULT_WATCHDOG_TIMEOUT (2 * HZ)
++
++/** Success */
++#define UAP_STATUS_SUCCESS (0)
++/** Failure */
++#define UAP_STATUS_FAILURE (-1)
++/** Not accepted */
++#define UAP_STATUS_NOT_ACCEPTED (-2)
++
++/** Max loop count (* 100ms) for waiting device ready at init time */
++#define MAX_WAIT_DEVICE_READY_COUNT 50
++
++/** Tx high watermark. Stop Tx queue after this is crossed */
++#define TX_HIGH_WATERMARK 4
++/** Tx low watermark. Restart Tx queue after this is crossed */
++#define TX_LOW_WATERMARK 2
++
++/** Netlink protocol number */
++#define NETLINK_MARVELL (MAX_LINKS - 1)
++/** Netlink maximum payload size */
++#define NL_MAX_PAYLOAD 1024
++/** Netlink multicast group number */
++#define NL_MULTICAST_GROUP 1
++
++/** 20 seconds */
++#define MRVDRV_TIMER_20S 20000
++
++/** Host Command option for wait till Send */
++#define HostCmd_OPTION_WAITFORSEND 0x0001
++/** Host Command option for wait for RSP */
++#define HostCmd_OPTION_WAITFORRSP 0x0002
++/** Host Command option for wait for RSP or Timeout */
++#define HostCmd_OPTION_WAITFORRSP_TIMEOUT 0x0003
++/** Host Command option for wait for RSP of sleep confirm */
++#define HostCmd_OPTION_WAITFORRSP_SLEEPCONFIRM 0x0004
++
++/** Sleep until a condition gets true or a timeout elapses */
++#define os_wait_interruptible_timeout(waitq, cond, timeout) \
++ wait_event_interruptible_timeout(waitq, cond, ((timeout) * HZ / 1000))
++
++/** Private command ID to Host command */
++#define UAPHOSTCMD (SIOCDEVPRIVATE + 1)
++
++/** Private command ID to Power Mode */
++#define UAP_POWER_MODE (SIOCDEVPRIVATE + 3)
++/** sleep_param */
++typedef struct _ps_sleep_param
++{
++ /** control bitmap */
++ u32 ctrl_bitmap;
++ /** minimum sleep period (micro second) */
++ u32 min_sleep;
++ /** maximum sleep period (micro second) */
++ u32 max_sleep;
++} ps_sleep_param;
++
++/** inactivity sleep_param */
++typedef struct _inact_sleep_param
++{
++ /** inactivity timeout (micro second) */
++ u32 inactivity_to;
++ /** miniumu awake period (micro second) */
++ u32 min_awake;
++ /** maximum awake period (micro second) */
++ u32 max_awake;
++} inact_sleep_param;
++
++/** flag for ps mode */
++#define PS_FLAG_PS_MODE 1
++/** flag for sleep param */
++#define PS_FLAG_SLEEP_PARAM 2
++/** flag for inactivity sleep param */
++#define PS_FLAG_INACT_SLEEP_PARAM 4
++
++/** Disable power mode */
++#define PS_MODE_DISABLE 0
++/** Enable periodic dtim ps */
++#define PS_MODE_PERIODIC_DTIM 1
++/** Enable inactivity ps */
++#define PS_MODE_INACTIVITY 2
++
++/** sleep parameter */
++#define SLEEP_PARAMETER 1
++/** inactivity sleep parameter */
++#define INACTIVITY_SLEEP_PARAMETER 2
++/** ps_mgmt */
++typedef struct _ps_mgmt
++{
++ /** flags for valid field */
++ u16 flags;
++ /** power mode */
++ u16 ps_mode;
++ /** sleep param */
++ ps_sleep_param sleep_param;
++ /** inactivity sleep param */
++ inact_sleep_param inact_param;
++} ps_mgmt;
++
++/** Semaphore structure */
++typedef struct semaphore SEMAPHORE;
++
++/** Global Varibale Declaration */
++/** Private data structure of the device */
++typedef struct _uap_private uap_private;
++/** Adapter data structure of the device */
++typedef struct _uap_adapter uap_adapter;
++/** private structure */
++extern uap_private *uappriv;
++
++/** ENUM definition*/
++
++/** Hardware status codes */
++typedef enum _HARDWARE_STATUS
++{
++ HWReady,
++ HWInitializing,
++ HWReset,
++ HWClosing,
++ HWNotReady
++} HARDWARE_STATUS;
++
++/** info for debug purpose */
++typedef struct _uap_dbg
++{
++ /** Number of host to card command failures */
++ u32 num_cmd_host_to_card_failure;
++ /** Number of host to card Tx failures */
++ u32 num_tx_host_to_card_failure;
++} uap_dbg;
++
++/** Set thread state */
++#define OS_SET_THREAD_STATE(x) set_current_state(x)
++
++typedef struct
++{
++ /** Task */
++ struct task_struct *task;
++ /** Queue */
++ wait_queue_head_t waitQ;
++ /** PID */
++ pid_t pid;
++ /** Private structure */
++ void *priv;
++} uap_thread;
++
++static inline void
++uap_activate_thread(uap_thread * thr)
++{
++ /** Record the thread pid */
++ thr->pid = current->pid;
++
++ /** Initialize the wait queue */
++ init_waitqueue_head(&thr->waitQ);
++}
++
++static inline void
++uap_deactivate_thread(uap_thread * thr)
++{
++ thr->pid = 0;
++ return;
++}
++
++static inline void
++uap_create_thread(int (*uapfunc) (void *), uap_thread * thr, char *name)
++{
++ thr->task = kthread_run(uapfunc, thr, "%s", name);
++}
++
++static inline int
++uap_terminate_thread(uap_thread * thr)
++{
++ /* Check if the thread is active or not */
++ if (!thr->pid)
++ return -1;
++ kthread_stop(thr->task);
++ return 0;
++}
++
++/** Data structure for the Marvell uAP device */
++typedef struct _uap_dev
++{
++ /** device name */
++ char name[DEV_NAME_LEN];
++ /** card pointer */
++ void *card;
++ /** IO port */
++ u32 ioport;
++ /** Rx unit */
++ u8 rx_unit;
++ /** Data sent:
++ TRUE - Data is sent to fw, no Tx Done received
++ FALSE - Tx done received for previous Tx */
++ BOOLEAN data_sent;
++ /** CMD sent:
++ TRUE - CMD is sent to fw, no CMD Done received
++ FALSE - CMD done received for previous CMD */
++ BOOLEAN cmd_sent;
++ /** netdev pointer */
++ struct net_device *netdev;
++} uap_dev_t, *puap_dev_t;
++
++/** Private structure for the MV device */
++struct _uap_private
++{
++ /** Device open */
++ int open;
++
++ /** Device adapter structure */
++ uap_adapter *adapter;
++ /** Device structure */
++ uap_dev_t uap_dev;
++
++ /** Net device statistics structure */
++ struct net_device_stats stats;
++
++ /** Number of Tx timeouts */
++ u32 num_tx_timeout;
++
++ /** Media connection status */
++ BOOLEAN MediaConnected;
++
++#ifdef CONFIG_PROC_FS
++ struct proc_dir_entry *proc_uap;
++ struct proc_dir_entry *proc_entry;
++#endif /* CONFIG_PROC_FS */
++
++ /** Firmware helper */
++ const struct firmware *fw_helper;
++ /** Firmware */
++ const struct firmware *firmware;
++ /** Hotplug device */
++ struct device *hotplug_device;
++ /** thread to service interrupts */
++ uap_thread MainThread;
++ /** Driver lock */
++ spinlock_t driver_lock;
++ /** Driver lock flags */
++ ulong driver_flags;
++
++};
++
++/** PS_CMD_ConfirmSleep */
++typedef struct _PS_CMD_ConfirmSleep
++{
++ /** SDIO Length */
++ u16 SDLen;
++ /** SDIO Type */
++ u16 SDType;
++ /** Command */
++ u16 Command;
++ /** Size */
++ u16 Size;
++ /** Sequence number */
++ u16 SeqNum;
++ /** Result */
++ u16 Result;
++} __ATTRIB_PACK__ PS_CMD_ConfirmSleep, *PPS_CMD_ConfirmSleep;
++
++/** Wlan Adapter data structure*/
++struct _uap_adapter
++{
++ /** Power save confirm sleep command */
++ PS_CMD_ConfirmSleep PSConfirmSleep;
++ /** Device status */
++ HARDWARE_STATUS HardwareStatus;
++ /** Interrupt counter */
++ u32 IntCounter;
++ /** Tx packet queue */
++ struct sk_buff_head tx_queue;
++ /** Cmd packet queue */
++ struct sk_buff_head cmd_queue;
++ /** Command sequence number */
++ u16 SeqNum;
++ /** Command buffer */
++ u8 *CmdBuf;
++ /** cmd pending flag */
++ u8 cmd_pending;
++ /** cmd wait option */
++ u8 cmd_wait_option;
++ /** Command buffer length */
++ u32 CmdSize;
++ /** Command wait queue */
++ wait_queue_head_t cmdwait_q __ATTRIB_ALIGN__;
++ /** Command wait queue state flag */
++ u8 CmdWaitQWoken;
++ /** PnP support */
++ BOOLEAN SurpriseRemoved;
++ /** Debug */
++ uap_dbg dbg;
++ /** Netlink kernel socket */
++ struct sock *nl_sk;
++ /** Semaphore for CMD */
++ SEMAPHORE CmdSem;
++ /** Power Save mode */
++ u8 psmode;
++ /** Power Save state */
++ u8 ps_state;
++ /** Number of wakeup tries */
++ u32 WakeupTries;
++};
++
++static inline int
++os_upload_rx_packet(uap_private * priv, struct sk_buff *skb)
++{
++ skb->dev = priv->uap_dev.netdev;
++ skb->protocol = eth_type_trans(skb, priv->uap_dev.netdev);
++ skb->ip_summed = CHECKSUM_UNNECESSARY;
++ if (in_interrupt())
++ netif_rx(skb);
++ else
++ netif_rx_ni(skb);
++ return 0;
++}
++
++/*
++ * netif carrier_on/off and start(wake)/stop_queue handling
++ */
++static inline void
++os_carrier_on(uap_private * priv)
++{
++ if (!netif_carrier_ok(priv->uap_dev.netdev) &&
++ (priv->MediaConnected == TRUE)) {
++ netif_carrier_on(priv->uap_dev.netdev);
++ }
++}
++
++static inline void
++os_carrier_off(uap_private * priv)
++{
++ if (netif_carrier_ok(priv->uap_dev.netdev)) {
++ netif_carrier_off(priv->uap_dev.netdev);
++ }
++}
++
++static inline void
++os_start_queue(uap_private * priv)
++{
++ if (netif_queue_stopped(priv->uap_dev.netdev) &&
++ (priv->MediaConnected == TRUE)) {
++ netif_wake_queue(priv->uap_dev.netdev);
++ }
++}
++
++static inline void
++os_stop_queue(uap_private * priv)
++{
++ if (!netif_queue_stopped(priv->uap_dev.netdev)) {
++ netif_stop_queue(priv->uap_dev.netdev);
++ }
++}
++
++/** Interface specific header */
++#define INTF_HEADER_LEN 4
++
++/** headroom alignment for tx packet */
++#define HEADER_ALIGNMENT 8
++
++/** The number of times to try when polling for status bits */
++#define MAX_POLL_TRIES 100
++
++/** Length of SNAP header */
++#define MRVDRV_SNAP_HEADER_LEN 8
++
++/** Extra length of Tx packet buffer */
++#define EXTRA_LEN 36
++
++/** Buffer size for ethernet Tx packets */
++#define MRVDRV_ETH_TX_PACKET_BUFFER_SIZE \
++ (ETH_FRAME_LEN + sizeof(TxPD) + EXTRA_LEN)
++
++/** Buffer size for ethernet Rx packets */
++#define MRVDRV_ETH_RX_PACKET_BUFFER_SIZE \
++ (ETH_FRAME_LEN + sizeof(RxPD) \
++ + MRVDRV_SNAP_HEADER_LEN + EXTRA_LEN)
++
++/** Packet type: data, command & event */
++typedef enum _mv_type
++{
++ MV_TYPE_DAT = 0,
++ MV_TYPE_CMD = 1,
++ MV_TYPE_EVENT = 3
++} mv_type;
++
++/** Disable interrupt */
++#define OS_INT_DISABLE spin_lock_irqsave(&priv->driver_lock, priv->driver_flags)
++/** Enable interrupt */
++#define OS_INT_RESTORE spin_unlock_irqrestore(&priv->driver_lock, priv->driver_flags)
++
++int uap_process_rx_packet(uap_private * priv, struct sk_buff *skb);
++void uap_interrupt(uap_private * priv);
++uap_private *uap_add_card(void *card);
++int uap_remove_card(void *card);
++int uap_process_event(uap_private * priv, u8 * payload, uint len);
++int uap_soft_reset(uap_private * priv);
++int uap_process_sleep_confirm_resp(uap_private * priv, u8 * resp, int resp_len);
++
++#ifdef CONFIG_PROC_FS
++/** The proc fs interface */
++void uap_proc_entry(uap_private * priv, struct net_device *dev);
++void uap_proc_remove(uap_private * priv);
++int string_to_number(char *s);
++void uap_debug_entry(uap_private * priv, struct net_device *dev);
++void uap_debug_remove(uap_private * priv);
++#endif /* CONFIG_PROC_FS */
++
++int sbi_register(void);
++
++void sbi_unregister(void);
++int sbi_register_dev(uap_private * priv);
++int sbi_unregister_dev(uap_private * priv);
++int sbi_prog_fw_w_helper(uap_private *);
++
++int sbi_host_to_card(uap_private * priv, u8 * payload, u16 nb);
++int sbi_enable_host_int(uap_private * priv);
++int sbi_disable_host_int(uap_private * priv);
++
++int sbi_get_int_status(uap_private * priv, u8 * ireg);
++/** Check firmware status */
++int sbi_check_fw_status(uap_private *, int);
++int sbi_prog_helper(uap_private *);
++
++int sbi_wakeup_firmware(uap_private * priv);
++
++#endif /* _UAP_DRV_H */
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/libertas_uap/uap_fw.h backports-3.18.1-1/drivers/net/wireless/libertas_uap/uap_fw.h
+--- backports-3.18.1-1.org/drivers/net/wireless/libertas_uap/uap_fw.h 1970-01-01 01:00:00.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/libertas_uap/uap_fw.h 2014-12-29 20:37:43.949097590 +0100
+@@ -0,0 +1,359 @@
++/** @file uap_fw.h
++ *
++ * @brief This file contains firmware specific defines.
++ *
++ * Copyright (C) 2008-2009, Marvell International Ltd.
++ *
++ * This software file (the "File") is distributed by Marvell International
++ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
++ * (the "License"). You may use, redistribute and/or modify this File in
++ * accordance with the terms and conditions of the License, a copy of which
++ * is available along with the File in the gpl.txt file or by writing to
++ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ * 02111-1307 or on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
++ *
++ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
++ * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
++ * this warranty disclaimer.
++ *
++ */
++/********************************************************
++Change log:
++ 02/26/08: Initial creation
++********************************************************/
++
++#ifndef _UAP_FW_H
++#define _UAP_FW_H
++
++/** uap upload size */
++#define UAP_UPLD_SIZE 2312
++/** Packet type Micro AP */
++#define PKT_TYPE_MICROAP 1
++/** Packet type client */
++#define PKT_TYPE_CLIENT 0
++
++/** TxPD descriptor */
++typedef struct _TxPD
++{
++ /** Bss Type */
++ u8 BssType;
++ /** Bss num */
++ u8 BssNum;
++ /** Tx packet length */
++ u16 TxPktLength;
++ /** Tx packet offset */
++ u16 TxPktOffset;
++ /** Tx packet type */
++ u16 TxPktType;
++ /** Tx Control */
++ u32 TxControl;
++ /** reserved */
++ u32 reserved[2];
++} __ATTRIB_PACK__ TxPD, *PTxPD;
++
++/** RxPD Descriptor */
++typedef struct _RxPD
++{
++ /** Bss Type */
++ u8 BssType;
++ /** Bss Num */
++ u8 BssNum;
++ /** Tx packet length */
++ u16 RxPktLength;
++ /** Tx packet offset */
++ u16 RxPktOffset;
++} __ATTRIB_PACK__ RxPD, *PRxPD;
++
++#ifdef BIG_ENDIAN
++/** Convert from 16 bit little endian format to CPU format */
++#define uap_le16_to_cpu(x) le16_to_cpu(x)
++/** Convert from 32 bit little endian format to CPU format */
++#define uap_le32_to_cpu(x) le32_to_cpu(x)
++/** Convert from 64 bit little endian format to CPU format */
++#define uap_le64_to_cpu(x) le64_to_cpu(x)
++/** Convert to 16 bit little endian format from CPU format */
++#define uap_cpu_to_le16(x) cpu_to_le16(x)
++/** Convert to 32 bit little endian format from CPU format */
++#define uap_cpu_to_le32(x) cpu_to_le32(x)
++/** Convert to 64 bit little endian format from CPU format */
++#define uap_cpu_to_le64(x) cpu_to_le64(x)
++
++/** Convert TxPD to little endian format from CPU format */
++#define endian_convert_TxPD(x); \
++ { \
++ (x)->TxPktLength = uap_cpu_to_le16((x)->TxPktLength); \
++ (x)->TxPktOffset = uap_cpu_to_le32((x)->TxPktOffset); \
++ (x)->TxControl = uap_cpu_to_le32((x)->TxControl); \
++ (x)->TxPktType = uap_cpu_to_le32((x)->TxPktType); \
++ }
++
++/** Convert RxPD from little endian format to CPU format */
++#define endian_convert_RxPD(x); \
++ { \
++ (x)->RxPktLength = uap_le16_to_cpu((x)->RxPktLength); \
++ (x)->RxPktOffset = uap_le32_to_cpu((x)->RxPktOffset); \
++ }
++#else /* BIG_ENDIAN */
++/** Do nothing */
++#define uap_le16_to_cpu(x) x
++/** Do nothing */
++#define uap_le32_to_cpu(x) x
++/** Do nothing */
++#define uap_le64_to_cpu(x) x
++/** Do nothing */
++#define uap_cpu_to_le16(x) x
++/** Do nothing */
++#define uap_cpu_to_le32(x) x
++/** Do nothing */
++#define uap_cpu_to_le64(x) x
++
++/** Do nothing */
++#define endian_convert_TxPD(x)
++/** Do nothing */
++#define endian_convert_RxPD(x)
++#endif /* BIG_ENDIAN */
++
++/** Host Command ID : Function initialization */
++#define HostCmd_CMD_FUNC_INIT 0x00a9
++/** Host Command ID : Function shutdown */
++#define HostCmd_CMD_FUNC_SHUTDOWN 0x00aa
++
++/** Host Command id: SYS_INFO */
++#define HOST_CMD_APCMD_SYS_INFO 0x00ae
++/** Host Command id: SYS_RESET */
++#define HOST_CMD_APCMD_SYS_RESET 0x00af
++/** Host Command id: SYS_CONFIGURE */
++#define HOST_CMD_APCMD_SYS_CONFIGURE 0x00b0
++/** Host Command id: BSS_START */
++#define HOST_CMD_APCMD_BSS_START 0x00b1
++/** Host Command id: SYS_STOP */
++#define HOST_CMD_APCMD_BSS_STOP 0x00b2
++/** Host Command id: STA_LIST */
++#define HOST_CMD_APCMD_STA_LIST 0x00b3
++/** Host Command id: STA_FILTER_TABLE */
++#define HOST_CMD_APCMD_STA_FILTER_TABLE 0x00b4
++/** Host Command id: STA_DEAUTH */
++#define HOST_CMD_APCMD_STA_DEAUTH 0x00b5
++/** Host Command id: SOFT_RESET */
++#define HOST_CMD_APCMD_SOFT_RESET 0x00d5
++/** Host Command id: POWER_MGMT_EXT */
++#define HOST_CMD_POWER_MGMT_EXT 0x00ef
++/** Host Command id: SLEEP_CONFIRM*/
++#define HOST_CMD_SLEEP_CONFIRM 0x00d8
++
++/** TLV type : SSID */
++#define TLV_TYPE_SSID 0x0000
++/** TLV type : Rates */
++#define TLV_TYPE_RATES 0x0001
++/** TLV type : PHY DS */
++#define TLV_TYPE_PHY_DS 0x0003
++
++/** TLV Id : Base id */
++#define PROPRIETARY_TLV_BASE_ID 0x0100
++/** TLV Id : AP_MAC_ADDRESS */
++#define MRVL_AP_MAC_ADDRESS_TLV_ID (PROPRIETARY_TLV_BASE_ID + 43)
++/** TLV Id : Beacon period */
++#define MRVL_BEACON_PERIOD_TLV_ID (PROPRIETARY_TLV_BASE_ID + 44)
++/** TLV Id : Dtim period */
++#define MRVL_DTIM_PERIOD_TLV_ID (PROPRIETARY_TLV_BASE_ID + 45)
++/** TLV Id : Basic rates */
++#define MRVL_BASIC_RATES_TLV_ID (PROPRIETARY_TLV_BASE_ID + 46)
++/** TLV Id : Tx Power */
++#define MRVL_TX_POWER_TLV_ID (PROPRIETARY_TLV_BASE_ID + 47)
++/** TLV Id : Broadcast SSID control */
++#define MRVL_BCAST_SSID_CTL_TLV_ID (PROPRIETARY_TLV_BASE_ID + 48)
++/** TLV Id : Preamble control */
++#define MRVL_PREAMBLE_CTL_TLV_ID (PROPRIETARY_TLV_BASE_ID + 49)
++/** TLV Id : Antenna control */
++#define MRVL_ANTENNA_CTL_TLV_ID (PROPRIETARY_TLV_BASE_ID + 50)
++/** TLV Id : RTS threshold */
++#define MRVL_RTS_THRESHOLD_TLV_ID (PROPRIETARY_TLV_BASE_ID + 51)
++/** TLV Id : Radio control */
++#define MRVL_RADIO_CTL_TLV_ID (PROPRIETARY_TLV_BASE_ID + 52)
++/** TLV Id : TX data rate */
++#define MRVL_TX_DATA_RATE_TLV_ID (PROPRIETARY_TLV_BASE_ID + 53)
++/** TLV Id : Packet forward control */
++#define MRVL_PKT_FWD_CTL_TLV_ID (PROPRIETARY_TLV_BASE_ID + 54)
++/** TLV Id : STA info */
++#define MRVL_STA_INFO_TLV_ID (PROPRIETARY_TLV_BASE_ID + 55)
++/** TLV Id : STA MAC address filter */
++#define MRVL_STA_MAC_ADDR_FILTER_TLV_ID (PROPRIETARY_TLV_BASE_ID + 56)
++/** TLV Id : STA ageout timer */
++#define MRVL_STA_AGEOUT_TIMER_TLV_ID (PROPRIETARY_TLV_BASE_ID + 57)
++/** TLV Id : Security config */
++#define MRVL_SECURITY_CFG_TLV_ID (PROPRIETARY_TLV_BASE_ID + 58)
++/** TLV Id : WEP KEY */
++#define MRVL_WEP_KEY_TLV_ID (PROPRIETARY_TLV_BASE_ID + 59)
++/** TLV Id : WPA Passphrase */
++#define MRVL_WPA_PASSPHRASE_TLV_ID (PROPRIETARY_TLV_BASE_ID + 60)
++
++/** Action get */
++#define ACTION_GET 0
++/** Action set */
++#define ACTION_SET 1
++/** Length of ethernet address */
++#ifndef ETH_ALEN
++#define ETH_ALEN 6
++#endif
++
++/** HostCmd_DS_GEN */
++typedef struct
++{
++ /** Command */
++ u16 Command;
++ /** Size */
++ u16 Size;
++ /** Sequence number */
++ u16 SeqNum;
++ /** Result */
++ u16 Result;
++} __ATTRIB_PACK__ HostCmd_DS_GEN;
++
++/** Size of HostCmd_DS_GEN */
++#define S_DS_GEN sizeof(HostCmd_DS_GEN)
++
++/** _HostCmd_HEADER*/
++typedef struct
++{
++ /** Command Header : Command */
++ u16 Command;
++ /** Command Header : Size */
++ u16 Size;
++} __ATTRIB_PACK__ HostCmd_HEADER;
++
++/** HostCmd_SYS_CONFIG */
++typedef struct _HostCmd_SYS_CONFIG
++{
++ /** CMD Action GET/SET*/
++ u16 Action;
++ /** Tlv buffer */
++ u8 TlvBuffer[0];
++} __ATTRIB_PACK__ HostCmd_SYS_CONFIG;
++
++/** HostCmd_DS_POWER_MGMT_EXT */
++typedef struct _HostCmd_DS_POWER_MGMT_EXT
++{
++ /** CMD Action Get/Set*/
++ u16 action;
++ /** power mode */
++ u16 power_mode;
++} __ATTRIB_PACK__ HostCmd_DS_POWER_MGMT_EXT;
++
++/** _HostCmd_DS_COMMAND*/
++typedef struct _HostCmd_DS_COMMAND
++{
++
++ /** Command Header : Command */
++ u16 Command;
++ /** Command Header : Size */
++ u16 Size;
++ /** Command Header : Sequence number */
++ u16 SeqNum;
++ /** Command Header : Result */
++ u16 Result;
++ /** Command Body */
++ union
++ {
++ HostCmd_SYS_CONFIG sys_config;
++ HostCmd_DS_POWER_MGMT_EXT pm_cfg;
++
++ } params;
++} __ATTRIB_PACK__ HostCmd_DS_COMMAND;
++
++/** MrvlIEtypesHeader_*/
++typedef struct _MrvlIEtypesHeader
++{
++ /** Header type */
++ u16 Type;
++ /** Header length */
++ u16 Len;
++} __ATTRIB_PACK__ MrvlIEtypesHeader_t;
++
++/** MrvlIEtypes_Data_t */
++typedef struct _MrvlIEtypes_Data_t
++{
++ /** Header */
++ MrvlIEtypesHeader_t Header;
++ /** Data */
++ u8 Data[1];
++} __ATTRIB_PACK__ MrvlIEtypes_Data_t;
++
++/** MrvlIEtypes_ChanListParamSet_t */
++typedef struct _MrvlIEtypes_MacAddr_t
++{
++ /** Header */
++ MrvlIEtypesHeader_t Header;
++ /** AP MAC address */
++ u8 ApMacAddr[ETH_ALEN];
++} __ATTRIB_PACK__ MrvlIEtypes_MacAddr_t;
++
++/** Event ID: BSS started */
++#define MICRO_AP_EV_ID_BSS_START 46
++
++/** Event ID: BSS idle event */
++#define MICRO_AP_EV_BSS_IDLE 67
++
++/** Event ID: BSS active event */
++#define MICRO_AP_EV_BSS_ACTIVE 68
++
++/** Event ID: PS_AWAKE */
++#define EVENT_PS_AWAKE 0x0a
++
++/** Event ID: PS_SLEEP */
++#define EVENT_PS_SLEEP 0x0b
++
++/** PS_STATE */
++typedef enum _PS_STATE
++{
++ PS_STATE_AWAKE,
++ PS_STATE_PRE_SLEEP,
++ PS_STATE_SLEEP
++} PS_STATE;
++
++/** TLV type: AP Sleep param */
++#define TLV_TYPE_AP_SLEEP_PARAM (PROPRIETARY_TLV_BASE_ID + 106)
++/** TLV type: AP Inactivity Sleep param */
++#define TLV_TYPE_AP_INACT_SLEEP_PARAM (PROPRIETARY_TLV_BASE_ID + 107)
++
++/** MrvlIEtypes_sleep_param_t */
++typedef struct _MrvlIEtypes_sleep_param_t
++{
++ /** Header */
++ MrvlIEtypesHeader_t header;
++ /** control bitmap */
++ u32 ctrl_bitmap;
++ /** min_sleep */
++ u32 min_sleep;
++ /** max_sleep */
++ u32 max_sleep;
++} __ATTRIB_PACK__ MrvlIEtypes_sleep_param_t;
++
++/** MrvlIEtypes_inact_sleep_param_t */
++typedef struct _MrvlIEtypes_inact_sleep_param_t
++{
++ /** Header */
++ MrvlIEtypesHeader_t header;
++ /** inactivity timeout */
++ u32 inactivity_to;
++ /** min_awake */
++ u32 min_awake;
++ /** max_awake */
++ u32 max_awake;
++} __ATTRIB_PACK__ MrvlIEtypes_inact_sleep_param_t;
++
++/** AP_Event */
++typedef struct _AP_Event
++{
++ /** Event ID */
++ u32 EventId;
++ /*
++ * Reserved for STA_ASSOCIATED event and contains
++ * status information for the MIC_COUNTERMEASURES event.
++ */
++ /** Reserved/status */
++ u16 status;
++ /** AP MAC address */
++ u8 MacAddr[ETH_ALEN];
++} __ATTRIB_PACK__ AP_Event;
++#endif /* _UAP_FW_H */
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/libertas_uap/uap_headers.h backports-3.18.1-1/drivers/net/wireless/libertas_uap/uap_headers.h
+--- backports-3.18.1-1.org/drivers/net/wireless/libertas_uap/uap_headers.h 1970-01-01 01:00:00.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/libertas_uap/uap_headers.h 2014-12-29 20:37:43.949097590 +0100
+@@ -0,0 +1,64 @@
++/** @file uap_headers.h
++ *
++ * @brief This file contains all the necessary include file.
++ *
++ * Copyright (C) 2008-2009, Marvell International Ltd.
++ *
++ * This software file (the "File") is distributed by Marvell International
++ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
++ * (the "License"). You may use, redistribute and/or modify this File in
++ * accordance with the terms and conditions of the License, a copy of which
++ * is available along with the File in the gpl.txt file or by writing to
++ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ * 02111-1307 or on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
++ *
++ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
++ * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
++ * this warranty disclaimer.
++ *
++ */
++#ifndef _UAP_HEADERS_H
++#define _UAP_HEADERS_H
++
++/* Linux header files */
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/version.h>
++#include <linux/param.h>
++#include <linux/types.h>
++#include <linux/interrupt.h>
++#include <linux/proc_fs.h>
++#include <linux/kthread.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
++#include <linux/semaphore.h>
++#else
++#include <asm/semaphore.h>
++#endif
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
++#include <linux/config.h>
++#endif
++
++/* Net header files */
++#include <linux/netdevice.h>
++#include <linux/net.h>
++#include <linux/skbuff.h>
++#include <linux/if_ether.h>
++#include <linux/etherdevice.h>
++#include <net/sock.h>
++#include <linux/netlink.h>
++#include <linux/firmware.h>
++#include <linux/delay.h>
++
++#include "uap_drv.h"
++#include "uap_fw.h"
++
++#include <linux/mmc/sdio.h>
++#include <linux/mmc/sdio_ids.h>
++#include <linux/mmc/sdio_func.h>
++#include <linux/mmc/card.h>
++#include "uap_sdio_mmc.h"
++
++#endif /* _UAP_HEADERS_H */
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/libertas_uap/uap_main.c backports-3.18.1-1/drivers/net/wireless/libertas_uap/uap_main.c
+--- backports-3.18.1-1.org/drivers/net/wireless/libertas_uap/uap_main.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/libertas_uap/uap_main.c 2014-12-29 20:37:43.952431125 +0100
+@@ -0,0 +1,1817 @@
++/** @file uap_main.c
++ * @brief This file contains the major functions in uAP
++ * driver. It includes init, exit etc..
++ * This file also contains the initialization for SW,
++ * FW and HW
++ *
++ * Copyright (C) 2008-2009, Marvell International Ltd.
++ *
++ * This software file (the "File") is distributed by Marvell International
++ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
++ * (the "License"). You may use, redistribute and/or modify this File in
++ * accordance with the terms and conditions of the License, a copy of which
++ * is available along with the File in the gpl.txt file or by writing to
++ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ * 02111-1307 or on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
++ *
++ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
++ * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
++ * this warranty disclaimer.
++ *
++ */
++/**
++ * @mainpage uAP Linux Driver
++ *
++ * @section overview_sec Overview
++ *
++ * This is Linux reference driver for Marvell uAP.
++ *
++ * @section copyright_sec Copyright
++ *
++ * Copyright (C) 2008, Marvell International Ltd.
++ *
++ */
++
++#include "uap_headers.h"
++
++/**
++ * the global variable of a pointer to uap_private
++ * structure variable
++ */
++uap_private *uappriv = NULL;
++#ifdef DEBUG_LEVEL1
++#define DEFAULT_DEBUG_MASK (DBG_MSG | DBG_FATAL | DBG_ERROR)
++u32 drvdbg = DEFAULT_DEBUG_MASK;
++#endif
++/** Helper name */
++char *helper_name = NULL;
++/** Firmware name */
++char *fw_name = NULL;
++
++/** Semaphore for add/remove card */
++SEMAPHORE AddRemoveCardSem;
++
++/********************************************************
++ Local Functions
++********************************************************/
++/**
++ * @brief This function send sleep confirm command to firmware
++ *
++ * @param priv A pointer to uap_private structure
++ * @return UAP_STATUS_SUCCESS for success otherwise UAP_STATUS_FAILURE
++ */
++static int
++uap_dnld_sleep_confirm_cmd(uap_private * priv)
++{
++ uap_adapter *Adapter = priv->adapter;
++ int ret = UAP_STATUS_SUCCESS;
++ ENTER();
++ PRINTM(CMND, "Sleep confirm\n");
++ Adapter->cmd_pending = TRUE;
++ Adapter->cmd_wait_option = HostCmd_OPTION_WAITFORRSP_SLEEPCONFIRM;
++ ret =
++ sbi_host_to_card(priv, (u8 *) & Adapter->PSConfirmSleep,
++ sizeof(PS_CMD_ConfirmSleep));
++ if (ret != UAP_STATUS_SUCCESS) {
++ Adapter->ps_state = PS_STATE_AWAKE;
++ Adapter->cmd_pending = FALSE;
++ Adapter->cmd_wait_option = FALSE;
++ }
++ LEAVE();
++ return ret;
++}
++
++/**
++ * @brief This function process sleep confirm resp from firmware
++ *
++ * @param priv A pointer to uap_private structure
++ * @param resp A pointer to resp buf
++ * @param resp_len resp buf len
++ * @return UAP_STATUS_SUCCESS for success otherwise UAP_STATUS_FAILURE
++ */
++int
++uap_process_sleep_confirm_resp(uap_private * priv, u8 * resp, int resp_len)
++{
++ int ret = UAP_STATUS_SUCCESS;
++ HostCmd_DS_COMMAND *cmd;
++ uap_adapter *Adapter = priv->adapter;
++ ENTER();
++ PRINTM(CMND, "Sleep confirm resp\n");
++ if (!resp_len) {
++ PRINTM(ERROR, "Cmd Size is 0\n");
++ ret = -EFAULT;
++ goto done;
++ }
++ cmd = (HostCmd_DS_COMMAND *) resp;
++ cmd->Result = uap_le16_to_cpu(cmd->Result);
++ if (cmd->Result != UAP_STATUS_SUCCESS) {
++ PRINTM(ERROR, "HOST_CMD_APCMD_PS_SLEEP_CONFIRM fail=%x\n", cmd->Result);
++ ret = -EFAULT;
++ }
++ done:
++ if (ret == UAP_STATUS_SUCCESS)
++ Adapter->ps_state = PS_STATE_SLEEP;
++ else
++ Adapter->ps_state = PS_STATE_AWAKE;
++ LEAVE();
++ return ret;
++}
++
++/**
++ * @brief This function checks condition and prepares to
++ * send sleep confirm command to firmware if OK.
++ *
++ * @param priv A pointer to uap_private structure
++ * @return n/a
++ */
++static void
++uap_ps_cond_check(uap_private * priv)
++{
++ uap_adapter *Adapter = priv->adapter;
++
++ ENTER();
++ if (!priv->uap_dev.cmd_sent &&
++ !Adapter->cmd_pending && !Adapter->IntCounter) {
++ uap_dnld_sleep_confirm_cmd(priv);
++ } else {
++ PRINTM(INFO, "Delay Sleep Confirm (%s%s%s)\n",
++ (priv->uap_dev.cmd_sent) ? "D" : "",
++ (Adapter->cmd_pending) ? "C" : "",
++ (Adapter->IntCounter) ? "I" : "");
++ }
++ LEAVE();
++}
++
++/**
++ * @brief This function add cmd to cmdQ and waiting for response
++ *
++ * @param priv A pointer to uap_private structure
++ * @param skb A pointer to the skb for process
++ * @param wait_option Wait option
++ * @return UAP_STATUS_SUCCESS for success otherwise UAP_STATUS_FAILURE
++ */
++static int
++uap_process_cmd(uap_private * priv, struct sk_buff *skb, u8 wait_option)
++{
++ uap_adapter *Adapter = priv->adapter;
++ int ret = UAP_STATUS_SUCCESS;
++ HostCmd_DS_COMMAND *cmd;
++ u8 *headptr;
++ ENTER();
++ if (Adapter->HardwareStatus != HWReady) {
++ PRINTM(ERROR, "Hw not ready, uap_process_cmd\n");
++ kfree(skb);
++ LEAVE();
++ return -EFAULT;
++ }
++ skb->cb[0] = wait_option;
++ headptr = skb->data;
++ *(u16 *) & headptr[0] = uap_cpu_to_le16(skb->len);
++ *(u16 *) & headptr[2] = uap_cpu_to_le16(MV_TYPE_CMD);
++ cmd = (HostCmd_DS_COMMAND *) (skb->data + INTF_HEADER_LEN);
++ Adapter->SeqNum++;
++ cmd->SeqNum = uap_cpu_to_le16(Adapter->SeqNum);
++ PRINTM(CMND, "process_cmd: %x\n", cmd->Command);
++ DBG_HEXDUMP(CMD_D, "process_cmd", (u8 *) cmd, cmd->Size);
++ if (!wait_option) {
++ skb_queue_tail(&priv->adapter->cmd_queue, skb);
++ wake_up_interruptible(&priv->MainThread.waitQ);
++ LEAVE();
++ return ret;
++ }
++ if (OS_ACQ_SEMAPHORE_BLOCK(&Adapter->CmdSem)) {
++ PRINTM(ERROR, "Acquire semaphore error, uap_prepare_cmd\n");
++ kfree(skb);
++ LEAVE();
++ return -EBUSY;
++ }
++ skb_queue_tail(&priv->adapter->cmd_queue, skb);
++ Adapter->CmdWaitQWoken = FALSE;
++ wake_up_interruptible(&priv->MainThread.waitQ);
++ /* Sleep until response is generated by FW */
++ if (wait_option == HostCmd_OPTION_WAITFORRSP_TIMEOUT) {
++ if (!os_wait_interruptible_timeout
++ (Adapter->cmdwait_q, Adapter->CmdWaitQWoken, MRVDRV_TIMER_20S)) {
++ PRINTM(ERROR, "Cmd timeout\n");
++ Adapter->cmd_pending = FALSE;
++ ret = -EFAULT;
++ }
++ } else
++ wait_event_interruptible(Adapter->cmdwait_q, Adapter->CmdWaitQWoken);
++ OS_REL_SEMAPHORE(&Adapter->CmdSem);
++ LEAVE();
++ return ret;
++}
++
++/**
++ * @brief Inspect the response buffer for pointers to expected TLVs
++ *
++ *
++ * @param pTlv Pointer to the start of the TLV buffer to parse
++ * @param tlvBufSize Size of the TLV buffer
++ * @param reqTlvType request tlv's tlvtype
++ * @param ppTlv Output parameter: Pointer to the request TLV if found
++ *
++ * @return void
++ */
++static void
++uap_get_tlv_ptrs(MrvlIEtypes_Data_t * pTlv, int tlvBufSize,
++ u16 reqTlvType, MrvlIEtypes_Data_t ** ppTlv)
++{
++ MrvlIEtypes_Data_t *pCurrentTlv;
++ int tlvBufLeft;
++ u16 tlvType;
++ u16 tlvLen;
++
++ ENTER();
++ pCurrentTlv = pTlv;
++ tlvBufLeft = tlvBufSize;
++ *ppTlv = NULL;
++ PRINTM(INFO, "uap_get_tlv: tlvBufSize = %d, reqTlvType=%x\n", tlvBufSize,
++ reqTlvType);
++ while (tlvBufLeft >= sizeof(MrvlIEtypesHeader_t)) {
++ tlvType = uap_le16_to_cpu(pCurrentTlv->Header.Type);
++ tlvLen = uap_le16_to_cpu(pCurrentTlv->Header.Len);
++ if (reqTlvType == tlvType)
++ *ppTlv = (MrvlIEtypes_Data_t *) pCurrentTlv;
++ if (*ppTlv) {
++ HEXDUMP("TLV Buf", (u8 *) * ppTlv, tlvLen);
++ break;
++ }
++ tlvBufLeft -= (sizeof(pTlv->Header) + tlvLen);
++ pCurrentTlv = (MrvlIEtypes_Data_t *) (pCurrentTlv->Data + tlvLen);
++ } /* while */
++ LEAVE();
++}
++
++/**
++ * @brief This function get mac
++ *
++ * @param priv A pointer to uap_private structure
++ * @return UAP_STATUS_SUCCESS on success, otherwise failure code
++ */
++static int
++uap_get_mac_address(uap_private * priv)
++{
++ int ret = UAP_STATUS_SUCCESS;
++ u32 CmdSize;
++ HostCmd_DS_COMMAND *cmd;
++ uap_adapter *Adapter = priv->adapter;
++ struct sk_buff *skb;
++ MrvlIEtypes_MacAddr_t *pMacAddrTlv;
++ MrvlIEtypes_Data_t *pTlv;
++ u16 tlvBufSize;
++ ENTER();
++ skb = dev_alloc_skb(MRVDRV_SIZE_OF_CMD_BUFFER);
++ if (!skb) {
++ PRINTM(ERROR, "No free skb\n");
++ ret = -ENOMEM;
++ goto done;
++ }
++ CmdSize =
++ S_DS_GEN + sizeof(HostCmd_SYS_CONFIG) + sizeof(MrvlIEtypes_MacAddr_t);
++ cmd = (HostCmd_DS_COMMAND *) (skb->data + INTF_HEADER_LEN);
++ cmd->Command = uap_cpu_to_le16(HOST_CMD_APCMD_SYS_CONFIGURE);
++ cmd->Size = uap_cpu_to_le16(CmdSize);
++ cmd->params.sys_config.Action = uap_cpu_to_le16(ACTION_GET);
++ pMacAddrTlv =
++ (MrvlIEtypes_MacAddr_t *) (skb->data + INTF_HEADER_LEN + S_DS_GEN +
++ sizeof(HostCmd_SYS_CONFIG));
++ pMacAddrTlv->Header.Type = uap_cpu_to_le16(MRVL_AP_MAC_ADDRESS_TLV_ID);
++ pMacAddrTlv->Header.Len = uap_cpu_to_le16(ETH_ALEN);
++ skb_put(skb, CmdSize + INTF_HEADER_LEN);
++ if (UAP_STATUS_SUCCESS !=
++ uap_process_cmd(priv, skb, HostCmd_OPTION_WAITFORRSP_TIMEOUT)) {
++ PRINTM(ERROR, "Fail to process cmd SYS_CONFIGURE Query\n");
++ ret = -EFAULT;
++ goto done;
++ }
++ if (!Adapter->CmdSize) {
++ PRINTM(ERROR, "Cmd Size is 0\n");
++ ret = -EFAULT;
++ goto done;
++ }
++ cmd = (HostCmd_DS_COMMAND *) Adapter->CmdBuf;
++ cmd->Result = uap_le16_to_cpu(cmd->Result);
++ if (cmd->Result != UAP_STATUS_SUCCESS) {
++ PRINTM(ERROR, "uap_get_mac_address fail=%x\n", cmd->Result);
++ ret = -EFAULT;
++ goto done;
++ }
++ pTlv =
++ (MrvlIEtypes_Data_t *) (Adapter->CmdBuf + S_DS_GEN +
++ sizeof(HostCmd_SYS_CONFIG));
++ tlvBufSize = Adapter->CmdSize - S_DS_GEN - sizeof(HostCmd_SYS_CONFIG);
++ uap_get_tlv_ptrs(pTlv, tlvBufSize, MRVL_AP_MAC_ADDRESS_TLV_ID,
++ (MrvlIEtypes_Data_t **) & pMacAddrTlv);
++ if (pMacAddrTlv) {
++ memcpy(priv->uap_dev.netdev->dev_addr, pMacAddrTlv->ApMacAddr,
++ ETH_ALEN);
++ HEXDUMP("Original MAC addr", priv->uap_dev.netdev->dev_addr, ETH_ALEN);
++ }
++ done:
++ LEAVE();
++ return ret;
++}
++
++/**
++ * @brief This function checks the conditions and sends packet to device
++ *
++ * @param priv A pointer to uap_private structure
++ * @param skb A pointer to the skb for process
++ * @return UAP_STATUS_SUCCESS or UAP_STATUS_FAILURE
++ */
++static int
++uap_process_tx(uap_private * priv, struct sk_buff *skb)
++{
++ uap_adapter *Adapter = priv->adapter;
++ int ret = UAP_STATUS_SUCCESS;
++ TxPD *pLocalTxPD;
++ u8 *headptr;
++ struct sk_buff *newskb;
++ int newheadlen;
++ ENTER();
++ ASSERT(skb);
++ if (!skb) {
++ LEAVE();
++ return UAP_STATUS_FAILURE;
++ }
++ if (skb_headroom(skb) < (sizeof(TxPD) + INTF_HEADER_LEN + HEADER_ALIGNMENT)) {
++ newheadlen = sizeof(TxPD) + INTF_HEADER_LEN + HEADER_ALIGNMENT;
++ PRINTM(WARN, "Tx: Insufficient skb headroom %d\n", skb_headroom(skb));
++ /* Insufficient skb headroom - allocate a new skb */
++ newskb = skb_realloc_headroom(skb, newheadlen);
++ if (unlikely(newskb == NULL)) {
++ PRINTM(ERROR, "Tx: Cannot allocate skb\n");
++ ret = UAP_STATUS_FAILURE;
++ goto done;
++ }
++ kfree_skb(skb);
++ skb = newskb;
++ PRINTM(INFO, "new skb headroom %d\n", skb_headroom(skb));
++ }
++ /* headptr should be aligned */
++ headptr = skb->data - sizeof(TxPD) - INTF_HEADER_LEN;
++ headptr = (u8 *) ((u32) headptr & ~((u32) (HEADER_ALIGNMENT - 1)));
++
++ pLocalTxPD = (TxPD *) (headptr + INTF_HEADER_LEN);
++ memset(pLocalTxPD, 0, sizeof(TxPD));
++ pLocalTxPD->BssType = PKT_TYPE_MICROAP;
++ pLocalTxPD->TxPktLength = skb->len;
++ /* offset of actual data */
++ pLocalTxPD->TxPktOffset = (long) skb->data - (long) pLocalTxPD;
++ endian_convert_TxPD(pLocalTxPD);
++ *(u16 *) & headptr[0] =
++ uap_cpu_to_le16(skb->len + ((long) skb->data - (long) headptr));
++ *(u16 *) & headptr[2] = uap_cpu_to_le16(MV_TYPE_DAT);
++ ret =
++ sbi_host_to_card(priv, headptr,
++ skb->len + ((long) skb->data - (long) headptr));
++ if (ret) {
++ PRINTM(ERROR, "uap_process_tx Error: sbi_host_to_card failed: 0x%X\n",
++ ret);
++ Adapter->dbg.num_tx_host_to_card_failure++;
++ goto done;
++ }
++ PRINTM(DATA, "Data => FW\n");
++ DBG_HEXDUMP(DAT_D, "Tx", headptr,
++ MIN(skb->len + sizeof(TxPD), DATA_DUMP_LEN));
++ done:
++ /* Freed skb */
++ kfree_skb(skb);
++ LEAVE();
++ return ret;
++}
++
++static struct netlink_kernel_cfg cfg = {
++ .groups = NL_MULTICAST_GROUP,
++};
++
++/**
++ * @brief This function initializes the adapter structure
++ * and set default value to the member of adapter.
++ *
++ * @param priv A pointer to uap_private structure
++ * @return UAP_STATUS_SUCCESS or UAP_STATUS_FAILURE
++ */
++static int
++uap_init_sw(uap_private * priv)
++{
++ uap_adapter *Adapter = priv->adapter;
++
++ ENTER();
++
++ if (!(Adapter->CmdBuf = kmalloc(MRVDRV_SIZE_OF_CMD_BUFFER, GFP_KERNEL))) {
++ PRINTM(INFO, "Failed to allocate command buffer!\n");
++ LEAVE();
++ return UAP_STATUS_FAILURE;
++ }
++
++ Adapter->cmd_pending = FALSE;
++ Adapter->CmdWaitQWoken = FALSE;
++ Adapter->ps_state = PS_STATE_AWAKE;
++ Adapter->WakeupTries = 0;
++
++ memset(&Adapter->PSConfirmSleep, 0, sizeof(PS_CMD_ConfirmSleep));
++ /** SDIO header */
++ Adapter->PSConfirmSleep.SDLen =
++ uap_cpu_to_le16(sizeof(PS_CMD_ConfirmSleep));
++ Adapter->PSConfirmSleep.SDType = uap_cpu_to_le16(MV_TYPE_CMD);
++ Adapter->PSConfirmSleep.SeqNum = 0;
++ Adapter->PSConfirmSleep.Command = uap_cpu_to_le16(HOST_CMD_SLEEP_CONFIRM);
++ Adapter->PSConfirmSleep.Size = uap_cpu_to_le16(sizeof(HostCmd_DS_GEN));
++ Adapter->PSConfirmSleep.Result = 0;
++
++ init_waitqueue_head(&Adapter->cmdwait_q);
++ OS_INIT_SEMAPHORE(&Adapter->CmdSem);
++
++ skb_queue_head_init(&Adapter->tx_queue);
++ skb_queue_head_init(&Adapter->cmd_queue);
++
++ /* Status variable */
++ Adapter->HardwareStatus = HWInitializing;
++
++ /* PnP support */
++ Adapter->SurpriseRemoved = FALSE;
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
++ Adapter->nl_sk = netlink_kernel_create(NETLINK_MARVELL,
++ NL_MULTICAST_GROUP, NULL,
++ THIS_MODULE);
++#else
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
++ Adapter->nl_sk = netlink_kernel_create(NETLINK_MARVELL,
++ NL_MULTICAST_GROUP, NULL, NULL,
++ THIS_MODULE);
++#else
++ Adapter->nl_sk = netlink_kernel_create(&init_net, NETLINK_MARVELL, &cfg);
++#endif
++#endif
++ if (!Adapter->nl_sk) {
++ PRINTM(ERROR,
++ "Could not initialize netlink event passing mechanism!\n");
++ }
++ LEAVE();
++ return UAP_STATUS_SUCCESS;
++}
++
++/**
++ * @brief This function sends FUNC_INIT command to firmware
++ *
++ * @param priv A pointer to uap_private structure
++ * @return UAP_STATUS_SUCCESS on success, otherwise failure code
++ */
++static int
++uap_func_init(uap_private * priv)
++{
++ int ret = UAP_STATUS_SUCCESS;
++ u32 CmdSize;
++ HostCmd_DS_GEN *cmd;
++ uap_adapter *Adapter = priv->adapter;
++ struct sk_buff *skb;
++ ENTER();
++ if (Adapter->HardwareStatus != HWReady) {
++ PRINTM(ERROR, "uap_func_init:Hardware is not ready!\n");
++ ret = -EFAULT;
++ goto done;
++ }
++ skb = dev_alloc_skb(MRVDRV_SIZE_OF_CMD_BUFFER);
++ if (!skb) {
++ PRINTM(ERROR, "No free skb\n");
++ ret = -ENOMEM;
++ goto done;
++ }
++ CmdSize = sizeof(HostCmd_DS_GEN);
++ cmd = (HostCmd_DS_GEN *) (skb->data + INTF_HEADER_LEN);
++ cmd->Command = uap_cpu_to_le16(HostCmd_CMD_FUNC_INIT);
++ cmd->Size = uap_cpu_to_le16(CmdSize);
++ skb_put(skb, CmdSize + INTF_HEADER_LEN);
++ PRINTM(CMND, "HostCmd_CMD_FUNC_INIT\n");
++ if (UAP_STATUS_SUCCESS !=
++ uap_process_cmd(priv, skb, HostCmd_OPTION_WAITFORRSP_TIMEOUT)) {
++ PRINTM(ERROR, "Fail to process cmd HostCmd_CMD_FUNC_INIT\n");
++ ret = -EFAULT;
++ goto done;
++ }
++ done:
++ LEAVE();
++ return ret;
++}
++
++/**
++ * @brief This function sends FUNC_SHUTDOWN command to firmware
++ *
++ * @param priv A pointer to uap_private structure
++ * @return UAP_STATUS_SUCCESS on success, otherwise failure code
++ */
++static int __exit
++uap_func_shutdown(uap_private * priv)
++{
++ int ret = UAP_STATUS_SUCCESS;
++ u32 CmdSize;
++ HostCmd_DS_GEN *cmd;
++ uap_adapter *Adapter = priv->adapter;
++ struct sk_buff *skb;
++ ENTER();
++ if (Adapter->HardwareStatus != HWReady) {
++ PRINTM(ERROR, "uap_func_shutdown:Hardware is not ready!\n");
++ ret = -EFAULT;
++ goto done;
++ }
++ skb = dev_alloc_skb(MRVDRV_SIZE_OF_CMD_BUFFER);
++ if (!skb) {
++ PRINTM(ERROR, "No free skb\n");
++ ret = -ENOMEM;
++ goto done;
++ }
++ CmdSize = sizeof(HostCmd_DS_GEN);
++ cmd = (HostCmd_DS_GEN *) (skb->data + INTF_HEADER_LEN);
++ cmd->Command = uap_cpu_to_le16(HostCmd_CMD_FUNC_SHUTDOWN);
++ cmd->Size = uap_cpu_to_le16(CmdSize);
++ skb_put(skb, CmdSize + INTF_HEADER_LEN);
++ PRINTM(CMND, "HostCmd_CMD_FUNC_SHUTDOWN\n");
++ if (UAP_STATUS_SUCCESS !=
++ uap_process_cmd(priv, skb, HostCmd_OPTION_WAITFORRSP_TIMEOUT)) {
++ PRINTM(ERROR, "Fail to process cmd HostCmd_CMD_FUNC_SHUTDOWN\n");
++ ret = -EFAULT;
++ goto done;
++ }
++ done:
++ LEAVE();
++ return ret;
++}
++
++/**
++ * @brief This function initializes firmware
++ *
++ * @param priv A pointer to uap_private structure
++ * @return UAP_STATUS_SUCCESS or UAP_STATUS_FAILURE
++ */
++static int
++uap_init_fw(uap_private * priv)
++{
++ int ret = UAP_STATUS_SUCCESS;
++ ENTER();
++ sbi_disable_host_int(priv);
++ /* Check if firmware is already running */
++ if (sbi_check_fw_status(priv, 1) == UAP_STATUS_SUCCESS) {
++ PRINTM(MSG, "UAP FW already running! Skip FW download\n");
++ } else {
++ if ((ret = request_firmware(&priv->fw_helper, helper_name,
++ priv->hotplug_device)) < 0) {
++ PRINTM(FATAL,
++ "request_firmware() failed (helper), error code = %#x\n",
++ ret);
++ goto done;
++ }
++
++ /* Download the helper */
++ ret = sbi_prog_helper(priv);
++
++ if (ret) {
++ PRINTM(FATAL,
++ "Bootloader in invalid state! Helper download failed!\n");
++ ret = UAP_STATUS_FAILURE;
++ goto done;
++ }
++ if ((ret = request_firmware(&priv->firmware, fw_name,
++ priv->hotplug_device)) < 0) {
++ PRINTM(FATAL, "request_firmware() failed, error code = %#x\n", ret);
++ goto done;
++ }
++
++ /* Download the main firmware via the helper firmware */
++ if (sbi_prog_fw_w_helper(priv)) {
++ PRINTM(FATAL, "UAP FW download failed!\n");
++ ret = UAP_STATUS_FAILURE;
++ goto done;
++ }
++ /* Check if the firmware is downloaded successfully or not */
++ if (sbi_check_fw_status(priv, MAX_FIRMWARE_POLL_TRIES) ==
++ UAP_STATUS_FAILURE) {
++ PRINTM(FATAL, "FW failed to be active in time!\n");
++ ret = UAP_STATUS_FAILURE;
++ goto done;
++ }
++ PRINTM(MSG, "UAP FW is active\n");
++ }
++ sbi_enable_host_int(priv);
++ priv->adapter->HardwareStatus = HWReady;
++ if (uap_func_init(priv) != UAP_STATUS_SUCCESS) {
++ ret = UAP_STATUS_FAILURE;
++ goto done;
++ }
++ done:
++ if (priv->fw_helper)
++ release_firmware(priv->fw_helper);
++ if (priv->firmware)
++ release_firmware(priv->firmware);
++ LEAVE();
++ return ret;
++
++}
++
++/**
++ * @brief This function frees the structure of adapter
++ *
++ * @param priv A pointer to uap_private structure
++ * @return n/a
++ */
++static void
++uap_free_adapter(uap_private * priv)
++{
++ uap_adapter *Adapter = priv->adapter;
++
++ ENTER();
++
++ if (Adapter) {
++ if ((Adapter->nl_sk) && ((Adapter->nl_sk)->sk_socket)) {
++ sock_release((Adapter->nl_sk)->sk_socket);
++ Adapter->nl_sk = NULL;
++ }
++ if (Adapter->CmdBuf)
++ kfree(Adapter->CmdBuf);
++ skb_queue_purge(&priv->adapter->tx_queue);
++ skb_queue_purge(&priv->adapter->cmd_queue);
++ /* Free the adapter object itself */
++ kfree(Adapter);
++ priv->adapter = NULL;
++ }
++
++ LEAVE();
++}
++
++/**
++ * @brief This function handles the major job in uap driver.
++ * it handles the event generated by firmware, rx data received
++ * from firmware and tx data sent from kernel.
++ *
++ * @param data A pointer to uap_thread structure
++ * @return BT_STATUS_SUCCESS
++ */
++static int
++uap_service_main_thread(void *data)
++{
++ uap_thread *thread = data;
++ uap_private *priv = thread->priv;
++ uap_adapter *Adapter = priv->adapter;
++ wait_queue_t wait;
++ u8 ireg = 0;
++ struct sk_buff *skb;
++ ENTER();
++ uap_activate_thread(thread);
++ init_waitqueue_entry(&wait, current);
++ current->flags |= PF_NOFREEZE;
++
++ for (;;) {
++ add_wait_queue(&thread->waitQ, &wait);
++ OS_SET_THREAD_STATE(TASK_INTERRUPTIBLE);
++ if ((Adapter->WakeupTries) ||
++ (!Adapter->IntCounter && Adapter->ps_state == PS_STATE_PRE_SLEEP) ||
++ (!priv->adapter->IntCounter
++ && (priv->uap_dev.data_sent ||
++ skb_queue_empty(&priv->adapter->tx_queue))
++ && (priv->uap_dev.cmd_sent || Adapter->cmd_pending ||
++ skb_queue_empty(&priv->adapter->cmd_queue))
++ )) {
++ PRINTM(INFO, "Main: Thread sleeping...\n");
++ schedule();
++ }
++ OS_SET_THREAD_STATE(TASK_RUNNING);
++ remove_wait_queue(&thread->waitQ, &wait);
++ if (kthread_should_stop() || Adapter->SurpriseRemoved) {
++ PRINTM(INFO, "main-thread: break from main thread: "
++ "SurpriseRemoved=0x%x\n", Adapter->SurpriseRemoved);
++ /* Cancel pending command */
++ if (Adapter->cmd_pending == TRUE) {
++ /* Wake up cmd Q */
++ Adapter->CmdWaitQWoken = TRUE;
++ wake_up_interruptible(&Adapter->cmdwait_q);
++ }
++ break;
++ }
++
++ PRINTM(INFO, "Main: Thread waking up...\n");
++ if (priv->adapter->IntCounter) {
++ OS_INT_DISABLE;
++ Adapter->IntCounter = 0;
++ OS_INT_RESTORE;
++ sbi_get_int_status(priv, &ireg);
++ } else if ((priv->adapter->ps_state == PS_STATE_SLEEP) &&
++ (!skb_queue_empty(&priv->adapter->cmd_queue) ||
++ !skb_queue_empty(&priv->adapter->tx_queue))) {
++ priv->adapter->WakeupTries++;
++ PRINTM(CMND, "%lu : Wakeup device...\n", os_time_get());
++ sbi_wakeup_firmware(priv);
++ continue;
++ }
++ if (Adapter->ps_state == PS_STATE_PRE_SLEEP)
++ uap_ps_cond_check(priv);
++
++ /* The PS state is changed during processing of Sleep Request event
++ above */
++ if ((Adapter->ps_state == PS_STATE_SLEEP) ||
++ (Adapter->ps_state == PS_STATE_PRE_SLEEP))
++ continue;
++ /* Execute the next command */
++ if (!priv->uap_dev.cmd_sent && !Adapter->cmd_pending &&
++ (Adapter->HardwareStatus == HWReady)) {
++ if (!skb_queue_empty(&priv->adapter->cmd_queue)) {
++ skb = skb_dequeue(&priv->adapter->cmd_queue);
++ if (skb) {
++ Adapter->CmdSize = 0;
++ Adapter->cmd_pending = TRUE;
++ Adapter->cmd_wait_option = skb->cb[0];
++ if (sbi_host_to_card(priv, skb->data, skb->len)) {
++ PRINTM(ERROR, "Cmd:sbi_host_to_card failed!\n");
++ Adapter->cmd_pending = FALSE;
++ Adapter->dbg.num_cmd_host_to_card_failure++;
++ /* Wake up cmd Q */
++ Adapter->CmdWaitQWoken = TRUE;
++ wake_up_interruptible(&Adapter->cmdwait_q);
++ } else {
++ if (Adapter->cmd_wait_option ==
++ HostCmd_OPTION_WAITFORSEND) {
++ /* Wake up cmd Q */
++ Adapter->CmdWaitQWoken = TRUE;
++ wake_up_interruptible(&Adapter->cmdwait_q);
++ Adapter->cmd_wait_option = FALSE;
++ }
++ }
++ kfree_skb(skb);
++ }
++ }
++ }
++ if (!priv->uap_dev.data_sent && (Adapter->HardwareStatus == HWReady)) {
++ if (!skb_queue_empty(&priv->adapter->tx_queue)) {
++ skb = skb_dequeue(&priv->adapter->tx_queue);
++ if (skb) {
++ if (uap_process_tx(priv, skb)) {
++ priv->stats.tx_dropped++;
++ priv->stats.tx_errors++;
++ os_start_queue(priv);
++ } else {
++ priv->stats.tx_packets++;
++ priv->stats.tx_bytes += skb->len;
++ }
++
++ }
++ }
++ }
++ }
++ uap_deactivate_thread(thread);
++ LEAVE();
++ return UAP_STATUS_SUCCESS;
++}
++
++/**
++ * @brief uap hostcmd ioctl handler
++ *
++ * @param dev A pointer to net_device structure
++ * @param req A pointer to ifreq structure
++ * @return UAP_STATUS_SUCCESS --success, otherwise fail
++ */
++/********* format of ifr_data *************/
++/* buf_len + Hostcmd_body */
++/* buf_len: 4 bytes */
++/* the length of the buf which */
++/* can be used to return data */
++/* to application */
++/* Hostcmd_body */
++/*******************************************/
++static int
++uap_hostcmd_ioctl(struct net_device *dev, struct ifreq *req)
++{
++ u32 buf_len;
++ HostCmd_HEADER head;
++ uap_private *priv = (uap_private *) netdev_priv(dev);
++ uap_adapter *Adapter = priv->adapter;
++ int ret = UAP_STATUS_SUCCESS;
++ struct sk_buff *skb;
++
++ ENTER();
++
++ /* Sanity check */
++ if (req->ifr_data == NULL) {
++ PRINTM(ERROR, "uap_hostcmd_ioctl() corrupt data\n");
++ LEAVE();
++ return -EFAULT;
++ }
++ if (copy_from_user(&buf_len, req->ifr_data, sizeof(buf_len))) {
++ PRINTM(ERROR, "Copy from user failed\n");
++ LEAVE();
++ return -EFAULT;
++ }
++ memset(&head, 0, sizeof(HostCmd_HEADER));
++ /* Get the command size from user space */
++ if (copy_from_user
++ (&head, req->ifr_data + sizeof(buf_len), sizeof(HostCmd_HEADER))) {
++ PRINTM(ERROR, "Copy from user failed\n");
++ LEAVE();
++ return -EFAULT;
++ }
++ head.Size = uap_le16_to_cpu(head.Size);
++ if (head.Size > MRVDRV_SIZE_OF_CMD_BUFFER) {
++ PRINTM(ERROR, "CmdSize too big=%d\n", head.Size);
++ LEAVE();
++ return -EFAULT;
++ }
++ PRINTM(CMND, "ioctl: hostcmd=%x, size=%d,buf_len=%d\n", head.Command,
++ head.Size, buf_len);
++ skb = dev_alloc_skb(head.Size + INTF_HEADER_LEN);
++ if (!skb) {
++ PRINTM(ERROR, "No free skb\n");
++ LEAVE();
++ return -ENOMEM;
++ }
++
++ /* Get the command from user space */
++ if (copy_from_user
++ (skb->data + INTF_HEADER_LEN, req->ifr_data + sizeof(buf_len),
++ head.Size)) {
++ PRINTM(ERROR, "Copy from user failed\n");
++ LEAVE();
++ return -EFAULT;
++ }
++ skb_put(skb, head.Size + INTF_HEADER_LEN);
++ if (UAP_STATUS_SUCCESS !=
++ uap_process_cmd(priv, skb, HostCmd_OPTION_WAITFORRSP)) {
++ PRINTM(ERROR, "Fail to process cmd\n");
++ LEAVE();
++ return -EFAULT;
++ }
++ if (!Adapter->CmdSize) {
++ PRINTM(ERROR, "Cmd Size is 0\n");
++ LEAVE();
++ return -EFAULT;
++ }
++ if (Adapter->CmdSize > buf_len) {
++ PRINTM(ERROR, "buf_len is too small\n");
++ LEAVE();
++ return -EFAULT;
++ }
++ /* Copy to user */
++ if (copy_to_user
++ (req->ifr_data + sizeof(buf_len), Adapter->CmdBuf, Adapter->CmdSize)) {
++ PRINTM(ERROR, "Copy to user failed!\n");
++ LEAVE();
++ return -EFAULT;
++ }
++ LEAVE();
++ return ret;
++}
++
++/**
++ * @brief uap power mode ioctl handler
++ *
++ * @param dev A pointer to net_device structure
++ * @param req A pointer to ifreq structure
++ * @return UAP_STATUS_SUCCESS --success, otherwise fail
++ */
++static int
++uap_power_mode_ioctl(struct net_device *dev, struct ifreq *req)
++{
++ ps_mgmt pm_cfg;
++ int ret = UAP_STATUS_SUCCESS;
++ uap_private *priv = (uap_private *) netdev_priv(dev);
++ uap_adapter *Adapter = priv->adapter;
++ struct sk_buff *skb = NULL;
++ HostCmd_DS_COMMAND *cmd;
++ u32 CmdSize;
++ u8 *tlv = NULL;
++ MrvlIEtypes_sleep_param_t *sleep_tlv = NULL;
++ MrvlIEtypes_inact_sleep_param_t *inact_tlv = NULL;
++ u16 tlv_buf_left = 0;
++ MrvlIEtypesHeader_t *tlvbuf = NULL;
++ u16 tlv_type = 0;
++ u16 tlv_len = 0;
++
++ ENTER();
++
++ /* Sanity check */
++ if (req->ifr_data == NULL) {
++ PRINTM(ERROR, "uap_power_mode_ioctl() corrupt data\n");
++ LEAVE();
++ return -EFAULT;
++ }
++
++ memset(&pm_cfg, 0, sizeof(ps_mgmt));
++ if (copy_from_user(&pm_cfg, req->ifr_data, sizeof(ps_mgmt))) {
++ PRINTM(ERROR, "Copy from user failed\n");
++ LEAVE();
++ return -EFAULT;
++ }
++ PRINTM(CMND,
++ "ioctl power: flag=0x%x ps_mode=%d ctrl_bitmap=%d min_sleep=%d max_sleep=%d "
++ "inact_to=%d min_awake=%d max_awake=%d\n", pm_cfg.flags,
++ (int) pm_cfg.ps_mode, (int) pm_cfg.sleep_param.ctrl_bitmap,
++ (int) pm_cfg.sleep_param.min_sleep,
++ (int) pm_cfg.sleep_param.max_sleep,
++ (int) pm_cfg.inact_param.inactivity_to,
++ (int) pm_cfg.inact_param.min_awake,
++ (int) pm_cfg.inact_param.max_awake);
++
++ if (pm_cfg.
++ flags & ~(PS_FLAG_PS_MODE | PS_FLAG_SLEEP_PARAM |
++ PS_FLAG_INACT_SLEEP_PARAM)) {
++ PRINTM(ERROR, "Invalid parameter: flags = 0x%x\n", pm_cfg.flags);
++ ret = -EINVAL;
++ goto done;
++ }
++ if (pm_cfg.ps_mode > PS_MODE_INACTIVITY) {
++ PRINTM(ERROR, "Invalid parameter: ps_mode = %d\n", (int) pm_cfg.flags);
++ ret = -EINVAL;
++ goto done;
++ }
++
++ skb = dev_alloc_skb(MRVDRV_SIZE_OF_CMD_BUFFER);
++ if (!skb) {
++ PRINTM(INFO, "No free skb\n");
++ ret = -ENOMEM;
++ goto done;
++ }
++
++ CmdSize = S_DS_GEN + sizeof(HostCmd_DS_POWER_MGMT_EXT);
++
++ cmd = (HostCmd_DS_COMMAND *) (skb->data + INTF_HEADER_LEN);
++ cmd->Command = uap_cpu_to_le16(HOST_CMD_POWER_MGMT_EXT);
++ if (!pm_cfg.flags) {
++ cmd->params.pm_cfg.action = uap_cpu_to_le16(ACTION_GET);
++ } else {
++ cmd->params.pm_cfg.action = uap_cpu_to_le16(ACTION_SET);
++ cmd->params.pm_cfg.power_mode = uap_cpu_to_le16(pm_cfg.ps_mode);
++ tlv = (u8 *) & cmd->params.pm_cfg + sizeof(HostCmd_DS_POWER_MGMT_EXT);
++
++ if ((pm_cfg.ps_mode) && (pm_cfg.flags & PS_FLAG_SLEEP_PARAM)) {
++ sleep_tlv = (MrvlIEtypes_sleep_param_t *) tlv;
++ sleep_tlv->header.Type = uap_cpu_to_le16(TLV_TYPE_AP_SLEEP_PARAM);
++ sleep_tlv->header.Len =
++ uap_cpu_to_le16(sizeof(MrvlIEtypes_sleep_param_t) -
++ sizeof(MrvlIEtypesHeader_t));
++ sleep_tlv->ctrl_bitmap =
++ uap_cpu_to_le32(pm_cfg.sleep_param.ctrl_bitmap);
++ sleep_tlv->min_sleep =
++ uap_cpu_to_le32(pm_cfg.sleep_param.min_sleep);
++ sleep_tlv->max_sleep =
++ uap_cpu_to_le32(pm_cfg.sleep_param.max_sleep);
++ CmdSize += sizeof(MrvlIEtypes_sleep_param_t);
++ tlv += sizeof(MrvlIEtypes_sleep_param_t);
++ }
++ if ((pm_cfg.ps_mode == PS_MODE_INACTIVITY) &&
++ (pm_cfg.flags & PS_FLAG_INACT_SLEEP_PARAM)) {
++ inact_tlv = (MrvlIEtypes_inact_sleep_param_t *) tlv;
++ inact_tlv->header.Type =
++ uap_cpu_to_le16(TLV_TYPE_AP_INACT_SLEEP_PARAM);
++ inact_tlv->header.Len =
++ uap_cpu_to_le16(sizeof(MrvlIEtypes_inact_sleep_param_t) -
++ sizeof(MrvlIEtypesHeader_t));
++ inact_tlv->inactivity_to =
++ uap_cpu_to_le32(pm_cfg.inact_param.inactivity_to);
++ inact_tlv->min_awake =
++ uap_cpu_to_le32(pm_cfg.inact_param.min_awake);
++ inact_tlv->max_awake =
++ uap_cpu_to_le32(pm_cfg.inact_param.max_awake);
++ CmdSize += sizeof(MrvlIEtypes_inact_sleep_param_t);
++ tlv += sizeof(MrvlIEtypes_inact_sleep_param_t);
++ }
++ }
++ cmd->Size = uap_cpu_to_le16(CmdSize);
++ skb_put(skb, CmdSize + INTF_HEADER_LEN);
++ if (UAP_STATUS_SUCCESS !=
++ uap_process_cmd(priv, skb, HostCmd_OPTION_WAITFORRSP)) {
++ PRINTM(ERROR, "Fail to process cmd POWER_MODE\n");
++ ret = -EFAULT;
++ goto done;
++ }
++ if (!Adapter->CmdSize) {
++ PRINTM(ERROR, "Cmd Size is 0\n");
++ ret = -EFAULT;
++ goto done;
++ }
++ cmd = (HostCmd_DS_COMMAND *) Adapter->CmdBuf;
++ cmd->Result = uap_le16_to_cpu(cmd->Result);
++ if (cmd->Result != UAP_STATUS_SUCCESS) {
++ PRINTM(ERROR, "HOST_CMD_APCMD_POWER_MODE fail=%x\n", cmd->Result);
++ ret = -EFAULT;
++ goto done;
++ }
++ if (pm_cfg.flags) {
++ Adapter->psmode = uap_le16_to_cpu(cmd->params.pm_cfg.power_mode);
++ } else {
++ pm_cfg.flags = PS_FLAG_PS_MODE;
++ pm_cfg.ps_mode = uap_le16_to_cpu(cmd->params.pm_cfg.power_mode);
++ tlv_buf_left =
++ cmd->Size - (sizeof(HostCmd_DS_POWER_MGMT_EXT) + S_DS_GEN);
++ tlvbuf =
++ (MrvlIEtypesHeader_t *) ((u8 *) & cmd->params.pm_cfg +
++ sizeof(HostCmd_DS_POWER_MGMT_EXT));
++ while (tlv_buf_left >= sizeof(MrvlIEtypesHeader_t)) {
++ tlv_type = uap_le16_to_cpu(tlvbuf->Type);
++ tlv_len = uap_le16_to_cpu(tlvbuf->Len);
++ switch (tlv_type) {
++ case TLV_TYPE_AP_SLEEP_PARAM:
++ sleep_tlv = (MrvlIEtypes_sleep_param_t *) tlvbuf;
++ pm_cfg.flags |= PS_FLAG_SLEEP_PARAM;
++ pm_cfg.sleep_param.ctrl_bitmap =
++ uap_le32_to_cpu(sleep_tlv->ctrl_bitmap);
++ pm_cfg.sleep_param.min_sleep =
++ uap_le32_to_cpu(sleep_tlv->min_sleep);
++ pm_cfg.sleep_param.max_sleep =
++ uap_le32_to_cpu(sleep_tlv->max_sleep);
++ break;
++ case TLV_TYPE_AP_INACT_SLEEP_PARAM:
++ inact_tlv = (MrvlIEtypes_inact_sleep_param_t *) tlvbuf;
++ pm_cfg.flags |= PS_FLAG_INACT_SLEEP_PARAM;
++ pm_cfg.inact_param.inactivity_to =
++ uap_le32_to_cpu(inact_tlv->inactivity_to);
++ pm_cfg.inact_param.min_awake =
++ uap_le32_to_cpu(inact_tlv->min_awake);
++ pm_cfg.inact_param.max_awake =
++ uap_le32_to_cpu(inact_tlv->max_awake);
++ break;
++ }
++ tlv_buf_left -= tlv_len + sizeof(MrvlIEtypesHeader_t);
++ tlvbuf =
++ (MrvlIEtypesHeader_t *) ((u8 *) tlvbuf + tlv_len +
++ sizeof(MrvlIEtypesHeader_t));
++ }
++ /* Copy to user */
++ if (copy_to_user(req->ifr_data, &pm_cfg, sizeof(ps_mgmt))) {
++ PRINTM(ERROR, "Copy to user failed!\n");
++ LEAVE();
++ return -EFAULT;
++ }
++ }
++ done:
++ LEAVE();
++ return ret;
++}
++
++/**
++ * @brief This function send bss_stop command to firmware
++ *
++ * @param priv A pointer to uap_private structure
++ * @return UAP_STATUS_SUCCESS on success, otherwise failure code
++ */
++static int
++uap_bss_stop(uap_private * priv)
++{
++ int ret = UAP_STATUS_SUCCESS;
++ u32 CmdSize;
++ HostCmd_DS_GEN *cmd;
++ uap_adapter *Adapter = priv->adapter;
++ struct sk_buff *skb;
++ ENTER();
++ if (Adapter->HardwareStatus != HWReady) {
++ PRINTM(ERROR, "uap_bss_stop:Hardware is not ready!\n");
++ ret = -EFAULT;
++ goto done;
++ }
++ skb = dev_alloc_skb(MRVDRV_SIZE_OF_CMD_BUFFER);
++ if (!skb) {
++ PRINTM(ERROR, "No free skb\n");
++ ret = -ENOMEM;
++ goto done;
++ }
++ CmdSize = sizeof(HostCmd_DS_GEN);
++ cmd = (HostCmd_DS_GEN *) (skb->data + INTF_HEADER_LEN);
++ cmd->Command = uap_cpu_to_le16(HOST_CMD_APCMD_BSS_STOP);
++ cmd->Size = uap_cpu_to_le16(CmdSize);
++ skb_put(skb, CmdSize + INTF_HEADER_LEN);
++ PRINTM(CMND, "APCMD_BSS_STOP\n");
++ if (UAP_STATUS_SUCCESS !=
++ uap_process_cmd(priv, skb, HostCmd_OPTION_WAITFORRSP_TIMEOUT)) {
++ PRINTM(ERROR, "Fail to process cmd BSS_STOP\n");
++ ret = -EFAULT;
++ goto done;
++ }
++ done:
++ LEAVE();
++ return ret;
++}
++
++/********************************************************
++ Global Functions
++********************************************************/
++/**
++ * @brief This function send soft_reset command to firmware
++ *
++ * @param priv A pointer to uap_private structure
++ * @return UAP_STATUS_SUCCESS on success, otherwise failure code
++ */
++int
++uap_soft_reset(uap_private * priv)
++{
++ int ret = UAP_STATUS_SUCCESS;
++ u32 CmdSize;
++ HostCmd_DS_GEN *cmd;
++ uap_adapter *Adapter = priv->adapter;
++ struct sk_buff *skb;
++ ENTER();
++ ret = uap_bss_stop(priv);
++ if (ret != UAP_STATUS_SUCCESS)
++ goto done;
++ skb = dev_alloc_skb(MRVDRV_SIZE_OF_CMD_BUFFER);
++ if (!skb) {
++ PRINTM(ERROR, "No free skb\n");
++ ret = -ENOMEM;
++ goto done;
++ }
++ CmdSize = sizeof(HostCmd_DS_GEN);
++ cmd = (HostCmd_DS_GEN *) (skb->data + INTF_HEADER_LEN);
++ cmd->Command = uap_cpu_to_le16(HOST_CMD_APCMD_SOFT_RESET);
++ cmd->Size = uap_cpu_to_le16(CmdSize);
++ skb_put(skb, CmdSize + INTF_HEADER_LEN);
++ PRINTM(CMND, "APCMD_SOFT_RESET\n");
++ if (UAP_STATUS_SUCCESS !=
++ uap_process_cmd(priv, skb, HostCmd_OPTION_WAITFORSEND)) {
++ PRINTM(ERROR, "Fail to process cmd SOFT_RESET\n");
++ ret = -EFAULT;
++ goto done;
++ }
++ Adapter->SurpriseRemoved = TRUE;
++ /* delay to allow hardware complete reset */
++ os_sched_timeout(5);
++ if (priv->MediaConnected == TRUE) {
++ os_stop_queue(priv);
++ os_carrier_off(priv);
++ priv->MediaConnected = FALSE;
++ }
++ Adapter->CmdSize = 0;
++ Adapter->CmdWaitQWoken = TRUE;
++ wake_up_interruptible(&Adapter->cmdwait_q);
++ skb_queue_purge(&priv->adapter->tx_queue);
++ skb_queue_purge(&priv->adapter->cmd_queue);
++ done:
++ LEAVE();
++ return ret;
++}
++
++/**
++ * @brief This function processes received packet and forwards it
++ * to kernel/upper layer
++ *
++ * @param priv A pointer to uap_private
++ * @param skb A pointer to skb which includes the received packet
++ * @return UAP_STATUS_SUCCESS or UAP_STATUS_FAILURE
++ */
++int
++uap_process_rx_packet(uap_private * priv, struct sk_buff *skb)
++{
++ int ret = UAP_STATUS_SUCCESS;
++ RxPD *pRxPD;
++ ENTER();
++ priv->adapter->ps_state = PS_STATE_AWAKE;
++ pRxPD = (RxPD *) skb->data;
++ endian_convert_RxPD(pRxPD);
++ DBG_HEXDUMP(DAT_D, "Rx", skb->data, MIN(skb->len, DATA_DUMP_LEN));
++ skb_pull(skb, pRxPD->RxPktOffset);
++ priv->stats.rx_packets++;
++ priv->stats.rx_bytes += skb->len;
++ os_upload_rx_packet(priv, skb);
++ LEAVE();
++ return ret;
++}
++
++/**
++ * @brief This function opens the network device
++ *
++ * @param dev A pointer to net_device structure
++ * @return UAP_STATUS_SUCCESS
++ */
++static int
++uap_open(struct net_device *dev)
++{
++ uap_private *priv = (uap_private *) (uap_private *) netdev_priv(dev);
++ uap_adapter *Adapter = priv->adapter;
++ int i = 0;
++
++ ENTER();
++
++ /* On some systems the device open handler will be called before HW ready. */
++ /* Use the following flag check and wait function to work around the issue. */
++ while ((Adapter->HardwareStatus != HWReady) &&
++ (i < MAX_WAIT_DEVICE_READY_COUNT)) {
++ i++;
++ os_sched_timeout(100);
++ }
++ if (i >= MAX_WAIT_DEVICE_READY_COUNT) {
++ PRINTM(FATAL, "HW not ready, uap_open() return failure\n");
++ LEAVE();
++ return UAP_STATUS_FAILURE;
++ }
++
++ if (MODULE_GET == 0)
++ return UAP_STATUS_FAILURE;
++
++ priv->open = TRUE;
++ if (priv->MediaConnected == TRUE) {
++ os_carrier_on(priv);
++ os_start_queue(priv);
++ } else {
++ os_stop_queue(priv);
++ os_carrier_off(priv);
++ }
++ LEAVE();
++ return UAP_STATUS_SUCCESS;
++}
++
++/**
++ * @brief This function closes the network device
++ *
++ * @param dev A pointer to net_device structure
++ * @return UAP_STATUS_SUCCESS
++ */
++static int
++uap_close(struct net_device *dev)
++{
++ uap_private *priv = (uap_private *) netdev_priv(dev);
++
++ ENTER();
++ skb_queue_purge(&priv->adapter->tx_queue);
++ os_stop_queue(priv);
++ os_carrier_off(priv);
++
++ MODULE_PUT;
++ priv->open = FALSE;
++ LEAVE();
++ return UAP_STATUS_SUCCESS;
++}
++
++/**
++ * @brief This function returns the network statistics
++ *
++ * @param dev A pointer to uap_private structure
++ * @return A pointer to net_device_stats structure
++ */
++static struct net_device_stats *
++uap_get_stats(struct net_device *dev)
++{
++ uap_private *priv = (uap_private *) netdev_priv(dev);
++
++ return &priv->stats;
++}
++
++/**
++ * @brief This function sets the MAC address to firmware.
++ *
++ * @param dev A pointer to uap_private structure
++ * @param addr MAC address to set
++ * @return UAP_STATUS_SUCCESS or UAP_STATUS_FAILURE
++ */
++static int
++uap_set_mac_address(struct net_device *dev, void *addr)
++{
++ int ret = UAP_STATUS_SUCCESS;
++ uap_private *priv = (uap_private *) netdev_priv(dev);
++ struct sockaddr *pHwAddr = (struct sockaddr *) addr;
++ u32 CmdSize;
++ HostCmd_DS_COMMAND *cmd;
++ MrvlIEtypes_MacAddr_t *pMacAddrTlv;
++ uap_adapter *Adapter = priv->adapter;
++ struct sk_buff *skb;
++
++ ENTER();
++
++ /* Dump MAC address */
++ DBG_HEXDUMP(CMD_D, "Original MAC addr", dev->dev_addr, ETH_ALEN);
++ DBG_HEXDUMP(CMD_D, "New MAC addr", pHwAddr->sa_data, ETH_ALEN);
++ if (priv->open && (priv->MediaConnected == TRUE)) {
++ os_carrier_on(priv);
++ os_start_queue(priv);
++ }
++ skb = dev_alloc_skb(MRVDRV_SIZE_OF_CMD_BUFFER);
++ if (!skb) {
++ PRINTM(ERROR, "No free skb\n");
++ LEAVE();
++ return -ENOMEM;
++ }
++ CmdSize =
++ S_DS_GEN + sizeof(HostCmd_SYS_CONFIG) + sizeof(MrvlIEtypes_MacAddr_t);
++ cmd = (HostCmd_DS_COMMAND *) (skb->data + INTF_HEADER_LEN);
++ cmd->Command = uap_cpu_to_le16(HOST_CMD_APCMD_SYS_CONFIGURE);
++ cmd->Size = uap_cpu_to_le16(CmdSize);
++ cmd->params.sys_config.Action = uap_cpu_to_le16(ACTION_SET);
++ pMacAddrTlv =
++ (MrvlIEtypes_MacAddr_t *) ((u8 *) cmd + S_DS_GEN +
++ sizeof(HostCmd_SYS_CONFIG));
++ pMacAddrTlv->Header.Type = uap_cpu_to_le16(MRVL_AP_MAC_ADDRESS_TLV_ID);
++ pMacAddrTlv->Header.Len = uap_cpu_to_le16(ETH_ALEN);
++ memcpy(pMacAddrTlv->ApMacAddr, pHwAddr->sa_data, ETH_ALEN);
++ skb_put(skb, CmdSize + INTF_HEADER_LEN);
++ PRINTM(CMND, "set_mac_address\n");
++ if (UAP_STATUS_SUCCESS !=
++ uap_process_cmd(priv, skb, HostCmd_OPTION_WAITFORRSP_TIMEOUT)) {
++ PRINTM(ERROR, "Fail to set mac address\n");
++ LEAVE();
++ return -EFAULT;
++ }
++ if (!Adapter->CmdSize) {
++ PRINTM(ERROR, "Cmd Size is 0\n");
++ LEAVE();
++ return -EFAULT;
++ }
++ cmd = (HostCmd_DS_COMMAND *) Adapter->CmdBuf;
++ cmd->Result = uap_cpu_to_le16(cmd->Result);
++ if (cmd->Result != UAP_STATUS_SUCCESS) {
++ PRINTM(ERROR, "set mac addrress fail,cmd result=%x\n", cmd->Result);
++ ret = -EFAULT;
++ } else
++ memcpy(dev->dev_addr, pHwAddr->sa_data, ETH_ALEN);
++ LEAVE();
++ return ret;
++}
++
++/**
++ * @brief This function handles the timeout of packet
++ * transmission
++ *
++ * @param dev A pointer to net_device structure
++ * @return n/a
++ */
++static void
++uap_tx_timeout(struct net_device *dev)
++{
++ uap_private *priv = (uap_private *) netdev_priv(dev);
++
++ ENTER();
++
++ PRINTM(DATA, "Tx timeout\n");
++ UpdateTransStart(dev);
++ priv->num_tx_timeout++;
++ priv->adapter->IntCounter++;
++ wake_up_interruptible(&priv->MainThread.waitQ);
++
++ LEAVE();
++}
++
++/**
++ * @brief This function handles packet transmission
++ *
++ * @param skb A pointer to sk_buff structure
++ * @param dev A pointer to net_device structure
++ * @return UAP_STATUS_SUCCESS or UAP_STATUS_FAILURE
++ */
++static int
++uap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
++{
++ uap_private *priv = (uap_private *) netdev_priv(dev);
++ int ret = UAP_STATUS_SUCCESS;
++
++ ENTER();
++ PRINTM(DATA, "Data <= kernel\n");
++ DBG_HEXDUMP(DAT_D, "Tx", skb->data, MIN(skb->len, DATA_DUMP_LEN));
++ /* skb sanity check */
++ if (!skb->len || (skb->len > MRVDRV_MAXIMUM_ETH_PACKET_SIZE)) {
++ PRINTM(ERROR, "Tx Error: Bad skb length %d : %d\n", skb->len,
++ MRVDRV_MAXIMUM_ETH_PACKET_SIZE);
++ priv->stats.tx_dropped++;
++ kfree(skb);
++ goto done;
++ }
++ skb_queue_tail(&priv->adapter->tx_queue, skb);
++ wake_up_interruptible(&priv->MainThread.waitQ);
++ if (skb_queue_len(&priv->adapter->tx_queue) > TX_HIGH_WATERMARK) {
++ UpdateTransStart(dev);
++ os_stop_queue(priv);
++ }
++ done:
++ LEAVE();
++ return ret;
++}
++
++/**
++ * @brief ioctl function - entry point
++ *
++ * @param dev A pointer to net_device structure
++ * @param req A pointer to ifreq structure
++ * @param cmd command
++ * @return UAP_STATUS_SUCCESS--success, otherwise fail
++ */
++static int
++uap_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
++{
++ int ret = UAP_STATUS_SUCCESS;
++
++ ENTER();
++
++ PRINTM(CMND, "uap_do_ioctl: ioctl cmd = 0x%x\n", cmd);
++
++ switch (cmd) {
++ case UAPHOSTCMD:
++ ret = uap_hostcmd_ioctl(dev, req);
++ break;
++ case UAP_POWER_MODE:
++ ret = uap_power_mode_ioctl(dev, req);
++ break;
++ default:
++ ret = -EINVAL;
++ break;
++ }
++
++ LEAVE();
++ return ret;
++}
++
++/**
++ * @brief This function handles events generated by firmware
++ *
++ * @param priv A pointer to uap_private structure
++ * @param payload A pointer to payload buffer
++ * @param len Length of the payload
++ * @return UAP_STATUS_SUCCESS or UAP_STATUS_FAILURE
++ */
++int
++uap_process_event(uap_private * priv, u8 * payload, uint len)
++{
++ int ret = UAP_STATUS_SUCCESS;
++ uap_adapter *Adapter = priv->adapter;
++ struct sk_buff *skb = NULL;
++ struct nlmsghdr *nlh = NULL;
++ struct sock *sk = Adapter->nl_sk;
++ AP_Event *pEvent;
++
++ ENTER();
++ Adapter->ps_state = PS_STATE_AWAKE;
++ if (len > NL_MAX_PAYLOAD) {
++ PRINTM(ERROR, "event size is too big!!! len=%d\n", len);
++ ret = UAP_STATUS_FAILURE;
++ goto done;
++ }
++ pEvent = (AP_Event *) payload;
++ PRINTM(CMND, "Event: %d\n", pEvent->EventId);
++ switch (pEvent->EventId) {
++ case MICRO_AP_EV_ID_BSS_START:
++ memcpy(priv->uap_dev.netdev->dev_addr, pEvent->MacAddr, ETH_ALEN);
++ DBG_HEXDUMP(CMD_D, "BSS MAC addr", priv->uap_dev.netdev->dev_addr,
++ ETH_ALEN);
++ break;
++ case MICRO_AP_EV_BSS_ACTIVE:
++ // carrier on
++ priv->MediaConnected = TRUE;
++ os_carrier_on(priv);
++ os_start_queue(priv);
++ break;
++ case MICRO_AP_EV_BSS_IDLE:
++ os_stop_queue(priv);
++ os_carrier_off(priv);
++ priv->MediaConnected = FALSE;
++ break;
++ case EVENT_PS_AWAKE:
++ PRINTM(CMND, "UAP: PS_AWAKE\n");
++ Adapter->ps_state = PS_STATE_AWAKE;
++ Adapter->WakeupTries = 0;
++ break;
++ case EVENT_PS_SLEEP:
++ PRINTM(CMND, "UAP: PS_SLEEP\n");
++ Adapter->ps_state = PS_STATE_PRE_SLEEP;
++ break;
++ default:
++ break;
++ }
++ if ((pEvent->EventId == EVENT_PS_AWAKE) ||
++ (pEvent->EventId == EVENT_PS_SLEEP))
++ goto done;
++ if (sk) {
++ /* Allocate skb */
++ if (!(skb = alloc_skb(NLMSG_SPACE(NL_MAX_PAYLOAD), GFP_ATOMIC))) {
++ PRINTM(ERROR, "Could not allocate skb for netlink.\n");
++ ret = UAP_STATUS_FAILURE;
++ goto done;
++ }
++ nlh = (struct nlmsghdr *) skb->data;
++ nlh->nlmsg_len = NLMSG_SPACE(len);
++
++ /* From kernel */
++ nlh->nlmsg_pid = 0;
++ nlh->nlmsg_flags = 0;
++
++ /* Data */
++ skb_put(skb, nlh->nlmsg_len);
++ memcpy(NLMSG_DATA(nlh), payload, len);
++
++ /* From Kernel */
++ NETLINK_CB(skb).portid = 0;
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
++ /* Multicast message */
++ NETLINK_CB(skb).dst_pid = 0;
++#endif
++
++ /* Multicast group number */
++ NETLINK_CB(skb).dst_group = NL_MULTICAST_GROUP;
++
++ /* Send message */
++ netlink_broadcast(sk, skb, 0, NL_MULTICAST_GROUP, GFP_KERNEL);
++
++ ret = UAP_STATUS_SUCCESS;
++ } else {
++ PRINTM(ERROR, "Could not send event through NETLINK. Link down.\n");
++ ret = UAP_STATUS_FAILURE;
++ }
++ done:
++ LEAVE();
++ return ret;
++}
++
++/**
++ * @brief This function handles the interrupt. it will change PS
++ * state if applicable. it will wake up main_thread to handle
++ * the interrupt event as well.
++ *
++ * @param priv A pointer to uap_private structure
++ * @return n/a
++ */
++void
++uap_interrupt(uap_private * priv)
++{
++ ENTER();
++ priv->adapter->IntCounter++;
++ priv->adapter->WakeupTries = 0;
++ PRINTM(INFO, "*\n");
++ wake_up_interruptible(&priv->MainThread.waitQ);
++
++ LEAVE();
++
++}
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
++/** Network device handlers */
++static const struct net_device_ops uap_netdev_ops = {
++ .ndo_open = uap_open,
++ .ndo_start_xmit = uap_hard_start_xmit,
++ .ndo_stop = uap_close,
++ .ndo_do_ioctl = uap_do_ioctl,
++ .ndo_set_mac_address = uap_set_mac_address,
++ .ndo_tx_timeout = uap_tx_timeout,
++ .ndo_get_stats = uap_get_stats,
++};
++#endif
++
++/**
++ * @brief This function adds the card. it will probe the
++ * card, allocate the uap_priv and initialize the device.
++ *
++ * @param card A pointer to card
++ * @return A pointer to uap_private structure
++ */
++uap_private *
++uap_add_card(void *card)
++{
++ struct net_device *dev = NULL;
++ uap_private *priv = NULL;
++
++ ENTER();
++
++ if (OS_ACQ_SEMAPHORE_BLOCK(&AddRemoveCardSem))
++ goto exit_sem_err;
++
++ /* Allocate an Ethernet device */
++ if (!(dev = alloc_etherdev(sizeof(uap_private)))) {
++ PRINTM(FATAL, "Init ethernet device failed!\n");
++ goto error;
++ }
++ priv = (uap_private *) netdev_priv(dev);
++
++ /* Allocate name */
++ if (dev_alloc_name(dev, "uap%d") < 0) {
++ PRINTM(ERROR, "Could not allocate device name!\n");
++ goto error;
++ }
++
++ /* Allocate buffer for uap_adapter */
++ if (!(priv->adapter = kmalloc(sizeof(uap_adapter), GFP_KERNEL))) {
++ PRINTM(FATAL, "Allocate buffer for uap_adapter failed!\n");
++ goto error;
++ }
++ memset(priv->adapter, 0, sizeof(uap_adapter));
++
++ priv->uap_dev.netdev = dev;
++ priv->uap_dev.card = card;
++ priv->MediaConnected = FALSE;
++ uappriv = priv;
++ ((struct sdio_mmc_card *) card)->priv = priv;
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
++ SET_MODULE_OWNER(dev);
++#endif
++
++ /* Setup the OS Interface to our functions */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
++ dev->open = uap_open;
++ dev->stop = uap_close;
++ dev->hard_start_xmit = uap_hard_start_xmit;
++ dev->tx_timeout = uap_tx_timeout;
++ dev->get_stats = uap_get_stats;
++ dev->do_ioctl = uap_do_ioctl;
++ dev->set_mac_address = uap_set_mac_address;
++ dev->set_multicast_list = uap_set_multicast_list;
++#else
++ dev->netdev_ops = &uap_netdev_ops;
++#endif
++ dev->watchdog_timeo = MRVDRV_DEFAULT_WATCHDOG_TIMEOUT;
++ dev->hard_header_len += sizeof(TxPD) + INTF_HEADER_LEN;
++ dev->hard_header_len += HEADER_ALIGNMENT;
++#define NETIF_F_DYNALLOC 16
++ dev->features |= NETIF_F_DYNALLOC;
++ dev->flags |= IFF_BROADCAST | IFF_MULTICAST;
++
++ /* Init SW */
++ if (uap_init_sw(priv)) {
++ PRINTM(FATAL, "Software Init Failed\n");
++ goto error;
++ }
++
++ PRINTM(INFO, "Starting kthread...\n");
++ priv->MainThread.priv = priv;
++ spin_lock_init(&priv->driver_lock);
++ uap_create_thread(uap_service_main_thread, &priv->MainThread,
++ "uap_main_service");
++ while (priv->MainThread.pid == 0) {
++ os_sched_timeout(2);
++ }
++
++ /* Register the device */
++ if (sbi_register_dev(priv) < 0) {
++ PRINTM(FATAL, "Failed to register uap device!\n");
++ goto err_registerdev;
++ }
++#ifdef FW_DNLD_NEEDED
++ SET_NETDEV_DEV(dev, priv->hotplug_device);
++#endif
++
++ /* Init FW and HW */
++ if (uap_init_fw(priv)) {
++ PRINTM(FATAL, "Firmware Init Failed\n");
++ goto err_init_fw;
++ }
++
++ priv->uap_dev.cmd_sent = FALSE;
++ priv->uap_dev.data_sent = FALSE;
++
++ /* Get mac address from firmware */
++ if (uap_get_mac_address(priv)) {
++ PRINTM(FATAL, "Fail to get mac address\n");
++ goto err_init_fw;
++ }
++ /* Register network device */
++ if (register_netdev(dev)) {
++ printk(KERN_ERR "Cannot register network device!\n");
++ goto err_init_fw;
++ }
++#ifdef CONFIG_PROC_FS
++ uap_proc_entry(priv, dev);
++ uap_debug_entry(priv, dev);
++#endif /* CPNFIG_PROC_FS */
++ OS_REL_SEMAPHORE(&AddRemoveCardSem);
++
++ LEAVE();
++ return priv;
++ err_init_fw:
++ sbi_unregister_dev(priv);
++ err_registerdev:
++ ((struct sdio_mmc_card *) card)->priv = NULL;
++ /* Stop the thread servicing the interrupts */
++ priv->adapter->SurpriseRemoved = TRUE;
++ wake_up_interruptible(&priv->MainThread.waitQ);
++ while (priv->MainThread.pid) {
++ os_sched_timeout(1);
++ }
++ error:
++ if (dev) {
++ if (dev->reg_state == NETREG_REGISTERED)
++ unregister_netdev(dev);
++ if (priv->adapter)
++ uap_free_adapter(priv);
++ free_netdev(dev);
++ uappriv = NULL;
++ }
++ OS_REL_SEMAPHORE(&AddRemoveCardSem);
++ exit_sem_err:
++ LEAVE();
++ return NULL;
++}
++
++/**
++ * @brief This function removes the card.
++ *
++ * @param card A pointer to card
++ * @return UAP_STATUS_SUCCESS
++ */
++int
++uap_remove_card(void *card)
++{
++ uap_private *priv = uappriv;
++ uap_adapter *Adapter;
++ struct net_device *dev;
++
++ ENTER();
++
++ if (OS_ACQ_SEMAPHORE_BLOCK(&AddRemoveCardSem))
++ goto exit_sem_err;
++
++ if (!priv || !(Adapter = priv->adapter)) {
++ goto exit_remove;
++ }
++ Adapter->SurpriseRemoved = TRUE;
++ if (Adapter->cmd_pending == TRUE) {
++ /* Wake up cmd Q */
++ Adapter->CmdWaitQWoken = TRUE;
++ wake_up_interruptible(&Adapter->cmdwait_q);
++ }
++ dev = priv->uap_dev.netdev;
++ if (priv->MediaConnected == TRUE) {
++ os_stop_queue(priv);
++ os_carrier_off(priv);
++ priv->MediaConnected = FALSE;
++ }
++ Adapter->CmdSize = 0;
++ Adapter->CmdWaitQWoken = TRUE;
++ wake_up_interruptible(&Adapter->cmdwait_q);
++ skb_queue_purge(&priv->adapter->tx_queue);
++ skb_queue_purge(&priv->adapter->cmd_queue);
++
++ /* Disable interrupts on the card */
++ sbi_disable_host_int(priv);
++ PRINTM(INFO, "netdev_finish_unregister: %s%s.\n", dev->name,
++ (dev->features & NETIF_F_DYNALLOC) ? "" : ", old style");
++ unregister_netdev(dev);
++ PRINTM(INFO, "Unregister finish\n");
++ wake_up_interruptible(&priv->MainThread.waitQ);
++ while (priv->MainThread.pid) {
++ os_sched_timeout(1);
++ }
++
++ if ((Adapter->nl_sk) && ((Adapter->nl_sk)->sk_socket)) {
++ sock_release((Adapter->nl_sk)->sk_socket);
++ Adapter->nl_sk = NULL;
++ }
++#ifdef CONFIG_PROC_FS
++ uap_debug_remove(priv);
++ uap_proc_remove(priv);
++#endif
++ sbi_unregister_dev(priv);
++ PRINTM(INFO, "Free Adapter\n");
++ uap_free_adapter(priv);
++ priv->uap_dev.netdev = NULL;
++ free_netdev(dev);
++ uappriv = NULL;
++
++ exit_remove:
++ OS_REL_SEMAPHORE(&AddRemoveCardSem);
++ exit_sem_err:
++ LEAVE();
++ return UAP_STATUS_SUCCESS;
++}
++
++/**
++ * @brief This function initializes module.
++ *
++ * @return UAP_STATUS_SUCCESS or UAP_STATUS_FAILURE
++ */
++static int __init
++uap_init_module(void)
++{
++ int ret = UAP_STATUS_SUCCESS;
++ ENTER();
++
++ OS_INIT_SEMAPHORE(&AddRemoveCardSem);
++ ret = sbi_register();
++ LEAVE();
++ return ret;
++}
++
++/**
++ * @brief This function cleans module
++ *
++ * @return n/a
++ */
++static void __exit
++uap_cleanup_module(void)
++{
++ ENTER();
++
++ if (OS_ACQ_SEMAPHORE_BLOCK(&AddRemoveCardSem))
++ goto exit_sem_err;
++
++ if ((uappriv) && (uappriv->adapter)) {
++ uap_func_shutdown(uappriv);
++ }
++ OS_REL_SEMAPHORE(&AddRemoveCardSem);
++ exit_sem_err:
++ sbi_unregister();
++ LEAVE();
++}
++
++module_init(uap_init_module);
++module_exit(uap_cleanup_module);
++module_param(helper_name, charp, 0);
++MODULE_PARM_DESC(helper_name, "Helper name");
++module_param(fw_name, charp, 0);
++MODULE_PARM_DESC(fw_name, "Firmware name");
++
++MODULE_DESCRIPTION("M-UAP Driver");
++MODULE_AUTHOR("Marvell International Ltd.");
++MODULE_VERSION(DRIVER_VERSION);
++MODULE_LICENSE("GPL");
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/libertas_uap/uap_proc.c backports-3.18.1-1/drivers/net/wireless/libertas_uap/uap_proc.c
+--- backports-3.18.1-1.org/drivers/net/wireless/libertas_uap/uap_proc.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/libertas_uap/uap_proc.c 2014-12-29 20:37:43.952431125 +0100
+@@ -0,0 +1,258 @@
++/** @file uap_proc.c
++ * @brief This file contains functions for proc file.
++ *
++ * Copyright (C) 2008-2009, Marvell International Ltd.
++ *
++ * This software file (the "File") is distributed by Marvell International
++ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
++ * (the "License"). You may use, redistribute and/or modify this File in
++ * accordance with the terms and conditions of the License, a copy of which
++ * is available along with the File in the gpl.txt file or by writing to
++ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ * 02111-1307 or on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
++ *
++ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
++ * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
++ * this warranty disclaimer.
++ *
++ */
++#ifdef CONFIG_PROC_FS
++#include <linux/proc_fs.h>
++#include <linux/seq_file.h>
++#include "uap_headers.h"
++
++/** /proc directory root */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
++#define PROC_DIR NULL
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
++#define PROC_DIR &proc_root
++#else
++#define PROC_DIR proc_net
++#endif
++
++/********************************************************
++ Local Variables
++********************************************************/
++
++/********************************************************
++ Global Variables
++********************************************************/
++
++/********************************************************
++ Local Functions
++********************************************************/
++
++static int uap_info_proc_show(struct seq_file *s, void *data) {
++ int i;
++ struct net_device *netdev = (struct net_device*)s->private;
++ struct netdev_hw_addr *ha;
++ uap_private *priv = (uap_private *) netdev_priv(netdev);
++
++ seq_printf(s, "driver_name = " "\"uap\"\n");
++ seq_printf(s, "driver_version = %s-(FP%s)", DRIVER_VERSION, FPNUM);
++ seq_printf(s, "\nInterfaceName=\"%s\"\n", netdev->name);
++
++ seq_printf(s, "State=\"%s\"\n",
++ ((priv->MediaConnected ==
++ FALSE) ? "Disconnected" : "Connected"));
++ seq_printf(s, "MACAddress=\"%02x:%02x:%02x:%02x:%02x:%02x\"\n",
++ netdev->dev_addr[0], netdev->dev_addr[1], netdev->dev_addr[2],
++ netdev->dev_addr[3], netdev->dev_addr[4], netdev->dev_addr[5]);
++ i = 0;
++ netdev_for_each_mc_addr(ha, netdev) {
++ ++i;
++ }
++ seq_printf(s, "MCCount=\"%d\"\n", i);
++
++ /*
++ * Put out the multicast list
++ */
++ i = 0;
++ netdev_for_each_mc_addr(ha, netdev) {
++ seq_printf(s,
++ "MCAddr[%d]=\"%02x:%02x:%02x:%02x:%02x:%02x\"\n",
++ i++,
++ ha->addr[0], ha->addr[1],
++ ha->addr[2], ha->addr[3],
++ ha->addr[4], ha->addr[5]);
++ }
++
++ seq_printf(s, "num_tx_bytes = %lu\n", priv->stats.tx_bytes);
++ seq_printf(s, "num_rx_bytes = %lu\n", priv->stats.rx_bytes);
++ seq_printf(s, "num_tx_pkts = %lu\n", priv->stats.tx_packets);
++ seq_printf(s, "num_rx_pkts = %lu\n", priv->stats.rx_packets);
++ seq_printf(s, "num_tx_pkts_dropped = %lu\n", priv->stats.tx_dropped);
++ seq_printf(s, "num_rx_pkts_dropped = %lu\n", priv->stats.rx_dropped);
++ seq_printf(s, "num_tx_pkts_err = %lu\n", priv->stats.tx_errors);
++ seq_printf(s, "num_rx_pkts_err = %lu\n", priv->stats.rx_errors);
++ seq_printf(s, "num_tx_timeout = %u\n", priv->num_tx_timeout);
++ seq_printf(s, "carrier %s\n",
++ ((netif_carrier_ok(priv->uap_dev.netdev)) ? "on" : "off"));
++ seq_printf(s, "tx queue %s\n",
++ ((netif_queue_stopped(priv->uap_dev.netdev)) ? "stopped" :
++ "started"));
++
++ return 0;
++}
++
++static int uap_info_proc_open(struct inode *inode, struct file *file) {
++ return single_open(file, uap_info_proc_show, PDE_DATA(inode));
++}
++
++static int uap_hwstatus_proc_show(struct seq_file *s, void *data) {
++ struct net_device *netdev = (struct net_device*)s->private;
++ uap_private *priv = (uap_private *) netdev_priv(netdev);
++
++ MODULE_GET;
++ seq_printf(s, "%d\n", priv->adapter->HardwareStatus);
++ MODULE_PUT;
++
++ return 0;
++}
++
++static int uap_hwstatus_proc_open(struct inode *inode, struct file *file) {
++ return single_open(file, uap_hwstatus_proc_show, PDE_DATA(inode));
++}
++
++static ssize_t uap_hwstatus_proc_write(struct file *file, const char __user *buffer, size_t count, loff_t *data) {
++ struct net_device *netdev = (struct net_device *)PDE_DATA(file_inode(file));
++ uap_private *priv = (uap_private *) netdev_priv(netdev);
++
++ int hwstatus;
++ char value[10];
++
++ if (count > sizeof(value))
++ return count;
++
++ if (copy_from_user(&value, buffer, count))
++ return -EFAULT;
++
++ hwstatus = string_to_number(value);
++ switch (hwstatus) {
++ case HWReset:
++ PRINTM(MSG, "reset hw\n");
++ uap_soft_reset(priv);
++ priv->adapter->HardwareStatus = HWReset;
++ break;
++ default:
++ break;
++ }
++
++ MODULE_PUT;
++ return count;
++}
++
++static const struct file_operations uap_info_proc_fops = {
++ .owner = THIS_MODULE,
++ .open = uap_info_proc_open,
++ .read = seq_read,
++ .llseek = seq_lseek,
++ .release = single_release,
++};
++
++static const struct file_operations uap_hwstatus_proc_fops = {
++ .owner = THIS_MODULE,
++ .open = uap_hwstatus_proc_open,
++ .read = seq_read,
++ .llseek = seq_lseek,
++ .release = single_release,
++ .write = uap_hwstatus_proc_write,
++};
++
++/********************************************************
++ Global Functions
++********************************************************/
++/**
++ * @brief create uap proc file
++ *
++ * @param priv pointer uap_private
++ * @param dev pointer net_device
++ * @return N/A
++ */
++void
++uap_proc_entry(uap_private * priv, struct net_device *dev)
++{
++ PRINTM(INFO, "Creating Proc Interface\n");
++ /* Check if uap directory already exists */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
++ struct proc_dir_entry *r = PROC_DIR;
++
++ for (r = r->subdir; r; r = r->next) {
++ if (r->namelen && !strcmp("uap", r->name)) {
++ /* Directory exists */
++ PRINTM(WARN, "proc directory already exists!\n");
++ priv->proc_uap = r;
++ break;
++ }
++ }
++#endif
++ if (!priv->proc_uap) {
++ priv->proc_uap = proc_mkdir("uap", PROC_DIR);
++ if (!priv->proc_uap)
++ return;
++ }
++ priv->proc_entry = proc_mkdir(dev->name, priv->proc_uap);
++
++ if (priv->proc_entry) {
++ proc_create_data("info", 0644, priv->proc_entry, &uap_info_proc_fops, dev);
++ proc_create_data("hwinfo", 0644, priv->proc_entry, &uap_hwstatus_proc_fops, dev);
++ }
++}
++
++/**
++ * @brief remove proc file
++ *
++ * @param priv pointer uap_private
++ * @return N/A
++ */
++void
++uap_proc_remove(uap_private * priv)
++{
++ if (priv->proc_uap) {
++ if (priv->proc_entry) {
++ remove_proc_entry("info", priv->proc_entry);
++ remove_proc_entry("hwstatus", priv->proc_entry);
++ }
++ remove_proc_entry(priv->uap_dev.netdev->name, priv->proc_uap);
++ }
++}
++
++/**
++ * @brief convert string to number
++ *
++ * @param s pointer to numbered string
++ * @return converted number from string s
++ */
++int
++string_to_number(char *s)
++{
++ int r = 0;
++ int base = 0;
++ int pn = 1;
++
++ if (strncmp(s, "-", 1) == 0) {
++ pn = -1;
++ s++;
++ }
++ if ((strncmp(s, "0x", 2) == 0) || (strncmp(s, "0X", 2) == 0)) {
++ base = 16;
++ s += 2;
++ } else
++ base = 10;
++
++ for (s = s; *s != 0; s++) {
++ if ((*s >= '0') && (*s <= '9'))
++ r = (r * base) + (*s - '0');
++ else if ((*s >= 'A') && (*s <= 'F'))
++ r = (r * base) + (*s - 'A' + 10);
++ else if ((*s >= 'a') && (*s <= 'f'))
++ r = (r * base) + (*s - 'a' + 10);
++ else
++ break;
++ }
++
++ return (r * pn);
++}
++
++#endif
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/libertas_uap/uap_sdio_mmc.c backports-3.18.1-1/drivers/net/wireless/libertas_uap/uap_sdio_mmc.c
+--- backports-3.18.1-1.org/drivers/net/wireless/libertas_uap/uap_sdio_mmc.c 1970-01-01 01:00:00.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/libertas_uap/uap_sdio_mmc.c 2014-12-29 20:37:43.955764567 +0100
+@@ -0,0 +1,1428 @@
++/** @file uap_sdio_mmc.c
++ * @brief This file contains SDIO IF (interface) module
++ * related functions.
++ *
++ * Copyright (C) 2007-2009, Marvell International Ltd.
++ *
++ * This software file (the "File") is distributed by Marvell International
++ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
++ * (the "License"). You may use, redistribute and/or modify this File in
++ * accordance with the terms and conditions of the License, a copy of which
++ * is available along with the File in the gpl.txt file or by writing to
++ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ * 02111-1307 or on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
++ *
++ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
++ * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
++ * this warranty disclaimer.
++ *
++ */
++/****************************************************
++Change log:
++****************************************************/
++
++#include "uap_sdio_mmc.h"
++
++#include <linux/firmware.h>
++
++/** define SDIO block size */
++/* We support up to 480-byte block size due to FW buffer limitation. */
++#define SD_BLOCK_SIZE 256
++
++/** define allocated buffer size */
++#define ALLOC_BUF_SIZE (((MAX(MRVDRV_ETH_RX_PACKET_BUFFER_SIZE, \
++ MRVDRV_SIZE_OF_CMD_BUFFER) + INTF_HEADER_LEN \
++ + SD_BLOCK_SIZE - 1) / SD_BLOCK_SIZE) * SD_BLOCK_SIZE)
++
++/** Max retry number of CMD53 write */
++#define MAX_WRITE_IOMEM_RETRY 2
++
++/********************************************************
++ Local Variables
++********************************************************/
++
++/** SDIO Rx unit */
++static u8 sdio_rx_unit = 0;
++
++/**Interrupt status */
++static u8 sd_ireg = 0;
++/********************************************************
++ Global Variables
++********************************************************/
++extern u8 *helper_name;
++extern u8 *fw_name;
++/** Default helper name */
++#define DEFAULT_HELPER_NAME "mrvl/helper_sd.bin"
++/** Default firmware name */
++#define DEFAULT_FW_NAME "mrvl/sd8688_ap.bin"
++
++/********************************************************
++ Local Functions
++********************************************************/
++/**
++ * @brief This function reads the IO register.
++ *
++ * @param priv A pointer to uap_private structure
++ * @param reg register to be read
++ * @param dat A pointer to variable that keeps returned value
++ * @return UAP_STATUS_SUCCESS or UAP_STATUS_FAILURE
++ */
++static int
++sbi_read_ioreg(uap_private * priv, u32 reg, u8 * dat)
++{
++ struct sdio_mmc_card *card;
++ int ret = UAP_STATUS_FAILURE;
++
++ ENTER();
++
++ card = priv->uap_dev.card;
++ if (!card || !card->func) {
++ PRINTM(ERROR, "sbi_read_ioreg(): card or function is NULL!\n");
++ goto done;
++ }
++
++ *dat = sdio_readb(card->func, reg, &ret);
++ if (ret) {
++ PRINTM(ERROR, "sbi_read_ioreg(): sdio_readb failed! ret=%d\n", ret);
++ goto done;
++ }
++
++ PRINTM(INFO, "sbi_read_ioreg() priv=%p func=%d reg=%#x dat=%#x\n", priv,
++ card->func->num, reg, *dat);
++
++ done:
++ LEAVE();
++ return ret;
++}
++
++/**
++ * @brief This function writes the IO register.
++ *
++ * @param priv A pointer to uap_private structure
++ * @param reg register to be written
++ * @param dat the value to be written
++ * @return UAP_STATUS_SUCCESS or UAP_STATUS_FAILURE
++ */
++static int
++sbi_write_ioreg(uap_private * priv, u32 reg, u8 dat)
++{
++ struct sdio_mmc_card *card;
++ int ret = UAP_STATUS_FAILURE;
++
++ ENTER();
++
++ card = priv->uap_dev.card;
++ if (!card || !card->func) {
++ PRINTM(ERROR, "sbi_write_ioreg(): card or function is NULL!\n");
++ goto done;
++ }
++
++ PRINTM(INFO, "sbi_write_ioreg() priv=%p func=%d reg=%#x dat=%#x\n", priv,
++ card->func->num, reg, dat);
++
++ sdio_writeb(card->func, dat, reg, &ret);
++ if (ret) {
++ PRINTM(ERROR, "sbi_write_ioreg(): sdio_readb failed! ret=%d\n", ret);
++ goto done;
++ }
++
++ done:
++ LEAVE();
++ return ret;
++}
++
++/**
++ * @brief This function get rx_unit value
++ *
++ * @param priv A pointer to uap_private structure
++ * @return UAP_STATUS_SUCCESS or UAP_STATUS_FAILURE
++ */
++static int
++sd_get_rx_unit(uap_private * priv)
++{
++ int ret = UAP_STATUS_SUCCESS;
++ u8 reg;
++
++ ENTER();
++
++ ret = sbi_read_ioreg(priv, CARD_RX_UNIT_REG, ®);
++ if (ret == UAP_STATUS_SUCCESS)
++ sdio_rx_unit = reg;
++
++ LEAVE();
++ return ret;
++}
++
++/**
++ * @brief This function reads rx length
++ *
++ * @param priv A pointer to uap_private structure
++ * @param dat A pointer to keep returned data
++ * @return UAP_STATUS_SUCCESS or UAP_STATUS_FAILURE
++ */
++static int
++sd_read_rx_len(uap_private * priv, u16 * dat)
++{
++ int ret = UAP_STATUS_SUCCESS;
++ u8 reg;
++
++ ENTER();
++
++ ret = sbi_read_ioreg(priv, CARD_RX_LEN_REG, ®);
++ if (ret == UAP_STATUS_SUCCESS)
++ *dat = (u16) reg << sdio_rx_unit;
++
++ LEAVE();
++ return ret;
++}
++
++/**
++ * @brief This function reads fw status registers
++ *
++ * @param priv A pointer to uap_private structure
++ * @param dat A pointer to keep returned data
++ * @return UAP_STATUS_SUCCESS or UAP_STATUS_FAILURE
++ */
++static int
++sd_read_firmware_status(uap_private * priv, u16 * dat)
++{
++ int ret = UAP_STATUS_SUCCESS;
++ u8 fws0;
++ u8 fws1;
++
++ ENTER();
++
++ ret = sbi_read_ioreg(priv, CARD_FW_STATUS0_REG, &fws0);
++ if (ret < 0) {
++ LEAVE();
++ return UAP_STATUS_FAILURE;
++ }
++
++ ret = sbi_read_ioreg(priv, CARD_FW_STATUS1_REG, &fws1);
++ if (ret < 0) {
++ LEAVE();
++ return UAP_STATUS_FAILURE;
++ }
++
++ *dat = (((u16) fws1) << 8) | fws0;
++
++ LEAVE();
++ return UAP_STATUS_SUCCESS;
++}
++
++/**
++ * @brief This function polls the card status register.
++ *
++ * @param priv A pointer to uap_private structure
++ * @param bits the bit mask
++ * @return UAP_STATUS_SUCCESS or UAP_STATUS_FAILURE
++ */
++static int
++mv_sdio_poll_card_status(uap_private * priv, u8 bits)
++{
++ int tries;
++ u8 cs;
++
++ ENTER();
++
++ for (tries = 0; tries < MAX_POLL_TRIES; tries++) {
++ if (sbi_read_ioreg(priv, CARD_STATUS_REG, &cs) < 0)
++ break;
++ else if ((cs & bits) == bits) {
++ LEAVE();
++ return UAP_STATUS_SUCCESS;
++ }
++ udelay(10);
++ }
++
++ PRINTM(WARN, "mv_sdio_poll_card_status failed, tries = %d\n", tries);
++
++ LEAVE();
++ return UAP_STATUS_FAILURE;
++}
++
++/**
++ * @brief This function set the sdio bus width.
++ *
++ * @param priv A pointer to uap_private structure
++ * @param mode 1--1 bit mode, 4--4 bit mode
++ * @return UAP_STATUS_SUCCESS or UAP_STATUS_FAILURE
++ */
++#if 0
++static int
++sdio_set_bus_width(uap_private * priv, u8 mode)
++{
++ ENTER();
++ LEAVE();
++ return UAP_STATUS_SUCCESS;
++}
++#endif
++
++/**
++ * @brief This function reads data from the card.
++ *
++ * @param priv A pointer to uap_private structure
++ * @return UAP_STATUS_SUCCESS or UAP_STATUS_FAILURE
++ */
++static int
++sd_card_to_host(uap_private * priv)
++{
++ int ret = UAP_STATUS_SUCCESS;
++ u16 buf_len = 0;
++ int buf_block_len;
++ int blksz;
++ struct sk_buff *skb = NULL;
++ u16 type;
++ u8 *payload = NULL;
++ struct sdio_mmc_card *card = priv->uap_dev.card;
++
++ ENTER();
++
++ if (!card || !card->func) {
++ PRINTM(ERROR, "card or function is NULL!\n");
++ ret = UAP_STATUS_FAILURE;
++ goto exit;
++ }
++
++ /* Read the length of data to be transferred */
++ ret = sd_read_rx_len(priv, &buf_len);
++ if (ret < 0) {
++ PRINTM(ERROR, "card_to_host, read scratch reg failed\n");
++ ret = UAP_STATUS_FAILURE;
++ goto exit;
++ }
++
++ /* Allocate buffer */
++ blksz = SD_BLOCK_SIZE;
++ buf_block_len = (buf_len + blksz - 1) / blksz;
++ if (buf_len <= INTF_HEADER_LEN || (buf_block_len * blksz) > ALLOC_BUF_SIZE) {
++ PRINTM(ERROR, "card_to_host, invalid packet length: %d\n", buf_len);
++ ret = UAP_STATUS_FAILURE;
++ goto exit;
++ }
++#ifdef PXA3XX_DMA_ALIGN
++ skb = dev_alloc_skb(buf_block_len * blksz + PXA3XX_DMA_ALIGNMENT);
++#else
++ skb = dev_alloc_skb(buf_block_len * blksz);
++#endif
++ if (skb == NULL) {
++ PRINTM(WARN, "No free skb\n");
++ goto exit;
++ }
++#ifdef PXA3XX_DMA_ALIGN
++ if ((u32) skb->data & (PXA3XX_DMA_ALIGNMENT - 1)) {
++ skb_put(skb, (u32) skb->data & (PXA3XX_DMA_ALIGNMENT - 1));
++ skb_pull(skb, (u32) skb->data & (PXA3XX_DMA_ALIGNMENT - 1));
++ }
++#endif /* PXA3XX_DMA_ALIGN */
++
++ payload = skb->tail;
++ ret = sdio_readsb(card->func, payload, priv->uap_dev.ioport,
++ buf_block_len * blksz);
++ if (ret < 0) {
++ PRINTM(ERROR, "card_to_host, read iomem failed: %d\n", ret);
++ ret = UAP_STATUS_FAILURE;
++ goto exit;
++ }
++ HEXDUMP("SDIO Blk Rd", payload, blksz * buf_block_len);
++ /*
++ * This is SDIO specific header
++ * u16 length,
++ * u16 type (MV_TYPE_DAT = 0, MV_TYPE_CMD = 1, MV_TYPE_EVENT = 3)
++ */
++ buf_len = uap_le16_to_cpu(*(u16 *) & payload[0]);
++ type = uap_le16_to_cpu(*(u16 *) & payload[2]);
++ switch (type) {
++ case MV_TYPE_EVENT:
++ skb_put(skb, buf_len);
++ skb_pull(skb, INTF_HEADER_LEN);
++ uap_process_event(priv, skb->data, skb->len);
++ kfree_skb(skb);
++ skb = NULL;
++ break;
++ case MV_TYPE_CMD:
++ skb_put(skb, buf_len);
++ skb_pull(skb, INTF_HEADER_LEN);
++ priv->adapter->cmd_pending = FALSE;
++ if (priv->adapter->cmd_wait_option ==
++ HostCmd_OPTION_WAITFORRSP_SLEEPCONFIRM) {
++ priv->adapter->cmd_wait_option = FALSE;
++ uap_process_sleep_confirm_resp(priv, skb->data, skb->len);
++ } else if (priv->adapter->cmd_wait_option) {
++ memcpy(priv->adapter->CmdBuf, skb->data, skb->len);
++ priv->adapter->CmdSize = skb->len;
++ priv->adapter->cmd_wait_option = FALSE;
++ priv->adapter->CmdWaitQWoken = TRUE;
++ wake_up_interruptible(&priv->adapter->cmdwait_q);
++ }
++ kfree_skb(skb);
++ skb = NULL;
++ break;
++ case MV_TYPE_DAT:
++ skb_put(skb, buf_len);
++ skb_pull(skb, INTF_HEADER_LEN);
++ uap_process_rx_packet(priv, skb);
++ break;
++ default:
++ priv->stats.rx_errors++;
++ priv->stats.rx_dropped++;
++ /* Driver specified event and command resp should be handle here */
++ PRINTM(INFO, "Unknown PKT type:%d\n", type);
++ kfree_skb(skb);
++ skb = NULL;
++ break;
++ }
++ exit:
++ if (ret) {
++ if (skb)
++ kfree_skb(skb);
++ }
++
++ LEAVE();
++ return ret;
++}
++
++/**
++ * @brief This function enables the host interrupts mask
++ *
++ * @param priv A pointer to uap_private structure
++ * @param mask the interrupt mask
++ * @return UAP_STATUS_SUCCESS
++ */
++static int
++enable_host_int_mask(uap_private * priv, u8 mask)
++{
++ int ret = UAP_STATUS_SUCCESS;
++
++ ENTER();
++
++ /* Simply write the mask to the register */
++ ret = sbi_write_ioreg(priv, HOST_INT_MASK_REG, mask);
++
++ if (ret) {
++ PRINTM(WARN, "Unable to enable the host interrupt!\n");
++ ret = UAP_STATUS_FAILURE;
++ }
++
++ LEAVE();
++ return ret;
++}
++
++/** @brief This function disables the host interrupts mask.
++ *
++ * @param priv A pointer to uap_private structure
++ * @param mask the interrupt mask
++ * @return UAP_STATUS_SUCCESS or UAP_STATUS_FAILURE
++ */
++static int
++disable_host_int_mask(uap_private * priv, u8 mask)
++{
++ int ret = UAP_STATUS_SUCCESS;
++ u8 host_int_mask;
++
++ ENTER();
++
++ /* Read back the host_int_mask register */
++ ret = sbi_read_ioreg(priv, HOST_INT_MASK_REG, &host_int_mask);
++ if (ret) {
++ ret = UAP_STATUS_FAILURE;
++ goto done;
++ }
++
++ /* Update with the mask and write back to the register */
++ host_int_mask &= ~mask;
++ ret = sbi_write_ioreg(priv, HOST_INT_MASK_REG, host_int_mask);
++ if (ret < 0) {
++ PRINTM(WARN, "Unable to diable the host interrupt!\n");
++ ret = UAP_STATUS_FAILURE;
++ goto done;
++ }
++
++ done:
++ LEAVE();
++ return ret;
++}
++
++/********************************************************
++ Global Functions
++********************************************************/
++
++/**
++ * @brief This function handles the interrupt.
++ *
++ * @param func A pointer to sdio_func structure.
++ * @return n/a
++ */
++static void
++sbi_interrupt(struct sdio_func *func)
++{
++ struct sdio_mmc_card *card;
++ uap_private *priv;
++ u8 ireg = 0;
++ int ret = UAP_STATUS_SUCCESS;
++
++ ENTER();
++
++ card = sdio_get_drvdata(func);
++ if (!card || !card->priv) {
++ PRINTM(MSG, "%s: sbi_interrupt(%p) card or priv is NULL, card=%p\n",
++ __FUNCTION__, func, card);
++ LEAVE();
++ return;
++ }
++ priv = card->priv;
++#ifdef FW_WAKEUP_TIME
++ if ((priv->adapter->wt_pwrup_sending != 0L) &&
++ (priv->adapter->wt_int == 0L))
++ priv->adapter->wt_int = get_utimeofday();
++#endif
++
++ ireg = sdio_readb(card->func, HOST_INTSTATUS_REG, &ret);
++ if (ret) {
++ PRINTM(WARN, "sdio_read_ioreg: read int status register failed\n");
++ goto done;
++ }
++ if (ireg != 0) {
++ /*
++ * DN_LD_HOST_INT_STATUS and/or UP_LD_HOST_INT_STATUS
++ * Clear the interrupt status register and re-enable the interrupt
++ */
++ PRINTM(INFO, "sdio_ireg = 0x%x\n", ireg);
++ sdio_writeb(card->func,
++ ~(ireg) & (DN_LD_HOST_INT_STATUS | UP_LD_HOST_INT_STATUS),
++ HOST_INTSTATUS_REG, &ret);
++ if (ret) {
++ PRINTM(WARN,
++ "sdio_write_ioreg: clear int status register failed\n");
++ goto done;
++ }
++ }
++ OS_INT_DISABLE;
++ sd_ireg |= ireg;
++ OS_INT_RESTORE;
++
++ uap_interrupt(priv);
++ done:
++ LEAVE();
++}
++
++/**
++ * @brief This function probe the card
++ *
++ * @param func A pointer to sdio_func structure
++ * @param id A pointer to structure sd_device_id
++ * @return UAP_STATUS_SUCCESS or UAP_STATUS_FAILURE
++ */
++static int
++uap_probe(struct sdio_func *func, const struct sdio_device_id *id)
++{
++ int ret = UAP_STATUS_FAILURE;
++ struct sdio_mmc_card *card = NULL;
++
++ ENTER();
++
++ PRINTM(MSG, "%s: vendor=0x%4.04X device=0x%4.04X class=%d function=%d\n",
++ __FUNCTION__, func->vendor, func->device, func->class, func->num);
++
++ card = kzalloc(sizeof(struct sdio_mmc_card), GFP_KERNEL);
++ if (!card) {
++ ret = -ENOMEM;
++ goto done;
++ }
++
++ card->func = func;
++
++ if (!uap_add_card(card)) {
++ PRINTM(ERROR, "%s: uap_add_callback failed\n", __FUNCTION__);
++ kfree(card);
++ ret = UAP_STATUS_FAILURE;
++ goto done;
++ }
++
++ ret = UAP_STATUS_SUCCESS;
++
++ done:
++ LEAVE();
++ return ret;
++}
++
++/**
++ * @brief This function removes the card
++ *
++ * @param func A pointer to sdio_func structure
++ * @return N/A
++ */
++static void
++uap_remove(struct sdio_func *func)
++{
++ struct sdio_mmc_card *card;
++
++ ENTER();
++
++ if (func) {
++ card = sdio_get_drvdata(func);
++ if (card) {
++ uap_remove_card(card);
++ kfree(card);
++ }
++ }
++
++ LEAVE();
++}
++
++#ifdef CONFIG_PM
++/**
++ * @brief This function handles client driver suspend
++ *
++ * @param func A pointer to sdio_func structure
++ * @return UAP_STATUS_SUCCESS or UAP_STATUS_FAILURE
++ */
++int
++uap_suspend(struct sdio_func *func)
++{
++ ENTER();
++ LEAVE();
++ return 0;
++}
++
++/**
++ * @brief This function handles client driver resume
++ *
++ * @param func A pointer to sdio_func structure
++ * @return UAP_STATUS_SUCCESS or UAP_STATUS_FAILURE
++ */
++int
++uap_resume(struct sdio_func *func)
++{
++ ENTER();
++ LEAVE();
++ return 0;
++}
++#endif
++
++/** Device ID for SD8688 */
++#define SD_DEVICE_ID_8688_UAP 0x9104
++/** UAP IDs */
++static const struct sdio_device_id uap_ids[] = {
++ {SDIO_DEVICE(SDIO_VENDOR_ID_MARVELL, SD_DEVICE_ID_8688_UAP)},
++ {},
++};
++
++MODULE_DEVICE_TABLE(sdio, uap_ids);
++
++static struct sdio_driver uap_sdio = {
++ .name = "uap_sdio",
++ .id_table = uap_ids,
++ .probe = uap_probe,
++ .remove = uap_remove,
++#ifdef CONFIG_PM
++/* .suspend = uap_suspend, */
++/* .resume = uap_resume, */
++#endif
++
++};
++
++/**
++ * @brief This function registers the IF module in bus driver.
++ *
++ * @return UAP_STATUS_SUCCESS or UAP_STATUS_FAILURE
++ */
++int __init
++sbi_register()
++{
++ int ret = UAP_STATUS_SUCCESS;
++
++ ENTER();
++
++ /* SDIO Driver Registration */
++ if (sdio_register_driver(&uap_sdio) != 0) {
++ PRINTM(FATAL, "SDIO Driver Registration Failed \n");
++ ret = UAP_STATUS_FAILURE;
++ }
++
++ LEAVE();
++ return ret;
++}
++
++/**
++ * @brief This function de-registers the IF module in bus driver.
++ *
++ * @return n/a
++ */
++void __exit
++sbi_unregister(void)
++{
++ ENTER();
++
++ /* SDIO Driver Unregistration */
++ sdio_unregister_driver(&uap_sdio);
++
++ LEAVE();
++}
++
++/**
++ * @brief This function checks the interrupt status and handle it accordingly.
++ *
++ * @param priv A pointer to uap_private structure
++ * @param ireg A pointer to variable that keeps returned value
++ * @return UAP_STATUS_SUCCESS or UAP_STATUS_FAILURE
++ */
++int
++sbi_get_int_status(uap_private * priv, u8 * ireg)
++{
++ int ret = UAP_STATUS_SUCCESS;
++ u8 sdio_ireg = 0;
++ struct sdio_mmc_card *card = priv->uap_dev.card;
++
++ ENTER();
++
++ *ireg = 0;
++ OS_INT_DISABLE;
++ sdio_ireg = sd_ireg;
++ sd_ireg = 0;
++ OS_INT_RESTORE;
++
++ sdio_claim_host(card->func);
++
++ if (sdio_ireg & DN_LD_HOST_INT_STATUS) { /* tx_done INT */
++ if (!priv->uap_dev.cmd_sent) { /* tx_done already received */
++ PRINTM(INFO,
++ "warning: tx_done already received: tx_dnld_rdy=0x%x int status=0x%x\n",
++ priv->uap_dev.cmd_sent, sdio_ireg);
++ } else {
++ priv->uap_dev.cmd_sent = FALSE;
++ priv->uap_dev.data_sent = FALSE;
++ if ( (priv->uap_dev.netdev->reg_state == NETREG_REGISTERED) && (skb_queue_len(&priv->adapter->tx_queue) < TX_LOW_WATERMARK)) {
++ os_start_queue(priv);
++ }
++ }
++ }
++ if (sdio_ireg & UP_LD_HOST_INT_STATUS) {
++ sd_card_to_host(priv);
++ }
++
++ *ireg = sdio_ireg;
++ ret = UAP_STATUS_SUCCESS;
++ sdio_release_host(card->func);
++
++ LEAVE();
++ return ret;
++}
++
++/**
++ * @brief This function disables the host interrupts.
++ *
++ * @param priv A pointer to uap_private structure
++ * @return UAP_STATUS_SUCCESS or UAP_STATUS_FAILURE
++ */
++int
++sbi_disable_host_int(uap_private * priv)
++{
++ struct sdio_mmc_card *card = priv->uap_dev.card;
++ int ret;
++
++ ENTER();
++
++ sdio_claim_host(card->func);
++ ret = disable_host_int_mask(priv, HIM_DISABLE);
++ sdio_release_host(card->func);
++
++ LEAVE();
++ return ret;
++}
++
++/**
++ * @brief This function enables the host interrupts.
++ *
++ * @param priv A pointer to uap_private structure
++ * @return UAP_STATUS_SUCCESS
++ */
++int
++sbi_enable_host_int(uap_private * priv)
++{
++ struct sdio_mmc_card *card = priv->uap_dev.card;
++ int ret;
++
++ ENTER();
++
++ sdio_claim_host(card->func);
++ ret = enable_host_int_mask(priv, HIM_ENABLE);
++ sdio_release_host(card->func);
++
++ LEAVE();
++ return ret;
++}
++
++/**
++ * @brief This function de-registers the device.
++ *
++ * @param priv A pointer to uap_private structure
++ * @return UAP_STATUS_SUCCESS
++ */
++int
++sbi_unregister_dev(uap_private * priv)
++{
++ struct sdio_mmc_card *card = priv->uap_dev.card;
++
++ ENTER();
++
++ if (!card || !card->func) {
++ PRINTM(ERROR, "Error: card or function is NULL!\n");
++ goto done;
++ }
++
++ sdio_claim_host(card->func);
++ sdio_release_irq(card->func);
++ sdio_disable_func(card->func);
++ sdio_release_host(card->func);
++
++ sdio_set_drvdata(card->func, NULL);
++
++ done:
++ LEAVE();
++ return UAP_STATUS_SUCCESS;
++}
++
++/**
++ * @brief This function registers the device.
++ *
++ * @param priv A pointer to uap_private structure
++ * @return UAP_STATUS_SUCCESS or UAP_STATUS_FAILURE
++ */
++int
++sbi_register_dev(uap_private * priv)
++{
++ int ret = UAP_STATUS_FAILURE;
++ u8 reg;
++ struct sdio_mmc_card *card = priv->uap_dev.card;
++ struct sdio_func *func;
++
++ ENTER();
++
++ if (!card || !card->func) {
++ PRINTM(ERROR, "Error: card or function is NULL!\n");
++ goto done;
++ }
++
++ func = card->func;
++
++ /* Initialize the private structure */
++ priv->uap_dev.ioport = 0;
++
++ sdio_claim_host(func);
++
++ ret = sdio_enable_func(func);
++ if (ret) {
++ PRINTM(FATAL, "sdio_enable_func() failed: ret=%d\n", ret);
++ goto release_host;
++ }
++
++ ret = sdio_claim_irq(func, sbi_interrupt);
++ if (ret) {
++ PRINTM(FATAL, "sdio_claim_irq failed: ret=%d\n", ret);
++ goto disable_func;
++ }
++
++ /* Read the IO port */
++ ret = sbi_read_ioreg(priv, IO_PORT_0_REG, ®);
++ if (ret)
++ goto release_irq;
++ else
++ priv->uap_dev.ioport |= reg;
++
++ ret = sbi_read_ioreg(priv, IO_PORT_1_REG, ®);
++ if (ret)
++ goto release_irq;
++ else
++ priv->uap_dev.ioport |= (reg << 8);
++
++ ret = sbi_read_ioreg(priv, IO_PORT_2_REG, ®);
++ if (ret)
++ goto release_irq;
++ else
++ priv->uap_dev.ioport |= (reg << 16);
++
++ PRINTM(INFO, "SDIO FUNC #%d IO port: 0x%x\n", func->num,
++ priv->uap_dev.ioport);
++
++ ret = sdio_set_block_size(card->func, SD_BLOCK_SIZE);
++ if (ret) {
++ PRINTM(ERROR, "%s: cannot set SDIO block size\n", __FUNCTION__);
++ ret = UAP_STATUS_FAILURE;
++ goto release_irq;
++ }
++ priv->hotplug_device = &func->dev;
++
++ if (helper_name == NULL) {
++ helper_name = DEFAULT_HELPER_NAME;
++ }
++ if (fw_name == NULL) {
++ fw_name = DEFAULT_FW_NAME;
++ }
++ sdio_release_host(func);
++
++ sdio_set_drvdata(func, card);
++
++ ret = UAP_STATUS_SUCCESS;
++ goto done;
++
++ release_irq:
++ sdio_release_irq(func);
++ disable_func:
++ sdio_disable_func(func);
++ release_host:
++ sdio_release_host(func);
++
++ done:
++ LEAVE();
++ return ret;
++}
++
++/**
++ * @brief This function sends data to the card.
++ *
++ * @param priv A pointer to uap_private structure
++ * @param payload A pointer to the data/cmd buffer
++ * @param nb the length of data/cmd
++ * @return UAP_STATUS_SUCCESS or UAP_STATUS_FAILURE
++ */
++int
++sbi_host_to_card(uap_private * priv, u8 * payload, u16 nb)
++{
++ struct sdio_mmc_card *card = priv->uap_dev.card;
++ int ret = UAP_STATUS_SUCCESS;
++ int buf_block_len;
++ int blksz;
++ int i = 0;
++ u8 *buf = NULL;
++#ifdef PXA3XX_DMA_ALIGN
++ void *tmpbuf = NULL;
++ int tmpbufsz;
++#endif
++
++ ENTER();
++
++ if (!card || !card->func) {
++ PRINTM(ERROR, "card or function is NULL!\n");
++ LEAVE();
++ return UAP_STATUS_FAILURE;
++ }
++ buf = payload;
++#ifdef PXA3XX_DMA_ALIGN
++ if ((u32) payload & (PXA3XX_DMA_ALIGNMENT - 1)) {
++ tmpbufsz = ALIGN_SZ(nb, PXA3XX_DMA_ALIGNMENT);
++ tmpbuf = kmalloc(tmpbufsz, GFP_KERNEL);
++ memset(tmpbuf, 0, tmpbufsz);
++ /* Ensure 8-byte aligned CMD buffer */
++ buf = (u8 *) ALIGN_ADDR(tmpbuf, PXA3XX_DMA_ALIGNMENT);
++ memcpy(buf, payload, nb);
++ }
++#endif
++ /* Allocate buffer and copy payload */
++ blksz = SD_BLOCK_SIZE;
++ buf_block_len = (nb + blksz - 1) / blksz;
++ sdio_claim_host(card->func);
++#define MAX_WRITE_IOMEM_RETRY 2
++ priv->uap_dev.cmd_sent = TRUE;
++ priv->uap_dev.data_sent = TRUE;
++ do {
++ /* Transfer data to card */
++ ret = sdio_writesb(card->func, priv->uap_dev.ioport, buf,
++ buf_block_len * blksz);
++ if (ret < 0) {
++ i++;
++ PRINTM(ERROR, "host_to_card, write iomem (%d) failed: %d\n", i,
++ ret);
++ ret = UAP_STATUS_FAILURE;
++ if (i > MAX_WRITE_IOMEM_RETRY)
++ goto exit;
++ } else {
++ HEXDUMP("SDIO Blk Wr", payload, nb);
++ }
++ } while (ret == UAP_STATUS_FAILURE);
++ exit:
++ sdio_release_host(card->func);
++#ifdef PXA3XX_DMA_ALIGN
++ if (tmpbuf)
++ kfree(tmpbuf);
++#endif
++ if (ret == UAP_STATUS_FAILURE) {
++ priv->uap_dev.cmd_sent = FALSE;
++ priv->uap_dev.data_sent = FALSE;
++ }
++ LEAVE();
++ return ret;
++}
++
++/**
++ * @brief This function reads CIS information.
++ *
++ * @param priv A pointer to uap_private structure
++ * @param cisinfo A pointer to CIS information output buffer
++ * @param cislen A pointer to length of CIS info output buffer
++ * @return UAP_STATUS_SUCCESS or UAP_STATUS_FAILURE
++ */
++#if 0
++static int
++sbi_get_cis_info(uap_private * priv, void *cisinfo, int *cislen)
++{
++#define CIS_PTR (0x8000)
++ struct sdio_mmc_card *card = priv->uap_dev.card;
++ unsigned int i, cis_ptr = CIS_PTR;
++ int ret = UAP_STATUS_FAILURE;
++
++ ENTER();
++
++ if (!card || !card->func) {
++ PRINTM(ERROR, "sbi_get_cis_info(): card or function is NULL!\n");
++ goto exit;
++ }
++#define MAX_SDIO_CIS_INFO_LEN (256)
++ if (!cisinfo || (*cislen < MAX_SDIO_CIS_INFO_LEN)) {
++ PRINTM(WARN, "ERROR! get_cis_info: insufficient buffer passed\n");
++ goto exit;
++ }
++
++ *cislen = MAX_SDIO_CIS_INFO_LEN;
++
++ sdio_claim_host(card->func);
++
++ PRINTM(INFO, "cis_ptr=%#x\n", cis_ptr);
++
++ /* Read the Tuple Data */
++ for (i = 0; i < *cislen; i++) {
++ ((unsigned char *) cisinfo)[i] =
++ sdio_readb(card->func, cis_ptr + i, &ret);
++ if (ret) {
++ PRINTM(WARN, "get_cis_info error: ret=%d\n", ret);
++ ret = UAP_STATUS_FAILURE;
++ goto done;
++ }
++ PRINTM(INFO, "cisinfo[%d]=%#x\n", i, ((unsigned char *) cisinfo)[i]);
++ }
++
++ done:
++ sdio_release_host(card->func);
++ exit:
++ LEAVE();
++ return ret;
++}
++#endif
++/**
++ * @brief This function downloads helper image to the card.
++ *
++ * @param priv A pointer to uap_private structure
++ * @return UAP_STATUS_SUCCESS or UAP_STATUS_FAILURE
++ */
++int
++sbi_prog_helper(uap_private * priv)
++{
++ struct sdio_mmc_card *card = priv->uap_dev.card;
++ u8 *helper = NULL;
++ int helperlen;
++ int ret = UAP_STATUS_SUCCESS;
++ void *tmphlprbuf = NULL;
++ int tmphlprbufsz;
++ u8 *hlprbuf;
++ int hlprblknow;
++ u32 tx_len;
++#ifdef FW_DOWNLOAD_SPEED
++ u32 tv1, tv2;
++#endif
++
++ ENTER();
++
++ if (!card || !card->func) {
++ PRINTM(ERROR, "sbi_prog_helper(): card or function is NULL!\n");
++ goto done;
++ }
++
++ if (priv->fw_helper) {
++ helper = (u8 *) priv->fw_helper->data;
++ helperlen = priv->fw_helper->size;
++ } else {
++ PRINTM(MSG, "No helper image found! Terminating download.\n");
++ LEAVE();
++ return UAP_STATUS_FAILURE;
++ }
++
++ PRINTM(INFO, "Downloading helper image (%d bytes), block size %d bytes\n",
++ helperlen, SD_BLOCK_SIZE);
++
++#ifdef FW_DOWNLOAD_SPEED
++ tv1 = get_utimeofday();
++#endif
++
++#ifdef PXA3XX_DMA_ALIGN
++ tmphlprbufsz = ALIGN_SZ(UAP_UPLD_SIZE, PXA3XX_DMA_ALIGNMENT);
++#else /* !PXA3XX_DMA_ALIGN */
++ tmphlprbufsz = UAP_UPLD_SIZE;
++#endif /* !PXA3XX_DMA_ALIGN */
++ tmphlprbuf = kmalloc(tmphlprbufsz, GFP_KERNEL);
++ if (!tmphlprbuf) {
++ PRINTM(ERROR,
++ "Unable to allocate buffer for helper. Terminating download\n");
++ ret = UAP_STATUS_FAILURE;
++ goto done;
++ }
++ memset(tmphlprbuf, 0, tmphlprbufsz);
++#ifdef PXA3XX_DMA_ALIGN
++ hlprbuf = (u8 *) ALIGN_ADDR(tmphlprbuf, PXA3XX_DMA_ALIGNMENT);
++#else /* !PXA3XX_DMA_ALIGN */
++ hlprbuf = (u8 *) tmphlprbuf;
++#endif /* !PXA3XX_DMA_ALIGN */
++
++ sdio_claim_host(card->func);
++
++ /* Perform helper data transfer */
++ tx_len = (FIRMWARE_TRANSFER_NBLOCK * SD_BLOCK_SIZE) - INTF_HEADER_LEN;
++ hlprblknow = 0;
++ do {
++ /* The host polls for the DN_LD_CARD_RDY and CARD_IO_READY bits */
++ ret = mv_sdio_poll_card_status(priv, CARD_IO_READY | DN_LD_CARD_RDY);
++ if (ret < 0) {
++ PRINTM(FATAL, "Helper download poll status timeout @ %d\n",
++ hlprblknow);
++ goto done;
++ }
++
++ /* More data? */
++ if (hlprblknow >= helperlen)
++ break;
++
++ /* Set blocksize to transfer - checking for last block */
++ if (helperlen - hlprblknow < tx_len)
++ tx_len = helperlen - hlprblknow;
++
++ /* Set length to the 4-byte header */
++ *(u32 *) hlprbuf = uap_cpu_to_le32(tx_len);
++
++ /* Copy payload to buffer */
++ memcpy(&hlprbuf[INTF_HEADER_LEN], &helper[hlprblknow], tx_len);
++
++ PRINTM(INFO, ".");
++
++ /* Send data */
++ ret = sdio_writesb(card->func, priv->uap_dev.ioport,
++ hlprbuf, FIRMWARE_TRANSFER_NBLOCK * SD_BLOCK_SIZE);
++
++ if (ret < 0) {
++ PRINTM(FATAL, "IO error during helper download @ %d\n", hlprblknow);
++ goto done;
++ }
++
++ hlprblknow += tx_len;
++ } while (TRUE);
++
++#ifdef FW_DOWNLOAD_SPEED
++ tv2 = get_utimeofday();
++ PRINTM(INFO, "helper: %ld.%03ld.%03ld ", tv1 / 1000000,
++ (tv1 % 1000000) / 1000, tv1 % 1000);
++ PRINTM(INFO, " -> %ld.%03ld.%03ld ", tv2 / 1000000, (tv2 % 1000000) / 1000,
++ tv2 % 1000);
++ tv2 -= tv1;
++ PRINTM(INFO, " == %ld.%03ld.%03ld\n", tv2 / 1000000, (tv2 % 1000000) / 1000,
++ tv2 % 1000);
++#endif
++
++ /* Write last EOF data */
++ PRINTM(INFO, "\nTransferring helper image EOF block\n");
++ memset(hlprbuf, 0x0, SD_BLOCK_SIZE);
++ ret = sdio_writesb(card->func, priv->uap_dev.ioport,
++ hlprbuf, SD_BLOCK_SIZE);
++
++ if (ret < 0) {
++ PRINTM(FATAL, "IO error in writing helper image EOF block\n");
++ goto done;
++ }
++
++ ret = UAP_STATUS_SUCCESS;
++
++ done:
++ sdio_release_host(card->func);
++ if (tmphlprbuf)
++ kfree(tmphlprbuf);
++
++ LEAVE();
++ return ret;
++}
++
++/**
++ * @brief This function downloads firmware image to the card.
++ *
++ * @param priv A pointer to uap_private structure
++ * @return UAP_STATUS_SUCCESS or UAP_STATUS_FAILURE
++ */
++int
++sbi_prog_fw_w_helper(uap_private * priv)
++{
++ struct sdio_mmc_card *card = priv->uap_dev.card;
++ u8 *firmware = NULL;
++ int firmwarelen;
++ u8 base0;
++ u8 base1;
++ int ret = UAP_STATUS_SUCCESS;
++ int offset;
++ void *tmpfwbuf = NULL;
++ int tmpfwbufsz;
++ u8 *fwbuf;
++ u16 len;
++ int txlen = 0;
++ int tx_blocks = 0;
++ int i = 0;
++ int tries = 0;
++#ifdef FW_DOWNLOAD_SPEED
++ u32 tv1, tv2;
++#endif
++
++ ENTER();
++
++ if (!card || !card->func) {
++ PRINTM(ERROR, "sbi_prog_fw_w_helper(): card or function is NULL!\n");
++ goto done;
++ }
++
++ if (priv->firmware) {
++ firmware = (u8 *) priv->firmware->data;
++ firmwarelen = priv->firmware->size;
++ } else {
++ PRINTM(MSG, "No firmware image found! Terminating download.\n");
++ LEAVE();
++ return UAP_STATUS_FAILURE;
++ }
++
++ PRINTM(INFO, "Downloading FW image (%d bytes)\n", firmwarelen);
++
++#ifdef FW_DOWNLOAD_SPEED
++ tv1 = get_utimeofday();
++#endif
++
++#ifdef PXA3XX_DMA_ALIGN
++ tmpfwbufsz = ALIGN_SZ(UAP_UPLD_SIZE, PXA3XX_DMA_ALIGNMENT);
++#else /* PXA3XX_DMA_ALIGN */
++ tmpfwbufsz = UAP_UPLD_SIZE;
++#endif /* PXA3XX_DMA_ALIGN */
++ tmpfwbuf = kmalloc(tmpfwbufsz, GFP_KERNEL);
++ if (!tmpfwbuf) {
++ PRINTM(ERROR,
++ "Unable to allocate buffer for firmware. Terminating download.\n");
++ ret = UAP_STATUS_FAILURE;
++ goto done;
++ }
++ memset(tmpfwbuf, 0, tmpfwbufsz);
++#ifdef PXA3XX_DMA_ALIGN
++ /* Ensure 8-byte aligned firmware buffer */
++ fwbuf = (u8 *) ALIGN_ADDR(tmpfwbuf, PXA3XX_DMA_ALIGNMENT);
++#else /* PXA3XX_DMA_ALIGN */
++ fwbuf = (u8 *) tmpfwbuf;
++#endif /* PXA3XX_DMA_ALIGN */
++
++ sdio_claim_host(card->func);
++
++ /* Perform firmware data transfer */
++ offset = 0;
++ do {
++ /* The host polls for the DN_LD_CARD_RDY and CARD_IO_READY bits */
++ ret = mv_sdio_poll_card_status(priv, CARD_IO_READY | DN_LD_CARD_RDY);
++ if (ret < 0) {
++ PRINTM(FATAL, "FW download with helper poll status timeout @ %d\n",
++ offset);
++ goto done;
++ }
++
++ /* More data? */
++ if (offset >= firmwarelen)
++ break;
++
++ for (tries = 0; tries < MAX_POLL_TRIES; tries++) {
++ if ((ret = sbi_read_ioreg(priv, HOST_F1_RD_BASE_0, &base0)) < 0) {
++ PRINTM(WARN, "Dev BASE0 register read failed:"
++ " base0=0x%04X(%d). Terminating download.\n", base0,
++ base0);
++ ret = UAP_STATUS_FAILURE;
++ goto done;
++ }
++ if ((ret = sbi_read_ioreg(priv, HOST_F1_RD_BASE_1, &base1)) < 0) {
++ PRINTM(WARN, "Dev BASE1 register read failed:"
++ " base1=0x%04X(%d). Terminating download.\n", base1,
++ base1);
++ ret = UAP_STATUS_FAILURE;
++ goto done;
++ }
++ len = (((u16) base1) << 8) | base0;
++
++ /* For SD8688 wait until the length is not 0, 1 or 2 before
++ downloading the first FW block, since BOOT code writes the
++ register to indicate the helper/FW download winner, the value
++ could be 1 or 2 (Func1 or Func2). */
++ if ((len && offset) || (len > 2))
++ break;
++ udelay(10);
++ }
++
++ if (len == 0)
++ break;
++ else if (len > UAP_UPLD_SIZE) {
++ PRINTM(FATAL, "FW download failure @ %d, invalid length %d\n",
++ offset, len);
++ ret = UAP_STATUS_FAILURE;
++ goto done;
++ }
++
++ txlen = len;
++
++ if (len & BIT(0)) {
++ i++;
++ if (i > MAX_WRITE_IOMEM_RETRY) {
++ PRINTM(FATAL,
++ "FW download failure @ %d, over max retry count\n",
++ offset);
++ ret = UAP_STATUS_FAILURE;
++ goto done;
++ }
++ PRINTM(ERROR, "FW CRC error indicated by the helper:"
++ " len = 0x%04X, txlen = %d\n", len, txlen);
++ len &= ~BIT(0);
++ /* Setting this to 0 to resend from same offset */
++ txlen = 0;
++ } else {
++ i = 0;
++
++ /* Set blocksize to transfer - checking for last block */
++ if (firmwarelen - offset < txlen) {
++ txlen = firmwarelen - offset;
++ }
++ PRINTM(INFO, ".");
++
++ tx_blocks = (txlen + SD_BLOCK_SIZE - 1) / SD_BLOCK_SIZE;
++
++ /* Copy payload to buffer */
++ memcpy(fwbuf, &firmware[offset], txlen);
++ }
++
++ /* Send data */
++ ret = sdio_writesb(card->func, priv->uap_dev.ioport,
++ fwbuf, tx_blocks * SD_BLOCK_SIZE);
++
++ if (ret < 0) {
++ PRINTM(ERROR, "FW download, write iomem (%d) failed @ %d\n", i,
++ offset);
++ if (sbi_write_ioreg(priv, CONFIGURATION_REG, 0x04) < 0) {
++ PRINTM(ERROR, "write ioreg failed (CFG)\n");
++ }
++ }
++
++ offset += txlen;
++ } while (TRUE);
++
++ PRINTM(INFO, "\nFW download over, size %d bytes\n", offset);
++
++ ret = UAP_STATUS_SUCCESS;
++ done:
++#ifdef FW_DOWNLOAD_SPEED
++ tv2 = get_utimeofday();
++ PRINTM(INFO, "FW: %ld.%03ld.%03ld ", tv1 / 1000000,
++ (tv1 % 1000000) / 1000, tv1 % 1000);
++ PRINTM(INFO, " -> %ld.%03ld.%03ld ", tv2 / 1000000,
++ (tv2 % 1000000) / 1000, tv2 % 1000);
++ tv2 -= tv1;
++ PRINTM(INFO, " == %ld.%03ld.%03ld\n", tv2 / 1000000,
++ (tv2 % 1000000) / 1000, tv2 % 1000);
++#endif
++ sdio_release_host(card->func);
++ if (tmpfwbuf)
++ kfree(tmpfwbuf);
++
++ LEAVE();
++ return ret;
++}
++
++/**
++ * @brief This function checks if the firmware is ready to accept
++ * command or not.
++ *
++ * @param priv A pointer to uap_private structure
++ * @param pollnum Poll number
++ * @return UAP_STATUS_SUCCESS or UAP_STATUS_FAILURE
++ */
++int
++sbi_check_fw_status(uap_private * priv, int pollnum)
++{
++ struct sdio_mmc_card *card = priv->uap_dev.card;
++ int ret = UAP_STATUS_SUCCESS;
++ u16 firmwarestat;
++ int tries;
++
++ ENTER();
++
++ sdio_claim_host(card->func);
++
++ /* Wait for firmware initialization event */
++ for (tries = 0; tries < pollnum; tries++) {
++ if ((ret = sd_read_firmware_status(priv, &firmwarestat)) < 0)
++ continue;
++ if (firmwarestat == FIRMWARE_READY) {
++ ret = UAP_STATUS_SUCCESS;
++ break;
++ } else {
++ mdelay(10);
++ ret = UAP_STATUS_FAILURE;
++ }
++ }
++
++ if (ret < 0)
++ goto done;
++
++ ret = UAP_STATUS_SUCCESS;
++ sd_get_rx_unit(priv);
++
++ done:
++ sdio_release_host(card->func);
++
++ LEAVE();
++ return ret;
++}
++
++/**
++ * @brief This function set bus clock on/off
++ *
++ * @param priv A pointer to uap_private structure
++ * @param option TRUE--on , FALSE--off
++ * @return UAP_STATUS_SUCCESS
++ */
++#if 0
++static int
++sbi_set_bus_clock(uap_private * priv, u8 option)
++{
++ ENTER();
++ LEAVE();
++ return UAP_STATUS_SUCCESS;
++}
++#endif
++
++/**
++ * @brief This function wakeup firmware
++ *
++ * @param priv A pointer to uap_private structure
++ * @return UAP_STATUS_SUCCESS or UAP_STATUS_FAILURE
++ */
++int
++sbi_wakeup_firmware(uap_private * priv)
++{
++ struct sdio_mmc_card *card = priv->uap_dev.card;
++ int ret = UAP_STATUS_SUCCESS;
++
++ ENTER();
++
++ if (!card || !card->func) {
++ PRINTM(ERROR, "card or function is NULL!\n");
++ LEAVE();
++ return UAP_STATUS_FAILURE;
++ }
++ sdio_claim_host(card->func);
++ sdio_writeb(card->func, HOST_POWER_UP, CONFIGURATION_REG, &ret);
++ sdio_release_host(card->func);
++ LEAVE();
++ return ret;
++}
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/libertas_uap/uap_sdio_mmc.h backports-3.18.1-1/drivers/net/wireless/libertas_uap/uap_sdio_mmc.h
+--- backports-3.18.1-1.org/drivers/net/wireless/libertas_uap/uap_sdio_mmc.h 1970-01-01 01:00:00.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/libertas_uap/uap_sdio_mmc.h 2014-12-29 20:37:43.955764567 +0100
+@@ -0,0 +1,136 @@
++/** @file uap_sdio_mmc.h
++ * @brief This file contains SDIO IF (interface) module
++ * related macros, enum, and structure.
++ *
++ * Copyright (C) 2007-2009, Marvell International Ltd.
++ *
++ * This software file (the "File") is distributed by Marvell International
++ * Ltd. under the terms of the GNU General Public License Version 2, June 1991
++ * (the "License"). You may use, redistribute and/or modify this File in
++ * accordance with the terms and conditions of the License, a copy of which
++ * is available along with the File in the gpl.txt file or by writing to
++ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ * 02111-1307 or on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
++ *
++ * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
++ * ARE EXPRESSLY DISCLAIMED. The License provides additional details about
++ * this warranty disclaimer.
++ *
++ */
++/****************************************************
++Change log:
++ 10/10/07: initial version
++****************************************************/
++
++#ifndef _UAP_SDIO_MMC_H
++#define _UAP_SDIO_MMC_H
++
++#include <linux/mmc/sdio.h>
++#include <linux/mmc/sdio_ids.h>
++#include <linux/mmc/sdio_func.h>
++#include <linux/mmc/card.h>
++
++#include "uap_headers.h"
++
++/** The number of times to try when waiting for downloaded firmware to
++ become active. (polling the scratch register). */
++#define MAX_FIRMWARE_POLL_TRIES 100
++
++/** Firmware ready */
++#define FIRMWARE_READY 0xfedc
++
++/** Number of firmware blocks to transfer */
++#define FIRMWARE_TRANSFER_NBLOCK 2
++
++/* Host Control Registers */
++/** Host Control Registers : I/O port 0 */
++#define IO_PORT_0_REG 0x00
++/** Host Control Registers : I/O port 1 */
++#define IO_PORT_1_REG 0x01
++/** Host Control Registers : I/O port 2 */
++#define IO_PORT_2_REG 0x02
++
++/** Host Control Registers : Configuration */
++#define CONFIGURATION_REG 0x03
++/** Host Control Registers : Host without Command 53 finish host */
++#define HOST_WO_CMD53_FINISH_HOST (0x1U << 2)
++/** Host Control Registers : Host power up */
++#define HOST_POWER_UP (0x1U << 1)
++/** Host Control Registers : Host power down */
++#define HOST_POWER_DOWN (0x1U << 0)
++
++/** Host Control Registers : Host interrupt mask */
++#define HOST_INT_MASK_REG 0x04
++/** Host Control Registers : Upload host interrupt mask */
++#define UP_LD_HOST_INT_MASK (0x1U)
++/** Host Control Registers : Download host interrupt mask */
++#define DN_LD_HOST_INT_MASK (0x2U)
++/** Enable Host interrupt mask */
++#define HIM_ENABLE (UP_LD_HOST_INT_MASK | DN_LD_HOST_INT_MASK)
++/** Disable Host interrupt mask */
++#define HIM_DISABLE 0xff
++
++/** Host Control Registers : Host interrupt status */
++#define HOST_INTSTATUS_REG 0x05
++/** Host Control Registers : Upload host interrupt status */
++#define UP_LD_HOST_INT_STATUS (0x1U)
++/** Host Control Registers : Download host interrupt status */
++#define DN_LD_HOST_INT_STATUS (0x2U)
++
++/** Host F1 read base 0 */
++#define HOST_F1_RD_BASE_0 0x10
++/** Host F1 read base 1 */
++#define HOST_F1_RD_BASE_1 0x11
++
++/** Card Control Registers : Card status register */
++#define CARD_STATUS_REG 0x20
++/** Card Control Registers : Card I/O ready */
++#define CARD_IO_READY (0x1U << 3)
++/** Card Control Registers : CIS card ready */
++#define CIS_CARD_RDY (0x1U << 2)
++/** Card Control Registers : Upload card ready */
++#define UP_LD_CARD_RDY (0x1U << 1)
++/** Card Control Registers : Download card ready */
++#define DN_LD_CARD_RDY (0x1U << 0)
++
++/** Card Control Registers : Card OCR 0 register */
++#define CARD_OCR_0_REG 0x34
++/** Card Control Registers : Card OCR 1 register */
++#define CARD_OCR_1_REG 0x35
++
++/** Firmware status 0 register */
++#define CARD_FW_STATUS0_REG 0x40
++/** Firmware status 1 register */
++#define CARD_FW_STATUS1_REG 0x41
++/** Rx length register */
++#define CARD_RX_LEN_REG 0x42
++/** Rx unit register */
++#define CARD_RX_UNIT_REG 0x43
++
++/** Chip Id Register 0 */
++#define CARD_CHIP_ID_0_REG 0x801c
++/** Chip Id Register 1 */
++#define CARD_CHIP_ID_1_REG 0x801d
++
++#ifdef PXA3XX_DMA_ALIGN
++/** DMA alignment value for PXA3XX platforms */
++#define PXA3XX_DMA_ALIGNMENT 8
++/** Macros for Data Alignment : size */
++#define ALIGN_SZ(p, a) \
++ (((p) + ((a) - 1)) & ~((a) - 1))
++
++/** Macros for Data Alignment : address */
++#define ALIGN_ADDR(p, a) \
++ ((((u32)(p)) + (((u32)(a)) - 1)) & ~(((u32)(a)) - 1))
++#endif /* PXA3XX_DMA_ALIGN */
++
++struct sdio_mmc_card
++{
++ /** sdio_func structure pointer */
++ struct sdio_func *func;
++ /** uap_private structure pointer */
++ uap_private *priv;
++};
++
++#endif /* _UAP_SDIO_MMC_H */
+diff -Naur backports-3.18.1-1.org/drivers/net/wireless/Makefile backports-3.18.1-1/drivers/net/wireless/Makefile
+--- backports-3.18.1-1.org/drivers/net/wireless/Makefile 2014-12-21 22:37:15.000000000 +0100
++++ backports-3.18.1-1/drivers/net/wireless/Makefile 2014-12-29 20:40:33.632440784 +0100
+@@ -60,3 +60,5 @@
+
+ obj-$(CPTCFG_CW1200) += cw1200/
+ obj-$(CPTCFG_RSI_91X) += rsi/
++
++obj-$(CPTCFG_LIBERTAS_UAP) += libertas_uap/
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. db9d194a6cc4efa8251415895e823e4db254c7a4
by git＠ipfire.org 29 Dec '14
by git＠ipfire.org 29 Dec '14
29 Dec '14
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via db9d194a6cc4efa8251415895e823e4db254c7a4 (commit)
from 405d20bcb33efccd16a7164e318adeb954d7639a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit db9d194a6cc4efa8251415895e823e4db254c7a4
Author: Ben Schweikert <trikolon(a)ipfire.org>
Date: Mon Nov 24 17:54:05 2014 +0100
Nginx: New Version - 1.6.2
-----------------------------------------------------------------------
Summary of changes:
lfs/nginx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Difference in files:
diff --git a/lfs/nginx b/lfs/nginx
index b640dcc..63d3698 100644
--- a/lfs/nginx
+++ b/lfs/nginx
@@ -24,7 +24,7 @@
include Config
-VER = 1.4.4
+VER = 1.6.2
THISAPP = nginx-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = nginx
-PAK_VER = 3
+PAK_VER = 4
###############################################################################
# Top-level Rules
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 5dfaba1cbeae9087f3949860a02caa9f
+$(DL_FILE)_MD5 = d1b55031ae6e4bce37f8776b94d8b930
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. cba4ea7b3e10ef8b96bb386389d947aa3e7763bd
by git＠ipfire.org 27 Dec '14
by git＠ipfire.org 27 Dec '14
27 Dec '14
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via cba4ea7b3e10ef8b96bb386389d947aa3e7763bd (commit)
from 1d4cf0a3b6862f2a12d7c68e1c866bd8d9cd59a7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit cba4ea7b3e10ef8b96bb386389d947aa3e7763bd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Dec 27 20:36:31 2014 +0000
ppp: Re-add ifname patch
This is needed so that we can give zones a proper name
instead of calling them ppp0 and so on.
-----------------------------------------------------------------------
Summary of changes:
ppp/patches/ppp-2.4.2-ifname.patch | 126 +++++++++++++++++++++++++++++++++++++
ppp/ppp.nm | 2 +-
2 files changed, 127 insertions(+), 1 deletion(-)
create mode 100644 ppp/patches/ppp-2.4.2-ifname.patch
Difference in files:
diff --git a/ppp/patches/ppp-2.4.2-ifname.patch b/ppp/patches/ppp-2.4.2-ifname.patch
new file mode 100644
index 0000000..50b96c9
--- /dev/null
+++ b/ppp/patches/ppp-2.4.2-ifname.patch
@@ -0,0 +1,126 @@
+--- ./pppd/main.c.orig 2004-07-19 12:35:22.000000000 +0000
++++ ./pppd/main.c 2004-07-19 14:34:38.542120946 +0000
+@@ -98,7 +98,7 @@
+ static const char rcsid[] = RCSID;
+
+ /* interface vars */
+-char ifname[32]; /* Interface name */
++char ifname[MAXIFNAMELEN]; /* Interface name */
+ int ifunit; /* Interface unit number */
+
+ struct channel *the_channel;
+@@ -261,13 +261,6 @@
+ NULL
+ };
+
+-/*
+- * If PPP_DRV_NAME is not defined, use the default "ppp" as the device name.
+- */
+-#if !defined(PPP_DRV_NAME)
+-#define PPP_DRV_NAME "ppp"
+-#endif /* !defined(PPP_DRV_NAME) */
+-
+ int
+ main(argc, argv)
+ int argc;
+@@ -777,8 +770,11 @@
+ set_ifunit(iskey)
+ int iskey;
+ {
+- info("Using interface %s%d", PPP_DRV_NAME, ifunit);
++ if (req_ifname[0] != '\0')
++ slprintf(ifname, sizeof(ifname), req_ifname);
++ else
+ slprintf(ifname, sizeof(ifname), "%s%d", PPP_DRV_NAME, ifunit);
++ info("Using interface %s", ifname);
+ script_setenv("IFNAME", ifname, iskey);
+ if (iskey) {
+ create_pidfile(getpid()); /* write pid to file */
+--- ./pppd/options.c.orig 2004-07-19 12:59:21.000000000 +0000
++++ ./pppd/options.c 2004-07-19 14:35:04.253865964 +0000
+@@ -102,6 +102,7 @@
+ bool tune_kernel; /* may alter kernel settings */
+ int connect_delay = 1000; /* wait this many ms after connect script */
+ int req_unit = -1; /* requested interface unit */
++char req_ifname[MAXIFNAMELEN]; /* requested interface name */
+ bool multilink = 0; /* Enable multilink operation */
+ char *bundle_name = NULL; /* bundle name for multilink */
+ bool dump_options; /* print out option values */
+@@ -259,6 +260,10 @@
+ "PPP interface unit number to use if possible",
+ OPT_PRIO | OPT_LLIMIT, 0, 0 },
+
++ { "ifname", o_string, req_ifname,
++ "Set PPP interface name",
++ OPT_PRIO | OPT_PRIV | OPT_STATIC, NULL, MAXIFNAMELEN },
++
+ { "dump", o_bool, &dump_options,
+ "Print out option values after parsing all options", 1 },
+ { "dryrun", o_bool, &dryrun,
+--- ./pppd/pppd.8.orig 2004-07-19 14:39:06.639320497 +0000
++++ ./pppd/pppd.8 2004-07-19 15:00:37.339448432 +0000
+@@ -1020,7 +1020,12 @@
+ .TP
+ .B unit \fInum
+ Sets the ppp unit number (for a ppp0 or ppp1 etc interface name) for outbound
+-connections.
++connections. If the unit is already in use a dynamically allocated will be
++used.
++.TP
++.B ifname \fIstring
++Set the ppp interface name for outbound connections. A failure to set the
++name will terminate the pppd.
+ .TP
+ .B updetach
+ With this option, pppd will detach from its controlling terminal once
+--- ./pppd/pppd.h.orig 2004-07-19 12:59:16.000000000 +0000
++++ ./pppd/pppd.h 2004-07-19 15:02:08.792752747 +0000
+@@ -80,6 +80,16 @@
+ #define MAXARGS 1 /* max # args to a command */
+ #define MAXNAMELEN 256 /* max length of hostname or name for auth */
+ #define MAXSECRETLEN 256 /* max length of password or secret */
++#define MAXIFNAMELEN 32 /* max length of interface name; or use IFNAMSIZ, can we
++ always include net/if.h? */
++
++/*
++ * If PPP_DRV_NAME is not defined, use the default "ppp" as the device name.
++ * Where should PPP_DRV_NAME come from? Do we include it here?
++ */
++#if !defined(PPP_DRV_NAME)
++#define PPP_DRV_NAME "ppp"
++#endif /* !defined(PPP_DRV_NAME) */
+
+ /*
+ * Option descriptor structure.
+@@ -304,6 +314,7 @@
+ extern int connect_delay; /* Time to delay after connect script */
+ extern int max_data_rate; /* max bytes/sec through charshunt */
+ extern int req_unit; /* interface unit number to use */
++extern char req_ifname[MAXIFNAMELEN]; /* interface name to use */
+ extern bool multilink; /* enable multilink operation */
+ extern bool noendpoint; /* don't send or accept endpt. discrim. */
+ extern char *bundle_name; /* bundle name for multilink */
+--- ./pppd/sys-linux.c.orig 2004-07-19 12:33:29.000000000 +0000
++++ ./pppd/sys-linux.c 2004-07-19 14:37:36.463754450 +0000
+@@ -649,6 +649,21 @@
+ }
+ if (x < 0)
+ error("Couldn't create new ppp unit: %m");
++
++ if (x == 0 && req_ifname[0] != '\0') {
++ struct ifreq ifr;
++ char t[MAXIFNAMELEN];
++ memset(&ifr, 0, sizeof(struct ifreq));
++ slprintf(t, sizeof(t), "%s%d", PPP_DRV_NAME, ifunit);
++ strncpy(ifr.ifr_name, t, IF_NAMESIZE);
++ strncpy(ifr.ifr_newname, req_ifname, IF_NAMESIZE);
++ x = ioctl(sock_fd, SIOCSIFNAME, &ifr);
++ if (x < 0)
++ error("Couldn't rename interface %s to %s: %m", t, req_ifname);
++ else
++ info("Renamed interface %s to %s", t, req_ifname);
++ }
++
+ return x;
+ }
+
diff --git a/ppp/ppp.nm b/ppp/ppp.nm
index ea6f9c1..e12c68a 100644
--- a/ppp/ppp.nm
+++ b/ppp/ppp.nm
@@ -5,7 +5,7 @@
name = ppp
version = 2.4.6
-release = 1
+release = 2
groups = System/Daemons
url = http://ppp.samba.org/
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 1d4cf0a3b6862f2a12d7c68e1c866bd8d9cd59a7
by git＠ipfire.org 27 Dec '14
by git＠ipfire.org 27 Dec '14
27 Dec '14
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via 1d4cf0a3b6862f2a12d7c68e1c866bd8d9cd59a7 (commit)
via 82128b048ce9f4ab29ed807502e4ba97bfbec824 (commit)
via c1684e7c92db8f506816a43004f1c452315c04a7 (commit)
via 7708fdfea02803b4782399ecc14d9d00d4bfcae5 (commit)
from 4579e6806acab5ccde4a16686569936b018ce9e3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1d4cf0a3b6862f2a12d7c68e1c866bd8d9cd59a7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Dec 27 03:03:15 2014 +0100
noip: Remove package
This is replaced by ddns.
commit 82128b048ce9f4ab29ed807502e4ba97bfbec824
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Dec 27 02:59:33 2014 +0100
ez-ipupdate: Remove package
This has been replaced by ddns
commit c1684e7c92db8f506816a43004f1c452315c04a7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Dec 27 02:57:55 2014 +0100
nftables: Update to latest snapshot
commit 7708fdfea02803b4782399ecc14d9d00d4bfcae5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Dec 27 02:56:50 2014 +0100
libnftl: Update to version 1.0.3
-----------------------------------------------------------------------
Summary of changes:
ez-ipupdate/ez-ipupdate.nm | 35 -
ez-ipupdate/patches/ez-ipupdate-3.0.11b8-10.patch | 8024 --------------------
.../patches/ez-ipupdate-3.0.11b8-pidfile.patch | 11 -
libnftnl/libnftnl.nm | 16 +-
nftables/nftables.nm | 6 +-
.../nftables-20140118-db2x_docbook2man.patch | 53 -
noip/noip.nm | 41 -
7 files changed, 6 insertions(+), 8180 deletions(-)
delete mode 100644 ez-ipupdate/ez-ipupdate.nm
delete mode 100644 ez-ipupdate/patches/ez-ipupdate-3.0.11b8-10.patch
delete mode 100644 ez-ipupdate/patches/ez-ipupdate-3.0.11b8-pidfile.patch
delete mode 100644 nftables/patches/nftables-20140118-db2x_docbook2man.patch
delete mode 100644 noip/noip.nm
Difference in files:
diff --git a/ez-ipupdate/ez-ipupdate.nm b/ez-ipupdate/ez-ipupdate.nm
deleted file mode 100644
index 4d92b79..0000000
--- a/ez-ipupdate/ez-ipupdate.nm
+++ /dev/null
@@ -1,35 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = ez-ipupdate
-version = 3.0.11b8
-release = 1
-
-groups = Networking/Tools
-url = http://www.gusnet.cx/proj/ez-ipupdate/
-license = GPLv2+
-summary = Client for Dynamic DNS Services.
-
-description
- ez-ipupdate is a small utility for updating your host name for a lot of
- dynamic DNS service provider.
-end
-
-source_dl =
-
-build
- configure_cmds
- chmod -v 755 missing
- end
-end
-
-packages
- package %{name}
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/ez-ipupdate/patches/ez-ipupdate-3.0.11b8-10.patch b/ez-ipupdate/patches/ez-ipupdate-3.0.11b8-10.patch
deleted file mode 100644
index fd19e11..0000000
--- a/ez-ipupdate/patches/ez-ipupdate-3.0.11b8-10.patch
+++ /dev/null
@@ -1,8024 +0,0 @@
---- ez-ipupdate-3.0.11b8.orig/Makefile.in
-+++ ez-ipupdate-3.0.11b8/Makefile.in
-@@ -1,6 +1,6 @@
--# Makefile.in generated automatically by automake 1.3 from Makefile.am
-+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
--# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -11,7 +11,7 @@
- # PARTICULAR PURPOSE.
-
-
--SHELL = /bin/sh
-+SHELL = @SHELL@
-
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
-@@ -32,7 +32,7 @@
- includedir = @includedir@
- oldincludedir = /usr/include
-
--DISTDIR =
-+DESTDIR =
-
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
-@@ -46,7 +46,7 @@
- AUTOHEADER = @AUTOHEADER@
-
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- transform = @program_transform_name@
-@@ -73,7 +73,7 @@
-
- EXTRA_DIST = getpass.c ez-ipupdate.lsm example.conf example-pgpow.conf example-dhs.conf example-dyndns.conf example-ods.conf example-tzo.conf example-gnudip.conf example-easydns.conf example-justlinux.conf example-dyns.conf CHANGELOG mkbinary example-heipv6tb.conf
-
--AUTOMAKE_OPTIONS=foreign
-+AUTOMAKE_OPTIONS = foreign
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
-@@ -90,50 +90,59 @@
- ez_ipupdate_DEPENDENCIES =
- ez_ipupdate_LDFLAGS =
- CFLAGS = @CFLAGS@
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
--LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
--DIST_COMMON = README COPYING INSTALL Makefile.am Makefile.in acconfig.h \
--aclocal.m4 config.guess config.h.in config.sub configure configure.in \
--install-sh missing mkinstalldirs stamp-h.in
-+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-+DIST_COMMON = README ./stamp-h.in COPYING INSTALL Makefile.am \
-+Makefile.in acconfig.h aclocal.m4 config.guess config.h.in config.sub \
-+configure configure.in install-sh missing mkinstalldirs
-
-
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
- TAR = tar
--GZIP = --best
-+GZIP_ENV = --best
-+DEP_FILES = .deps/cache_file.P .deps/conf_file.P .deps/ez-ipupdate.P \
-+.deps/md5.P .deps/pid_file.P
- SOURCES = $(ez_ipupdate_SOURCES)
- OBJECTS = $(ez_ipupdate_OBJECTS)
-
--all: Makefile $(PROGRAMS) config.h
--
-+all: all-redirect
- .SUFFIXES:
- .SUFFIXES: .S .c .o .s
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-- cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile
-+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+ cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
-
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
- cd $(top_builddir) \
- && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
- $(ACLOCAL_M4): configure.in
- cd $(srcdir) && $(ACLOCAL)
-
--config.status: $(srcdir)/configure
-+config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
- $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
- cd $(srcdir) && $(AUTOCONF)
-
- config.h: stamp-h
-- @:
-+ @if test ! -f $@; then \
-+ rm -f stamp-h; \
-+ $(MAKE) stamp-h; \
-+ else :; fi
- stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES= CONFIG_HEADERS=config.h \
- $(SHELL) ./config.status
-- @echo timestamp > stamp-h
-+ @echo timestamp > stamp-h 2> /dev/null
- $(srcdir)/config.h.in: $(srcdir)/stamp-h.in
-+ @if test ! -f $@; then \
-+ rm -f $(srcdir)/stamp-h.in; \
-+ $(MAKE) $(srcdir)/stamp-h.in; \
-+ else :; fi
- $(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
- cd $(top_srcdir) && $(AUTOHEADER)
-- @echo timestamp > $(srcdir)/stamp-h.in
-+ @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
-
- mostlyclean-hdr:
-
-@@ -158,20 +167,17 @@
- $(mkinstalldirs) $(DESTDIR)$(bindir)
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- if test -f $$p; then \
-- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
-- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
-+ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-+ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
- else :; fi; \
- done
-
- uninstall-binPROGRAMS:
- @$(NORMAL_UNINSTALL)
- list='$(bin_PROGRAMS)'; for p in $$list; do \
-- rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
-+ rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
- done
-
--.c.o:
-- $(COMPILE) -c $<
--
- .s.o:
- $(COMPILE) -c $<
-
-@@ -195,8 +201,12 @@
- tags: TAGS
-
- ID: $(HEADERS) $(SOURCES) $(LISP)
-+ list='$(SOURCES) $(HEADERS)'; \
-+ unique=`for i in $$list; do echo $$i; done | \
-+ awk ' { files[$$0] = 1; } \
-+ END { for (i in files) print i; }'`; \
- here=`pwd` && cd $(srcdir) \
-- && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
-+ && mkid -f$$here/ID $$unique $(LISP)
-
- TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
- tags=; \
-@@ -206,7 +216,7 @@
- awk ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
-- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
-+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP))
-
- mostlyclean-tags:
-
-@@ -225,99 +235,148 @@
- # tarfile.
- distcheck: dist
- -rm -rf $(distdir)
-- GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz
-+ GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
- mkdir $(distdir)/=build
- mkdir $(distdir)/=inst
- dc_install_base=`cd $(distdir)/=inst && pwd`; \
- cd $(distdir)/=build \
- && ../configure --srcdir=.. --prefix=$$dc_install_base \
-- && $(MAKE) \
-- && $(MAKE) dvi \
-- && $(MAKE) check \
-- && $(MAKE) install \
-- && $(MAKE) installcheck \
-- && $(MAKE) dist
-+ && $(MAKE) $(AM_MAKEFLAGS) \
-+ && $(MAKE) $(AM_MAKEFLAGS) dvi \
-+ && $(MAKE) $(AM_MAKEFLAGS) check \
-+ && $(MAKE) $(AM_MAKEFLAGS) install \
-+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-+ && $(MAKE) $(AM_MAKEFLAGS) dist
- -rm -rf $(distdir)
-- @echo "========================"; \
-- echo "$(distdir).tar.gz is ready for distribution"; \
-- echo "========================"
-+ @banner="$(distdir).tar.gz is ready for distribution"; \
-+ dashes=`echo "$$banner" | sed s/./=/g`; \
-+ echo "$$dashes"; \
-+ echo "$$banner"; \
-+ echo "$$dashes"
- dist: distdir
- -chmod -R a+r $(distdir)
-- GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
-+ GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
- -rm -rf $(distdir)
- dist-all: distdir
- -chmod -R a+r $(distdir)
-- GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
-+ GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
- -rm -rf $(distdir)
- distdir: $(DISTFILES)
- -rm -rf $(distdir)
- mkdir $(distdir)
- -chmod 777 $(distdir)
-+ here=`cd $(top_builddir) && pwd`; \
-+ top_distdir=`cd $(distdir) && pwd`; \
-+ distdir=`cd $(distdir) && pwd`; \
-+ cd $(top_srcdir) \
-+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile
- @for file in $(DISTFILES); do \
- d=$(srcdir); \
-- test -f $(distdir)/$$file \
-- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-- || cp -p $$d/$$file $(distdir)/$$file; \
-+ if test -d $$d/$$file; then \
-+ cp -pr $$d/$$file $(distdir)/$$file; \
-+ else \
-+ test -f $(distdir)/$$file \
-+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-+ || cp -p $$d/$$file $(distdir)/$$file || :; \
-+ fi; \
- done
--cache_file.o: cache_file.c config.h cache_file.h
--conf_file.o: conf_file.c config.h conf_file.h
--ez-ipupdate.o: ez-ipupdate.c config.h error.h md5.h dprintf.h \
-- conf_file.h cache_file.h pid_file.h
--md5.o: md5.c config.h md5.h
--pid_file.o: pid_file.c config.h error.h dprintf.h
--
--info:
--dvi:
--check: all
-- $(MAKE)
--installcheck:
--install-exec: install-binPROGRAMS
-- @$(NORMAL_INSTALL)
-
--install-data:
-- @$(NORMAL_INSTALL)
-+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
--install: install-exec install-data all
-- @:
-+-include $(DEP_FILES)
-
--uninstall: uninstall-binPROGRAMS
-+mostlyclean-depend:
-
-+clean-depend:
-+
-+distclean-depend:
-+ -rm -rf .deps
-+
-+maintainer-clean-depend:
-+
-+%.o: %.c
-+ @echo '$(COMPILE) -c $<'; \
-+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+ @-cp .deps/$(*F).pp .deps/$(*F).P; \
-+ tr ' ' '\012' < .deps/$(*F).pp \
-+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+ >> .deps/$(*F).P; \
-+ rm .deps/$(*F).pp
-+
-+%.lo: %.c
-+ @echo '$(LTCOMPILE) -c $<'; \
-+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
-+ < .deps/$(*F).pp > .deps/$(*F).P; \
-+ tr ' ' '\012' < .deps/$(*F).pp \
-+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+ >> .deps/$(*F).P; \
-+ rm -f .deps/$(*F).pp
-+info-am:
-+info: info-am
-+dvi-am:
-+dvi: dvi-am
-+check-am: all-am
-+check: check-am
-+installcheck-am:
-+installcheck: installcheck-am
-+all-recursive-am: config.h
-+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
-+
-+install-exec-am: install-binPROGRAMS
-+install-exec: install-exec-am
-+
-+install-data-am:
-+install-data: install-data-am
-+
-+install-am: all-am
-+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+install: install-am
-+uninstall-am: uninstall-binPROGRAMS
-+uninstall: uninstall-am
-+all-am: Makefile $(PROGRAMS) config.h
-+all-redirect: all-am
- install-strip:
-- $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs:
-- $(mkinstalldirs) $(DATADIR)$(bindir)
-+ $(mkinstalldirs) $(DESTDIR)$(bindir)
-
-
- mostlyclean-generic:
-- -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
- clean-generic:
-- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
- distclean-generic:
-- -rm -f Makefile $(DISTCLEANFILES)
-+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
-- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
--mostlyclean: mostlyclean-hdr mostlyclean-binPROGRAMS \
-- mostlyclean-compile mostlyclean-tags \
-+mostlyclean-am: mostlyclean-hdr mostlyclean-binPROGRAMS \
-+ mostlyclean-compile mostlyclean-tags mostlyclean-depend \
- mostlyclean-generic
-
--clean: clean-hdr clean-binPROGRAMS clean-compile clean-tags \
-- clean-generic mostlyclean
-+mostlyclean: mostlyclean-am
-+
-+clean-am: clean-hdr clean-binPROGRAMS clean-compile clean-tags \
-+ clean-depend clean-generic mostlyclean-am
-
--distclean: distclean-hdr distclean-binPROGRAMS distclean-compile \
-- distclean-tags distclean-generic clean
-+clean: clean-am
-+
-+distclean-am: distclean-hdr distclean-binPROGRAMS distclean-compile \
-+ distclean-tags distclean-depend distclean-generic \
-+ clean-am
-+
-+distclean: distclean-am
- -rm -f config.status
-
--maintainer-clean: maintainer-clean-hdr maintainer-clean-binPROGRAMS \
-+maintainer-clean-am: maintainer-clean-hdr maintainer-clean-binPROGRAMS \
- maintainer-clean-compile maintainer-clean-tags \
-- maintainer-clean-generic distclean
-+ maintainer-clean-depend maintainer-clean-generic \
-+ distclean-am
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
-+
-+maintainer-clean: maintainer-clean-am
- -rm -f config.status
-
- .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-@@ -325,8 +384,11 @@
- maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
- mostlyclean-compile distclean-compile clean-compile \
- maintainer-clean-compile tags mostlyclean-tags distclean-tags \
--clean-tags maintainer-clean-tags distdir info dvi installcheck \
--install-exec install-data install uninstall all installdirs \
-+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
-+distclean-depend clean-depend maintainer-clean-depend info-am info \
-+dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
-+install-exec-am install-exec install-data-am install-data install-am \
-+install uninstall-am uninstall all-redirect all-am all installdirs \
- mostlyclean-generic distclean-generic clean-generic \
- maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
---- ez-ipupdate-3.0.11b8.orig/aclocal.m4
-+++ ez-ipupdate-3.0.11b8/aclocal.m4
-@@ -1,7 +1,7 @@
--dnl aclocal.m4 generated automatically by aclocal 1.3
-+dnl aclocal.m4 generated automatically by aclocal 1.4-p6
-
--dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
--dnl This Makefile.in is free software; the Free Software Foundation
-+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
- dnl with or without modifications, as long as this notice is preserved.
-
-@@ -12,7 +12,7 @@
-
- # Like AC_CONFIG_HEADER, but automatically create stamp file.
-
--AC_DEFUN(AM_CONFIG_HEADER,
-+AC_DEFUN([AM_CONFIG_HEADER],
- [AC_PREREQ([2.12])
- AC_CONFIG_HEADER([$1])
- dnl When config.status generates a header, we must update the stamp-h file.
-@@ -42,8 +42,9 @@
- dnl Usage:
- dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
--AC_DEFUN(AM_INIT_AUTOMAKE,
--[AC_REQUIRE([AM_PROG_INSTALL])
-+AC_DEFUN([AM_INIT_AUTOMAKE],
-+[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-+AC_REQUIRE([AC_PROG_INSTALL])
- PACKAGE=[$1]
- AC_SUBST(PACKAGE)
- VERSION=[$2]
-@@ -53,33 +54,53 @@
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
- fi
- ifelse([$3],,
--AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
--AC_DEFINE_UNQUOTED(VERSION, "$VERSION"))
-+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
- AC_REQUIRE([AM_SANITY_CHECK])
- AC_REQUIRE([AC_ARG_PROGRAM])
- dnl FIXME This is truly gross.
- missing_dir=`cd $ac_aux_dir && pwd`
--AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
- AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
--AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
- AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
- AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
- AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-+# Copyright 2002 Free Software Foundation, Inc.
-
--# serial 1
--
--AC_DEFUN(AM_PROG_INSTALL,
--[AC_REQUIRE([AC_PROG_INSTALL])
--test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
--AC_SUBST(INSTALL_SCRIPT)dnl
--])
-+# 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 2, 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, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+
-+# AM_AUTOMAKE_VERSION(VERSION)
-+# ----------------------------
-+# Automake X.Y traces this macro to ensure aclocal.m4 has been
-+# generated from the m4 files accompanying Automake X.Y.
-+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-+
-+# AM_SET_CURRENT_AUTOMAKE_VERSION
-+# -------------------------------
-+# Call AM_AUTOMAKE_VERSION so it can be traced.
-+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+ [AM_AUTOMAKE_VERSION([1.4-p6])])
-
- #
- # Check to make sure that the build environment is sane.
- #
-
--AC_DEFUN(AM_SANITY_CHECK,
-+AC_DEFUN([AM_SANITY_CHECK],
- [AC_MSG_CHECKING([whether build environment is sane])
- # Just in case
- sleep 1
-@@ -120,7 +141,7 @@
-
- dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
- dnl The program must properly implement --version.
--AC_DEFUN(AM_MISSING_PROG,
-+AC_DEFUN([AM_MISSING_PROG],
- [AC_MSG_CHECKING(for working $2)
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
---- ez-ipupdate-3.0.11b8.orig/config.guess
-+++ ez-ipupdate-3.0.11b8/config.guess
-@@ -1,7 +1,10 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
--# Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
--#
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-+
-+timestamp='2003-01-10'
-+
- # This file 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
-@@ -21,36 +24,220 @@
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
-
--# Written by Per Bothner <bothner(a)cygnus.com>.
--# The master version of this file is at the FSF in /home/gd/gnu/lib.
-+# Originally written by Per Bothner <per(a)bothner.com>.
-+# Please send patches to <config-patches(a)gnu.org>. Submit a context
-+# diff and a properly formatted ChangeLog entry.
- #
- # This script attempts to guess a canonical system name similar to
- # config.sub. If it succeeds, it prints the system name on stdout, and
- # exits with 0. Otherwise, it exits with 1.
- #
- # The plan is that this can be called by configure scripts if you
--# don't specify an explicit system type (host/target name).
--#
--# Only a few systems have been added to this list; please add others
--# (but try to keep the structure clean).
--#
-+# don't specify an explicit build system type.
-+
-+me=`echo "$0" | sed -e 's,.*/,,'`
-+
-+usage="\
-+Usage: $0 [OPTION]
-+
-+Output the configuration name of the system \`$me' is run on.
-+
-+Operation modes:
-+ -h, --help print this help, then exit
-+ -t, --time-stamp print date of last modification, then exit
-+ -v, --version print version number, then exit
-+
-+Report bugs and patches to <config-patches(a)gnu.org>."
-+
-+version="\
-+GNU config.guess ($timestamp)
-+
-+Originally written by Per Bothner.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-+Free Software Foundation, Inc.
-+
-+This is free software; see the source for copying conditions. There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+
-+help="
-+Try \`$me --help' for more information."
-+
-+# Parse command line
-+while test $# -gt 0 ; do
-+ case $1 in
-+ --time-stamp | --time* | -t )
-+ echo "$timestamp" ; exit 0 ;;
-+ --version | -v )
-+ echo "$version" ; exit 0 ;;
-+ --help | --h* | -h )
-+ echo "$usage"; exit 0 ;;
-+ -- ) # Stop option processing
-+ shift; break ;;
-+ - ) # Use stdin as input.
-+ break ;;
-+ -* )
-+ echo "$me: invalid option $1$help" >&2
-+ exit 1 ;;
-+ * )
-+ break ;;
-+ esac
-+done
-+
-+if test $# != 0; then
-+ echo "$me: too many arguments$help" >&2
-+ exit 1
-+fi
-+
-+trap 'exit 1' 1 2 15
-+
-+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-+# compiler to aid in system detection is discouraged as it requires
-+# temporary files to be created and, as you can see below, it is a
-+# headache to deal with in a portable fashion.
-+
-+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-+# use `HOST_CC' if defined, but it is deprecated.
-+
-+# Portable tmp directory creation inspired by the Autoconf team.
-+
-+set_cc_for_build='
-+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-+: ${TMPDIR=/tmp} ;
-+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
-+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-+dummy=$tmp/dummy ;
-+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-+case $CC_FOR_BUILD,$HOST_CC,$CC in
-+ ,,) echo "int x;" > $dummy.c ;
-+ for c in cc gcc c89 c99 ; do
-+ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-+ CC_FOR_BUILD="$c"; break ;
-+ fi ;
-+ done ;
-+ if test x"$CC_FOR_BUILD" = x ; then
-+ CC_FOR_BUILD=no_compiler_found ;
-+ fi
-+ ;;
-+ ,,*) CC_FOR_BUILD=$CC ;;
-+ ,*,*) CC_FOR_BUILD=$HOST_CC ;;
-+esac ;'
-
- # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
--# (ghazi(a)noc.rutgers.edu 8/24/94.)
-+# (ghazi(a)noc.rutgers.edu 1994-08-24)
- if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
- PATH=$PATH:/.attbin ; export PATH
- fi
-
- UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
- UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
--UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
-+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
- UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
--trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
--
- # Note: order is significant - the case branches are not exclusive.
-
- case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-+ *:NetBSD:*:*)
-+ # NetBSD (nbsd) targets should (where applicable) match one or
-+ # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-+ # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
-+ # switched to ELF, *-*-netbsd* would select the old
-+ # object file format. This provides both forward
-+ # compatibility and a consistent mechanism for selecting the
-+ # object file format.
-+ #
-+ # Note: NetBSD doesn't particularly care about the vendor
-+ # portion of the name. We always set it to "unknown".
-+ sysctl="sysctl -n hw.machine_arch"
-+ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-+ /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-+ case "${UNAME_MACHINE_ARCH}" in
-+ armeb) machine=armeb-unknown ;;
-+ arm*) machine=arm-unknown ;;
-+ sh3el) machine=shl-unknown ;;
-+ sh3eb) machine=sh-unknown ;;
-+ *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-+ esac
-+ # The Operating System including object format, if it has switched
-+ # to ELF recently, or will in the future.
-+ case "${UNAME_MACHINE_ARCH}" in
-+ arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-+ eval $set_cc_for_build
-+ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-+ | grep __ELF__ >/dev/null
-+ then
-+ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-+ # Return netbsd for either. FIX?
-+ os=netbsd
-+ else
-+ os=netbsdelf
-+ fi
-+ ;;
-+ *)
-+ os=netbsd
-+ ;;
-+ esac
-+ # The OS release
-+ # Debian GNU/NetBSD machines have a different userland, and
-+ # thus, need a distinct triplet. However, they do not need
-+ # kernel version information, so it can be replaced with a
-+ # suitable tag, in the style of linux-gnu.
-+ case "${UNAME_VERSION}" in
-+ Debian*)
-+ release='-gnu'
-+ ;;
-+ *)
-+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+ ;;
-+ esac
-+ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-+ # contains redundant information, the shorter form:
-+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-+ echo "${machine}-${os}${release}"
-+ exit 0 ;;
-+ amiga:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ arc:OpenBSD:*:*)
-+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ hp300:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ mac68k:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ macppc:OpenBSD:*:*)
-+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ mvme68k:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ mvme88k:OpenBSD:*:*)
-+ echo m88k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ mvmeppc:OpenBSD:*:*)
-+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ pmax:OpenBSD:*:*)
-+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ sgi:OpenBSD:*:*)
-+ echo mipseb-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ sun3:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ wgrisc:OpenBSD:*:*)
-+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:OpenBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:MicroBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE}
-+ exit 0 ;;
- alpha:OSF1:*:*)
- if test $UNAME_RELEASE = "V4.0"; then
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-@@ -59,87 +246,91 @@
- # A Tn.n version is a released field test version.
- # A Xn.n version is an unreleased experimental baselevel.
- # 1.2 uses "1.2" for uname -r.
-- cat <<EOF >dummy.s
-+ eval $set_cc_for_build
-+ cat <<EOF >$dummy.s
-+ .data
-+\$Lformat:
-+ .byte 37,100,45,37,120,10,0 # "%d-%x\n"
-+
-+ .text
- .globl main
-+ .align 4
- .ent main
- main:
-- .frame \$30,0,\$26,0
-- .prologue 0
-- .long 0x47e03d80 # implver $0
-- lda \$2,259
-- .long 0x47e20c21 # amask $2,$1
-- srl \$1,8,\$2
-- sll \$2,2,\$2
-- sll \$0,3,\$0
-- addl \$1,\$0,\$0
-- addl \$2,\$0,\$0
-- ret \$31,(\$26),1
-+ .frame \$30,16,\$26,0
-+ ldgp \$29,0(\$27)
-+ .prologue 1
-+ .long 0x47e03d80 # implver \$0
-+ lda \$2,-1
-+ .long 0x47e20c21 # amask \$2,\$1
-+ lda \$16,\$Lformat
-+ mov \$0,\$17
-+ not \$1,\$18
-+ jsr \$26,printf
-+ ldgp \$29,0(\$26)
-+ mov 0,\$16
-+ jsr \$26,exit
- .end main
- EOF
-- ${CC-cc} dummy.s -o dummy 2>/dev/null
-+ $CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
- if test "$?" = 0 ; then
-- ./dummy
-- case "$?" in
-- 7)
-+ case `$dummy` in
-+ 0-0)
- UNAME_MACHINE="alpha"
- ;;
-- 15)
-+ 1-0)
- UNAME_MACHINE="alphaev5"
- ;;
-- 14)
-+ 1-1)
- UNAME_MACHINE="alphaev56"
- ;;
-- 10)
-+ 1-101)
- UNAME_MACHINE="alphapca56"
- ;;
-- 16)
-+ 2-303)
- UNAME_MACHINE="alphaev6"
- ;;
-+ 2-307)
-+ UNAME_MACHINE="alphaev67"
-+ ;;
-+ 2-1307)
-+ UNAME_MACHINE="alphaev68"
-+ ;;
-+ 3-1307)
-+ UNAME_MACHINE="alphaev7"
-+ ;;
- esac
- fi
-- rm -f dummy.s dummy
-- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
-+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+ exit 0 ;;
-+ Alpha\ *:Windows_NT*:*)
-+ # How do we know it's Interix rather than the generic POSIX subsystem?
-+ # Should we change UNAME_MACHINE based on the output of uname instead
-+ # of the specific Alpha model?
-+ echo alpha-pc-interix
- exit 0 ;;
- 21064:Windows_NT:50:3)
- echo alpha-dec-winnt3.5
- exit 0 ;;
- Amiga*:UNIX_System_V:4.0:*)
-- echo m68k-cbm-sysv4
-+ echo m68k-unknown-sysv4
- exit 0;;
-- amiga:NetBSD:*:*)
-- echo m68k-cbm-netbsd${UNAME_RELEASE}
-- exit 0 ;;
-- amiga:OpenBSD:*:*)
-- echo m68k-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
-- arc64:OpenBSD:*:*)
-- echo mips64el-unknown-openbsd${UNAME_RELEASE}
-+ *:[Aa]miga[Oo][Ss]:*:*)
-+ echo ${UNAME_MACHINE}-unknown-amigaos
- exit 0 ;;
-- arc:OpenBSD:*:*)
-- echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+ *:[Mm]orph[Oo][Ss]:*:*)
-+ echo ${UNAME_MACHINE}-unknown-morphos
- exit 0 ;;
-- hkmips:OpenBSD:*:*)
-- echo mips-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
-- pmax:OpenBSD:*:*)
-- echo mipsel-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
-- sgi:OpenBSD:*:*)
-- echo mips-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
-- wgrisc:OpenBSD:*:*)
-- echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+ *:OS/390:*:*)
-+ echo i370-ibm-openedition
- exit 0 ;;
- arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- echo arm-acorn-riscix${UNAME_RELEASE}
- exit 0;;
-- arm32:NetBSD:*:*)
-- echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-- exit 0 ;;
-- SR2?01:HI-UX/MPP:*:*)
-+ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
- echo hppa1.1-hitachi-hiuxmpp
- exit 0;;
-- Pyramid*:OSx*:*:*|MIS*:OSx*:*:*)
-+ Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
- # akee(a)wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
- if test "`(/bin/universe) 2>/dev/null`" = att ; then
- echo pyramid-pyramid-sysv3
-@@ -147,9 +338,16 @@
- echo pyramid-pyramid-bsd
- fi
- exit 0 ;;
-- NILE:*:*:dcosx)
-+ NILE*:*:*:dcosx)
- echo pyramid-pyramid-svr4
- exit 0 ;;
-+ DRS?6000:UNIX_SV:4.2*:7*)
-+ case `/usr/bin/uname -p` in
-+ sparc) echo sparc-icl-nx7 && exit 0 ;;
-+ esac ;;
-+ sun4H:SunOS:5.*:*)
-+ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ exit 0 ;;
- sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
-@@ -175,7 +373,7 @@
- echo m68k-sun-sunos${UNAME_RELEASE}
- exit 0 ;;
- sun*:*:4.2BSD:*)
-- UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-+ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
- test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
- case "`/bin/arch`" in
- sun3)
-@@ -189,30 +387,32 @@
- aushp:SunOS:*:*)
- echo sparc-auspex-sunos${UNAME_RELEASE}
- exit 0 ;;
-- atari*:NetBSD:*:*)
-- echo m68k-atari-netbsd${UNAME_RELEASE}
-- exit 0 ;;
-- atari*:OpenBSD:*:*)
-- echo m68k-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
-- sun3*:NetBSD:*:*)
-- echo m68k-sun-netbsd${UNAME_RELEASE}
-- exit 0 ;;
-- sun3*:OpenBSD:*:*)
-- echo m68k-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
-- mac68k:NetBSD:*:*)
-- echo m68k-apple-netbsd${UNAME_RELEASE}
-+ # The situation for MiNT is a little confusing. The machine name
-+ # can be virtually everything (everything which is not
-+ # "atarist" or "atariste" at least should have a processor
-+ # > m68000). The system name ranges from "MiNT" over "FreeMiNT"
-+ # to the lowercase version "mint" (or "freemint"). Finally
-+ # the system name "TOS" denotes a system which is actually not
-+ # MiNT. But MiNT is downward compatible to TOS, so this should
-+ # be no problem.
-+ atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-+ echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
-- mac68k:OpenBSD:*:*)
-- echo m68k-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
-- mvme68k:OpenBSD:*:*)
-- echo m68k-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
-- mvme88k:OpenBSD:*:*)
-- echo m88k-unknown-openbsd${UNAME_RELEASE}
-+ atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-+ echo m68k-atari-mint${UNAME_RELEASE}
-+ exit 0 ;;
-+ *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-+ echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
-+ milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-+ echo m68k-milan-mint${UNAME_RELEASE}
-+ exit 0 ;;
-+ hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-+ echo m68k-hades-mint${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-+ echo m68k-unknown-mint${UNAME_RELEASE}
-+ exit 0 ;;
- powerpc:machten:*:*)
- echo powerpc-apple-machten${UNAME_RELEASE}
- exit 0 ;;
-@@ -225,12 +425,18 @@
- VAX*:ULTRIX*:*:*)
- echo vax-dec-ultrix${UNAME_RELEASE}
- exit 0 ;;
-- 2020:CLIX:*:*)
-+ 2020:CLIX:*:* | 2430:CLIX:*:*)
- echo clipper-intergraph-clix${UNAME_RELEASE}
- exit 0 ;;
- mips:*:*:UMIPS | mips:*:*:RISCos)
-- sed 's/^ //' << EOF >dummy.c
-- int main (argc, argv) int argc; char **argv; {
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+#ifdef __cplusplus
-+#include <stdio.h> /* for printf() prototype */
-+ int main (int argc, char *argv[]) {
-+#else
-+ int main (argc, argv) int argc; char *argv[]; {
-+#endif
- #if defined (host_mips) && defined (MIPSEB)
- #if defined (SYSTYPE_SYSV)
- printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-@@ -245,12 +451,20 @@
- exit (-1);
- }
- EOF
-- ${CC-cc} dummy.c -o dummy \
-- && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-- && rm dummy.c dummy && exit 0
-- rm -f dummy.c dummy
-+ $CC_FOR_BUILD -o $dummy $dummy.c \
-+ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-+ && exit 0
- echo mips-mips-riscos${UNAME_RELEASE}
- exit 0 ;;
-+ Motorola:PowerMAX_OS:*:*)
-+ echo powerpc-motorola-powermax
-+ exit 0 ;;
-+ Motorola:*:4.3:PL8-*)
-+ echo powerpc-harris-powermax
-+ exit 0 ;;
-+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-+ echo powerpc-harris-powermax
-+ exit 0 ;;
- Night_Hawk:Power_UNIX:*:*)
- echo powerpc-harris-powerunix
- exit 0 ;;
-@@ -266,15 +480,18 @@
- AViiON:dgux:*:*)
- # DG/UX returns AViiON for all architectures
- UNAME_PROCESSOR=`/usr/bin/uname -p`
-- if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
-- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
-- -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
-+ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-+ then
-+ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-+ [ ${TARGET_BINARY_INTERFACE}x = x ]
-+ then
- echo m88k-dg-dgux${UNAME_RELEASE}
-- else
-+ else
- echo m88k-dg-dguxbcs${UNAME_RELEASE}
-+ fi
-+ else
-+ echo i586-dg-dgux${UNAME_RELEASE}
- fi
-- else echo i586-dg-dgux${UNAME_RELEASE}
-- fi
- exit 0 ;;
- M88*:DolphinOS:*:*) # DolphinOS (SVR3)
- echo m88k-dolphin-sysv3
-@@ -295,12 +512,21 @@
- ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
-- i?86:AIX:*:*)
-+ i*86:AIX:*:*)
- echo i386-ibm-aix
- exit 0 ;;
-+ ia64:AIX:*:*)
-+ if [ -x /usr/bin/oslevel ] ; then
-+ IBM_REV=`/usr/bin/oslevel`
-+ else
-+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+ fi
-+ echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-+ exit 0 ;;
- *:AIX:2:3)
- if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-- sed 's/^ //' << EOF >dummy.c
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
- #include <sys/systemcfg.h>
-
- main()
-@@ -311,8 +537,7 @@
- exit(0);
- }
- EOF
-- ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-- rm -f dummy.c dummy
-+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
- echo rs6000-ibm-aix3.2.5
- elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
- echo rs6000-ibm-aix3.2.4
-@@ -320,8 +545,9 @@
- echo rs6000-ibm-aix3.2
- fi
- exit 0 ;;
-- *:AIX:*:4)
-- if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
-+ *:AIX:*:[45])
-+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- IBM_ARCH=rs6000
- else
- IBM_ARCH=powerpc
-@@ -329,7 +555,7 @@
- if [ -x /usr/bin/oslevel ] ; then
- IBM_REV=`/usr/bin/oslevel`
- else
-- IBM_REV=4.${UNAME_RELEASE}
-+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- fi
- echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- exit 0 ;;
-@@ -339,7 +565,7 @@
- ibmrt:4.4BSD:*|romp-ibm:BSD:*)
- echo romp-ibm-bsd4.4
- exit 0 ;;
-- ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and
-+ ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
- echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
- exit 0 ;; # report: romp-ibm BSD 4.3
- *:BOSX:*:*)
-@@ -354,18 +580,85 @@
- hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
- echo m68k-hp-bsd4.4
- exit 0 ;;
-- 9000/[3478]??:HP-UX:*:*)
-+ 9000/[34678]??:HP-UX:*:*)
-+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- case "${UNAME_MACHINE}" in
- 9000/31? ) HP_ARCH=m68000 ;;
- 9000/[34]?? ) HP_ARCH=m68k ;;
-- 9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;;
-- 9000/8?? ) HP_ARCH=hppa1.0 ;;
-+ 9000/[678][0-9][0-9])
-+ if [ -x /usr/bin/getconf ]; then
-+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-+ case "${sc_cpu_version}" in
-+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-+ 532) # CPU_PA_RISC2_0
-+ case "${sc_kernel_bits}" in
-+ 32) HP_ARCH="hppa2.0n" ;;
-+ 64) HP_ARCH="hppa2.0w" ;;
-+ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
-+ esac ;;
-+ esac
-+ fi
-+ if [ "${HP_ARCH}" = "" ]; then
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+
-+ #define _HPUX_SOURCE
-+ #include <stdlib.h>
-+ #include <unistd.h>
-+
-+ int main ()
-+ {
-+ #if defined(_SC_KERNEL_BITS)
-+ long bits = sysconf(_SC_KERNEL_BITS);
-+ #endif
-+ long cpu = sysconf (_SC_CPU_VERSION);
-+
-+ switch (cpu)
-+ {
-+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-+ case CPU_PA_RISC2_0:
-+ #if defined(_SC_KERNEL_BITS)
-+ switch (bits)
-+ {
-+ case 64: puts ("hppa2.0w"); break;
-+ case 32: puts ("hppa2.0n"); break;
-+ default: puts ("hppa2.0"); break;
-+ } break;
-+ #else /* !defined(_SC_KERNEL_BITS) */
-+ puts ("hppa2.0"); break;
-+ #endif
-+ default: puts ("hppa1.0"); break;
-+ }
-+ exit (0);
-+ }
-+EOF
-+ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-+ test -z "$HP_ARCH" && HP_ARCH=hppa
-+ fi ;;
- esac
-- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-+ if [ ${HP_ARCH} = "hppa2.0w" ]
-+ then
-+ # avoid double evaluation of $set_cc_for_build
-+ test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
-+ then
-+ HP_ARCH="hppa2.0w"
-+ else
-+ HP_ARCH="hppa64"
-+ fi
-+ fi
- echo ${HP_ARCH}-hp-hpux${HPUX_REV}
- exit 0 ;;
-+ ia64:HP-UX:*:*)
-+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-+ echo ia64-hp-hpux${HPUX_REV}
-+ exit 0 ;;
- 3050*:HI-UX:*:*)
-- sed 's/^ //' << EOF >dummy.c
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
- #include <unistd.h>
- int
- main ()
-@@ -390,8 +683,7 @@
- exit (0);
- }
- EOF
-- ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-- rm -f dummy.c dummy
-+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
- echo unknown-hitachi-hiuxwe2
- exit 0 ;;
- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-@@ -400,13 +692,16 @@
- 9000/8??:4.3bsd:*:*)
- echo hppa1.0-hp-bsd
- exit 0 ;;
-+ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-+ echo hppa1.0-hp-mpeix
-+ exit 0 ;;
- hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
- echo hppa1.1-hp-osf
- exit 0 ;;
- hp8??:OSF1:*:*)
- echo hppa1.0-hp-osf
- exit 0 ;;
-- i?86:OSF1:*:*)
-+ i*86:OSF1:*:*)
- if [ -x /usr/sbin/sysversion ] ; then
- echo ${UNAME_MACHINE}-unknown-osf1mk
- else
-@@ -434,57 +729,82 @@
- C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- echo c4-convex-bsd
- exit 0 ;;
-- CRAY*X-MP:*:*:*)
-- echo xmp-cray-unicos
-- exit 0 ;;
- CRAY*Y-MP:*:*:*)
-- echo ymp-cray-unicos${UNAME_RELEASE}
-+ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
- CRAY*[A-Z]90:*:*:*)
- echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
- | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-- -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
-+ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-+ -e 's/\.[^.]*$/.X/'
- exit 0 ;;
- CRAY*TS:*:*:*)
-- echo t90-cray-unicos${UNAME_RELEASE}
-+ echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
-- CRAY-2:*:*:*)
-- echo cray2-cray-unicos
-- exit 0 ;;
-- F300:UNIX_System_V:*:*)
-- FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
-- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-- echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-- exit 0 ;;
-- F301:UNIX_System_V:*:*)
-- echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
-- exit 0 ;;
-- hp3[0-9][05]:NetBSD:*:*)
-- echo m68k-hp-netbsd${UNAME_RELEASE}
-+ CRAY*T3E:*:*:*)
-+ echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
-- hp300:OpenBSD:*:*)
-- echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ CRAY*SV1:*:*:*)
-+ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
-- i?86:BSD/386:*:* | *:BSD/OS:*:*)
-+ *:UNICOS/mp:*:*)
-+ echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ exit 0 ;;
-+ F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-+ FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+ exit 0 ;;
-+ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
- exit 0 ;;
-- *:FreeBSD:*:*)
-- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+ sparc*:BSD/OS:*:*)
-+ echo sparc-unknown-bsdi${UNAME_RELEASE}
- exit 0 ;;
-- *:NetBSD:*:*)
-- echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+ *:BSD/OS:*:*)
-+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- exit 0 ;;
-- *:OpenBSD:*:*)
-- echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+ *:FreeBSD:*:*)
-+ # Determine whether the default compiler uses glibc.
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #include <features.h>
-+ #if __GLIBC__ >= 2
-+ LIBC=gnu
-+ #else
-+ LIBC=
-+ #endif
-+EOF
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
- exit 0 ;;
- i*:CYGWIN*:*)
-- echo ${UNAME_MACHINE}-pc-cygwin32
-+ echo ${UNAME_MACHINE}-pc-cygwin
- exit 0 ;;
- i*:MINGW*:*)
- echo ${UNAME_MACHINE}-pc-mingw32
- exit 0 ;;
-+ i*:PW*:*)
-+ echo ${UNAME_MACHINE}-pc-pw32
-+ exit 0 ;;
-+ x86:Interix*:3*)
-+ echo i586-pc-interix3
-+ exit 0 ;;
-+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-+ echo i${UNAME_MACHINE}-pc-mks
-+ exit 0 ;;
-+ i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-+ # How do we know it's Interix rather than the generic POSIX subsystem?
-+ # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-+ # UNAME_MACHINE based on the output of uname instead of i386?
-+ echo i586-pc-interix
-+ exit 0 ;;
-+ i*:UWIN*:*)
-+ echo ${UNAME_MACHINE}-pc-uwin
-+ exit 0 ;;
- p*:CYGWIN*:*)
-- echo powerpcle-unknown-cygwin32
-+ echo powerpcle-unknown-cygwin
- exit 0 ;;
- prep*:SunOS:5.*:*)
- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-@@ -492,145 +812,159 @@
- *:GNU:*:*)
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
- exit 0 ;;
-- *:Linux:*:*)
-- # uname on the ARM produces all sorts of strangeness, and we need to
-- # filter it out.
-- case "$UNAME_MACHINE" in
-- arm* | sa110*) UNAME_MACHINE="arm" ;;
-+ i*86:Minix:*:*)
-+ echo ${UNAME_MACHINE}-pc-minix
-+ exit 0 ;;
-+ arm*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ ia64:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ m68*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ mips:Linux:*:*)
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #undef CPU
-+ #undef mips
-+ #undef mipsel
-+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-+ CPU=mipsel
-+ #else
-+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-+ CPU=mips
-+ #else
-+ CPU=
-+ #endif
-+ #endif
-+EOF
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-+ ;;
-+ mips64:Linux:*:*)
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #undef CPU
-+ #undef mips64
-+ #undef mips64el
-+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-+ CPU=mips64el
-+ #else
-+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-+ CPU=mips64
-+ #else
-+ CPU=
-+ #endif
-+ #endif
-+EOF
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-+ ;;
-+ ppc:Linux:*:*)
-+ echo powerpc-unknown-linux-gnu
-+ exit 0 ;;
-+ ppc64:Linux:*:*)
-+ echo powerpc64-unknown-linux-gnu
-+ exit 0 ;;
-+ alpha:Linux:*:*)
-+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-+ EV5) UNAME_MACHINE=alphaev5 ;;
-+ EV56) UNAME_MACHINE=alphaev56 ;;
-+ PCA56) UNAME_MACHINE=alphapca56 ;;
-+ PCA57) UNAME_MACHINE=alphapca56 ;;
-+ EV6) UNAME_MACHINE=alphaev6 ;;
-+ EV67) UNAME_MACHINE=alphaev67 ;;
-+ EV68*) UNAME_MACHINE=alphaev68 ;;
-+ esac
-+ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+ exit 0 ;;
-+ parisc:Linux:*:* | hppa:Linux:*:*)
-+ # Look for CPU level
-+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-+ PA7*) echo hppa1.1-unknown-linux-gnu ;;
-+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
-+ *) echo hppa-unknown-linux-gnu ;;
- esac
--
-+ exit 0 ;;
-+ parisc64:Linux:*:* | hppa64:Linux:*:*)
-+ echo hppa64-unknown-linux-gnu
-+ exit 0 ;;
-+ s390:Linux:*:* | s390x:Linux:*:*)
-+ echo ${UNAME_MACHINE}-ibm-linux
-+ exit 0 ;;
-+ sh*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ sparc:Linux:*:* | sparc64:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ x86_64:Linux:*:*)
-+ echo x86_64-unknown-linux-gnu
-+ exit 0 ;;
-+ i*86:Linux:*:*)
- # The BFD linker knows what the default object file format is, so
-- # first see if it will tell us.
-- ld_help_string=`ld --help 2>&1`
-- ld_supported_emulations=`echo $ld_help_string \
-- | sed -ne '/supported emulations:/!d
-+ # first see if it will tell us. cd to the root directory to prevent
-+ # problems with other programs or directories called `ld' in the path.
-+ # Set LC_ALL=C to ensure ld outputs messages in English.
-+ ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-+ | sed -ne '/supported targets:/!d
- s/[ ][ ]*/ /g
-- s/.*supported emulations: *//
-+ s/.*supported targets: *//
- s/ .*//
- p'`
-- case "$ld_supported_emulations" in
-- i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;;
-- i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;;
-- sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-- armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-- m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-- elf32ppc) echo "powerpc-unknown-linux-gnu" ; exit 0 ;;
-+ case "$ld_supported_targets" in
-+ elf32-i386)
-+ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-+ ;;
-+ a.out-i386-linux)
-+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-+ exit 0 ;;
-+ coff-i386)
-+ echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-+ exit 0 ;;
-+ "")
-+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
-+ # one that does not give us useful --help.
-+ echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-+ exit 0 ;;
- esac
--
-- if test "${UNAME_MACHINE}" = "alpha" ; then
-- sed 's/^ //' <<EOF >dummy.s
-- .globl main
-- .ent main
-- main:
-- .frame \$30,0,\$26,0
-- .prologue 0
-- .long 0x47e03d80 # implver $0
-- lda \$2,259
-- .long 0x47e20c21 # amask $2,$1
-- srl \$1,8,\$2
-- sll \$2,2,\$2
-- sll \$0,3,\$0
-- addl \$1,\$0,\$0
-- addl \$2,\$0,\$0
-- ret \$31,(\$26),1
-- .end main
--EOF
-- LIBC=""
-- ${CC-cc} dummy.s -o dummy 2>/dev/null
-- if test "$?" = 0 ; then
-- ./dummy
-- case "$?" in
-- 7)
-- UNAME_MACHINE="alpha"
-- ;;
-- 15)
-- UNAME_MACHINE="alphaev5"
-- ;;
-- 14)
-- UNAME_MACHINE="alphaev56"
-- ;;
-- 10)
-- UNAME_MACHINE="alphapca56"
-- ;;
-- 16)
-- UNAME_MACHINE="alphaev6"
-- ;;
-- esac
--
-- objdump --private-headers dummy | \
-- grep ld.so.1 > /dev/null
-- if test "$?" = 0 ; then
-- LIBC="libc1"
-- fi
-- fi
-- rm -f dummy.s dummy
-- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
-- elif test "${UNAME_MACHINE}" = "mips" ; then
-- cat >dummy.c <<EOF
--main(argc, argv)
-- int argc;
-- char *argv[];
--{
--#ifdef __MIPSEB__
-- printf ("%s-unknown-linux-gnu\n", argv[1]);
--#endif
--#ifdef __MIPSEL__
-- printf ("%sel-unknown-linux-gnu\n", argv[1]);
--#endif
-- return 0;
--}
--EOF
-- ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
-- rm -f dummy.c dummy
-- else
-- # Either a pre-BFD a.out linker (linux-gnuoldld)
-- # or one that does not give us useful --help.
-- # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
-- # If ld does not provide *any* "supported emulations:"
-- # that means it is gnuoldld.
-- echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
-- test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
--
-- case "${UNAME_MACHINE}" in
-- i?86)
-- VENDOR=pc;
-- ;;
-- *)
-- VENDOR=unknown;
-- ;;
-- esac
-- # Determine whether the default compiler is a.out or elf
-- cat >dummy.c <<EOF
--#include <features.h>
--main(argc, argv)
-- int argc;
-- char *argv[];
--{
--#ifdef __ELF__
--# ifdef __GLIBC__
--# if __GLIBC__ >= 2
-- printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
--# else
-- printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
--# endif
--# else
-- printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
--# endif
--#else
-- printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
--#endif
-- return 0;
--}
-+ # Determine whether the default compiler is a.out or elf
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #include <features.h>
-+ #ifdef __ELF__
-+ # ifdef __GLIBC__
-+ # if __GLIBC__ >= 2
-+ LIBC=gnu
-+ # else
-+ LIBC=gnulibc1
-+ # endif
-+ # else
-+ LIBC=gnulibc1
-+ # endif
-+ #else
-+ #ifdef __INTEL_COMPILER
-+ LIBC=gnu
-+ #else
-+ LIBC=gnuaout
-+ #endif
-+ #endif
- EOF
-- ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
-- rm -f dummy.c dummy
-- fi ;;
--# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions
--# are messed up and put the nodename in both sysname and nodename.
-- i?86:DYNIX/ptx:4*:*)
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-+ test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-+ test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-+ ;;
-+ i*86:DYNIX/ptx:4*:*)
-+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-+ # earlier versions are messed up and put the nodename in both
-+ # sysname and nodename.
- echo i386-sequent-sysv4
- exit 0 ;;
-- i?86:UNIX_SV:4.2MP:2.*)
-+ i*86:UNIX_SV:4.2MP:2.*)
- # Unixware is an offshoot of SVR4, but it has its own version
- # number series starting with 2...
- # I am not positive that other SVR4 systems won't match this,
-@@ -638,28 +972,59 @@
- # Use sysv4.2uw... so that sysv4* matches it.
- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
- exit 0 ;;
-- i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
-+ i*86:OS/2:*:*)
-+ # If we were able to find `uname', then EMX Unix compatibility
-+ # is probably installed.
-+ echo ${UNAME_MACHINE}-pc-os2-emx
-+ exit 0 ;;
-+ i*86:XTS-300:*:STOP)
-+ echo ${UNAME_MACHINE}-unknown-stop
-+ exit 0 ;;
-+ i*86:atheos:*:*)
-+ echo ${UNAME_MACHINE}-unknown-atheos
-+ exit 0 ;;
-+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+ echo i386-unknown-lynxos${UNAME_RELEASE}
-+ exit 0 ;;
-+ i*86:*DOS:*:*)
-+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
-+ exit 0 ;;
-+ i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-+ UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
- if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-- echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
-+ echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
- else
-- echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
-+ echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
- fi
- exit 0 ;;
-- i?86:*:3.2:*)
-+ i*86:*:5:[78]*)
-+ case `/bin/uname -X | grep "^Machine"` in
-+ *486*) UNAME_MACHINE=i486 ;;
-+ *Pentium) UNAME_MACHINE=i586 ;;
-+ *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-+ esac
-+ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-+ exit 0 ;;
-+ i*86:*:3.2:*)
- if test -f /usr/options/cb.name; then
- UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
- echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
- elif /bin/uname -X 2>/dev/null >/dev/null ; then
-- UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-- (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-- (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-+ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-+ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-+ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
- && UNAME_MACHINE=i586
-+ (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-+ && UNAME_MACHINE=i686
-+ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-+ && UNAME_MACHINE=i686
- echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
- else
- echo ${UNAME_MACHINE}-pc-sysv32
- fi
- exit 0 ;;
- pc:*:*:*)
-+ # Left here for compatibility:
- # uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i386.
- echo i386-pc-msdosdjgpp
-@@ -681,9 +1046,15 @@
- # "miniframe"
- echo m68010-convergent-sysv
- exit 0 ;;
-+ mc68k:UNIX:SYSTEM5:3.51m)
-+ echo m68k-convergent-sysv
-+ exit 0 ;;
-+ M680?0:D-NIX:5.3:*)
-+ echo m68k-diab-dnix
-+ exit 0 ;;
- M68*:*:R3V[567]*:*)
- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-- 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
-+ 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0)
- OS_REL=''
- test -r /etc/.relid \
- && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-@@ -694,24 +1065,27 @@
- 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && echo i486-ncr-sysv4 && exit 0 ;;
-- m68*:LynxOS:2.*:*)
-+ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- echo m68k-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
- mc68030:UNIX_System_V:4.*:*)
- echo m68k-atari-sysv4
- exit 0 ;;
-- i?86:LynxOS:2.*:*)
-- echo i386-unknown-lynxos${UNAME_RELEASE}
-- exit 0 ;;
- TSUNAMI:LynxOS:2.*:*)
- echo sparc-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
-- rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
-+ rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
-+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-+ echo powerpc-unknown-lynxos${UNAME_RELEASE}
-+ exit 0 ;;
- SM[BE]S:UNIX_SV:*:*)
- echo mips-dde-sysv${UNAME_RELEASE}
- exit 0 ;;
-+ RM*:ReliantUNIX-*:*:*)
-+ echo mips-sni-sysv4
-+ exit 0 ;;
- RM*:SINIX-*:*:*)
- echo mips-sni-sysv4
- exit 0 ;;
-@@ -723,8 +1097,8 @@
- echo ns32k-sni-sysv
- fi
- exit 0 ;;
-- PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-- # says <Richard.M.Bartel(a)ccMail.Census.GOV>
-+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-+ # says <Richard.M.Bartel(a)ccMail.Census.GOV>
- echo i586-unisys-sysv4
- exit 0 ;;
- *:UNIX_System_V:4*:FTX*)
-@@ -736,25 +1110,113 @@
- # From seanf(a)swdc.stratus.com.
- echo i860-stratus-sysv4
- exit 0 ;;
-+ *:VOS:*:*)
-+ # From Paul.Green(a)stratus.com.
-+ echo hppa1.1-stratus-vos
-+ exit 0 ;;
- mc68*:A/UX:*:*)
- echo m68k-apple-aux${UNAME_RELEASE}
- exit 0 ;;
-- news*:NEWS-OS:*:6*)
-+ news*:NEWS-OS:6*:*)
- echo mips-sony-newsos6
- exit 0 ;;
-- R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*)
-+ R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
- if [ -d /usr/nec ]; then
- echo mips-nec-sysv${UNAME_RELEASE}
- else
- echo mips-unknown-sysv${UNAME_RELEASE}
- fi
- exit 0 ;;
-+ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
-+ echo powerpc-be-beos
-+ exit 0 ;;
-+ BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
-+ echo powerpc-apple-beos
-+ exit 0 ;;
-+ BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
-+ echo i586-pc-beos
-+ exit 0 ;;
-+ SX-4:SUPER-UX:*:*)
-+ echo sx4-nec-superux${UNAME_RELEASE}
-+ exit 0 ;;
-+ SX-5:SUPER-UX:*:*)
-+ echo sx5-nec-superux${UNAME_RELEASE}
-+ exit 0 ;;
-+ SX-6:SUPER-UX:*:*)
-+ echo sx6-nec-superux${UNAME_RELEASE}
-+ exit 0 ;;
-+ Power*:Rhapsody:*:*)
-+ echo powerpc-apple-rhapsody${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:Rhapsody:*:*)
-+ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:Darwin:*:*)
-+ case `uname -p` in
-+ *86) UNAME_PROCESSOR=i686 ;;
-+ powerpc) UNAME_PROCESSOR=powerpc ;;
-+ esac
-+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:procnto*:*:* | *:QNX:[0123456789]*:*)
-+ UNAME_PROCESSOR=`uname -p`
-+ if test "$UNAME_PROCESSOR" = "x86"; then
-+ UNAME_PROCESSOR=i386
-+ UNAME_MACHINE=pc
-+ fi
-+ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:QNX:*:4*)
-+ echo i386-pc-qnx
-+ exit 0 ;;
-+ NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
-+ echo nsr-tandem-nsk${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:NonStop-UX:*:*)
-+ echo mips-compaq-nonstopux
-+ exit 0 ;;
-+ BS2000:POSIX*:*:*)
-+ echo bs2000-siemens-sysv
-+ exit 0 ;;
-+ DS/*:UNIX_System_V:*:*)
-+ echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:Plan9:*:*)
-+ # "uname -m" is not consistent, so use $cputype instead. 386
-+ # is converted to i386 for consistency with other x86
-+ # operating systems.
-+ if test "$cputype" = "386"; then
-+ UNAME_MACHINE=i386
-+ else
-+ UNAME_MACHINE="$cputype"
-+ fi
-+ echo ${UNAME_MACHINE}-unknown-plan9
-+ exit 0 ;;
-+ *:TOPS-10:*:*)
-+ echo pdp10-unknown-tops10
-+ exit 0 ;;
-+ *:TENEX:*:*)
-+ echo pdp10-unknown-tenex
-+ exit 0 ;;
-+ KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-+ echo pdp10-dec-tops20
-+ exit 0 ;;
-+ XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-+ echo pdp10-xkl-tops20
-+ exit 0 ;;
-+ *:TOPS-20:*:*)
-+ echo pdp10-unknown-tops20
-+ exit 0 ;;
-+ *:ITS:*:*)
-+ echo pdp10-unknown-its
-+ exit 0 ;;
- esac
-
- #echo '(No uname command or uname output not recognized.)' 1>&2
- #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
--cat >dummy.c <<EOF
-+eval $set_cc_for_build
-+cat >$dummy.c <<EOF
- #ifdef _SEQUENT_
- # include <sys/types.h>
- # include <sys/utsname.h>
-@@ -792,7 +1254,10 @@
- #endif
- int version;
- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-+ if (version < 4)
-+ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-+ else
-+ printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
- exit (0);
- #endif
-
-@@ -837,11 +1302,24 @@
- #endif
-
- #if defined (vax)
--#if !defined (ultrix)
-- printf ("vax-dec-bsd\n"); exit (0);
--#else
-- printf ("vax-dec-ultrix\n"); exit (0);
--#endif
-+# if !defined (ultrix)
-+# include <sys/param.h>
-+# if defined (BSD)
-+# if BSD == 43
-+ printf ("vax-dec-bsd4.3\n"); exit (0);
-+# else
-+# if BSD == 199006
-+ printf ("vax-dec-bsd4.3reno\n"); exit (0);
-+# else
-+ printf ("vax-dec-bsd\n"); exit (0);
-+# endif
-+# endif
-+# else
-+ printf ("vax-dec-bsd\n"); exit (0);
-+# endif
-+# else
-+ printf ("vax-dec-ultrix\n"); exit (0);
-+# endif
- #endif
-
- #if defined (alliant) && defined (i860)
-@@ -852,8 +1330,7 @@
- }
- EOF
-
--${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
--rm -f dummy.c dummy
-+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
-
- # Apollos put the system type in the environment.
-
-@@ -885,6 +1362,48 @@
- esac
- fi
-
--#echo '(Unable to guess system type)' 1>&2
-+cat >&2 <<EOF
-+$0: unable to guess system type
-+
-+This script, last modified $timestamp, has failed to recognize
-+the operating system you are using. It is advised that you
-+download the most up to date version of the config scripts from
-+
-+ ftp://ftp.gnu.org/pub/gnu/config/
-+
-+If the version you run ($0) is already up to date, please
-+send the following data and any information you think might be
-+pertinent to <config-patches(a)gnu.org> in order to provide the needed
-+information to handle your system.
-+
-+config.guess timestamp = $timestamp
-+
-+uname -m = `(uname -m) 2>/dev/null || echo unknown`
-+uname -r = `(uname -r) 2>/dev/null || echo unknown`
-+uname -s = `(uname -s) 2>/dev/null || echo unknown`
-+uname -v = `(uname -v) 2>/dev/null || echo unknown`
-+
-+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-+/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
-+
-+hostinfo = `(hostinfo) 2>/dev/null`
-+/bin/universe = `(/bin/universe) 2>/dev/null`
-+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
-+/bin/arch = `(/bin/arch) 2>/dev/null`
-+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
-+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-+
-+UNAME_MACHINE = ${UNAME_MACHINE}
-+UNAME_RELEASE = ${UNAME_RELEASE}
-+UNAME_SYSTEM = ${UNAME_SYSTEM}
-+UNAME_VERSION = ${UNAME_VERSION}
-+EOF
-
- exit 1
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "timestamp='"
-+# time-stamp-format: "%:y-%02m-%02d"
-+# time-stamp-end: "'"
-+# End:
---- ez-ipupdate-3.0.11b8.orig/config.h.in
-+++ ez-ipupdate-3.0.11b8/config.h.in
-@@ -1,4 +1,4 @@
--/* config.h.in. Generated automatically from configure.in by autoheader. */
-+/* config.h.in. Generated automatically from configure.in by autoheader 2.13. */
-
- /* Define as the return type of signal handlers (int or void). */
- #undef RETSIGTYPE
-@@ -132,6 +132,9 @@
- /* Define if you have the <stdarg.h> header file. */
- #undef HAVE_STDARG_H
-
-+/* Define if you have the <string.h> header file. */
-+#undef HAVE_STRING_H
-+
- /* Define if you have the <sys/socket.h> header file. */
- #undef HAVE_SYS_SOCKET_H
-
-@@ -153,6 +156,9 @@
- /* Define if you have the <syslog.h> header file. */
- #undef HAVE_SYSLOG_H
-
-+/* Define if you have the <time.h> header file. */
-+#undef HAVE_TIME_H
-+
- /* Define if you have the <unistd.h> header file. */
- #undef HAVE_UNISTD_H
-
-@@ -161,3 +167,10 @@
-
- /* Define if you have the socket library (-lsocket). */
- #undef HAVE_LIBSOCKET
-+
-+/* Name of package */
-+#undef PACKAGE
-+
-+/* Version number of package */
-+#undef VERSION
-+
---- ez-ipupdate-3.0.11b8.orig/config.sub
-+++ ez-ipupdate-3.0.11b8/config.sub
-@@ -1,6 +1,10 @@
- #! /bin/sh
--# Configuration validation subroutine script, version 1.1.
--# Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
-+# Configuration validation subroutine script.
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-+
-+timestamp='2003-01-03'
-+
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
- # can handle that machine. It does not imply ALL GNU software can.
-@@ -25,6 +29,9 @@
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
-
-+# Please send patches to <config-patches(a)gnu.org>. Submit a context
-+# diff and a properly formatted ChangeLog entry.
-+#
- # Configuration subroutine to validate and canonicalize a configuration type.
- # Supply the specified configuration type as an argument.
- # If it is invalid, we print an error message on stderr and exit with code 1.
-@@ -45,30 +52,73 @@
- # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
- # It is wrong to echo any other type of specification.
-
--if [ x$1 = x ]
--then
-- echo Configuration name missing. 1>&2
-- echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
-- echo "or $0 ALIAS" 1>&2
-- echo where ALIAS is a recognized configuration type. 1>&2
-- exit 1
--fi
-+me=`echo "$0" | sed -e 's,.*/,,'`
-
--# First pass through any local machine types.
--case $1 in
-- *local*)
-- echo $1
-- exit 0
-- ;;
-- *)
-- ;;
-+usage="\
-+Usage: $0 [OPTION] CPU-MFR-OPSYS
-+ $0 [OPTION] ALIAS
-+
-+Canonicalize a configuration name.
-+
-+Operation modes:
-+ -h, --help print this help, then exit
-+ -t, --time-stamp print date of last modification, then exit
-+ -v, --version print version number, then exit
-+
-+Report bugs and patches to <config-patches(a)gnu.org>."
-+
-+version="\
-+GNU config.sub ($timestamp)
-+
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-+Free Software Foundation, Inc.
-+
-+This is free software; see the source for copying conditions. There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+
-+help="
-+Try \`$me --help' for more information."
-+
-+# Parse command line
-+while test $# -gt 0 ; do
-+ case $1 in
-+ --time-stamp | --time* | -t )
-+ echo "$timestamp" ; exit 0 ;;
-+ --version | -v )
-+ echo "$version" ; exit 0 ;;
-+ --help | --h* | -h )
-+ echo "$usage"; exit 0 ;;
-+ -- ) # Stop option processing
-+ shift; break ;;
-+ - ) # Use stdin as input.
-+ break ;;
-+ -* )
-+ echo "$me: invalid option $1$help"
-+ exit 1 ;;
-+
-+ *local*)
-+ # First pass through any local machine types.
-+ echo $1
-+ exit 0;;
-+
-+ * )
-+ break ;;
-+ esac
-+done
-+
-+case $# in
-+ 0) echo "$me: missing argument$help" >&2
-+ exit 1;;
-+ 1) ;;
-+ *) echo "$me: too many arguments$help" >&2
-+ exit 1;;
- esac
-
- # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
-- linux-gnu*)
-+ nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
- ;;
-@@ -94,15 +144,33 @@
- -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
- -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
- -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-- -apple)
-+ -apple | -axis)
- os=
- basic_machine=$1
- ;;
-+ -sim | -cisco | -oki | -wec | -winbond)
-+ os=
-+ basic_machine=$1
-+ ;;
-+ -scout)
-+ ;;
-+ -wrs)
-+ os=-vxworks
-+ basic_machine=$1
-+ ;;
-+ -chorusos*)
-+ os=-chorusos
-+ basic_machine=$1
-+ ;;
-+ -chorusrdb)
-+ os=-chorusrdb
-+ basic_machine=$1
-+ ;;
- -hiux*)
- os=-hiuxwe2
- ;;
- -sco5)
-- os=sco3.2v5
-+ os=-sco3.2v5
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco4)
-@@ -121,6 +189,9 @@
- os=-sco3.2v2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
-+ -udk*)
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
- -isc)
- os=-isc2.2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -143,26 +214,72 @@
- -psos*)
- os=-psos
- ;;
-+ -mint | -mint[0-9]*)
-+ basic_machine=m68k-atari
-+ os=-mint
-+ ;;
- esac
-
- # Decode aliases for certain CPU-COMPANY combinations.
- case $basic_machine in
- # Recognize the basic CPU types without company name.
- # Some are omitted here because they have special meanings below.
-- tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
-- | arme[lb] | pyramid | mn10200 | mn10300 \
-- | tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
-- | alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
-- | i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
-- | mips64 | mipsel | mips64el | mips64orion | mips64orionel \
-- | mipstx39 | mipstx39el \
-- | sparc | sparclet | sparclite | sparc64 | v850)
-+ 1750a | 580 \
-+ | a29k \
-+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-+ | clipper \
-+ | d10v | d30v | dlx | dsp16xx \
-+ | fr30 | frv \
-+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-+ | i370 | i860 | i960 | ia64 \
-+ | ip2k \
-+ | m32r | m68000 | m68k | m88k | mcore \
-+ | mips | mipsbe | mipseb | mipsel | mipsle \
-+ | mips16 \
-+ | mips64 | mips64el \
-+ | mips64vr | mips64vrel \
-+ | mips64orion | mips64orionel \
-+ | mips64vr4100 | mips64vr4100el \
-+ | mips64vr4300 | mips64vr4300el \
-+ | mips64vr5000 | mips64vr5000el \
-+ | mipsisa32 | mipsisa32el \
-+ | mipsisa32r2 | mipsisa32r2el \
-+ | mipsisa64 | mipsisa64el \
-+ | mipsisa64sb1 | mipsisa64sb1el \
-+ | mipsisa64sr71k | mipsisa64sr71kel \
-+ | mipstx39 | mipstx39el \
-+ | mn10200 | mn10300 \
-+ | msp430 \
-+ | ns16k | ns32k \
-+ | openrisc | or32 \
-+ | pdp10 | pdp11 | pj | pjl \
-+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-+ | pyramid \
-+ | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+ | sh64 | sh64le \
-+ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-+ | strongarm \
-+ | tahoe | thumb | tic80 | tron \
-+ | v850 | v850e \
-+ | we32k \
-+ | x86 | xscale | xstormy16 | xtensa \
-+ | z8k)
-+ basic_machine=$basic_machine-unknown
-+ ;;
-+ m6811 | m68hc11 | m6812 | m68hc12)
-+ # Motorola 68HC11/12.
- basic_machine=$basic_machine-unknown
-+ os=-none
-+ ;;
-+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
- ;;
-+
- # We use `pc' rather than `unknown'
- # because (1) that's what they normally are, and
- # (2) the word "unknown" tends to confuse beginning users.
-- i[34567]86)
-+ i*86 | x86_64)
- basic_machine=$basic_machine-pc
- ;;
- # Object if more than one company name word.
-@@ -171,27 +288,79 @@
- exit 1
- ;;
- # Recognize the basic CPU types with company name.
-- vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
-- | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
-- | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
-- | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
-- | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* \
-- | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
-- | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
-- | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-- | sparc64-* | mips64-* | mipsel-* \
-- | mips64el-* | mips64orion-* | mips64orionel-* \
-- | mipstx39-* | mipstx39el-* \
-- | f301-*)
-+ 580-* \
-+ | a29k-* \
-+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
-+ | avr-* \
-+ | bs2000-* \
-+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
-+ | clipper-* | cydra-* \
-+ | d10v-* | d30v-* | dlx-* \
-+ | elxsi-* \
-+ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-+ | h8300-* | h8500-* \
-+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-+ | i*86-* | i860-* | i960-* | ia64-* \
-+ | ip2k-* \
-+ | m32r-* \
-+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-+ | m88110-* | m88k-* | mcore-* \
-+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-+ | mips16-* \
-+ | mips64-* | mips64el-* \
-+ | mips64vr-* | mips64vrel-* \
-+ | mips64orion-* | mips64orionel-* \
-+ | mips64vr4100-* | mips64vr4100el-* \
-+ | mips64vr4300-* | mips64vr4300el-* \
-+ | mips64vr5000-* | mips64vr5000el-* \
-+ | mipsisa32-* | mipsisa32el-* \
-+ | mipsisa32r2-* | mipsisa32r2el-* \
-+ | mipsisa64-* | mipsisa64el-* \
-+ | mipsisa64sb1-* | mipsisa64sb1el-* \
-+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \
-+ | mipstx39-* | mipstx39el-* \
-+ | msp430-* \
-+ | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
-+ | orion-* \
-+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-+ | pyramid-* \
-+ | romp-* | rs6000-* \
-+ | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
-+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-+ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-+ | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-+ | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
-+ | v850-* | v850e-* | vax-* \
-+ | we32k-* \
-+ | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-+ | xtensa-* \
-+ | ymp-* \
-+ | z8k-*)
- ;;
- # Recognize the various machine names and aliases which stand
- # for a CPU type and a company and sometimes even an OS.
-+ 386bsd)
-+ basic_machine=i386-unknown
-+ os=-bsd
-+ ;;
- 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
- basic_machine=m68000-att
- ;;
- 3b*)
- basic_machine=we32k-att
- ;;
-+ a29khif)
-+ basic_machine=a29k-amd
-+ os=-udi
-+ ;;
-+ adobe68k)
-+ basic_machine=m68010-adobe
-+ os=-scout
-+ ;;
- alliant | fx80)
- basic_machine=fx80-alliant
- ;;
-@@ -207,20 +376,24 @@
- os=-sysv
- ;;
- amiga | amiga-*)
-- basic_machine=m68k-cbm
-+ basic_machine=m68k-unknown
- ;;
- amigaos | amigados)
-- basic_machine=m68k-cbm
-+ basic_machine=m68k-unknown
- os=-amigaos
- ;;
- amigaunix | amix)
-- basic_machine=m68k-cbm
-+ basic_machine=m68k-unknown
- os=-sysv4
- ;;
- apollo68)
- basic_machine=m68k-apollo
- os=-sysv
- ;;
-+ apollo68bsd)
-+ basic_machine=m68k-apollo
-+ os=-bsd
-+ ;;
- aux)
- basic_machine=m68k-apple
- os=-aux
-@@ -229,6 +402,10 @@
- basic_machine=ns32k-sequent
- os=-dynix
- ;;
-+ c90)
-+ basic_machine=c90-cray
-+ os=-unicos
-+ ;;
- convex-c1)
- basic_machine=c1-convex
- os=-bsd
-@@ -249,27 +426,30 @@
- basic_machine=c38-convex
- os=-bsd
- ;;
-- cray | ymp)
-- basic_machine=ymp-cray
-- os=-unicos
-- ;;
-- cray2)
-- basic_machine=cray2-cray
-- os=-unicos
-- ;;
-- [ctj]90-cray)
-- basic_machine=c90-cray
-+ cray | j90)
-+ basic_machine=j90-cray
- os=-unicos
- ;;
- crds | unos)
- basic_machine=m68k-crds
- ;;
-+ cris | cris-* | etrax*)
-+ basic_machine=cris-axis
-+ ;;
- da30 | da30-*)
- basic_machine=m68k-da30
- ;;
- decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
- basic_machine=mips-dec
- ;;
-+ decsystem10* | dec10*)
-+ basic_machine=pdp10-dec
-+ os=-tops10
-+ ;;
-+ decsystem20* | dec20*)
-+ basic_machine=pdp10-dec
-+ os=-tops20
-+ ;;
- delta | 3300 | motorola-3300 | motorola-delta \
- | 3300-motorola | delta-motorola)
- basic_machine=m68k-motorola
-@@ -297,6 +477,10 @@
- encore | umax | mmax)
- basic_machine=ns32k-encore
- ;;
-+ es1800 | OSE68k | ose68k | ose | OSE)
-+ basic_machine=m68k-ericsson
-+ os=-ose
-+ ;;
- fx2800)
- basic_machine=i860-alliant
- ;;
-@@ -307,6 +491,10 @@
- basic_machine=tron-gmicro
- os=-sysv
- ;;
-+ go32)
-+ basic_machine=i386-pc
-+ os=-go32
-+ ;;
- h3050r* | hiux*)
- basic_machine=hppa1.1-hitachi
- os=-hiuxwe2
-@@ -315,6 +503,14 @@
- basic_machine=h8300-hitachi
- os=-hms
- ;;
-+ h8300xray)
-+ basic_machine=h8300-hitachi
-+ os=-xray
-+ ;;
-+ h8500hms)
-+ basic_machine=h8500-hitachi
-+ os=-hms
-+ ;;
- harris)
- basic_machine=m88k-harris
- os=-sysv3
-@@ -330,13 +526,30 @@
- basic_machine=m68k-hp
- os=-hpux
- ;;
-+ hp3k9[0-9][0-9] | hp9[0-9][0-9])
-+ basic_machine=hppa1.0-hp
-+ ;;
- hp9k2[0-9][0-9] | hp9k31[0-9])
- basic_machine=m68000-hp
- ;;
- hp9k3[2-9][0-9])
- basic_machine=m68k-hp
- ;;
-- hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
-+ hp9k6[0-9][0-9] | hp6[0-9][0-9])
-+ basic_machine=hppa1.0-hp
-+ ;;
-+ hp9k7[0-79][0-9] | hp7[0-79][0-9])
-+ basic_machine=hppa1.1-hp
-+ ;;
-+ hp9k78[0-9] | hp78[0-9])
-+ # FIXME: really hppa2.0-hp
-+ basic_machine=hppa1.1-hp
-+ ;;
-+ hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-+ # FIXME: really hppa2.0-hp
-+ basic_machine=hppa1.1-hp
-+ ;;
-+ hp9k8[0-9][13679] | hp8[0-9][13679])
- basic_machine=hppa1.1-hp
- ;;
- hp9k8[0-9][0-9] | hp8[0-9][0-9])
-@@ -345,27 +558,42 @@
- hppa-next)
- os=-nextstep3
- ;;
-+ hppaosf)
-+ basic_machine=hppa1.1-hp
-+ os=-osf
-+ ;;
-+ hppro)
-+ basic_machine=hppa1.1-hp
-+ os=-proelf
-+ ;;
- i370-ibm* | ibm*)
- basic_machine=i370-ibm
-- os=-mvs
- ;;
- # I'm not sure what "Sysv32" means. Should this be sysv3.2?
-- i[34567]86v32)
-+ i*86v32)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv32
- ;;
-- i[34567]86v4*)
-+ i*86v4*)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv4
- ;;
-- i[34567]86v)
-+ i*86v)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv
- ;;
-- i[34567]86sol2)
-+ i*86sol2)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-solaris2
- ;;
-+ i386mach)
-+ basic_machine=i386-mach
-+ os=-mach
-+ ;;
-+ i386-vsta | vsta)
-+ basic_machine=i386-unknown
-+ os=-vsta
-+ ;;
- iris | iris4d)
- basic_machine=mips-sgi
- case $os in
-@@ -391,16 +619,16 @@
- basic_machine=ns32k-utek
- os=-sysv
- ;;
-+ mingw32)
-+ basic_machine=i386-pc
-+ os=-mingw32
-+ ;;
- miniframe)
- basic_machine=m68000-convergent
- ;;
-- mipsel*-linux*)
-- basic_machine=mipsel-unknown
-- os=-linux-gnu
-- ;;
-- mips*-linux*)
-- basic_machine=mips-unknown
-- os=-linux-gnu
-+ *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-+ basic_machine=m68k-atari
-+ os=-mint
- ;;
- mips3*-*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-@@ -408,10 +636,38 @@
- mips3*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
- ;;
-+ mmix*)
-+ basic_machine=mmix-knuth
-+ os=-mmixware
-+ ;;
-+ monitor)
-+ basic_machine=m68k-rom68k
-+ os=-coff
-+ ;;
-+ morphos)
-+ basic_machine=powerpc-unknown
-+ os=-morphos
-+ ;;
-+ msdos)
-+ basic_machine=i386-pc
-+ os=-msdos
-+ ;;
-+ mvs)
-+ basic_machine=i370-ibm
-+ os=-mvs
-+ ;;
- ncr3000)
- basic_machine=i486-ncr
- os=-sysv4
- ;;
-+ netbsd386)
-+ basic_machine=i386-unknown
-+ os=-netbsd
-+ ;;
-+ netwinder)
-+ basic_machine=armv4l-rebel
-+ os=-linux
-+ ;;
- news | news700 | news800 | news900)
- basic_machine=m68k-sony
- os=-newsos
-@@ -424,6 +680,10 @@
- basic_machine=mips-sony
- os=-newsos
- ;;
-+ necv70)
-+ basic_machine=v70-nec
-+ os=-sysv
-+ ;;
- next | m*-next )
- basic_machine=m68k-next
- case $os in
-@@ -449,9 +709,40 @@
- basic_machine=i960-intel
- os=-nindy
- ;;
-+ mon960)
-+ basic_machine=i960-intel
-+ os=-mon960
-+ ;;
-+ nonstopux)
-+ basic_machine=mips-compaq
-+ os=-nonstopux
-+ ;;
- np1)
- basic_machine=np1-gould
- ;;
-+ nv1)
-+ basic_machine=nv1-cray
-+ os=-unicosmp
-+ ;;
-+ nsr-tandem)
-+ basic_machine=nsr-tandem
-+ ;;
-+ op50n-* | op60c-*)
-+ basic_machine=hppa1.1-oki
-+ os=-proelf
-+ ;;
-+ or32 | or32-*)
-+ basic_machine=or32-unknown
-+ os=-coff
-+ ;;
-+ OSE68000 | ose68000)
-+ basic_machine=m68000-ericsson
-+ os=-ose
-+ ;;
-+ os68k)
-+ basic_machine=m68k-none
-+ os=-os68k
-+ ;;
- pa-hitachi)
- basic_machine=hppa1.1-hitachi
- os=-hiuxwe2
-@@ -466,51 +757,85 @@
- pbb)
- basic_machine=m68k-tti
- ;;
-- pc532 | pc532-*)
-+ pc532 | pc532-*)
- basic_machine=ns32k-pc532
- ;;
-- pentium | p5 | k5 | nexen)
-+ pentium | p5 | k5 | k6 | nexgen | viac3)
- basic_machine=i586-pc
- ;;
-- pentiumpro | p6 | k6 | 6x86)
-+ pentiumpro | p6 | 6x86 | athlon | athlon_*)
- basic_machine=i686-pc
- ;;
- pentiumii | pentium2)
-- basic_machine=i786-pc
-+ basic_machine=i686-pc
- ;;
-- pentium-* | p5-* | k5-* | nexen-*)
-+ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
- basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
-- pentiumpro-* | p6-* | k6-* | 6x86-*)
-+ pentiumpro-* | p6-* | 6x86-* | athlon-*)
- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pentiumii-* | pentium2-*)
-- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pn)
- basic_machine=pn-gould
- ;;
-- power) basic_machine=rs6000-ibm
-+ power) basic_machine=power-ibm
- ;;
- ppc) basic_machine=powerpc-unknown
-- ;;
-+ ;;
- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ppcle | powerpclittle | ppc-le | powerpc-little)
- basic_machine=powerpcle-unknown
-- ;;
-+ ;;
- ppcle-* | powerpclittle-*)
- basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
-+ ppc64) basic_machine=powerpc64-unknown
-+ ;;
-+ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-+ basic_machine=powerpc64le-unknown
-+ ;;
-+ ppc64le-* | powerpc64little-*)
-+ basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
- ps2)
- basic_machine=i386-ibm
- ;;
-+ pw32)
-+ basic_machine=i586-unknown
-+ os=-pw32
-+ ;;
-+ rom68k)
-+ basic_machine=m68k-rom68k
-+ os=-coff
-+ ;;
- rm[46]00)
- basic_machine=mips-siemens
- ;;
- rtpc | rtpc-*)
- basic_machine=romp-ibm
- ;;
-+ s390 | s390-*)
-+ basic_machine=s390-ibm
-+ ;;
-+ s390x | s390x-*)
-+ basic_machine=s390x-ibm
-+ ;;
-+ sa29200)
-+ basic_machine=a29k-amd
-+ os=-udi
-+ ;;
-+ sb1)
-+ basic_machine=mipsisa64sb1-unknown
-+ ;;
-+ sb1el)
-+ basic_machine=mipsisa64sb1el-unknown
-+ ;;
- sequent)
- basic_machine=i386-sequent
- ;;
-@@ -518,6 +843,10 @@
- basic_machine=sh-hitachi
- os=-hms
- ;;
-+ sparclite-wrs | simso-wrs)
-+ basic_machine=sparclite-wrs
-+ os=-vxworks
-+ ;;
- sps7)
- basic_machine=m68k-bull
- os=-sysv2
-@@ -525,6 +854,13 @@
- spur)
- basic_machine=spur-unknown
- ;;
-+ st2000)
-+ basic_machine=m68k-tandem
-+ ;;
-+ stratus)
-+ basic_machine=i860-stratus
-+ os=-sysv4
-+ ;;
- sun2)
- basic_machine=m68000-sun
- ;;
-@@ -565,16 +901,40 @@
- sun386 | sun386i | roadrunner)
- basic_machine=i386-sun
- ;;
-+ sv1)
-+ basic_machine=sv1-cray
-+ os=-unicos
-+ ;;
- symmetry)
- basic_machine=i386-sequent
- os=-dynix
- ;;
-+ t3e)
-+ basic_machine=alphaev5-cray
-+ os=-unicos
-+ ;;
-+ t90)
-+ basic_machine=t90-cray
-+ os=-unicos
-+ ;;
-+ tic4x | c4x*)
-+ basic_machine=tic4x-unknown
-+ os=-coff
-+ ;;
-+ tic54x | c54x*)
-+ basic_machine=tic54x-unknown
-+ os=-coff
-+ ;;
- tx39)
- basic_machine=mipstx39-unknown
- ;;
- tx39el)
- basic_machine=mipstx39el-unknown
- ;;
-+ toad1)
-+ basic_machine=pdp10-xkl
-+ os=-tops20
-+ ;;
- tower | tower-32)
- basic_machine=m68k-ncr
- ;;
-@@ -586,6 +946,10 @@
- basic_machine=a29k-nyu
- os=-sym1
- ;;
-+ v810 | necv810)
-+ basic_machine=v810-nec
-+ os=-none
-+ ;;
- vaxv)
- basic_machine=vax-dec
- os=-sysv
-@@ -595,8 +959,8 @@
- os=-vms
- ;;
- vpp*|vx|vx-*)
-- basic_machine=f301-fujitsu
-- ;;
-+ basic_machine=f301-fujitsu
-+ ;;
- vxworks960)
- basic_machine=i960-wrs
- os=-vxworks
-@@ -609,13 +973,25 @@
- basic_machine=a29k-wrs
- os=-vxworks
- ;;
-- xmp)
-- basic_machine=xmp-cray
-- os=-unicos
-+ w65*)
-+ basic_machine=w65-wdc
-+ os=-none
-+ ;;
-+ w89k-*)
-+ basic_machine=hppa1.1-winbond
-+ os=-proelf
- ;;
-- xps | xps100)
-+ xps | xps100)
- basic_machine=xps100-honeywell
- ;;
-+ ymp)
-+ basic_machine=ymp-cray
-+ os=-unicos
-+ ;;
-+ z8k-*-coff)
-+ basic_machine=z8k-unknown
-+ os=-sim
-+ ;;
- none)
- basic_machine=none-none
- os=-none
-@@ -623,12 +999,14 @@
-
- # Here we handle the default manufacturer of certain CPU types. It is in
- # some cases the only manufacturer, in others, it is the most popular.
-- mips)
-- if [ x$os = x-linux-gnu ]; then
-- basic_machine=mips-unknown
-- else
-- basic_machine=mips-mips
-- fi
-+ w89k)
-+ basic_machine=hppa1.1-winbond
-+ ;;
-+ op50n)
-+ basic_machine=hppa1.1-oki
-+ ;;
-+ op60c)
-+ basic_machine=hppa1.1-oki
- ;;
- romp)
- basic_machine=romp-ibm
-@@ -639,16 +1017,26 @@
- vax)
- basic_machine=vax-dec
- ;;
-+ pdp10)
-+ # there are many clones, so DEC is not a safe bet
-+ basic_machine=pdp10-unknown
-+ ;;
- pdp11)
- basic_machine=pdp11-dec
- ;;
- we32k)
- basic_machine=we32k-att
- ;;
-- sparc)
-+ sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
-+ basic_machine=sh-unknown
-+ ;;
-+ sh64)
-+ basic_machine=sh64-unknown
-+ ;;
-+ sparc | sparcv9 | sparcv9b)
- basic_machine=sparc-sun
- ;;
-- cydra)
-+ cydra)
- basic_machine=cydra-cydrome
- ;;
- orion)
-@@ -657,6 +1045,15 @@
- orion105)
- basic_machine=clipper-highlevel
- ;;
-+ mac | mpw | mac-mpw)
-+ basic_machine=m68k-apple
-+ ;;
-+ pmac | pmac-mpw)
-+ basic_machine=powerpc-apple
-+ ;;
-+ *-unknown)
-+ # Make sure to match an already-canonicalized machine name.
-+ ;;
- *)
- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
- exit 1
-@@ -710,13 +1107,41 @@
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
-+ | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-- | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-- | -mingw32* | -linux-gnu* | -uxpv*)
-+ | -chorusos* | -chorusrdb* \
-+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-+ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-+ | -powermax* | -dnix* | -microbsd*)
- # Remember, each alternative MUST END IN *, to match a version number.
- ;;
-+ -qnx*)
-+ case $basic_machine in
-+ x86-* | i*86-*)
-+ ;;
-+ *)
-+ os=-nto$os
-+ ;;
-+ esac
-+ ;;
-+ -nto-qnx*)
-+ ;;
-+ -nto*)
-+ os=`echo $os | sed -e 's|nto|nto-qnx|'`
-+ ;;
-+ -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-+ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-+ ;;
-+ -mac*)
-+ os=`echo $os | sed -e 's|mac|macos|'`
-+ ;;
- -linux*)
- os=`echo $os | sed -e 's|linux|linux-gnu|'`
- ;;
-@@ -726,6 +1151,12 @@
- -sunos6*)
- os=`echo $os | sed -e 's|sunos6|solaris3|'`
- ;;
-+ -opened*)
-+ os=-openedition
-+ ;;
-+ -wince*)
-+ os=-wince
-+ ;;
- -osfrose*)
- os=-osfrose
- ;;
-@@ -741,11 +1172,23 @@
- -acis*)
- os=-aos
- ;;
-+ -atheos*)
-+ os=-atheos
-+ ;;
-+ -386bsd)
-+ os=-bsd
-+ ;;
- -ctix* | -uts*)
- os=-sysv
- ;;
-+ -nova*)
-+ os=-rtmk-nova
-+ ;;
- -ns2 )
-- os=-nextstep2
-+ os=-nextstep2
-+ ;;
-+ -nsk*)
-+ os=-nsk
- ;;
- # Preserve the version number of sinix5.
- -sinix5.*)
-@@ -772,9 +1215,18 @@
- # This must come after -sysvr4.
- -sysv*)
- ;;
-+ -ose*)
-+ os=-ose
-+ ;;
-+ -es1800*)
-+ os=-ose
-+ ;;
- -xenix)
- os=-xenix
- ;;
-+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-+ os=-mint
-+ ;;
- -none)
- ;;
- *)
-@@ -800,10 +1252,17 @@
- *-acorn)
- os=-riscix1.2
- ;;
-+ arm*-rebel)
-+ os=-linux
-+ ;;
- arm*-semi)
- os=-aout
- ;;
-- pdp11-*)
-+ # This must come before the *-dec entry.
-+ pdp10-*)
-+ os=-tops20
-+ ;;
-+ pdp11-*)
- os=-none
- ;;
- *-dec | vax-*)
-@@ -821,15 +1280,39 @@
- # default.
- # os=-sunos4
- ;;
-+ m68*-cisco)
-+ os=-aout
-+ ;;
-+ mips*-cisco)
-+ os=-elf
-+ ;;
-+ mips*-*)
-+ os=-elf
-+ ;;
-+ or32-*)
-+ os=-coff
-+ ;;
- *-tti) # must be before sparc entry or we get the wrong os.
- os=-sysv3
- ;;
- sparc-* | *-sun)
- os=-sunos4.1.1
- ;;
-+ *-be)
-+ os=-beos
-+ ;;
- *-ibm)
- os=-aix
- ;;
-+ *-wec)
-+ os=-proelf
-+ ;;
-+ *-winbond)
-+ os=-proelf
-+ ;;
-+ *-oki)
-+ os=-proelf
-+ ;;
- *-hp)
- os=-hpux
- ;;
-@@ -872,27 +1355,39 @@
- *-next)
- os=-nextstep3
- ;;
-- *-gould)
-+ *-gould)
- os=-sysv
- ;;
-- *-highlevel)
-+ *-highlevel)
- os=-bsd
- ;;
- *-encore)
- os=-bsd
- ;;
-- *-sgi)
-+ *-sgi)
- os=-irix
- ;;
-- *-siemens)
-+ *-siemens)
- os=-sysv4
- ;;
- *-masscomp)
- os=-rtu
- ;;
-- f301-fujitsu)
-+ f30[01]-fujitsu | f700-fujitsu)
- os=-uxpv
- ;;
-+ *-rom68k)
-+ os=-coff
-+ ;;
-+ *-*bug)
-+ os=-coff
-+ ;;
-+ *-apple)
-+ os=-macos
-+ ;;
-+ *-atari*)
-+ os=-mint
-+ ;;
- *)
- os=-none
- ;;
-@@ -914,9 +1409,15 @@
- -aix*)
- vendor=ibm
- ;;
-+ -beos*)
-+ vendor=be
-+ ;;
- -hpux*)
- vendor=hp
- ;;
-+ -mpeix*)
-+ vendor=hp
-+ ;;
- -hiux*)
- vendor=hitachi
- ;;
-@@ -932,21 +1433,41 @@
- -genix*)
- vendor=ns
- ;;
-- -mvs*)
-+ -mvs* | -opened*)
- vendor=ibm
- ;;
- -ptx*)
- vendor=sequent
- ;;
-- -vxsim* | -vxworks*)
-+ -vxsim* | -vxworks* | -windiss*)
- vendor=wrs
- ;;
- -aux*)
- vendor=apple
- ;;
-+ -hms*)
-+ vendor=hitachi
-+ ;;
-+ -mpw* | -macos*)
-+ vendor=apple
-+ ;;
-+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-+ vendor=atari
-+ ;;
-+ -vos*)
-+ vendor=stratus
-+ ;;
- esac
- basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
- ;;
- esac
-
- echo $basic_machine$os
-+exit 0
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "timestamp='"
-+# time-stamp-format: "%:y-%02m-%02d"
-+# time-stamp-end: "'"
-+# End:
---- ez-ipupdate-3.0.11b8.orig/configure
-+++ ez-ipupdate-3.0.11b8/configure
-@@ -1,7 +1,7 @@
- #! /bin/sh
-
- # Guess values for system-dependent variables and create Makefiles.
--# Generated automatically using autoconf version 2.12
-+# Generated automatically using autoconf version 2.13
- # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
- #
- # This configure script is free software; the Free Software Foundation
-@@ -58,6 +58,7 @@
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-+SHELL=${CONFIG_SHELL-/bin/sh}
- # Maximum number of lines to put in a shell here document.
- ac_max_here_lines=12
-
-@@ -341,7 +342,7 @@
- verbose=yes ;;
-
- -version | --version | --versio | --versi | --vers)
-- echo "configure generated by autoconf version 2.12"
-+ echo "configure generated by autoconf version 2.13"
- exit 0 ;;
-
- -with-* | --with-*)
-@@ -511,9 +512,11 @@
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cc_cross
-
-+ac_exeext=
-+ac_objext=o
- if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
- # Stardent Vistra SVR4 grep lacks -e, says ghazi(a)caip.rutgers.edu.
- if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-@@ -549,6 +552,7 @@
- ac_config_sub=$ac_aux_dir/config.sub
- ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-+am__api_version="1.4"
- # Find a good install program. We prefer a C program (faster),
- # so one script is as good as another. But avoid the broken or
- # incompatible versions:
-@@ -556,28 +560,30 @@
- # SunOS /usr/etc/install
- # IRIX /sbin/install
- # AIX /bin/install
-+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
- # AFS /usr/afsws/bin/install, which mishandles nonexistent args
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
--echo "configure:564: checking for a BSD compatible install" >&5
-+echo "configure:569: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-- IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:"
-+ IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
- for ac_dir in $PATH; do
- # Account for people who put trailing slashes in PATH elements.
- case "$ac_dir/" in
- /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
-- for ac_prog in ginstall installbsd scoinst install; do
-+ # Don't use installbsd from OSF since it installs stuff as root
-+ # by default.
-+ for ac_prog in ginstall scoinst install; do
- if test -f $ac_dir/$ac_prog; then
- if test $ac_prog = install &&
- grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
-- # OSF/1 installbsd also uses dspmsg, but is usable.
- :
- else
- ac_cv_path_install="$ac_dir/$ac_prog -c"
-@@ -607,13 +613,12 @@
- # It thinks the first close brace ends the variable substitution.
- test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
--test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
--
--
- test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-+
- echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
--echo "configure:617: checking whether build environment is sane" >&5
-+echo "configure:622: checking whether build environment is sane" >&5
- # Just in case
- sleep 1
- echo timestamp > conftestfile
-@@ -670,7 +675,7 @@
- test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
- echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
--echo "configure:674: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo "configure:679: checking whether ${MAKE-make} sets \${MAKE}" >&5
- set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -715,21 +720,21 @@
-
-
- missing_dir=`cd $ac_aux_dir && pwd`
--echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
--echo "configure:720: checking for working aclocal" >&5
-+echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-+echo "configure:725: checking for working aclocal-${am__api_version}" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf. Sigh.
--if (aclocal --version) < /dev/null > /dev/null 2>&1; then
-- ACLOCAL=aclocal
-+if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-+ ACLOCAL=aclocal-${am__api_version}
- echo "$ac_t""found" 1>&6
- else
-- ACLOCAL="$missing_dir/missing aclocal"
-+ ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
- echo "$ac_t""missing" 1>&6
- fi
-
- echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
--echo "configure:733: checking for working autoconf" >&5
-+echo "configure:738: checking for working autoconf" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf. Sigh.
-@@ -741,21 +746,21 @@
- echo "$ac_t""missing" 1>&6
- fi
-
--echo $ac_n "checking for working automake""... $ac_c" 1>&6
--echo "configure:746: checking for working automake" >&5
-+echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-+echo "configure:751: checking for working automake-${am__api_version}" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf. Sigh.
--if (automake --version) < /dev/null > /dev/null 2>&1; then
-- AUTOMAKE=automake
-+if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-+ AUTOMAKE=automake-${am__api_version}
- echo "$ac_t""found" 1>&6
- else
-- AUTOMAKE="$missing_dir/missing automake"
-+ AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
- echo "$ac_t""missing" 1>&6
- fi
-
- echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
--echo "configure:759: checking for working autoheader" >&5
-+echo "configure:764: checking for working autoheader" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf. Sigh.
-@@ -768,7 +773,7 @@
- fi
-
- echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
--echo "configure:772: checking for working makeinfo" >&5
-+echo "configure:777: checking for working makeinfo" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf. Sigh.
-@@ -806,15 +811,16 @@
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:810: checking for $ac_word" >&5
-+echo "configure:815: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in $PATH; do
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-+ ac_dummy="$PATH"
-+ for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_CC="gcc"
-@@ -835,16 +841,17 @@
- # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:839: checking for $ac_word" >&5
-+echo "configure:845: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_prog_rejected=no
-- for ac_dir in $PATH; do
-+ ac_dummy="$PATH"
-+ for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-@@ -879,25 +886,61 @@
- echo "$ac_t""no" 1>&6
- fi
-
-+ if test -z "$CC"; then
-+ case "`uname -s`" in
-+ *win32* | *WIN32*)
-+ # Extract the first word of "cl", so it can be a program name with args.
-+set dummy cl; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:896: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ if test -n "$CC"; then
-+ ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-+ ac_dummy="$PATH"
-+ for ac_dir in $ac_dummy; do
-+ test -z "$ac_dir" && ac_dir=.
-+ if test -f $ac_dir/$ac_word; then
-+ ac_cv_prog_CC="cl"
-+ break
-+ fi
-+ done
-+ IFS="$ac_save_ifs"
-+fi
-+fi
-+CC="$ac_cv_prog_CC"
-+if test -n "$CC"; then
-+ echo "$ac_t""$CC" 1>&6
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+ ;;
-+ esac
-+ fi
- test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
- fi
-
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:887: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+echo "configure:928: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-
- ac_ext=c
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cc_cross
-
--cat > conftest.$ac_ext <<EOF
--#line 897 "configure"
-+cat > conftest.$ac_ext << EOF
-+
-+#line 939 "configure"
- #include "confdefs.h"
-+
- main(){return(0);}
- EOF
--if { (eval echo configure:901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- ac_cv_prog_cc_works=yes
- # If we can't run a trivial program, we are probably using a cross compiler.
- if (./conftest; exit) 2>/dev/null; then
-@@ -911,18 +954,24 @@
- ac_cv_prog_cc_works=no
- fi
- rm -fr conftest*
-+ac_ext=c
-+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
-
- echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
- if test $ac_cv_prog_cc_works = no; then
- { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
- fi
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:921: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "configure:970: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
- echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
- cross_compiling=$ac_cv_prog_cc_cross
-
- echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
--echo "configure:926: checking whether we are using GNU C" >&5
-+echo "configure:975: checking whether we are using GNU C" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -931,7 +980,7 @@
- yes;
- #endif
- EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:935: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:984: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
- ac_cv_prog_gcc=yes
- else
- ac_cv_prog_gcc=no
-@@ -942,11 +991,15 @@
-
- if test $ac_cv_prog_gcc = yes; then
- GCC=yes
-- ac_test_CFLAGS="${CFLAGS+set}"
-- ac_save_CFLAGS="$CFLAGS"
-- CFLAGS=
-- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--echo "configure:950: checking whether ${CC-cc} accepts -g" >&5
-+else
-+ GCC=
-+fi
-+
-+ac_test_CFLAGS="${CFLAGS+set}"
-+ac_save_CFLAGS="$CFLAGS"
-+CFLAGS=
-+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-+echo "configure:1003: checking whether ${CC-cc} accepts -g" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -961,20 +1014,24 @@
- fi
-
- echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-- if test "$ac_test_CFLAGS" = set; then
-- CFLAGS="$ac_save_CFLAGS"
-- elif test $ac_cv_prog_cc_g = yes; then
-+if test "$ac_test_CFLAGS" = set; then
-+ CFLAGS="$ac_save_CFLAGS"
-+elif test $ac_cv_prog_cc_g = yes; then
-+ if test "$GCC" = yes; then
- CFLAGS="-g -O2"
- else
-- CFLAGS="-O2"
-+ CFLAGS="-g"
- fi
- else
-- GCC=
-- test "${CFLAGS+set}" = set || CFLAGS="-g"
-+ if test "$GCC" = yes; then
-+ CFLAGS="-O2"
-+ else
-+ CFLAGS=
-+ fi
- fi
-
- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
--echo "configure:978: checking how to run the C preprocessor" >&5
-+echo "configure:1035: checking how to run the C preprocessor" >&5
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-@@ -989,14 +1046,14 @@
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp.
- cat > conftest.$ac_ext <<EOF
--#line 993 "configure"
-+#line 1050 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:999: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1056: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- :
- else
-@@ -1006,14 +1063,31 @@
- rm -rf conftest*
- CPP="${CC-cc} -E -traditional-cpp"
- cat > conftest.$ac_ext <<EOF
--#line 1010 "configure"
-+#line 1067 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1016: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1073: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+ :
-+else
-+ echo "$ac_err" >&5
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ CPP="${CC-cc} -nologo -E"
-+ cat > conftest.$ac_ext <<EOF
-+#line 1084 "configure"
-+#include "confdefs.h"
-+#include <assert.h>
-+Syntax Error
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:1090: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- :
- else
-@@ -1026,6 +1100,8 @@
- rm -f conftest*
- fi
- rm -f conftest*
-+fi
-+rm -f conftest*
- ac_cv_prog_CPP="$CPP"
- fi
- CPP="$ac_cv_prog_CPP"
-@@ -1041,28 +1117,30 @@
- # SunOS /usr/etc/install
- # IRIX /sbin/install
- # AIX /bin/install
-+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
- # AFS /usr/afsws/bin/install, which mishandles nonexistent args
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
--echo "configure:1049: checking for a BSD compatible install" >&5
-+echo "configure:1126: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-- IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:"
-+ IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
- for ac_dir in $PATH; do
- # Account for people who put trailing slashes in PATH elements.
- case "$ac_dir/" in
- /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
-- for ac_prog in ginstall installbsd scoinst install; do
-+ # Don't use installbsd from OSF since it installs stuff as root
-+ # by default.
-+ for ac_prog in ginstall scoinst install; do
- if test -f $ac_dir/$ac_prog; then
- if test $ac_prog = install &&
- grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
-- # OSF/1 installbsd also uses dspmsg, but is usable.
- :
- else
- ac_cv_path_install="$ac_dir/$ac_prog -c"
-@@ -1092,16 +1170,18 @@
- # It thinks the first close brace ends the variable substitution.
- test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
- echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
--echo "configure:1100: checking return type of signal handlers" >&5
-+echo "configure:1180: checking return type of signal handlers" >&5
- if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1105 "configure"
-+#line 1185 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <signal.h>
-@@ -1118,7 +1198,7 @@
- int i;
- ; return 0; }
- EOF
--if { (eval echo configure:1122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_type_signal=void
- else
-@@ -1139,12 +1219,12 @@
-
-
- echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
--echo "configure:1143: checking for gethostbyname" >&5
-+echo "configure:1223: checking for gethostbyname" >&5
- if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1148 "configure"
-+#line 1228 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char gethostbyname(); below. */
-@@ -1167,7 +1247,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:1171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_gethostbyname=yes"
- else
-@@ -1188,7 +1268,7 @@
-
- if test $ac_cv_func_gethostbyname = no; then
- echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
--echo "configure:1192: checking for gethostbyname in -lnsl" >&5
-+echo "configure:1272: checking for gethostbyname in -lnsl" >&5
- ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1196,7 +1276,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lnsl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1200 "configure"
-+#line 1280 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -1207,7 +1287,7 @@
- gethostbyname()
- ; return 0; }
- EOF
--if { (eval echo configure:1211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1236,12 +1316,12 @@
-
- fi
- echo $ac_n "checking for connect""... $ac_c" 1>&6
--echo "configure:1240: checking for connect" >&5
-+echo "configure:1320: checking for connect" >&5
- if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1245 "configure"
-+#line 1325 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char connect(); below. */
-@@ -1264,7 +1344,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:1268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_connect=yes"
- else
-@@ -1285,7 +1365,7 @@
-
- if test $ac_cv_func_connect = no; then
- echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
--echo "configure:1289: checking for connect in -lsocket" >&5
-+echo "configure:1369: checking for connect in -lsocket" >&5
- ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1293,7 +1373,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lsocket $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1297 "configure"
-+#line 1377 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -1304,7 +1384,7 @@
- connect()
- ; return 0; }
- EOF
--if { (eval echo configure:1308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1364,12 +1444,12 @@
- herror
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:1368: checking for $ac_func" >&5
-+echo "configure:1448: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1373 "configure"
-+#line 1453 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -1392,7 +1472,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:1396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
- else
-@@ -1419,10 +1499,12 @@
-
- for ac_hdr in arpa/inet.h \
- sys/types.h \
-+ time.h \
- sys/time.h \
- sys/stat.h \
- fcntl.h \
- signal.h \
-+ string.h \
- syslog.h \
- pwd.h \
- stdarg.h \
-@@ -1434,18 +1516,18 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1438: checking for $ac_hdr" >&5
-+echo "configure:1520: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1443 "configure"
-+#line 1525 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1448: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1530: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-@@ -1478,18 +1560,18 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1482: checking for $ac_hdr" >&5
-+echo "configure:1564: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1487 "configure"
-+#line 1569 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1492: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1574: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-@@ -1517,7 +1599,7 @@
-
-
- echo $ac_n "checking for sys_errlist in -lc""... $ac_c" 1>&6
--echo "configure:1521: checking for sys_errlist in -lc" >&5
-+echo "configure:1603: checking for sys_errlist in -lc" >&5
- ac_lib_var=`echo c'_'sys_errlist | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1525,7 +1607,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lc $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1529 "configure"
-+#line 1611 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -1536,7 +1618,7 @@
- sys_errlist()
- ; return 0; }
- EOF
--if { (eval echo configure:1540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1563,12 +1645,12 @@
- for ac_func in getopt
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:1567: checking for $ac_func" >&5
-+echo "configure:1649: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1572 "configure"
-+#line 1654 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -1591,7 +1673,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:1595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
- else
-@@ -1620,12 +1702,12 @@
- fi
-
- echo $ac_n "checking for getpass""... $ac_c" 1>&6
--echo "configure:1624: checking for getpass" >&5
-+echo "configure:1706: checking for getpass" >&5
- if eval "test \"`echo '$''{'ac_cv_func_getpass'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1629 "configure"
-+#line 1711 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char getpass(); below. */
-@@ -1648,7 +1730,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:1652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_getpass=yes"
- else
-@@ -1675,26 +1757,26 @@
-
-
- # Make sure we can run config.sub.
--if $ac_config_sub sun4 >/dev/null 2>&1; then :
-+if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
- else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
- fi
-
- echo $ac_n "checking host system type""... $ac_c" 1>&6
--echo "configure:1684: checking host system type" >&5
-+echo "configure:1766: checking host system type" >&5
-
- host_alias=$host
- case "$host_alias" in
- NONE)
- case $nonopt in
- NONE)
-- if host_alias=`$ac_config_guess`; then :
-+ if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
- else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
- fi ;;
- *) host_alias=$nonopt ;;
- esac ;;
- esac
-
--host=`$ac_config_sub $host_alias`
-+host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
- host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
- host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
- host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-@@ -1706,7 +1788,7 @@
-
-
- echo $ac_n "checking for user supplied default service""... $ac_c" 1>&6
--echo "configure:1710: checking for user supplied default service" >&5
-+echo "configure:1792: checking for user supplied default service" >&5
- # Check whether --enable-default-service or --disable-default-service was given.
- if test "${enable_default_service+set}" = set; then
- enableval="$enable_default_service"
-@@ -1800,7 +1882,7 @@
- esac
-
- echo $ac_n "checking whether user wants debugging support""... $ac_c" 1>&6
--echo "configure:1804: checking whether user wants debugging support" >&5
-+echo "configure:1886: checking whether user wants debugging support" >&5
- # Check whether --enable-debug or --disable-debug was given.
- if test "${enable_debug+set}" = set; then
- enableval="$enable_debug"
-@@ -1815,7 +1897,7 @@
-
-
- echo $ac_n "checking whether user wants to dissable MD5 support""... $ac_c" 1>&6
--echo "configure:1819: checking whether user wants to dissable MD5 support" >&5
-+echo "configure:1901: checking whether user wants to dissable MD5 support" >&5
- # Check whether --enable-md5 or --disable-md5 was given.
- if test "${enable_md5+set}" = set; then
- enableval="$enable_md5"
-@@ -1855,7 +1937,7 @@
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
- (set) 2>&1 |
-- case `(ac_space=' '; set) 2>&1` in
-+ case `(ac_space=' '; set | grep ac_space) 2>&1` in
- *ac_space=\ *)
- # `set' does not quote correctly, so add quotes (double-quote substitution
- # turns \\\\ into \\, and sed turns \\ into \).
-@@ -1922,7 +2004,7 @@
- echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
- exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
- -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-- echo "$CONFIG_STATUS generated by autoconf version 2.12"
-+ echo "$CONFIG_STATUS generated by autoconf version 2.13"
- exit 0 ;;
- -help | --help | --hel | --he | --h)
- echo "\$ac_cs_usage"; exit 0 ;;
-@@ -1942,9 +2024,11 @@
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
- $ac_vpsub
- $extrasub
-+s%@SHELL@%$SHELL%g
- s%@CFLAGS@%$CFLAGS%g
- s%@CPPFLAGS@%$CPPFLAGS%g
- s%@CXXFLAGS@%$CXXFLAGS%g
-+s%@FFLAGS@%$FFLAGS%g
- s%@DEFS@%$DEFS%g
- s%@LDFLAGS@%$LDFLAGS%g
- s%@LIBS@%$LIBS%g
-@@ -1964,8 +2048,8 @@
- s%@infodir@%$infodir%g
- s%@mandir@%$mandir%g
- s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
--s%@INSTALL_DATA@%$INSTALL_DATA%g
- s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-+s%@INSTALL_DATA@%$INSTALL_DATA%g
- s%@PACKAGE@%$PACKAGE%g
- s%@VERSION@%$VERSION%g
- s%@ACLOCAL@%$ACLOCAL%g
---- ez-ipupdate-3.0.11b8.orig/configure.in
-+++ ez-ipupdate-3.0.11b8/configure.in
-@@ -58,10 +58,12 @@
- dnl Checks for header files.
- AC_CHECK_HEADERS( arpa/inet.h \
- sys/types.h \
-+ time.h \
- sys/time.h \
- sys/stat.h \
- fcntl.h \
- signal.h \
-+ string.h \
- syslog.h \
- pwd.h \
- stdarg.h \
---- ez-ipupdate-3.0.11b8.orig/install-sh
-+++ ez-ipupdate-3.0.11b8/install-sh
-@@ -118,6 +118,7 @@
-
- if [ -d $dst ]; then
- instcmd=:
-+ chmodcmd=""
- else
- instcmd=mkdir
- fi
-@@ -162,7 +163,7 @@
-
- # Skip lots of stat calls in the usual case.
- if [ ! -d "$dstdir" ]; then
--defaultIFS='
-+defaultIFS='
- '
- IFS="${IFS-${defaultIFS}}"
-
---- ez-ipupdate-3.0.11b8.orig/missing
-+++ ez-ipupdate-3.0.11b8/missing
-@@ -1 +1,198 @@
--#autoconf complains if this is not here
-+#! /bin/sh
-+# Common stub for a few missing GNU programs while installing.
-+# Copyright (C) 1996, 1997, 2001, 2002 Free Software Foundation, Inc.
-+# Franc,ois Pinard <pinard(a)iro.umontreal.ca>, 1996.
-+
-+# 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 2, 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, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+if test $# -eq 0; then
-+ echo 1>&2 "Try \`$0 --help' for more information"
-+ exit 1
-+fi
-+
-+# In the cases where this matters, `missing' is being run in the
-+# srcdir already.
-+if test -f configure.in; then
-+ configure_ac=configure.ac
-+else
-+ configure_ac=configure.in
-+fi
-+
-+case "$1" in
-+
-+ -h|--h|--he|--hel|--help)
-+ echo "\
-+$0 [OPTION]... PROGRAM [ARGUMENT]...
-+
-+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-+error status if there is no known handling for PROGRAM.
-+
-+Options:
-+ -h, --help display this help and exit
-+ -v, --version output version information and exit
-+
-+Supported PROGRAM values:
-+ aclocal touch file \`aclocal.m4'
-+ autoconf touch file \`configure'
-+ autoheader touch file \`config.h.in'
-+ automake touch all \`Makefile.in' files
-+ bison create \`y.tab.[ch]', if possible, from existing .[ch]
-+ flex create \`lex.yy.c', if possible, from existing .c
-+ lex create \`lex.yy.c', if possible, from existing .c
-+ makeinfo touch the output file
-+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
-+ ;;
-+
-+ -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-+ echo "missing - GNU libit 0.0"
-+ ;;
-+
-+ -*)
-+ echo 1>&2 "$0: Unknown \`$1' option"
-+ echo 1>&2 "Try \`$0 --help' for more information"
-+ exit 1
-+ ;;
-+
-+ aclocal*)
-+ echo 1>&2 "\
-+WARNING: \`$1' is missing on your system. You should only need it if
-+ you modified \`acinclude.m4' or \`$configure_ac'. You might want
-+ to install the \`Automake' and \`Perl' packages. Grab them from
-+ any GNU archive site."
-+ touch aclocal.m4
-+ ;;
-+
-+ autoconf)
-+ echo 1>&2 "\
-+WARNING: \`$1' is missing on your system. You should only need it if
-+ you modified \`$configure_ac'. You might want to install the
-+ \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
-+ archive site."
-+ touch configure
-+ ;;
-+
-+ autoheader)
-+ echo 1>&2 "\
-+WARNING: \`$1' is missing on your system. You should only need it if
-+ you modified \`acconfig.h' or \`$configure_ac'. You might want
-+ to install the \`Autoconf' and \`GNU m4' packages. Grab them
-+ from any GNU archive site."
-+ files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' $configure_ac`
-+ test -z "$files" && files="config.h"
-+ touch_files=
-+ for f in $files; do
-+ case "$f" in
-+ *:*) touch_files="$touch_files "`echo "$f" |
-+ sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-+ *) touch_files="$touch_files $f.in";;
-+ esac
-+ done
-+ touch $touch_files
-+ ;;
-+
-+ automake*)
-+ echo 1>&2 "\
-+WARNING: \`$1' is missing on your system. You should only need it if
-+ you modified \`Makefile.am', \`acinclude.m4' or \`$configure_ac'.
-+ You might want to install the \`Automake' and \`Perl' packages.
-+ Grab them from any GNU archive site."
-+ find . -type f -name Makefile.am -print |
-+ sed 's/\.am$/.in/' |
-+ while read f; do touch "$f"; done
-+ ;;
-+
-+ bison|yacc)
-+ echo 1>&2 "\
-+WARNING: \`$1' is missing on your system. You should only need it if
-+ you modified a \`.y' file. You may need the \`Bison' package
-+ in order for those modifications to take effect. You can get
-+ \`Bison' from any GNU archive site."
-+ rm -f y.tab.c y.tab.h
-+ if [ $# -ne 1 ]; then
-+ eval LASTARG="\${$#}"
-+ case "$LASTARG" in
-+ *.y)
-+ SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-+ if [ -f "$SRCFILE" ]; then
-+ cp "$SRCFILE" y.tab.c
-+ fi
-+ SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-+ if [ -f "$SRCFILE" ]; then
-+ cp "$SRCFILE" y.tab.h
-+ fi
-+ ;;
-+ esac
-+ fi
-+ if [ ! -f y.tab.h ]; then
-+ echo >y.tab.h
-+ fi
-+ if [ ! -f y.tab.c ]; then
-+ echo 'main() { return 0; }' >y.tab.c
-+ fi
-+ ;;
-+
-+ lex|flex)
-+ echo 1>&2 "\
-+WARNING: \`$1' is missing on your system. You should only need it if
-+ you modified a \`.l' file. You may need the \`Flex' package
-+ in order for those modifications to take effect. You can get
-+ \`Flex' from any GNU archive site."
-+ rm -f lex.yy.c
-+ if [ $# -ne 1 ]; then
-+ eval LASTARG="\${$#}"
-+ case "$LASTARG" in
-+ *.l)
-+ SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-+ if [ -f "$SRCFILE" ]; then
-+ cp "$SRCFILE" lex.yy.c
-+ fi
-+ ;;
-+ esac
-+ fi
-+ if [ ! -f lex.yy.c ]; then
-+ echo 'main() { return 0; }' >lex.yy.c
-+ fi
-+ ;;
-+
-+ makeinfo)
-+ echo 1>&2 "\
-+WARNING: \`$1' is missing on your system. You should only need it if
-+ you modified a \`.texi' or \`.texinfo' file, or any other file
-+ indirectly affecting the aspect of the manual. The spurious
-+ call might also be the consequence of using a buggy \`make' (AIX,
-+ DU, IRIX). You might want to install the \`Texinfo' package or
-+ the \`GNU make' package. Grab either from any GNU archive site."
-+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-+ if test -z "$file"; then
-+ file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-+ fi
-+ touch $file
-+ ;;
-+
-+ *)
-+ echo 1>&2 "\
-+WARNING: \`$1' is needed, and you do not seem to have it handy on your
-+ system. You might have modified some files without having the
-+ proper tools for further handling them. Check the \`README' file,
-+ it often tells you about the needed prerequirements for installing
-+ this package. You may also peek at any GNU archive site, in case
-+ some other package would contain this missing \`$1' program."
-+ exit 1
-+ ;;
-+esac
-+
-+exit 0
---- ez-ipupdate-3.0.11b8.orig/mkinstalldirs
-+++ ez-ipupdate-3.0.11b8/mkinstalldirs
-@@ -4,7 +4,7 @@
- # Created: 1993-05-16
- # Public domain
-
--# $Id: mkinstalldirs,v 1.1.1.1 1999/04/19 00:34:59 amackay Exp $
-+# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $
-
- errstatus=0
-
-@@ -22,7 +22,7 @@
- esac
-
- if test ! -d "$pathcomp"; then
-- echo "mkdir $pathcomp" 1>&2
-+ echo "mkdir $pathcomp"
-
- mkdir "$pathcomp" || lasterr=$?
-
---- ez-ipupdate-3.0.11b8.orig/ez-ipupdate.c
-+++ ez-ipupdate-3.0.11b8/ez-ipupdate.c
-@@ -139,6 +139,9 @@
- #if HAVE_SIGNAL_H
- # include <signal.h>
- #endif
-+#if HAVE_TIME_H
-+# include <time.h>
-+#endif
- #if HAVE_SYS_TIME_H
- # include <sys/time.h>
- #endif
-@@ -165,7 +168,7 @@
- #endif
-
-
--#if __linux__ || __SVR4 || __OpenBSD__ || __FreeBSD__ || __NetBSD__
-+#if __GLIBC__ || __SVR4 || __OpenBSD__ || __FreeBSD__ || __NetBSD__
- # define IF_LOOKUP 1
- # include <sys/ioctl.h>
- # include <net/if.h>
-@@ -640,7 +643,7 @@
- fprintf(stdout, " -q, --quiet \t\t\tbe quiet\n");
- fprintf(stdout, " -r, --retrys <num>\t\tnumber of trys (default: 1)\n");
- fprintf(stdout, " -R, --run-as-user <user>\tchange to <user> for running, be ware\n\t\t\t\tthat this can cause problems with handeling\n\t\t\t\tSIGHUP properly if that user can't read the\n\t\t\t\tconfig file. also it can't write it's pid file \n\t\t\t\tto a root directory\n");
-- fprintf(stdout, " -Q, --run-as-euser <user>\tchange to effective <user> for running, \n\t\t\t\tthis is NOT secure but it does solve the \n\t\t\t\tproblems with run-as-user and config files and \n\t\t\t\tpid files.\n");
-+ fprintf(stdout, " -Q, --run-as-euser <user>\tchange to effective <user> for running, \n\t\t\t\tthis is NOT secure but it does solve the \n\t\t\t\tproblems with run-as-user and config files and \n\t\t\t\tpid files\n");
- fprintf(stdout, " -s, --server <server[:port]>\tthe server to connect to\n");
- fprintf(stdout, " -S, --service-type <server>\tthe type of service that you are using\n");
- width = fprintf(stdout, "\t\t\t\ttry one of: ") + 4*7;
-@@ -682,7 +685,7 @@
-
- void print_signalhelp( void )
- {
-- fprintf(stdout, "\nsignals are only really used when in daemon mode.\n\n");
-+ fprintf(stdout, "\nsignals are only really used when in daemon mode\n\n");
- fprintf(stdout, "signals: \n");
- fprintf(stdout, " HUP\t\tcauses it to re-read its config file\n");
- fprintf(stdout, " TERM\t\twake up and possibly perform an update\n");
-@@ -693,7 +696,7 @@
- #if HAVE_SIGNAL_H
- RETSIGTYPE sigint_handler(int sig)
- {
-- char message[] = "interupted.\n";
-+ char message[] = "interrupted\n";
- close(client_sockfd);
- write(2, message, sizeof(message)-1);
-
-@@ -704,6 +707,10 @@
- }
- #endif
-
-+#if HAVE_SYSLOG_H
-+ closelog();
-+#endif
-+
- exit(1);
- }
- RETSIGTYPE generic_sig_handler(int sig)
-@@ -798,7 +805,7 @@
- sprintf(buf, "message incomplete because your OS sucks: %s\n", fmt);
- #endif
-
-- syslog(LOG_NOTICE, buf);
-+ syslog(LOG_NOTICE, "%s", buf);
- }
- else
- {
-@@ -1439,7 +1446,7 @@
- if(!(options & OPT_QUIET))
- {
- fprintf(stderr,
-- "connected to %s (%s) on port %d.\n",
-+ "connected to %s (%s) on port %d\n",
- host,
- inet_ntoa(address.sin_addr),
- ntohs(address.sin_port));
-@@ -1683,7 +1690,7 @@
- close(client_sockfd);
- return(-1);
- }
-- if(strstr(buf, "\r\n") > 0)
-+ if(strstr(buf, "\n") != NULL)
- {
- break;
- }
-@@ -1702,8 +1709,8 @@
-
- if(options & OPT_DAEMON)
- {
-- fprintf(stderr, "no compile time default service was set therefor you must "
-- "specify a service type.\n");
-+ fprintf(stderr, "no compile time default service was set, you must "
-+ "specify a service type\n");
-
- return(-1);
- }
-@@ -2039,7 +2046,7 @@
- }
- else if(strstr(buf, "\nnumhost") != NULL)
- {
-- show_message("Too many or too few hosts found\n");
-+ show_message("too many or too few hosts found\n");
- retval = UPDATERES_SHUTDOWN;
- }
- else if(strstr(buf, "\ndnserr") != NULL)
-@@ -2051,17 +2058,17 @@
- }
- else if(strstr(buf, "\n911") != NULL)
- {
-- show_message("Ahhhh! call 911!\n");
-+ show_message("ahhhh! call 911!\n");
- retval = UPDATERES_SHUTDOWN;
- }
- else if(strstr(buf, "\n999") != NULL)
- {
-- show_message("Ahhhh! call 999!\n");
-+ show_message("ahhhh! call 999!\n");
- retval = UPDATERES_SHUTDOWN;
- }
- else if(strstr(buf, "\n!donator") != NULL)
- {
-- show_message("a feature requested is only available to donators, please donate.\n", host);
-+ show_message("a feature requested is only available to donators, please donate\n", host);
- retval = UPDATERES_OK;
- }
- // this one should be last as it is a stupid string to signify waits
-@@ -2095,9 +2102,9 @@
- sprintf(reason, "problem parsing reason for wait response");
- }
-
-- show_message("Wait response received, waiting for %s before next update.\n",
-+ show_message("wait response received, waiting for %s before next update\n",
- format_time(howlong));
-- show_message("Wait response reason: %d\n", N_STR(reason));
-+ show_message("wait response reason: %d\n", N_STR(reason));
- sleep(howlong);
- retval = UPDATERES_ERROR;
- }
-@@ -3370,7 +3377,7 @@
- {
- if(!(options & OPT_QUIET))
- {
-- fprintf(stderr, "warning: for GNUDIP the \"address\" parpameter is only used if set to \"0.0.0.0\" thus making an offline request.\n");
-+ fprintf(stderr, "warning: for GNUDIP the \"address\" parameter is only used if set to \"0.0.0.0\" thus making an offline request\n");
- }
- }
-
-@@ -3392,7 +3399,7 @@
-
- // send an offline request if address 0.0.0.0 is used
- // otherwise, we ignore the address and send an update request
-- gnudip_request[0] = strcmp(address, "0.0.0.0") == 0 ? '1' : '0';
-+ gnudip_request[0] = address && strcmp(address, "0.0.0.0") == 0 ? '1' : '0';
- gnudip_request[1] = '\0';
-
- // find domainname
-@@ -3943,22 +3950,22 @@
- break;
-
- case 201:
-- show_message("Last update was less than %d seconds ago.\n", 300);
-+ show_message("last update was less than %d seconds ago\n", 300);
- return(UPDATERES_ERROR);
- break;
-
- case 202:
-- show_message("Server error.\n");
-+ show_message("server error\n");
- return(UPDATERES_ERROR);
- break;
-
- case 203:
-- show_message("Failure because account is frozen (by admin).\n");
-+ show_message("failure because account is frozen (by admin)\n");
- return(UPDATERES_SHUTDOWN);
- break;
-
- case 204:
-- show_message("Failure because account is locked (by user).\n");
-+ show_message("failure because account is locked (by user)\n");
- return(UPDATERES_SHUTDOWN);
- break;
-
-@@ -4215,8 +4222,6 @@
-
- switch(ret)
- {
-- char *p;
--
- case -1:
- if(!(options & OPT_QUIET))
- {
-@@ -4349,7 +4354,7 @@
- case SIGHUP:
- if(config_file)
- {
-- show_message("SIGHUP recieved, re-reading config file\n");
-+ show_message("SIGHUP received, re-reading config file\n");
- if(parse_conf_file(config_file, conf_commands) != 0)
- {
- show_message("error parsing config file \"%s\"\n", config_file);
-@@ -4384,6 +4389,7 @@
-
- int main(int argc, char **argv)
- {
-+ char *tmp;
- int ifresolve_warned = 0;
- int i;
- int retval = 1;
-@@ -4395,9 +4401,10 @@
- mcheck(NULL);
- #endif
-
-- dprintf((stderr, "staring...\n"));
-+ dprintf((stderr, "starting...\n"));
-
-- program_name = argv[0];
-+ tmp = strrchr(argv[0], '/');
-+ program_name = tmp ? tmp + 1 : argv[0];
- options = 0;
- *user = '\0';
- timeout.tv_sec = DEFAULT_TIMEOUT;
-@@ -4417,7 +4424,7 @@
-
- if(!(options & OPT_QUIET) && !(options & OPT_DAEMON))
- {
-- fprintf(stderr, "ez-ipupdate Version %s\nCopyright (C) 1998-2001 Angus Mackay.\n", VERSION);
-+ fprintf(stderr, "%s Version %s\nCopyright (C) 1998-2001 Angus Mackay\n", program_name, VERSION);
- }
-
- dprintf((stderr, "options: 0x%04X\n", options));
-@@ -4434,7 +4441,7 @@
- {
- if(service->check_info() != 0)
- {
-- fprintf(stderr, "invalid data to perform requested action.\n");
-+ fprintf(stderr, "invalid data to perform requested action\n");
- exit(1);
- }
- }
-@@ -4456,13 +4463,13 @@
- dprintf((stderr, "user_name: %s\n", user_name));
- dprintf((stderr, "password: %s\n", password));
- }
-- if(*user_name == '\0')
-+ if(*user_name == '\0' && !(options & OPT_DAEMON))
- {
- printf("user name: ");
- fgets(user_name, sizeof(user_name), stdin);
- chomp(user_name);
- }
-- if(*password == '\0')
-+ if(*password == '\0' && !(options & OPT_DAEMON))
- {
- strncpy(password, getpass("password: "), sizeof(password));
- }
-@@ -4480,7 +4487,7 @@
-
- if(service->check_info() != 0)
- {
-- fprintf(stderr, "invalid data to perform requested action.\n");
-+ fprintf(stderr, "invalid data to perform requested action\n");
- exit(1);
- }
-
-@@ -4503,7 +4510,7 @@
-
- if(interface == NULL)
- {
-- fprintf(stderr, "invalid data to perform requested action.\n");
-+ fprintf(stderr, "invalid data to perform requested action\n");
- fprintf(stderr, "you must provide an interface for daemon mode");
- exit(1);
- }
-@@ -4519,23 +4526,25 @@
- if(fork() > 0) { exit(0); } /* parent */
- }
-
-+# if HAVE_SYSLOG_H
-+ openlog(program_name, LOG_PID, LOG_DAEMON );
-+ //options |= OPT_QUIET;
-+# endif
-+ show_message("version %s, interface %s, host %s, server %s, service %s\n",
-+ VERSION, N_STR(interface), N_STR(host), server, service->title);
-+
- #if HAVE_GETPID
- if(pid_file && pid_file_create(pid_file) != 0)
- {
-- fprintf(stderr, "exiting...\n");
-+ show_message("could not create pid file %s (%s), exiting\n",
-+ pid_file, strerror(errno));
-+#if HAVE_SYSLOG_H
-+ closelog();
-+#endif
- exit(1);
- }
- #endif
-
--# if HAVE_SYSLOG_H
-- openlog(program_name, LOG_PID, LOG_USER );
-- options |= OPT_QUIET;
--# endif
-- show_message("ez-ipupdate Version %s, Copyright (C) 1998-2001 Angus Mackay.\n",
-- VERSION);
-- show_message("%s started for interface %s host %s using server %s and service %s\n",
-- program_name, N_STR(interface), N_STR(host), server, service->title);
--
- memset(&sin, 0, sizeof(sin));
-
- if(cache_file)
-@@ -4560,7 +4569,7 @@
- strftime(timebuf, sizeof(timebuf), "%Y/%m/%d %H:%M", ts);
- show_message("got last update %s on %s from cache file\n", ipstr, timebuf);
- }
-- else
-+ else if(ipstr||ipdate)
- {
- show_message("malformed cache file: %s\n", cache_file);
- }
-@@ -4647,7 +4656,7 @@
- }
- else
- {
-- show_message("failure to update %s->%s (%s)\n",
-+ show_message("failed to update %s->%s (%s)\n",
- interface, inet_ntoa(sin.sin_addr), N_STR(host));
- memset(&sin, 0, sizeof(sin));
-
-@@ -4671,7 +4680,7 @@
- dprintf((stderr, "updateres: %d\n", updateres));
- if(updateres == UPDATERES_SHUTDOWN)
- {
-- show_message("shuting down updater for %s due to fatal error\n",
-+ show_message("shutting down updater for %s due to fatal error\n",
- N_STR(host));
-
- if(notify_email && *notify_email != '\0')
-@@ -4711,7 +4720,7 @@
- #endif
-
- #else
-- fprintf(stderr, "sorry, this mode is only available on platforms that the ");
-+ fprintf(stderr, "sorry, this mode is only available on platforms where the ");
- fprintf(stderr, "IP address \ncan be determined. feel free to hack the code");
- fprintf(stderr, " though.\n");
- exit(1);
-@@ -4799,7 +4808,7 @@
- }
- else
- {
-- show_message("could not resolve ip address for %s.\n", interface);
-+ show_message("could not resolve ip address for %s\n", interface);
- exit(1);
- }
- close(sock);
-@@ -4840,7 +4849,7 @@
- {
- char ipbuf[64];
-
-- if(address == NULL || *address == '\0')
-+ if((address == NULL || *address == '\0') && interface != NULL)
- {
- #ifdef IF_LOOKUP
- struct sockaddr_in sin;
---- ez-ipupdate-3.0.11b8.orig/example.conf
-+++ ez-ipupdate-3.0.11b8/example.conf
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ez-ipupdate -c
-+#!/usr/sbin/ez-ipupdate -c
- #
- # example config file for ez-ipupdate
- #
---- ez-ipupdate-3.0.11b8.orig/example-pgpow.conf
-+++ ez-ipupdate-3.0.11b8/example-pgpow.conf
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ez-ipupdate -c
-+#!/usr/sbin/ez-ipupdate -c
- #
- # example config file for ez-ipupdate
- #
-@@ -10,8 +10,8 @@
- host=mydomain.penguinpowered.com
- interface=eth1
-
--# if you use run-as ensure the user has permission to write this file
--cache-file=/tmp/ez-ipupdate.cache
-+run-as-user=ez-ipupd
-+cache-file=/var/cache/ez-ipupdate/default-cache
-
- # uncomment this once you have everything working how you want and you are
- # ready to have ez-ipupdate running in the background all the time. to stop it
---- ez-ipupdate-3.0.11b8.orig/example-dhs.conf
-+++ ez-ipupdate-3.0.11b8/example-dhs.conf
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ez-ipupdate -c
-+#!/usr/sbin/ez-ipupdate -c
- #
- # example config file for ez-ipupdate
- #
-@@ -10,8 +10,8 @@
- host=mydomain.whatever.com
- interface=eth1
-
--# if you use run-as ensure the user has permission to write this file
--cache-file=/tmp/ez-ipupdate.cache
-+run-as-user=ez-ipupd
-+cache-file=/var/cache/ez-ipupdate/default-cache
-
- # uncomment this once you have everything working how you want and you are
- # ready to have ez-ipupdate running in the background all the time. to stop it
---- ez-ipupdate-3.0.11b8.orig/example-dyndns.conf
-+++ ez-ipupdate-3.0.11b8/example-dyndns.conf
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ez-ipupdate -c
-+#!/usr/sbin/ez-ipupdate -c
- #
- # example config file for ez-ipupdate
- #
-@@ -12,14 +12,9 @@
- interface=eth1
- max-interval=2073600
-
--# please create this file and ensure that the user that ez-ipupdate is running
--# as has write permissions to it then uncomment this line, if you don't your
--# dyndns account will probably get banned. if you run ez-ipupdate as root (bad
--# idea, use "run-as-user") then you can just uncomment this line.
--#cache-file=/etc/ez-ipupdate.cache.eth1
--
--# for the mean time we'll just use a cache file in the temp directory
--cache-file=/tmp/ez-ipupdate.cache
-+# if you don't use a cache file your dyndns account will probably get banned.
-+run-as-user=ez-ipupd
-+cache-file=/var/cache/ez-ipupdate/default-cache
-
- # uncomment this once you have everything working how you want and you are
- # ready to have ez-ipupdate running in the background all the time. to stop it
---- ez-ipupdate-3.0.11b8.orig/example-ods.conf
-+++ ez-ipupdate-3.0.11b8/example-ods.conf
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ez-ipupdate -c
-+#!/usr/sbin/ez-ipupdate -c
- #
- # example config file for ez-ipupdate
- #
-@@ -10,8 +10,8 @@
- host=mydomain.ods.org
- interface=eth1
-
--# if you use run-as ensure the user has permission to write this file
--cache-file=/tmp/ez-ipupdate.cache
-+run-as-user=ez-ipupd
-+cache-file=/var/cache/ez-ipupdate/default-cache
-
- # uncomment this once you have everything working how you want and you are
- # ready to have ez-ipupdate running in the background all the time. to stop it
---- ez-ipupdate-3.0.11b8.orig/example-tzo.conf
-+++ ez-ipupdate-3.0.11b8/example-tzo.conf
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ez-ipupdate -c
-+#!/usr/sbin/ez-ipupdate -c
- #
- # example config file for ez-ipupdate
- #
-@@ -14,8 +14,8 @@
- max-interval=2073600
- interface=eth1
-
--# if you use run-as ensure the user has permission to write this file
--cache-file=/tmp/ez-ipupdate.cache
-+run-as-user=ez-ipupd
-+cache-file=/var/cache/ez-ipupdate/default-cache
-
- # uncomment this once you have everything working how you want and you are
- # ready to have ez-ipupdate running in the background all the time. to stop it
---- ez-ipupdate-3.0.11b8.orig/example-gnudip.conf
-+++ ez-ipupdate-3.0.11b8/example-gnudip.conf
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ez-ipupdate -c
-+#!/usr/sbin/ez-ipupdate -c
- #
- # example config file for ez-ipupdate
- #
-@@ -14,8 +14,8 @@
- # any other value is ignored
- #address=0.0.0.0
-
--# if you use run-as ensure the user has permission to write this file
--cache-file=/tmp/ez-ipupdate.cache
-+run-as-user=ez-ipupd
-+cache-file=/var/cache/ez-ipupdate/default-cache
-
- # uncomment this once you have everything working how you want and you are
- # ready to have ez-ipupdate running in the background all the time. to stop it
---- ez-ipupdate-3.0.11b8.orig/example-easydns.conf
-+++ ez-ipupdate-3.0.11b8/example-easydns.conf
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ez-ipupdate -c
-+#!/usr/sbin/ez-ipupdate -c
- #
- # example config file for ez-ipupdate
- #
-@@ -10,8 +10,8 @@
- host=mydomain.whatever.com
- interface=eth1
-
--# if you use run-as ensure the user has permission to write this file
--cache-file=/tmp/ez-ipupdate.cache
-+run-as-user=ez-ipupd
-+cache-file=/var/cache/ez-ipupdate/default-cache
-
- # uncomment this once you have everything working how you want and you are
- # ready to have ez-ipupdate running in the background all the time. to stop it
---- ez-ipupdate-3.0.11b8.orig/example-justlinux.conf
-+++ ez-ipupdate-3.0.11b8/example-justlinux.conf
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ez-ipupdate -c
-+#!/usr/sbin/ez-ipupdate -c
- #
- # example config file for ez-ipupdate
- #
-@@ -10,8 +10,8 @@
- host=mydomain.penguinpowered.com
- interface=eth1
-
--# if you use run-as ensure the user has permission to write this file
--cache-file=/tmp/ez-ipupdate.cache
-+run-as-user=ez-ipupd
-+cache-file=/var/cache/ez-ipupdate/default-cache
-
- # uncomment this once you have everything working how you want and you are
- # ready to have ez-ipupdate running in the background all the time. to stop it
---- ez-ipupdate-3.0.11b8.orig/example-dyns.conf
-+++ ez-ipupdate-3.0.11b8/example-dyns.conf
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ez-ipupdate -c
-+#!/usr/sbin/ez-ipupdate -c
- #
- # example config file for ez-ipupdate
- #
-@@ -10,8 +10,8 @@
- host=myhost
- #interface=eth1
-
--# if you use run-as ensure the user has permission to write this file
--#cache-file=/tmp/ez-ipupdate.cache
-+run-as-user=ez-ipupd
-+cache-file=/var/cache/ez-ipupdate/default-cache
-
- # uncomment this once you have everything working how you want and you are
- # ready to have ez-ipupdate running in the background all the time. to stop it
---- ez-ipupdate-3.0.11b8.orig/CHANGELOG
-+++ ez-ipupdate-3.0.11b8/CHANGELOG
-@@ -1,3 +1,86 @@
-+Changelog for ez-ipupdate:
-+
-+version 3.0.11b7 is a bug fix for the new ODS server update (it was
-+ez-ipupdate's bug).
-+
-+version 3.0.11b6 has a small fix for dyns.cx changing their protocol by
-+accident (lower case Host now).
-+
-+version 3.0.7 -> 3.0.11x I can't remember, check the changelog.
-+
-+version 3.0.7 gives us a default max-interval for dyndns and allows specifying
-+intervals in days/weeks/months as well as support for another service
-+zoneedit.
-+
-+version 3.0.3 brings a fix for hn.org that was causing it to ignore the
-+supplied IP address and always use the one that you were connecting from.
-+
-+version 3.0.1 brings supoprt for hn.org and the option of using a pid file.
-+
-+version 3.0.0 brings new symantics, now you MUST specify an interface and
-+service-type for daemon mode. it also brings many fixes, it seems that there
-+have been some serious bugs introduced some time after version 2.9.1 and this
-+should fix those and bring some new features like self throttling. All users
-+are strongly encoraged to upgrade to version 3.x.x.
-+
-+version 2.9.3 brings long awaited support for a cache file. this was needed in
-+a big way for use with the dyndns.org service.
-+
-+version 2.9.2 brings support for justlinux.com's new version 2.0 service, now
-+"justlinux" is for the justlinux v2.0 service and "pgpow" is for the justlinux
-+v1.0 service. now that penguinpowered has switched to their v2.0 update method
-+I don't know which one I like the best, probably dyndns.org.
-+
-+version 2.9.0 adds support for EasyDNS. Their service is nice, very good web .
-+site design, it is commercial though thanks to Mark Jeftovic for the code to .
-+support EasyDNS .
-+
-+version 2.8.0 adds support for GNUDip and TZO as well as a new feature to run.
-+a command after every successful update. There are probably some bug fixes in.
-+there too thanks to Jeremy Bopp for the code to support GNUDip and TZO .
-+
-+version 2.6.0 adds support for ODS and a couple minor fixups.
-+
-+version 2.4.2 adds support for dyndns and some other cleanups. the service
-+that dyndns offers looks good, I still think I like justlinux better though.
-+
-+version 2.2.2 gives us support for updating the MX record for dhs.org. I
-+have to say that the implementation of dhs.org's service is laughable. I
-+strongly advise people not to use it, it is just that bad. If you are updating
-+a dhs.org acount with an MX record then there is 60 second sleep() call (or
-+the length of the timeout, whichever is shorter) to get around problems with
-+dhs' service.
-+
-+version 2.2.1 brings support for our friends at dhs.org and fixes a socket
-+leak in the dhs code and the penguinpowered code. I have to say though that I
-+am not impressed with the dhs.org service, penguinpowered.com gets my vote for
-+best implementation. (although they wont even acknowledge my client or put a
-+link to it on thier site)
-+
-+If you are getting errors connecting to the server for a justlinux.com service
-+please ensure that you either specify "-S pgpow" or "--service penguinpowered"
-+on either the command line or in the config file(in the config file the syntax
-+is "service=penguinpowered"). The default for this tool is to think it is
-+connecting to an ez-ip.net service.
-+
-+Version 2.0.0 brings support for other services than just ez-ip.net and
-+contains some bug fixes.
-+
-+Version 1.0.1 brings some new features such the useage of config files,
-+timeouts on I/O, set user id and many more.
-+
-+Version 0.9.0 fixes a problem with a leaky file descriptor and some other
-+litte things wrong. It also moves the version number up quite a bit as I have
-+been running it in daemon mode for over 60 days without any problems.
-+
-+Version 0.0.3 fixes a bug in the user/password code and a bunch of issues with
-+the packaging (I copied another project to start this one and forgot to update
-+some stuff). I Also added the system type to the User-Agent string.
-+
-+Version 0.0.2 adds some nice features for those of use who use Linux. It
-+now can run in daemon mode periodicly check the IP address of the specified
-+interface and only update it if it has changed. It also adds the feature to
-+turn your password in to '***' for the proccess listing.
-
- RCS file: /home/amackay/src/cvsroot/ez-ipupdate/ez-ipupdate.c,v
- Working file: ez-ipupdate.c
---- ez-ipupdate-3.0.11b8.orig/example-heipv6tb.conf
-+++ ez-ipupdate-3.0.11b8/example-heipv6tb.conf
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ez-ipupdate -c
-+#!/usr/sbin/ez-ipupdate -c
- #
- # example config file for ez-ipupdate
- #
-@@ -11,14 +11,9 @@
- interface=eth1
- max-interval=2073600
-
--# please create this file and ensure that the user that ez-ipupdate is running
--# as has write permissions to it then uncomment this line, if you don't your
--# dyndns account will probably get banned. if you run ez-ipupdate as root (bad
--# idea, use "run-as-user") then you can just uncomment this line.
--#cache-file=/etc/ez-ipupdate.cache.eth1
--
--# for the mean time we'll just use a cache file in the temp directory
--cache-file=/tmp/ez-ipupdate.cache
-+# if you don't use a cache file your account will probably get banned.
-+run-as-user=ez-ipupd
-+cache-file=/var/cache/ez-ipupdate/default-cache
-
- # uncomment this once you have everything working how you want and you are
- # ready to have ez-ipupdate running in the background all the time. to stop it
---- ez-ipupdate-3.0.11b8.orig/debian/control
-+++ ez-ipupdate-3.0.11b8/debian/control
-@@ -0,0 +1,25 @@
-+Source: ez-ipupdate
-+Section: net
-+Priority: optional
-+Maintainer: Sam Hocevar (Debian packages) <sam+deb(a)zoy.org>
-+Build-Depends: debhelper (>= 4.1.68)
-+Standards-Version: 3.6.2.1
-+
-+Package: ez-ipupdate
-+Section: net
-+Architecture: any
-+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, debconf (>= 1.2.0)
-+Provides: dyndns-client
-+Description: client for most dynamic DNS services
-+ ez-ipupdate is a quite complete client for the dynamic DNS service offered
-+ by http://www.ez-ip.net/ and many more.
-+ .
-+ Currently supported are: ez-ip (http://www.EZ-IP.Net/), Penguinpowered
-+ (http://www.penguinpowered.com/), DHS (http://members.dhs.org/),
-+ dynDNS (http://members.dyndns.org/), ODS (http://www.ods.org/),
-+ TZO (http://www.tzo.com/), EasyDNS (http://members.easydns.com/),
-+ Justlinux (http://www.justlinux.com), Dyns (http://www.dyns.cx),
-+ HN (http://dup.hn.org/), ZoneEdit (http://www.zoneedit.com/) and
-+ Hurricane Electric's IPv6 Tunnel Broker (http://ipv6tb.he.net/).
-+ .
-+ All services using GNUDip are also supported.
---- ez-ipupdate-3.0.11b8.orig/debian/po/POTFILES.in
-+++ ez-ipupdate-3.0.11b8/debian/po/POTFILES.in
-@@ -0,0 +1 @@
-+[type: gettext/rfc822deb] templates
---- ez-ipupdate-3.0.11b8.orig/debian/po/templates.pot
-+++ ez-ipupdate-3.0.11b8/debian/po/templates.pot
-@@ -0,0 +1,252 @@
-+# SOME DESCRIPTIVE TITLE.
-+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-+# This file is distributed under the same license as the PACKAGE package.
-+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-+#
-+#, fuzzy
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: PACKAGE VERSION\n"
-+"Report-Msgid-Bugs-To: sam+deb(a)zoy.org\n"
-+"POT-Creation-Date: 2005-11-14 20:17+0100\n"
-+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-+"Language-Team: LANGUAGE <LL(a)li.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=CHARSET\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "configure manually"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "zoneedit"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "ez-ip"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "pgpow"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dhs"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns-static"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns-custom"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "ods"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "tzo"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "easydns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "easydns-partner"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "gnudip"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "justlinux"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "hn"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "heipv6tb"
-+msgstr ""
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+msgid "Dynamic DNS provider to use:"
-+msgstr ""
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+msgid ""
-+"There are many Dynamic DNS providers supported by ez-ipupdate. If you want "
-+"your default configuration to be created automatically, you must select the "
-+"provider that you wish to use here. You must configure an account on your "
-+"chosen provider's service yourself."
-+msgstr ""
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+msgid ""
-+"If you prefer your default ez-ipupdate configuration not to be managed for "
-+"you, you may choose \"configure manually\"."
-+msgstr ""
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+msgid ""
-+"Whatever your decision, you can later put as many additional configuration "
-+"files in /etc/ez-ipupdate/ as you need."
-+msgstr ""
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:19
-+msgid "Does this system use dialup PPP to connect to the internet?"
-+msgstr ""
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:19
-+msgid ""
-+"If you use dialup PPP to connect to the internet, then ez-ipupdate can be "
-+"run to notify providers of your new address when ppp connects to the "
-+"network. Otherwise it will run in the background, and scan for changes to "
-+"your address while you are online."
-+msgstr ""
-+
-+#. Type: string
-+#. Description
-+#: ../templates:27
-+msgid "Address for your Dynamic DNS server:"
-+msgstr ""
-+
-+#. Type: string
-+#. Description
-+#: ../templates:27
-+msgid ""
-+"The service type you selected requires a server address to connect to. You "
-+"may specify either a full hostname or an IP address."
-+msgstr ""
-+
-+#. Type: string
-+#. Description
-+#: ../templates:33
-+msgid "Username for your Dynamic DNS account:"
-+msgstr ""
-+
-+#. Type: password
-+#. Description
-+#: ../templates:37
-+msgid "Password for your Dynamic DNS account:"
-+msgstr ""
-+
-+#. Type: string
-+#. Description
-+#: ../templates:42
-+msgid "Network interface to monitor:"
-+msgstr ""
-+
-+#. Type: string
-+#. Description
-+#: ../templates:42
-+msgid ""
-+"ez-ipupdate will monitor the chosen network interface for changes of IP "
-+"address. It is not possible to automatically detect which interface should "
-+"be monitored, so you must name the interface here."
-+msgstr ""
-+
-+#. Type: string
-+#. Description
-+#: ../templates:49
-+msgid "Dynamic DNS hostname to keep updated:"
-+msgstr ""
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:54
-+msgid "Enable DNS wildcards for your Dynamic DNS hostname?"
-+msgstr ""
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:54
-+msgid ""
-+"Many Dynamic DNS providers are capable of supporting \"wildcard\" DNS "
-+"lookups. This means that for yourdomain, a lookup for anything.yourdomain "
-+"will return an answer that points to yourdomain."
-+msgstr ""
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid "MX record to add:"
-+msgstr ""
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid ""
-+"Many Dynamic DNS providers are capable of supporting MX records. If you want "
-+"an MX record enabled for your domain, specify the content of that MX record "
-+"here. If you do not want an MX record, leave it blank."
-+msgstr ""
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid ""
-+"For further information on MX records, what they do, and how they are used, "
-+"see your Dynamic DNS provider."
-+msgstr ""
---- ez-ipupdate-3.0.11b8.orig/debian/po/cs.po
-+++ ez-ipupdate-3.0.11b8/debian/po/cs.po
-@@ -0,0 +1,315 @@
-+#
-+# Translators, if you are not familiar with the PO format, gettext
-+# documentation is worth reading, especially sections dedicated to
-+# this format, e.g. by running:
-+# info -n '(gettext)PO Files'
-+# info -n '(gettext)Header Entry'
-+#
-+# Some information specific to po-debconf are available at
-+# /usr/share/doc/po-debconf/README-trans
-+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-+#
-+# Developers do not need to manually edit POT or PO files.
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: ez-ipupdate\n"
-+"Report-Msgid-Bugs-To: sam+deb(a)zoy.org\n"
-+"POT-Creation-Date: 2005-11-14 20:17+0100\n"
-+"PO-Revision-Date: 2005-03-17 08:23+0100\n"
-+"Last-Translator: Miroslav Kure <kurem(a)debian.cz>\n"
-+"Language-Team: Czech <debian-l10n-czech(a)debian.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=ISO-8859-2\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "configure manually"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "zoneedit"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "ez-ip"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "pgpow"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dhs"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns-static"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns-custom"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "ods"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "tzo"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "easydns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "easydns-partner"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "gnudip"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "justlinux"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "hn"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "heipv6tb"
-+msgstr ""
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+msgid "Dynamic DNS provider to use:"
-+msgstr "Poskytovatel dynamického DNS:"
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+#, fuzzy
-+msgid ""
-+"There are many Dynamic DNS providers supported by ez-ipupdate. If you want "
-+"your default configuration to be created automatically, you must select the "
-+"provider that you wish to use here. You must configure an account on your "
-+"chosen provider's service yourself."
-+msgstr ""
-+"ez-ipupdate podporuje mnoho poskytovatelù dynamického DNS. Vyberte zde, "
-+"kterého poskytovatele pouŸíváte. Konkrétní úèet u daného poskytovatele si "
-+"v¹ak musíte nastavit sami."
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+msgid ""
-+"If you prefer your default ez-ipupdate configuration not to be managed for "
-+"you, you may choose \"configure manually\"."
-+msgstr ""
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+#, fuzzy
-+msgid ""
-+"Whatever your decision, you can later put as many additional configuration "
-+"files in /etc/ez-ipupdate/ as you need."
-+msgstr ""
-+"Poznamenejme, Ÿe do adresáøe /etc/ez-ipupdate/ mùŸete pøidat libovolný poèet "
-+"dal¹ích konfigurací. Tyto dodateèné konfigurace nebude ez-ipupdate nijak "
-+"mìnit."
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:19
-+msgid "Does this system use dialup PPP to connect to the internet?"
-+msgstr ""
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:19
-+msgid ""
-+"If you use dialup PPP to connect to the internet, then ez-ipupdate can be "
-+"run to notify providers of your new address when ppp connects to the "
-+"network. Otherwise it will run in the background, and scan for changes to "
-+"your address while you are online."
-+msgstr ""
-+
-+#. Type: string
-+#. Description
-+#: ../templates:27
-+msgid "Address for your Dynamic DNS server:"
-+msgstr "Adresa serveru dynamického DNS:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:27
-+msgid ""
-+"The service type you selected requires a server address to connect to. You "
-+"may specify either a full hostname or an IP address."
-+msgstr ""
-+"SluŸba, kterou jste vybrali, vyŸaduje adresu serveru, ke kterému se má "
-+"pøipojit. MùŸete zadat buï celé jméno serveru nebo jeho IP adresu."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:33
-+msgid "Username for your Dynamic DNS account:"
-+msgstr "UŸivatelské jméno pro úèet dynamického DNS:"
-+
-+#. Type: password
-+#. Description
-+#: ../templates:37
-+msgid "Password for your Dynamic DNS account:"
-+msgstr "Heslo pro úèet dynamického DNS:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:42
-+msgid "Network interface to monitor:"
-+msgstr "Sledovat sí»ové rozhraní:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:42
-+msgid ""
-+"ez-ipupdate will monitor the chosen network interface for changes of IP "
-+"address. It is not possible to automatically detect which interface should "
-+"be monitored, so you must name the interface here."
-+msgstr ""
-+"ez-ipupdate bude na daném sí»ovém rozhraní sledovat zmìny IP adresy. Program "
-+"neumí odhadnout, které rozhraní má sledovat a proto zde musíte uvést pøesný "
-+"název rozhraní."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:49
-+msgid "Dynamic DNS hostname to keep updated:"
-+msgstr "Dynamické DNS jméno poèítaèe, jeŸ se má udrŸovat aktuální:"
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:54
-+msgid "Enable DNS wildcards for your Dynamic DNS hostname?"
-+msgstr "Povolit zástupné znaky DNS pro dynamické DNS jméno poèítaèe?"
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:54
-+#, fuzzy
-+msgid ""
-+"Many Dynamic DNS providers are capable of supporting \"wildcard\" DNS "
-+"lookups. This means that for yourdomain, a lookup for anything.yourdomain "
-+"will return an answer that points to yourdomain."
-+msgstr ""
-+"Mnoho poskytovatelù dynamického DNS podporuje DNS dotazy se zástupnými "
-+"znaky. To znamená, Ÿe pro vasedomena vrátí dotaz na cokoliv.vasedomena "
-+"odpovìï ukazující na vasedomena. Chcete-li tuto moŸnost povolit, odpovìzte "
-+"zde kladnì."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid "MX record to add:"
-+msgstr "MX záznam:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid ""
-+"Many Dynamic DNS providers are capable of supporting MX records. If you want "
-+"an MX record enabled for your domain, specify the content of that MX record "
-+"here. If you do not want an MX record, leave it blank."
-+msgstr ""
-+"Mnoho poskytovatelù dynamického DNS podporuje MX záznamy. Chcete-li pro svou "
-+"doménu povolit MX záznam, zadejte zde jeho obsah. V opaèném pøípadì ponechte "
-+"pole prázdné."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid ""
-+"For further information on MX records, what they do, and how they are used, "
-+"see your Dynamic DNS provider."
-+msgstr ""
-+"Dal¹í informace o MX záznamech (co dìlají, jak se pouŸívají) naleznete u "
-+"svého poskytovatele dynamického DNS."
-+
-+#~ msgid "Manage your default configuration with debconf?"
-+#~ msgstr "Spravovat nastavení pomocí debconfu?"
-+
-+#~ msgid ""
-+#~ "ez-ipupdate can manage your default configuration automatically using "
-+#~ "debconf. If you do not want your default configuration managed "
-+#~ "automatically, decline this option."
-+#~ msgstr ""
-+#~ "Buï mùŸete spravovat výchozí konfiguraci ez-ipupdate automaticky pomocí "
-+#~ "debconfu, nebo ruènì úpravou konfiguraèního souboru."
-+
-+#~ msgid "Run as a daemon?"
-+#~ msgstr "Spou¹tìt jako daemon?"
-+
-+#~ msgid ""
-+#~ "By default ez-ipupdate will run as a daemon to manage the configuration. "
-+#~ "Refuse here if you do not want this. Instead, ez-ipupdate will install a "
-+#~ "script in /etc/ppp/ip-up.d that will run all non-daemon configurations "
-+#~ "when the ppp interface is brought up. See the /usr/share/doc/ez-ipupdate/"
-+#~ "README.Debian file for more information."
-+#~ msgstr ""
-+#~ "Implicitnì se ez-ipupdate spou¹tí jako daemon. Pokud tomu tak nechcete, "
-+#~ "zamítnìte zde a ez-ipupdate místo toho nainstaluje do adresáøe /etc/ppp/"
-+#~ "ip-up.d skript, který se bude spou¹tìt pøi kaŸdém nahození ppp rozhraní. "
-+#~ "Podrobnosti naleznete v /usr/share/doc/ez-ipupdate/README.Debian."
-+
-+#~ msgid ""
-+#~ "If none of these automated behaviors suit you, you should probably not "
-+#~ "manage your default configuration using debconf."
-+#~ msgstr ""
-+#~ "Pokud vám Ÿádné z automatických chování nevyhovuje, pravdìpodobnì "
-+#~ "nechcete, aby se výchozí konfigurace spravovala pomocí debconfu."
---- ez-ipupdate-3.0.11b8.orig/debian/po/fr.po
-+++ ez-ipupdate-3.0.11b8/debian/po/fr.po
-@@ -0,0 +1,318 @@
-+# translation of fr.po to French
-+#
-+# Translators, if you are not familiar with the PO format, gettext
-+# documentation is worth reading, especially sections dedicated to
-+# this format, e.g. by running:
-+# info -n '(gettext)PO Files'
-+# info -n '(gettext)Header Entry'
-+# Some information specific to po-debconf are available at
-+# /usr/share/doc/po-debconf/README-trans
-+# or http://www.debian.org/intl/l10n/po-debconf/README-trans#
-+# Developers do not need to manually edit POT or PO files.
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: ez-ipupdate\n"
-+"Report-Msgid-Bugs-To: sam+deb(a)zoy.org\n"
-+"POT-Creation-Date: 2005-11-14 20:17+0100\n"
-+"PO-Revision-Date: 2005-03-17 08:39+0100\n"
-+"Last-Translator: Christian perrier <bubulle(a)debian.org>\n"
-+"Language-Team: French <debian-l10n-french(a)lists.debian.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=ISO-8859-15\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"X-Generator: KBabel 1.9.1\n"
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "configure manually"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "zoneedit"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "ez-ip"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "pgpow"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dhs"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns-static"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns-custom"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "ods"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "tzo"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "easydns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "easydns-partner"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "gnudip"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "justlinux"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "hn"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "heipv6tb"
-+msgstr ""
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+msgid "Dynamic DNS provider to use:"
-+msgstr "Fournisseur de service de nom dynamique à utiliser :"
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+#, fuzzy
-+msgid ""
-+"There are many Dynamic DNS providers supported by ez-ipupdate. If you want "
-+"your default configuration to be created automatically, you must select the "
-+"provider that you wish to use here. You must configure an account on your "
-+"chosen provider's service yourself."
-+msgstr ""
-+"De nombreux fournisseurs de service de nom dynamique sont gérés par ez-"
-+"ipupdate. Veuillez choisir le vôtre. La configuration de votre compte chez "
-+"ce fournisseur doit être effectuée à part."
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+msgid ""
-+"If you prefer your default ez-ipupdate configuration not to be managed for "
-+"you, you may choose \"configure manually\"."
-+msgstr ""
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+#, fuzzy
-+msgid ""
-+"Whatever your decision, you can later put as many additional configuration "
-+"files in /etc/ez-ipupdate/ as you need."
-+msgstr ""
-+"Veuillez noter que si vous ajoutez des configurations supplémentaires dans /"
-+"etc/ez-ipupdate/, elles ne seront ultérieurement pas modifiées."
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:19
-+msgid "Does this system use dialup PPP to connect to the internet?"
-+msgstr ""
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:19
-+msgid ""
-+"If you use dialup PPP to connect to the internet, then ez-ipupdate can be "
-+"run to notify providers of your new address when ppp connects to the "
-+"network. Otherwise it will run in the background, and scan for changes to "
-+"your address while you are online."
-+msgstr ""
-+
-+#. Type: string
-+#. Description
-+#: ../templates:27
-+msgid "Address for your Dynamic DNS server:"
-+msgstr "Adresse de votre serveur de nom dynamique :"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:27
-+msgid ""
-+"The service type you selected requires a server address to connect to. You "
-+"may specify either a full hostname or an IP address."
-+msgstr ""
-+"Le type de service que vous avez choisi a besoin de l'adresse d'un serveur. "
-+"Vous pouvez indiquer un nom d'hôte complètement qualifié ou une adresse IP."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:33
-+msgid "Username for your Dynamic DNS account:"
-+msgstr "Identifiant de votre compte de service de nom dynamique :"
-+
-+#. Type: password
-+#. Description
-+#: ../templates:37
-+msgid "Password for your Dynamic DNS account:"
-+msgstr "Mot de passe de votre compte de service de nom dynamique :"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:42
-+msgid "Network interface to monitor:"
-+msgstr "Interface réseau à surveiller :"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:42
-+msgid ""
-+"ez-ipupdate will monitor the chosen network interface for changes of IP "
-+"address. It is not possible to automatically detect which interface should "
-+"be monitored, so you must name the interface here."
-+msgstr ""
-+"Ez-ipupdate surveille les changements d'adresse IP sur une interface réseau. "
-+"Cette interface ne peut pas être détectée automatiquement et vous devez donc "
-+"l'indiquer ici."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:49
-+msgid "Dynamic DNS hostname to keep updated:"
-+msgstr "Nom d'hôte dynamique à tenir à jour :"
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:54
-+msgid "Enable DNS wildcards for your Dynamic DNS hostname?"
-+msgstr ""
-+"Faut-il activer les requêtes DNS génériques pour votre nom d'hôte dynamique ?"
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:54
-+#, fuzzy
-+msgid ""
-+"Many Dynamic DNS providers are capable of supporting \"wildcard\" DNS "
-+"lookups. This means that for yourdomain, a lookup for anything.yourdomain "
-+"will return an answer that points to yourdomain."
-+msgstr ""
-+"De nombreux fournisseurs de services de nom dynamique gèrent les requêtes "
-+"DNS génériques (« wildcard DNS »). Cela signifie qu'une requête pour "
-+"« adresse.votre.domaine » sera résolue vers « votre.domaine »."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid "MX record to add:"
-+msgstr "Enregistrement MX à ajouter :"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid ""
-+"Many Dynamic DNS providers are capable of supporting MX records. If you want "
-+"an MX record enabled for your domain, specify the content of that MX record "
-+"here. If you do not want an MX record, leave it blank."
-+msgstr ""
-+"De nombreux fournisseurs de services de nom dynamique gèrent les "
-+"enregistrements MX. Si vous souhaitez en activer un pour votre domaine, "
-+"veuillez en indiquer le contenu ici. Si vous laissez ce champ vide, aucun "
-+"enregistrement MX ne sera ajouté."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid ""
-+"For further information on MX records, what they do, and how they are used, "
-+"see your Dynamic DNS provider."
-+msgstr ""
-+"Pour plus d'informations sur les enregistrements MX et leur utilisation, "
-+"veuillez consulter votre fournisseur de service de nom dynamique."
-+
-+#~ msgid "Manage your default configuration with debconf?"
-+#~ msgstr "Voulez-vous gérer la configuration par défaut avec debconf ?"
-+
-+#~ msgid ""
-+#~ "ez-ipupdate can manage your default configuration automatically using "
-+#~ "debconf. If you do not want your default configuration managed "
-+#~ "automatically, decline this option."
-+#~ msgstr ""
-+#~ "Ez-ipupdate peut gérer votre configuration par défaut automatiquement "
-+#~ "avec l'outil de configuration debconf. Vous pouvez choisir de ne pas "
-+#~ "utiliser cette option."
-+
-+#~ msgid "Run as a daemon?"
-+#~ msgstr "Faut-il utiliser ez-ipudate comme un démon ?"
-+
-+#~ msgid ""
-+#~ "By default ez-ipupdate will run as a daemon to manage the configuration. "
-+#~ "Refuse here if you do not want this. Instead, ez-ipupdate will install a "
-+#~ "script in /etc/ppp/ip-up.d that will run all non-daemon configurations "
-+#~ "when the ppp interface is brought up. See the /usr/share/doc/ez-ipupdate/"
-+#~ "README.Debian file for more information."
-+#~ msgstr ""
-+#~ "Par défaut, ez-ipupdate fonctionne comme un démon pour gérer la "
-+#~ "configuration. Vous pouvez choisir de ne pas utiliser cette option. Dans "
-+#~ "ce cas, ez-ipupdate installera un script dans /etc/ppp/ip-up.d qui "
-+#~ "exécutera toutes les configurations qui ne sont pas gérées par un démon, "
-+#~ "lorsque l'interface PPP sera activée. Veuillez consulter le fichier /usr/"
-+#~ "share/doc/ez-ipupdate/README.Debian pour plus d'informations."
-+
-+#~ msgid ""
-+#~ "If none of these automated behaviors suit you, you should probably not "
-+#~ "manage your default configuration using debconf."
-+#~ msgstr ""
-+#~ "Si aucun de ces fonctionnements automatisés ne vous convient, vous "
-+#~ "devriez éviter de gérer la configuration par défaut avec debconf."
---- ez-ipupdate-3.0.11b8.orig/debian/po/de.po
-+++ ez-ipupdate-3.0.11b8/debian/po/de.po
-@@ -0,0 +1,324 @@
-+# translation of de-new.po to German
-+# translation of de.po to German
-+#
-+# Translators, if you are not familiar with the PO format, gettext
-+# documentation is worth reading, especially sections dedicated to
-+# this format, e.g. by running:
-+# info -n '(gettext)PO Files'
-+# info -n '(gettext)Header Entry'
-+# Some information specific to po-debconf are available at
-+# /usr/share/doc/po-debconf/README-trans
-+# or http://www.debian.org/intl/l10n/po-debconf/README-trans#
-+# Developers do not need to manually edit POT or PO files.
-+# Jens Nachtigall <nachtigall(a)web.de>, 2005.
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: de-new\n"
-+"Report-Msgid-Bugs-To: sam+deb(a)zoy.org\n"
-+"POT-Creation-Date: 2005-11-14 20:17+0100\n"
-+"PO-Revision-Date: 2005-03-21 21:43+0100\n"
-+"Last-Translator: Jens Nachtigall <nachtigall(a)web.de>\n"
-+"Language-Team: German <debian-l10n-german(a)lists.debian.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"X-Generator: KBabel 1.9.1\n"
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "configure manually"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "zoneedit"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "ez-ip"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "pgpow"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dhs"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns-static"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns-custom"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "ods"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "tzo"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "easydns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "easydns-partner"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "gnudip"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "justlinux"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "hn"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "heipv6tb"
-+msgstr ""
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+msgid "Dynamic DNS provider to use:"
-+msgstr "Zu benutzender Dynamischer DNS-Provider:"
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+#, fuzzy
-+msgid ""
-+"There are many Dynamic DNS providers supported by ez-ipupdate. If you want "
-+"your default configuration to be created automatically, you must select the "
-+"provider that you wish to use here. You must configure an account on your "
-+"chosen provider's service yourself."
-+msgstr ""
-+"ez-ipupdate unterstÌtzt viele Dynamische DNS-Provider. WÀhlen Sie hier den "
-+"Provider aus, den Sie benutzen möchten. Das Benutzerkonto mÌssen Sie beim "
-+"Provider Ihrer Wahl selbst einrichten."
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+msgid ""
-+"If you prefer your default ez-ipupdate configuration not to be managed for "
-+"you, you may choose \"configure manually\"."
-+msgstr ""
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+#, fuzzy
-+msgid ""
-+"Whatever your decision, you can later put as many additional configuration "
-+"files in /etc/ez-ipupdate/ as you need."
-+msgstr ""
-+"Beachten Sie, dass Sie unter /etc/ez-ipupdate/ so viele zusÀtzliche "
-+"Konfigurationen haben können, wie Sie wollen. ez-ipupdate wird diese nicht "
-+"verÀndern."
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:19
-+msgid "Does this system use dialup PPP to connect to the internet?"
-+msgstr ""
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:19
-+msgid ""
-+"If you use dialup PPP to connect to the internet, then ez-ipupdate can be "
-+"run to notify providers of your new address when ppp connects to the "
-+"network. Otherwise it will run in the background, and scan for changes to "
-+"your address while you are online."
-+msgstr ""
-+
-+#. Type: string
-+#. Description
-+#: ../templates:27
-+msgid "Address for your Dynamic DNS server:"
-+msgstr "Adresse fÃŒr Ihren Dynamischen DNS-Server:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:27
-+msgid ""
-+"The service type you selected requires a server address to connect to. You "
-+"may specify either a full hostname or an IP address."
-+msgstr ""
-+"FÌr den ausgewÀhlten Service wird eine Server-Adresse benötigt, zu der eine "
-+"Verbindung aufgebaut wird. Sie können entweder einen vollstÀndigen Host-"
-+"Namen oder eine IP-Adresse angeben."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:33
-+msgid "Username for your Dynamic DNS account:"
-+msgstr "Benutzername fÃŒr Ihr Dynamisches DNS-Konto:"
-+
-+#. Type: password
-+#. Description
-+#: ../templates:37
-+msgid "Password for your Dynamic DNS account:"
-+msgstr "Passwort fÃŒr Ihr Dynamisches DNS-Konto:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:42
-+msgid "Network interface to monitor:"
-+msgstr "Zu verwaltende Netzwerk-Schnittstelle:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:42
-+msgid ""
-+"ez-ipupdate will monitor the chosen network interface for changes of IP "
-+"address. It is not possible to automatically detect which interface should "
-+"be monitored, so you must name the interface here."
-+msgstr ""
-+"ez-ipupdate wird die ausgewÀhlte Netzwerk-Schnittstelle auf VerÀnderungen "
-+"der IP-Adresse beobachten. Es ist nicht möglich automatisch festzustellen, "
-+"welche Schnittstelle beobachtet werden soll. Deshalb mÃŒssen Sie hier den "
-+"Namen der Schnittstelle selbst angeben."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:49
-+msgid "Dynamic DNS hostname to keep updated:"
-+msgstr "Zu aktualisierender Dynamischer DNS-Hostname:"
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:54
-+msgid "Enable DNS wildcards for your Dynamic DNS hostname?"
-+msgstr "DNS-Wildcards fÃŒr Ihren Dynamischen DNS-Hostnamen aktivieren?"
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:54
-+#, fuzzy
-+msgid ""
-+"Many Dynamic DNS providers are capable of supporting \"wildcard\" DNS "
-+"lookups. This means that for yourdomain, a lookup for anything.yourdomain "
-+"will return an answer that points to yourdomain."
-+msgstr ""
-+"Viele Dynamische DNS-Provider unterstÃŒtzen DNS-Lookups mit Platzhaltern "
-+"(»wildcards«). Das bedeutet: Haben Sie eine Domain namens »ihredomain«, dann "
-+"werden Anfragen nach »irgendetwas.ihredomain« mit einer Antwort erwidert, "
-+"die auf »ihredomain« verweist. Soll diese FÀhigkeit aktiviert sein, dann "
-+"stimmen Sie hier zu."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid "MX record to add:"
-+msgstr "HinzuzufÃŒgender MX-Record:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid ""
-+"Many Dynamic DNS providers are capable of supporting MX records. If you want "
-+"an MX record enabled for your domain, specify the content of that MX record "
-+"here. If you do not want an MX record, leave it blank."
-+msgstr ""
-+"Viele Dynamische DNS-Provider unterstÃŒtzen MX-Records. Wollen Sie fÃŒr Ihre "
-+"Domain einen MX-Record hinzufÃŒgen, dann geben Sie hier bitte den Inhalt des "
-+"MX-Records an. Wollen Sie keinen MX-Record, dann lassen Sie das Feld frei."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid ""
-+"For further information on MX records, what they do, and how they are used, "
-+"see your Dynamic DNS provider."
-+msgstr ""
-+"Weitere Informationen ÃŒber MX-Records, wofÃŒr sie gut sind, und wie sie "
-+"verwendet werden, erfahren Sie von Ihrem Dynamischen DNS-Provider."
-+
-+#~ msgid "Manage your default configuration with debconf?"
-+#~ msgstr "Standard-Konfiguration mit debconf verwalten?"
-+
-+#~ msgid ""
-+#~ "ez-ipupdate can manage your default configuration automatically using "
-+#~ "debconf. If you do not want your default configuration managed "
-+#~ "automatically, decline this option."
-+#~ msgstr ""
-+#~ "ez-ipupdate kann Ihre Standard-Konfiguration automatisch mittels debconf "
-+#~ "verwalten. Wenn Sie nicht wollen, dass Ihre Standard-Konfiguration "
-+#~ "automatisch verwaltet wird, dann lehnen Sie diese Option ab."
-+
-+#~ msgid "Run as a daemon?"
-+#~ msgstr "Als Daemon laufen?"
-+
-+#~ msgid ""
-+#~ "By default ez-ipupdate will run as a daemon to manage the configuration. "
-+#~ "Refuse here if you do not want this. Instead, ez-ipupdate will install a "
-+#~ "script in /etc/ppp/ip-up.d that will run all non-daemon configurations "
-+#~ "when the ppp interface is brought up. See the /usr/share/doc/ez-ipupdate/"
-+#~ "README.Debian file for more information."
-+#~ msgstr ""
-+#~ "StandardmÀÃig wird ez-ipupdate Ihre Konfiguration als Daemon verwalten. "
-+#~ "Lehnen Sie hier ab, wenn Sie das nicht wÃŒnschen. Stattdessen wÃŒrde ez-"
-+#~ "ipupdate dann unter /etc/ppp/ip-up.d/ ein Skript installieren, welches "
-+#~ "sÀmtliche Nicht-Daemon-Konfigurationen ausfÌhrt, sobald die PPP-"
-+#~ "Schnittstelle hochgefahren wird. Lesen Sie die Datei /usr/share/doc/ez-"
-+#~ "ipupdate/README.Debian fÃŒr weitere Informationen."
-+
-+#~ msgid ""
-+#~ "If none of these automated behaviors suit you, you should probably not "
-+#~ "manage your default configuration using debconf."
-+#~ msgstr ""
-+#~ "Sollte Ihnen keine dieser Automatismen zusagen, dann ist es "
-+#~ "wahrscheinlich besser, wenn Sie Ihre Standard-Konfiguration nicht mittels "
-+#~ "debconf verwalten."
---- ez-ipupdate-3.0.11b8.orig/debian/po/pt_BR.po
-+++ ez-ipupdate-3.0.11b8/debian/po/pt_BR.po
-@@ -0,0 +1,319 @@
-+# Translators, if you are not familiar with the PO format, gettext
-+# documentation is worth reading, especially sections dedicated to
-+# this format, e.g. by running:
-+# info -n '(gettext)PO Files'
-+# info -n '(gettext)Header Entry'
-+# Some information specific to po-debconf are available at
-+# /usr/share/doc/po-debconf/README-trans
-+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-+# Developers do not need to manually edit POT or PO files.
-+#
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: ez-ipupdate 3.0.11\n"
-+"Report-Msgid-Bugs-To: sam+deb(a)zoy.org\n"
-+"POT-Creation-Date: 2005-11-14 20:17+0100\n"
-+"PO-Revision-Date: 2005-03-21 23:11-0300\n"
-+"Last-Translator: Felipe Augusto van de Wiel (faw) <felipe@cathedrallabs>\n"
-+"Language-Team: Portuguese/Brazil <debian-l10n-portuguese(a)lists.debian.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"pt_BR\n"
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "configure manually"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "zoneedit"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "ez-ip"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "pgpow"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dhs"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns-static"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns-custom"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "ods"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "tzo"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "easydns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "easydns-partner"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "gnudip"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "justlinux"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "hn"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "heipv6tb"
-+msgstr ""
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+msgid "Dynamic DNS provider to use:"
-+msgstr "Provedor de DNS Dinâmico a ser usado:"
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+#, fuzzy
-+msgid ""
-+"There are many Dynamic DNS providers supported by ez-ipupdate. If you want "
-+"your default configuration to be created automatically, you must select the "
-+"provider that you wish to use here. You must configure an account on your "
-+"chosen provider's service yourself."
-+msgstr ""
-+"Há vários provedores de DNS Dinâmico suportados pelo ez-ipupdate. Você deve "
-+"selecionar o provedor que você gostaria de usar aqui. Você mesmo deve "
-+"configurar uma conta no serviço do provedor que você escolheu."
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+msgid ""
-+"If you prefer your default ez-ipupdate configuration not to be managed for "
-+"you, you may choose \"configure manually\"."
-+msgstr ""
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+#, fuzzy
-+msgid ""
-+"Whatever your decision, you can later put as many additional configuration "
-+"files in /etc/ez-ipupdate/ as you need."
-+msgstr ""
-+"Note que você pode colocar quantas configurações adicionais no /etc/ez-"
-+"ipupdate/ você quiser. ez-ipupdate não vai modificá-las."
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:19
-+msgid "Does this system use dialup PPP to connect to the internet?"
-+msgstr ""
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:19
-+msgid ""
-+"If you use dialup PPP to connect to the internet, then ez-ipupdate can be "
-+"run to notify providers of your new address when ppp connects to the "
-+"network. Otherwise it will run in the background, and scan for changes to "
-+"your address while you are online."
-+msgstr ""
-+
-+#. Type: string
-+#. Description
-+#: ../templates:27
-+msgid "Address for your Dynamic DNS server:"
-+msgstr "Endereço do seu servidor de DNS Dinâmico:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:27
-+msgid ""
-+"The service type you selected requires a server address to connect to. You "
-+"may specify either a full hostname or an IP address."
-+msgstr ""
-+"O tipo do serviço que você selecionou requer um endereço de servidor para se "
-+"conectar. Você pode especificar um nome de máquina ou um endereço IP."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:33
-+msgid "Username for your Dynamic DNS account:"
-+msgstr "Nome do usuário para a sua conta de DNS Dinâmico:"
-+
-+#. Type: password
-+#. Description
-+#: ../templates:37
-+msgid "Password for your Dynamic DNS account:"
-+msgstr "Senha para a sua conta de DNS Dinâmico:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:42
-+msgid "Network interface to monitor:"
-+msgstr "Interface de rede para monitorar:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:42
-+msgid ""
-+"ez-ipupdate will monitor the chosen network interface for changes of IP "
-+"address. It is not possible to automatically detect which interface should "
-+"be monitored, so you must name the interface here."
-+msgstr ""
-+"ez-ipupdate irá monitorar mudanças do endereço IP na interface de rede "
-+"escolhida. Não é possÃvel detectar automaticamente qual interface deve ser "
-+"monitorada, portanto você deve nomear a interface aqui."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:49
-+msgid "Dynamic DNS hostname to keep updated:"
-+msgstr "Nome de máquina do DNS Dinâmico para manter atualizado:"
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:54
-+msgid "Enable DNS wildcards for your Dynamic DNS hostname?"
-+msgstr ""
-+"Habilitar máscaras (\"wildcards\") de DNS para o seu nome de máquina do DNS "
-+"Dinâmico?"
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:54
-+#, fuzzy
-+msgid ""
-+"Many Dynamic DNS providers are capable of supporting \"wildcard\" DNS "
-+"lookups. This means that for yourdomain, a lookup for anything.yourdomain "
-+"will return an answer that points to yourdomain."
-+msgstr ""
-+"Vários provedores de DNS Dinâmico são capazes de suportar consultas para "
-+"\"máscaras\" (\"wildcards\") de DNS. Isso significa que para o seu domÃnio, "
-+"uma consulta para qualquercoisa.seudominio vai retornar uma resposta que "
-+"aponta para o seu domÃnio. Se você deseja que esse recurso seja ativado, "
-+"aceite aqui."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid "MX record to add:"
-+msgstr "Entrada MX a ser adicionada:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid ""
-+"Many Dynamic DNS providers are capable of supporting MX records. If you want "
-+"an MX record enabled for your domain, specify the content of that MX record "
-+"here. If you do not want an MX record, leave it blank."
-+msgstr ""
-+"Vários provedores de DNS Dinâmico são capazes de suportar entradas MX. Se "
-+"você deseja que uma entrada MX seja habilitada para o seu domÃnio, "
-+"especifique aqui o conteúdo da sua entrada MX. Se você não quer uma entrada "
-+"MX, deixe em branco."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid ""
-+"For further information on MX records, what they do, and how they are used, "
-+"see your Dynamic DNS provider."
-+msgstr ""
-+"Para maiores informações sobre entradas MX, o que elas fazem, e como são "
-+"usadas, veja o seu provedor de DNS Dinâmico."
-+
-+#~ msgid "Manage your default configuration with debconf?"
-+#~ msgstr "Gerenciar suas configurações \"default\" com o debconf?"
-+
-+#~ msgid ""
-+#~ "ez-ipupdate can manage your default configuration automatically using "
-+#~ "debconf. If you do not want your default configuration managed "
-+#~ "automatically, decline this option."
-+#~ msgstr ""
-+#~ "ez-ipupdate pode gerenciar suas configurações \"default\" automaticamente "
-+#~ "usando o deconf. Se você não quer que suas configurações \"default\" "
-+#~ "sejam gerenciadas automaticamente, negue esta opção."
-+
-+#~ msgid "Run as a daemon?"
-+#~ msgstr "Executar como serviço?"
-+
-+#~ msgid ""
-+#~ "By default ez-ipupdate will run as a daemon to manage the configuration. "
-+#~ "Refuse here if you do not want this. Instead, ez-ipupdate will install a "
-+#~ "script in /etc/ppp/ip-up.d that will run all non-daemon configurations "
-+#~ "when the ppp interface is brought up. See the /usr/share/doc/ez-ipupdate/"
-+#~ "README.Debian file for more information."
-+#~ msgstr ""
-+#~ "Por \"default\" ez-ipupdate é executado como serviço para gerenciar a "
-+#~ "configuração. Recuse aqui se você não quiser isso. Ao invés disso, ez-"
-+#~ "ipupdate instalará um script em /etc/ppp/ip-up.d que executará todas as "
-+#~ "configurações quando a interface ppp for ativada. Veja o arquivo /usr/"
-+#~ "share/doc/ez-ipupdate/README.Debian para mais informações."
-+
-+#~ msgid ""
-+#~ "If none of these automated behaviors suit you, you should probably not "
-+#~ "manage your default configuration using debconf."
-+#~ msgstr ""
-+#~ "Se nenhum dos comportamentos automáticos atender você, você não deveria "
-+#~ "gerenciar suas configurações \"default\" usando o debconf."
---- ez-ipupdate-3.0.11b8.orig/debian/po/vi.po
-+++ ez-ipupdate-3.0.11b8/debian/po/vi.po
-@@ -0,0 +1,308 @@
-+# Vietnamese Translation for ez-ipupdate.
-+# Copyright © 2005 Free Software Foundation, Inc.
-+# Clytie Siddall <clytie(a)riverland.net.au>, 2005.
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: ez-ipupdate 3.0.11b8-8.1\n"
-+"Report-Msgid-Bugs-To: sam+deb(a)zoy.org\n"
-+"POT-Creation-Date: 2005-11-14 20:17+0100\n"
-+"PO-Revision-Date: 2005-06-02 21:37+0930\n"
-+"Last-Translator: Clytie Siddall <clytie(a)riverland.net.au>\n"
-+"Language-Team: Vietnamese <gnomevi-list(a)lists.sourceforge.net>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=utf-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"Plural-Forms: nplurals=1; plural=0\n"
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "configure manually"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "zoneedit"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "ez-ip"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "pgpow"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dhs"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns-static"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns-custom"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "ods"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "tzo"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "easydns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "easydns-partner"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "gnudip"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "justlinux"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "hn"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "heipv6tb"
-+msgstr ""
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+msgid "Dynamic DNS provider to use:"
-+msgstr "Nhà cung cấp DNS Äá»ng cần dùng:"
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+#, fuzzy
-+msgid ""
-+"There are many Dynamic DNS providers supported by ez-ipupdate. If you want "
-+"your default configuration to be created automatically, you must select the "
-+"provider that you wish to use here. You must configure an account on your "
-+"chosen provider's service yourself."
-+msgstr ""
-+"Trình ez-ipupdate có há» trợ nhiá»u nhà cung cấp DNS Äá»ng. á» Äây thì bạn hãy "
-+"chá»n nhà cung cấp nà o bạn muá»n dùng. Cần phải tá»± cấu hình má»t tà i khoản trên "
-+"dá»ch vụ Äã chá»n."
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+msgid ""
-+"If you prefer your default ez-ipupdate configuration not to be managed for "
-+"you, you may choose \"configure manually\"."
-+msgstr ""
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+#, fuzzy
-+msgid ""
-+"Whatever your decision, you can later put as many additional configuration "
-+"files in /etc/ez-ipupdate/ as you need."
-+msgstr ""
-+"Hãy ghi chú rằng bạn có thá» chÚn cà ng nhiá»u cấu hình thêm và o /etc/ez-"
-+"ipupdate/ cà ng muá»n, và trình ez-ipupdate sẜ khÃŽng sá»a Äá»i chúng."
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:19
-+msgid "Does this system use dialup PPP to connect to the internet?"
-+msgstr ""
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:19
-+msgid ""
-+"If you use dialup PPP to connect to the internet, then ez-ipupdate can be "
-+"run to notify providers of your new address when ppp connects to the "
-+"network. Otherwise it will run in the background, and scan for changes to "
-+"your address while you are online."
-+msgstr ""
-+
-+#. Type: string
-+#. Description
-+#: ../templates:27
-+msgid "Address for your Dynamic DNS server:"
-+msgstr "Äá»a chá» cho máy phục vụ DNS Äá»ng của bạn:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:27
-+msgid ""
-+"The service type you selected requires a server address to connect to. You "
-+"may specify either a full hostname or an IP address."
-+msgstr ""
-+"Bạn Äã chá»n loại dá»ch vụ cần thiết má»t Äá»a chá» máy phục vụ Äá» kết ná»i Äến "
-+"nó. Bạn có thá» ghi rõ hoặc má»t tên máy Äầy Äủ hoặc má»t Äá»a chá» IP."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:33
-+msgid "Username for your Dynamic DNS account:"
-+msgstr "Tên ngÆ°á»i dùng cho tà i khoản DNS Äá»ng của bạn:"
-+
-+#. Type: password
-+#. Description
-+#: ../templates:37
-+msgid "Password for your Dynamic DNS account:"
-+msgstr "Máºt khẩu cho tà i khoản DNS Äá»ng của bạn:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:42
-+msgid "Network interface to monitor:"
-+msgstr "Giao diá»n mạng cần theo dõi:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:42
-+msgid ""
-+"ez-ipupdate will monitor the chosen network interface for changes of IP "
-+"address. It is not possible to automatically detect which interface should "
-+"be monitored, so you must name the interface here."
-+msgstr ""
-+"Trình ez-ipupdate sẜ theo dõi giao diá»n mạng Äã chá»n, Äá» tìm lần thay Äá»i "
-+"Äá»a chá» IP nà o. KhÃŽng thá» tá»± Äá»ng phát hiá»n giao diá»n nà o cần theo dõi, thì "
-+"bạn hãy gõ tên của giao diá»n ấy và o Äây."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:49
-+msgid "Dynamic DNS hostname to keep updated:"
-+msgstr "Tên máy DNS Äá»ng cần cáºp nháºt suá»t:"
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:54
-+msgid "Enable DNS wildcards for your Dynamic DNS hostname?"
-+msgstr "Báºt kÃœ tá»± Äại diá»n DNS cho tên máy DNS Äá»ng khÃŽng?"
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:54
-+#, fuzzy
-+msgid ""
-+"Many Dynamic DNS providers are capable of supporting \"wildcard\" DNS "
-+"lookups. This means that for yourdomain, a lookup for anything.yourdomain "
-+"will return an answer that points to yourdomain."
-+msgstr ""
-+"Nhiá»u nhà cung cấp dá»ch vụ DNS Äá»ng có khả nÄng há» trợ viá»c tra cứu DNS loại "
-+"«Äại diá»n». Có nghÄ©a là cho miá»n_tÃŽi, khi tra cứu cáigì.miá»n_tÃŽi sẜ gá»i trả "
-+"má»t trả lá»i ngụ Ãœ miá»n_tÃŽi. Nếu bạn muá»n báºt tÃnh nÄng nà y thì hãy Äá»ng Ãœ á» "
-+"Äây."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid "MX record to add:"
-+msgstr "Mục ghi MX cần thêm:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid ""
-+"Many Dynamic DNS providers are capable of supporting MX records. If you want "
-+"an MX record enabled for your domain, specify the content of that MX record "
-+"here. If you do not want an MX record, leave it blank."
-+msgstr ""
-+"Nhiá»u nhà cung cấp dá»ch vụ DNS Äá»ng có khả nÄng há» trợ mục ghi MX. Nếu bạn "
-+"muá»n báºt má»t mục ghi MX cho miá»n bạn, thì hãy ghi rõ ná»i dung của mục ghi MX "
-+"ấy và o Äây. Nếu bạn khÃŽng muá»n Äiá»u ấy thì hãy bá» rá»ng."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid ""
-+"For further information on MX records, what they do, and how they are used, "
-+"see your Dynamic DNS provider."
-+msgstr ""
-+"Äá» tìm thÃŽng tin thêm vá» mục ghi MX, chức nÄng chúng và cách sá» dụng chúng, "
-+"hãy xem nhà cung cấp dá»ch vụ DNS Äá»ng của bạn."
-+
-+#~ msgid "Manage your default configuration with debconf?"
-+#~ msgstr "Quản lÃœ cấu hình mặc Äá»nh bạn dùng debconf khÃŽng?"
-+
-+#~ msgid ""
-+#~ "ez-ipupdate can manage your default configuration automatically using "
-+#~ "debconf. If you do not want your default configuration managed "
-+#~ "automatically, decline this option."
-+#~ msgstr ""
-+#~ "Trình ez-ipupdate có thá» tá»± Äá»ng quản lÃœ cấu hình bạn dùng debconf. Nếu "
-+#~ "bạn khÃŽng muá»n Äiá»u nà y thì hãy từ khá»i tùy chá»n nà y."
-+
-+#~ msgid "Run as a daemon?"
-+#~ msgstr "Chạy trong ná»n khÃŽng?"
-+
-+#~ msgid ""
-+#~ "By default ez-ipupdate will run as a daemon to manage the configuration. "
-+#~ "Refuse here if you do not want this. Instead, ez-ipupdate will install a "
-+#~ "script in /etc/ppp/ip-up.d that will run all non-daemon configurations "
-+#~ "when the ppp interface is brought up. See the /usr/share/doc/ez-ipupdate/"
-+#~ "README.Debian file for more information."
-+#~ msgstr ""
-+#~ "Mặc Äá»nh là trình ez-ipupdate sẜ chạy trong ná»n (là dÊmon) Äá» quản lÃœ "
-+#~ "tiến trình cấu hình. Hãy từ chá»i á» Äây nếu bạn khÃŽng muá»n Äiá»u nà y. Thay "
-+#~ "và o Äó, trình ez-ipupdate sẜ cà i Äặt má»t táºp lá»nh và o /etc/ppp/ip-up.d mà "
-+#~ "sẜ chạy má»i cấu hình khÃŽng phải là trình ná»n khi giao diá»n ppp má»i hoạt "
-+#~ "Äá»ng. Hãy xem táºp tin /usr/share/doc/ez-ipupdate/README.Debian Äá» tìm "
-+#~ "thÎng tin thêm."
-+
-+#~ msgid ""
-+#~ "If none of these automated behaviors suit you, you should probably not "
-+#~ "manage your default configuration using debconf."
-+#~ msgstr ""
-+#~ "Nếu bạn khÃŽng muá»n dùng cách tá»± Äá»ng nà o thì rất có thá» là bạn khÃŽng nên "
-+#~ "quản lÃœ cấu hình mặc Äá»nh dùng debconf."
---- ez-ipupdate-3.0.11b8.orig/debian/changelog
-+++ ez-ipupdate-3.0.11b8/debian/changelog
-@@ -0,0 +1,208 @@
-+ez-ipupdate (3.0.11b8-10) unstable; urgency=low
-+
-+ * debian/templates:
-+ + Allow translation of the "configure manually" option (Closes: #339047).
-+ * debian/rules:
-+ + Use dh_install instead of cp.
-+ + Use dh_installexamples instead of cp.
-+
-+ -- Sam Hocevar (Debian packages) <sam+deb(a)zoy.org> Mon, 14 Nov 2005 20:11:20 +0100
-+
-+ez-ipupdate (3.0.11b8-9) unstable; urgency=low
-+
-+ * Acknowledge NMU. Thanks to Lucas Wall (Closes: #237444, #300821).
-+ * debian/control:
-+ + Set policy to 3.6.2.1.
-+ * debian/rules:
-+ + Use dh_installman instead of dh_installmanpages.
-+ * debian/po/vi.po:
-+ + Vietnamese debconf template translation, thanks to Clytie Siddall
-+ (Closes: #311643).
-+ * debian/config debian/templates:
-+ + Merge the "manage the config file automatically?" and the "choose
-+ service type" questions and set the priority to high (Closes: #275600).
-+ + Put zoneedit higher in the list of services in debconf because it is
-+ easy to set up.
-+ + Do not ask for the interface in PPP mode.
-+ + Tuned the questions so that they do not refer to a particular debconf
-+ backend, and many other fixes suggested by Joey Hess (Closes: #275602).
-+ + Replaced ez-ipupdate/daemon with ez-ipupdate/ppp.
-+ * CHANGELOG:
-+ + Changelog information more recent than 2001/07/04 is not available; I
-+ added the NEWS information to this file instead (Closes: #306751).
-+ * ez-ipupdate.c:
-+ + Fixed a segfault thanks to Robert Jacobs (Closes: #323718).
-+
-+ -- Sam Hocevar (Debian packages) <sam+deb(a)zoy.org> Sat, 12 Nov 2005 10:32:58 +0100
-+
-+ez-ipupdate (3.0.11b8-8.1) unstable; urgency=low
-+
-+ * Non-maintainer upload
-+ * Switched to po-debconf. (closes: #237444)
-+ * Added Czech debconf template translation.
-+ * Added French debconf template translation.
-+ * Added German debconf template translation.
-+ * Added Brazilian Portuguese debconf template translation. (closes: #300821)
-+
-+ -- Lucas Wall <lwall(a)debian.org> Fri, 25 Mar 2005 17:34:15 -0300
-+
-+ez-ipupdate (3.0.11b8-8) unstable; urgency=critical
-+
-+ * ez-ipupdate.c:
-+ + Fixed the format string vulnerability in CAN-2004-0980 (Closes: #280822).
-+ * debian/control:
-+ + Set policy to 3.6.1.1.
-+
-+ -- Sam Hocevar (Debian packages) <sam+deb(a)zoy.org> Sat, 13 Nov 2004 15:45:58 +0100
-+
-+ez-ipupdate (3.0.11b8-7) unstable; urgency=low
-+
-+ * debian/control:
-+ + Set policy to 3.6.1.0.
-+ + Set debhelper build-dependency to (>= 4.1.68) because of dh_installppp.
-+ * debian/rules:
-+ + Use dh_installppp instead of doing the work by hand (Closes: #212896).
-+
-+ -- Sam Hocevar (Debian packages) <sam+deb(a)zoy.org> Mon, 27 Oct 2003 13:39:09 +0100
-+
-+ez-ipupdate (3.0.11b8-6) unstable; urgency=low
-+
-+ * debian/control:
-+ + Set policy to 3.6.0. No changes required.
-+ + Updated debhelper build-dependency to (>= 3.4.4) because we now
-+ use debian/compat.
-+ + Use ${misc:Depends}.
-+ * debian/config:
-+ + Fixed the wildcard/MX prompting, thanks to Sam Couter (Closes: #201720).
-+
-+ -- Sam Hocevar (Debian packages) <sam+deb(a)zoy.org> Thu, 17 Jul 2003 14:44:06 +0200
-+
-+ez-ipupdate (3.0.11b8-5) unstable; urgency=low
-+
-+ * Do not prompt for a username or password in daemon mode (Closes: #198141).
-+ * debian/postinst:
-+ + Removed useless verbosity when installing the package for the first time.
-+
-+ -- Sam Hocevar (Debian packages) <sam+deb(a)zoy.org> Fri, 20 Jun 2003 10:17:37 +0200
-+
-+ez-ipupdate (3.0.11b8-4) unstable; urgency=low
-+
-+ * Do not output the "invalid cache file" message if the reason is that the
-+ cache file is empty.
-+ * debian/postinst:
-+ + Removed a temporary file that was left behind.
-+ * Log to LOG_DAEMON instead of LOG_USER so that messages go to daemon.log.
-+ * Only show the executable name in syslog, not its full path.
-+ * Do not switch to OPT_QUIET in daemon mode, so that daemon.log shows
-+ useful information such as login failures (Closes: #179717).
-+ * Fixed a few spelling errors in the log messages.
-+ * Open syslog before creating the pid file so that errors regarding the
-+ pid file creation are logged as well.
-+
-+ -- Sam Hocevar (Debian packages) <sam+deb(a)zoy.org> Thu, 19 Jun 2003 02:51:13 +0200
-+
-+ez-ipupdate (3.0.11b8-3) unstable; urgency=low
-+
-+ * Fixed a crash in the GNUDip code when no address is specified.
-+ * debian/control:
-+ + Set policy to 3.5.10.
-+ + Removed the leading "a" in the package description.
-+ + Added URLs for the various services in the long description.
-+ * debian/postinst:
-+ + Fixed default cache filename, thanks to Daniel Bonniot (Closes: #194004).
-+ + Added an invariant section to the default configuration file to preserve
-+ user changes (Closes: #191642).
-+ + No longer clear the password in debconf.
-+ * debian/config:
-+ + The GNUDip service needs a server address when run as a daemon; added a
-+ debconf prompt for this.
-+ + Added a debconf prompt to run ez-ipupdate as a daemon or through the
-+ PPP ip-up.d script (Closes: #85942).
-+ * debian/ppp:
-+ + Added this script for /etc/ppp/ip-up.d/.
-+
-+ -- Sam Hocevar (Debian packages) <sam+deb(a)zoy.org> Wed, 18 Jun 2003 15:08:00 +0200
-+
-+ez-ipupdate (3.0.11b8-2) unstable; urgency=low
-+
-+ * Re-ran "rm -f config.sub config.guess configure install-sh missing \
-+ mkinstalldirs && aclocal && automake --copy --add-missing && autoconf"
-+ * Updated policy to 3.5.9.0.
-+
-+ -- Samuel Hocevar <sam(a)zoy.org> Wed, 23 Apr 2003 05:29:22 +0200
-+
-+ez-ipupdate (3.0.11b8-1) unstable; urgency=low
-+
-+ * New upstream release.
-+ * The debconf-created file is now mode 700 to avoid password exposure
-+ (Closes: #190237).
-+
-+ -- Samuel Hocevar <sam(a)zoy.org> Wed, 23 Apr 2003 05:03:37 +0200
-+
-+ez-ipupdate (3.0.11b7-3) unstable; urgency=low
-+
-+ * The "faster than light" release.
-+ * Really fixed the timestamp skew in debian/rules (Closes: #180901).
-+
-+ -- Samuel Hocevar <sam(a)zoy.org> Fri, 14 Feb 2003 02:12:38 +0100
-+
-+ez-ipupdate (3.0.11b7-2) unstable; urgency=low
-+
-+ * The "bloody valentine" release.
-+ * Fixed another timestamp skew in debian/rules (Closes: #180901, #180904).
-+
-+ -- Samuel Hocevar <sam(a)zoy.org> Fri, 14 Feb 2003 01:06:02 +0100
-+
-+ez-ipupdate (3.0.11b7-1) unstable; urgency=low
-+
-+ * The "eternal hellfire for lazy maintainers" release.
-+ * New upstream package (Closes: #167038).
-+ * Removed dependency on debconf-tiny (Closes: #137029).
-+ * We now Provide: dyndns-client (Closes: #139082).
-+ * Updated authors list in debian/copyright (Closes: #177772).
-+ * Fixed -Wall warnings.
-+ * This release fixes a hang in ODS_read_response() (Closes: #169043).
-+ * Added various safety checks in the init.d script.
-+ * Fixed the reload rule in the init.d script (Closes: #144798).
-+ * The init.d script only looks for files ending with .conf (Closes: #139518).
-+ * Applied a patch to handle running ez-ipupdate as a user, courtesy of Sam
-+ Couter (Closes: #127913).
-+ * Applied a patch for debconf management of the default configuration,
-+ courtesy of Sam Couter again (Closes: #100327).
-+ * Prevented timestamp skews in debian/rules.
-+ * Wrote a short manpage (Closes: #168361).
-+
-+ -- Samuel Hocevar <sam(a)zoy.org> Thu, 13 Feb 2003 15:56:57 +0100
-+
-+ez-ipupdate (3.0.11b5-1) unstable; urgency=low
-+
-+ * New upstream package.
-+
-+ -- Samuel Hocevar <sam(a)zoy.org> Thu, 8 Nov 2001 19:43:21 +0100
-+
-+ez-ipupdate (3.0.10-2) unstable; urgency=low
-+
-+ * Now builds and runs properly on Hurd (Closes: #108058).
-+
-+ -- Samuel Hocevar <sam(a)zoy.org> Thu, 9 Aug 2001 15:31:23 +0200
-+
-+ez-ipupdate (3.0.10-1) unstable; urgency=low
-+
-+ * New upstream release.
-+ * Fixed typo in init.d (Closes: #97175).
-+
-+ -- Samuel Hocevar <sam(a)zoy.org> Fri, 11 May 2001 18:51:35 +0200
-+
-+ez-ipupdate (3.0.6-1) unstable; urgency=low
-+
-+ * New upstream release.
-+ * Fixed moronic errors in the init.d file (Closes: #85057, #85955, #85956).
-+ * Removed generic installation instructions from /usr/share/doc.
-+
-+ -- Samuel Hocevar <sam(a)zoy.org> Thu, 1 Mar 2001 11:44:35 +0100
-+
-+ez-ipupdate (3.0.4-1) unstable; urgency=low
-+
-+ * Initial Release (Closes: #78202).
-+
-+ -- Samuel Hocevar <sam(a)zoy.org> Mon, 25 Dec 2000 05:48:01 +0100
---- ez-ipupdate-3.0.11b8.orig/debian/templates
-+++ ez-ipupdate-3.0.11b8/debian/templates
-@@ -0,0 +1,67 @@
-+Template: ez-ipupdate/service_type
-+Type: select
-+__Choices: configure manually, zoneedit, ez-ip, pgpow, dhs, dyndns, dyndns-static, dyndns-custom, ods, tzo, easydns, easydns-partner, gnudip, justlinux, dyns, hn, heipv6tb
-+_Description: Dynamic DNS provider to use:
-+ There are many Dynamic DNS providers supported by ez-ipupdate. If you want
-+ your default configuration to be created automatically, you must select the
-+ provider that you wish to use here. You must configure an account on your
-+ chosen provider's service yourself.
-+ .
-+ If you prefer your default ez-ipupdate configuration not to be managed for
-+ you, you may choose "configure manually".
-+ .
-+ Whatever your decision, you can later put as many additional configuration
-+ files in /etc/ez-ipupdate/ as you need.
-+
-+Template: ez-ipupdate/ppp
-+Type: boolean
-+Default: false
-+_Description: Does this system use dialup PPP to connect to the internet?
-+ If you use dialup PPP to connect to the internet, then ez-ipupdate can
-+ be run to notify providers of your new address when ppp connects to the
-+ network. Otherwise it will run in the background, and scan for changes
-+ to your address while you are online.
-+
-+Template: ez-ipupdate/server
-+Type: string
-+_Description: Address for your Dynamic DNS server:
-+ The service type you selected requires a server address to connect to. You
-+ may specify either a full hostname or an IP address.
-+
-+Template: ez-ipupdate/username
-+Type: string
-+_Description: Username for your Dynamic DNS account:
-+
-+Template: ez-ipupdate/password
-+Type: password
-+_Description: Password for your Dynamic DNS account:
-+
-+Template: ez-ipupdate/interface
-+Type: string
-+Default: eth0
-+_Description: Network interface to monitor:
-+ ez-ipupdate will monitor the chosen network interface for changes of IP
-+ address. It is not possible to automatically detect which interface should
-+ be monitored, so you must name the interface here.
-+
-+Template: ez-ipupdate/hostname
-+Type: string
-+_Description: Dynamic DNS hostname to keep updated:
-+
-+Template: ez-ipupdate/dns_wildcard
-+Type: boolean
-+Default: false
-+_Description: Enable DNS wildcards for your Dynamic DNS hostname?
-+ Many Dynamic DNS providers are capable of supporting "wildcard" DNS
-+ lookups. This means that for yourdomain, a lookup for anything.yourdomain
-+ will return an answer that points to yourdomain.
-+
-+Template: ez-ipupdate/dns_mx
-+Type: string
-+_Description: MX record to add:
-+ Many Dynamic DNS providers are capable of supporting MX records. If you
-+ want an MX record enabled for your domain, specify the content of that MX
-+ record here. If you do not want an MX record, leave it blank.
-+ .
-+ For further information on MX records, what they do, and how they are
-+ used, see your Dynamic DNS provider.
---- ez-ipupdate-3.0.11b8.orig/debian/copyright
-+++ ez-ipupdate-3.0.11b8/debian/copyright
-@@ -0,0 +1,16 @@
-+This package was debianized by Sam Hocevar <sam(a)zoy.org> on
-+Mon, 25 Dec 2000 05:48:01 +0100.
-+
-+It was downloaded from http://ez-ipupdate.com/
-+
-+Upstream Authors: Angus Mackay <amackay(a)gusnet.cx>
-+ Jeremy Bopp <jbopp(a)mail.utexas.edu>
-+ Mark Jeftovic <markjr(a)easydns.com>
-+ Stefaan Ponnet <webmaster(a)dyns.cx>
-+ Colin Viebrock <colin(a)easydns.com>
-+ Tim Brown <timb(a)machine.org.uk>
-+
-+License: GNU General Public License.
-+
-+On Debian GNU/Linux systems, a copy of the GNU GPL can be found in
-+/usr/share/common-licenses/GPL.
---- ez-ipupdate-3.0.11b8.orig/debian/dirs
-+++ ez-ipupdate-3.0.11b8/debian/dirs
-@@ -0,0 +1,4 @@
-+etc/ez-ipupdate
-+etc/ppp/ip-up.d/
-+usr/sbin
-+usr/share/doc/ez-ipupdate/examples
---- ez-ipupdate-3.0.11b8.orig/debian/init
-+++ ez-ipupdate-3.0.11b8/debian/init
-@@ -0,0 +1,96 @@
-+#! /bin/sh
-+
-+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-+DAEMON=/usr/sbin/ez-ipupdate
-+NAME=ez-ipupdate
-+DESC="Dynamic DNS client"
-+
-+test -f "$DAEMON" || exit 0
-+
-+set -e
-+
-+case "$1" in
-+ start)
-+ echo -n "Starting $DESC:"
-+ configs=`find "/etc/$NAME/" -name '*.conf' | \
-+ sed -e 's,.*/\(.*\).conf,\1,'`
-+ if [ x"$configs" = x ]
-+ then
-+ echo " no .conf file in /etc/$NAME."
-+ exit 0
-+ fi
-+
-+ echo -n " $NAME"
-+ for config in `echo "$configs"`
-+ do
-+ # Don't run configurations that are not daemons
-+ if ! grep -q '^ *daemon' "/etc/$NAME/$config.conf"; then continue; fi
-+ # Don't run configurations that run in the foreground
-+ if grep -q '^ *foreground' "/etc/$NAME/$config.conf"; then continue; fi
-+ # Ok, launch an ez-ipupdate instance
-+ if start-stop-daemon --start --quiet \
-+ --pidfile "/var/run/$NAME/$config.pid" \
-+ --exec "$DAEMON" \
-+ -- -d -c "/etc/$NAME/$config.conf" \
-+ -F "/var/run/$NAME/$config.pid"
-+ then
-+ echo -n " $config"
-+ fi
-+ done
-+ echo "."
-+ ;;
-+ stop)
-+ echo -n "Stopping $DESC:"
-+ pidfiles=`find "/var/run/$NAME/" -name "*.pid" | \
-+ sed -e 's,.*/\(.*\).pid,\1,'`
-+ if [ x"$pidfiles" = x ]
-+ then
-+ echo " no $NAME running."
-+ exit 0
-+ fi
-+
-+ echo -n " $NAME"
-+ for pidfile in `echo "$pidfiles"`
-+ do
-+ if start-stop-daemon --stop --signal 3 --quiet \
-+ --pidfile "/var/run/$NAME/$pidfile.pid"
-+ then
-+ echo -n " $pidfile"
-+ fi
-+ done
-+ echo "."
-+ ;;
-+ reload)
-+ echo -n "Reloading $DESC configuration files:"
-+ pidfiles=`find "/var/run/$NAME" -name "*.pid" | \
-+ sed -e 's,.*/\(.*\).pid,\1,'`
-+ if [ x"$pidfiles" = x ]
-+ then
-+ echo " no $NAME running."
-+ exit 0
-+ fi
-+
-+ echo -n " $NAME"
-+ for pidfile in `echo "$pidfiles"`
-+ do
-+ if start-stop-daemon --stop --signal 1 --quiet \
-+ --pidfile "/var/run/$NAME/$pidfile.pid"
-+ then
-+ echo -n " $pidfile"
-+ fi
-+ done
-+ echo "."
-+ ;;
-+ restart|force-reload)
-+ $0 stop
-+ sleep 1
-+ $0 start
-+ ;;
-+ *)
-+ N="/etc/init.d/$NAME"
-+ echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
-+ exit 1
-+ ;;
-+esac
-+
-+exit 0
---- ez-ipupdate-3.0.11b8.orig/debian/README.Debian
-+++ ez-ipupdate-3.0.11b8/debian/README.Debian
-@@ -0,0 +1,37 @@
-+Notes for ez-ipupdate on Debian
-+===============================
-+
-+Configuration files
-+-------------------
-+ To configure this package, put your configuration files the /etc/ez-ipupdate/
-+directory.
-+
-+ To avoid password exposure, it is recommended you set the permission for all
-+configuration files in this directory to 700 (-rwx------). You will still be
-+able to use the run-as-user option because the file is opened before root
-+permissions are dropped.
-+
-+Automated behavior
-+------------------
-+ The init.d script will launch an ez-ipupdate daemon for each configuration
-+file in that directory that has the "daemon" option set and the "foreground"
-+option disabled.
-+
-+ The ppp script will launch ez-ipupdate once for each configuration file in
-+the /etc/ez-ipupdate/ directory that has the "daemon" and the "foreground"
-+options disabled.
-+
-+ If you do not want your configuration files to be automatically used, please
-+set the "foreground" option in them, or put them in an alternate directory.
-+
-+Cache files
-+-----------
-+ You may store cache files in /var/cache/ez-ipupdate/, as the daemon has write
-+permission to this directory.
-+
-+
-+ -- Sam Hocevar <sam(a)zoy.org> Mon, 25 Dec 2000 05:48:01 +0100
-+ updated on Thu, 13 Feb 2003 15:56:36 +0100 (cache files)
-+ updated on Wed, 23 Apr 2003 04:59:52 +0200 (file permissions)
-+ updated on Wed, 18 Jun 2003 20:08:44 +0200 (ppp ip-up.d)
-+
---- ez-ipupdate-3.0.11b8.orig/debian/rules
-+++ ez-ipupdate-3.0.11b8/debian/rules
-@@ -0,0 +1,87 @@
-+#!/usr/bin/make -f
-+# Sample debian/rules that uses debhelper.
-+# GNU copyright 1997 to 1999 by Joey Hess.
-+
-+# Uncomment this to turn on verbose mode.
-+#export DH_VERBOSE=1
-+
-+export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-+
-+confflags = --prefix=/usr
-+confflags += --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-+ confflags += --build $(DEB_HOST_GNU_TYPE)
-+else
-+ confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-+endif
-+
-+configure: configure-stamp
-+configure-stamp:
-+ dh_testdir
-+ touch configure.in \
-+ && touch aclocal.m4 \
-+ && touch configure \
-+ && touch stamp-h.in \
-+ && touch config.h.in \
-+ && touch `find -name Makefile.in`
-+ CFLAGS=-Wall ./configure $(confflags)
-+ touch configure-stamp
-+
-+build: configure-stamp build-stamp
-+build-stamp:
-+ dh_testdir
-+ $(MAKE)
-+ touch build-stamp
-+
-+clean:
-+ dh_testdir
-+ dh_testroot
-+ rm -f build-stamp configure-stamp
-+ -$(MAKE) distclean
-+ chmod a-x ex*conf
-+ dh_clean
-+ debconf-updatepo
-+
-+install: build
-+ dh_testdir
-+ dh_testroot
-+ dh_clean -k
-+ dh_installdirs
-+ dh_install ez-ipupdate /usr/sbin/
-+ dh_installppp
-+
-+# Build architecture-independent files here.
-+binary-indep: build install
-+# We have nothing to do by default.
-+
-+# Build architecture-dependent files here.
-+binary-arch: build install
-+# dh_testversion
-+ dh_testdir
-+ dh_testroot
-+ dh_installdebconf
-+ dh_installdocs
-+ dh_installexamples ex*conf
-+ dh_installmenu
-+# dh_installemacsen
-+# dh_installpam
-+ dh_installinit
-+ dh_installcron
-+ dh_installman ez-ipupdate.8
-+ dh_installinfo
-+ dh_installchangelogs CHANGELOG
-+ dh_link
-+ dh_strip
-+ dh_compress
-+ dh_fixperms
-+# dh_makeshlibs
-+ dh_installdeb
-+# dh_perl
-+ dh_shlibdeps
-+ dh_gencontrol
-+ dh_md5sums
-+ dh_builddeb
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary install configure
---- ez-ipupdate-3.0.11b8.orig/debian/docs
-+++ ez-ipupdate-3.0.11b8/debian/docs
-@@ -0,0 +1 @@
-+README
---- ez-ipupdate-3.0.11b8.orig/debian/postinst
-+++ ez-ipupdate-3.0.11b8/debian/postinst
-@@ -0,0 +1,139 @@
-+#! /bin/sh
-+# postinst script for ez-ipupdate
-+#
-+# see: dh_installdeb(1)
-+
-+set -e
-+
-+# Load the debconf library
-+. /usr/share/debconf/confmodule
-+
-+# summary of how this script can be called:
-+# * <postinst> `configure' <most-recently-configured-version>
-+# * <old-postinst> `abort-upgrade' <new version>
-+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-+# <new-version>
-+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-+# <failed-install-package> <version> `removing'
-+# <conflicting-package> <version>
-+# for details, see http://www.debian.org/doc/debian-policy/ or
-+# the debian-policy package
-+#
-+# quoting from the policy:
-+# Any necessary prompting should almost always be confined to the
-+# post-installation script, and should be protected with a conditional
-+# so that unnecessary prompting doesn't happen if a package's
-+# installation fails and the `postinst' is called with `abort-upgrade',
-+# `abort-remove' or `abort-deconfigure'.
-+
-+case "$1" in
-+ configure)
-+ # Create the user if it doesn't exist
-+ if ! id ez-ipupd 2>/dev/null 1>&2 ; then
-+ adduser --system --home /var/cache/ez-ipupdate \
-+ --shell /bin/false --gecos "Dynamic DNS client" \
-+ --disabled-password --disabled-login ez-ipupd
-+ fi
-+ # Create the default cache file
-+ touch /var/cache/ez-ipupdate/default-cache
-+ chown ez-ipupd /var/cache/ez-ipupdate/default-cache
-+ # Remove spurious cache file from the 3.0.11b8-2 broken package
-+ rm -f /var/cache/ez-ipupdate/cache-default
-+ # Create the directory where the PID file will be stored
-+ mkdir -p /var/run/ez-ipupdate
-+ chown -R ez-ipupd /var/run/ez-ipupdate
-+ # Create the default config file (maybe)
-+ db_get ez-ipupdate/service_type
-+ if [ "$RET" != "configure manually" ] ; then
-+ service="$RET"
-+ conf="/etc/ez-ipupdate/default.conf"
-+ newconf="$conf.dpkg-new"
-+ # Grab answers from debconf
-+ db_get ez-ipupdate/ppp
-+ ppp="$RET"
-+ db_get ez-ipupdate/username
-+ username="$RET"
-+ db_get ez-ipupdate/password
-+ password="$RET"
-+ db_get ez-ipupdate/hostname
-+ hostname="$RET"
-+ db_get ez-ipupdate/interface
-+ interface="$RET"
-+ echo "#!/usr/sbin/ez-ipupdate -c" > "$newconf"
-+ cat >> "$newconf" << EOF
-+###
-+### Default ez-ipupdate configuration file - EDIT WITH CARE
-+### Use \`dpkg-reconfigure ez-ipupdate' to update the debconf-generated lines.
-+###
-+
-+### The following lines were generated by debconf
-+
-+service-type=$service
-+EOF
-+ db_get ez-ipupdate/server || RET=""
-+ if [ -n "$RET" ]; then
-+ echo "server=$RET" >> "$newconf"
-+ else
-+ echo "#server=(default)" >> "$newconf"
-+ fi
-+ cat >> "$newconf" << EOF
-+user=$username:$password
-+host=$hostname
-+interface=$interface
-+EOF
-+ db_get ez-ipupdate/dns_wildcard || RET="false"
-+ if [ "$RET" = "true" ]; then
-+ echo "wildcard" >> "$newconf"
-+ else
-+ echo "#wildcard" >> "$newconf"
-+ fi
-+ db_get ez-ipupdate/dns_mx || RET=""
-+ if [ -n "$RET" ]; then
-+ echo "mx=$RET" >> "$newconf"
-+ else
-+ echo "#mx=(none)" >> "$newconf"
-+ fi
-+ cat >> "$newconf" << EOF
-+run-as-user=ez-ipupd
-+cache-file=/var/cache/ez-ipupdate/default-cache
-+EOF
-+ if [ "$ppp" = "true" ]; then
-+ echo "#daemon" >> "$newconf"
-+ else
-+ echo "daemon" >> "$newconf"
-+ fi
-+ echo >> "$newconf"
-+ if grep -q '^### Changes below this' "$conf" >/dev/null 2>&1; then
-+ sed -ne '/^### Changes below this/,$p' < "$conf" >> "$newconf"
-+ else
-+ cat >> "$newconf" << EOF
-+### Changes below this line will be preserved on upgrades.
-+
-+EOF
-+ fi
-+ # Fix the file permissions
-+ chmod 700 "$newconf"
-+ rm -f "$conf" && mv "$newconf" "$conf"
-+ # Remove that old file, from broken 3.0.11b8-3 package
-+ rm -f "$conf.new"
-+ fi
-+ ;;
-+
-+ abort-upgrade|abort-remove|abort-deconfigure)
-+ ;;
-+
-+ *)
-+ echo "postinst called with unknown argument \`$1'" >&2
-+ exit 1
-+ ;;
-+esac
-+
-+# dh_installdeb will replace this with shell code automatically
-+# generated by other debhelper scripts.
-+
-+#DEBHELPER#
-+
-+# ez-ipupdate is a bit misbehaved.
-+db_stop
-+
-+exit 0
---- ez-ipupdate-3.0.11b8.orig/debian/config
-+++ ez-ipupdate-3.0.11b8/debian/config
-@@ -0,0 +1,165 @@
-+#!/bin/sh
-+
-+set -e
-+
-+# Source debconf library
-+. /usr/share/debconf/confmodule
-+
-+service_supports_wildcards()
-+{
-+ service=$1
-+ ret=1
-+
-+ case "$service" in
-+ ez-ip|dhs|dyndns|dyndns-static|easydns|easydns-partner)
-+ ret=0
-+ ;;
-+ esac
-+
-+ return $ret
-+}
-+
-+service_supports_mx()
-+{
-+ service=$1
-+ ret=1
-+
-+ case "$service" in
-+ ez-ip|dhs|dyndns|dyndns-static|easydns|zoneedit)
-+ ret=0
-+ ;;
-+ esac
-+
-+ return $ret
-+}
-+
-+service_needs_server()
-+{
-+ service=$1
-+ ret=1
-+
-+ case "$service" in
-+ gnudip)
-+ ret=0
-+ ;;
-+ esac
-+
-+ return $ret
-+}
-+
-+# I no longer claim this question, migrate it.
-+if db_get ez-ipupdate/daemon; then
-+ case "$RET" in
-+ true) db_set ez-ipupdate/ppp "false" ;;
-+ false) db_set ez-ipupdate/ppp "true" ;;
-+ esac
-+ db_unregister ez-ipupdate/daemon
-+fi
-+
-+# I no longer claim this question either.
-+if db_get ez-ipupdate/manage_default_config_automatically; then
-+ case "$RET" in
-+ false) db_set ez-ipupdate/service_type "configure manually" ;;
-+ esac
-+ db_unregister ez-ipupdate/manage_default_config_automatically
-+fi
-+
-+# Name the configuration file
-+conf=/etc/ez-ipupdate/default.conf
-+
-+# Do you want debconf to manage the default configuration?
-+if [ -f "$conf" ]; then
-+ service="`sed -ne 's/^service-type *= *//p' < $conf`"
-+fi
-+if [ -n "$service" ]; then
-+ db_set ez-ipupdate/service_type "$service"
-+fi
-+db_input high ez-ipupdate/service_type || true
-+db_go
-+
-+db_get ez-ipupdate/service_type
-+if [ "$RET" != "configure manually" ]; then
-+ if [ -f "$conf" ]; then
-+ # Grab existing values from config file
-+ if grep "^daemon" $conf > /dev/null 2>&1; then
-+ ppp="false"
-+ fi
-+ service="`sed -ne 's/^service-type *= *//p' < $conf`"
-+ server="`sed -ne 's/^server *= *//p' < $conf`"
-+ username="`sed -ne 's/^user *= *\([^:]*\):.*/\1/p' < $conf`"
-+ password="`sed -ne 's/^user *= *[^:]*://p' < $conf`"
-+ hostname="`sed -ne 's/^host *= *//p' < $conf`"
-+ interface="`sed -ne 's/^interface *= *//p' < $conf`"
-+ if grep "^wildcard" $conf > /dev/null 2>&1; then
-+ wildcard="true"
-+ fi
-+ dns_mx="`sed -ne 's/^mx *= *//p' < $conf`"
-+ # Poke the values into debconf
-+ if [ -n "$ppp" ]; then
-+ db_set ez-ipupdate/ppp "$ppp"
-+ fi
-+ if [ -n "$service" ]; then
-+ db_set ez-ipupdate/service_type "$service"
-+ fi
-+ if [ -n "$server" ]; then
-+ db_set ez-ipupdate/server "$server"
-+ fi
-+ if [ -n "$username" ]; then
-+ db_set ez-ipupdate/username "$username"
-+ fi
-+ if [ -n "$password" ]; then
-+ db_set ez-ipupdate/password "$password"
-+ fi
-+ if [ -n "$hostname" ]; then
-+ db_set ez-ipupdate/hostname "$hostname"
-+ fi
-+ if [ -n "$interface" ]; then
-+ db_set ez-ipupdate/interface "$interface"
-+ fi
-+ if [ "$wildcard" = true ]; then
-+ db_set ez-ipupdate/dns_wildcard true
-+ fi
-+ if [ -n "$dns_mx" ]; then
-+ db_set ez-ipupdate/dns_mx "$dns_mx"
-+ fi
-+ fi
-+ # Ask for new answers
-+ db_beginblock
-+ db_input high ez-ipupdate/ppp || true
-+ db_input high ez-ipupdate/username || true
-+ db_input high ez-ipupdate/password || true
-+ db_input high ez-ipupdate/hostname || true
-+ db_endblock
-+ db_go
-+ # Need to determine whether wildcards and MX records are supported
-+ # by the chosen service
-+ db_beginblock
-+ db_get ez-ipupdate/service_type
-+ service_type="$RET"
-+ if service_needs_server "$service_type"; then
-+ db_input high ez-ipupdate/server || true
-+ else
-+ db_set ez-ipupdate/server ""
-+ fi
-+ if service_supports_wildcards "$service_type"; then
-+ db_input medium ez-ipupdate/dns_wildcard || true
-+ else
-+ db_set ez-ipupdate/dns_wildcard false
-+ fi
-+ if service_supports_mx "$service_type"; then
-+ db_input medium ez-ipupdate/dns_mx || true
-+ else
-+ db_set ez-ipupdate/dns_mx ""
-+ fi
-+ db_endblock
-+ db_go
-+ # Check whether we really need to know the listening interface
-+ db_beginblock
-+ db_get ez-ipupdate/ppp
-+ ppp="$RET"
-+ if [ "$ppp" = "false" ]; then
-+ db_input high ez-ipupdate/interface || true
-+ fi
-+ db_endblock
-+ db_go
-+fi
---- ez-ipupdate-3.0.11b8.orig/debian/postrm
-+++ ez-ipupdate-3.0.11b8/debian/postrm
-@@ -0,0 +1,54 @@
-+#! /bin/sh
-+# postrm script for ez-ipupdate
-+#
-+# see: dh_installdeb(1)
-+
-+set -e
-+
-+# summary of how this script can be called:
-+# * <postrm> `remove'
-+# * <postrm> `purge'
-+# * <old-postrm> `upgrade' <new-version>
-+# * <new-postrm> `failed-upgrade' <old-version>
-+# * <new-postrm> `abort-install'
-+# * <new-postrm> `abort-install' <old-version>
-+# * <new-postrm> `abort-upgrade' <old-version>
-+# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
-+# for details, see http://www.debian.org/doc/debian-policy/ or
-+# the debian-policy package
-+
-+#DEBHELPER#
-+
-+remove_var_run() {
-+ # Delete the user account, if it exists
-+ if id ez-ipupd 2>/dev/null 1>&2 ; then
-+ deluser ez-ipupd
-+ # The --remove-home option to deluser requires
-+ # perl-modules? WTF?
-+ rm -Rf /var/cache/ez-ipupdate
-+ fi
-+ # And remove the directory where the PID files were stored
-+ rm -rf /var/run/ez-ipupdate
-+}
-+
-+case "$1" in
-+ purge)
-+ rm -f /etc/ez-ipupdate/default.conf
-+ remove_var_run
-+ ;;
-+
-+ remove)
-+ remove_var_run
-+ ;;
-+
-+ upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-+ ;;
-+
-+ *)
-+ echo "postrm called with unknown argument \`$1'" >&2
-+ exit 1
-+ ;;
-+
-+esac
-+
-+exit 0
---- ez-ipupdate-3.0.11b8.orig/debian/preinst
-+++ ez-ipupdate-3.0.11b8/debian/preinst
-@@ -0,0 +1,35 @@
-+#! /bin/sh
-+# preinst script for ez-ipupdate
-+#
-+# see: dh_installdeb(1)
-+
-+set -e
-+
-+# summary of how this script can be called:
-+# * <new-preinst> `install'
-+# * <new-preinst> `install' <old-version>
-+# * <new-preinst> `upgrade' <old-version>
-+# * <old-preinst> `abort-upgrade' <new-version>
-+#
-+# for details, see http://www.debian.org/doc/debian-policy/ or
-+# the debian-policy package
-+
-+case "$1" in
-+ install|upgrade)
-+ ;;
-+
-+ abort-upgrade)
-+ ;;
-+
-+ *)
-+ echo "preinst called with unknown argument \`$1'" >&2
-+ exit 1
-+ ;;
-+esac
-+
-+# dh_installdeb will replace this with shell code automatically
-+# generated by other debhelper scripts.
-+
-+#DEBHELPER#
-+
-+exit 0
---- ez-ipupdate-3.0.11b8.orig/debian/prerm
-+++ ez-ipupdate-3.0.11b8/debian/prerm
-@@ -0,0 +1,37 @@
-+#! /bin/sh
-+# prerm script for ez-ipupdate
-+#
-+# see: dh_installdeb(1)
-+
-+set -e
-+
-+# summary of how this script can be called:
-+# * <prerm> `remove'
-+# * <old-prerm> `upgrade' <new-version>
-+# * <new-prerm> `failed-upgrade' <old-version>
-+# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-+# * <deconfigured's-prerm> `deconfigure' `in-favour'
-+# <package-being-installed> <version> `removing'
-+# <conflicting-package> <version>
-+# for details, see http://www.debian.org/doc/debian-policy/ or
-+# the debian-policy package
-+
-+case "$1" in
-+ remove|upgrade|deconfigure)
-+ ;;
-+
-+ failed-upgrade)
-+ ;;
-+
-+ *)
-+ echo "prerm called with unknown argument \`$1'" >&2
-+ exit 1
-+ ;;
-+esac
-+
-+# dh_installdeb will replace this with shell code automatically
-+# generated by other debhelper scripts.
-+
-+#DEBHELPER#
-+
-+exit 0
---- ez-ipupdate-3.0.11b8.orig/debian/compat
-+++ ez-ipupdate-3.0.11b8/debian/compat
-@@ -0,0 +1 @@
-+4
---- ez-ipupdate-3.0.11b8.orig/debian/ez-ipupdate.ppp.ip-up
-+++ ez-ipupdate-3.0.11b8/debian/ez-ipupdate.ppp.ip-up
-@@ -0,0 +1,25 @@
-+#!/bin/sh
-+#
-+# Default ez-ipupdate ip-up script
-+# /etc/ppp/ip-up.d/ez-ipupdate
-+#
-+
-+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-+DAEMON=/usr/sbin/ez-ipupdate
-+NAME=ez-ipupdate
-+
-+[ -x $DAEMON ] || exit 0
-+
-+configs=`find "/etc/$NAME/" -name '*.conf' | sed -e 's,.*/\(.*\).conf,\1,'`
-+[ x"$configs" = x ] && exit 0
-+
-+for config in `echo "$configs"`
-+do
-+ # Don't run daemon configurations
-+ if grep -q '^ *daemon' "/etc/$NAME/$config.conf"; then continue; fi
-+ # Don't run configurations that run in the foreground
-+ if grep -q '^ *foreground' "/etc/$NAME/$config.conf"; then continue; fi
-+ # Ok, launch an ez-ipupdate instance
-+ "$DAEMON" -c "/etc/$NAME/$config.conf"
-+done
-+
---- ez-ipupdate-3.0.11b8.orig/ez-ipupdate.8
-+++ ez-ipupdate-3.0.11b8/ez-ipupdate.8
-@@ -0,0 +1,140 @@
-+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.29.
-+.\" I DO WHATEVER I WANT YOU DUMBASS SCRIPT! -- Sam
-+.TH EZ-IPUPDATE "8" "February 2003" "ez-ipupdate - 3.0.11b7" "Dynamic DNS client"
-+.SH NAME
-+ez-ipupdate \- dynamic DNS client
-+.SH SYNOPSIS
-+.B ez-ipupdate
-+.RI [ options ]
-+.SH DESCRIPTION
-+This manual page documents briefly the
-+.B ez-ipupdate
-+dynamic DNS client.
-+
-+.SH OPTIONS
-+.B ez-ipupdate
-+follows the usual GNU command line syntax, with long
-+options starting with two dashes (`-').
-+.TP
-+\fB\-a\fR, \fB\-\-address\fR <ip address>
-+string to send as your ip address
-+.TP
-+\fB\-b\fR, \fB\-\-cache\-file\fR <file>
-+file to use for caching the ipaddress
-+.TP
-+\fB\-c\fR, \fB\-\-config\-file\fR <file>
-+configuration file, almost all arguments can be
-+given with: <name>[=<value>]
-+to see a list of possible config commands
-+try "echo help | ez-ipupdate \fB\-c\fR -"
-+.TP
-+\fB\-d\fR, \fB\-\-daemon\fR
-+run as a daemon periodicly updating if
-+necessary
-+.TP
-+\fB\-e\fR, \fB\-\-execute\fR <command>
-+shell command to execute after a successful
-+update
-+.TP
-+\fB\-f\fR, \fB\-\-foreground\fR
-+when running as a daemon run in the foreground
-+.TP
-+\fB\-F\fR, \fB\-\-pidfile\fR <file>
-+use <file> as a pid file
-+.TP
-+\fB\-g\fR, \fB\-\-request\-uri\fR <uri>
-+URI to send updates to
-+.TP
-+\fB\-h\fR, \fB\-\-host\fR <host>
-+string to send as host parameter
-+.TP
-+\fB\-i\fR, \fB\-\-interface\fR <iface>
-+which interface to use
-+.TP
-+\fB\-L\fR, \fB\-\-cloak_title\fR <host>
-+some stupid thing for DHS only
-+.TP
-+\fB\-m\fR, \fB\-\-mx\fR <mail exchange>
-+string to send as your mail exchange
-+.HP
-+\fB\-M\fR, \fB\-\-max\-interval\fR <# of sec> max time in between updates
-+.TP
-+\fB\-N\fR, \fB\-\-notify\-email\fR <email>
-+address to send mail to if bad things happen
-+.TP
-+\fB\-o\fR, \fB\-\-offline\fR
-+set to off line mode
-+.TP
-+\fB\-p\fR, \fB\-\-resolv\-period\fR <sec>
-+period to check IP if it can't be resolved
-+.TP
-+\fB\-P\fR, \fB\-\-period\fR <# of sec>
-+period to check IP in daemon
-+mode (default: 1800 seconds)
-+.TP
-+\fB\-q\fR, \fB\-\-quiet\fR
-+be quiet
-+.TP
-+\fB\-r\fR, \fB\-\-retrys\fR <num>
-+number of trys (default: 1)
-+.TP
-+\fB\-R\fR, \fB\-\-run\-as\-user\fR <user>
-+change to <user> for running, be ware
-+that this can cause problems with handeling
-+SIGHUP properly if that user can't read the
-+config file. also it can't write it's pid file
-+to a root directory
-+.TP
-+\fB\-Q\fR, \fB\-\-run\-as\-euser\fR <user>
-+change to effective <user> for running,
-+this is NOT secure but it does solve the
-+problems with run-as-user and config files and
-+pid files.
-+.TP
-+\fB\-s\fR, \fB\-\-server\fR <server[:port]>
-+the server to connect to
-+.TP
-+\fB\-S\fR, \fB\-\-service\-type\fR <server>
-+the type of service that you are using
-+try one of: null ezip pgpow dhs
-+dyndns dyndns-static dyndns-custom
-+ods tzo easydns easydns-partner
-+gnudip justlinux dyns hn zoneedit
-+heipv6tb
-+.TP
-+\fB\-t\fR, \fB\-\-timeout\fR <sec.millisec>
-+the amount of time to wait on I/O
-+.TP
-+\fB\-T\fR, \fB\-\-connection\-type\fR <num>
-+number sent to TZO as your connection
-+type (default: 1)
-+.TP
-+\fB\-U\fR, \fB\-\-url\fR <url>
-+string to send as the url parameter
-+.TP
-+\fB\-u\fR, \fB\-\-user\fR <user[:passwd]>
-+user ID and password, if either is left blank
-+they will be prompted for
-+.TP
-+\fB\-w\fR, \fB\-\-wildcard\fR
-+set your domain to have a wildcard alias
-+.TP
-+\fB\-z\fR, \fB\-\-partner\fR <partner>
-+specify easyDNS partner (for easydns-partner
-+services)
-+.TP
-+\fB\-\-help\fR
-+display this help and exit
-+.TP
-+\fB\-\-version\fR
-+output version information and exit
-+.TP
-+\fB\-\-credits\fR
-+print the credits and exit
-+.TP
-+\fB\-\-signalhelp\fR
-+print help about signals
-+.br
-+.SH AUTHOR
-+This manual page was written by Sam Hocevar <sam(a)zoy.org> for the Debian
-+GNU/Linux system (but may be used by others).
diff --git a/ez-ipupdate/patches/ez-ipupdate-3.0.11b8-pidfile.patch b/ez-ipupdate/patches/ez-ipupdate-3.0.11b8-pidfile.patch
deleted file mode 100644
index 65d5ab2..0000000
--- a/ez-ipupdate/patches/ez-ipupdate-3.0.11b8-pidfile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/ez-ipupdate.c 2003-05-27 17:48:26.000000000 +0300
-+++ b/ez-ipupdate.c 2003-05-27 19:28:38.000000000 +0300
-@@ -629,7 +629,7 @@
- #endif
- fprintf(stdout, " -e, --execute <command>\tshell command to execute after a successful\n\t\t\t\tupdate\n");
- fprintf(stdout, " -f, --foreground\t\twhen running as a daemon run in the foreground\n");
-- fprintf(stdout, " -F, --pidfile <file>\t\tuse <file> as a pid file\n");
-+ fprintf(stdout, " -F, --pid-file <file>\t\tuse <file> as a pid file\n");
- fprintf(stdout, " -g, --request-uri <uri>\tURI to send updates to\n");
- fprintf(stdout, " -h, --host <host>\t\tstring to send as host parameter\n");
- fprintf(stdout, " -i, --interface <iface>\twhich interface to use\n");
diff --git a/libnftnl/libnftnl.nm b/libnftnl/libnftnl.nm
index 147303c..c810e90 100644
--- a/libnftnl/libnftnl.nm
+++ b/libnftnl/libnftnl.nm
@@ -4,10 +4,8 @@
###############################################################################
name = libnftnl
-version = 1.0.0
-snapshot = 20140412
-release = 1.%{snapshot}
-thisapp = %{name}-%{snapshot}
+version = 1.0.3
+release = 1
groups = Networking/Tools
url = http://netfilter.org/projects/libnftnl
@@ -19,20 +17,12 @@ description
libmnl.
end
-source_dl = http://ftp.netfilter.org/pub/libnftnl/snapshot/
+source_dl = http://ftp.netfilter.org/pub/libnftnl/
sources = %{thisapp}.tar.bz2
build
requires
- autoconf
- autogen
- automake
libmnl-devel
- libtool
- end
-
- prepare_cmds
- ./autogen.sh
end
end
diff --git a/nftables/nftables.nm b/nftables/nftables.nm
index 0303095..2f1098d 100644
--- a/nftables/nftables.nm
+++ b/nftables/nftables.nm
@@ -5,8 +5,8 @@
name = nftables
version = 0.100
-snapshot = 20140412
-release = 2.%{snapshot}
+snapshot = 20141226
+release = 3.%{snapshot}
thisapp = %{name}-%{snapshot}
groups = Networking/Tools
@@ -33,7 +33,7 @@ build
gmp-devel
libtool
libmnl-devel
- libnftnl-devel
+ libnftnl-devel >= 1.0.3
readline-devel
end
diff --git a/nftables/patches/nftables-20140118-db2x_docbook2man.patch b/nftables/patches/nftables-20140118-db2x_docbook2man.patch
deleted file mode 100644
index efec20d..0000000
--- a/nftables/patches/nftables-20140118-db2x_docbook2man.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -Nur nftables-20140118.orig/configure nftables-20140118/configure
---- nftables-20140118.orig/configure 2014-01-17 22:28:04.000000000 -0700
-+++ nftables-20140118/configure 2014-01-18 15:42:10.427000000 -0700
-@@ -3310,8 +3310,8 @@
- rm -f conftest.sed
-
-
--# Extract the first word of "docbook2x-man", so it can be a program name with args.
--set dummy docbook2x-man; ac_word=$2
-+# Extract the first word of "db2x_docbook2man", so it can be a program name with args.
-+set dummy db2x_docbook2man; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_CONFIG_MAN+set}" = set; then :
-@@ -3350,8 +3350,8 @@
-
- if test "$CONFIG_MAN" != "y"
- then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: docbookx2-man not found, no manpages will be built" >&5
--$as_echo "$as_me: WARNING: docbookx2-man not found, no manpages will be built" >&2;}
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: db2x_docbook2man not found, no manpages will be built" >&5
-+$as_echo "$as_me: WARNING: db2x_docbook2man not found, no manpages will be built" >&2;}
- fi
-
- # Extract the first word of "db2pdf", so it can be a program name with args.
-diff -Nur nftables-20140118.orig/configure.ac nftables-20140118/configure.ac
---- nftables-20140118.orig/configure.ac 2014-01-17 22:28:00.000000000 -0700
-+++ nftables-20140118/configure.ac 2014-01-18 15:42:24.483000000 -0700
-@@ -25,10 +25,10 @@
- AC_PROG_INSTALL
- AC_PROG_SED
-
--AC_CHECK_PROG(CONFIG_MAN, docbook2x-man, y, n)
-+AC_CHECK_PROG(CONFIG_MAN, db2x_docbook2man, y, n)
- if test "$CONFIG_MAN" != "y"
- then
-- AC_MSG_WARN([docbookx2-man not found, no manpages will be built])
-+ AC_MSG_WARN([db2x_docbook2man not found, no manpages will be built])
- fi
-
- AC_CHECK_PROG(CONFIG_PDF, db2pdf, y, n)
-diff -Nur nftables-20140118.orig/Makefile.rules.in nftables-20140118/Makefile.rules.in
---- nftables-20140118.orig/Makefile.rules.in 2014-01-17 22:28:00.000000000 -0700
-+++ nftables-20140118/Makefile.rules.in 2014-01-18 15:27:45.759000000 -0700
-@@ -37,7 +37,7 @@
-
- %.8: %.xml $(makedeps)
- @echo -e " MAN\t\t$@"
-- (cd $(SUBDIR); docbook2x-man ../$<)
-+ (cd $(SUBDIR); db2x_docbook2man ../$<)
-
- %.pdf: %.xml $(makedeps)
- @echo -e " PDF\t\t$@"
diff --git a/noip/noip.nm b/noip/noip.nm
deleted file mode 100644
index ff23279..0000000
--- a/noip/noip.nm
+++ /dev/null
@@ -1,41 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = noip
-version = 2.1.7
-release = 1
-
-groups = System/Daemons
-url = http://www.no-ip.com
-license = GPLv2+
-summary = A dynamic DNS update client.
-
-description
- Keep your current IP address in sync with your No-IP host or domain
- with this Dynamic Update Client (DUC). The client continually checks
- for IP address changes in the background and automatically updates
- the DNS at No-IP whenever it changes.
-end
-
-source_dl =
-
-build
- make_build_targets +=\
- PREFIX=/usr \
- CONFDIR=/etc
-
- install
- mkdir -pv %{BUILDROOT}/usr/bin
- cp noip2 %{BUILDROOT}/usr/bin/noip2
- end
-end
-
-packages
- package %{name}
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 4d7f5ead1657438247e1f0ce378e259cc04aef48
by git＠ipfire.org 26 Dec '14
by git＠ipfire.org 26 Dec '14
26 Dec '14
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via 4d7f5ead1657438247e1f0ce378e259cc04aef48 (commit)
from 7fae88972f04acde0f011ebc1dbfbed35e522536 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4d7f5ead1657438247e1f0ce378e259cc04aef48
Author: Erik Kapfer <erik.kapfer(a)ipfire.org>
Date: Sat Dec 6 12:48:18 2014 +0100
tmux: Add missing dependency of libevent2
Fix #10695
-----------------------------------------------------------------------
Summary of changes:
lfs/tmux | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Difference in files:
diff --git a/lfs/tmux b/lfs/tmux
index ec4cc20..ddd5384 100644
--- a/lfs/tmux
+++ b/lfs/tmux
@@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = tmux
-PAK_VER = 1
+PAK_VER = 2
-DEPS = ""
+DEPS = "libevent2"
###############################################################################
# Top-level Rules
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 7fae88972f04acde0f011ebc1dbfbed35e522536
by git＠ipfire.org 26 Dec '14
by git＠ipfire.org 26 Dec '14
26 Dec '14
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via 7fae88972f04acde0f011ebc1dbfbed35e522536 (commit)
via 66c684fa60c4ad2a6333d4bb41196c636c4748de (commit)
via 0d87efae29c14dedbd1e7623ba7b9e968bec040b (commit)
via 8cc7ba902092e8b49da402afa09fcaa3990387fd (commit)
via b097fdd66fa7e1c2252171016bfbcfa40bb2f140 (commit)
from 7168162ef13be445996ff2f65d12e5643ef0f2b2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7fae88972f04acde0f011ebc1dbfbed35e522536
Merge: 66c684f 7168162
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 26 18:01:21 2014 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
commit 66c684fa60c4ad2a6333d4bb41196c636c4748de
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 26 18:00:51 2014 +0100
Change default font to that what we use in IPFire 3
commit 0d87efae29c14dedbd1e7623ba7b9e968bec040b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 26 17:32:17 2014 +0100
setup: Update translations
commit 8cc7ba902092e8b49da402afa09fcaa3990387fd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Dec 26 17:31:37 2014 +0100
installer: Update translations
commit b097fdd66fa7e1c2252171016bfbcfa40bb2f140
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Dec 24 00:33:30 2014 +0100
installer: Improve changing language at runtime
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/kbd | 3 +
lfs/kbd | 12 +-
src/initscripts/init.d/console | 2 +-
src/installer/dracut-module/run-installer.sh | 2 +-
src/installer/main.c | 40 ++--
src/installer/po/ar.po | 197 +++++++++++-----
src/installer/po/ca.po | 197 +++++++++++-----
src/installer/po/cs_CZ.po | 197 +++++++++++-----
src/installer/po/da.po | 219 ++++++++++++------
src/installer/po/de.po | 206 ++++++++++++-----
src/installer/po/el_GR.po | 197 +++++++++++-----
src/installer/po/es.po | 197 +++++++++++-----
src/installer/po/fa.po | 221 ++++++++++++------
src/installer/po/fr.po | 197 +++++++++++-----
src/installer/po/hr.po | 329 +++++++++++++++++++++++++++
src/installer/po/hu.po | 197 +++++++++++-----
src/installer/po/id.po | 197 +++++++++++-----
src/installer/po/it.po | 299 +++++++++++++++---------
src/installer/po/ja.po | 197 +++++++++++-----
src/installer/po/{id.po => ja_JP.po} | 203 ++++++++++++-----
src/installer/po/km_KH.po | 197 +++++++++++-----
src/installer/po/nl.po | 197 +++++++++++-----
src/installer/po/pl.po | 281 +++++++++++++++--------
src/installer/po/pt_BR.po | 205 ++++++++++++-----
src/installer/po/pt_PT.po | 197 +++++++++++-----
src/installer/po/ro_RO.po | 197 +++++++++++-----
src/installer/po/ru.po | 197 +++++++++++-----
src/installer/po/{ca.po => rw.po} | 201 +++++++++++-----
src/installer/po/sk.po | 197 +++++++++++-----
src/installer/po/sq.po | 197 +++++++++++-----
src/installer/po/{ru.po => sr.po} | 203 ++++++++++++-----
src/installer/po/sv.po | 197 +++++++++++-----
src/installer/po/th.po | 197 +++++++++++-----
src/installer/po/tk.po | 197 +++++++++++-----
src/installer/po/tr.po | 295 +++++++++++++++---------
src/installer/po/uk.po | 197 +++++++++++-----
src/installer/po/uz(a)Latn.po | 197 +++++++++++-----
src/installer/po/vi.po | 197 +++++++++++-----
src/installer/po/zh.po | 197 +++++++++++-----
src/setup/po/da.po | 6 +-
src/setup/po/de.po | 6 +-
src/setup/po/fa.po | 139 +++++------
src/setup/po/fr.po | 39 ++--
src/setup/po/{da.po => hr.po} | 263 +++++++++++----------
src/setup/po/it.po | 264 ++++++++++-----------
src/setup/po/{th.po => ja_JP.po} | 8 +-
src/setup/po/pl.po | 264 ++++++++++-----------
src/setup/po/ru.po | 79 +++----
src/setup/po/{nl.po => rw.po} | 8 +-
src/setup/po/{uk.po => sr.po} | 8 +-
src/setup/po/tr.po | 263 ++++++++++-----------
51 files changed, 5915 insertions(+), 2684 deletions(-)
create mode 100644 src/installer/po/hr.po
copy src/installer/po/{id.po => ja_JP.po} (55%)
copy src/installer/po/{ca.po => rw.po} (57%)
copy src/installer/po/{ru.po => sr.po} (56%)
copy src/setup/po/{da.po => hr.po} (61%)
copy src/setup/po/{th.po => ja_JP.po} (98%)
copy src/setup/po/{nl.po => rw.po} (98%)
copy src/setup/po/{uk.po => sr.po} (98%)
Difference in files:
diff --git a/config/rootfiles/common/kbd b/config/rootfiles/common/kbd
index 7b6ccc3..5f694ff 100644
--- a/config/rootfiles/common/kbd
+++ b/config/rootfiles/common/kbd
@@ -137,6 +137,7 @@ lib/kbd/consolefonts/iso07u-16.psfu.gz
#lib/kbd/consolefonts/lat0-12.psfu.gz
#lib/kbd/consolefonts/lat0-14.psfu.gz
lib/kbd/consolefonts/lat0-16.psfu.gz
+lib/kbd/consolefonts/lat0-sun16.psfu.gz
#lib/kbd/consolefonts/lat1-08.psfu.gz
#lib/kbd/consolefonts/lat1-10.psfu.gz
#lib/kbd/consolefonts/lat1-12.psfu.gz
@@ -147,6 +148,7 @@ lib/kbd/consolefonts/lat1-16.psfu.gz
#lib/kbd/consolefonts/lat2-12.psfu.gz
#lib/kbd/consolefonts/lat2-14.psfu.gz
lib/kbd/consolefonts/lat2-16.psfu.gz
+lib/kbd/consolefonts/lat2-sun16.psfu.gz
#lib/kbd/consolefonts/lat2a-16.psfu.gz
#lib/kbd/consolefonts/lat4-08.psfu.gz
#lib/kbd/consolefonts/lat4-10.psfu.gz
@@ -188,6 +190,7 @@ lib/kbd/consolefonts/lat5-16.psfu.gz
#lib/kbd/consolefonts/lat9w-12.psfu.gz
#lib/kbd/consolefonts/lat9w-14.psfu.gz
#lib/kbd/consolefonts/lat9w-16.psfu.gz
+lib/kbd/consolefonts/latarcyrheb-sun16.psfu.gz
#lib/kbd/consolefonts/partialfonts
#lib/kbd/consolefonts/partialfonts/8859-1.a0-ff.08.gz
#lib/kbd/consolefonts/partialfonts/8859-1.a0-ff.14.gz
diff --git a/lfs/kbd b/lfs/kbd
index 1c99242..bb9d261 100644
--- a/lfs/kbd
+++ b/lfs/kbd
@@ -35,13 +35,18 @@ TARGET = $(DIR_INFO)/$(THISAPP)
###############################################################################
# Top-level Rules
###############################################################################
-objects = $(DL_FILE) $(THISAPP)-more-programs-1.patch
+objects = $(DL_FILE) $(THISAPP)-more-programs-1.patch \
+ kbd-latarcyrheb-16-fixed.tar.bz2 kbd-latsun-fonts.tar.bz2
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(THISAPP)-more-programs-1.patch = $(DL_FROM)/kbd-$(VER)-more-programs-1.patch
+kbd-latarcyrheb-16-fixed.tar.bz2 = $(DL_FROM)/kbd-latarcyrheb-16-fixed.tar.bz2
+kbd-latsun-fonts.tar.bz2 = $(DL_FROM)/kbd-latsun-fonts.tar.bz2
$(DL_FILE)_MD5 = 069d1175b4891343b107a8ac2b4a39f6
$(THISAPP)-more-programs-1.patch_MD5 = dc70180a6bc0afa2b741cd38e3cc2e18
+kbd-latarcyrheb-16-fixed.tar.bz2_MD5 = 884fdbb0b952b2e3e8389a0c40a3e301
+kbd-latsun-fonts.tar.bz2_MD5 = e22ee88353968df8d4a4b1bf1fa8fc31
install : $(TARGET)
@@ -74,6 +79,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-more-programs-1.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-backspace-1.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gcc4_fixes-1.patch
+
+ # Extract our own fonts
+ cd $(DIR_APP) && tar xvfa $(DIR_DL)/kbd-latarcyrheb-16-fixed.tar.bz2
+ cd $(DIR_APP) && tar xvfa $(DIR_DL)/kbd-latsun-fonts.tar.bz2
+
cd $(DIR_APP) && ./configure --datadir=/lib/kbd --disable-nls
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
diff --git a/src/initscripts/init.d/console b/src/initscripts/init.d/console
index 7381a69..8757b4d 100644
--- a/src/initscripts/init.d/console
+++ b/src/initscripts/init.d/console
@@ -17,7 +17,7 @@
. ${rc_functions}
eval $(/usr/local/bin/readhash /var/ipfire/main/settings)
-FONT="LatArCyrHeb-16"
+FONT="latarcyrheb-sun16"
KEYMAP_CORRECTIONS="euro2"
UNICODE="1"
BROKEN_COMPOSE="0"
diff --git a/src/installer/dracut-module/run-installer.sh b/src/installer/dracut-module/run-installer.sh
index ea9669a..33c8c4b 100644
--- a/src/installer/dracut-module/run-installer.sh
+++ b/src/installer/dracut-module/run-installer.sh
@@ -12,7 +12,7 @@ fi
echo -en '\033%G' && kbd_mode -u
# Load default console font
-setfont LatArCyrHeb-16
+setfont latarcyrheb-sun16
# Silence the kernel
echo >/proc/sys/kernel/printk "1 4 1 7"
diff --git a/src/installer/main.c b/src/installer/main.c
index d02db28..ab2cb89 100644
--- a/src/installer/main.c
+++ b/src/installer/main.c
@@ -233,23 +233,26 @@ static char* center_string(const char* str, int width) {
return string;
}
-#define DEFAULT_LANG "English"
-#define NUM_LANGS 10
+#define DEFAULT_LANG "en_US.utf8"
+#define NUM_LANGS 13
static struct lang {
const char* code;
char* name;
} languages[NUM_LANGS + 1] = {
- { "da.utf8", "Danish (Dansk)" },
- { "nl_NL.utf8", "Dutch (Nederlands)" },
- { "en_US.utf8", "English" },
- { "fr_FR.utf8", "French (Français)" },
- { "de_DE.utf8", "German (Deutsch)" },
- { "pl_PL.utf8", "Polish (Polski)" },
- { "pt_BR.utf8", "Portuguese (Brasil)" },
- { "ru_RU.utf8", "Russian (Русский)" },
- { "es_ES.utf8", "Spanish (Español)" },
- { "tr_TR.utf8", "Turkish (Türkçe)" },
+ { "fa.utf8", "فارسی (Persian)" },
+ { "da.utf8", "Dansk (Danish)" },
+ { "es.utf8", "Español (Spanish)" },
+ { "en.utf8", "English" },
+ { "fr.utf8", "Français (French)" },
+ { "hr.utf8", "Hrvatski (Croatian)" },
+ { "it.utf8", "Italiano (Italian)" },
+ { "de.utf8", "Deutsch (German)" },
+ { "nl.utf8", "Nederlands (Dutch)" },
+ { "pl.utf8", "Polski (Polish)" },
+ { "pt.utf8", "Portuguese (Brasil)" },
+ { "ru.utf8", "Русский (Russian)" },
+ { "tr.utf8", "Türkçe (Turkish)" },
{ NULL, NULL },
};
@@ -261,6 +264,7 @@ static struct config {
int disable_swap;
char download_url[STRING_SIZE];
char postinstall[STRING_SIZE];
+ char* language;
} config = {
.unattended = 0,
.serial_console = 0,
@@ -269,6 +273,7 @@ static struct config {
.disable_swap = 0,
.download_url = DOWNLOAD_URL,
.postinstall = "\0",
+ .language = DEFAULT_LANG,
};
static void parse_command_line(struct config* c) {
@@ -340,7 +345,6 @@ int main(int argc, char *argv[]) {
int rc = 0;
char commandstring[STRING_SIZE];
int choice;
- char language[STRING_SIZE];
char message[STRING_SIZE];
char title[STRING_SIZE];
int allok = 0;
@@ -393,7 +397,7 @@ int main(int argc, char *argv[]) {
char* langnames[NUM_LANGS + 1];
for (unsigned int i = 0; i < NUM_LANGS; i++) {
- if (strcmp(languages[i].name, DEFAULT_LANG) == 0)
+ if (strcmp(languages[i].code, DEFAULT_LANG) == 0)
choice = i;
langnames[i] = languages[i].name;
@@ -406,10 +410,10 @@ int main(int argc, char *argv[]) {
assert(choice <= NUM_LANGS);
fprintf(flog, "Selected language: %s (%s)\n", languages[choice].name, languages[choice].code);
- snprintf(language, sizeof(language), "%s", languages[choice].code);
+ config.language = languages[choice].code;
- setenv("LANGUAGE", language, 1);
- setlocale(LC_ALL, language);
+ setlocale(LC_ALL, config.language);
+ setenv("LANGUAGE", config.language, 1);
}
// Set helpline
@@ -770,7 +774,7 @@ int main(int argc, char *argv[]) {
}
/* Save language und local settings */
- write_lang_configs(language);
+ write_lang_configs(config.language);
/* Build cache lang file */
snprintf(commandstring, STRING_SIZE, "/usr/sbin/chroot /harddisk /usr/bin/perl -e \"require '" CONFIG_ROOT "/lang.pl'; &Lang::BuildCacheLang\"");
diff --git a/src/installer/po/ar.po b/src/installer/po/ar.po
index a10146e..b138c96 100644
--- a/src/installer/po/ar.po
+++ b/src/installer/po/ar.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/ipfire/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,40 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
msgid "OK"
msgstr ""
-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
msgid "Cancel"
msgstr ""
-#: main.c:145
+#: main.c:176
msgid "I accept this license"
msgstr ""
-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
msgid "Language selection"
msgstr ""
-#: main.c:312
+#: main.c:403
msgid "Select the language you wish to use for the installation."
msgstr ""
-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr ""
-#: main.c:328
+#: main.c:426
#, c-format
msgid ""
"Welcome to the %s installation program.\n"
@@ -49,53 +58,104 @@ msgid ""
"Selecting Cancel on any of the following screens will reboot the computer."
msgstr ""
-#: main.c:330
+#: main.c:428
msgid "Start installation"
msgstr ""
-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr ""
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
msgstr ""
-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:501
+msgid "Downloading installation image..."
msgstr ""
-#: main.c:342
-msgid "Download error"
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
msgstr ""
-#: main.c:376
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr ""
+
+#: main.c:543
msgid "License Agreement"
msgstr ""
-#: main.c:377
+#: main.c:544
msgid "License not accepted!"
msgstr ""
-#: main.c:399
+#: main.c:566
msgid "No hard disk found."
msgstr ""
-#: main.c:418
+#: main.c:587
msgid "Disk Selection"
msgstr ""
-#: main.c:419
+#: main.c:588
msgid ""
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
"\n"
"ALL DATA ON THE DISK WILL BE DESTROYED."
msgstr ""
-#: main.c:430
+#: main.c:599
msgid ""
"No disk has been selected.\n"
"\n"
"Please select one or more disks you want to install IPFire on."
msgstr ""
-#: main.c:443
+#: main.c:617
#, c-format
msgid ""
"The installation program will now prepare the chosen harddisk:\n"
@@ -105,15 +165,15 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:445
+#: main.c:619
msgid "Disk Setup"
msgstr ""
-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
msgid "Delete all data"
msgstr ""
-#: main.c:453
+#: main.c:627
#, c-format
msgid ""
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -124,104 +184,131 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:455
+#: main.c:629
msgid "RAID Setup"
msgstr ""
-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
msgstr ""
-#: main.c:480
+#: main.c:655
msgid "Your harddisk is too small."
msgstr ""
-#: main.c:494
+#: main.c:671
msgid ""
"Your harddisk is very small, but you can continue without a swap partition."
msgstr ""
-#: main.c:506
+#: main.c:684
msgid "ext4 Filesystem"
msgstr ""
-#: main.c:507
+#: main.c:685
msgid "ext4 Filesystem without journal"
msgstr ""
-#: main.c:508
+#: main.c:686
msgid "XFS Filesystem"
msgstr ""
-#: main.c:509
+#: main.c:687
msgid "ReiserFS Filesystem"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Filesystem Selection"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Please choose your filesystem:"
msgstr ""
-#: main.c:534
+#: main.c:712
msgid "Building RAID..."
msgstr ""
-#: main.c:538
+#: main.c:716
msgid "Unable to build the RAID."
msgstr ""
-#: main.c:550
+#: main.c:728
msgid "Partitioning disk..."
msgstr ""
-#: main.c:554
+#: main.c:732
msgid "Unable to partition the disk."
msgstr ""
-#: main.c:561
+#: main.c:739
msgid "Creating filesystems..."
msgstr ""
-#: main.c:565
+#: main.c:743
msgid "Unable to create filesystems."
msgstr ""
-#: main.c:571
+#: main.c:749
msgid "Unable to mount filesystems."
msgstr ""
-#: main.c:582
+#: main.c:760
msgid "Installing the system..."
msgstr ""
-#: main.c:583
+#: main.c:761
msgid "Unable to install the system."
msgstr ""
-#: main.c:599
+#: main.c:777
msgid "Installing the language cache..."
msgstr ""
-#: main.c:600
+#: main.c:778
msgid "Unable to install the language cache."
msgstr ""
-#: main.c:605
+#: main.c:783
msgid "Installing the bootloader..."
msgstr ""
-#: main.c:612
+#: main.c:790
msgid "Unable to open /etc/default/grub for writing."
msgstr ""
-#: main.c:634
+#: main.c:812
msgid "Unable to install the bootloader."
msgstr ""
-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
#, c-format
msgid ""
"%s was successfully installed!\n"
@@ -229,14 +316,14 @@ msgid ""
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Congratulations!"
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Reboot"
msgstr ""
-#: main.c:682
+#: main.c:893
msgid "Setup has failed. Press Ok to reboot."
msgstr ""
diff --git a/src/installer/po/ca.po b/src/installer/po/ca.po
index 54e3699..a7d97cf 100644
--- a/src/installer/po/ca.po
+++ b/src/installer/po/ca.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/ipfire/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,40 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
msgid "OK"
msgstr ""
-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
msgid "Cancel"
msgstr ""
-#: main.c:145
+#: main.c:176
msgid "I accept this license"
msgstr ""
-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
msgid "Language selection"
msgstr ""
-#: main.c:312
+#: main.c:403
msgid "Select the language you wish to use for the installation."
msgstr ""
-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr ""
-#: main.c:328
+#: main.c:426
#, c-format
msgid ""
"Welcome to the %s installation program.\n"
@@ -49,53 +58,104 @@ msgid ""
"Selecting Cancel on any of the following screens will reboot the computer."
msgstr ""
-#: main.c:330
+#: main.c:428
msgid "Start installation"
msgstr ""
-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr ""
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
msgstr ""
-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:501
+msgid "Downloading installation image..."
msgstr ""
-#: main.c:342
-msgid "Download error"
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
msgstr ""
-#: main.c:376
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr ""
+
+#: main.c:543
msgid "License Agreement"
msgstr ""
-#: main.c:377
+#: main.c:544
msgid "License not accepted!"
msgstr ""
-#: main.c:399
+#: main.c:566
msgid "No hard disk found."
msgstr ""
-#: main.c:418
+#: main.c:587
msgid "Disk Selection"
msgstr ""
-#: main.c:419
+#: main.c:588
msgid ""
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
"\n"
"ALL DATA ON THE DISK WILL BE DESTROYED."
msgstr ""
-#: main.c:430
+#: main.c:599
msgid ""
"No disk has been selected.\n"
"\n"
"Please select one or more disks you want to install IPFire on."
msgstr ""
-#: main.c:443
+#: main.c:617
#, c-format
msgid ""
"The installation program will now prepare the chosen harddisk:\n"
@@ -105,15 +165,15 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:445
+#: main.c:619
msgid "Disk Setup"
msgstr ""
-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
msgid "Delete all data"
msgstr ""
-#: main.c:453
+#: main.c:627
#, c-format
msgid ""
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -124,104 +184,131 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:455
+#: main.c:629
msgid "RAID Setup"
msgstr ""
-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
msgstr ""
-#: main.c:480
+#: main.c:655
msgid "Your harddisk is too small."
msgstr ""
-#: main.c:494
+#: main.c:671
msgid ""
"Your harddisk is very small, but you can continue without a swap partition."
msgstr ""
-#: main.c:506
+#: main.c:684
msgid "ext4 Filesystem"
msgstr ""
-#: main.c:507
+#: main.c:685
msgid "ext4 Filesystem without journal"
msgstr ""
-#: main.c:508
+#: main.c:686
msgid "XFS Filesystem"
msgstr ""
-#: main.c:509
+#: main.c:687
msgid "ReiserFS Filesystem"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Filesystem Selection"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Please choose your filesystem:"
msgstr ""
-#: main.c:534
+#: main.c:712
msgid "Building RAID..."
msgstr ""
-#: main.c:538
+#: main.c:716
msgid "Unable to build the RAID."
msgstr ""
-#: main.c:550
+#: main.c:728
msgid "Partitioning disk..."
msgstr ""
-#: main.c:554
+#: main.c:732
msgid "Unable to partition the disk."
msgstr ""
-#: main.c:561
+#: main.c:739
msgid "Creating filesystems..."
msgstr ""
-#: main.c:565
+#: main.c:743
msgid "Unable to create filesystems."
msgstr ""
-#: main.c:571
+#: main.c:749
msgid "Unable to mount filesystems."
msgstr ""
-#: main.c:582
+#: main.c:760
msgid "Installing the system..."
msgstr ""
-#: main.c:583
+#: main.c:761
msgid "Unable to install the system."
msgstr ""
-#: main.c:599
+#: main.c:777
msgid "Installing the language cache..."
msgstr ""
-#: main.c:600
+#: main.c:778
msgid "Unable to install the language cache."
msgstr ""
-#: main.c:605
+#: main.c:783
msgid "Installing the bootloader..."
msgstr ""
-#: main.c:612
+#: main.c:790
msgid "Unable to open /etc/default/grub for writing."
msgstr ""
-#: main.c:634
+#: main.c:812
msgid "Unable to install the bootloader."
msgstr ""
-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
#, c-format
msgid ""
"%s was successfully installed!\n"
@@ -229,14 +316,14 @@ msgid ""
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Congratulations!"
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Reboot"
msgstr ""
-#: main.c:682
+#: main.c:893
msgid "Setup has failed. Press Ok to reboot."
msgstr ""
diff --git a/src/installer/po/cs_CZ.po b/src/installer/po/cs_CZ.po
index 101c98d..4cfc7aa 100644
--- a/src/installer/po/cs_CZ.po
+++ b/src/installer/po/cs_CZ.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/ipfire/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,40 @@ msgstr ""
"Language: cs_CZ\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
msgid "OK"
msgstr ""
-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
msgid "Cancel"
msgstr ""
-#: main.c:145
+#: main.c:176
msgid "I accept this license"
msgstr ""
-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
msgid "Language selection"
msgstr ""
-#: main.c:312
+#: main.c:403
msgid "Select the language you wish to use for the installation."
msgstr ""
-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr ""
-#: main.c:328
+#: main.c:426
#, c-format
msgid ""
"Welcome to the %s installation program.\n"
@@ -49,53 +58,104 @@ msgid ""
"Selecting Cancel on any of the following screens will reboot the computer."
msgstr ""
-#: main.c:330
+#: main.c:428
msgid "Start installation"
msgstr ""
-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr ""
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
msgstr ""
-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:501
+msgid "Downloading installation image..."
msgstr ""
-#: main.c:342
-msgid "Download error"
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
msgstr ""
-#: main.c:376
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr ""
+
+#: main.c:543
msgid "License Agreement"
msgstr ""
-#: main.c:377
+#: main.c:544
msgid "License not accepted!"
msgstr ""
-#: main.c:399
+#: main.c:566
msgid "No hard disk found."
msgstr ""
-#: main.c:418
+#: main.c:587
msgid "Disk Selection"
msgstr ""
-#: main.c:419
+#: main.c:588
msgid ""
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
"\n"
"ALL DATA ON THE DISK WILL BE DESTROYED."
msgstr ""
-#: main.c:430
+#: main.c:599
msgid ""
"No disk has been selected.\n"
"\n"
"Please select one or more disks you want to install IPFire on."
msgstr ""
-#: main.c:443
+#: main.c:617
#, c-format
msgid ""
"The installation program will now prepare the chosen harddisk:\n"
@@ -105,15 +165,15 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:445
+#: main.c:619
msgid "Disk Setup"
msgstr ""
-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
msgid "Delete all data"
msgstr ""
-#: main.c:453
+#: main.c:627
#, c-format
msgid ""
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -124,104 +184,131 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:455
+#: main.c:629
msgid "RAID Setup"
msgstr ""
-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
msgstr ""
-#: main.c:480
+#: main.c:655
msgid "Your harddisk is too small."
msgstr ""
-#: main.c:494
+#: main.c:671
msgid ""
"Your harddisk is very small, but you can continue without a swap partition."
msgstr ""
-#: main.c:506
+#: main.c:684
msgid "ext4 Filesystem"
msgstr ""
-#: main.c:507
+#: main.c:685
msgid "ext4 Filesystem without journal"
msgstr ""
-#: main.c:508
+#: main.c:686
msgid "XFS Filesystem"
msgstr ""
-#: main.c:509
+#: main.c:687
msgid "ReiserFS Filesystem"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Filesystem Selection"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Please choose your filesystem:"
msgstr ""
-#: main.c:534
+#: main.c:712
msgid "Building RAID..."
msgstr ""
-#: main.c:538
+#: main.c:716
msgid "Unable to build the RAID."
msgstr ""
-#: main.c:550
+#: main.c:728
msgid "Partitioning disk..."
msgstr ""
-#: main.c:554
+#: main.c:732
msgid "Unable to partition the disk."
msgstr ""
-#: main.c:561
+#: main.c:739
msgid "Creating filesystems..."
msgstr ""
-#: main.c:565
+#: main.c:743
msgid "Unable to create filesystems."
msgstr ""
-#: main.c:571
+#: main.c:749
msgid "Unable to mount filesystems."
msgstr ""
-#: main.c:582
+#: main.c:760
msgid "Installing the system..."
msgstr ""
-#: main.c:583
+#: main.c:761
msgid "Unable to install the system."
msgstr ""
-#: main.c:599
+#: main.c:777
msgid "Installing the language cache..."
msgstr ""
-#: main.c:600
+#: main.c:778
msgid "Unable to install the language cache."
msgstr ""
-#: main.c:605
+#: main.c:783
msgid "Installing the bootloader..."
msgstr ""
-#: main.c:612
+#: main.c:790
msgid "Unable to open /etc/default/grub for writing."
msgstr ""
-#: main.c:634
+#: main.c:812
msgid "Unable to install the bootloader."
msgstr ""
-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
#, c-format
msgid ""
"%s was successfully installed!\n"
@@ -229,14 +316,14 @@ msgid ""
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Congratulations!"
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Reboot"
msgstr ""
-#: main.c:682
+#: main.c:893
msgid "Setup has failed. Press Ok to reboot."
msgstr ""
diff --git a/src/installer/po/da.po b/src/installer/po/da.po
index d15c917..75918db 100644
--- a/src/installer/po/da.po
+++ b/src/installer/po/da.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/ipfire/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -18,85 +18,145 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
msgid "OK"
msgstr "OK"
-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
msgid "Cancel"
msgstr "Annuller"
-#: main.c:145
+#: main.c:176
msgid "I accept this license"
msgstr "Jeg accepterer brugerlicensen"
-#: main.c:312
-msgid "Language selection"
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
msgstr ""
-#: main.c:312
+#: main.c:403
+msgid "Language selection"
+msgstr "Vælg sprog"
+
+#: main.c:403
msgid "Select the language you wish to use for the installation."
+msgstr "Vælg det sprog du ønsker at anvende under installationen."
+
+#: main.c:418
+msgid "Unattended mode"
msgstr ""
-#: main.c:323
+#: main.c:420
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr "<Tab>/<Alt-Tab> mellem elementer | <Space> vælger | <F12> næste skærm"
-#: main.c:328
+#: main.c:426
#, c-format
msgid ""
"Welcome to the %s installation program.\n"
"\n"
"Selecting Cancel on any of the following screens will reboot the computer."
-msgstr ""
+msgstr "Velkommen til %s installationsprogram.\n\nVælg Annuller på ethvert tidspunkt for at genstarte computeren."
-#: main.c:330
+#: main.c:428
msgid "Start installation"
msgstr "Start installationen"
-#: main.c:339
-msgid "No local source media found. Starting download."
-msgstr "Fandt ikke en lokal kilde. Henter fra internettet."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr ""
-#: main.c:340
-msgid "Downloading installation image ..."
-msgstr "Henter installationsbillede ..."
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
-#: main.c:342
-msgid "Download error"
-msgstr "Fejl under hentning"
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
-#: main.c:376
-msgid "License Agreement"
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
+msgstr ""
+
+#: main.c:501
+msgid "Downloading installation image..."
+msgstr ""
+
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
+msgstr ""
+
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
msgstr ""
-#: main.c:377
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr ""
+
+#: main.c:543
+msgid "License Agreement"
+msgstr "Licensaftale"
+
+#: main.c:544
msgid "License not accepted!"
msgstr "Brugerlicensen ikke accepteret!"
-#: main.c:399
+#: main.c:566
msgid "No hard disk found."
msgstr "Fandt ikke en harddisk."
-#: main.c:418
+#: main.c:587
msgid "Disk Selection"
msgstr "Vælg harddisk"
-#: main.c:419
+#: main.c:588
msgid ""
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
"\n"
"ALL DATA ON THE DISK WILL BE DESTROYED."
msgstr "Vælg den eller de harddisk(e) du vil installere IPFire på. Diskene bliver først partitioneret og dernæst bliver der oprettet filsystemer.\n\nAL DATA PÅ DISKENE BLIVER SLETTET."
-#: main.c:430
+#: main.c:599
msgid ""
"No disk has been selected.\n"
"\n"
"Please select one or more disks you want to install IPFire on."
msgstr "Ingen harddisk valgt.\n\nVælg venligst en eller flere harddiske du vil installere IPFire på."
-#: main.c:443
+#: main.c:617
#, c-format
msgid ""
"The installation program will now prepare the chosen harddisk:\n"
@@ -106,15 +166,15 @@ msgid ""
"Do you agree to continue?"
msgstr "Installationsprogrammet forbereder nu den eller de valgte harddiske:\n\n%s\n\nVil du fortsætte?"
-#: main.c:445
+#: main.c:619
msgid "Disk Setup"
msgstr "Harddisk opsætning"
-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
msgid "Delete all data"
msgstr "Slet alle data"
-#: main.c:453
+#: main.c:627
#, c-format
msgid ""
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -125,119 +185,146 @@ msgid ""
"Do you agree to continue?"
msgstr "Installationsprogrammet vil nu opsætte RAID konfigurationen på de valgte harddiske:\n\n%s\n%s\n\nVil du fortsætte?"
-#: main.c:455
+#: main.c:629
msgid "RAID Setup"
msgstr "RAID opsætning"
-#: main.c:466
-msgid "You disk configuration is currently not supported."
-msgstr "Din harddisk konfiguration understøttes ikke pt."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
+msgstr ""
-#: main.c:480
+#: main.c:655
msgid "Your harddisk is too small."
msgstr "Din harddisk er for lille."
-#: main.c:494
+#: main.c:671
msgid ""
"Your harddisk is very small, but you can continue without a swap partition."
-msgstr ""
+msgstr "Din harddisk er meget lille, men du kan fortsætte uden en swap partition."
-#: main.c:506
+#: main.c:684
msgid "ext4 Filesystem"
msgstr "ext4 filsystem"
-#: main.c:507
+#: main.c:685
msgid "ext4 Filesystem without journal"
msgstr "ext4 filsystem uden journal"
-#: main.c:508
+#: main.c:686
msgid "XFS Filesystem"
msgstr "XFS filsystem"
-#: main.c:509
+#: main.c:687
msgid "ReiserFS Filesystem"
msgstr "ReiserFS filsystem"
-#: main.c:523
+#: main.c:701
msgid "Filesystem Selection"
msgstr "Vælg filsystem"
-#: main.c:523
+#: main.c:701
msgid "Please choose your filesystem:"
msgstr "Vælg venligst et filsystem:"
-#: main.c:534
+#: main.c:712
msgid "Building RAID..."
msgstr "Bygger RAID..."
-#: main.c:538
+#: main.c:716
msgid "Unable to build the RAID."
msgstr "Kunne ikke bygge RAID."
-#: main.c:550
+#: main.c:728
msgid "Partitioning disk..."
msgstr "Partitionerer harddisk..."
-#: main.c:554
+#: main.c:732
msgid "Unable to partition the disk."
msgstr "Kunne ikke partitionere harddisk."
-#: main.c:561
+#: main.c:739
msgid "Creating filesystems..."
msgstr "Opretter filsystemer..."
-#: main.c:565
+#: main.c:743
msgid "Unable to create filesystems."
msgstr "Kunne ikke oprette filsystemer."
-#: main.c:571
+#: main.c:749
msgid "Unable to mount filesystems."
msgstr "Kunne ikke forbinde til filsystemer."
-#: main.c:582
+#: main.c:760
msgid "Installing the system..."
msgstr "Installerer systemet..."
-#: main.c:583
+#: main.c:761
msgid "Unable to install the system."
msgstr "Kunne ikke installere systemet."
-#: main.c:599
+#: main.c:777
msgid "Installing the language cache..."
msgstr "Installerer sprog arkivet..."
-#: main.c:600
+#: main.c:778
msgid "Unable to install the language cache."
msgstr "Kunne ikke installere sprog arkivet."
-#: main.c:605
+#: main.c:783
msgid "Installing the bootloader..."
msgstr "Installerer bootloader..."
-#: main.c:612
+#: main.c:790
msgid "Unable to open /etc/default/grub for writing."
-msgstr ""
+msgstr "Kunne ikke gemme til /etc/default/grub."
-#: main.c:634
+#: main.c:812
msgid "Unable to install the bootloader."
msgstr "Kunne ikke installere bootloader."
-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
#, c-format
msgid ""
"%s was successfully installed!\n"
"\n"
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
-msgstr ""
+msgstr "%s blev installeret korrekt!\n\nFjern venligst installationsmedier fra systemet og vælg Genstart. Efter genstart bliver du bedt om at opsætte netværket og system kodeord. Efter opsætningen, besøg da https://%s:444 (eller hvad du navngav %s) fra din internet browser for at anvende web konsollen."
-#: main.c:671
+#: main.c:882
msgid "Congratulations!"
msgstr "Tillykke!"
-#: main.c:671
+#: main.c:882
msgid "Reboot"
msgstr "Genstart"
-#: main.c:682
+#: main.c:893
msgid "Setup has failed. Press Ok to reboot."
-msgstr ""
+msgstr "Installationen fejlede. Vælg Ok for at genstarte."
diff --git a/src/installer/po/de.po b/src/installer/po/de.po
index f4487a0..93893d9 100644
--- a/src/installer/po/de.po
+++ b/src/installer/po/de.po
@@ -4,14 +4,15 @@
#
# Translators:
# Michael Tremer <michael.tremer(a)ipfire.org>, 2014
+# Peter Cloudstone <rmg-mainz(a)web.de>, 2014
# Stefan Schantl <stefan.schantl(a)ipfire.org>, 2014
msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 16:04+0000\n"
-"Last-Translator: Stefan Schantl <stefan.schantl(a)ipfire.org>\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-07 15:02+0000\n"
+"Last-Translator: Peter Cloudstone <rmg-mainz(a)web.de>\n"
"Language-Team: German (http://www.transifex.com/projects/p/ipfire/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,31 +20,40 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
msgid "OK"
msgstr "OK"
-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
msgid "Cancel"
msgstr "Abbrechen"
-#: main.c:145
+#: main.c:176
msgid "I accept this license"
msgstr "Ich akzeptiere die Lizenz"
-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr "Warnung: Automatische Installation startet in 10 Sekunden..."
+
+#: main.c:403
msgid "Language selection"
msgstr "Sprachauswahl"
-#: main.c:312
+#: main.c:403
msgid "Select the language you wish to use for the installation."
msgstr "Wählen Sie die gewünschte Sprache für den Installationsprozess aus."
-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr "Automatikmodus"
+
+#: main.c:420
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr "<Tab>/<Alt-Tab> um zu wechseln | <Leertaste> wählt aus | <F12> nächster Bildschirm"
-#: main.c:328
+#: main.c:426
#, c-format
msgid ""
"Welcome to the %s installation program.\n"
@@ -51,53 +61,104 @@ msgid ""
"Selecting Cancel on any of the following screens will reboot the computer."
msgstr "Willkommen zum %s Installationsprogramm.\n\nWenn Sie auf irgendeiner der folgenden Seiten 'Abbrechen' auswählen, wird der Computer neu gestartet."
-#: main.c:330
+#: main.c:428
msgid "Start installation"
msgstr "Installation beginnen"
-#: main.c:339
-msgid "No local source media found. Starting download."
-msgstr "Kein lokales Quellmedium gefunden. Starte Download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr "Der Installer versucht nun, das Installationsimage herunterzuladen."
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr "Kein Quelllaufwerk gefunden.\n\nBitte versuchen Sie, das erforderliche Installationsabbild herunterzuladen."
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr "Bitte stellen Sie sicher, dass der Computer mit einem Netzwerk verbunden ist, danach wird das Installationsprogramm versuchen, eine IP-Adresse zu erhalten."
+
+#: main.c:460
+msgid "Download installation image"
+msgstr "Installationsabbild wird heruntergeladen"
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr "Versuche, Netzwerk (DHCP) zu starten..."
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr "Das Netzwerk konnte nicht gestartet werden, es ist aber für das Fortfahren erforderlich.\n\nBitte verbinden Sie den Computer mit einem Netzwerk mit DHCP und versuchen Sie es erneut."
+
+#: main.c:487 main.c:516
+msgid "Retry"
+msgstr "Erneut versuchen"
-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:501
+msgid "Downloading installation image..."
msgstr "Lade Installationsimage herunter..."
-#: main.c:342
-msgid "Download error"
-msgstr "Fehler beim Download"
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
+msgstr "MD5-Prüfsummen stimmen nicht überein"
-#: main.c:376
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr "Das Installationsabbild konnte nicht heruntergeladen werden.\nGrund: %s\n\n%s"
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr "Konnte %s nicht auf %s mounten:\n%s\n"
+
+#: main.c:543
msgid "License Agreement"
msgstr "Lizenzvereinbarung"
-#: main.c:377
+#: main.c:544
msgid "License not accepted!"
msgstr "Lizenz nicht akzeptiert!"
-#: main.c:399
+#: main.c:566
msgid "No hard disk found."
msgstr "Es wurde keine Festplatte gefunden."
-#: main.c:418
+#: main.c:587
msgid "Disk Selection"
msgstr "Festplattenauswahl"
-#: main.c:419
+#: main.c:588
msgid ""
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
"\n"
"ALL DATA ON THE DISK WILL BE DESTROYED."
msgstr "Wählen Sie die Festplatte(n) auf denen IPFire installiert werden soll. Diese wird/werden zuerst partitioniert und danach mit einem Dateisystem ausgestattet.\n\nSÄMTLICHE DATEN AUF DER FESTPLATTE GEHEN VERLOREN."
-#: main.c:430
+#: main.c:599
msgid ""
"No disk has been selected.\n"
"\n"
"Please select one or more disks you want to install IPFire on."
msgstr "Keine Festplatte ausgewählt.\n\nBitte wählen Sie eine oder mehrere Festplatten auf denen IPFire installiert werden soll aus."
-#: main.c:443
+#: main.c:617
#, c-format
msgid ""
"The installation program will now prepare the chosen harddisk:\n"
@@ -107,15 +168,15 @@ msgid ""
"Do you agree to continue?"
msgstr "Das Installationsprogramm wird die folgende Festplatte nun vorbereiten:\n\n%s\n\nMöchten Sie damit fortfahren?"
-#: main.c:445
+#: main.c:619
msgid "Disk Setup"
msgstr "Disk-Setup"
-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
msgid "Delete all data"
msgstr "Alle Daten löschen"
-#: main.c:453
+#: main.c:627
#, c-format
msgid ""
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -126,119 +187,146 @@ msgid ""
"Do you agree to continue?"
msgstr "Das Installationsprogramm wird nun einen RAID Verbund auf den folgenden Festplatten erstellen:\n\n%s\n%s\n\nMöchten Sie damit fortfahren?"
-#: main.c:455
+#: main.c:629
msgid "RAID Setup"
msgstr "RAID-Setup"
-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
msgstr "Die gewählte Festplattenkonstellation wird momentan nicht unterstützt."
-#: main.c:480
+#: main.c:655
msgid "Your harddisk is too small."
msgstr "Ihre Festplatte ist zu klein."
-#: main.c:494
+#: main.c:671
msgid ""
"Your harddisk is very small, but you can continue without a swap partition."
msgstr "Die gewählte Festplatte ist sehr klein, die Installation kann aber ohne Swap Partition fortgesetzt werden."
-#: main.c:506
+#: main.c:684
msgid "ext4 Filesystem"
msgstr "ext4-Dateisystem"
-#: main.c:507
+#: main.c:685
msgid "ext4 Filesystem without journal"
msgstr "ext4-Dateisystem ohne Journal"
-#: main.c:508
+#: main.c:686
msgid "XFS Filesystem"
msgstr "XFS-Dateisystem"
-#: main.c:509
+#: main.c:687
msgid "ReiserFS Filesystem"
msgstr "ReiserFS-Dateisystem"
-#: main.c:523
+#: main.c:701
msgid "Filesystem Selection"
msgstr "Dateisystemauswahl"
-#: main.c:523
+#: main.c:701
msgid "Please choose your filesystem:"
msgstr "Bitte wählen Sie ein Dateisystem:"
-#: main.c:534
+#: main.c:712
msgid "Building RAID..."
msgstr "Erstelle RAID..."
-#: main.c:538
+#: main.c:716
msgid "Unable to build the RAID."
msgstr "Das RAID konnte nicht erstellt werden."
-#: main.c:550
+#: main.c:728
msgid "Partitioning disk..."
msgstr "Partitioniere die Festplatte..."
-#: main.c:554
+#: main.c:732
msgid "Unable to partition the disk."
msgstr "Die Festplatte konnte nicht partitioniert werden."
-#: main.c:561
+#: main.c:739
msgid "Creating filesystems..."
msgstr "Erstelle Dateisysteme..."
-#: main.c:565
+#: main.c:743
msgid "Unable to create filesystems."
msgstr "Die Dateisysteme konnten nicht erstellt werden."
-#: main.c:571
+#: main.c:749
msgid "Unable to mount filesystems."
msgstr "Die Dateisysteme konnten nicht eingehangen werden."
-#: main.c:582
+#: main.c:760
msgid "Installing the system..."
msgstr "Installiere das System..."
-#: main.c:583
+#: main.c:761
msgid "Unable to install the system."
msgstr "Das System konnte nicht installiert werden."
-#: main.c:599
+#: main.c:777
msgid "Installing the language cache..."
msgstr "Installiere den Sprachdateicache..."
-#: main.c:600
+#: main.c:778
msgid "Unable to install the language cache."
msgstr "Der Sprachdateicache konnte nicht erstellt werden."
-#: main.c:605
+#: main.c:783
msgid "Installing the bootloader..."
msgstr "Installiere den Bootloader..."
-#: main.c:612
+#: main.c:790
msgid "Unable to open /etc/default/grub for writing."
msgstr "/etc/default/grub konnte nicht geschrieben werden."
-#: main.c:634
+#: main.c:812
msgid "Unable to install the bootloader."
msgstr "Der Bootloader konnte nicht installiert werden."
-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr "Eine Sicherungskopie wurde auf dem Installationsmedium gefunden.\n\nMöchten Sie die Sicherungskopie wiederherstellen?"
+
+#: main.c:827
+msgid "Yes"
+msgstr "Ja"
+
+#: main.c:827
+msgid "No"
+msgstr "Nein"
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr "Bei der Wiederherstellung der Sicherungskopie trat ein Fehler auf."
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr "Führe Post-Installations-Skripte aus..."
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr "Post-Installations-Skript fehlgeschlagen."
+
+#: main.c:877
#, c-format
msgid ""
"%s was successfully installed!\n"
"\n"
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
-msgstr "%s wurde erfolgreich installiert.\n\nEntfernen Sie bitte alle Installionsmedian aus dem Computer und drücken Sie den \"Neustarten\" Knopf . \n\nNach dem erfolgten Neustart wird das Setup-Programm gestartet, in dem Sie Netzwerkkarten und die Systempasswörter konfigurieren können. Sobald dies fertiggestellt ist, können Sie in Ihrem Webbrowser die Weboberfläche mit https://%s:444 (oder welchen Namen Sie Ihrem %s auch immer gegeben haben) erreichen."
+msgstr "%s wurde erfolgreich installiert.\n\nEntfernen Sie bitte alle Installionsmedien aus dem Computer und drücken Sie \"Neustarten\". \n\nNach dem erfolgten Neustart wird das Setup-Programm gestartet, in dem Sie Netzwerkkarten und die Systempasswörter konfigurieren können. Sobald dies fertiggestellt ist, können Sie in Ihrem Webbrowser die Weboberfläche über https://%s:444 (oder welchen Namen Sie Ihrem %s auch immer gegeben haben) erreichen."
-#: main.c:671
+#: main.c:882
msgid "Congratulations!"
msgstr "Herzlichen Glückwunsch!"
-#: main.c:671
+#: main.c:882
msgid "Reboot"
msgstr "Neustarten"
-#: main.c:682
+#: main.c:893
msgid "Setup has failed. Press Ok to reboot."
msgstr "Installation fehlgeschlagen. Drücken Sie \"OK\" für einen Neustart des Systems."
diff --git a/src/installer/po/el_GR.po b/src/installer/po/el_GR.po
index d27fe7b..cf5ec2b 100644
--- a/src/installer/po/el_GR.po
+++ b/src/installer/po/el_GR.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
"Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/ipfire/language/el_GR/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,40 @@ msgstr ""
"Language: el_GR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
msgid "OK"
msgstr ""
-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
msgid "Cancel"
msgstr ""
-#: main.c:145
+#: main.c:176
msgid "I accept this license"
msgstr ""
-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
msgid "Language selection"
msgstr ""
-#: main.c:312
+#: main.c:403
msgid "Select the language you wish to use for the installation."
msgstr ""
-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr ""
-#: main.c:328
+#: main.c:426
#, c-format
msgid ""
"Welcome to the %s installation program.\n"
@@ -49,53 +58,104 @@ msgid ""
"Selecting Cancel on any of the following screens will reboot the computer."
msgstr ""
-#: main.c:330
+#: main.c:428
msgid "Start installation"
msgstr ""
-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr ""
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
msgstr ""
-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:501
+msgid "Downloading installation image..."
msgstr ""
-#: main.c:342
-msgid "Download error"
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
msgstr ""
-#: main.c:376
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr ""
+
+#: main.c:543
msgid "License Agreement"
msgstr ""
-#: main.c:377
+#: main.c:544
msgid "License not accepted!"
msgstr ""
-#: main.c:399
+#: main.c:566
msgid "No hard disk found."
msgstr ""
-#: main.c:418
+#: main.c:587
msgid "Disk Selection"
msgstr ""
-#: main.c:419
+#: main.c:588
msgid ""
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
"\n"
"ALL DATA ON THE DISK WILL BE DESTROYED."
msgstr ""
-#: main.c:430
+#: main.c:599
msgid ""
"No disk has been selected.\n"
"\n"
"Please select one or more disks you want to install IPFire on."
msgstr ""
-#: main.c:443
+#: main.c:617
#, c-format
msgid ""
"The installation program will now prepare the chosen harddisk:\n"
@@ -105,15 +165,15 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:445
+#: main.c:619
msgid "Disk Setup"
msgstr ""
-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
msgid "Delete all data"
msgstr ""
-#: main.c:453
+#: main.c:627
#, c-format
msgid ""
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -124,104 +184,131 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:455
+#: main.c:629
msgid "RAID Setup"
msgstr ""
-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
msgstr ""
-#: main.c:480
+#: main.c:655
msgid "Your harddisk is too small."
msgstr ""
-#: main.c:494
+#: main.c:671
msgid ""
"Your harddisk is very small, but you can continue without a swap partition."
msgstr ""
-#: main.c:506
+#: main.c:684
msgid "ext4 Filesystem"
msgstr ""
-#: main.c:507
+#: main.c:685
msgid "ext4 Filesystem without journal"
msgstr ""
-#: main.c:508
+#: main.c:686
msgid "XFS Filesystem"
msgstr ""
-#: main.c:509
+#: main.c:687
msgid "ReiserFS Filesystem"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Filesystem Selection"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Please choose your filesystem:"
msgstr ""
-#: main.c:534
+#: main.c:712
msgid "Building RAID..."
msgstr ""
-#: main.c:538
+#: main.c:716
msgid "Unable to build the RAID."
msgstr ""
-#: main.c:550
+#: main.c:728
msgid "Partitioning disk..."
msgstr ""
-#: main.c:554
+#: main.c:732
msgid "Unable to partition the disk."
msgstr ""
-#: main.c:561
+#: main.c:739
msgid "Creating filesystems..."
msgstr ""
-#: main.c:565
+#: main.c:743
msgid "Unable to create filesystems."
msgstr ""
-#: main.c:571
+#: main.c:749
msgid "Unable to mount filesystems."
msgstr ""
-#: main.c:582
+#: main.c:760
msgid "Installing the system..."
msgstr ""
-#: main.c:583
+#: main.c:761
msgid "Unable to install the system."
msgstr ""
-#: main.c:599
+#: main.c:777
msgid "Installing the language cache..."
msgstr ""
-#: main.c:600
+#: main.c:778
msgid "Unable to install the language cache."
msgstr ""
-#: main.c:605
+#: main.c:783
msgid "Installing the bootloader..."
msgstr ""
-#: main.c:612
+#: main.c:790
msgid "Unable to open /etc/default/grub for writing."
msgstr ""
-#: main.c:634
+#: main.c:812
msgid "Unable to install the bootloader."
msgstr ""
-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
#, c-format
msgid ""
"%s was successfully installed!\n"
@@ -229,14 +316,14 @@ msgid ""
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Congratulations!"
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Reboot"
msgstr ""
-#: main.c:682
+#: main.c:893
msgid "Setup has failed. Press Ok to reboot."
msgstr ""
diff --git a/src/installer/po/es.po b/src/installer/po/es.po
index d4812af..d58cee8 100644
--- a/src/installer/po/es.po
+++ b/src/installer/po/es.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/ipfire/language/es/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,40 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
msgid "OK"
msgstr ""
-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
msgid "Cancel"
msgstr ""
-#: main.c:145
+#: main.c:176
msgid "I accept this license"
msgstr ""
-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
msgid "Language selection"
msgstr ""
-#: main.c:312
+#: main.c:403
msgid "Select the language you wish to use for the installation."
msgstr ""
-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr ""
-#: main.c:328
+#: main.c:426
#, c-format
msgid ""
"Welcome to the %s installation program.\n"
@@ -49,53 +58,104 @@ msgid ""
"Selecting Cancel on any of the following screens will reboot the computer."
msgstr ""
-#: main.c:330
+#: main.c:428
msgid "Start installation"
msgstr ""
-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr ""
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
msgstr ""
-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:501
+msgid "Downloading installation image..."
msgstr ""
-#: main.c:342
-msgid "Download error"
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
msgstr ""
-#: main.c:376
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr ""
+
+#: main.c:543
msgid "License Agreement"
msgstr ""
-#: main.c:377
+#: main.c:544
msgid "License not accepted!"
msgstr ""
-#: main.c:399
+#: main.c:566
msgid "No hard disk found."
msgstr ""
-#: main.c:418
+#: main.c:587
msgid "Disk Selection"
msgstr ""
-#: main.c:419
+#: main.c:588
msgid ""
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
"\n"
"ALL DATA ON THE DISK WILL BE DESTROYED."
msgstr ""
-#: main.c:430
+#: main.c:599
msgid ""
"No disk has been selected.\n"
"\n"
"Please select one or more disks you want to install IPFire on."
msgstr ""
-#: main.c:443
+#: main.c:617
#, c-format
msgid ""
"The installation program will now prepare the chosen harddisk:\n"
@@ -105,15 +165,15 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:445
+#: main.c:619
msgid "Disk Setup"
msgstr ""
-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
msgid "Delete all data"
msgstr ""
-#: main.c:453
+#: main.c:627
#, c-format
msgid ""
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -124,104 +184,131 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:455
+#: main.c:629
msgid "RAID Setup"
msgstr ""
-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
msgstr ""
-#: main.c:480
+#: main.c:655
msgid "Your harddisk is too small."
msgstr ""
-#: main.c:494
+#: main.c:671
msgid ""
"Your harddisk is very small, but you can continue without a swap partition."
msgstr ""
-#: main.c:506
+#: main.c:684
msgid "ext4 Filesystem"
msgstr ""
-#: main.c:507
+#: main.c:685
msgid "ext4 Filesystem without journal"
msgstr ""
-#: main.c:508
+#: main.c:686
msgid "XFS Filesystem"
msgstr ""
-#: main.c:509
+#: main.c:687
msgid "ReiserFS Filesystem"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Filesystem Selection"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Please choose your filesystem:"
msgstr ""
-#: main.c:534
+#: main.c:712
msgid "Building RAID..."
msgstr ""
-#: main.c:538
+#: main.c:716
msgid "Unable to build the RAID."
msgstr ""
-#: main.c:550
+#: main.c:728
msgid "Partitioning disk..."
msgstr ""
-#: main.c:554
+#: main.c:732
msgid "Unable to partition the disk."
msgstr ""
-#: main.c:561
+#: main.c:739
msgid "Creating filesystems..."
msgstr ""
-#: main.c:565
+#: main.c:743
msgid "Unable to create filesystems."
msgstr ""
-#: main.c:571
+#: main.c:749
msgid "Unable to mount filesystems."
msgstr ""
-#: main.c:582
+#: main.c:760
msgid "Installing the system..."
msgstr ""
-#: main.c:583
+#: main.c:761
msgid "Unable to install the system."
msgstr ""
-#: main.c:599
+#: main.c:777
msgid "Installing the language cache..."
msgstr ""
-#: main.c:600
+#: main.c:778
msgid "Unable to install the language cache."
msgstr ""
-#: main.c:605
+#: main.c:783
msgid "Installing the bootloader..."
msgstr ""
-#: main.c:612
+#: main.c:790
msgid "Unable to open /etc/default/grub for writing."
msgstr ""
-#: main.c:634
+#: main.c:812
msgid "Unable to install the bootloader."
msgstr ""
-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
#, c-format
msgid ""
"%s was successfully installed!\n"
@@ -229,14 +316,14 @@ msgid ""
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Congratulations!"
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Reboot"
msgstr ""
-#: main.c:682
+#: main.c:893
msgid "Setup has failed. Press Ok to reboot."
msgstr ""
diff --git a/src/installer/po/fa.po b/src/installer/po/fa.po
index 81d3631..67d4d26 100644
--- a/src/installer/po/fa.po
+++ b/src/installer/po/fa.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
-"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-12 18:37+0000\n"
+"Last-Translator: Khalil Delavaran <khalil.delavaran(a)gmail.com>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/ipfire/language/fa/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,85 +18,145 @@ msgstr ""
"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
msgid "OK"
msgstr "بله"
-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
msgid "Cancel"
msgstr "نمی خواهم"
-#: main.c:145
+#: main.c:176
msgid "I accept this license"
msgstr "من این پروانه را می پذیرم."
-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr "گوشزد: برپاسازی خودکار تا 10 ثانیه دیگر شروع می شود..."
+
+#: main.c:403
msgid "Language selection"
-msgstr ""
+msgstr "گزینش زبان"
-#: main.c:312
+#: main.c:403
msgid "Select the language you wish to use for the installation."
-msgstr ""
+msgstr "گزینش زبان شما برای بکارگیری در برپاسازی."
+
+#: main.c:418
+msgid "Unattended mode"
+msgstr "حالت خودکار"
-#: main.c:323
+#: main.c:420
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr "<Tab>/<Alt-Tab> میان عنصری | <Space> گزینش | <F12> برای برگه پسین"
-#: main.c:328
+#: main.c:426
#, c-format
msgid ""
"Welcome to the %s installation program.\n"
"\n"
"Selecting Cancel on any of the following screens will reboot the computer."
-msgstr ""
+msgstr "به برنامه برپا سازی %s خوش آمدید.\n\nبرای راه اندازی دوباره کامپیوتر، نمی خواهم را در هر صفحه ای می توانید گزینش کنید."
-#: main.c:330
+#: main.c:428
msgid "Start installation"
msgstr "آغاز برپا سازی"
-#: main.c:339
-msgid "No local source media found. Starting download."
-msgstr "هیچ رسانه محلی یافت نشد. دانلود آغاز شد."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr ""
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr "دانلود ایمیج برپاسازی"
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:487 main.c:516
+msgid "Retry"
+msgstr "دوباره"
+
+#: main.c:501
+msgid "Downloading installation image..."
msgstr "در حال دانلود ایمیج برای برپا سازی..."
-#: main.c:342
-msgid "Download error"
-msgstr "ایراد در دانلود"
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
+msgstr ""
+
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr "ایمیج برپاسازی را نمی توان دانلود کرد.\nزیرا: %s\n\n%s"
-#: main.c:376
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr "نمی توان %s را به %s مونت کرد:\n%s\n"
+
+#: main.c:543
msgid "License Agreement"
-msgstr ""
+msgstr "موافقنامه"
-#: main.c:377
+#: main.c:544
msgid "License not accepted!"
msgstr "پروانه پذیرفته نشد!"
-#: main.c:399
+#: main.c:566
msgid "No hard disk found."
msgstr "هارد دیسک یافت نشد."
-#: main.c:418
+#: main.c:587
msgid "Disk Selection"
msgstr "گزینش دیسک"
-#: main.c:419
+#: main.c:588
msgid ""
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
"\n"
"ALL DATA ON THE DISK WILL BE DESTROYED."
msgstr "دیسک (های) را برای برپاسازی IPFire گزینش کنید. نخست آنها را پارنیشین بندی کرده، و سپس، سیستم فایلی برای پارتیشن ها برگزینید.\n\nهمه داده های دیسک پاک می شوند."
-#: main.c:430
+#: main.c:599
msgid ""
"No disk has been selected.\n"
"\n"
"Please select one or more disks you want to install IPFire on."
msgstr "هیچ دیسکی گزینش نشده است.\n\nخواهشمند است یک دیسک یا بیشتر را برای برپا سازی IPFire گزینش کنید."
-#: main.c:443
+#: main.c:617
#, c-format
msgid ""
"The installation program will now prepare the chosen harddisk:\n"
@@ -106,15 +166,15 @@ msgid ""
"Do you agree to continue?"
msgstr "آماده سازی دیسک سخت برای برپا سازی برنامه :\n\n%s\n\nآیا شما گرایش به ادامه دارید؟"
-#: main.c:445
+#: main.c:619
msgid "Disk Setup"
msgstr "پیکربندی دیسک"
-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
msgid "Delete all data"
msgstr "پاک کردن همه داده ها"
-#: main.c:453
+#: main.c:627
#, c-format
msgid ""
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -125,119 +185,146 @@ msgid ""
"Do you agree to continue?"
msgstr "پیکربندی RAID بر روی هارد دیسکهای گزینش شده برای برپا سازی برنامه\n\n%s\n%s\n\nآیا شما گرایش به ادامه دارید؟"
-#: main.c:455
+#: main.c:629
msgid "RAID Setup"
msgstr "پیکربندی RAID"
-#: main.c:466
-msgid "You disk configuration is currently not supported."
-msgstr "پیکربندی دیسک شما پشتیبانی نمی شود."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
+msgstr ""
-#: main.c:480
+#: main.c:655
msgid "Your harddisk is too small."
msgstr "هارد دیسک شما بسیار کوچک است."
-#: main.c:494
+#: main.c:671
msgid ""
"Your harddisk is very small, but you can continue without a swap partition."
-msgstr ""
+msgstr "هارد دیسک شما بسیار کوچک است، ولی می توانید بدون ساخت swap پارتیشن ادامه دهید."
-#: main.c:506
+#: main.c:684
msgid "ext4 Filesystem"
msgstr "فایل سیستم ext4"
-#: main.c:507
+#: main.c:685
msgid "ext4 Filesystem without journal"
msgstr "سیستم فایل ext4 بدون روزنامه"
-#: main.c:508
+#: main.c:686
msgid "XFS Filesystem"
msgstr "فایل سیستم XFS"
-#: main.c:509
+#: main.c:687
msgid "ReiserFS Filesystem"
msgstr "فایل سیستم RaiserFS"
-#: main.c:523
+#: main.c:701
msgid "Filesystem Selection"
msgstr "گزینش فایل سیستم"
-#: main.c:523
+#: main.c:701
msgid "Please choose your filesystem:"
msgstr "خواهشمند است فایل سیستم خود را گزینش کنید:"
-#: main.c:534
+#: main.c:712
msgid "Building RAID..."
msgstr "ساخت RAID..."
-#: main.c:538
+#: main.c:716
msgid "Unable to build the RAID."
msgstr "ناتوانی در ساخت RAID."
-#: main.c:550
+#: main.c:728
msgid "Partitioning disk..."
msgstr "پارتیشن بندی دیسک..."
-#: main.c:554
+#: main.c:732
msgid "Unable to partition the disk."
msgstr "ناتوانی در پارتیشین بندی دیسک."
-#: main.c:561
+#: main.c:739
msgid "Creating filesystems..."
msgstr "ساخت سیستم فایل..."
-#: main.c:565
+#: main.c:743
msgid "Unable to create filesystems."
msgstr "ناتوانی در ساخت سیستم فایل."
-#: main.c:571
+#: main.c:749
msgid "Unable to mount filesystems."
msgstr "ناتوانی در مونت کردن سیستم فایل."
-#: main.c:582
+#: main.c:760
msgid "Installing the system..."
msgstr "برپا سازی سیستم..."
-#: main.c:583
+#: main.c:761
msgid "Unable to install the system."
msgstr "ناتوانی در برپاسازی سیستم."
-#: main.c:599
+#: main.c:777
msgid "Installing the language cache..."
msgstr "در حال برپا سازی کش زبان..."
-#: main.c:600
+#: main.c:778
msgid "Unable to install the language cache."
msgstr "ناتوانی در برپا سازی کش زبان."
-#: main.c:605
+#: main.c:783
msgid "Installing the bootloader..."
msgstr "برپا سازی بوت لودر..."
-#: main.c:612
+#: main.c:790
msgid "Unable to open /etc/default/grub for writing."
-msgstr ""
+msgstr "نمی توان /etc/default/grub را برای ویرایش باز کرد."
-#: main.c:634
+#: main.c:812
msgid "Unable to install the bootloader."
msgstr "ناتوانی در برپا سازی بوت لودر."
-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr "بله"
+
+#: main.c:827
+msgid "No"
+msgstr "خیر"
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
#, c-format
msgid ""
"%s was successfully installed!\n"
"\n"
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
-msgstr ""
+msgstr "%s برپا سازی شده است!\n\nخواهشمند است هر برپاسازی میانه ای از سیستم را پاک کنید و دکمه ریبوت را بزنید. پس از یک بار ریستارت سیستم، شما به پرسش های پیکربندی شبکه و گذر واژه سیستم پاسخ دهید. سپس برای پیکربندی پیشخوان وب، باید در مرورگر خود آدرس https://%s:444 (یا هر نامیکه گزینشی شما %s )را بنویسید."
-#: main.c:671
+#: main.c:882
msgid "Congratulations!"
msgstr "شادباش می گوییم!"
-#: main.c:671
+#: main.c:882
msgid "Reboot"
msgstr "ریبوت"
-#: main.c:682
+#: main.c:893
msgid "Setup has failed. Press Ok to reboot."
-msgstr ""
+msgstr "برپا سازی شکست خورد. برای راه اندازی دوباره بلی را فشار دهید."
diff --git a/src/installer/po/fr.po b/src/installer/po/fr.po
index a4af363..93ba210 100644
--- a/src/installer/po/fr.po
+++ b/src/installer/po/fr.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
"Language-Team: French (http://www.transifex.com/projects/p/ipfire/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,40 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
msgid "OK"
msgstr ""
-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
msgid "Cancel"
msgstr ""
-#: main.c:145
+#: main.c:176
msgid "I accept this license"
msgstr ""
-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
msgid "Language selection"
msgstr ""
-#: main.c:312
+#: main.c:403
msgid "Select the language you wish to use for the installation."
msgstr ""
-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr ""
-#: main.c:328
+#: main.c:426
#, c-format
msgid ""
"Welcome to the %s installation program.\n"
@@ -49,53 +58,104 @@ msgid ""
"Selecting Cancel on any of the following screens will reboot the computer."
msgstr ""
-#: main.c:330
+#: main.c:428
msgid "Start installation"
msgstr ""
-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr ""
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
msgstr ""
-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:501
+msgid "Downloading installation image..."
msgstr ""
-#: main.c:342
-msgid "Download error"
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
msgstr ""
-#: main.c:376
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr ""
+
+#: main.c:543
msgid "License Agreement"
msgstr ""
-#: main.c:377
+#: main.c:544
msgid "License not accepted!"
msgstr ""
-#: main.c:399
+#: main.c:566
msgid "No hard disk found."
msgstr ""
-#: main.c:418
+#: main.c:587
msgid "Disk Selection"
msgstr ""
-#: main.c:419
+#: main.c:588
msgid ""
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
"\n"
"ALL DATA ON THE DISK WILL BE DESTROYED."
msgstr ""
-#: main.c:430
+#: main.c:599
msgid ""
"No disk has been selected.\n"
"\n"
"Please select one or more disks you want to install IPFire on."
msgstr ""
-#: main.c:443
+#: main.c:617
#, c-format
msgid ""
"The installation program will now prepare the chosen harddisk:\n"
@@ -105,15 +165,15 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:445
+#: main.c:619
msgid "Disk Setup"
msgstr ""
-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
msgid "Delete all data"
msgstr ""
-#: main.c:453
+#: main.c:627
#, c-format
msgid ""
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -124,104 +184,131 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:455
+#: main.c:629
msgid "RAID Setup"
msgstr ""
-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
msgstr ""
-#: main.c:480
+#: main.c:655
msgid "Your harddisk is too small."
msgstr ""
-#: main.c:494
+#: main.c:671
msgid ""
"Your harddisk is very small, but you can continue without a swap partition."
msgstr ""
-#: main.c:506
+#: main.c:684
msgid "ext4 Filesystem"
msgstr ""
-#: main.c:507
+#: main.c:685
msgid "ext4 Filesystem without journal"
msgstr ""
-#: main.c:508
+#: main.c:686
msgid "XFS Filesystem"
msgstr ""
-#: main.c:509
+#: main.c:687
msgid "ReiserFS Filesystem"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Filesystem Selection"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Please choose your filesystem:"
msgstr ""
-#: main.c:534
+#: main.c:712
msgid "Building RAID..."
msgstr ""
-#: main.c:538
+#: main.c:716
msgid "Unable to build the RAID."
msgstr ""
-#: main.c:550
+#: main.c:728
msgid "Partitioning disk..."
msgstr ""
-#: main.c:554
+#: main.c:732
msgid "Unable to partition the disk."
msgstr ""
-#: main.c:561
+#: main.c:739
msgid "Creating filesystems..."
msgstr ""
-#: main.c:565
+#: main.c:743
msgid "Unable to create filesystems."
msgstr ""
-#: main.c:571
+#: main.c:749
msgid "Unable to mount filesystems."
msgstr ""
-#: main.c:582
+#: main.c:760
msgid "Installing the system..."
msgstr ""
-#: main.c:583
+#: main.c:761
msgid "Unable to install the system."
msgstr ""
-#: main.c:599
+#: main.c:777
msgid "Installing the language cache..."
msgstr ""
-#: main.c:600
+#: main.c:778
msgid "Unable to install the language cache."
msgstr ""
-#: main.c:605
+#: main.c:783
msgid "Installing the bootloader..."
msgstr ""
-#: main.c:612
+#: main.c:790
msgid "Unable to open /etc/default/grub for writing."
msgstr ""
-#: main.c:634
+#: main.c:812
msgid "Unable to install the bootloader."
msgstr ""
-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
#, c-format
msgid ""
"%s was successfully installed!\n"
@@ -229,14 +316,14 @@ msgid ""
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Congratulations!"
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Reboot"
msgstr ""
-#: main.c:682
+#: main.c:893
msgid "Setup has failed. Press Ok to reboot."
msgstr ""
diff --git a/src/installer/po/hr.po b/src/installer/po/hr.po
new file mode 100644
index 0000000..3b67c36
--- /dev/null
+++ b/src/installer/po/hr.po
@@ -0,0 +1,329 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The IPFire Project (www.ipfire.org)
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: IPFire Project\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
+"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/ipfire/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
+msgid "OK"
+msgstr "OK"
+
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
+msgid "Cancel"
+msgstr "Otkazati"
+
+#: main.c:176
+msgid "I accept this license"
+msgstr "Prihvaćam ovu licencu"
+
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
+msgid "Language selection"
+msgstr "Odabir jezika"
+
+#: main.c:403
+msgid "Select the language you wish to use for the installation."
+msgstr "Odaberite jezik koji želite koristiti za instalaciju."
+
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
+msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
+msgstr "<Tab>/<Alt-Tab> Između odabira | <Space> Izaberi | <F12> Idući ekran"
+
+#: main.c:426
+#, c-format
+msgid ""
+"Welcome to the %s installation program.\n"
+"\n"
+"Selecting Cancel on any of the following screens will reboot the computer."
+msgstr "Dobrodošli u %s instalacijski programa..\n\nOdabirom Otkazati na bilo kojem od sljedećih ekranima će se ponovno pokrenuti računalo."
+
+#: main.c:428
+msgid "Start installation"
+msgstr "Pokrenite instalaciju"
+
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr ""
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
+msgstr ""
+
+#: main.c:501
+msgid "Downloading installation image..."
+msgstr ""
+
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
+msgstr ""
+
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr ""
+
+#: main.c:543
+msgid "License Agreement"
+msgstr "Ugovor o licenci"
+
+#: main.c:544
+msgid "License not accepted!"
+msgstr "Licenca nije prihvaćena!"
+
+#: main.c:566
+msgid "No hard disk found."
+msgstr "Tvrdi disk nije pronađen."
+
+#: main.c:587
+msgid "Disk Selection"
+msgstr "Izbor diska"
+
+#: main.c:588
+msgid ""
+"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
+"\n"
+"ALL DATA ON THE DISK WILL BE DESTROYED."
+msgstr "Odaberite disk(ove) na koje želite instalirati IPFire. Prvo će biti podijeljeni, a zatim particije će se datotečni sustav staviti na njih.\n\nSVI PODACI NA DISKU ĆE BITI UNIŠTENI!"
+
+#: main.c:599
+msgid ""
+"No disk has been selected.\n"
+"\n"
+"Please select one or more disks you want to install IPFire on."
+msgstr "Disk nije izabran. \n\nOdaberite jedan ili više diskova na koje želite instalirati na IPFire."
+
+#: main.c:617
+#, c-format
+msgid ""
+"The installation program will now prepare the chosen harddisk:\n"
+"\n"
+" %s\n"
+"\n"
+"Do you agree to continue?"
+msgstr "Instalacijski program će sada pripremiti odabrani tvrdi disk:\n\n %s\n\nSlažete li da nastavimo?"
+
+#: main.c:619
+msgid "Disk Setup"
+msgstr "Postavke diska"
+
+#: main.c:620 main.c:630
+msgid "Delete all data"
+msgstr "Izbriši sve podatke"
+
+#: main.c:627
+#, c-format
+msgid ""
+"The installation program will now set up a RAID configuration on the selected harddisks:\n"
+"\n"
+" %s\n"
+" %s\n"
+"\n"
+"Do you agree to continue?"
+msgstr "Instalacijski program će se sada postaviti RAID konfiguraciju na odabranim tvrdim diskovima:\n\n %s\n %s\n\nSlažete li da nastavimo?"
+
+#: main.c:629
+msgid "RAID Setup"
+msgstr "Postavljanje RAIDa"
+
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
+msgstr ""
+
+#: main.c:655
+msgid "Your harddisk is too small."
+msgstr "Vaš tvrdi disk je premali."
+
+#: main.c:671
+msgid ""
+"Your harddisk is very small, but you can continue without a swap partition."
+msgstr "Vaš tvrdi disk je dosta mali, ali možete nastaviti bez swap particije."
+
+#: main.c:684
+msgid "ext4 Filesystem"
+msgstr "ext4 datotečni sustav"
+
+#: main.c:685
+msgid "ext4 Filesystem without journal"
+msgstr "ext4 datotečni sustav bez journal-a"
+
+#: main.c:686
+msgid "XFS Filesystem"
+msgstr "XFS datotečni sustav"
+
+#: main.c:687
+msgid "ReiserFS Filesystem"
+msgstr "ReiserFS datotečni sustav"
+
+#: main.c:701
+msgid "Filesystem Selection"
+msgstr "Izabir datotečnog sustava"
+
+#: main.c:701
+msgid "Please choose your filesystem:"
+msgstr "Molimo odaberite svoj datotečni sustav:"
+
+#: main.c:712
+msgid "Building RAID..."
+msgstr "Izgradnja RAIDa..."
+
+#: main.c:716
+msgid "Unable to build the RAID."
+msgstr "Nije moguće izgraditi RAID."
+
+#: main.c:728
+msgid "Partitioning disk..."
+msgstr "Particioniranje diska ..."
+
+#: main.c:732
+msgid "Unable to partition the disk."
+msgstr "Nije moguće particionirati disk."
+
+#: main.c:739
+msgid "Creating filesystems..."
+msgstr "Izrada datotečnog sustava ..."
+
+#: main.c:743
+msgid "Unable to create filesystems."
+msgstr "Nije moguće stvoriti datotečni sustav."
+
+#: main.c:749
+msgid "Unable to mount filesystems."
+msgstr "Nije moguće montirati datotečni sustav."
+
+#: main.c:760
+msgid "Installing the system..."
+msgstr "Instaliranje sustava..."
+
+#: main.c:761
+msgid "Unable to install the system."
+msgstr "Nije moguće instalirati sustav."
+
+#: main.c:777
+msgid "Installing the language cache..."
+msgstr "Instaliranje cache-a jezika..."
+
+#: main.c:778
+msgid "Unable to install the language cache."
+msgstr "Nije moguće instalirati cache jezika."
+
+#: main.c:783
+msgid "Installing the bootloader..."
+msgstr "Instaliranje bootloadera..."
+
+#: main.c:790
+msgid "Unable to open /etc/default/grub for writing."
+msgstr "Ne mogu otvoriti /etc/default/grub grub za pisanje."
+
+#: main.c:812
+msgid "Unable to install the bootloader."
+msgstr "Nije moguće instalirati bootloader."
+
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
+#, c-format
+msgid ""
+"%s was successfully installed!\n"
+"\n"
+"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
+msgstr "%s uspješno je instaliran!\n\nMolimo uklonite sve instalacijske medije iz tog sustava i pritisnite gumb ponovno podizanje sustava. Nakon što je sustav ponovno podigne, od vas će biti zatraženo postavljanje mreže i lozinke sustava. Nakon toga, trebali usmjerite svoj web preglednik nahttps://%s:444 (ili koje god ste nazvali vaš %s) za postavke preko weba."
+
+#: main.c:882
+msgid "Congratulations!"
+msgstr "Čestitamo!"
+
+#: main.c:882
+msgid "Reboot"
+msgstr "Ponovno pokretanje"
+
+#: main.c:893
+msgid "Setup has failed. Press Ok to reboot."
+msgstr "Postavljanje nije uspjelo. Pritisnite OK za ponovno podizanje sustava."
diff --git a/src/installer/po/hu.po b/src/installer/po/hu.po
index ac25009..7e9e198 100644
--- a/src/installer/po/hu.po
+++ b/src/installer/po/hu.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
"Language-Team: Hungarian (http://www.transifex.com/projects/p/ipfire/language/hu/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,40 @@ msgstr ""
"Language: hu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
msgid "OK"
msgstr ""
-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
msgid "Cancel"
msgstr ""
-#: main.c:145
+#: main.c:176
msgid "I accept this license"
msgstr ""
-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
msgid "Language selection"
msgstr ""
-#: main.c:312
+#: main.c:403
msgid "Select the language you wish to use for the installation."
msgstr ""
-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr ""
-#: main.c:328
+#: main.c:426
#, c-format
msgid ""
"Welcome to the %s installation program.\n"
@@ -49,53 +58,104 @@ msgid ""
"Selecting Cancel on any of the following screens will reboot the computer."
msgstr ""
-#: main.c:330
+#: main.c:428
msgid "Start installation"
msgstr ""
-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr ""
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
msgstr ""
-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:501
+msgid "Downloading installation image..."
msgstr ""
-#: main.c:342
-msgid "Download error"
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
msgstr ""
-#: main.c:376
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr ""
+
+#: main.c:543
msgid "License Agreement"
msgstr ""
-#: main.c:377
+#: main.c:544
msgid "License not accepted!"
msgstr ""
-#: main.c:399
+#: main.c:566
msgid "No hard disk found."
msgstr ""
-#: main.c:418
+#: main.c:587
msgid "Disk Selection"
msgstr ""
-#: main.c:419
+#: main.c:588
msgid ""
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
"\n"
"ALL DATA ON THE DISK WILL BE DESTROYED."
msgstr ""
-#: main.c:430
+#: main.c:599
msgid ""
"No disk has been selected.\n"
"\n"
"Please select one or more disks you want to install IPFire on."
msgstr ""
-#: main.c:443
+#: main.c:617
#, c-format
msgid ""
"The installation program will now prepare the chosen harddisk:\n"
@@ -105,15 +165,15 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:445
+#: main.c:619
msgid "Disk Setup"
msgstr ""
-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
msgid "Delete all data"
msgstr ""
-#: main.c:453
+#: main.c:627
#, c-format
msgid ""
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -124,104 +184,131 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:455
+#: main.c:629
msgid "RAID Setup"
msgstr ""
-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
msgstr ""
-#: main.c:480
+#: main.c:655
msgid "Your harddisk is too small."
msgstr ""
-#: main.c:494
+#: main.c:671
msgid ""
"Your harddisk is very small, but you can continue without a swap partition."
msgstr ""
-#: main.c:506
+#: main.c:684
msgid "ext4 Filesystem"
msgstr ""
-#: main.c:507
+#: main.c:685
msgid "ext4 Filesystem without journal"
msgstr ""
-#: main.c:508
+#: main.c:686
msgid "XFS Filesystem"
msgstr ""
-#: main.c:509
+#: main.c:687
msgid "ReiserFS Filesystem"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Filesystem Selection"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Please choose your filesystem:"
msgstr ""
-#: main.c:534
+#: main.c:712
msgid "Building RAID..."
msgstr ""
-#: main.c:538
+#: main.c:716
msgid "Unable to build the RAID."
msgstr ""
-#: main.c:550
+#: main.c:728
msgid "Partitioning disk..."
msgstr ""
-#: main.c:554
+#: main.c:732
msgid "Unable to partition the disk."
msgstr ""
-#: main.c:561
+#: main.c:739
msgid "Creating filesystems..."
msgstr ""
-#: main.c:565
+#: main.c:743
msgid "Unable to create filesystems."
msgstr ""
-#: main.c:571
+#: main.c:749
msgid "Unable to mount filesystems."
msgstr ""
-#: main.c:582
+#: main.c:760
msgid "Installing the system..."
msgstr ""
-#: main.c:583
+#: main.c:761
msgid "Unable to install the system."
msgstr ""
-#: main.c:599
+#: main.c:777
msgid "Installing the language cache..."
msgstr ""
-#: main.c:600
+#: main.c:778
msgid "Unable to install the language cache."
msgstr ""
-#: main.c:605
+#: main.c:783
msgid "Installing the bootloader..."
msgstr ""
-#: main.c:612
+#: main.c:790
msgid "Unable to open /etc/default/grub for writing."
msgstr ""
-#: main.c:634
+#: main.c:812
msgid "Unable to install the bootloader."
msgstr ""
-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
#, c-format
msgid ""
"%s was successfully installed!\n"
@@ -229,14 +316,14 @@ msgid ""
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Congratulations!"
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Reboot"
msgstr ""
-#: main.c:682
+#: main.c:893
msgid "Setup has failed. Press Ok to reboot."
msgstr ""
diff --git a/src/installer/po/id.po b/src/installer/po/id.po
index 28d9ae3..e4cc4c1 100644
--- a/src/installer/po/id.po
+++ b/src/installer/po/id.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/ipfire/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,40 @@ msgstr ""
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
msgid "OK"
msgstr ""
-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
msgid "Cancel"
msgstr ""
-#: main.c:145
+#: main.c:176
msgid "I accept this license"
msgstr ""
-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
msgid "Language selection"
msgstr ""
-#: main.c:312
+#: main.c:403
msgid "Select the language you wish to use for the installation."
msgstr ""
-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr ""
-#: main.c:328
+#: main.c:426
#, c-format
msgid ""
"Welcome to the %s installation program.\n"
@@ -49,53 +58,104 @@ msgid ""
"Selecting Cancel on any of the following screens will reboot the computer."
msgstr ""
-#: main.c:330
+#: main.c:428
msgid "Start installation"
msgstr ""
-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr ""
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
msgstr ""
-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:501
+msgid "Downloading installation image..."
msgstr ""
-#: main.c:342
-msgid "Download error"
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
msgstr ""
-#: main.c:376
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr ""
+
+#: main.c:543
msgid "License Agreement"
msgstr ""
-#: main.c:377
+#: main.c:544
msgid "License not accepted!"
msgstr ""
-#: main.c:399
+#: main.c:566
msgid "No hard disk found."
msgstr ""
-#: main.c:418
+#: main.c:587
msgid "Disk Selection"
msgstr ""
-#: main.c:419
+#: main.c:588
msgid ""
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
"\n"
"ALL DATA ON THE DISK WILL BE DESTROYED."
msgstr ""
-#: main.c:430
+#: main.c:599
msgid ""
"No disk has been selected.\n"
"\n"
"Please select one or more disks you want to install IPFire on."
msgstr ""
-#: main.c:443
+#: main.c:617
#, c-format
msgid ""
"The installation program will now prepare the chosen harddisk:\n"
@@ -105,15 +165,15 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:445
+#: main.c:619
msgid "Disk Setup"
msgstr ""
-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
msgid "Delete all data"
msgstr ""
-#: main.c:453
+#: main.c:627
#, c-format
msgid ""
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -124,104 +184,131 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:455
+#: main.c:629
msgid "RAID Setup"
msgstr ""
-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
msgstr ""
-#: main.c:480
+#: main.c:655
msgid "Your harddisk is too small."
msgstr ""
-#: main.c:494
+#: main.c:671
msgid ""
"Your harddisk is very small, but you can continue without a swap partition."
msgstr ""
-#: main.c:506
+#: main.c:684
msgid "ext4 Filesystem"
msgstr ""
-#: main.c:507
+#: main.c:685
msgid "ext4 Filesystem without journal"
msgstr ""
-#: main.c:508
+#: main.c:686
msgid "XFS Filesystem"
msgstr ""
-#: main.c:509
+#: main.c:687
msgid "ReiserFS Filesystem"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Filesystem Selection"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Please choose your filesystem:"
msgstr ""
-#: main.c:534
+#: main.c:712
msgid "Building RAID..."
msgstr ""
-#: main.c:538
+#: main.c:716
msgid "Unable to build the RAID."
msgstr ""
-#: main.c:550
+#: main.c:728
msgid "Partitioning disk..."
msgstr ""
-#: main.c:554
+#: main.c:732
msgid "Unable to partition the disk."
msgstr ""
-#: main.c:561
+#: main.c:739
msgid "Creating filesystems..."
msgstr ""
-#: main.c:565
+#: main.c:743
msgid "Unable to create filesystems."
msgstr ""
-#: main.c:571
+#: main.c:749
msgid "Unable to mount filesystems."
msgstr ""
-#: main.c:582
+#: main.c:760
msgid "Installing the system..."
msgstr ""
-#: main.c:583
+#: main.c:761
msgid "Unable to install the system."
msgstr ""
-#: main.c:599
+#: main.c:777
msgid "Installing the language cache..."
msgstr ""
-#: main.c:600
+#: main.c:778
msgid "Unable to install the language cache."
msgstr ""
-#: main.c:605
+#: main.c:783
msgid "Installing the bootloader..."
msgstr ""
-#: main.c:612
+#: main.c:790
msgid "Unable to open /etc/default/grub for writing."
msgstr ""
-#: main.c:634
+#: main.c:812
msgid "Unable to install the bootloader."
msgstr ""
-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
#, c-format
msgid ""
"%s was successfully installed!\n"
@@ -229,14 +316,14 @@ msgid ""
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Congratulations!"
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Reboot"
msgstr ""
-#: main.c:682
+#: main.c:893
msgid "Setup has failed. Press Ok to reboot."
msgstr ""
diff --git a/src/installer/po/it.po b/src/installer/po/it.po
index 70d0098..d938f37 100644
--- a/src/installer/po/it.po
+++ b/src/installer/po/it.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Gabriele, 2014
+# luX <lucianocataldo(a)gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
-"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-12-06 18:41+0000\n"
+"Last-Translator: Gabriele\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/ipfire/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,85 +19,145 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
msgid "OK"
-msgstr ""
+msgstr "OK"
-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
msgid "Cancel"
-msgstr ""
+msgstr "Annulla"
-#: main.c:145
+#: main.c:176
msgid "I accept this license"
-msgstr ""
+msgstr "Accetto questa licenza"
-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr "Attenzione: L'installazione automatica inizierà tra 10 secondi..."
+
+#: main.c:403
msgid "Language selection"
-msgstr ""
+msgstr "Scelta della lingua"
-#: main.c:312
+#: main.c:403
msgid "Select the language you wish to use for the installation."
-msgstr ""
+msgstr "Selezionare la lingua che si desidera utilizzare per l'installazione."
-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr "Modalità automatico"
+
+#: main.c:420
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
-msgstr ""
+msgstr "<Tab>/<Alt-Tab> tra elementi | <Space> seleziona | <F12> schermata successiva"
-#: main.c:328
+#: main.c:426
#, c-format
msgid ""
"Welcome to the %s installation program.\n"
"\n"
"Selecting Cancel on any of the following screens will reboot the computer."
-msgstr ""
+msgstr "Benvenuti nel programma di installazione %s.\n\nSelezionando Annulla su una delle seguenti schermate si riavvia il computer."
-#: main.c:330
+#: main.c:428
msgid "Start installation"
-msgstr ""
+msgstr "Avvio installazione"
-#: main.c:339
-msgid "No local source media found. Starting download."
-msgstr ""
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr "Il programma di installazione proverà ora a scaricare l'immagine di installazione."
-#: main.c:340
-msgid "Downloading installation image ..."
-msgstr ""
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr "Nessuna unità di origine trovata.\n\nPuoi provare a scaricare l'immagine d'installazione richiesta."
-#: main.c:342
-msgid "Download error"
-msgstr ""
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr "Per piacere assicurati di collegare il tuo computer ad una rete e il programma d'installazione proverà ad acquisire un indirizzo IP."
+
+#: main.c:460
+msgid "Download installation image"
+msgstr "Scaricamento immagine d'installazione"
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr "Provo ad avviare la rete (DHCP)..."
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr "Non è stato possibile avviare la rete, ma è richiesto per continuare l'installazione.\n\nPer piacere collega il tuo computer ad una rete con un server DHCP e riprova."
+
+#: main.c:487 main.c:516
+msgid "Retry"
+msgstr "Riprova"
+
+#: main.c:501
+msgid "Downloading installation image..."
+msgstr "Scaricamento immagine di installazione..."
+
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
+msgstr "Checksum MD5 non corrispondente"
+
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr "Non è stato possibile scaricare l'immagine di installazione.\nMotivo: %s\n\n%s"
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr "Impossibile montare %s su %s:\n %s\n"
-#: main.c:376
+#: main.c:543
msgid "License Agreement"
-msgstr ""
+msgstr "Contratto di licenza"
-#: main.c:377
+#: main.c:544
msgid "License not accepted!"
-msgstr ""
+msgstr "Licenza non accettata!"
-#: main.c:399
+#: main.c:566
msgid "No hard disk found."
-msgstr ""
+msgstr "Nessun Hard Disk trovato."
-#: main.c:418
+#: main.c:587
msgid "Disk Selection"
-msgstr ""
+msgstr "Selezione disco"
-#: main.c:419
+#: main.c:588
msgid ""
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
"\n"
"ALL DATA ON THE DISK WILL BE DESTROYED."
-msgstr ""
+msgstr "Selezionare il disco su cui si desidera installare IPFire. In primo luogo verrà partizionato, e quindi le partizioni avranno un filesystem.\n\nTUTTI I DATI SUL DISCO VERRANNO DISTRUTTI."
-#: main.c:430
+#: main.c:599
msgid ""
"No disk has been selected.\n"
"\n"
"Please select one or more disks you want to install IPFire on."
-msgstr ""
+msgstr "Non è stato selezionato alcun disco.\n\nSi prega di selezionare uno o più dischi su cui si desidera installare IPFire."
-#: main.c:443
+#: main.c:617
#, c-format
msgid ""
"The installation program will now prepare the chosen harddisk:\n"
@@ -103,17 +165,17 @@ msgid ""
" %s\n"
"\n"
"Do you agree to continue?"
-msgstr ""
+msgstr "Il programma di installazione preparerà l'hard disk prescelto.\n\n%s\n\nSiete d'accordo di continuare?"
-#: main.c:445
+#: main.c:619
msgid "Disk Setup"
-msgstr ""
+msgstr "Disco di Installazione"
-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
msgid "Delete all data"
-msgstr ""
+msgstr "Elimina tutti i dati"
-#: main.c:453
+#: main.c:627
#, c-format
msgid ""
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -122,121 +184,148 @@ msgid ""
" %s\n"
"\n"
"Do you agree to continue?"
-msgstr ""
+msgstr "Il programma di installazione configurerà il RAID sul hard disk selezionato:\n\n%s\n%s\n\nSiete d'accordo di continuare?"
-#: main.c:455
+#: main.c:629
msgid "RAID Setup"
-msgstr ""
+msgstr "Installazione RAID"
-#: main.c:466
-msgid "You disk configuration is currently not supported."
-msgstr ""
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
+msgstr "La tua configurazione disco non è attualmente supportata."
-#: main.c:480
+#: main.c:655
msgid "Your harddisk is too small."
-msgstr ""
+msgstr "Il disco rigido è troppo piccolo."
-#: main.c:494
+#: main.c:671
msgid ""
"Your harddisk is very small, but you can continue without a swap partition."
-msgstr ""
+msgstr "Il disco rigido è molto piccolo, ma puoi continuare senza una partizione di swap."
-#: main.c:506
+#: main.c:684
msgid "ext4 Filesystem"
-msgstr ""
+msgstr "Filesystem ext4"
-#: main.c:507
+#: main.c:685
msgid "ext4 Filesystem without journal"
-msgstr ""
+msgstr "ext4 Filesystem senza journal"
-#: main.c:508
+#: main.c:686
msgid "XFS Filesystem"
-msgstr ""
+msgstr "Filesystem XFS"
-#: main.c:509
+#: main.c:687
msgid "ReiserFS Filesystem"
-msgstr ""
+msgstr "Filesystem ReiserFS"
-#: main.c:523
+#: main.c:701
msgid "Filesystem Selection"
-msgstr ""
+msgstr "Selezione del filesystem"
-#: main.c:523
+#: main.c:701
msgid "Please choose your filesystem:"
-msgstr ""
+msgstr "Scegliere il filesystem:"
-#: main.c:534
+#: main.c:712
msgid "Building RAID..."
-msgstr ""
+msgstr "Costruzione RAID..."
-#: main.c:538
+#: main.c:716
msgid "Unable to build the RAID."
-msgstr ""
+msgstr "Impossibile generare il RAID."
-#: main.c:550
+#: main.c:728
msgid "Partitioning disk..."
-msgstr ""
+msgstr "Partizionamento del disco..."
-#: main.c:554
+#: main.c:732
msgid "Unable to partition the disk."
-msgstr ""
+msgstr "Impossibile partizionare il disco."
-#: main.c:561
+#: main.c:739
msgid "Creating filesystems..."
-msgstr ""
+msgstr "Creazione filesystem..."
-#: main.c:565
+#: main.c:743
msgid "Unable to create filesystems."
-msgstr ""
+msgstr "Impossibile creare il filesystem."
-#: main.c:571
+#: main.c:749
msgid "Unable to mount filesystems."
-msgstr ""
+msgstr "Impossibile montare il filesystem."
-#: main.c:582
+#: main.c:760
msgid "Installing the system..."
-msgstr ""
+msgstr "Installazione del sistema..."
-#: main.c:583
+#: main.c:761
msgid "Unable to install the system."
-msgstr ""
+msgstr "Impossibile installare il sistema."
-#: main.c:599
+#: main.c:777
msgid "Installing the language cache..."
-msgstr ""
+msgstr "Installazione della cache della lingua..."
-#: main.c:600
+#: main.c:778
msgid "Unable to install the language cache."
-msgstr ""
+msgstr "Impossibile installare la cache della lingua."
-#: main.c:605
+#: main.c:783
msgid "Installing the bootloader..."
-msgstr ""
+msgstr "Installazione del bootloader..."
-#: main.c:612
+#: main.c:790
msgid "Unable to open /etc/default/grub for writing."
-msgstr ""
+msgstr "Impossibile aprire /etc/default/grub per la scrittura."
-#: main.c:634
+#: main.c:812
msgid "Unable to install the bootloader."
-msgstr ""
+msgstr "Impossibile installare il bootloader."
+
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr "Un file di backup è stato trovato sull'immagine di installazione.\n\nVuoi ripristinare il backup?"
-#: main.c:666
+#: main.c:827
+msgid "Yes"
+msgstr "Sì"
+
+#: main.c:827
+msgid "No"
+msgstr "No"
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr "Si è verificato un errore durante il ripristino del file di backup"
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr "Esecuzione degli script post-installazione..."
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr "Script post-installazione fallito."
+
+#: main.c:877
#, c-format
msgid ""
"%s was successfully installed!\n"
"\n"
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
-msgstr ""
+msgstr "%s è stato installato con successo!\n\nSi prega di rimuovere eventuali supporti di installazione da questo sistema e premere il pulsante di riavvio. Una volta che il sistema è stato riavviato verrà chiesto di impostare le password di rete e di sistema.\nDopo di che, si dovrebbe puntare il browser web su https://%s:444 (o qualunque altro nome %s) per la console di configurazione web.\n "
-#: main.c:671
+#: main.c:882
msgid "Congratulations!"
-msgstr ""
+msgstr "Congratulazioni!"
-#: main.c:671
+#: main.c:882
msgid "Reboot"
-msgstr ""
+msgstr "Riavvio"
-#: main.c:682
+#: main.c:893
msgid "Setup has failed. Press Ok to reboot."
-msgstr ""
+msgstr "Installazione non riuscita. Premere Ok per riavviare."
diff --git a/src/installer/po/ja.po b/src/installer/po/ja.po
index 6cdadf5..5a14029 100644
--- a/src/installer/po/ja.po
+++ b/src/installer/po/ja.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
"Language-Team: Japanese (http://www.transifex.com/projects/p/ipfire/language/ja/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,40 @@ msgstr ""
"Language: ja\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
msgid "OK"
msgstr ""
-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
msgid "Cancel"
msgstr ""
-#: main.c:145
+#: main.c:176
msgid "I accept this license"
msgstr ""
-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
msgid "Language selection"
msgstr ""
-#: main.c:312
+#: main.c:403
msgid "Select the language you wish to use for the installation."
msgstr ""
-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr ""
-#: main.c:328
+#: main.c:426
#, c-format
msgid ""
"Welcome to the %s installation program.\n"
@@ -49,53 +58,104 @@ msgid ""
"Selecting Cancel on any of the following screens will reboot the computer."
msgstr ""
-#: main.c:330
+#: main.c:428
msgid "Start installation"
msgstr ""
-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr ""
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
msgstr ""
-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:501
+msgid "Downloading installation image..."
msgstr ""
-#: main.c:342
-msgid "Download error"
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
msgstr ""
-#: main.c:376
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr ""
+
+#: main.c:543
msgid "License Agreement"
msgstr ""
-#: main.c:377
+#: main.c:544
msgid "License not accepted!"
msgstr ""
-#: main.c:399
+#: main.c:566
msgid "No hard disk found."
msgstr ""
-#: main.c:418
+#: main.c:587
msgid "Disk Selection"
msgstr ""
-#: main.c:419
+#: main.c:588
msgid ""
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
"\n"
"ALL DATA ON THE DISK WILL BE DESTROYED."
msgstr ""
-#: main.c:430
+#: main.c:599
msgid ""
"No disk has been selected.\n"
"\n"
"Please select one or more disks you want to install IPFire on."
msgstr ""
-#: main.c:443
+#: main.c:617
#, c-format
msgid ""
"The installation program will now prepare the chosen harddisk:\n"
@@ -105,15 +165,15 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:445
+#: main.c:619
msgid "Disk Setup"
msgstr ""
-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
msgid "Delete all data"
msgstr ""
-#: main.c:453
+#: main.c:627
#, c-format
msgid ""
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -124,104 +184,131 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:455
+#: main.c:629
msgid "RAID Setup"
msgstr ""
-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
msgstr ""
-#: main.c:480
+#: main.c:655
msgid "Your harddisk is too small."
msgstr ""
-#: main.c:494
+#: main.c:671
msgid ""
"Your harddisk is very small, but you can continue without a swap partition."
msgstr ""
-#: main.c:506
+#: main.c:684
msgid "ext4 Filesystem"
msgstr ""
-#: main.c:507
+#: main.c:685
msgid "ext4 Filesystem without journal"
msgstr ""
-#: main.c:508
+#: main.c:686
msgid "XFS Filesystem"
msgstr ""
-#: main.c:509
+#: main.c:687
msgid "ReiserFS Filesystem"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Filesystem Selection"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Please choose your filesystem:"
msgstr ""
-#: main.c:534
+#: main.c:712
msgid "Building RAID..."
msgstr ""
-#: main.c:538
+#: main.c:716
msgid "Unable to build the RAID."
msgstr ""
-#: main.c:550
+#: main.c:728
msgid "Partitioning disk..."
msgstr ""
-#: main.c:554
+#: main.c:732
msgid "Unable to partition the disk."
msgstr ""
-#: main.c:561
+#: main.c:739
msgid "Creating filesystems..."
msgstr ""
-#: main.c:565
+#: main.c:743
msgid "Unable to create filesystems."
msgstr ""
-#: main.c:571
+#: main.c:749
msgid "Unable to mount filesystems."
msgstr ""
-#: main.c:582
+#: main.c:760
msgid "Installing the system..."
msgstr ""
-#: main.c:583
+#: main.c:761
msgid "Unable to install the system."
msgstr ""
-#: main.c:599
+#: main.c:777
msgid "Installing the language cache..."
msgstr ""
-#: main.c:600
+#: main.c:778
msgid "Unable to install the language cache."
msgstr ""
-#: main.c:605
+#: main.c:783
msgid "Installing the bootloader..."
msgstr ""
-#: main.c:612
+#: main.c:790
msgid "Unable to open /etc/default/grub for writing."
msgstr ""
-#: main.c:634
+#: main.c:812
msgid "Unable to install the bootloader."
msgstr ""
-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
#, c-format
msgid ""
"%s was successfully installed!\n"
@@ -229,14 +316,14 @@ msgid ""
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Congratulations!"
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Reboot"
msgstr ""
-#: main.c:682
+#: main.c:893
msgid "Setup has failed. Press Ok to reboot."
msgstr ""
diff --git a/src/installer/po/ja_JP.po b/src/installer/po/ja_JP.po
new file mode 100644
index 0000000..1243121
--- /dev/null
+++ b/src/installer/po/ja_JP.po
@@ -0,0 +1,329 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The IPFire Project (www.ipfire.org)
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: IPFire Project\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-07-31 09:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/ipfire/language/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
+msgid "OK"
+msgstr ""
+
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
+msgid "Cancel"
+msgstr ""
+
+#: main.c:176
+msgid "I accept this license"
+msgstr ""
+
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
+msgid "Language selection"
+msgstr ""
+
+#: main.c:403
+msgid "Select the language you wish to use for the installation."
+msgstr ""
+
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
+msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
+msgstr ""
+
+#: main.c:426
+#, c-format
+msgid ""
+"Welcome to the %s installation program.\n"
+"\n"
+"Selecting Cancel on any of the following screens will reboot the computer."
+msgstr ""
+
+#: main.c:428
+msgid "Start installation"
+msgstr ""
+
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr ""
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
+msgstr ""
+
+#: main.c:501
+msgid "Downloading installation image..."
+msgstr ""
+
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
+msgstr ""
+
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr ""
+
+#: main.c:543
+msgid "License Agreement"
+msgstr ""
+
+#: main.c:544
+msgid "License not accepted!"
+msgstr ""
+
+#: main.c:566
+msgid "No hard disk found."
+msgstr ""
+
+#: main.c:587
+msgid "Disk Selection"
+msgstr ""
+
+#: main.c:588
+msgid ""
+"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
+"\n"
+"ALL DATA ON THE DISK WILL BE DESTROYED."
+msgstr ""
+
+#: main.c:599
+msgid ""
+"No disk has been selected.\n"
+"\n"
+"Please select one or more disks you want to install IPFire on."
+msgstr ""
+
+#: main.c:617
+#, c-format
+msgid ""
+"The installation program will now prepare the chosen harddisk:\n"
+"\n"
+" %s\n"
+"\n"
+"Do you agree to continue?"
+msgstr ""
+
+#: main.c:619
+msgid "Disk Setup"
+msgstr ""
+
+#: main.c:620 main.c:630
+msgid "Delete all data"
+msgstr ""
+
+#: main.c:627
+#, c-format
+msgid ""
+"The installation program will now set up a RAID configuration on the selected harddisks:\n"
+"\n"
+" %s\n"
+" %s\n"
+"\n"
+"Do you agree to continue?"
+msgstr ""
+
+#: main.c:629
+msgid "RAID Setup"
+msgstr ""
+
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
+msgstr ""
+
+#: main.c:655
+msgid "Your harddisk is too small."
+msgstr ""
+
+#: main.c:671
+msgid ""
+"Your harddisk is very small, but you can continue without a swap partition."
+msgstr ""
+
+#: main.c:684
+msgid "ext4 Filesystem"
+msgstr ""
+
+#: main.c:685
+msgid "ext4 Filesystem without journal"
+msgstr ""
+
+#: main.c:686
+msgid "XFS Filesystem"
+msgstr ""
+
+#: main.c:687
+msgid "ReiserFS Filesystem"
+msgstr ""
+
+#: main.c:701
+msgid "Filesystem Selection"
+msgstr ""
+
+#: main.c:701
+msgid "Please choose your filesystem:"
+msgstr ""
+
+#: main.c:712
+msgid "Building RAID..."
+msgstr ""
+
+#: main.c:716
+msgid "Unable to build the RAID."
+msgstr ""
+
+#: main.c:728
+msgid "Partitioning disk..."
+msgstr ""
+
+#: main.c:732
+msgid "Unable to partition the disk."
+msgstr ""
+
+#: main.c:739
+msgid "Creating filesystems..."
+msgstr ""
+
+#: main.c:743
+msgid "Unable to create filesystems."
+msgstr ""
+
+#: main.c:749
+msgid "Unable to mount filesystems."
+msgstr ""
+
+#: main.c:760
+msgid "Installing the system..."
+msgstr ""
+
+#: main.c:761
+msgid "Unable to install the system."
+msgstr ""
+
+#: main.c:777
+msgid "Installing the language cache..."
+msgstr ""
+
+#: main.c:778
+msgid "Unable to install the language cache."
+msgstr ""
+
+#: main.c:783
+msgid "Installing the bootloader..."
+msgstr ""
+
+#: main.c:790
+msgid "Unable to open /etc/default/grub for writing."
+msgstr ""
+
+#: main.c:812
+msgid "Unable to install the bootloader."
+msgstr ""
+
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
+#, c-format
+msgid ""
+"%s was successfully installed!\n"
+"\n"
+"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
+msgstr ""
+
+#: main.c:882
+msgid "Congratulations!"
+msgstr ""
+
+#: main.c:882
+msgid "Reboot"
+msgstr ""
+
+#: main.c:893
+msgid "Setup has failed. Press Ok to reboot."
+msgstr ""
diff --git a/src/installer/po/km_KH.po b/src/installer/po/km_KH.po
index 0f7f946..b4e5f89 100644
--- a/src/installer/po/km_KH.po
+++ b/src/installer/po/km_KH.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
"Language-Team: Khmer (Cambodia) (http://www.transifex.com/projects/p/ipfire/language/km_KH/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,40 @@ msgstr ""
"Language: km_KH\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
msgid "OK"
msgstr ""
-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
msgid "Cancel"
msgstr ""
-#: main.c:145
+#: main.c:176
msgid "I accept this license"
msgstr ""
-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
msgid "Language selection"
msgstr ""
-#: main.c:312
+#: main.c:403
msgid "Select the language you wish to use for the installation."
msgstr ""
-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr ""
-#: main.c:328
+#: main.c:426
#, c-format
msgid ""
"Welcome to the %s installation program.\n"
@@ -49,53 +58,104 @@ msgid ""
"Selecting Cancel on any of the following screens will reboot the computer."
msgstr ""
-#: main.c:330
+#: main.c:428
msgid "Start installation"
msgstr ""
-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr ""
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
msgstr ""
-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:501
+msgid "Downloading installation image..."
msgstr ""
-#: main.c:342
-msgid "Download error"
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
msgstr ""
-#: main.c:376
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr ""
+
+#: main.c:543
msgid "License Agreement"
msgstr ""
-#: main.c:377
+#: main.c:544
msgid "License not accepted!"
msgstr ""
-#: main.c:399
+#: main.c:566
msgid "No hard disk found."
msgstr ""
-#: main.c:418
+#: main.c:587
msgid "Disk Selection"
msgstr ""
-#: main.c:419
+#: main.c:588
msgid ""
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
"\n"
"ALL DATA ON THE DISK WILL BE DESTROYED."
msgstr ""
-#: main.c:430
+#: main.c:599
msgid ""
"No disk has been selected.\n"
"\n"
"Please select one or more disks you want to install IPFire on."
msgstr ""
-#: main.c:443
+#: main.c:617
#, c-format
msgid ""
"The installation program will now prepare the chosen harddisk:\n"
@@ -105,15 +165,15 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:445
+#: main.c:619
msgid "Disk Setup"
msgstr ""
-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
msgid "Delete all data"
msgstr ""
-#: main.c:453
+#: main.c:627
#, c-format
msgid ""
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -124,104 +184,131 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:455
+#: main.c:629
msgid "RAID Setup"
msgstr ""
-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
msgstr ""
-#: main.c:480
+#: main.c:655
msgid "Your harddisk is too small."
msgstr ""
-#: main.c:494
+#: main.c:671
msgid ""
"Your harddisk is very small, but you can continue without a swap partition."
msgstr ""
-#: main.c:506
+#: main.c:684
msgid "ext4 Filesystem"
msgstr ""
-#: main.c:507
+#: main.c:685
msgid "ext4 Filesystem without journal"
msgstr ""
-#: main.c:508
+#: main.c:686
msgid "XFS Filesystem"
msgstr ""
-#: main.c:509
+#: main.c:687
msgid "ReiserFS Filesystem"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Filesystem Selection"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Please choose your filesystem:"
msgstr ""
-#: main.c:534
+#: main.c:712
msgid "Building RAID..."
msgstr ""
-#: main.c:538
+#: main.c:716
msgid "Unable to build the RAID."
msgstr ""
-#: main.c:550
+#: main.c:728
msgid "Partitioning disk..."
msgstr ""
-#: main.c:554
+#: main.c:732
msgid "Unable to partition the disk."
msgstr ""
-#: main.c:561
+#: main.c:739
msgid "Creating filesystems..."
msgstr ""
-#: main.c:565
+#: main.c:743
msgid "Unable to create filesystems."
msgstr ""
-#: main.c:571
+#: main.c:749
msgid "Unable to mount filesystems."
msgstr ""
-#: main.c:582
+#: main.c:760
msgid "Installing the system..."
msgstr ""
-#: main.c:583
+#: main.c:761
msgid "Unable to install the system."
msgstr ""
-#: main.c:599
+#: main.c:777
msgid "Installing the language cache..."
msgstr ""
-#: main.c:600
+#: main.c:778
msgid "Unable to install the language cache."
msgstr ""
-#: main.c:605
+#: main.c:783
msgid "Installing the bootloader..."
msgstr ""
-#: main.c:612
+#: main.c:790
msgid "Unable to open /etc/default/grub for writing."
msgstr ""
-#: main.c:634
+#: main.c:812
msgid "Unable to install the bootloader."
msgstr ""
-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
#, c-format
msgid ""
"%s was successfully installed!\n"
@@ -229,14 +316,14 @@ msgid ""
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Congratulations!"
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Reboot"
msgstr ""
-#: main.c:682
+#: main.c:893
msgid "Setup has failed. Press Ok to reboot."
msgstr ""
diff --git a/src/installer/po/nl.po b/src/installer/po/nl.po
index 6e2f7ea..41908ac 100644
--- a/src/installer/po/nl.po
+++ b/src/installer/po/nl.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/ipfire/language/nl/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,40 @@ msgstr ""
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
msgid "OK"
msgstr ""
-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
msgid "Cancel"
msgstr ""
-#: main.c:145
+#: main.c:176
msgid "I accept this license"
msgstr ""
-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
msgid "Language selection"
msgstr ""
-#: main.c:312
+#: main.c:403
msgid "Select the language you wish to use for the installation."
msgstr ""
-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr ""
-#: main.c:328
+#: main.c:426
#, c-format
msgid ""
"Welcome to the %s installation program.\n"
@@ -49,53 +58,104 @@ msgid ""
"Selecting Cancel on any of the following screens will reboot the computer."
msgstr ""
-#: main.c:330
+#: main.c:428
msgid "Start installation"
msgstr ""
-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr ""
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
msgstr ""
-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:501
+msgid "Downloading installation image..."
msgstr ""
-#: main.c:342
-msgid "Download error"
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
msgstr ""
-#: main.c:376
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr ""
+
+#: main.c:543
msgid "License Agreement"
msgstr ""
-#: main.c:377
+#: main.c:544
msgid "License not accepted!"
msgstr ""
-#: main.c:399
+#: main.c:566
msgid "No hard disk found."
msgstr ""
-#: main.c:418
+#: main.c:587
msgid "Disk Selection"
msgstr ""
-#: main.c:419
+#: main.c:588
msgid ""
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
"\n"
"ALL DATA ON THE DISK WILL BE DESTROYED."
msgstr ""
-#: main.c:430
+#: main.c:599
msgid ""
"No disk has been selected.\n"
"\n"
"Please select one or more disks you want to install IPFire on."
msgstr ""
-#: main.c:443
+#: main.c:617
#, c-format
msgid ""
"The installation program will now prepare the chosen harddisk:\n"
@@ -105,15 +165,15 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:445
+#: main.c:619
msgid "Disk Setup"
msgstr ""
-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
msgid "Delete all data"
msgstr ""
-#: main.c:453
+#: main.c:627
#, c-format
msgid ""
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -124,104 +184,131 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:455
+#: main.c:629
msgid "RAID Setup"
msgstr ""
-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
msgstr ""
-#: main.c:480
+#: main.c:655
msgid "Your harddisk is too small."
msgstr ""
-#: main.c:494
+#: main.c:671
msgid ""
"Your harddisk is very small, but you can continue without a swap partition."
msgstr ""
-#: main.c:506
+#: main.c:684
msgid "ext4 Filesystem"
msgstr ""
-#: main.c:507
+#: main.c:685
msgid "ext4 Filesystem without journal"
msgstr ""
-#: main.c:508
+#: main.c:686
msgid "XFS Filesystem"
msgstr ""
-#: main.c:509
+#: main.c:687
msgid "ReiserFS Filesystem"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Filesystem Selection"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Please choose your filesystem:"
msgstr ""
-#: main.c:534
+#: main.c:712
msgid "Building RAID..."
msgstr ""
-#: main.c:538
+#: main.c:716
msgid "Unable to build the RAID."
msgstr ""
-#: main.c:550
+#: main.c:728
msgid "Partitioning disk..."
msgstr ""
-#: main.c:554
+#: main.c:732
msgid "Unable to partition the disk."
msgstr ""
-#: main.c:561
+#: main.c:739
msgid "Creating filesystems..."
msgstr ""
-#: main.c:565
+#: main.c:743
msgid "Unable to create filesystems."
msgstr ""
-#: main.c:571
+#: main.c:749
msgid "Unable to mount filesystems."
msgstr ""
-#: main.c:582
+#: main.c:760
msgid "Installing the system..."
msgstr ""
-#: main.c:583
+#: main.c:761
msgid "Unable to install the system."
msgstr ""
-#: main.c:599
+#: main.c:777
msgid "Installing the language cache..."
msgstr ""
-#: main.c:600
+#: main.c:778
msgid "Unable to install the language cache."
msgstr ""
-#: main.c:605
+#: main.c:783
msgid "Installing the bootloader..."
msgstr ""
-#: main.c:612
+#: main.c:790
msgid "Unable to open /etc/default/grub for writing."
msgstr ""
-#: main.c:634
+#: main.c:812
msgid "Unable to install the bootloader."
msgstr ""
-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
#, c-format
msgid ""
"%s was successfully installed!\n"
@@ -229,14 +316,14 @@ msgid ""
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Congratulations!"
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Reboot"
msgstr ""
-#: main.c:682
+#: main.c:893
msgid "Setup has failed. Press Ok to reboot."
msgstr ""
diff --git a/src/installer/po/pl.po b/src/installer/po/pl.po
index cfad680..4abe195 100644
--- a/src/installer/po/pl.po
+++ b/src/installer/po/pl.po
@@ -3,12 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# btelega <btelega(a)gmail.com>, 2014
+# Przemysław Karpeta <przemyslaw.karpeta(a)gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/ipfire/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -17,85 +19,145 @@ msgstr ""
"Language: pl\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
msgid "OK"
-msgstr ""
+msgstr "OK"
-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
-#: main.c:145
+#: main.c:176
msgid "I accept this license"
+msgstr "Akceptuje licencje"
+
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
msgstr ""
-#: main.c:312
+#: main.c:403
msgid "Language selection"
-msgstr ""
+msgstr "Wybór języka"
-#: main.c:312
+#: main.c:403
msgid "Select the language you wish to use for the installation."
+msgstr "Wybierz język jaki chcesz użyć do tej instalacji."
+
+#: main.c:418
+msgid "Unattended mode"
msgstr ""
-#: main.c:323
+#: main.c:420
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
-msgstr ""
+msgstr "<Tab>/<Alt-Tab> przełącza między pozycjami | <Space> wybiera | <F12> następny ekran"
-#: main.c:328
+#: main.c:426
#, c-format
msgid ""
"Welcome to the %s installation program.\n"
"\n"
"Selecting Cancel on any of the following screens will reboot the computer."
-msgstr ""
+msgstr "Witaj w instalatorze %s.\n\nWybranie Cancel na dowolnym z następnych ekranów spowoduje restart komputera."
-#: main.c:330
+#: main.c:428
msgid "Start installation"
+msgstr "Rozpoczynam instalację"
+
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
msgstr ""
-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
msgstr ""
-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
msgstr ""
-#: main.c:342
-msgid "Download error"
+#: main.c:460
+msgid "Download installation image"
msgstr ""
-#: main.c:376
-msgid "License Agreement"
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
msgstr ""
-#: main.c:377
-msgid "License not accepted!"
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
msgstr ""
-#: main.c:399
-msgid "No hard disk found."
+#: main.c:487 main.c:516
+msgid "Retry"
msgstr ""
-#: main.c:418
-msgid "Disk Selection"
+#: main.c:501
+msgid "Downloading installation image..."
+msgstr ""
+
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
+msgstr ""
+
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
msgstr ""
-#: main.c:419
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr ""
+
+#: main.c:543
+msgid "License Agreement"
+msgstr "Umowa Licencyjna"
+
+#: main.c:544
+msgid "License not accepted!"
+msgstr "Licencja nie została zaakceptowana !"
+
+#: main.c:566
+msgid "No hard disk found."
+msgstr "Nie znaleziono twardego dysku."
+
+#: main.c:587
+msgid "Disk Selection"
+msgstr "Wybór Dysku"
+
+#: main.c:588
msgid ""
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
"\n"
"ALL DATA ON THE DISK WILL BE DESTROYED."
-msgstr ""
+msgstr "Wybierz dysk(dyski), na którym ma zostać zainstalowany IPFire. Wybrane urządzenia zostaną podzielone na partycje, a na tych partycjach zostaną utworzone systemy plików. \n\nWSZYSTKIE ISTNIEJĄCE NA DYSKACH DANE ZOSTANĄ ZNISZCZONE."
-#: main.c:430
+#: main.c:599
msgid ""
"No disk has been selected.\n"
"\n"
"Please select one or more disks you want to install IPFire on."
-msgstr ""
+msgstr "Nie wybrano żadnego dysku.\n\nWybierz jeden lub więcej dysków, na których chesz zainstalować IPFire."
-#: main.c:443
+#: main.c:617
#, c-format
msgid ""
"The installation program will now prepare the chosen harddisk:\n"
@@ -103,17 +165,17 @@ msgid ""
" %s\n"
"\n"
"Do you agree to continue?"
-msgstr ""
+msgstr "Instalator przygotuje teraz wybrany dysk twardy:\n\n %s\n\nCzy kontynuować ?"
-#: main.c:445
+#: main.c:619
msgid "Disk Setup"
-msgstr ""
+msgstr "Konfiguracja Dysku"
-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
msgid "Delete all data"
-msgstr ""
+msgstr "Usuń wszystkie dane"
-#: main.c:453
+#: main.c:627
#, c-format
msgid ""
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -122,121 +184,148 @@ msgid ""
" %s\n"
"\n"
"Do you agree to continue?"
-msgstr ""
+msgstr "Instalator skonfiguruje teraz RAID na wybranych dyskach twardych:\n\n %s\n %s\n\nCzy kontynuować ?"
-#: main.c:455
+#: main.c:629
msgid "RAID Setup"
-msgstr ""
+msgstr "Konfiguracja RAID"
-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
msgstr ""
-#: main.c:480
+#: main.c:655
msgid "Your harddisk is too small."
-msgstr ""
+msgstr "Twój dysk twardy jest za mały"
-#: main.c:494
+#: main.c:671
msgid ""
"Your harddisk is very small, but you can continue without a swap partition."
-msgstr ""
+msgstr "Dysk twardy jest bardzo mały, ale można kontynuować bez partycji swap."
-#: main.c:506
+#: main.c:684
msgid "ext4 Filesystem"
-msgstr ""
+msgstr "ext4 Filesystem"
-#: main.c:507
+#: main.c:685
msgid "ext4 Filesystem without journal"
-msgstr ""
+msgstr "ext4 Filesystem bez dziennika"
-#: main.c:508
+#: main.c:686
msgid "XFS Filesystem"
-msgstr ""
+msgstr "XFS Filesystem"
-#: main.c:509
+#: main.c:687
msgid "ReiserFS Filesystem"
-msgstr ""
+msgstr "System plików ReiserFS"
-#: main.c:523
+#: main.c:701
msgid "Filesystem Selection"
-msgstr ""
+msgstr "System plików został wybrany"
-#: main.c:523
+#: main.c:701
msgid "Please choose your filesystem:"
-msgstr ""
+msgstr "Wybierz system plików:"
-#: main.c:534
+#: main.c:712
msgid "Building RAID..."
-msgstr ""
+msgstr "Tworzenie RAID ..."
-#: main.c:538
+#: main.c:716
msgid "Unable to build the RAID."
-msgstr ""
+msgstr "Nie udało się utworzyć RAID."
-#: main.c:550
+#: main.c:728
msgid "Partitioning disk..."
-msgstr ""
+msgstr "Partycjonowanie dysku..."
-#: main.c:554
+#: main.c:732
msgid "Unable to partition the disk."
-msgstr ""
+msgstr "Partycjonowanie dysku niemożliwe."
-#: main.c:561
+#: main.c:739
msgid "Creating filesystems..."
-msgstr ""
+msgstr "Tworzenie systemów plików..."
-#: main.c:565
+#: main.c:743
msgid "Unable to create filesystems."
-msgstr ""
+msgstr "Nie można utworzyć systemów plików."
-#: main.c:571
+#: main.c:749
msgid "Unable to mount filesystems."
-msgstr ""
+msgstr "Nie można zamontować systemów plików."
-#: main.c:582
+#: main.c:760
msgid "Installing the system..."
-msgstr ""
+msgstr "Instalowanie systemu..."
-#: main.c:583
+#: main.c:761
msgid "Unable to install the system."
-msgstr ""
+msgstr "Nie można zainstalować systemu."
-#: main.c:599
+#: main.c:777
msgid "Installing the language cache..."
-msgstr ""
+msgstr "Instalacja pamięci podręcznej języków."
-#: main.c:600
+#: main.c:778
msgid "Unable to install the language cache."
-msgstr ""
+msgstr "Nie można zainstalować pamięci podręcznej języków."
-#: main.c:605
+#: main.c:783
msgid "Installing the bootloader..."
-msgstr ""
+msgstr "Instalacja programu rozruchowego..."
-#: main.c:612
+#: main.c:790
msgid "Unable to open /etc/default/grub for writing."
-msgstr ""
+msgstr "Nie można otworzyć /etc/default/grub do zapisu."
-#: main.c:634
+#: main.c:812
msgid "Unable to install the bootloader."
+msgstr "Nie mogę zainstalować programu rozruchowego."
+
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
msgstr ""
-#: main.c:666
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
#, c-format
msgid ""
"%s was successfully installed!\n"
"\n"
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
-msgstr ""
+msgstr "Instalacja %s zakończyła się sukcesem !\n\nProsze usunąć nośnik instalacyjny z systemu i wcisnąć przycisk restartu. Po restarcie systemu pojawi się prośba o skonfigurowanie sieci i ustawienie haseł systemowych. Następnie należy oworzyć w przeglądarce WWW adres https://%s:444 (lub inną nazwę, ktora została nadana %s), aby uzyskać dostęp do internetowej konsoli konfiguracyjnej."
-#: main.c:671
+#: main.c:882
msgid "Congratulations!"
-msgstr ""
+msgstr "Gratulacje!"
-#: main.c:671
+#: main.c:882
msgid "Reboot"
-msgstr ""
+msgstr "Uruchom ponownie"
-#: main.c:682
+#: main.c:893
msgid "Setup has failed. Press Ok to reboot."
-msgstr ""
+msgstr "Konfiguracja nieudana. Wciśnij Ok, aby zrestartować."
diff --git a/src/installer/po/pt_BR.po b/src/installer/po/pt_BR.po
index 0152ede..dba4b65 100644
--- a/src/installer/po/pt_BR.po
+++ b/src/installer/po/pt_BR.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/ipfire/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -19,31 +19,40 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
msgid "OK"
msgstr "Ok"
-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
msgid "Cancel"
msgstr "Cancelar"
-#: main.c:145
+#: main.c:176
msgid "I accept this license"
msgstr "Eu aceito esta licença"
-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
msgid "Language selection"
msgstr ""
-#: main.c:312
+#: main.c:403
msgid "Select the language you wish to use for the installation."
msgstr ""
-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr "<Tab>/<Alt-Tab> entre os elementos | <Space> Selecione | <F12> próxima tela"
-#: main.c:328
+#: main.c:426
#, c-format
msgid ""
"Welcome to the %s installation program.\n"
@@ -51,53 +60,104 @@ msgid ""
"Selecting Cancel on any of the following screens will reboot the computer."
msgstr ""
-#: main.c:330
+#: main.c:428
msgid "Start installation"
msgstr "Iniciar a instalação"
-#: main.c:339
-msgid "No local source media found. Starting download."
-msgstr "Nenhuma fonte de mídia local encontrada. Iniciando download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr ""
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
-#: main.c:340
-msgid "Downloading installation image ..."
-msgstr "Baixando imagem de instalação ..."
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
-#: main.c:342
-msgid "Download error"
-msgstr "Erro de download"
+#: main.c:487 main.c:516
+msgid "Retry"
+msgstr ""
-#: main.c:376
+#: main.c:501
+msgid "Downloading installation image..."
+msgstr ""
+
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
+msgstr ""
+
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr ""
+
+#: main.c:543
msgid "License Agreement"
msgstr ""
-#: main.c:377
+#: main.c:544
msgid "License not accepted!"
msgstr "Licença não aceita!"
-#: main.c:399
+#: main.c:566
msgid "No hard disk found."
msgstr "Nenhum disco rígido foi encontrado."
-#: main.c:418
+#: main.c:587
msgid "Disk Selection"
msgstr "Seleção de disco"
-#: main.c:419
+#: main.c:588
msgid ""
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
"\n"
"ALL DATA ON THE DISK WILL BE DESTROYED."
msgstr "Selecione o disco(s) que deseja instalar o IPFire. Primeiramente o mesmo será particionado, e então, as partições terão um sistema de arquivos que você escolher. \n\nTODOS OS DADOS NO DISCO SERÃO DESTRUÍDOS."
-#: main.c:430
+#: main.c:599
msgid ""
"No disk has been selected.\n"
"\n"
"Please select one or more disks you want to install IPFire on."
msgstr "Nenhum disco foi selecionado.\n\nPor favor seleccione um ou mais discos que você deseja instalar o IPFire."
-#: main.c:443
+#: main.c:617
#, c-format
msgid ""
"The installation program will now prepare the chosen harddisk:\n"
@@ -107,15 +167,15 @@ msgid ""
"Do you agree to continue?"
msgstr "O programa de instalação irá agora preparar o disco rígido escolhido:\n\n%s \n\nVocê concorda em continuar?"
-#: main.c:445
+#: main.c:619
msgid "Disk Setup"
msgstr "Configuração de Discos"
-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
msgid "Delete all data"
msgstr "Apagar todos os dados"
-#: main.c:453
+#: main.c:627
#, c-format
msgid ""
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -126,104 +186,131 @@ msgid ""
"Do you agree to continue?"
msgstr "O programa de instalação ira agora definir uma configuração de RAID nos discos rígidos selecionados:\n\n%s\n%s\n \nVocê concorda continuar?"
-#: main.c:455
+#: main.c:629
msgid "RAID Setup"
msgstr "Configuração de RAID"
-#: main.c:466
-msgid "You disk configuration is currently not supported."
-msgstr "Sua configuração de disco não é suportada atualmente."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
+msgstr ""
-#: main.c:480
+#: main.c:655
msgid "Your harddisk is too small."
msgstr "Seu disco rígido é muito pequeno."
-#: main.c:494
+#: main.c:671
msgid ""
"Your harddisk is very small, but you can continue without a swap partition."
msgstr ""
-#: main.c:506
+#: main.c:684
msgid "ext4 Filesystem"
msgstr "Sistema de arquivos ext4"
-#: main.c:507
+#: main.c:685
msgid "ext4 Filesystem without journal"
msgstr "Sistema de arquivos ext4 sem journal"
-#: main.c:508
+#: main.c:686
msgid "XFS Filesystem"
msgstr "Sistema de arquivos XFS"
-#: main.c:509
+#: main.c:687
msgid "ReiserFS Filesystem"
msgstr "Sistema de arquivos ReiserFS"
-#: main.c:523
+#: main.c:701
msgid "Filesystem Selection"
msgstr "Seleção do sistema de arquivos"
-#: main.c:523
+#: main.c:701
msgid "Please choose your filesystem:"
msgstr "Por favor, escolha o seu sistema de arquivos:"
-#: main.c:534
+#: main.c:712
msgid "Building RAID..."
msgstr "Construindo o RAID..."
-#: main.c:538
+#: main.c:716
msgid "Unable to build the RAID."
msgstr "Não foi possível construir o RAID."
-#: main.c:550
+#: main.c:728
msgid "Partitioning disk..."
msgstr "Particionando o disco..."
-#: main.c:554
+#: main.c:732
msgid "Unable to partition the disk."
msgstr "Não foi possível particionar o disco."
-#: main.c:561
+#: main.c:739
msgid "Creating filesystems..."
msgstr "Criando o sistema de arquivos..."
-#: main.c:565
+#: main.c:743
msgid "Unable to create filesystems."
msgstr "Não foi possível criar sistemas de arquivos."
-#: main.c:571
+#: main.c:749
msgid "Unable to mount filesystems."
msgstr "Não foi possível montar sistemas de arquivos."
-#: main.c:582
+#: main.c:760
msgid "Installing the system..."
msgstr "Instalando o sistema..."
-#: main.c:583
+#: main.c:761
msgid "Unable to install the system."
msgstr "Não é possível instalar o sistema."
-#: main.c:599
+#: main.c:777
msgid "Installing the language cache..."
msgstr "Instalando o cache de linguagem..."
-#: main.c:600
+#: main.c:778
msgid "Unable to install the language cache."
msgstr "Não foi possível instalar o cache de linguagem."
-#: main.c:605
+#: main.c:783
msgid "Installing the bootloader..."
msgstr "Instalando o gerenciador de inicialização..."
-#: main.c:612
+#: main.c:790
msgid "Unable to open /etc/default/grub for writing."
msgstr ""
-#: main.c:634
+#: main.c:812
msgid "Unable to install the bootloader."
msgstr "Não foi possível instalar o gerenciador de inicialização."
-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
#, c-format
msgid ""
"%s was successfully installed!\n"
@@ -231,14 +318,14 @@ msgid ""
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Congratulations!"
msgstr "Parabéns!"
-#: main.c:671
+#: main.c:882
msgid "Reboot"
msgstr "Reiniciar"
-#: main.c:682
+#: main.c:893
msgid "Setup has failed. Press Ok to reboot."
msgstr ""
diff --git a/src/installer/po/pt_PT.po b/src/installer/po/pt_PT.po
index ee41d97..5b70188 100644
--- a/src/installer/po/pt_PT.po
+++ b/src/installer/po/pt_PT.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/ipfire/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,40 @@ msgstr ""
"Language: pt_PT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
msgid "OK"
msgstr ""
-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
msgid "Cancel"
msgstr ""
-#: main.c:145
+#: main.c:176
msgid "I accept this license"
msgstr ""
-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
msgid "Language selection"
msgstr ""
-#: main.c:312
+#: main.c:403
msgid "Select the language you wish to use for the installation."
msgstr ""
-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr ""
-#: main.c:328
+#: main.c:426
#, c-format
msgid ""
"Welcome to the %s installation program.\n"
@@ -49,53 +58,104 @@ msgid ""
"Selecting Cancel on any of the following screens will reboot the computer."
msgstr ""
-#: main.c:330
+#: main.c:428
msgid "Start installation"
msgstr ""
-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr ""
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
msgstr ""
-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:501
+msgid "Downloading installation image..."
msgstr ""
-#: main.c:342
-msgid "Download error"
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
msgstr ""
-#: main.c:376
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr ""
+
+#: main.c:543
msgid "License Agreement"
msgstr ""
-#: main.c:377
+#: main.c:544
msgid "License not accepted!"
msgstr ""
-#: main.c:399
+#: main.c:566
msgid "No hard disk found."
msgstr ""
-#: main.c:418
+#: main.c:587
msgid "Disk Selection"
msgstr ""
-#: main.c:419
+#: main.c:588
msgid ""
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
"\n"
"ALL DATA ON THE DISK WILL BE DESTROYED."
msgstr ""
-#: main.c:430
+#: main.c:599
msgid ""
"No disk has been selected.\n"
"\n"
"Please select one or more disks you want to install IPFire on."
msgstr ""
-#: main.c:443
+#: main.c:617
#, c-format
msgid ""
"The installation program will now prepare the chosen harddisk:\n"
@@ -105,15 +165,15 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:445
+#: main.c:619
msgid "Disk Setup"
msgstr ""
-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
msgid "Delete all data"
msgstr ""
-#: main.c:453
+#: main.c:627
#, c-format
msgid ""
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -124,104 +184,131 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:455
+#: main.c:629
msgid "RAID Setup"
msgstr ""
-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
msgstr ""
-#: main.c:480
+#: main.c:655
msgid "Your harddisk is too small."
msgstr ""
-#: main.c:494
+#: main.c:671
msgid ""
"Your harddisk is very small, but you can continue without a swap partition."
msgstr ""
-#: main.c:506
+#: main.c:684
msgid "ext4 Filesystem"
msgstr ""
-#: main.c:507
+#: main.c:685
msgid "ext4 Filesystem without journal"
msgstr ""
-#: main.c:508
+#: main.c:686
msgid "XFS Filesystem"
msgstr ""
-#: main.c:509
+#: main.c:687
msgid "ReiserFS Filesystem"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Filesystem Selection"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Please choose your filesystem:"
msgstr ""
-#: main.c:534
+#: main.c:712
msgid "Building RAID..."
msgstr ""
-#: main.c:538
+#: main.c:716
msgid "Unable to build the RAID."
msgstr ""
-#: main.c:550
+#: main.c:728
msgid "Partitioning disk..."
msgstr ""
-#: main.c:554
+#: main.c:732
msgid "Unable to partition the disk."
msgstr ""
-#: main.c:561
+#: main.c:739
msgid "Creating filesystems..."
msgstr ""
-#: main.c:565
+#: main.c:743
msgid "Unable to create filesystems."
msgstr ""
-#: main.c:571
+#: main.c:749
msgid "Unable to mount filesystems."
msgstr ""
-#: main.c:582
+#: main.c:760
msgid "Installing the system..."
msgstr ""
-#: main.c:583
+#: main.c:761
msgid "Unable to install the system."
msgstr ""
-#: main.c:599
+#: main.c:777
msgid "Installing the language cache..."
msgstr ""
-#: main.c:600
+#: main.c:778
msgid "Unable to install the language cache."
msgstr ""
-#: main.c:605
+#: main.c:783
msgid "Installing the bootloader..."
msgstr ""
-#: main.c:612
+#: main.c:790
msgid "Unable to open /etc/default/grub for writing."
msgstr ""
-#: main.c:634
+#: main.c:812
msgid "Unable to install the bootloader."
msgstr ""
-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
#, c-format
msgid ""
"%s was successfully installed!\n"
@@ -229,14 +316,14 @@ msgid ""
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Congratulations!"
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Reboot"
msgstr ""
-#: main.c:682
+#: main.c:893
msgid "Setup has failed. Press Ok to reboot."
msgstr ""
diff --git a/src/installer/po/ro_RO.po b/src/installer/po/ro_RO.po
index 7fc70c8..6601c0b 100644
--- a/src/installer/po/ro_RO.po
+++ b/src/installer/po/ro_RO.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/ipfire/language/ro_RO/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,40 @@ msgstr ""
"Language: ro_RO\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
msgid "OK"
msgstr ""
-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
msgid "Cancel"
msgstr ""
-#: main.c:145
+#: main.c:176
msgid "I accept this license"
msgstr ""
-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
msgid "Language selection"
msgstr ""
-#: main.c:312
+#: main.c:403
msgid "Select the language you wish to use for the installation."
msgstr ""
-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr ""
-#: main.c:328
+#: main.c:426
#, c-format
msgid ""
"Welcome to the %s installation program.\n"
@@ -49,53 +58,104 @@ msgid ""
"Selecting Cancel on any of the following screens will reboot the computer."
msgstr ""
-#: main.c:330
+#: main.c:428
msgid "Start installation"
msgstr ""
-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr ""
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
msgstr ""
-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:501
+msgid "Downloading installation image..."
msgstr ""
-#: main.c:342
-msgid "Download error"
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
msgstr ""
-#: main.c:376
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr ""
+
+#: main.c:543
msgid "License Agreement"
msgstr ""
-#: main.c:377
+#: main.c:544
msgid "License not accepted!"
msgstr ""
-#: main.c:399
+#: main.c:566
msgid "No hard disk found."
msgstr ""
-#: main.c:418
+#: main.c:587
msgid "Disk Selection"
msgstr ""
-#: main.c:419
+#: main.c:588
msgid ""
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
"\n"
"ALL DATA ON THE DISK WILL BE DESTROYED."
msgstr ""
-#: main.c:430
+#: main.c:599
msgid ""
"No disk has been selected.\n"
"\n"
"Please select one or more disks you want to install IPFire on."
msgstr ""
-#: main.c:443
+#: main.c:617
#, c-format
msgid ""
"The installation program will now prepare the chosen harddisk:\n"
@@ -105,15 +165,15 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:445
+#: main.c:619
msgid "Disk Setup"
msgstr ""
-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
msgid "Delete all data"
msgstr ""
-#: main.c:453
+#: main.c:627
#, c-format
msgid ""
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -124,104 +184,131 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:455
+#: main.c:629
msgid "RAID Setup"
msgstr ""
-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
msgstr ""
-#: main.c:480
+#: main.c:655
msgid "Your harddisk is too small."
msgstr ""
-#: main.c:494
+#: main.c:671
msgid ""
"Your harddisk is very small, but you can continue without a swap partition."
msgstr ""
-#: main.c:506
+#: main.c:684
msgid "ext4 Filesystem"
msgstr ""
-#: main.c:507
+#: main.c:685
msgid "ext4 Filesystem without journal"
msgstr ""
-#: main.c:508
+#: main.c:686
msgid "XFS Filesystem"
msgstr ""
-#: main.c:509
+#: main.c:687
msgid "ReiserFS Filesystem"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Filesystem Selection"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Please choose your filesystem:"
msgstr ""
-#: main.c:534
+#: main.c:712
msgid "Building RAID..."
msgstr ""
-#: main.c:538
+#: main.c:716
msgid "Unable to build the RAID."
msgstr ""
-#: main.c:550
+#: main.c:728
msgid "Partitioning disk..."
msgstr ""
-#: main.c:554
+#: main.c:732
msgid "Unable to partition the disk."
msgstr ""
-#: main.c:561
+#: main.c:739
msgid "Creating filesystems..."
msgstr ""
-#: main.c:565
+#: main.c:743
msgid "Unable to create filesystems."
msgstr ""
-#: main.c:571
+#: main.c:749
msgid "Unable to mount filesystems."
msgstr ""
-#: main.c:582
+#: main.c:760
msgid "Installing the system..."
msgstr ""
-#: main.c:583
+#: main.c:761
msgid "Unable to install the system."
msgstr ""
-#: main.c:599
+#: main.c:777
msgid "Installing the language cache..."
msgstr ""
-#: main.c:600
+#: main.c:778
msgid "Unable to install the language cache."
msgstr ""
-#: main.c:605
+#: main.c:783
msgid "Installing the bootloader..."
msgstr ""
-#: main.c:612
+#: main.c:790
msgid "Unable to open /etc/default/grub for writing."
msgstr ""
-#: main.c:634
+#: main.c:812
msgid "Unable to install the bootloader."
msgstr ""
-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
#, c-format
msgid ""
"%s was successfully installed!\n"
@@ -229,14 +316,14 @@ msgid ""
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Congratulations!"
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Reboot"
msgstr ""
-#: main.c:682
+#: main.c:893
msgid "Setup has failed. Press Ok to reboot."
msgstr ""
diff --git a/src/installer/po/ru.po b/src/installer/po/ru.po
index e3e0a8b..7905236 100644
--- a/src/installer/po/ru.po
+++ b/src/installer/po/ru.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/ipfire/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,40 @@ msgstr ""
"Language: ru\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
msgid "OK"
msgstr ""
-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
msgid "Cancel"
msgstr ""
-#: main.c:145
+#: main.c:176
msgid "I accept this license"
msgstr ""
-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
msgid "Language selection"
msgstr ""
-#: main.c:312
+#: main.c:403
msgid "Select the language you wish to use for the installation."
msgstr ""
-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr ""
-#: main.c:328
+#: main.c:426
#, c-format
msgid ""
"Welcome to the %s installation program.\n"
@@ -49,53 +58,104 @@ msgid ""
"Selecting Cancel on any of the following screens will reboot the computer."
msgstr ""
-#: main.c:330
+#: main.c:428
msgid "Start installation"
msgstr ""
-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr ""
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
msgstr ""
-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:501
+msgid "Downloading installation image..."
msgstr ""
-#: main.c:342
-msgid "Download error"
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
msgstr ""
-#: main.c:376
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr ""
+
+#: main.c:543
msgid "License Agreement"
msgstr ""
-#: main.c:377
+#: main.c:544
msgid "License not accepted!"
msgstr ""
-#: main.c:399
+#: main.c:566
msgid "No hard disk found."
msgstr ""
-#: main.c:418
+#: main.c:587
msgid "Disk Selection"
msgstr ""
-#: main.c:419
+#: main.c:588
msgid ""
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
"\n"
"ALL DATA ON THE DISK WILL BE DESTROYED."
msgstr ""
-#: main.c:430
+#: main.c:599
msgid ""
"No disk has been selected.\n"
"\n"
"Please select one or more disks you want to install IPFire on."
msgstr ""
-#: main.c:443
+#: main.c:617
#, c-format
msgid ""
"The installation program will now prepare the chosen harddisk:\n"
@@ -105,15 +165,15 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:445
+#: main.c:619
msgid "Disk Setup"
msgstr ""
-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
msgid "Delete all data"
msgstr ""
-#: main.c:453
+#: main.c:627
#, c-format
msgid ""
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -124,104 +184,131 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:455
+#: main.c:629
msgid "RAID Setup"
msgstr ""
-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
msgstr ""
-#: main.c:480
+#: main.c:655
msgid "Your harddisk is too small."
msgstr ""
-#: main.c:494
+#: main.c:671
msgid ""
"Your harddisk is very small, but you can continue without a swap partition."
msgstr ""
-#: main.c:506
+#: main.c:684
msgid "ext4 Filesystem"
msgstr ""
-#: main.c:507
+#: main.c:685
msgid "ext4 Filesystem without journal"
msgstr ""
-#: main.c:508
+#: main.c:686
msgid "XFS Filesystem"
msgstr ""
-#: main.c:509
+#: main.c:687
msgid "ReiserFS Filesystem"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Filesystem Selection"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Please choose your filesystem:"
msgstr ""
-#: main.c:534
+#: main.c:712
msgid "Building RAID..."
msgstr ""
-#: main.c:538
+#: main.c:716
msgid "Unable to build the RAID."
msgstr ""
-#: main.c:550
+#: main.c:728
msgid "Partitioning disk..."
msgstr ""
-#: main.c:554
+#: main.c:732
msgid "Unable to partition the disk."
msgstr ""
-#: main.c:561
+#: main.c:739
msgid "Creating filesystems..."
msgstr ""
-#: main.c:565
+#: main.c:743
msgid "Unable to create filesystems."
msgstr ""
-#: main.c:571
+#: main.c:749
msgid "Unable to mount filesystems."
msgstr ""
-#: main.c:582
+#: main.c:760
msgid "Installing the system..."
msgstr ""
-#: main.c:583
+#: main.c:761
msgid "Unable to install the system."
msgstr ""
-#: main.c:599
+#: main.c:777
msgid "Installing the language cache..."
msgstr ""
-#: main.c:600
+#: main.c:778
msgid "Unable to install the language cache."
msgstr ""
-#: main.c:605
+#: main.c:783
msgid "Installing the bootloader..."
msgstr ""
-#: main.c:612
+#: main.c:790
msgid "Unable to open /etc/default/grub for writing."
msgstr ""
-#: main.c:634
+#: main.c:812
msgid "Unable to install the bootloader."
msgstr ""
-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
#, c-format
msgid ""
"%s was successfully installed!\n"
@@ -229,14 +316,14 @@ msgid ""
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Congratulations!"
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Reboot"
msgstr ""
-#: main.c:682
+#: main.c:893
msgid "Setup has failed. Press Ok to reboot."
msgstr ""
diff --git a/src/installer/po/rw.po b/src/installer/po/rw.po
new file mode 100644
index 0000000..e099182
--- /dev/null
+++ b/src/installer/po/rw.po
@@ -0,0 +1,329 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The IPFire Project (www.ipfire.org)
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: IPFire Project\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
+"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
+"Language-Team: Kinyarwanda (http://www.transifex.com/projects/p/ipfire/language/rw/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: rw\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
+msgid "OK"
+msgstr ""
+
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
+msgid "Cancel"
+msgstr ""
+
+#: main.c:176
+msgid "I accept this license"
+msgstr ""
+
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
+msgid "Language selection"
+msgstr ""
+
+#: main.c:403
+msgid "Select the language you wish to use for the installation."
+msgstr ""
+
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
+msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
+msgstr ""
+
+#: main.c:426
+#, c-format
+msgid ""
+"Welcome to the %s installation program.\n"
+"\n"
+"Selecting Cancel on any of the following screens will reboot the computer."
+msgstr ""
+
+#: main.c:428
+msgid "Start installation"
+msgstr ""
+
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr ""
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
+msgstr ""
+
+#: main.c:501
+msgid "Downloading installation image..."
+msgstr ""
+
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
+msgstr ""
+
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr ""
+
+#: main.c:543
+msgid "License Agreement"
+msgstr ""
+
+#: main.c:544
+msgid "License not accepted!"
+msgstr ""
+
+#: main.c:566
+msgid "No hard disk found."
+msgstr ""
+
+#: main.c:587
+msgid "Disk Selection"
+msgstr ""
+
+#: main.c:588
+msgid ""
+"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
+"\n"
+"ALL DATA ON THE DISK WILL BE DESTROYED."
+msgstr ""
+
+#: main.c:599
+msgid ""
+"No disk has been selected.\n"
+"\n"
+"Please select one or more disks you want to install IPFire on."
+msgstr ""
+
+#: main.c:617
+#, c-format
+msgid ""
+"The installation program will now prepare the chosen harddisk:\n"
+"\n"
+" %s\n"
+"\n"
+"Do you agree to continue?"
+msgstr ""
+
+#: main.c:619
+msgid "Disk Setup"
+msgstr ""
+
+#: main.c:620 main.c:630
+msgid "Delete all data"
+msgstr ""
+
+#: main.c:627
+#, c-format
+msgid ""
+"The installation program will now set up a RAID configuration on the selected harddisks:\n"
+"\n"
+" %s\n"
+" %s\n"
+"\n"
+"Do you agree to continue?"
+msgstr ""
+
+#: main.c:629
+msgid "RAID Setup"
+msgstr ""
+
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
+msgstr ""
+
+#: main.c:655
+msgid "Your harddisk is too small."
+msgstr ""
+
+#: main.c:671
+msgid ""
+"Your harddisk is very small, but you can continue without a swap partition."
+msgstr ""
+
+#: main.c:684
+msgid "ext4 Filesystem"
+msgstr ""
+
+#: main.c:685
+msgid "ext4 Filesystem without journal"
+msgstr ""
+
+#: main.c:686
+msgid "XFS Filesystem"
+msgstr ""
+
+#: main.c:687
+msgid "ReiserFS Filesystem"
+msgstr ""
+
+#: main.c:701
+msgid "Filesystem Selection"
+msgstr ""
+
+#: main.c:701
+msgid "Please choose your filesystem:"
+msgstr ""
+
+#: main.c:712
+msgid "Building RAID..."
+msgstr ""
+
+#: main.c:716
+msgid "Unable to build the RAID."
+msgstr ""
+
+#: main.c:728
+msgid "Partitioning disk..."
+msgstr ""
+
+#: main.c:732
+msgid "Unable to partition the disk."
+msgstr ""
+
+#: main.c:739
+msgid "Creating filesystems..."
+msgstr ""
+
+#: main.c:743
+msgid "Unable to create filesystems."
+msgstr ""
+
+#: main.c:749
+msgid "Unable to mount filesystems."
+msgstr ""
+
+#: main.c:760
+msgid "Installing the system..."
+msgstr ""
+
+#: main.c:761
+msgid "Unable to install the system."
+msgstr ""
+
+#: main.c:777
+msgid "Installing the language cache..."
+msgstr ""
+
+#: main.c:778
+msgid "Unable to install the language cache."
+msgstr ""
+
+#: main.c:783
+msgid "Installing the bootloader..."
+msgstr ""
+
+#: main.c:790
+msgid "Unable to open /etc/default/grub for writing."
+msgstr ""
+
+#: main.c:812
+msgid "Unable to install the bootloader."
+msgstr ""
+
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
+#, c-format
+msgid ""
+"%s was successfully installed!\n"
+"\n"
+"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
+msgstr ""
+
+#: main.c:882
+msgid "Congratulations!"
+msgstr ""
+
+#: main.c:882
+msgid "Reboot"
+msgstr ""
+
+#: main.c:893
+msgid "Setup has failed. Press Ok to reboot."
+msgstr ""
diff --git a/src/installer/po/sk.po b/src/installer/po/sk.po
index 86d37cd..3766bae 100644
--- a/src/installer/po/sk.po
+++ b/src/installer/po/sk.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/ipfire/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,40 @@ msgstr ""
"Language: sk\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
msgid "OK"
msgstr ""
-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
msgid "Cancel"
msgstr ""
-#: main.c:145
+#: main.c:176
msgid "I accept this license"
msgstr ""
-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
msgid "Language selection"
msgstr ""
-#: main.c:312
+#: main.c:403
msgid "Select the language you wish to use for the installation."
msgstr ""
-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr ""
-#: main.c:328
+#: main.c:426
#, c-format
msgid ""
"Welcome to the %s installation program.\n"
@@ -49,53 +58,104 @@ msgid ""
"Selecting Cancel on any of the following screens will reboot the computer."
msgstr ""
-#: main.c:330
+#: main.c:428
msgid "Start installation"
msgstr ""
-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr ""
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
msgstr ""
-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:501
+msgid "Downloading installation image..."
msgstr ""
-#: main.c:342
-msgid "Download error"
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
msgstr ""
-#: main.c:376
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr ""
+
+#: main.c:543
msgid "License Agreement"
msgstr ""
-#: main.c:377
+#: main.c:544
msgid "License not accepted!"
msgstr ""
-#: main.c:399
+#: main.c:566
msgid "No hard disk found."
msgstr ""
-#: main.c:418
+#: main.c:587
msgid "Disk Selection"
msgstr ""
-#: main.c:419
+#: main.c:588
msgid ""
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
"\n"
"ALL DATA ON THE DISK WILL BE DESTROYED."
msgstr ""
-#: main.c:430
+#: main.c:599
msgid ""
"No disk has been selected.\n"
"\n"
"Please select one or more disks you want to install IPFire on."
msgstr ""
-#: main.c:443
+#: main.c:617
#, c-format
msgid ""
"The installation program will now prepare the chosen harddisk:\n"
@@ -105,15 +165,15 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:445
+#: main.c:619
msgid "Disk Setup"
msgstr ""
-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
msgid "Delete all data"
msgstr ""
-#: main.c:453
+#: main.c:627
#, c-format
msgid ""
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -124,104 +184,131 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:455
+#: main.c:629
msgid "RAID Setup"
msgstr ""
-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
msgstr ""
-#: main.c:480
+#: main.c:655
msgid "Your harddisk is too small."
msgstr ""
-#: main.c:494
+#: main.c:671
msgid ""
"Your harddisk is very small, but you can continue without a swap partition."
msgstr ""
-#: main.c:506
+#: main.c:684
msgid "ext4 Filesystem"
msgstr ""
-#: main.c:507
+#: main.c:685
msgid "ext4 Filesystem without journal"
msgstr ""
-#: main.c:508
+#: main.c:686
msgid "XFS Filesystem"
msgstr ""
-#: main.c:509
+#: main.c:687
msgid "ReiserFS Filesystem"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Filesystem Selection"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Please choose your filesystem:"
msgstr ""
-#: main.c:534
+#: main.c:712
msgid "Building RAID..."
msgstr ""
-#: main.c:538
+#: main.c:716
msgid "Unable to build the RAID."
msgstr ""
-#: main.c:550
+#: main.c:728
msgid "Partitioning disk..."
msgstr ""
-#: main.c:554
+#: main.c:732
msgid "Unable to partition the disk."
msgstr ""
-#: main.c:561
+#: main.c:739
msgid "Creating filesystems..."
msgstr ""
-#: main.c:565
+#: main.c:743
msgid "Unable to create filesystems."
msgstr ""
-#: main.c:571
+#: main.c:749
msgid "Unable to mount filesystems."
msgstr ""
-#: main.c:582
+#: main.c:760
msgid "Installing the system..."
msgstr ""
-#: main.c:583
+#: main.c:761
msgid "Unable to install the system."
msgstr ""
-#: main.c:599
+#: main.c:777
msgid "Installing the language cache..."
msgstr ""
-#: main.c:600
+#: main.c:778
msgid "Unable to install the language cache."
msgstr ""
-#: main.c:605
+#: main.c:783
msgid "Installing the bootloader..."
msgstr ""
-#: main.c:612
+#: main.c:790
msgid "Unable to open /etc/default/grub for writing."
msgstr ""
-#: main.c:634
+#: main.c:812
msgid "Unable to install the bootloader."
msgstr ""
-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
#, c-format
msgid ""
"%s was successfully installed!\n"
@@ -229,14 +316,14 @@ msgid ""
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Congratulations!"
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Reboot"
msgstr ""
-#: main.c:682
+#: main.c:893
msgid "Setup has failed. Press Ok to reboot."
msgstr ""
diff --git a/src/installer/po/sq.po b/src/installer/po/sq.po
index 8ac31c1..af653fd 100644
--- a/src/installer/po/sq.po
+++ b/src/installer/po/sq.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/ipfire/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,40 @@ msgstr ""
"Language: sq\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
msgid "OK"
msgstr ""
-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
msgid "Cancel"
msgstr ""
-#: main.c:145
+#: main.c:176
msgid "I accept this license"
msgstr ""
-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
msgid "Language selection"
msgstr ""
-#: main.c:312
+#: main.c:403
msgid "Select the language you wish to use for the installation."
msgstr ""
-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr ""
-#: main.c:328
+#: main.c:426
#, c-format
msgid ""
"Welcome to the %s installation program.\n"
@@ -49,53 +58,104 @@ msgid ""
"Selecting Cancel on any of the following screens will reboot the computer."
msgstr ""
-#: main.c:330
+#: main.c:428
msgid "Start installation"
msgstr ""
-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr ""
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
msgstr ""
-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:501
+msgid "Downloading installation image..."
msgstr ""
-#: main.c:342
-msgid "Download error"
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
msgstr ""
-#: main.c:376
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr ""
+
+#: main.c:543
msgid "License Agreement"
msgstr ""
-#: main.c:377
+#: main.c:544
msgid "License not accepted!"
msgstr ""
-#: main.c:399
+#: main.c:566
msgid "No hard disk found."
msgstr ""
-#: main.c:418
+#: main.c:587
msgid "Disk Selection"
msgstr ""
-#: main.c:419
+#: main.c:588
msgid ""
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
"\n"
"ALL DATA ON THE DISK WILL BE DESTROYED."
msgstr ""
-#: main.c:430
+#: main.c:599
msgid ""
"No disk has been selected.\n"
"\n"
"Please select one or more disks you want to install IPFire on."
msgstr ""
-#: main.c:443
+#: main.c:617
#, c-format
msgid ""
"The installation program will now prepare the chosen harddisk:\n"
@@ -105,15 +165,15 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:445
+#: main.c:619
msgid "Disk Setup"
msgstr ""
-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
msgid "Delete all data"
msgstr ""
-#: main.c:453
+#: main.c:627
#, c-format
msgid ""
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -124,104 +184,131 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:455
+#: main.c:629
msgid "RAID Setup"
msgstr ""
-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
msgstr ""
-#: main.c:480
+#: main.c:655
msgid "Your harddisk is too small."
msgstr ""
-#: main.c:494
+#: main.c:671
msgid ""
"Your harddisk is very small, but you can continue without a swap partition."
msgstr ""
-#: main.c:506
+#: main.c:684
msgid "ext4 Filesystem"
msgstr ""
-#: main.c:507
+#: main.c:685
msgid "ext4 Filesystem without journal"
msgstr ""
-#: main.c:508
+#: main.c:686
msgid "XFS Filesystem"
msgstr ""
-#: main.c:509
+#: main.c:687
msgid "ReiserFS Filesystem"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Filesystem Selection"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Please choose your filesystem:"
msgstr ""
-#: main.c:534
+#: main.c:712
msgid "Building RAID..."
msgstr ""
-#: main.c:538
+#: main.c:716
msgid "Unable to build the RAID."
msgstr ""
-#: main.c:550
+#: main.c:728
msgid "Partitioning disk..."
msgstr ""
-#: main.c:554
+#: main.c:732
msgid "Unable to partition the disk."
msgstr ""
-#: main.c:561
+#: main.c:739
msgid "Creating filesystems..."
msgstr ""
-#: main.c:565
+#: main.c:743
msgid "Unable to create filesystems."
msgstr ""
-#: main.c:571
+#: main.c:749
msgid "Unable to mount filesystems."
msgstr ""
-#: main.c:582
+#: main.c:760
msgid "Installing the system..."
msgstr ""
-#: main.c:583
+#: main.c:761
msgid "Unable to install the system."
msgstr ""
-#: main.c:599
+#: main.c:777
msgid "Installing the language cache..."
msgstr ""
-#: main.c:600
+#: main.c:778
msgid "Unable to install the language cache."
msgstr ""
-#: main.c:605
+#: main.c:783
msgid "Installing the bootloader..."
msgstr ""
-#: main.c:612
+#: main.c:790
msgid "Unable to open /etc/default/grub for writing."
msgstr ""
-#: main.c:634
+#: main.c:812
msgid "Unable to install the bootloader."
msgstr ""
-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
#, c-format
msgid ""
"%s was successfully installed!\n"
@@ -229,14 +316,14 @@ msgid ""
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Congratulations!"
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Reboot"
msgstr ""
-#: main.c:682
+#: main.c:893
msgid "Setup has failed. Press Ok to reboot."
msgstr ""
diff --git a/src/installer/po/sr.po b/src/installer/po/sr.po
new file mode 100644
index 0000000..97fad59
--- /dev/null
+++ b/src/installer/po/sr.po
@@ -0,0 +1,329 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The IPFire Project (www.ipfire.org)
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: IPFire Project\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-07-31 09:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/ipfire/language/sr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
+msgid "OK"
+msgstr ""
+
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
+msgid "Cancel"
+msgstr ""
+
+#: main.c:176
+msgid "I accept this license"
+msgstr ""
+
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
+msgid "Language selection"
+msgstr ""
+
+#: main.c:403
+msgid "Select the language you wish to use for the installation."
+msgstr ""
+
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
+msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
+msgstr ""
+
+#: main.c:426
+#, c-format
+msgid ""
+"Welcome to the %s installation program.\n"
+"\n"
+"Selecting Cancel on any of the following screens will reboot the computer."
+msgstr ""
+
+#: main.c:428
+msgid "Start installation"
+msgstr ""
+
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr ""
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
+msgstr ""
+
+#: main.c:501
+msgid "Downloading installation image..."
+msgstr ""
+
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
+msgstr ""
+
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr ""
+
+#: main.c:543
+msgid "License Agreement"
+msgstr ""
+
+#: main.c:544
+msgid "License not accepted!"
+msgstr ""
+
+#: main.c:566
+msgid "No hard disk found."
+msgstr ""
+
+#: main.c:587
+msgid "Disk Selection"
+msgstr ""
+
+#: main.c:588
+msgid ""
+"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
+"\n"
+"ALL DATA ON THE DISK WILL BE DESTROYED."
+msgstr ""
+
+#: main.c:599
+msgid ""
+"No disk has been selected.\n"
+"\n"
+"Please select one or more disks you want to install IPFire on."
+msgstr ""
+
+#: main.c:617
+#, c-format
+msgid ""
+"The installation program will now prepare the chosen harddisk:\n"
+"\n"
+" %s\n"
+"\n"
+"Do you agree to continue?"
+msgstr ""
+
+#: main.c:619
+msgid "Disk Setup"
+msgstr ""
+
+#: main.c:620 main.c:630
+msgid "Delete all data"
+msgstr ""
+
+#: main.c:627
+#, c-format
+msgid ""
+"The installation program will now set up a RAID configuration on the selected harddisks:\n"
+"\n"
+" %s\n"
+" %s\n"
+"\n"
+"Do you agree to continue?"
+msgstr ""
+
+#: main.c:629
+msgid "RAID Setup"
+msgstr ""
+
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
+msgstr ""
+
+#: main.c:655
+msgid "Your harddisk is too small."
+msgstr ""
+
+#: main.c:671
+msgid ""
+"Your harddisk is very small, but you can continue without a swap partition."
+msgstr ""
+
+#: main.c:684
+msgid "ext4 Filesystem"
+msgstr ""
+
+#: main.c:685
+msgid "ext4 Filesystem without journal"
+msgstr ""
+
+#: main.c:686
+msgid "XFS Filesystem"
+msgstr ""
+
+#: main.c:687
+msgid "ReiserFS Filesystem"
+msgstr ""
+
+#: main.c:701
+msgid "Filesystem Selection"
+msgstr ""
+
+#: main.c:701
+msgid "Please choose your filesystem:"
+msgstr ""
+
+#: main.c:712
+msgid "Building RAID..."
+msgstr ""
+
+#: main.c:716
+msgid "Unable to build the RAID."
+msgstr ""
+
+#: main.c:728
+msgid "Partitioning disk..."
+msgstr ""
+
+#: main.c:732
+msgid "Unable to partition the disk."
+msgstr ""
+
+#: main.c:739
+msgid "Creating filesystems..."
+msgstr ""
+
+#: main.c:743
+msgid "Unable to create filesystems."
+msgstr ""
+
+#: main.c:749
+msgid "Unable to mount filesystems."
+msgstr ""
+
+#: main.c:760
+msgid "Installing the system..."
+msgstr ""
+
+#: main.c:761
+msgid "Unable to install the system."
+msgstr ""
+
+#: main.c:777
+msgid "Installing the language cache..."
+msgstr ""
+
+#: main.c:778
+msgid "Unable to install the language cache."
+msgstr ""
+
+#: main.c:783
+msgid "Installing the bootloader..."
+msgstr ""
+
+#: main.c:790
+msgid "Unable to open /etc/default/grub for writing."
+msgstr ""
+
+#: main.c:812
+msgid "Unable to install the bootloader."
+msgstr ""
+
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
+#, c-format
+msgid ""
+"%s was successfully installed!\n"
+"\n"
+"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
+msgstr ""
+
+#: main.c:882
+msgid "Congratulations!"
+msgstr ""
+
+#: main.c:882
+msgid "Reboot"
+msgstr ""
+
+#: main.c:893
+msgid "Setup has failed. Press Ok to reboot."
+msgstr ""
diff --git a/src/installer/po/sv.po b/src/installer/po/sv.po
index 25e0ad4..b0e5ae7 100644
--- a/src/installer/po/sv.po
+++ b/src/installer/po/sv.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/ipfire/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,40 @@ msgstr ""
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
msgid "OK"
msgstr ""
-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
msgid "Cancel"
msgstr ""
-#: main.c:145
+#: main.c:176
msgid "I accept this license"
msgstr ""
-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
msgid "Language selection"
msgstr ""
-#: main.c:312
+#: main.c:403
msgid "Select the language you wish to use for the installation."
msgstr ""
-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr ""
-#: main.c:328
+#: main.c:426
#, c-format
msgid ""
"Welcome to the %s installation program.\n"
@@ -49,53 +58,104 @@ msgid ""
"Selecting Cancel on any of the following screens will reboot the computer."
msgstr ""
-#: main.c:330
+#: main.c:428
msgid "Start installation"
msgstr ""
-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr ""
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
msgstr ""
-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:501
+msgid "Downloading installation image..."
msgstr ""
-#: main.c:342
-msgid "Download error"
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
msgstr ""
-#: main.c:376
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr ""
+
+#: main.c:543
msgid "License Agreement"
msgstr ""
-#: main.c:377
+#: main.c:544
msgid "License not accepted!"
msgstr ""
-#: main.c:399
+#: main.c:566
msgid "No hard disk found."
msgstr ""
-#: main.c:418
+#: main.c:587
msgid "Disk Selection"
msgstr ""
-#: main.c:419
+#: main.c:588
msgid ""
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
"\n"
"ALL DATA ON THE DISK WILL BE DESTROYED."
msgstr ""
-#: main.c:430
+#: main.c:599
msgid ""
"No disk has been selected.\n"
"\n"
"Please select one or more disks you want to install IPFire on."
msgstr ""
-#: main.c:443
+#: main.c:617
#, c-format
msgid ""
"The installation program will now prepare the chosen harddisk:\n"
@@ -105,15 +165,15 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:445
+#: main.c:619
msgid "Disk Setup"
msgstr ""
-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
msgid "Delete all data"
msgstr ""
-#: main.c:453
+#: main.c:627
#, c-format
msgid ""
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -124,104 +184,131 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:455
+#: main.c:629
msgid "RAID Setup"
msgstr ""
-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
msgstr ""
-#: main.c:480
+#: main.c:655
msgid "Your harddisk is too small."
msgstr ""
-#: main.c:494
+#: main.c:671
msgid ""
"Your harddisk is very small, but you can continue without a swap partition."
msgstr ""
-#: main.c:506
+#: main.c:684
msgid "ext4 Filesystem"
msgstr ""
-#: main.c:507
+#: main.c:685
msgid "ext4 Filesystem without journal"
msgstr ""
-#: main.c:508
+#: main.c:686
msgid "XFS Filesystem"
msgstr ""
-#: main.c:509
+#: main.c:687
msgid "ReiserFS Filesystem"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Filesystem Selection"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Please choose your filesystem:"
msgstr ""
-#: main.c:534
+#: main.c:712
msgid "Building RAID..."
msgstr ""
-#: main.c:538
+#: main.c:716
msgid "Unable to build the RAID."
msgstr ""
-#: main.c:550
+#: main.c:728
msgid "Partitioning disk..."
msgstr ""
-#: main.c:554
+#: main.c:732
msgid "Unable to partition the disk."
msgstr ""
-#: main.c:561
+#: main.c:739
msgid "Creating filesystems..."
msgstr ""
-#: main.c:565
+#: main.c:743
msgid "Unable to create filesystems."
msgstr ""
-#: main.c:571
+#: main.c:749
msgid "Unable to mount filesystems."
msgstr ""
-#: main.c:582
+#: main.c:760
msgid "Installing the system..."
msgstr ""
-#: main.c:583
+#: main.c:761
msgid "Unable to install the system."
msgstr ""
-#: main.c:599
+#: main.c:777
msgid "Installing the language cache..."
msgstr ""
-#: main.c:600
+#: main.c:778
msgid "Unable to install the language cache."
msgstr ""
-#: main.c:605
+#: main.c:783
msgid "Installing the bootloader..."
msgstr ""
-#: main.c:612
+#: main.c:790
msgid "Unable to open /etc/default/grub for writing."
msgstr ""
-#: main.c:634
+#: main.c:812
msgid "Unable to install the bootloader."
msgstr ""
-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
#, c-format
msgid ""
"%s was successfully installed!\n"
@@ -229,14 +316,14 @@ msgid ""
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Congratulations!"
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Reboot"
msgstr ""
-#: main.c:682
+#: main.c:893
msgid "Setup has failed. Press Ok to reboot."
msgstr ""
diff --git a/src/installer/po/th.po b/src/installer/po/th.po
index 2a88dca..97842e8 100644
--- a/src/installer/po/th.po
+++ b/src/installer/po/th.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
"Language-Team: Thai (http://www.transifex.com/projects/p/ipfire/language/th/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,40 @@ msgstr ""
"Language: th\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
msgid "OK"
msgstr ""
-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
msgid "Cancel"
msgstr ""
-#: main.c:145
+#: main.c:176
msgid "I accept this license"
msgstr ""
-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
msgid "Language selection"
msgstr ""
-#: main.c:312
+#: main.c:403
msgid "Select the language you wish to use for the installation."
msgstr ""
-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr ""
-#: main.c:328
+#: main.c:426
#, c-format
msgid ""
"Welcome to the %s installation program.\n"
@@ -49,53 +58,104 @@ msgid ""
"Selecting Cancel on any of the following screens will reboot the computer."
msgstr ""
-#: main.c:330
+#: main.c:428
msgid "Start installation"
msgstr ""
-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr ""
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
msgstr ""
-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:501
+msgid "Downloading installation image..."
msgstr ""
-#: main.c:342
-msgid "Download error"
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
msgstr ""
-#: main.c:376
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr ""
+
+#: main.c:543
msgid "License Agreement"
msgstr ""
-#: main.c:377
+#: main.c:544
msgid "License not accepted!"
msgstr ""
-#: main.c:399
+#: main.c:566
msgid "No hard disk found."
msgstr ""
-#: main.c:418
+#: main.c:587
msgid "Disk Selection"
msgstr ""
-#: main.c:419
+#: main.c:588
msgid ""
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
"\n"
"ALL DATA ON THE DISK WILL BE DESTROYED."
msgstr ""
-#: main.c:430
+#: main.c:599
msgid ""
"No disk has been selected.\n"
"\n"
"Please select one or more disks you want to install IPFire on."
msgstr ""
-#: main.c:443
+#: main.c:617
#, c-format
msgid ""
"The installation program will now prepare the chosen harddisk:\n"
@@ -105,15 +165,15 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:445
+#: main.c:619
msgid "Disk Setup"
msgstr ""
-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
msgid "Delete all data"
msgstr ""
-#: main.c:453
+#: main.c:627
#, c-format
msgid ""
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -124,104 +184,131 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:455
+#: main.c:629
msgid "RAID Setup"
msgstr ""
-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
msgstr ""
-#: main.c:480
+#: main.c:655
msgid "Your harddisk is too small."
msgstr ""
-#: main.c:494
+#: main.c:671
msgid ""
"Your harddisk is very small, but you can continue without a swap partition."
msgstr ""
-#: main.c:506
+#: main.c:684
msgid "ext4 Filesystem"
msgstr ""
-#: main.c:507
+#: main.c:685
msgid "ext4 Filesystem without journal"
msgstr ""
-#: main.c:508
+#: main.c:686
msgid "XFS Filesystem"
msgstr ""
-#: main.c:509
+#: main.c:687
msgid "ReiserFS Filesystem"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Filesystem Selection"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Please choose your filesystem:"
msgstr ""
-#: main.c:534
+#: main.c:712
msgid "Building RAID..."
msgstr ""
-#: main.c:538
+#: main.c:716
msgid "Unable to build the RAID."
msgstr ""
-#: main.c:550
+#: main.c:728
msgid "Partitioning disk..."
msgstr ""
-#: main.c:554
+#: main.c:732
msgid "Unable to partition the disk."
msgstr ""
-#: main.c:561
+#: main.c:739
msgid "Creating filesystems..."
msgstr ""
-#: main.c:565
+#: main.c:743
msgid "Unable to create filesystems."
msgstr ""
-#: main.c:571
+#: main.c:749
msgid "Unable to mount filesystems."
msgstr ""
-#: main.c:582
+#: main.c:760
msgid "Installing the system..."
msgstr ""
-#: main.c:583
+#: main.c:761
msgid "Unable to install the system."
msgstr ""
-#: main.c:599
+#: main.c:777
msgid "Installing the language cache..."
msgstr ""
-#: main.c:600
+#: main.c:778
msgid "Unable to install the language cache."
msgstr ""
-#: main.c:605
+#: main.c:783
msgid "Installing the bootloader..."
msgstr ""
-#: main.c:612
+#: main.c:790
msgid "Unable to open /etc/default/grub for writing."
msgstr ""
-#: main.c:634
+#: main.c:812
msgid "Unable to install the bootloader."
msgstr ""
-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
#, c-format
msgid ""
"%s was successfully installed!\n"
@@ -229,14 +316,14 @@ msgid ""
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Congratulations!"
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Reboot"
msgstr ""
-#: main.c:682
+#: main.c:893
msgid "Setup has failed. Press Ok to reboot."
msgstr ""
diff --git a/src/installer/po/tk.po b/src/installer/po/tk.po
index e07df58..c753b72 100644
--- a/src/installer/po/tk.po
+++ b/src/installer/po/tk.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
"Language-Team: Turkmen (http://www.transifex.com/projects/p/ipfire/language/tk/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,40 @@ msgstr ""
"Language: tk\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
msgid "OK"
msgstr ""
-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
msgid "Cancel"
msgstr ""
-#: main.c:145
+#: main.c:176
msgid "I accept this license"
msgstr ""
-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
msgid "Language selection"
msgstr ""
-#: main.c:312
+#: main.c:403
msgid "Select the language you wish to use for the installation."
msgstr ""
-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr ""
-#: main.c:328
+#: main.c:426
#, c-format
msgid ""
"Welcome to the %s installation program.\n"
@@ -49,53 +58,104 @@ msgid ""
"Selecting Cancel on any of the following screens will reboot the computer."
msgstr ""
-#: main.c:330
+#: main.c:428
msgid "Start installation"
msgstr ""
-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr ""
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
msgstr ""
-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:501
+msgid "Downloading installation image..."
msgstr ""
-#: main.c:342
-msgid "Download error"
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
msgstr ""
-#: main.c:376
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr ""
+
+#: main.c:543
msgid "License Agreement"
msgstr ""
-#: main.c:377
+#: main.c:544
msgid "License not accepted!"
msgstr ""
-#: main.c:399
+#: main.c:566
msgid "No hard disk found."
msgstr ""
-#: main.c:418
+#: main.c:587
msgid "Disk Selection"
msgstr ""
-#: main.c:419
+#: main.c:588
msgid ""
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
"\n"
"ALL DATA ON THE DISK WILL BE DESTROYED."
msgstr ""
-#: main.c:430
+#: main.c:599
msgid ""
"No disk has been selected.\n"
"\n"
"Please select one or more disks you want to install IPFire on."
msgstr ""
-#: main.c:443
+#: main.c:617
#, c-format
msgid ""
"The installation program will now prepare the chosen harddisk:\n"
@@ -105,15 +165,15 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:445
+#: main.c:619
msgid "Disk Setup"
msgstr ""
-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
msgid "Delete all data"
msgstr ""
-#: main.c:453
+#: main.c:627
#, c-format
msgid ""
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -124,104 +184,131 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:455
+#: main.c:629
msgid "RAID Setup"
msgstr ""
-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
msgstr ""
-#: main.c:480
+#: main.c:655
msgid "Your harddisk is too small."
msgstr ""
-#: main.c:494
+#: main.c:671
msgid ""
"Your harddisk is very small, but you can continue without a swap partition."
msgstr ""
-#: main.c:506
+#: main.c:684
msgid "ext4 Filesystem"
msgstr ""
-#: main.c:507
+#: main.c:685
msgid "ext4 Filesystem without journal"
msgstr ""
-#: main.c:508
+#: main.c:686
msgid "XFS Filesystem"
msgstr ""
-#: main.c:509
+#: main.c:687
msgid "ReiserFS Filesystem"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Filesystem Selection"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Please choose your filesystem:"
msgstr ""
-#: main.c:534
+#: main.c:712
msgid "Building RAID..."
msgstr ""
-#: main.c:538
+#: main.c:716
msgid "Unable to build the RAID."
msgstr ""
-#: main.c:550
+#: main.c:728
msgid "Partitioning disk..."
msgstr ""
-#: main.c:554
+#: main.c:732
msgid "Unable to partition the disk."
msgstr ""
-#: main.c:561
+#: main.c:739
msgid "Creating filesystems..."
msgstr ""
-#: main.c:565
+#: main.c:743
msgid "Unable to create filesystems."
msgstr ""
-#: main.c:571
+#: main.c:749
msgid "Unable to mount filesystems."
msgstr ""
-#: main.c:582
+#: main.c:760
msgid "Installing the system..."
msgstr ""
-#: main.c:583
+#: main.c:761
msgid "Unable to install the system."
msgstr ""
-#: main.c:599
+#: main.c:777
msgid "Installing the language cache..."
msgstr ""
-#: main.c:600
+#: main.c:778
msgid "Unable to install the language cache."
msgstr ""
-#: main.c:605
+#: main.c:783
msgid "Installing the bootloader..."
msgstr ""
-#: main.c:612
+#: main.c:790
msgid "Unable to open /etc/default/grub for writing."
msgstr ""
-#: main.c:634
+#: main.c:812
msgid "Unable to install the bootloader."
msgstr ""
-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
#, c-format
msgid ""
"%s was successfully installed!\n"
@@ -229,14 +316,14 @@ msgid ""
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Congratulations!"
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Reboot"
msgstr ""
-#: main.c:682
+#: main.c:893
msgid "Setup has failed. Press Ok to reboot."
msgstr ""
diff --git a/src/installer/po/tr.po b/src/installer/po/tr.po
index 99a100a..0198445 100644
--- a/src/installer/po/tr.po
+++ b/src/installer/po/tr.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Kudret Emre <kudretemre(a)hotmail.com.tr>, 2014
+# Kudret Emre <kudretemre(a)hotmail.com.tr>, 2014
msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
-"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-12-08 17:24+0000\n"
+"Last-Translator: Kudret Emre <kudretemre(a)hotmail.com.tr>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/ipfire/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,85 +19,145 @@ msgstr ""
"Language: tr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
msgid "OK"
-msgstr ""
+msgstr "Tamam"
-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
msgid "Cancel"
-msgstr ""
+msgstr "İptal"
-#: main.c:145
+#: main.c:176
msgid "I accept this license"
-msgstr ""
+msgstr "Lisansı kabul ediyorum"
-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr "Uyarı: Katılımsız kurulum 10 saniye içinde başlayacak..."
+
+#: main.c:403
msgid "Language selection"
-msgstr ""
+msgstr "Dil seçimi"
-#: main.c:312
+#: main.c:403
msgid "Select the language you wish to use for the installation."
-msgstr ""
+msgstr "Yükleme için istediğiniz dili seçin."
-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr "Katılımsız kurulum modu"
+
+#: main.c:420
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
-msgstr ""
+msgstr "<Tab>/<Alt-Tab> elementler arası geçiş | <Space> seç | <F12> sonraki ekran"
-#: main.c:328
+#: main.c:426
#, c-format
msgid ""
"Welcome to the %s installation program.\n"
"\n"
"Selecting Cancel on any of the following screens will reboot the computer."
-msgstr ""
+msgstr "%s yükleme programına hoşgeldiniz.\n\nİlerleyen ekranların herhangi birinde İptal'e tıklamanız bilgisayarınızı yeniden başlatır."
-#: main.c:330
+#: main.c:428
msgid "Start installation"
-msgstr ""
+msgstr "Yüklemeyi başlat"
-#: main.c:339
-msgid "No local source media found. Starting download."
-msgstr ""
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr "Yükleyici şimdi yükleme dosyasını indirmeyi deneyecek."
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr "Hiçbir kaynak sürücüsü bulunamadı.\n\nGerekli yükleme dosyasını indirmeyi deneyebilirsiniz."
-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
msgstr ""
-#: main.c:342
-msgid "Download error"
+#: main.c:460
+msgid "Download installation image"
+msgstr "Yükleme dosyasını indir"
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr "Ağa bağlanmaya çalışılıyor (DHCP)..."
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr "Yüklemenin devam etmesi için ağ bağlantısı gereklidir fakat başlatılamıyor.\n\nLütfen makinenizi bir DHCP sunucu ile ağa bağlayıp tekrar deneyin."
+
+#: main.c:487 main.c:516
+msgid "Retry"
+msgstr "Tekrar dene"
+
+#: main.c:501
+msgid "Downloading installation image..."
+msgstr "Yükleme dosyası indiriliyor..."
+
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
+msgstr "MD5 checksum uyuşmuyor"
+
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr "Yükleme dosyası indirilemedi.\nSebep: %s\n\n%s"
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
msgstr ""
-#: main.c:376
+#: main.c:543
msgid "License Agreement"
-msgstr ""
+msgstr "Lisans Anlaşması"
-#: main.c:377
+#: main.c:544
msgid "License not accepted!"
-msgstr ""
+msgstr "Lisans kabul edilmedi!"
-#: main.c:399
+#: main.c:566
msgid "No hard disk found."
-msgstr ""
+msgstr "Sabit disk bulunamadı."
-#: main.c:418
+#: main.c:587
msgid "Disk Selection"
-msgstr ""
+msgstr "Disk Seçimi"
-#: main.c:419
+#: main.c:588
msgid ""
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
"\n"
"ALL DATA ON THE DISK WILL BE DESTROYED."
-msgstr ""
+msgstr "IPFire'ı yüklemek istediğiniz disk(ler)i seçin. Diskler önce bölümlenecek, sonra bölümlere dosya sistemi oluşturulacaktır.\n\nDİSKTEKİ TÜM VERİLER SİLİNECEKTİR."
-#: main.c:430
+#: main.c:599
msgid ""
"No disk has been selected.\n"
"\n"
"Please select one or more disks you want to install IPFire on."
-msgstr ""
+msgstr "Hiçbir disk seçilmedi.\n\nLütfen IPFire'ı yüklemek için bir veya daha fazla disk seçin."
-#: main.c:443
+#: main.c:617
#, c-format
msgid ""
"The installation program will now prepare the chosen harddisk:\n"
@@ -103,17 +165,17 @@ msgid ""
" %s\n"
"\n"
"Do you agree to continue?"
-msgstr ""
+msgstr "Yükleme programı şimdi seçilen diski hazırlayacak:\n\n%s\n\nDevam etmek istiyor musunuz?"
-#: main.c:445
+#: main.c:619
msgid "Disk Setup"
-msgstr ""
+msgstr "Disk Kurulumu"
-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
msgid "Delete all data"
-msgstr ""
+msgstr "Tüm veriyi sil"
-#: main.c:453
+#: main.c:627
#, c-format
msgid ""
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -122,121 +184,148 @@ msgid ""
" %s\n"
"\n"
"Do you agree to continue?"
-msgstr ""
+msgstr "Yükleme programı şimdi seçilen sabit disk üzerinde bir RAID yapılandırması kuracak:\n\n%s\n%s\n\nDevam etmek istiyor musunuz?"
-#: main.c:455
+#: main.c:629
msgid "RAID Setup"
-msgstr ""
+msgstr "RAID Kurulumu"
-#: main.c:466
-msgid "You disk configuration is currently not supported."
-msgstr ""
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
+msgstr "Disk yapılandırmanız desteklenmiyor."
-#: main.c:480
+#: main.c:655
msgid "Your harddisk is too small."
-msgstr ""
+msgstr "Sabit diskiniz çok küçük."
-#: main.c:494
+#: main.c:671
msgid ""
"Your harddisk is very small, but you can continue without a swap partition."
-msgstr ""
+msgstr "Sabit diskiniz çok küçük, fakat takas bölümü olmadan devam edebilirsiniz."
-#: main.c:506
+#: main.c:684
msgid "ext4 Filesystem"
-msgstr ""
+msgstr "ext4 Dosya sistemi"
-#: main.c:507
+#: main.c:685
msgid "ext4 Filesystem without journal"
-msgstr ""
+msgstr "ext4 Dosya sistemi - günlüksüz"
-#: main.c:508
+#: main.c:686
msgid "XFS Filesystem"
-msgstr ""
+msgstr "XFS Dosya sistemi"
-#: main.c:509
+#: main.c:687
msgid "ReiserFS Filesystem"
-msgstr ""
+msgstr "ReiserFS Dosya sistemi"
-#: main.c:523
+#: main.c:701
msgid "Filesystem Selection"
-msgstr ""
+msgstr "Dosya sistemi Seçimi"
-#: main.c:523
+#: main.c:701
msgid "Please choose your filesystem:"
-msgstr ""
+msgstr "Lütfen dosya sisteminizi seçin:"
-#: main.c:534
+#: main.c:712
msgid "Building RAID..."
-msgstr ""
+msgstr "RAID oluşturuluyor..."
-#: main.c:538
+#: main.c:716
msgid "Unable to build the RAID."
-msgstr ""
+msgstr "RAID oluşturulamıyor."
-#: main.c:550
+#: main.c:728
msgid "Partitioning disk..."
-msgstr ""
+msgstr "Disk bölümleniyor..."
-#: main.c:554
+#: main.c:732
msgid "Unable to partition the disk."
-msgstr ""
+msgstr "Disk bölümlendirilemiyor."
-#: main.c:561
+#: main.c:739
msgid "Creating filesystems..."
-msgstr ""
+msgstr "Dosya sistemleri oluşturuluyor..."
-#: main.c:565
+#: main.c:743
msgid "Unable to create filesystems."
-msgstr ""
+msgstr "Dosya sistemleri oluşturulamıyor."
-#: main.c:571
+#: main.c:749
msgid "Unable to mount filesystems."
-msgstr ""
+msgstr "Dosya sistemleri bağlanamıyor."
-#: main.c:582
+#: main.c:760
msgid "Installing the system..."
-msgstr ""
+msgstr "Sistem yükleniyor..."
-#: main.c:583
+#: main.c:761
msgid "Unable to install the system."
-msgstr ""
+msgstr "Sistem yüklenemiyor."
-#: main.c:599
+#: main.c:777
msgid "Installing the language cache..."
-msgstr ""
+msgstr "Dil ön blleği yükleniyor..."
-#: main.c:600
+#: main.c:778
msgid "Unable to install the language cache."
-msgstr ""
+msgstr "Dil ön belleği yüklenemiyor."
-#: main.c:605
+#: main.c:783
msgid "Installing the bootloader..."
-msgstr ""
+msgstr "bootloader yükleniyor..."
-#: main.c:612
+#: main.c:790
msgid "Unable to open /etc/default/grub for writing."
-msgstr ""
+msgstr "/etc/default/grub yazma işlemi için açılamıyor."
-#: main.c:634
+#: main.c:812
msgid "Unable to install the bootloader."
-msgstr ""
+msgstr "bootloader yüklenemiyor."
+
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr "Yükleme dosyasında bir yedekleme dosyası bulundu.\n\nYedeği geri yüklemek ister misiniz?"
+
+#: main.c:827
+msgid "Yes"
+msgstr "Evet"
-#: main.c:666
+#: main.c:827
+msgid "No"
+msgstr "Hayır"
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr "Yedek dosyası geri yüklenirken bir hata oluştu."
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr "post-install betiği çalıştırılıyor..."
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr "post-install betiği başarısız oldu."
+
+#: main.c:877
#, c-format
msgid ""
"%s was successfully installed!\n"
"\n"
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
-msgstr ""
+msgstr "%s başarıyla yüklendi!\n\nLütfen yükleme ortamlarını bu sistemden çıkarın ve yeniden başlatma butonuna tıklayın. Sistem yeniden başlatıldığında ağ ve sistem şifrenizi ayarlamanız istenecek. Daha sonra web yapılandırma konsoluna gitmek için yarayıcınızdan https://%s:444 (veya %s yerine ne isim verdiyseniz) adresine gidin."
-#: main.c:671
+#: main.c:882
msgid "Congratulations!"
-msgstr ""
+msgstr "Tebrikler!"
-#: main.c:671
+#: main.c:882
msgid "Reboot"
-msgstr ""
+msgstr "Yeniden başlat."
-#: main.c:682
+#: main.c:893
msgid "Setup has failed. Press Ok to reboot."
-msgstr ""
+msgstr "Kurulum başarısız oldu. Yeniden başlatmak için Tamam'a basın."
diff --git a/src/installer/po/uk.po b/src/installer/po/uk.po
index e6c955a..4a2ab67 100644
--- a/src/installer/po/uk.po
+++ b/src/installer/po/uk.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/ipfire/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,40 @@ msgstr ""
"Language: uk\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
msgid "OK"
msgstr ""
-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
msgid "Cancel"
msgstr ""
-#: main.c:145
+#: main.c:176
msgid "I accept this license"
msgstr ""
-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
msgid "Language selection"
msgstr ""
-#: main.c:312
+#: main.c:403
msgid "Select the language you wish to use for the installation."
msgstr ""
-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr ""
-#: main.c:328
+#: main.c:426
#, c-format
msgid ""
"Welcome to the %s installation program.\n"
@@ -49,53 +58,104 @@ msgid ""
"Selecting Cancel on any of the following screens will reboot the computer."
msgstr ""
-#: main.c:330
+#: main.c:428
msgid "Start installation"
msgstr ""
-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr ""
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
msgstr ""
-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:501
+msgid "Downloading installation image..."
msgstr ""
-#: main.c:342
-msgid "Download error"
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
msgstr ""
-#: main.c:376
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr ""
+
+#: main.c:543
msgid "License Agreement"
msgstr ""
-#: main.c:377
+#: main.c:544
msgid "License not accepted!"
msgstr ""
-#: main.c:399
+#: main.c:566
msgid "No hard disk found."
msgstr ""
-#: main.c:418
+#: main.c:587
msgid "Disk Selection"
msgstr ""
-#: main.c:419
+#: main.c:588
msgid ""
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
"\n"
"ALL DATA ON THE DISK WILL BE DESTROYED."
msgstr ""
-#: main.c:430
+#: main.c:599
msgid ""
"No disk has been selected.\n"
"\n"
"Please select one or more disks you want to install IPFire on."
msgstr ""
-#: main.c:443
+#: main.c:617
#, c-format
msgid ""
"The installation program will now prepare the chosen harddisk:\n"
@@ -105,15 +165,15 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:445
+#: main.c:619
msgid "Disk Setup"
msgstr ""
-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
msgid "Delete all data"
msgstr ""
-#: main.c:453
+#: main.c:627
#, c-format
msgid ""
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -124,104 +184,131 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:455
+#: main.c:629
msgid "RAID Setup"
msgstr ""
-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
msgstr ""
-#: main.c:480
+#: main.c:655
msgid "Your harddisk is too small."
msgstr ""
-#: main.c:494
+#: main.c:671
msgid ""
"Your harddisk is very small, but you can continue without a swap partition."
msgstr ""
-#: main.c:506
+#: main.c:684
msgid "ext4 Filesystem"
msgstr ""
-#: main.c:507
+#: main.c:685
msgid "ext4 Filesystem without journal"
msgstr ""
-#: main.c:508
+#: main.c:686
msgid "XFS Filesystem"
msgstr ""
-#: main.c:509
+#: main.c:687
msgid "ReiserFS Filesystem"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Filesystem Selection"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Please choose your filesystem:"
msgstr ""
-#: main.c:534
+#: main.c:712
msgid "Building RAID..."
msgstr ""
-#: main.c:538
+#: main.c:716
msgid "Unable to build the RAID."
msgstr ""
-#: main.c:550
+#: main.c:728
msgid "Partitioning disk..."
msgstr ""
-#: main.c:554
+#: main.c:732
msgid "Unable to partition the disk."
msgstr ""
-#: main.c:561
+#: main.c:739
msgid "Creating filesystems..."
msgstr ""
-#: main.c:565
+#: main.c:743
msgid "Unable to create filesystems."
msgstr ""
-#: main.c:571
+#: main.c:749
msgid "Unable to mount filesystems."
msgstr ""
-#: main.c:582
+#: main.c:760
msgid "Installing the system..."
msgstr ""
-#: main.c:583
+#: main.c:761
msgid "Unable to install the system."
msgstr ""
-#: main.c:599
+#: main.c:777
msgid "Installing the language cache..."
msgstr ""
-#: main.c:600
+#: main.c:778
msgid "Unable to install the language cache."
msgstr ""
-#: main.c:605
+#: main.c:783
msgid "Installing the bootloader..."
msgstr ""
-#: main.c:612
+#: main.c:790
msgid "Unable to open /etc/default/grub for writing."
msgstr ""
-#: main.c:634
+#: main.c:812
msgid "Unable to install the bootloader."
msgstr ""
-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
#, c-format
msgid ""
"%s was successfully installed!\n"
@@ -229,14 +316,14 @@ msgid ""
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Congratulations!"
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Reboot"
msgstr ""
-#: main.c:682
+#: main.c:893
msgid "Setup has failed. Press Ok to reboot."
msgstr ""
diff --git a/src/installer/po/uz(a)Latn.po b/src/installer/po/uz(a)Latn.po
index 2bdb551..8c68800 100644
--- a/src/installer/po/uz(a)Latn.po
+++ b/src/installer/po/uz(a)Latn.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
"Language-Team: Uzbek (Latin) (http://www.transifex.com/projects/p/ipfire/language/uz@Latn/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,40 @@ msgstr ""
"Language: uz@Latn\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
msgid "OK"
msgstr ""
-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
msgid "Cancel"
msgstr ""
-#: main.c:145
+#: main.c:176
msgid "I accept this license"
msgstr ""
-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
msgid "Language selection"
msgstr ""
-#: main.c:312
+#: main.c:403
msgid "Select the language you wish to use for the installation."
msgstr ""
-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr ""
-#: main.c:328
+#: main.c:426
#, c-format
msgid ""
"Welcome to the %s installation program.\n"
@@ -49,53 +58,104 @@ msgid ""
"Selecting Cancel on any of the following screens will reboot the computer."
msgstr ""
-#: main.c:330
+#: main.c:428
msgid "Start installation"
msgstr ""
-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr ""
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
msgstr ""
-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:501
+msgid "Downloading installation image..."
msgstr ""
-#: main.c:342
-msgid "Download error"
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
msgstr ""
-#: main.c:376
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr ""
+
+#: main.c:543
msgid "License Agreement"
msgstr ""
-#: main.c:377
+#: main.c:544
msgid "License not accepted!"
msgstr ""
-#: main.c:399
+#: main.c:566
msgid "No hard disk found."
msgstr ""
-#: main.c:418
+#: main.c:587
msgid "Disk Selection"
msgstr ""
-#: main.c:419
+#: main.c:588
msgid ""
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
"\n"
"ALL DATA ON THE DISK WILL BE DESTROYED."
msgstr ""
-#: main.c:430
+#: main.c:599
msgid ""
"No disk has been selected.\n"
"\n"
"Please select one or more disks you want to install IPFire on."
msgstr ""
-#: main.c:443
+#: main.c:617
#, c-format
msgid ""
"The installation program will now prepare the chosen harddisk:\n"
@@ -105,15 +165,15 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:445
+#: main.c:619
msgid "Disk Setup"
msgstr ""
-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
msgid "Delete all data"
msgstr ""
-#: main.c:453
+#: main.c:627
#, c-format
msgid ""
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -124,104 +184,131 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:455
+#: main.c:629
msgid "RAID Setup"
msgstr ""
-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
msgstr ""
-#: main.c:480
+#: main.c:655
msgid "Your harddisk is too small."
msgstr ""
-#: main.c:494
+#: main.c:671
msgid ""
"Your harddisk is very small, but you can continue without a swap partition."
msgstr ""
-#: main.c:506
+#: main.c:684
msgid "ext4 Filesystem"
msgstr ""
-#: main.c:507
+#: main.c:685
msgid "ext4 Filesystem without journal"
msgstr ""
-#: main.c:508
+#: main.c:686
msgid "XFS Filesystem"
msgstr ""
-#: main.c:509
+#: main.c:687
msgid "ReiserFS Filesystem"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Filesystem Selection"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Please choose your filesystem:"
msgstr ""
-#: main.c:534
+#: main.c:712
msgid "Building RAID..."
msgstr ""
-#: main.c:538
+#: main.c:716
msgid "Unable to build the RAID."
msgstr ""
-#: main.c:550
+#: main.c:728
msgid "Partitioning disk..."
msgstr ""
-#: main.c:554
+#: main.c:732
msgid "Unable to partition the disk."
msgstr ""
-#: main.c:561
+#: main.c:739
msgid "Creating filesystems..."
msgstr ""
-#: main.c:565
+#: main.c:743
msgid "Unable to create filesystems."
msgstr ""
-#: main.c:571
+#: main.c:749
msgid "Unable to mount filesystems."
msgstr ""
-#: main.c:582
+#: main.c:760
msgid "Installing the system..."
msgstr ""
-#: main.c:583
+#: main.c:761
msgid "Unable to install the system."
msgstr ""
-#: main.c:599
+#: main.c:777
msgid "Installing the language cache..."
msgstr ""
-#: main.c:600
+#: main.c:778
msgid "Unable to install the language cache."
msgstr ""
-#: main.c:605
+#: main.c:783
msgid "Installing the bootloader..."
msgstr ""
-#: main.c:612
+#: main.c:790
msgid "Unable to open /etc/default/grub for writing."
msgstr ""
-#: main.c:634
+#: main.c:812
msgid "Unable to install the bootloader."
msgstr ""
-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
#, c-format
msgid ""
"%s was successfully installed!\n"
@@ -229,14 +316,14 @@ msgid ""
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Congratulations!"
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Reboot"
msgstr ""
-#: main.c:682
+#: main.c:893
msgid "Setup has failed. Press Ok to reboot."
msgstr ""
diff --git a/src/installer/po/vi.po b/src/installer/po/vi.po
index 197382b..4f5b455 100644
--- a/src/installer/po/vi.po
+++ b/src/installer/po/vi.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/ipfire/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,40 @@ msgstr ""
"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
msgid "OK"
msgstr ""
-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
msgid "Cancel"
msgstr ""
-#: main.c:145
+#: main.c:176
msgid "I accept this license"
msgstr ""
-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
msgid "Language selection"
msgstr ""
-#: main.c:312
+#: main.c:403
msgid "Select the language you wish to use for the installation."
msgstr ""
-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr ""
-#: main.c:328
+#: main.c:426
#, c-format
msgid ""
"Welcome to the %s installation program.\n"
@@ -49,53 +58,104 @@ msgid ""
"Selecting Cancel on any of the following screens will reboot the computer."
msgstr ""
-#: main.c:330
+#: main.c:428
msgid "Start installation"
msgstr ""
-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr ""
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
msgstr ""
-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:501
+msgid "Downloading installation image..."
msgstr ""
-#: main.c:342
-msgid "Download error"
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
msgstr ""
-#: main.c:376
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr ""
+
+#: main.c:543
msgid "License Agreement"
msgstr ""
-#: main.c:377
+#: main.c:544
msgid "License not accepted!"
msgstr ""
-#: main.c:399
+#: main.c:566
msgid "No hard disk found."
msgstr ""
-#: main.c:418
+#: main.c:587
msgid "Disk Selection"
msgstr ""
-#: main.c:419
+#: main.c:588
msgid ""
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
"\n"
"ALL DATA ON THE DISK WILL BE DESTROYED."
msgstr ""
-#: main.c:430
+#: main.c:599
msgid ""
"No disk has been selected.\n"
"\n"
"Please select one or more disks you want to install IPFire on."
msgstr ""
-#: main.c:443
+#: main.c:617
#, c-format
msgid ""
"The installation program will now prepare the chosen harddisk:\n"
@@ -105,15 +165,15 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:445
+#: main.c:619
msgid "Disk Setup"
msgstr ""
-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
msgid "Delete all data"
msgstr ""
-#: main.c:453
+#: main.c:627
#, c-format
msgid ""
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -124,104 +184,131 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:455
+#: main.c:629
msgid "RAID Setup"
msgstr ""
-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
msgstr ""
-#: main.c:480
+#: main.c:655
msgid "Your harddisk is too small."
msgstr ""
-#: main.c:494
+#: main.c:671
msgid ""
"Your harddisk is very small, but you can continue without a swap partition."
msgstr ""
-#: main.c:506
+#: main.c:684
msgid "ext4 Filesystem"
msgstr ""
-#: main.c:507
+#: main.c:685
msgid "ext4 Filesystem without journal"
msgstr ""
-#: main.c:508
+#: main.c:686
msgid "XFS Filesystem"
msgstr ""
-#: main.c:509
+#: main.c:687
msgid "ReiserFS Filesystem"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Filesystem Selection"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Please choose your filesystem:"
msgstr ""
-#: main.c:534
+#: main.c:712
msgid "Building RAID..."
msgstr ""
-#: main.c:538
+#: main.c:716
msgid "Unable to build the RAID."
msgstr ""
-#: main.c:550
+#: main.c:728
msgid "Partitioning disk..."
msgstr ""
-#: main.c:554
+#: main.c:732
msgid "Unable to partition the disk."
msgstr ""
-#: main.c:561
+#: main.c:739
msgid "Creating filesystems..."
msgstr ""
-#: main.c:565
+#: main.c:743
msgid "Unable to create filesystems."
msgstr ""
-#: main.c:571
+#: main.c:749
msgid "Unable to mount filesystems."
msgstr ""
-#: main.c:582
+#: main.c:760
msgid "Installing the system..."
msgstr ""
-#: main.c:583
+#: main.c:761
msgid "Unable to install the system."
msgstr ""
-#: main.c:599
+#: main.c:777
msgid "Installing the language cache..."
msgstr ""
-#: main.c:600
+#: main.c:778
msgid "Unable to install the language cache."
msgstr ""
-#: main.c:605
+#: main.c:783
msgid "Installing the bootloader..."
msgstr ""
-#: main.c:612
+#: main.c:790
msgid "Unable to open /etc/default/grub for writing."
msgstr ""
-#: main.c:634
+#: main.c:812
msgid "Unable to install the bootloader."
msgstr ""
-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
#, c-format
msgid ""
"%s was successfully installed!\n"
@@ -229,14 +316,14 @@ msgid ""
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Congratulations!"
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Reboot"
msgstr ""
-#: main.c:682
+#: main.c:893
msgid "Setup has failed. Press Ok to reboot."
msgstr ""
diff --git a/src/installer/po/zh.po b/src/installer/po/zh.po
index 3148f14..3dbca13 100644
--- a/src/installer/po/zh.po
+++ b/src/installer/po/zh.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-21 15:09+0000\n"
-"PO-Revision-Date: 2014-08-21 15:11+0000\n"
+"POT-Creation-Date: 2014-11-05 01:29+0000\n"
+"PO-Revision-Date: 2014-11-05 01:33+0000\n"
"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
"Language-Team: Chinese (http://www.transifex.com/projects/p/ipfire/language/zh/)\n"
"MIME-Version: 1.0\n"
@@ -17,31 +17,40 @@ msgstr ""
"Language: zh\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: main.c:77 main.c:148 main.c:313 main.c:339 main.c:493 main.c:524 main.c:682
+#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893
msgid "OK"
msgstr ""
-#: main.c:78 main.c:446 main.c:456 main.c:493 main.c:524
+#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670
+#: main.c:702
msgid "Cancel"
msgstr ""
-#: main.c:145
+#: main.c:176
msgid "I accept this license"
msgstr ""
-#: main.c:312
+#: main.c:384
+msgid "Warning: Unattended installation will start in 10 seconds..."
+msgstr ""
+
+#: main.c:403
msgid "Language selection"
msgstr ""
-#: main.c:312
+#: main.c:403
msgid "Select the language you wish to use for the installation."
msgstr ""
-#: main.c:323
+#: main.c:418
+msgid "Unattended mode"
+msgstr ""
+
+#: main.c:420
msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"
msgstr ""
-#: main.c:328
+#: main.c:426
#, c-format
msgid ""
"Welcome to the %s installation program.\n"
@@ -49,53 +58,104 @@ msgid ""
"Selecting Cancel on any of the following screens will reboot the computer."
msgstr ""
-#: main.c:330
+#: main.c:428
msgid "Start installation"
msgstr ""
-#: main.c:339
-msgid "No local source media found. Starting download."
+#: main.c:449
+#, c-format
+msgid "The installer will now try downloading the installation image."
+msgstr ""
+
+#: main.c:452
+#, c-format
+msgid ""
+"No source drive could be found.\n"
+"\n"
+"You can try downloading the required installation image."
+msgstr ""
+
+#: main.c:456
+msgid ""
+"Please make sure to connect your machine to a network and the installer will"
+" try connect to acquire an IP address."
+msgstr ""
+
+#: main.c:460
+msgid "Download installation image"
+msgstr ""
+
+#: main.c:473
+msgid "Trying to start networking (DHCP)..."
+msgstr ""
+
+#: main.c:484
+msgid ""
+"Networking could not be started but is required to go on with the installation.\n"
+"\n"
+"Please connect your machine to a network with a DHCP server and retry."
+msgstr ""
+
+#: main.c:487 main.c:516
+msgid "Retry"
msgstr ""
-#: main.c:340
-msgid "Downloading installation image ..."
+#: main.c:501
+msgid "Downloading installation image..."
msgstr ""
-#: main.c:342
-msgid "Download error"
+#: main.c:510
+#, c-format
+msgid "MD5 checksum mismatch"
msgstr ""
-#: main.c:376
+#: main.c:513
+#, c-format
+msgid ""
+"The installation image could not be downloaded.\n"
+" Reason: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: main.c:528
+#, c-format
+msgid ""
+"Could not mount %s to %s:\n"
+" %s\n"
+msgstr ""
+
+#: main.c:543
msgid "License Agreement"
msgstr ""
-#: main.c:377
+#: main.c:544
msgid "License not accepted!"
msgstr ""
-#: main.c:399
+#: main.c:566
msgid "No hard disk found."
msgstr ""
-#: main.c:418
+#: main.c:587
msgid "Disk Selection"
msgstr ""
-#: main.c:419
+#: main.c:588
msgid ""
"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n"
"\n"
"ALL DATA ON THE DISK WILL BE DESTROYED."
msgstr ""
-#: main.c:430
+#: main.c:599
msgid ""
"No disk has been selected.\n"
"\n"
"Please select one or more disks you want to install IPFire on."
msgstr ""
-#: main.c:443
+#: main.c:617
#, c-format
msgid ""
"The installation program will now prepare the chosen harddisk:\n"
@@ -105,15 +165,15 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:445
+#: main.c:619
msgid "Disk Setup"
msgstr ""
-#: main.c:446 main.c:456
+#: main.c:620 main.c:630
msgid "Delete all data"
msgstr ""
-#: main.c:453
+#: main.c:627
#, c-format
msgid ""
"The installation program will now set up a RAID configuration on the selected harddisks:\n"
@@ -124,104 +184,131 @@ msgid ""
"Do you agree to continue?"
msgstr ""
-#: main.c:455
+#: main.c:629
msgid "RAID Setup"
msgstr ""
-#: main.c:466
-msgid "You disk configuration is currently not supported."
+#: main.c:640
+msgid "Your disk configuration is currently not supported."
msgstr ""
-#: main.c:480
+#: main.c:655
msgid "Your harddisk is too small."
msgstr ""
-#: main.c:494
+#: main.c:671
msgid ""
"Your harddisk is very small, but you can continue without a swap partition."
msgstr ""
-#: main.c:506
+#: main.c:684
msgid "ext4 Filesystem"
msgstr ""
-#: main.c:507
+#: main.c:685
msgid "ext4 Filesystem without journal"
msgstr ""
-#: main.c:508
+#: main.c:686
msgid "XFS Filesystem"
msgstr ""
-#: main.c:509
+#: main.c:687
msgid "ReiserFS Filesystem"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Filesystem Selection"
msgstr ""
-#: main.c:523
+#: main.c:701
msgid "Please choose your filesystem:"
msgstr ""
-#: main.c:534
+#: main.c:712
msgid "Building RAID..."
msgstr ""
-#: main.c:538
+#: main.c:716
msgid "Unable to build the RAID."
msgstr ""
-#: main.c:550
+#: main.c:728
msgid "Partitioning disk..."
msgstr ""
-#: main.c:554
+#: main.c:732
msgid "Unable to partition the disk."
msgstr ""
-#: main.c:561
+#: main.c:739
msgid "Creating filesystems..."
msgstr ""
-#: main.c:565
+#: main.c:743
msgid "Unable to create filesystems."
msgstr ""
-#: main.c:571
+#: main.c:749
msgid "Unable to mount filesystems."
msgstr ""
-#: main.c:582
+#: main.c:760
msgid "Installing the system..."
msgstr ""
-#: main.c:583
+#: main.c:761
msgid "Unable to install the system."
msgstr ""
-#: main.c:599
+#: main.c:777
msgid "Installing the language cache..."
msgstr ""
-#: main.c:600
+#: main.c:778
msgid "Unable to install the language cache."
msgstr ""
-#: main.c:605
+#: main.c:783
msgid "Installing the bootloader..."
msgstr ""
-#: main.c:612
+#: main.c:790
msgid "Unable to open /etc/default/grub for writing."
msgstr ""
-#: main.c:634
+#: main.c:812
msgid "Unable to install the bootloader."
msgstr ""
-#: main.c:666
+#: main.c:826
+msgid ""
+"A backup file has been found on the installation image.\n"
+"\n"
+"Do you want to restore the backup?"
+msgstr ""
+
+#: main.c:827
+msgid "Yes"
+msgstr ""
+
+#: main.c:827
+msgid "No"
+msgstr ""
+
+#: main.c:834
+msgid "An error occured when the backup file was restored."
+msgstr ""
+
+#: main.c:869
+msgid "Running post-install script..."
+msgstr ""
+
+#: main.c:870
+msgid "Post-install script failed."
+msgstr ""
+
+#: main.c:877
#, c-format
msgid ""
"%s was successfully installed!\n"
@@ -229,14 +316,14 @@ msgid ""
"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console."
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Congratulations!"
msgstr ""
-#: main.c:671
+#: main.c:882
msgid "Reboot"
msgstr ""
-#: main.c:682
+#: main.c:893
msgid "Setup has failed. Press Ok to reboot."
msgstr ""
diff --git a/src/setup/po/da.po b/src/setup/po/da.po
index 7c696e5..bf05c10 100644
--- a/src/setup/po/da.po
+++ b/src/setup/po/da.po
@@ -9,8 +9,8 @@ msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-21 15:12+0000\n"
-"PO-Revision-Date: 2014-08-21 15:13+0000\n"
-"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
+"PO-Revision-Date: 2014-08-24 14:21+0000\n"
+"Last-Translator: Henrik Simonsen <cybermaze(a)gmail.com>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/ipfire/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -440,7 +440,7 @@ msgid ""
"Current config: %s\n"
"\n"
"%s"
-msgstr ""
+msgstr "Nuværende konfiguration: %s\n\n%s"
#: networking.c:268
msgid "Network configuration menu"
diff --git a/src/setup/po/de.po b/src/setup/po/de.po
index b1d7d3a..12333a6 100644
--- a/src/setup/po/de.po
+++ b/src/setup/po/de.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-21 15:12+0000\n"
-"PO-Revision-Date: 2014-08-21 18:01+0000\n"
+"PO-Revision-Date: 2014-08-24 19:39+0000\n"
"Last-Translator: Stefan Schantl <stefan.schantl(a)ipfire.org>\n"
"Language-Team: German (http://www.transifex.com/projects/p/ipfire/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -138,7 +138,7 @@ msgstr "Hostname"
#: hostname.c:46
msgid "Enter the machine's hostname."
-msgstr "Bitte geben Sie den Hostname der Maschine ein."
+msgstr "Bitte geben Sie den Hostnamen der Maschine ein."
#: hostname.c:53
msgid "Hostname cannot be empty."
@@ -158,7 +158,7 @@ msgstr "Tastaturbelegung"
#: keymap.c:85
msgid "Choose the type of keyboard you are using from the list below."
-msgstr "Wählen Sie aus dieser Liste den Tastatur-Typ aus, den Sie benutzen."
+msgstr "Bitte wählen Sie aus der Liste das gewünschte Tastatur-Layout aus."
#: main.c:68 timezone.c:77
msgid "Timezone"
diff --git a/src/setup/po/fa.po b/src/setup/po/fa.po
index 2e2adc4..58a2008 100644
--- a/src/setup/po/fa.po
+++ b/src/setup/po/fa.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# hashem ghavami <hashem.wolf(a)gmail.com>, 2014
# Khalil Delavaran <khalil.delavaran(a)gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-21 15:12+0000\n"
-"PO-Revision-Date: 2014-08-21 15:13+0000\n"
-"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
+"PO-Revision-Date: 2014-11-12 18:28+0000\n"
+"Last-Translator: Khalil Delavaran <khalil.delavaran(a)gmail.com>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/ipfire/language/fa/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -52,7 +53,7 @@ msgstr "پسوند نام دامنه:"
#: networking.c:442 networking.c:552 networking.c:603 networking.c:610
#: networking.c:713 timezone.c:63
msgid "Unable to open settings file"
-msgstr ""
+msgstr "نمی توان فایل پیکربندی را باز کرد"
#: dhcp.c:111
msgid "DHCP server configuration"
@@ -60,7 +61,7 @@ msgstr "پیکربندی سرور DHCP"
#: dhcp.c:116
msgid "Configure the DHCP server by entering the settings information."
-msgstr ""
+msgstr "سرویس دهنده DHcp با داده و تنظیمات وارد شده پیکربندی شد"
#: dhcp.c:125
msgid "Enabled"
@@ -85,7 +86,7 @@ msgstr "نمی خواهم"
msgid ""
"The following fields are invalid:\n"
"\n"
-msgstr ""
+msgstr "شاخص های زیر اشتباه هستند:\n\n"
#: dhcp.c:159
msgid "Start address"
@@ -129,7 +130,7 @@ msgstr "نام دامنه نمی تواند فاصله داشته باشد."
#: domainname.c:53
msgid "Domain name may only contain letters, numbers, hyphens and periods."
-msgstr ""
+msgstr "نام دامنه ممکن است شامل حروف، اعداد، خط فاصله و دوره های باشذ"
#: hostname.c:46 main.c:69
msgid "Hostname"
@@ -149,23 +150,23 @@ msgstr "نام هاست نمیتواند فاصله داشته باشد."
#: hostname.c:58
msgid "Hostname may only contain letters, numbers and hyphens."
-msgstr ""
+msgstr "نام هاست ممکن است شامل حروف، اعداد و خط فاصله باشد."
#: keymap.c:84 main.c:67
msgid "Keyboard mapping"
-msgstr ""
+msgstr "نگاشت کیبورد"
#: keymap.c:85
msgid "Choose the type of keyboard you are using from the list below."
-msgstr ""
+msgstr "نوع کی بورد خود را از لیست زیر گزینش کنید."
#: main.c:68 timezone.c:77
msgid "Timezone"
-msgstr ""
+msgstr "منطقه زمانی"
#: main.c:71 networking.c:110 networking.c:115 networking.c:447
msgid "Networking"
-msgstr ""
+msgstr "شبکه بندی"
#: main.c:72 misc.c:147
msgid "ISDN"
@@ -181,15 +182,15 @@ msgstr "گذر واژه 'admin'"
#: main.c:90
msgid " <Tab>/<Alt-Tab> between elements | <Space> selects"
-msgstr ""
+msgstr " <Tab>/<Alt-Tab> میان عنصری | <Space> گزینش"
#: main.c:97
msgid "Section menu"
-msgstr ""
+msgstr "برش منو"
#: main.c:98
msgid "Select the item you wish to configure."
-msgstr ""
+msgstr "اینترفیسی که قصد پیکربندی دوباره آنرا دارید گزینش کنید."
#: main.c:99
msgid "Quit"
@@ -207,50 +208,50 @@ msgstr "گوشزد"
msgid ""
"Initial setup was not entirely complete. You must ensure that Setup is "
"properly finished by running setup again at the shell."
-msgstr ""
+msgstr "راه اندازی به پایان نرسیده است. شما با اجرای دوباره راه اندازی در خط فرمان باید مطمئن شوید که راه اندازی پایان یافته است."
#: misc.c:62
#, c-format
msgid "Unable to write %s/main/hostname.conf"
-msgstr ""
+msgstr "نمی توان %s/main/hostname.conf را نوشت."
#: misc.c:71
msgid "Unable to open main hosts file."
-msgstr ""
+msgstr "نمی توان فایل هاست های اصلی را باز کرد."
#: misc.c:76
msgid "Unable to write /etc/hosts."
-msgstr ""
+msgstr "نمی توان در /etc/hosts نوشت."
#: misc.c:117
msgid "Unable to write /etc/hosts.deny."
-msgstr ""
+msgstr "نمی توان در /etc/hosts.deny نوشت."
#: misc.c:125
msgid "Unable to write /etc/hosts.allow."
-msgstr ""
+msgstr "نمی توان در /etc/hosts.allow نوشت."
#: misc.c:136
msgid "Unable to set hostname."
-msgstr ""
+msgstr "نمی توان نام هاست را پیکربندی کرد."
#: misc.c:147
msgid "Scanning and configuring ISDN devices."
-msgstr ""
+msgstr "پویش و پیکربندی دستگاه های ISDN."
#: misc.c:148
msgid "Unable to scan for ISDN devices."
-msgstr ""
+msgstr "نمی توان دستگاههای ISDN را پویش کرد."
#: netstuff.c:86
#, c-format
msgid "Interface - %s"
-msgstr ""
+msgstr "اینترفیس - %s"
#: netstuff.c:91
#, c-format
msgid "Enter the IP address information for the %s interface."
-msgstr ""
+msgstr "داده های آدرس IP برای اینترفیس %s را بنویسید."
#: netstuff.c:103
msgid "Static"
@@ -270,7 +271,7 @@ msgstr "نام هاست DHCP:"
#: netstuff.c:115
msgid "Force DHCP MTU:"
-msgstr ""
+msgstr "DHCP MTU به زور:"
#: netstuff.c:134
msgid "IP address:"
@@ -282,7 +283,7 @@ msgstr "ماسک شبکه:"
#: netstuff.c:173 networking.c:749
msgid "The following fields are invalid:"
-msgstr ""
+msgstr "شاخص های زیر اشتباه هستند"
#: netstuff.c:183
msgid "IP address"
@@ -298,16 +299,16 @@ msgstr "نام هاست DHCP"
#: netstuff.c:396 netstuff.c:709
msgid "Unset"
-msgstr ""
+msgstr "تنظیم نشده"
#: netstuff.c:669
#, c-format
msgid "Please choose a networkcard for the following interface - %s."
-msgstr ""
+msgstr "خواهشمند است یک کارت شبکه برای اینترفیس %s زیر گزینش کنید."
#: netstuff.c:672
msgid "Extended Network Menu"
-msgstr ""
+msgstr "منوی گسترده شبکه"
#: netstuff.c:673 networking.c:520
msgid "Select"
@@ -315,28 +316,28 @@ msgstr "گزینش"
#: netstuff.c:673
msgid "Identify"
-msgstr ""
+msgstr "شناختن"
#: netstuff.c:678
msgid "Device Identification"
-msgstr ""
+msgstr "شناسایی دستگاه"
#: netstuff.c:678
msgid "The lights on the selected port should flash now for 10 seconds..."
-msgstr ""
+msgstr "چراغ های پورت گزینش شده، هم اکنون باید برای 10 ثانیه چشمک بزنند..."
#: netstuff.c:679
msgid "Identification is not supported by this interface."
-msgstr ""
+msgstr "این اینترفیس شناسایی را پشتیبانی نمی کند."
#: netstuff.c:691
msgid "There are no unassigned interfaces on your system."
-msgstr ""
+msgstr "هیچ رابط اختصاص داده نشده بر روی سیستم شما وجود ندارد."
#: netstuff.c:732
#, c-format
msgid "Do you really want to remove the assigned %s interface?"
-msgstr ""
+msgstr "آیا شما واقعا می خواهید اینترفیس %s اختصاص داده شده را پاک کنید؟"
#: netstuff.c:755
msgid "Select network driver"
@@ -344,35 +345,35 @@ msgstr "گزینش راه انداز شبکه"
#: netstuff.c:755
msgid "Set additional module parameters"
-msgstr ""
+msgstr "پیکربندی پارامترهای افزوده ماژول"
#: netstuff.c:762
msgid "Loading module..."
-msgstr ""
+msgstr "بارگذاری ماژول..."
#: netstuff.c:777
msgid "Unable to load driver module."
-msgstr ""
+msgstr "نمی توان راه انداز ماژول را بارگذاری کرد."
#: netstuff.c:780
msgid "Module name cannot be blank."
-msgstr ""
+msgstr "نام ماژول نمی تواند پوچ باشد."
#: networking.c:110
msgid "Stopping network..."
-msgstr ""
+msgstr "از کار انداختن شبکه..."
#: networking.c:115
msgid "Restarting network..."
-msgstr ""
+msgstr "شروع دوباره شبکه..."
#: networking.c:146
msgid "No GREEN interface assigned."
-msgstr ""
+msgstr "به اینترفیس سبز میزانی داده نشده است."
#: networking.c:152
msgid "Missing an IP address on GREEN."
-msgstr ""
+msgstr "آدرس IP بر روی سبز یافت نشد."
#: networking.c:163
msgid "Error"
@@ -384,43 +385,43 @@ msgstr "نادیده گرفتن"
#: networking.c:164
msgid "No RED interface assigned."
-msgstr ""
+msgstr "برای اینترفیس قرمز میزانی داده نشده است."
#: networking.c:173
msgid "Missing an IP address on RED."
-msgstr ""
+msgstr "آدرس IP بر روی قرمز یافت نشد."
#: networking.c:183
msgid "No ORANGE interface assigned."
-msgstr ""
+msgstr "برای اینترفیس نارنجی میزانی داده نشده است."
#: networking.c:189
msgid "Missing an IP address on ORANGE."
-msgstr ""
+msgstr "آدرس IP بر روی نارنجی یافت نشد."
#: networking.c:199
msgid "No BLUE interface assigned."
-msgstr ""
+msgstr "برای اینترفیس آبی میزانی داده نشده است."
#: networking.c:205
msgid "Missing an IP address on BLUE."
-msgstr ""
+msgstr "آدرس IP بر روی آبی یافت نشد."
#: networking.c:217
msgid "Misssing DNS."
-msgstr ""
+msgstr "DNS یافت نشد."
#: networking.c:224
msgid "Missing Default Gateway."
-msgstr ""
+msgstr "Gateway پیش پندار یافت نشد."
#: networking.c:237 networking.c:304
msgid "Network configuration type"
-msgstr ""
+msgstr "چگونگی پیکربندی شبکه"
#: networking.c:238 networking.c:409
msgid "Drivers and card assignments"
-msgstr ""
+msgstr "راه انداز ها و تکالیف کارت ها"
#: networking.c:239 networking.c:640
msgid "Address settings"
@@ -428,11 +429,11 @@ msgstr "پیکربندی آدرس"
#: networking.c:240 networking.c:743
msgid "DNS and Gateway settings"
-msgstr ""
+msgstr "پیکربندی DNS و Gateway"
#: networking.c:260
msgid "When configuration is complete, a network restart will be required."
-msgstr ""
+msgstr "وقتی پیکربندی کامل شد سرویس شبکه در صورت نیاز راه اندازی مجدد خواهد شد"
#: networking.c:267
#, c-format
@@ -440,11 +441,11 @@ msgid ""
"Current config: %s\n"
"\n"
"%s"
-msgstr ""
+msgstr "پیکربندی جاری: %s\n\n%s"
#: networking.c:268
msgid "Network configuration menu"
-msgstr ""
+msgstr "منوی پیکربندی شبکه"
#: networking.c:269 networking.c:520 networking.c:642
msgid "Done"
@@ -457,7 +458,7 @@ msgid ""
"list those interfaces which have ethernet attached. If you change this "
"setting, a network restart will be required, and you will have to "
"reconfigure the network driver assignments."
-msgstr ""
+msgstr "پیکربندی شبکه برای %s را گزینش کنید. لیست روش های پیکربندی زیر آن اینترفیس ها، وقتیکه به شبکه متصل شده اند. اگر شما پیکربندی را دگرگون سازید، یک شبکه نیاز به خاموش روشن دارد، و شما راه انداز شبکه اختصاص داده شده را دوباره پیکربندی کنید."
#: networking.c:307
#, c-format
@@ -465,7 +466,7 @@ msgid ""
"Not enough netcards for your choice.\n"
"\n"
"Needed: %d - Available: %d\n"
-msgstr ""
+msgstr "کارتهای شبکه برای گزینش شما کافی نیست.\n\nنیازمند: %d - در دسترس: %d\n"
#: networking.c:359
msgid ""
@@ -475,21 +476,21 @@ msgstr ""
#: networking.c:408
msgid "Do you wish to change these settings?"
-msgstr ""
+msgstr "ایا قصد دارید این تنظیمات تغییر دهید؟"
#: networking.c:447
msgid "Restarting non-local network..."
-msgstr ""
+msgstr "شروع دوباره شبکه..."
#: networking.c:464
msgid ""
"Please choose the interface you wish to change.\n"
"\n"
-msgstr ""
+msgstr "خواهشمند است اینترفیسی را که می خواهید دگرگون سازید را گزینش کنید.\n\n"
#: networking.c:519
msgid "Assigned Cards"
-msgstr ""
+msgstr "کارت های واگذار شده"
#: networking.c:520
msgid "Remove"
@@ -506,7 +507,7 @@ msgstr ""
#: networking.c:641
msgid "Select the interface you wish to reconfigure."
-msgstr ""
+msgstr "اینترفیس که قصد پیکربندی مجدد را دارید انتخاب کنید"
#: networking.c:729
msgid "Default gateway:"
@@ -524,12 +525,12 @@ msgstr "Gateway پیش پندار"
#: networking.c:780
msgid "Secondary DNS specified without a Primary DNS"
-msgstr ""
+msgstr "دومین DNS بدون پیکربندی نخستین DNS"
#: passwords.c:33
msgid ""
"Enter the 'root' user password. Login as this user for commandline access."
-msgstr ""
+msgstr "رمز عبور کاربر ریشه را وارد کنید.این کاربر سطح دسترسی خط فرمان را فراهم میکند"
#: passwords.c:38 passwords.c:61
msgid "Setting password"
@@ -558,7 +559,7 @@ msgstr "پیکربندی %s 'admin' گذر واژه کاربر..."
#: passwords.c:62
#, c-format
msgid "Problem setting %s 'admin' user password."
-msgstr ""
+msgstr "ایراد در پیکربندی %s گذر واژه کاربر 'admin'"
#: passwords.c:76
msgid "Password:"
@@ -582,4 +583,4 @@ msgstr "در گذر واژه نمی توان فاصله گذاشت."
#: timezone.c:77
msgid "Choose the timezone you are in from the list below."
-msgstr ""
+msgstr " از لیست منطقه زمانی خود را انتخاب کنید"
diff --git a/src/setup/po/fr.po b/src/setup/po/fr.po
index 914095d..eb04ad4 100644
--- a/src/setup/po/fr.po
+++ b/src/setup/po/fr.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# irenee Munyaneza <muirenee(a)yahoo.fr>, 2014
msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-21 15:12+0000\n"
-"PO-Revision-Date: 2014-08-21 15:13+0000\n"
-"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
+"PO-Revision-Date: 2014-10-06 16:32+0000\n"
+"Last-Translator: irenee Munyaneza <muirenee(a)yahoo.fr>\n"
"Language-Team: French (http://www.transifex.com/projects/p/ipfire/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -78,7 +79,7 @@ msgstr ""
#: networking.c:410 networking.c:560 networking.c:653 networking.c:746
#: passwords.c:89 timezone.c:78
msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
#: dhcp.c:156
msgid ""
@@ -112,7 +113,7 @@ msgstr ""
#: domainname.c:42 main.c:70
msgid "Domain name"
-msgstr ""
+msgstr "Nom de domaine"
#: domainname.c:42
msgid "Enter Domain name"
@@ -200,7 +201,7 @@ msgstr ""
#: main.c:174 netstuff.c:733 networking.c:560 networking.c:653
msgid "Warning"
-msgstr ""
+msgstr "Avertissement"
#: main.c:175
msgid ""
@@ -273,7 +274,7 @@ msgstr ""
#: netstuff.c:134
msgid "IP address:"
-msgstr ""
+msgstr "Adresse IP"
#: netstuff.c:146
msgid "Network mask:"
@@ -285,7 +286,7 @@ msgstr ""
#: netstuff.c:183
msgid "IP address"
-msgstr ""
+msgstr "Adresse IP"
#: netstuff.c:189
msgid "Network mask"
@@ -355,7 +356,7 @@ msgstr ""
#: netstuff.c:780
msgid "Module name cannot be blank."
-msgstr ""
+msgstr "Le nom du module ne doit pas être vide"
#: networking.c:110
msgid "Stopping network..."
@@ -375,7 +376,7 @@ msgstr ""
#: networking.c:163
msgid "Error"
-msgstr ""
+msgstr "Erreur"
#: networking.c:163
msgid "Ignore"
@@ -423,7 +424,7 @@ msgstr ""
#: networking.c:239 networking.c:640
msgid "Address settings"
-msgstr ""
+msgstr "Configuration d'adresse"
#: networking.c:240 networking.c:743
msgid "DNS and Gateway settings"
@@ -443,7 +444,7 @@ msgstr ""
#: networking.c:268
msgid "Network configuration menu"
-msgstr ""
+msgstr "Menu de configuration Reseau"
#: networking.c:269 networking.c:520 networking.c:642
msgid "Done"
@@ -488,7 +489,7 @@ msgstr ""
#: networking.c:519
msgid "Assigned Cards"
-msgstr ""
+msgstr "Cartes attribuées"
#: networking.c:520
msgid "Remove"
@@ -509,7 +510,7 @@ msgstr ""
#: networking.c:729
msgid "Default gateway:"
-msgstr ""
+msgstr "Passerelle par defaut"
#: networking.c:744
msgid ""
@@ -519,7 +520,7 @@ msgstr ""
#: networking.c:773
msgid "Default gateway"
-msgstr ""
+msgstr "Passerelle par défaut"
#: networking.c:780
msgid "Secondary DNS specified without a Primary DNS"
@@ -532,7 +533,7 @@ msgstr ""
#: passwords.c:38 passwords.c:61
msgid "Setting password"
-msgstr ""
+msgstr "Configuration du mot de passe"
#: passwords.c:38
msgid "Setting 'root' password...."
@@ -561,15 +562,15 @@ msgstr ""
#: passwords.c:76
msgid "Password:"
-msgstr ""
+msgstr "Mot de passe"
#: passwords.c:77
msgid "Again:"
-msgstr ""
+msgstr "Encore"
#: passwords.c:95
msgid "Password cannot be blank."
-msgstr ""
+msgstr "Le mot de passe ne doit pas être vide"
#: passwords.c:102
msgid "Passwords do not match."
@@ -577,7 +578,7 @@ msgstr ""
#: passwords.c:109
msgid "Password cannot contain spaces."
-msgstr ""
+msgstr "Le mot de passe ne doit pas contenir des espaces"
#: timezone.c:77
msgid "Choose the timezone you are in from the list below."
diff --git a/src/setup/po/hr.po b/src/setup/po/hr.po
new file mode 100644
index 0000000..3ecc4d3
--- /dev/null
+++ b/src/setup/po/hr.po
@@ -0,0 +1,584 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The IPFire Project (www.ipfire.org)
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: IPFire Project\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-08-21 15:12+0000\n"
+"PO-Revision-Date: 2014-10-31 14:31+0000\n"
+"Last-Translator: Blago Culjak <blago.culjak(a)hotmail.com>\n"
+"Language-Team: Croatian (http://www.transifex.com/projects/p/ipfire/language/hr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+
+#: dhcp.c:50
+msgid "Start address:"
+msgstr "Početna adresa:"
+
+#: dhcp.c:51
+msgid "End address:"
+msgstr "Krajna adresa:"
+
+#: dhcp.c:52 networking.c:717
+msgid "Primary DNS:"
+msgstr "Primarni DNS:"
+
+#: dhcp.c:53 networking.c:723
+msgid "Secondary DNS:"
+msgstr "Sekundarni DNS:"
+
+#: dhcp.c:54
+msgid "Default lease (mins):"
+msgstr "Zadani zakup (min):"
+
+#: dhcp.c:55
+msgid "Max lease (mins):"
+msgstr "Max zakup (min):"
+
+#: dhcp.c:56
+msgid "Domain name suffix:"
+msgstr "Sufiks naziva domene:"
+
+#: dhcp.c:86 dhcp.c:93 dhcp.c:101 domainname.c:34 hostname.c:37 keymap.c:70
+#: misc.c:40 misc.c:52 netstuff.c:377 netstuff.c:566 netstuff.c:704
+#: networking.c:134 networking.c:255 networking.c:291 networking.c:346
+#: networking.c:442 networking.c:552 networking.c:603 networking.c:610
+#: networking.c:713 timezone.c:63
+msgid "Unable to open settings file"
+msgstr "Nije moguće otvoriti datoteku s postavkama"
+
+#: dhcp.c:111
+msgid "DHCP server configuration"
+msgstr "Konfiguracija DHCP poslužitelja"
+
+#: dhcp.c:116
+msgid "Configure the DHCP server by entering the settings information."
+msgstr "Konfiguracija DHCP poslužitelj s unosom postavki."
+
+#: dhcp.c:125
+msgid "Enabled"
+msgstr "Omogućeno"
+
+#: dhcp.c:142 domainname.c:43 hostname.c:47 keymap.c:86 main.c:99 main.c:172
+#: main.c:174 netstuff.c:157 netstuff.c:733 netstuff.c:756 networking.c:163
+#: networking.c:269 networking.c:305 networking.c:409 networking.c:560
+#: networking.c:642 networking.c:653 networking.c:746 passwords.c:89
+#: timezone.c:78
+msgid "OK"
+msgstr "OK"
+
+#: dhcp.c:143 domainname.c:43 hostname.c:47 keymap.c:86 netstuff.c:158
+#: netstuff.c:673 netstuff.c:733 netstuff.c:756 networking.c:305
+#: networking.c:410 networking.c:560 networking.c:653 networking.c:746
+#: passwords.c:89 timezone.c:78
+msgid "Cancel"
+msgstr "Otkazati"
+
+#: dhcp.c:156
+msgid ""
+"The following fields are invalid:\n"
+"\n"
+msgstr "Sljedeća polja su nevažeća:\n\n"
+
+#: dhcp.c:159
+msgid "Start address"
+msgstr "Početna adresa"
+
+#: dhcp.c:165
+msgid "End address"
+msgstr "Završna adresa"
+
+#: dhcp.c:173 networking.c:755
+msgid "Primary DNS"
+msgstr "Primarni DNS"
+
+#: dhcp.c:182 networking.c:764
+msgid "Secondary DNS"
+msgstr "Sekundarni DNS"
+
+#: dhcp.c:189
+msgid "Default lease time"
+msgstr "Zadano vrijeme zakupa"
+
+#: dhcp.c:195
+msgid "Max. lease time"
+msgstr "Max. vrijeme zakupa"
+
+#: domainname.c:42 main.c:70
+msgid "Domain name"
+msgstr "Naziv domene"
+
+#: domainname.c:42
+msgid "Enter Domain name"
+msgstr "Unesite naziv domene"
+
+#: domainname.c:48
+msgid "Domain name cannot be empty."
+msgstr "Naziv domene ne smije biti prazan."
+
+#: domainname.c:50
+msgid "Domain name cannot contain spaces."
+msgstr "Naziv domene ne smije sadržavati razmake."
+
+#: domainname.c:53
+msgid "Domain name may only contain letters, numbers, hyphens and periods."
+msgstr "Naziv domene može sadržavati samo slova, brojeve, crtice i točkice."
+
+#: hostname.c:46 main.c:69
+msgid "Hostname"
+msgstr "Ime računala"
+
+#: hostname.c:46
+msgid "Enter the machine's hostname."
+msgstr "Upišite naziv računala."
+
+#: hostname.c:53
+msgid "Hostname cannot be empty."
+msgstr "Naziv računala ne može biti prazan."
+
+#: hostname.c:55
+msgid "Hostname cannot contain spaces."
+msgstr "Naziv računala ne može sadržavati razmake."
+
+#: hostname.c:58
+msgid "Hostname may only contain letters, numbers and hyphens."
+msgstr "Naziv računala može sadržavati samo slova, brojeve i crtice."
+
+#: keymap.c:84 main.c:67
+msgid "Keyboard mapping"
+msgstr "Vrsta tipkovnice"
+
+#: keymap.c:85
+msgid "Choose the type of keyboard you are using from the list below."
+msgstr "Izaberite vrstu tipkovnice koju koristite s popisa u nastavku."
+
+#: main.c:68 timezone.c:77
+msgid "Timezone"
+msgstr "Vremenska zona"
+
+#: main.c:71 networking.c:110 networking.c:115 networking.c:447
+msgid "Networking"
+msgstr "Mreža"
+
+#: main.c:72 misc.c:147
+msgid "ISDN"
+msgstr "ISDN"
+
+#: main.c:73
+msgid "'root' password"
+msgstr "'root' lozinka"
+
+#: main.c:74
+msgid "'admin' password"
+msgstr "'admin' lozinka"
+
+#: main.c:90
+msgid " <Tab>/<Alt-Tab> between elements | <Space> selects"
+msgstr " <Tab>/<Alt-Tab> odabiranje drugih opcija | <Space> Izaberi"
+
+#: main.c:97
+msgid "Section menu"
+msgstr "Izbornik"
+
+#: main.c:98
+msgid "Select the item you wish to configure."
+msgstr "Odaberite stavku koju želite konfigurirati."
+
+#: main.c:99
+msgid "Quit"
+msgstr "Odustati"
+
+#: main.c:172
+msgid "Setup is complete."
+msgstr "Podešavanje je dovršeno."
+
+#: main.c:174 netstuff.c:733 networking.c:560 networking.c:653
+msgid "Warning"
+msgstr "Upozorenje"
+
+#: main.c:175
+msgid ""
+"Initial setup was not entirely complete. You must ensure that Setup is "
+"properly finished by running setup again at the shell."
+msgstr "Početno postavljanje nije u potpunosti završeno. Morate završiti postavljanje prije ponovnog postavljanja u shellu."
+
+#: misc.c:62
+#, c-format
+msgid "Unable to write %s/main/hostname.conf"
+msgstr "Nije moguće zapisati %s/main/hostname.conf"
+
+#: misc.c:71
+msgid "Unable to open main hosts file."
+msgstr "Nije moguće otvoriti glavnu hosts datoteku."
+
+#: misc.c:76
+msgid "Unable to write /etc/hosts."
+msgstr "Nije moguće zapisati /etc/hosts."
+
+#: misc.c:117
+msgid "Unable to write /etc/hosts.deny."
+msgstr "Nije moguće zapisati /etc/hosts.deny"
+
+#: misc.c:125
+msgid "Unable to write /etc/hosts.allow."
+msgstr "Nije moguće zapisati /etc/hosts.allow."
+
+#: misc.c:136
+msgid "Unable to set hostname."
+msgstr "Nije moguće postaviti naziv računala (hostname)."
+
+#: misc.c:147
+msgid "Scanning and configuring ISDN devices."
+msgstr "Skeniranje i postavljanje ISDN uređaja."
+
+#: misc.c:148
+msgid "Unable to scan for ISDN devices."
+msgstr "Nije moguće skenirati ISDN uređaj."
+
+#: netstuff.c:86
+#, c-format
+msgid "Interface - %s"
+msgstr "Sučelje - %s"
+
+#: netstuff.c:91
+#, c-format
+msgid "Enter the IP address information for the %s interface."
+msgstr "Unesite podatke o IP adresi za %s sučelje."
+
+#: netstuff.c:103
+msgid "Static"
+msgstr "Statička"
+
+#: netstuff.c:104
+msgid "DHCP"
+msgstr "DHCP"
+
+#: netstuff.c:105
+msgid "PPP DIALUP (PPPoE, modem, ATM ...)"
+msgstr "PPP DIALUP (PPPoE, modem, ATM ...)"
+
+#: netstuff.c:113
+msgid "DHCP Hostname:"
+msgstr "DHCP naziv računala:"
+
+#: netstuff.c:115
+msgid "Force DHCP MTU:"
+msgstr "Prisili DHCP MTU:"
+
+#: netstuff.c:134
+msgid "IP address:"
+msgstr "IP adresa:"
+
+#: netstuff.c:146
+msgid "Network mask:"
+msgstr "Mreža maska:"
+
+#: netstuff.c:173 networking.c:749
+msgid "The following fields are invalid:"
+msgstr "Sljedeća polja su nevažeća:"
+
+#: netstuff.c:183
+msgid "IP address"
+msgstr "IP adresa"
+
+#: netstuff.c:189
+msgid "Network mask"
+msgstr "Mreža maska"
+
+#: netstuff.c:198
+msgid "DHCP hostname"
+msgstr "DHCP naziv računala"
+
+#: netstuff.c:396 netstuff.c:709
+msgid "Unset"
+msgstr "Nije postavljeno"
+
+#: netstuff.c:669
+#, c-format
+msgid "Please choose a networkcard for the following interface - %s."
+msgstr "Odaberite mrežnu karticu za sučelje - %s."
+
+#: netstuff.c:672
+msgid "Extended Network Menu"
+msgstr "Dodatni izbornik mreže"
+
+#: netstuff.c:673 networking.c:520
+msgid "Select"
+msgstr "Odabrati"
+
+#: netstuff.c:673
+msgid "Identify"
+msgstr "Identificirati"
+
+#: netstuff.c:678
+msgid "Device Identification"
+msgstr "Identifikacija uređaja"
+
+#: netstuff.c:678
+msgid "The lights on the selected port should flash now for 10 seconds..."
+msgstr "Svjetla na odabranom ulazu bi trebala bljeskati 10 sekundi..."
+
+#: netstuff.c:679
+msgid "Identification is not supported by this interface."
+msgstr "Identifikacija ne podržava ovo sučelje."
+
+#: netstuff.c:691
+msgid "There are no unassigned interfaces on your system."
+msgstr "Nema dodijeljenih sučelja na vašem sustavu."
+
+#: netstuff.c:732
+#, c-format
+msgid "Do you really want to remove the assigned %s interface?"
+msgstr "Da li stvarno želite ukloniti dodijeljeno %s sučelje?"
+
+#: netstuff.c:755
+msgid "Select network driver"
+msgstr "Odaberite mrežni driver"
+
+#: netstuff.c:755
+msgid "Set additional module parameters"
+msgstr "Postavite dodatne parametre modula"
+
+#: netstuff.c:762
+msgid "Loading module..."
+msgstr "Očitavam modul..."
+
+#: netstuff.c:777
+msgid "Unable to load driver module."
+msgstr "Nije moguće učitati upravljački modul."
+
+#: netstuff.c:780
+msgid "Module name cannot be blank."
+msgstr "Naziv modula ne može biti prazan."
+
+#: networking.c:110
+msgid "Stopping network..."
+msgstr "Zaustavljanje mreže..."
+
+#: networking.c:115
+msgid "Restarting network..."
+msgstr "Ponovno pokretanje mreže..."
+
+#: networking.c:146
+msgid "No GREEN interface assigned."
+msgstr "Nije dodijeljeno GREEN sučelje."
+
+#: networking.c:152
+msgid "Missing an IP address on GREEN."
+msgstr "Nedostaje IP adresa na GREEN sučelju."
+
+#: networking.c:163
+msgid "Error"
+msgstr "Pogreška"
+
+#: networking.c:163
+msgid "Ignore"
+msgstr "Ignorirati"
+
+#: networking.c:164
+msgid "No RED interface assigned."
+msgstr "Nije dodijeljeno RED sučelje."
+
+#: networking.c:173
+msgid "Missing an IP address on RED."
+msgstr "Nedostaje IP adresu na RED sučelju."
+
+#: networking.c:183
+msgid "No ORANGE interface assigned."
+msgstr "Nije dodijeljeno ORANGE sučelje."
+
+#: networking.c:189
+msgid "Missing an IP address on ORANGE."
+msgstr "Nedostaje IP adresu na Orange sučelju."
+
+#: networking.c:199
+msgid "No BLUE interface assigned."
+msgstr "Nije dodijeljeno BLUE sučelje."
+
+#: networking.c:205
+msgid "Missing an IP address on BLUE."
+msgstr "Nedostaje IP adresu na BLUE sučelju."
+
+#: networking.c:217
+msgid "Misssing DNS."
+msgstr "Nedostaje DNS."
+
+#: networking.c:224
+msgid "Missing Default Gateway."
+msgstr "Nedostaje Zadani Gateway."
+
+#: networking.c:237 networking.c:304
+msgid "Network configuration type"
+msgstr "Tip mrežnih postavki"
+
+#: networking.c:238 networking.c:409
+msgid "Drivers and card assignments"
+msgstr "Driveri i dodjele kartice"
+
+#: networking.c:239 networking.c:640
+msgid "Address settings"
+msgstr "Postavke adresa"
+
+#: networking.c:240 networking.c:743
+msgid "DNS and Gateway settings"
+msgstr "DNS i Gateway postavke"
+
+#: networking.c:260
+msgid "When configuration is complete, a network restart will be required."
+msgstr "Kad konfiguracija je završi, ponovno pokretanje mreže je obvezno."
+
+#: networking.c:267
+#, c-format
+msgid ""
+"Current config: %s\n"
+"\n"
+"%s"
+msgstr "Trenutna konfiguracija:%s\n\n%s"
+
+#: networking.c:268
+msgid "Network configuration menu"
+msgstr "Izbornik postavki mreže"
+
+#: networking.c:269 networking.c:520 networking.c:642
+msgid "Done"
+msgstr "Završeno"
+
+#: networking.c:300
+#, c-format
+msgid ""
+"Select the network configuration for %s. The following configuration types "
+"list those interfaces which have ethernet attached. If you change this "
+"setting, a network restart will be required, and you will have to "
+"reconfigure the network driver assignments."
+msgstr "Odaberite konfiguraciju mreže za %s. Sljedeća lista su vrste postavki onih Ethernet sučelja koja su dodana. Ako promijenite ovu postavku, ponovno pokretanje mreže će biti potrebno, a vi ćete morati ponovno dodijeliti mrežne drivere."
+
+#: networking.c:307
+#, c-format
+msgid ""
+"Not enough netcards for your choice.\n"
+"\n"
+"Needed: %d - Available: %d\n"
+msgstr "Nema dovoljno nmrežnih kartica za vaš izbor.\n\nPotrebno: %d - Dostupno: %d\n"
+
+#: networking.c:359
+msgid ""
+"Configure network drivers, and which interface each card is assigned to. The current configuration is as follows:\n"
+"\n"
+msgstr "Konfiguracija mrežnih upravljačkih programa, svakome sučelju kojemu kartica je dodijeljena. Trenutna konfiguracija: \n\n"
+
+#: networking.c:408
+msgid "Do you wish to change these settings?"
+msgstr "Želite li promijeniti ove postavke?"
+
+#: networking.c:447
+msgid "Restarting non-local network..."
+msgstr "Ponovno pokretanje ne-lokalne mreže ..."
+
+#: networking.c:464
+msgid ""
+"Please choose the interface you wish to change.\n"
+"\n"
+msgstr "Odaberite sučelje koje želite promijeniti. \n\n"
+
+#: networking.c:519
+msgid "Assigned Cards"
+msgstr "Dodijeljene kartice"
+
+#: networking.c:520
+msgid "Remove"
+msgstr "Ukloniti"
+
+#: networking.c:556 networking.c:649
+#, c-format
+msgid ""
+"If you change this IP address, and you are logged in remotely, your "
+"connection to the %s machine will be broken, and you will have to reconnect "
+"on the new IP. This is a risky operation, and should only be attempted if "
+"you have physical access to the machine, should something go wrong."
+msgstr "Ako promijenite ovu IP adresu, i ako ste prijavljeni udaljeno, vaša veza s %s će biti prekinuta, a vi ćete morati ponovno povezati na novu IP adresu. Pošto je ovo rizično, te bi trebali ovo raditi samo ako imate fizički pristup uređaju, ako nešto pođe krivo."
+
+#: networking.c:641
+msgid "Select the interface you wish to reconfigure."
+msgstr "Izaberite sučelje koje želite ponovo konfigurirati."
+
+#: networking.c:729
+msgid "Default gateway:"
+msgstr "Zadani pristupnik (gateway):"
+
+#: networking.c:744
+msgid ""
+"Enter the DNS and gateway information. These settings are used only with "
+"Static IP (and DHCP if DNS set) on the RED interface."
+msgstr "Unesite DNS i gateway informacije. Ove postavke se koristite samo s Statičkim IP-om (i DHCP ako je DNS postavljen) na RED sučelju."
+
+#: networking.c:773
+msgid "Default gateway"
+msgstr "Zadani pristupnik (gateway):"
+
+#: networking.c:780
+msgid "Secondary DNS specified without a Primary DNS"
+msgstr "Sekundarni DNS je naveden bez Primarnog DNSa"
+
+#: passwords.c:33
+msgid ""
+"Enter the 'root' user password. Login as this user for commandline access."
+msgstr "Unesite 'root' lozinku. Prijavite se kao ovoj korisnik za Commandline pristup."
+
+#: passwords.c:38 passwords.c:61
+msgid "Setting password"
+msgstr "Postavljanje lozinke"
+
+#: passwords.c:38
+msgid "Setting 'root' password...."
+msgstr "Postavljanje 'root' lozinke...."
+
+#: passwords.c:39
+msgid "Problem setting 'root' password."
+msgstr "Problem s postavljanjem 'root' lozinke."
+
+#: passwords.c:53
+#, c-format
+msgid ""
+"Enter %s 'admin' user password. This is the user to use for logging into the"
+" %s web administration pages."
+msgstr "Upišite %s 'admin' lozinku. To je korisnik koji se prijavljiva na %s web sučelje za administraciju."
+
+#: passwords.c:60
+#, c-format
+msgid "Setting %s 'admin' user password..."
+msgstr "Postavljanje %s 'admin' korisničke lozinke ..."
+
+#: passwords.c:62
+#, c-format
+msgid "Problem setting %s 'admin' user password."
+msgstr "Problem postavljanja %s 'admin' korisničke lozinke."
+
+#: passwords.c:76
+msgid "Password:"
+msgstr "Lozinka:"
+
+#: passwords.c:77
+msgid "Again:"
+msgstr "Ponovno:"
+
+#: passwords.c:95
+msgid "Password cannot be blank."
+msgstr "Lozinka ne može biti prazna."
+
+#: passwords.c:102
+msgid "Passwords do not match."
+msgstr "Lozinke se ne podudaraju."
+
+#: passwords.c:109
+msgid "Password cannot contain spaces."
+msgstr "Lozinka ne može sadržavati razmak."
+
+#: timezone.c:77
+msgid "Choose the timezone you are in from the list below."
+msgstr "Odaberite vremensku zonu u kojoj se nalazite na popisu."
diff --git a/src/setup/po/it.po b/src/setup/po/it.po
index 8f14b37..778a65e 100644
--- a/src/setup/po/it.po
+++ b/src/setup/po/it.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# luX <lucianocataldo(a)gmail.com>, 2014
+# Mario <mc9085(a)mclink.it>, 2014
msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-21 15:12+0000\n"
-"PO-Revision-Date: 2014-08-21 15:13+0000\n"
-"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
+"PO-Revision-Date: 2014-09-30 13:22+0000\n"
+"Last-Translator: Mario <mc9085(a)mclink.it>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/ipfire/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,31 +21,31 @@ msgstr ""
#: dhcp.c:50
msgid "Start address:"
-msgstr ""
+msgstr "Indirizzo iniziale:"
#: dhcp.c:51
msgid "End address:"
-msgstr ""
+msgstr "Indirizzo finale:"
#: dhcp.c:52 networking.c:717
msgid "Primary DNS:"
-msgstr ""
+msgstr "DNS primario:"
#: dhcp.c:53 networking.c:723
msgid "Secondary DNS:"
-msgstr ""
+msgstr "DNS secondario:"
#: dhcp.c:54
msgid "Default lease (mins):"
-msgstr ""
+msgstr "Durata di Default del lease (min):"
#: dhcp.c:55
msgid "Max lease (mins):"
-msgstr ""
+msgstr "Durata massima del lease (min):"
#: dhcp.c:56
msgid "Domain name suffix:"
-msgstr ""
+msgstr "Suffisso del nome di Dominio:"
#: dhcp.c:86 dhcp.c:93 dhcp.c:101 domainname.c:34 hostname.c:37 keymap.c:70
#: misc.c:40 misc.c:52 netstuff.c:377 netstuff.c:566 netstuff.c:704
@@ -51,19 +53,19 @@ msgstr ""
#: networking.c:442 networking.c:552 networking.c:603 networking.c:610
#: networking.c:713 timezone.c:63
msgid "Unable to open settings file"
-msgstr ""
+msgstr "Impossibile aprire il file delle impostazioni"
#: dhcp.c:111
msgid "DHCP server configuration"
-msgstr ""
+msgstr "Configurazione server DHCP"
#: dhcp.c:116
msgid "Configure the DHCP server by entering the settings information."
-msgstr ""
+msgstr "Configura il server DHCP immettendo le informazioni necessarie."
#: dhcp.c:125
msgid "Enabled"
-msgstr ""
+msgstr "Abilitato"
#: dhcp.c:142 domainname.c:43 hostname.c:47 keymap.c:86 main.c:99 main.c:172
#: main.c:174 netstuff.c:157 netstuff.c:733 netstuff.c:756 networking.c:163
@@ -71,367 +73,367 @@ msgstr ""
#: networking.c:642 networking.c:653 networking.c:746 passwords.c:89
#: timezone.c:78
msgid "OK"
-msgstr ""
+msgstr "OK"
#: dhcp.c:143 domainname.c:43 hostname.c:47 keymap.c:86 netstuff.c:158
#: netstuff.c:673 netstuff.c:733 netstuff.c:756 networking.c:305
#: networking.c:410 networking.c:560 networking.c:653 networking.c:746
#: passwords.c:89 timezone.c:78
msgid "Cancel"
-msgstr ""
+msgstr "Annulla"
#: dhcp.c:156
msgid ""
"The following fields are invalid:\n"
"\n"
-msgstr ""
+msgstr "I seguenti campi non sono validi:\n\n"
#: dhcp.c:159
msgid "Start address"
-msgstr ""
+msgstr "Indirizzo iniziale"
#: dhcp.c:165
msgid "End address"
-msgstr ""
+msgstr "Indirizzo finale"
#: dhcp.c:173 networking.c:755
msgid "Primary DNS"
-msgstr ""
+msgstr "DNS primario"
#: dhcp.c:182 networking.c:764
msgid "Secondary DNS"
-msgstr ""
+msgstr "DNS secondario"
#: dhcp.c:189
msgid "Default lease time"
-msgstr ""
+msgstr "Tempo di lease di Default"
#: dhcp.c:195
msgid "Max. lease time"
-msgstr ""
+msgstr "Tempo di lease massimo"
#: domainname.c:42 main.c:70
msgid "Domain name"
-msgstr ""
+msgstr "Nome di Dominio"
#: domainname.c:42
msgid "Enter Domain name"
-msgstr ""
+msgstr "Inserire il nome del Dominio"
#: domainname.c:48
msgid "Domain name cannot be empty."
-msgstr ""
+msgstr "Il nome di Dominio non può essere vuoto."
#: domainname.c:50
msgid "Domain name cannot contain spaces."
-msgstr ""
+msgstr "Il nome di dominio non può contenere spazi."
#: domainname.c:53
msgid "Domain name may only contain letters, numbers, hyphens and periods."
-msgstr ""
+msgstr "Il nome del Dominio può contenere solamente lettere, numeri, trattini e punti."
#: hostname.c:46 main.c:69
msgid "Hostname"
-msgstr ""
+msgstr "Nome host"
#: hostname.c:46
msgid "Enter the machine's hostname."
-msgstr ""
+msgstr "Inserire il nome host della macchina."
#: hostname.c:53
msgid "Hostname cannot be empty."
-msgstr ""
+msgstr "Il nome host non può essere vuoto."
#: hostname.c:55
msgid "Hostname cannot contain spaces."
-msgstr ""
+msgstr "Il nome host non può contenere spazi"
#: hostname.c:58
msgid "Hostname may only contain letters, numbers and hyphens."
-msgstr ""
+msgstr "Il nome host può contenere solo lettere, numeri e trattini."
#: keymap.c:84 main.c:67
msgid "Keyboard mapping"
-msgstr ""
+msgstr "Mappatura della tastiera"
#: keymap.c:85
msgid "Choose the type of keyboard you are using from the list below."
-msgstr ""
+msgstr "Scegli la configurazione della tua tastiera dalla lista sottostante."
#: main.c:68 timezone.c:77
msgid "Timezone"
-msgstr ""
+msgstr "Fuso orario"
#: main.c:71 networking.c:110 networking.c:115 networking.c:447
msgid "Networking"
-msgstr ""
+msgstr "Networking"
#: main.c:72 misc.c:147
msgid "ISDN"
-msgstr ""
+msgstr "ISDN"
#: main.c:73
msgid "'root' password"
-msgstr ""
+msgstr "Password di 'root'"
#: main.c:74
msgid "'admin' password"
-msgstr ""
+msgstr "Password di 'admin'"
#: main.c:90
msgid " <Tab>/<Alt-Tab> between elements | <Space> selects"
-msgstr ""
+msgstr "<Tab>/<Alt-Tab> spostati tra gli elementi | <Space> selezione"
#: main.c:97
msgid "Section menu"
-msgstr ""
+msgstr "Menu di sezione"
#: main.c:98
msgid "Select the item you wish to configure."
-msgstr ""
+msgstr "Scegli l'elemento che vuoi configurare."
#: main.c:99
msgid "Quit"
-msgstr ""
+msgstr "Abbandona"
#: main.c:172
msgid "Setup is complete."
-msgstr ""
+msgstr "L'installazione è completata."
#: main.c:174 netstuff.c:733 networking.c:560 networking.c:653
msgid "Warning"
-msgstr ""
+msgstr "Attenzione"
#: main.c:175
msgid ""
"Initial setup was not entirely complete. You must ensure that Setup is "
"properly finished by running setup again at the shell."
-msgstr ""
+msgstr "Il setup iniziale non è stato completato. Completa il Setup inserendo la stinga \"setup\" nella shell. "
#: misc.c:62
#, c-format
msgid "Unable to write %s/main/hostname.conf"
-msgstr ""
+msgstr "Impossibile scrivere %s/main/hostname.conf"
#: misc.c:71
msgid "Unable to open main hosts file."
-msgstr ""
+msgstr "Impossibile aprire il file hosts principale."
#: misc.c:76
msgid "Unable to write /etc/hosts."
-msgstr ""
+msgstr "Impossibile scrivere /etc/hosts."
#: misc.c:117
msgid "Unable to write /etc/hosts.deny."
-msgstr ""
+msgstr "Impossibile scrivere /etc/hosts.deny."
#: misc.c:125
msgid "Unable to write /etc/hosts.allow."
-msgstr ""
+msgstr "Impossibile scrivere /etc/hosts.allow."
#: misc.c:136
msgid "Unable to set hostname."
-msgstr ""
+msgstr "Impossibile impostare l'hostname."
#: misc.c:147
msgid "Scanning and configuring ISDN devices."
-msgstr ""
+msgstr "Scansionando e configurando i dispositivi ISDN."
#: misc.c:148
msgid "Unable to scan for ISDN devices."
-msgstr ""
+msgstr "Impossibile scansionare i dispositivi ISDN."
#: netstuff.c:86
#, c-format
msgid "Interface - %s"
-msgstr ""
+msgstr "Interfaccia - %s"
#: netstuff.c:91
#, c-format
msgid "Enter the IP address information for the %s interface."
-msgstr ""
+msgstr "Inserisci l'indirizzo IP per l'interfaccia %s."
#: netstuff.c:103
msgid "Static"
-msgstr ""
+msgstr "Statico"
#: netstuff.c:104
msgid "DHCP"
-msgstr ""
+msgstr "DHCP"
#: netstuff.c:105
msgid "PPP DIALUP (PPPoE, modem, ATM ...)"
-msgstr ""
+msgstr "PPP DIALUP (PPPoE, modem, ATM ...)"
#: netstuff.c:113
msgid "DHCP Hostname:"
-msgstr ""
+msgstr "DHCP Hostname:"
#: netstuff.c:115
msgid "Force DHCP MTU:"
-msgstr ""
+msgstr "Forza DHCP MTU:"
#: netstuff.c:134
msgid "IP address:"
-msgstr ""
+msgstr "Indirizzo IP:"
#: netstuff.c:146
msgid "Network mask:"
-msgstr ""
+msgstr "Maschera di rete:"
#: netstuff.c:173 networking.c:749
msgid "The following fields are invalid:"
-msgstr ""
+msgstr "I seguenti campi non sono validi:"
#: netstuff.c:183
msgid "IP address"
-msgstr ""
+msgstr "Indirizzo IP"
#: netstuff.c:189
msgid "Network mask"
-msgstr ""
+msgstr "Maschera di rete"
#: netstuff.c:198
msgid "DHCP hostname"
-msgstr ""
+msgstr "DHCP hostname"
#: netstuff.c:396 netstuff.c:709
msgid "Unset"
-msgstr ""
+msgstr "Non stabilito"
#: netstuff.c:669
#, c-format
msgid "Please choose a networkcard for the following interface - %s."
-msgstr ""
+msgstr "Scegli una interfaccia di rete tra le seguenti - %s."
#: netstuff.c:672
msgid "Extended Network Menu"
-msgstr ""
+msgstr "Menu di Rete esteso"
#: netstuff.c:673 networking.c:520
msgid "Select"
-msgstr ""
+msgstr "Selezionare"
#: netstuff.c:673
msgid "Identify"
-msgstr ""
+msgstr "Identificare"
#: netstuff.c:678
msgid "Device Identification"
-msgstr ""
+msgstr "Identificazione del dispositivo"
#: netstuff.c:678
msgid "The lights on the selected port should flash now for 10 seconds..."
-msgstr ""
+msgstr "I led della porta selezionata lampeggeranno ora per 10 secondi... "
#: netstuff.c:679
msgid "Identification is not supported by this interface."
-msgstr ""
+msgstr "L'identificazione non è supportata da questa interfaccia."
#: netstuff.c:691
msgid "There are no unassigned interfaces on your system."
-msgstr ""
+msgstr "Non ci sono interfacce non assegnate nel sistema."
#: netstuff.c:732
#, c-format
msgid "Do you really want to remove the assigned %s interface?"
-msgstr ""
+msgstr "Vuoi veramente rimuovere l'assegnazione dell'l'interfaccia %s?"
#: netstuff.c:755
msgid "Select network driver"
-msgstr ""
+msgstr "Scegli un driver di rete"
#: netstuff.c:755
msgid "Set additional module parameters"
-msgstr ""
+msgstr "Inserisci parametri addizionali per il modulo"
#: netstuff.c:762
msgid "Loading module..."
-msgstr ""
+msgstr "Caricando il modulo..."
#: netstuff.c:777
msgid "Unable to load driver module."
-msgstr ""
+msgstr "Impossibile caricare i driver per il modulo."
#: netstuff.c:780
msgid "Module name cannot be blank."
-msgstr ""
+msgstr "Il nome del modulo non può essere lasciato in bianco."
#: networking.c:110
msgid "Stopping network..."
-msgstr ""
+msgstr "Arrestando la rete..."
#: networking.c:115
msgid "Restarting network..."
-msgstr ""
+msgstr "Riavviando la rete..."
#: networking.c:146
msgid "No GREEN interface assigned."
-msgstr ""
+msgstr "Non è stata assegnata l'interfaccia GREEN."
#: networking.c:152
msgid "Missing an IP address on GREEN."
-msgstr ""
+msgstr "Indirizzo IP dell'interfaccia GREEN mancante."
#: networking.c:163
msgid "Error"
-msgstr ""
+msgstr "Errore"
#: networking.c:163
msgid "Ignore"
-msgstr ""
+msgstr "Ignora"
#: networking.c:164
msgid "No RED interface assigned."
-msgstr ""
+msgstr "Non è stata assegnata l'interfaccia RED."
#: networking.c:173
msgid "Missing an IP address on RED."
-msgstr ""
+msgstr "Indirizzo IP dell'interfaccia RED mancante."
#: networking.c:183
msgid "No ORANGE interface assigned."
-msgstr ""
+msgstr "Non è stata assegnata l'interfaccia ORANGE."
#: networking.c:189
msgid "Missing an IP address on ORANGE."
-msgstr ""
+msgstr "Indirizzo IP dell'interfaccia ORANGE mancante."
#: networking.c:199
msgid "No BLUE interface assigned."
-msgstr ""
+msgstr "Non è stata assegnata l'interfaccia BLUE."
#: networking.c:205
msgid "Missing an IP address on BLUE."
-msgstr ""
+msgstr "Indirizzo IP dell'interfaccia BLUE mancante."
#: networking.c:217
msgid "Misssing DNS."
-msgstr ""
+msgstr "DNS mancanti."
#: networking.c:224
msgid "Missing Default Gateway."
-msgstr ""
+msgstr "Manca il Gateway di Default."
#: networking.c:237 networking.c:304
msgid "Network configuration type"
-msgstr ""
+msgstr "Tipo di configurazione di rete."
#: networking.c:238 networking.c:409
msgid "Drivers and card assignments"
-msgstr ""
+msgstr "Assegnazione dei driver e delle schede"
#: networking.c:239 networking.c:640
msgid "Address settings"
-msgstr ""
+msgstr "Impostazioni dell'indirizzo"
#: networking.c:240 networking.c:743
msgid "DNS and Gateway settings"
-msgstr ""
+msgstr "Impostazioni DNG e Gateway"
#: networking.c:260
msgid "When configuration is complete, a network restart will be required."
-msgstr ""
+msgstr "Quando la configurazione sarà completata, sarà necessario un riavvio della rete."
#: networking.c:267
#, c-format
@@ -439,15 +441,15 @@ msgid ""
"Current config: %s\n"
"\n"
"%s"
-msgstr ""
+msgstr "Configurazione corrente: %s\n\n%s"
#: networking.c:268
msgid "Network configuration menu"
-msgstr ""
+msgstr "Menu di configurazione della rete"
#: networking.c:269 networking.c:520 networking.c:642
msgid "Done"
-msgstr ""
+msgstr "Fatto"
#: networking.c:300
#, c-format
@@ -456,7 +458,7 @@ msgid ""
"list those interfaces which have ethernet attached. If you change this "
"setting, a network restart will be required, and you will have to "
"reconfigure the network driver assignments."
-msgstr ""
+msgstr "Scegli la configurazione di rete per l'interfaccia %s. I seguenti tipi di configurazione mostrano le interfacce con collegamento ethernet. Se cambi le impostazioni sarà richiesto un riavvio della rete, e sarà necessario riconfigurare le assegnazioni dei driver di rete."
#: networking.c:307
#, c-format
@@ -464,35 +466,35 @@ msgid ""
"Not enough netcards for your choice.\n"
"\n"
"Needed: %d - Available: %d\n"
-msgstr ""
+msgstr "Non solo più disponibili schede di rete per la tua scelta.\n\nRichieste: %d - Disponibili: %d\n"
#: networking.c:359
msgid ""
"Configure network drivers, and which interface each card is assigned to. The current configuration is as follows:\n"
"\n"
-msgstr ""
+msgstr "Configura i driver di rete e le assegnazioni delle schede alle interfacce. La configurazione attuale è la seguente:\n\n"
#: networking.c:408
msgid "Do you wish to change these settings?"
-msgstr ""
+msgstr "Desideri cambiare queste impostazioni?"
#: networking.c:447
msgid "Restarting non-local network..."
-msgstr ""
+msgstr "Riavviando la rete esterna..."
#: networking.c:464
msgid ""
"Please choose the interface you wish to change.\n"
"\n"
-msgstr ""
+msgstr "Seleziona l'interfaccia che desideri cambiare.\n\n"
#: networking.c:519
msgid "Assigned Cards"
-msgstr ""
+msgstr "Schede assegnate"
#: networking.c:520
msgid "Remove"
-msgstr ""
+msgstr "Rimuovi"
#: networking.c:556 networking.c:649
#, c-format
@@ -501,84 +503,84 @@ msgid ""
"connection to the %s machine will be broken, and you will have to reconnect "
"on the new IP. This is a risky operation, and should only be attempted if "
"you have physical access to the machine, should something go wrong."
-msgstr ""
+msgstr "Se cambi l'indirizzo IP e sei collegato in maniera remota, la connessione alla macchina %s sarà interrotta e sarà necessario riconnettersi usando il nuovo indirizzo. Questa è una operazione rischiosa e dovrebbe essere eseguita solamente se è disponibile un accesso fisico alla macchina, in caso qualcosa vada storto. "
#: networking.c:641
msgid "Select the interface you wish to reconfigure."
-msgstr ""
+msgstr "Scegli l'interfaccia che vuoi riconfigurare."
#: networking.c:729
msgid "Default gateway:"
-msgstr ""
+msgstr "Gateway di Default:"
#: networking.c:744
msgid ""
"Enter the DNS and gateway information. These settings are used only with "
"Static IP (and DHCP if DNS set) on the RED interface."
-msgstr ""
+msgstr "Immettere i parametri per il DNS ed il Gateway. Queste impostazioni saranno prese in considerazione solamente con l'opzione \"IP Statico\" (e DHCP se sono stati impostati i DNS) dell'interfaccia RED. "
#: networking.c:773
msgid "Default gateway"
-msgstr ""
+msgstr "Gateway di Default"
#: networking.c:780
msgid "Secondary DNS specified without a Primary DNS"
-msgstr ""
+msgstr "E' stato specificato un DNS secondario senza un DNS primario"
#: passwords.c:33
msgid ""
"Enter the 'root' user password. Login as this user for commandline access."
-msgstr ""
+msgstr "Immettere la Password per l'utente 'root'. Quando ci si collega da riga di comando, usare questo utente."
#: passwords.c:38 passwords.c:61
msgid "Setting password"
-msgstr ""
+msgstr "Impostando la Password"
#: passwords.c:38
msgid "Setting 'root' password...."
-msgstr ""
+msgstr "Impostando la Password per l'utente 'root'..."
#: passwords.c:39
msgid "Problem setting 'root' password."
-msgstr ""
+msgstr "Problemi durante l'impostazione della Password per l'utente 'root'."
#: passwords.c:53
#, c-format
msgid ""
"Enter %s 'admin' user password. This is the user to use for logging into the"
" %s web administration pages."
-msgstr ""
+msgstr "Introdurre la Password per l'utente 'admin' di %s. Quando ci si collega all'interfaccia web di %s usare questo utente. "
#: passwords.c:60
#, c-format
msgid "Setting %s 'admin' user password..."
-msgstr ""
+msgstr "Impostando la Password dell'utente 'admin' di %s..."
#: passwords.c:62
#, c-format
msgid "Problem setting %s 'admin' user password."
-msgstr ""
+msgstr "Si sono verificati problemi durante la configurazione della Password dell'utente 'admin' di %s."
#: passwords.c:76
msgid "Password:"
-msgstr ""
+msgstr "Password:"
#: passwords.c:77
msgid "Again:"
-msgstr ""
+msgstr "Nuovamente:"
#: passwords.c:95
msgid "Password cannot be blank."
-msgstr ""
+msgstr "La Password non può essere vuota."
#: passwords.c:102
msgid "Passwords do not match."
-msgstr ""
+msgstr "Le password non corrispondono."
#: passwords.c:109
msgid "Password cannot contain spaces."
-msgstr ""
+msgstr "La Password non può contenere spazi."
#: timezone.c:77
msgid "Choose the timezone you are in from the list below."
-msgstr ""
+msgstr "Scegli il tuo fuso orario dalla lista sottostante."
diff --git a/src/setup/po/ja_JP.po b/src/setup/po/ja_JP.po
new file mode 100644
index 0000000..0d2d2b6
--- /dev/null
+++ b/src/setup/po/ja_JP.po
@@ -0,0 +1,584 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The IPFire Project (www.ipfire.org)
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: IPFire Project\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-08-21 15:12+0000\n"
+"PO-Revision-Date: 2014-08-12 10:08+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/ipfire/language/ja_JP/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: dhcp.c:50
+msgid "Start address:"
+msgstr ""
+
+#: dhcp.c:51
+msgid "End address:"
+msgstr ""
+
+#: dhcp.c:52 networking.c:717
+msgid "Primary DNS:"
+msgstr ""
+
+#: dhcp.c:53 networking.c:723
+msgid "Secondary DNS:"
+msgstr ""
+
+#: dhcp.c:54
+msgid "Default lease (mins):"
+msgstr ""
+
+#: dhcp.c:55
+msgid "Max lease (mins):"
+msgstr ""
+
+#: dhcp.c:56
+msgid "Domain name suffix:"
+msgstr ""
+
+#: dhcp.c:86 dhcp.c:93 dhcp.c:101 domainname.c:34 hostname.c:37 keymap.c:70
+#: misc.c:40 misc.c:52 netstuff.c:377 netstuff.c:566 netstuff.c:704
+#: networking.c:134 networking.c:255 networking.c:291 networking.c:346
+#: networking.c:442 networking.c:552 networking.c:603 networking.c:610
+#: networking.c:713 timezone.c:63
+msgid "Unable to open settings file"
+msgstr ""
+
+#: dhcp.c:111
+msgid "DHCP server configuration"
+msgstr ""
+
+#: dhcp.c:116
+msgid "Configure the DHCP server by entering the settings information."
+msgstr ""
+
+#: dhcp.c:125
+msgid "Enabled"
+msgstr ""
+
+#: dhcp.c:142 domainname.c:43 hostname.c:47 keymap.c:86 main.c:99 main.c:172
+#: main.c:174 netstuff.c:157 netstuff.c:733 netstuff.c:756 networking.c:163
+#: networking.c:269 networking.c:305 networking.c:409 networking.c:560
+#: networking.c:642 networking.c:653 networking.c:746 passwords.c:89
+#: timezone.c:78
+msgid "OK"
+msgstr ""
+
+#: dhcp.c:143 domainname.c:43 hostname.c:47 keymap.c:86 netstuff.c:158
+#: netstuff.c:673 netstuff.c:733 netstuff.c:756 networking.c:305
+#: networking.c:410 networking.c:560 networking.c:653 networking.c:746
+#: passwords.c:89 timezone.c:78
+msgid "Cancel"
+msgstr ""
+
+#: dhcp.c:156
+msgid ""
+"The following fields are invalid:\n"
+"\n"
+msgstr ""
+
+#: dhcp.c:159
+msgid "Start address"
+msgstr ""
+
+#: dhcp.c:165
+msgid "End address"
+msgstr ""
+
+#: dhcp.c:173 networking.c:755
+msgid "Primary DNS"
+msgstr ""
+
+#: dhcp.c:182 networking.c:764
+msgid "Secondary DNS"
+msgstr ""
+
+#: dhcp.c:189
+msgid "Default lease time"
+msgstr ""
+
+#: dhcp.c:195
+msgid "Max. lease time"
+msgstr ""
+
+#: domainname.c:42 main.c:70
+msgid "Domain name"
+msgstr ""
+
+#: domainname.c:42
+msgid "Enter Domain name"
+msgstr ""
+
+#: domainname.c:48
+msgid "Domain name cannot be empty."
+msgstr ""
+
+#: domainname.c:50
+msgid "Domain name cannot contain spaces."
+msgstr ""
+
+#: domainname.c:53
+msgid "Domain name may only contain letters, numbers, hyphens and periods."
+msgstr ""
+
+#: hostname.c:46 main.c:69
+msgid "Hostname"
+msgstr ""
+
+#: hostname.c:46
+msgid "Enter the machine's hostname."
+msgstr ""
+
+#: hostname.c:53
+msgid "Hostname cannot be empty."
+msgstr ""
+
+#: hostname.c:55
+msgid "Hostname cannot contain spaces."
+msgstr ""
+
+#: hostname.c:58
+msgid "Hostname may only contain letters, numbers and hyphens."
+msgstr ""
+
+#: keymap.c:84 main.c:67
+msgid "Keyboard mapping"
+msgstr ""
+
+#: keymap.c:85
+msgid "Choose the type of keyboard you are using from the list below."
+msgstr ""
+
+#: main.c:68 timezone.c:77
+msgid "Timezone"
+msgstr ""
+
+#: main.c:71 networking.c:110 networking.c:115 networking.c:447
+msgid "Networking"
+msgstr ""
+
+#: main.c:72 misc.c:147
+msgid "ISDN"
+msgstr ""
+
+#: main.c:73
+msgid "'root' password"
+msgstr ""
+
+#: main.c:74
+msgid "'admin' password"
+msgstr ""
+
+#: main.c:90
+msgid " <Tab>/<Alt-Tab> between elements | <Space> selects"
+msgstr ""
+
+#: main.c:97
+msgid "Section menu"
+msgstr ""
+
+#: main.c:98
+msgid "Select the item you wish to configure."
+msgstr ""
+
+#: main.c:99
+msgid "Quit"
+msgstr ""
+
+#: main.c:172
+msgid "Setup is complete."
+msgstr ""
+
+#: main.c:174 netstuff.c:733 networking.c:560 networking.c:653
+msgid "Warning"
+msgstr ""
+
+#: main.c:175
+msgid ""
+"Initial setup was not entirely complete. You must ensure that Setup is "
+"properly finished by running setup again at the shell."
+msgstr ""
+
+#: misc.c:62
+#, c-format
+msgid "Unable to write %s/main/hostname.conf"
+msgstr ""
+
+#: misc.c:71
+msgid "Unable to open main hosts file."
+msgstr ""
+
+#: misc.c:76
+msgid "Unable to write /etc/hosts."
+msgstr ""
+
+#: misc.c:117
+msgid "Unable to write /etc/hosts.deny."
+msgstr ""
+
+#: misc.c:125
+msgid "Unable to write /etc/hosts.allow."
+msgstr ""
+
+#: misc.c:136
+msgid "Unable to set hostname."
+msgstr ""
+
+#: misc.c:147
+msgid "Scanning and configuring ISDN devices."
+msgstr ""
+
+#: misc.c:148
+msgid "Unable to scan for ISDN devices."
+msgstr ""
+
+#: netstuff.c:86
+#, c-format
+msgid "Interface - %s"
+msgstr ""
+
+#: netstuff.c:91
+#, c-format
+msgid "Enter the IP address information for the %s interface."
+msgstr ""
+
+#: netstuff.c:103
+msgid "Static"
+msgstr ""
+
+#: netstuff.c:104
+msgid "DHCP"
+msgstr ""
+
+#: netstuff.c:105
+msgid "PPP DIALUP (PPPoE, modem, ATM ...)"
+msgstr ""
+
+#: netstuff.c:113
+msgid "DHCP Hostname:"
+msgstr ""
+
+#: netstuff.c:115
+msgid "Force DHCP MTU:"
+msgstr ""
+
+#: netstuff.c:134
+msgid "IP address:"
+msgstr ""
+
+#: netstuff.c:146
+msgid "Network mask:"
+msgstr ""
+
+#: netstuff.c:173 networking.c:749
+msgid "The following fields are invalid:"
+msgstr ""
+
+#: netstuff.c:183
+msgid "IP address"
+msgstr ""
+
+#: netstuff.c:189
+msgid "Network mask"
+msgstr ""
+
+#: netstuff.c:198
+msgid "DHCP hostname"
+msgstr ""
+
+#: netstuff.c:396 netstuff.c:709
+msgid "Unset"
+msgstr ""
+
+#: netstuff.c:669
+#, c-format
+msgid "Please choose a networkcard for the following interface - %s."
+msgstr ""
+
+#: netstuff.c:672
+msgid "Extended Network Menu"
+msgstr ""
+
+#: netstuff.c:673 networking.c:520
+msgid "Select"
+msgstr ""
+
+#: netstuff.c:673
+msgid "Identify"
+msgstr ""
+
+#: netstuff.c:678
+msgid "Device Identification"
+msgstr ""
+
+#: netstuff.c:678
+msgid "The lights on the selected port should flash now for 10 seconds..."
+msgstr ""
+
+#: netstuff.c:679
+msgid "Identification is not supported by this interface."
+msgstr ""
+
+#: netstuff.c:691
+msgid "There are no unassigned interfaces on your system."
+msgstr ""
+
+#: netstuff.c:732
+#, c-format
+msgid "Do you really want to remove the assigned %s interface?"
+msgstr ""
+
+#: netstuff.c:755
+msgid "Select network driver"
+msgstr ""
+
+#: netstuff.c:755
+msgid "Set additional module parameters"
+msgstr ""
+
+#: netstuff.c:762
+msgid "Loading module..."
+msgstr ""
+
+#: netstuff.c:777
+msgid "Unable to load driver module."
+msgstr ""
+
+#: netstuff.c:780
+msgid "Module name cannot be blank."
+msgstr ""
+
+#: networking.c:110
+msgid "Stopping network..."
+msgstr ""
+
+#: networking.c:115
+msgid "Restarting network..."
+msgstr ""
+
+#: networking.c:146
+msgid "No GREEN interface assigned."
+msgstr ""
+
+#: networking.c:152
+msgid "Missing an IP address on GREEN."
+msgstr ""
+
+#: networking.c:163
+msgid "Error"
+msgstr ""
+
+#: networking.c:163
+msgid "Ignore"
+msgstr ""
+
+#: networking.c:164
+msgid "No RED interface assigned."
+msgstr ""
+
+#: networking.c:173
+msgid "Missing an IP address on RED."
+msgstr ""
+
+#: networking.c:183
+msgid "No ORANGE interface assigned."
+msgstr ""
+
+#: networking.c:189
+msgid "Missing an IP address on ORANGE."
+msgstr ""
+
+#: networking.c:199
+msgid "No BLUE interface assigned."
+msgstr ""
+
+#: networking.c:205
+msgid "Missing an IP address on BLUE."
+msgstr ""
+
+#: networking.c:217
+msgid "Misssing DNS."
+msgstr ""
+
+#: networking.c:224
+msgid "Missing Default Gateway."
+msgstr ""
+
+#: networking.c:237 networking.c:304
+msgid "Network configuration type"
+msgstr ""
+
+#: networking.c:238 networking.c:409
+msgid "Drivers and card assignments"
+msgstr ""
+
+#: networking.c:239 networking.c:640
+msgid "Address settings"
+msgstr ""
+
+#: networking.c:240 networking.c:743
+msgid "DNS and Gateway settings"
+msgstr ""
+
+#: networking.c:260
+msgid "When configuration is complete, a network restart will be required."
+msgstr ""
+
+#: networking.c:267
+#, c-format
+msgid ""
+"Current config: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: networking.c:268
+msgid "Network configuration menu"
+msgstr ""
+
+#: networking.c:269 networking.c:520 networking.c:642
+msgid "Done"
+msgstr ""
+
+#: networking.c:300
+#, c-format
+msgid ""
+"Select the network configuration for %s. The following configuration types "
+"list those interfaces which have ethernet attached. If you change this "
+"setting, a network restart will be required, and you will have to "
+"reconfigure the network driver assignments."
+msgstr ""
+
+#: networking.c:307
+#, c-format
+msgid ""
+"Not enough netcards for your choice.\n"
+"\n"
+"Needed: %d - Available: %d\n"
+msgstr ""
+
+#: networking.c:359
+msgid ""
+"Configure network drivers, and which interface each card is assigned to. The current configuration is as follows:\n"
+"\n"
+msgstr ""
+
+#: networking.c:408
+msgid "Do you wish to change these settings?"
+msgstr ""
+
+#: networking.c:447
+msgid "Restarting non-local network..."
+msgstr ""
+
+#: networking.c:464
+msgid ""
+"Please choose the interface you wish to change.\n"
+"\n"
+msgstr ""
+
+#: networking.c:519
+msgid "Assigned Cards"
+msgstr ""
+
+#: networking.c:520
+msgid "Remove"
+msgstr ""
+
+#: networking.c:556 networking.c:649
+#, c-format
+msgid ""
+"If you change this IP address, and you are logged in remotely, your "
+"connection to the %s machine will be broken, and you will have to reconnect "
+"on the new IP. This is a risky operation, and should only be attempted if "
+"you have physical access to the machine, should something go wrong."
+msgstr ""
+
+#: networking.c:641
+msgid "Select the interface you wish to reconfigure."
+msgstr ""
+
+#: networking.c:729
+msgid "Default gateway:"
+msgstr ""
+
+#: networking.c:744
+msgid ""
+"Enter the DNS and gateway information. These settings are used only with "
+"Static IP (and DHCP if DNS set) on the RED interface."
+msgstr ""
+
+#: networking.c:773
+msgid "Default gateway"
+msgstr ""
+
+#: networking.c:780
+msgid "Secondary DNS specified without a Primary DNS"
+msgstr ""
+
+#: passwords.c:33
+msgid ""
+"Enter the 'root' user password. Login as this user for commandline access."
+msgstr ""
+
+#: passwords.c:38 passwords.c:61
+msgid "Setting password"
+msgstr ""
+
+#: passwords.c:38
+msgid "Setting 'root' password...."
+msgstr ""
+
+#: passwords.c:39
+msgid "Problem setting 'root' password."
+msgstr ""
+
+#: passwords.c:53
+#, c-format
+msgid ""
+"Enter %s 'admin' user password. This is the user to use for logging into the"
+" %s web administration pages."
+msgstr ""
+
+#: passwords.c:60
+#, c-format
+msgid "Setting %s 'admin' user password..."
+msgstr ""
+
+#: passwords.c:62
+#, c-format
+msgid "Problem setting %s 'admin' user password."
+msgstr ""
+
+#: passwords.c:76
+msgid "Password:"
+msgstr ""
+
+#: passwords.c:77
+msgid "Again:"
+msgstr ""
+
+#: passwords.c:95
+msgid "Password cannot be blank."
+msgstr ""
+
+#: passwords.c:102
+msgid "Passwords do not match."
+msgstr ""
+
+#: passwords.c:109
+msgid "Password cannot contain spaces."
+msgstr ""
+
+#: timezone.c:77
+msgid "Choose the timezone you are in from the list below."
+msgstr ""
diff --git a/src/setup/po/pl.po b/src/setup/po/pl.po
index 607394a..ee6183f 100644
--- a/src/setup/po/pl.po
+++ b/src/setup/po/pl.po
@@ -3,13 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# btelega <btelega(a)gmail.com>, 2014
+# Przemysław Karpeta <przemyslaw.karpeta(a)gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-21 15:12+0000\n"
-"PO-Revision-Date: 2014-08-21 15:13+0000\n"
-"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
+"PO-Revision-Date: 2014-11-03 15:36+0000\n"
+"Last-Translator: Przemysław Karpeta <przemyslaw.karpeta(a)gmail.com>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/ipfire/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,31 +21,31 @@ msgstr ""
#: dhcp.c:50
msgid "Start address:"
-msgstr ""
+msgstr "Adres początkowy:"
#: dhcp.c:51
msgid "End address:"
-msgstr ""
+msgstr "Adres końcowy:"
#: dhcp.c:52 networking.c:717
msgid "Primary DNS:"
-msgstr ""
+msgstr "Główny DNS:"
#: dhcp.c:53 networking.c:723
msgid "Secondary DNS:"
-msgstr ""
+msgstr "Pomocniczy DNS:"
#: dhcp.c:54
msgid "Default lease (mins):"
-msgstr ""
+msgstr "Domyślna dzierżawa (min.):"
#: dhcp.c:55
msgid "Max lease (mins):"
-msgstr ""
+msgstr "Maksymalna dzierżawa (min.):"
#: dhcp.c:56
msgid "Domain name suffix:"
-msgstr ""
+msgstr "Przyrostek domeny: "
#: dhcp.c:86 dhcp.c:93 dhcp.c:101 domainname.c:34 hostname.c:37 keymap.c:70
#: misc.c:40 misc.c:52 netstuff.c:377 netstuff.c:566 netstuff.c:704
@@ -51,19 +53,19 @@ msgstr ""
#: networking.c:442 networking.c:552 networking.c:603 networking.c:610
#: networking.c:713 timezone.c:63
msgid "Unable to open settings file"
-msgstr ""
+msgstr "Nie można otworzyć pliku ustawień"
#: dhcp.c:111
msgid "DHCP server configuration"
-msgstr ""
+msgstr "Konfiguracja serwera DHCP "
#: dhcp.c:116
msgid "Configure the DHCP server by entering the settings information."
-msgstr ""
+msgstr "Skonfiguruj serwer DHCP wprowadzając właściwe ustawienia."
#: dhcp.c:125
msgid "Enabled"
-msgstr ""
+msgstr "Włączony"
#: dhcp.c:142 domainname.c:43 hostname.c:47 keymap.c:86 main.c:99 main.c:172
#: main.c:174 netstuff.c:157 netstuff.c:733 netstuff.c:756 networking.c:163
@@ -71,367 +73,367 @@ msgstr ""
#: networking.c:642 networking.c:653 networking.c:746 passwords.c:89
#: timezone.c:78
msgid "OK"
-msgstr ""
+msgstr "OK"
#: dhcp.c:143 domainname.c:43 hostname.c:47 keymap.c:86 netstuff.c:158
#: netstuff.c:673 netstuff.c:733 netstuff.c:756 networking.c:305
#: networking.c:410 networking.c:560 networking.c:653 networking.c:746
#: passwords.c:89 timezone.c:78
msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
#: dhcp.c:156
msgid ""
"The following fields are invalid:\n"
"\n"
-msgstr ""
+msgstr "Następujące pola są nieprawidłowe:\n\n"
#: dhcp.c:159
msgid "Start address"
-msgstr ""
+msgstr "Adres początkowy"
#: dhcp.c:165
msgid "End address"
-msgstr ""
+msgstr "Adres końcowy"
#: dhcp.c:173 networking.c:755
msgid "Primary DNS"
-msgstr ""
+msgstr "Główny DNS"
#: dhcp.c:182 networking.c:764
msgid "Secondary DNS"
-msgstr ""
+msgstr "Pomocniczy DNS"
#: dhcp.c:189
msgid "Default lease time"
-msgstr ""
+msgstr "Domyślny okres dzierżawy"
#: dhcp.c:195
msgid "Max. lease time"
-msgstr ""
+msgstr "Maksymalny okres dzierżawy"
#: domainname.c:42 main.c:70
msgid "Domain name"
-msgstr ""
+msgstr "Nazwa Domeny"
#: domainname.c:42
msgid "Enter Domain name"
-msgstr ""
+msgstr "Wpisz nazwę Domeny"
#: domainname.c:48
msgid "Domain name cannot be empty."
-msgstr ""
+msgstr "Nazwa Domeny nie może być pusta"
#: domainname.c:50
msgid "Domain name cannot contain spaces."
-msgstr ""
+msgstr "Nazwa domeny nie może zawierać spacji."
#: domainname.c:53
msgid "Domain name may only contain letters, numbers, hyphens and periods."
-msgstr ""
+msgstr "Nazwa domeny może zawierać jedynie litery, cyfry, myślniki i kropki."
#: hostname.c:46 main.c:69
msgid "Hostname"
-msgstr ""
+msgstr "Nazwa hosta"
#: hostname.c:46
msgid "Enter the machine's hostname."
-msgstr ""
+msgstr "Wprowadź nazwę hosta."
#: hostname.c:53
msgid "Hostname cannot be empty."
-msgstr ""
+msgstr "Nazwa hosta nie może być pusta."
#: hostname.c:55
msgid "Hostname cannot contain spaces."
-msgstr ""
+msgstr "Nazwa hosta nie może zawierać spacji."
#: hostname.c:58
msgid "Hostname may only contain letters, numbers and hyphens."
-msgstr ""
+msgstr "Nazwa hosta może zawierać tylko litery, cyfry i myślniki."
#: keymap.c:84 main.c:67
msgid "Keyboard mapping"
-msgstr ""
+msgstr "Mapowanie klawiatury"
#: keymap.c:85
msgid "Choose the type of keyboard you are using from the list below."
-msgstr ""
+msgstr "Wybierz używany przez siebie typ klawiatury z poniższej listy."
#: main.c:68 timezone.c:77
msgid "Timezone"
-msgstr ""
+msgstr "Strefa czasowa"
#: main.c:71 networking.c:110 networking.c:115 networking.c:447
msgid "Networking"
-msgstr ""
+msgstr "Sieć"
#: main.c:72 misc.c:147
msgid "ISDN"
-msgstr ""
+msgstr "ISDN"
#: main.c:73
msgid "'root' password"
-msgstr ""
+msgstr "Hasło użytkownika 'root'"
#: main.c:74
msgid "'admin' password"
-msgstr ""
+msgstr "Hasło użytkownika 'admin'"
#: main.c:90
msgid " <Tab>/<Alt-Tab> between elements | <Space> selects"
-msgstr ""
+msgstr " <Tab>/<Alt-Tab> przełącza między elementami | <Space> wybiera"
#: main.c:97
msgid "Section menu"
-msgstr ""
+msgstr "Menu sekcji"
#: main.c:98
msgid "Select the item you wish to configure."
-msgstr ""
+msgstr "Wybierz element który chcesz skonfigurować."
#: main.c:99
msgid "Quit"
-msgstr ""
+msgstr "Wyjście"
#: main.c:172
msgid "Setup is complete."
-msgstr ""
+msgstr "Instalacja zakończona"
#: main.c:174 netstuff.c:733 networking.c:560 networking.c:653
msgid "Warning"
-msgstr ""
+msgstr "Ostrzeżenie"
#: main.c:175
msgid ""
"Initial setup was not entirely complete. You must ensure that Setup is "
"properly finished by running setup again at the shell."
-msgstr ""
+msgstr "Wstępna konfiguracjia nie została ukończona. Musisz upewnić się, że konfiguracja jest ukończona poprzez ponowne uruchomienie polecenia 'setup' w powłoce."
#: misc.c:62
#, c-format
msgid "Unable to write %s/main/hostname.conf"
-msgstr ""
+msgstr "Nie można zapisać %s/main/hostname.conf"
#: misc.c:71
msgid "Unable to open main hosts file."
-msgstr ""
+msgstr "Nie można otworzyc głównego pliku hosts."
#: misc.c:76
msgid "Unable to write /etc/hosts."
-msgstr ""
+msgstr "Nie można zapisać /etc/hosts"
#: misc.c:117
msgid "Unable to write /etc/hosts.deny."
-msgstr ""
+msgstr "Nie można zapisać /etc/hosts.deny"
#: misc.c:125
msgid "Unable to write /etc/hosts.allow."
-msgstr ""
+msgstr "Nie można zapisać /etc/hosts.allow"
#: misc.c:136
msgid "Unable to set hostname."
-msgstr ""
+msgstr "Ustawienie nazwy hosta niemożliwe."
#: misc.c:147
msgid "Scanning and configuring ISDN devices."
-msgstr ""
+msgstr "Wykrywanie i konfiguracja urządzeń ISDN."
#: misc.c:148
msgid "Unable to scan for ISDN devices."
-msgstr ""
+msgstr "Wykrywanie urządzeń ISDN jest niemożliwe."
#: netstuff.c:86
#, c-format
msgid "Interface - %s"
-msgstr ""
+msgstr "Interfejs - %s"
#: netstuff.c:91
#, c-format
msgid "Enter the IP address information for the %s interface."
-msgstr ""
+msgstr "Wprowadź ustawienia adresu IP dla interfejsu %s."
#: netstuff.c:103
msgid "Static"
-msgstr ""
+msgstr "Statyczny"
#: netstuff.c:104
msgid "DHCP"
-msgstr ""
+msgstr "DHCP"
#: netstuff.c:105
msgid "PPP DIALUP (PPPoE, modem, ATM ...)"
-msgstr ""
+msgstr "PPP DIALUP (PPPoE, modem, ATM ...)"
#: netstuff.c:113
msgid "DHCP Hostname:"
-msgstr ""
+msgstr "Nazwa hosta DHCP:"
#: netstuff.c:115
msgid "Force DHCP MTU:"
-msgstr ""
+msgstr "Wymuś DHCP MTU:"
#: netstuff.c:134
msgid "IP address:"
-msgstr ""
+msgstr "IP address:"
#: netstuff.c:146
msgid "Network mask:"
-msgstr ""
+msgstr "Maska podsieci:"
#: netstuff.c:173 networking.c:749
msgid "The following fields are invalid:"
-msgstr ""
+msgstr "Następujące pola są nieprawidłowe:"
#: netstuff.c:183
msgid "IP address"
-msgstr ""
+msgstr "IP address"
#: netstuff.c:189
msgid "Network mask"
-msgstr ""
+msgstr "Maska podsieci"
#: netstuff.c:198
msgid "DHCP hostname"
-msgstr ""
+msgstr "Nazwa hosta DHCP"
#: netstuff.c:396 netstuff.c:709
msgid "Unset"
-msgstr ""
+msgstr "Wyłącz"
#: netstuff.c:669
#, c-format
msgid "Please choose a networkcard for the following interface - %s."
-msgstr ""
+msgstr "Proszę wybrać kartę sieciową dla następującego interfejsu - %s"
#: netstuff.c:672
msgid "Extended Network Menu"
-msgstr ""
+msgstr "Rozszerzone Menu Sieci"
#: netstuff.c:673 networking.c:520
msgid "Select"
-msgstr ""
+msgstr "Wybierz"
#: netstuff.c:673
msgid "Identify"
-msgstr ""
+msgstr "Zidentyfikuj"
#: netstuff.c:678
msgid "Device Identification"
-msgstr ""
+msgstr "Identyfikacja urządzenia"
#: netstuff.c:678
msgid "The lights on the selected port should flash now for 10 seconds..."
-msgstr ""
+msgstr "Kontrolki na wybranym porcie powinny migotać przez następne 10 sekund..."
#: netstuff.c:679
msgid "Identification is not supported by this interface."
-msgstr ""
+msgstr "Ten interfejs nie wspiera identyfikacji."
#: netstuff.c:691
msgid "There are no unassigned interfaces on your system."
-msgstr ""
+msgstr "Nie ma już nieprzydzielonych interfejsów w systemie."
#: netstuff.c:732
#, c-format
msgid "Do you really want to remove the assigned %s interface?"
-msgstr ""
+msgstr "Na pewno chcesz usunąć przydzielony interfejs %s ?"
#: netstuff.c:755
msgid "Select network driver"
-msgstr ""
+msgstr "Wybierz sterownik karty sieciowej"
#: netstuff.c:755
msgid "Set additional module parameters"
-msgstr ""
+msgstr "Ustaw dodatkowe parametry modułu"
#: netstuff.c:762
msgid "Loading module..."
-msgstr ""
+msgstr "Wczytywanie modułu..."
#: netstuff.c:777
msgid "Unable to load driver module."
-msgstr ""
+msgstr "Nie da się wczytać modułu."
#: netstuff.c:780
msgid "Module name cannot be blank."
-msgstr ""
+msgstr "Nazwa modułu nie może być pusta."
#: networking.c:110
msgid "Stopping network..."
-msgstr ""
+msgstr "Zatrzymywanie sieci..."
#: networking.c:115
msgid "Restarting network..."
-msgstr ""
+msgstr "Ponowne uruchamianie sieci..."
#: networking.c:146
msgid "No GREEN interface assigned."
-msgstr ""
+msgstr "Interfejs GREEN nie został przypisany."
#: networking.c:152
msgid "Missing an IP address on GREEN."
-msgstr ""
+msgstr "Brak adresu IP na GREEN."
#: networking.c:163
msgid "Error"
-msgstr ""
+msgstr "Błąd"
#: networking.c:163
msgid "Ignore"
-msgstr ""
+msgstr "Ignoruj"
#: networking.c:164
msgid "No RED interface assigned."
-msgstr ""
+msgstr "Interfejs RED nie został przypisany."
#: networking.c:173
msgid "Missing an IP address on RED."
-msgstr ""
+msgstr "Brak adresu IP na RED."
#: networking.c:183
msgid "No ORANGE interface assigned."
-msgstr ""
+msgstr "Interfejs ORANGE nie został przypisany."
#: networking.c:189
msgid "Missing an IP address on ORANGE."
-msgstr ""
+msgstr "Brak adresu IP na ORANGE."
#: networking.c:199
msgid "No BLUE interface assigned."
-msgstr ""
+msgstr "Interfejs BLUE nie został przypisany."
#: networking.c:205
msgid "Missing an IP address on BLUE."
-msgstr ""
+msgstr "Brak adresu IP na BLUE."
#: networking.c:217
msgid "Misssing DNS."
-msgstr ""
+msgstr "Brakuje DNS."
#: networking.c:224
msgid "Missing Default Gateway."
-msgstr ""
+msgstr "Brakuje Bramy Domyślnej."
#: networking.c:237 networking.c:304
msgid "Network configuration type"
-msgstr ""
+msgstr "Rodzaj konfiguracji sieci"
#: networking.c:238 networking.c:409
msgid "Drivers and card assignments"
-msgstr ""
+msgstr "Przydziały sterowników i kart"
#: networking.c:239 networking.c:640
msgid "Address settings"
-msgstr ""
+msgstr "Ustawienia adresu"
#: networking.c:240 networking.c:743
msgid "DNS and Gateway settings"
-msgstr ""
+msgstr "Ustawienia DNS i Bramy"
#: networking.c:260
msgid "When configuration is complete, a network restart will be required."
-msgstr ""
+msgstr "Po ukończeniu konfiguracji wymagane będzie ponowne uruchomienie sieci."
#: networking.c:267
#, c-format
@@ -439,15 +441,15 @@ msgid ""
"Current config: %s\n"
"\n"
"%s"
-msgstr ""
+msgstr "Obecna konfiguracja: %s\n\n%s"
#: networking.c:268
msgid "Network configuration menu"
-msgstr ""
+msgstr "Menu konfiguracji sieci"
#: networking.c:269 networking.c:520 networking.c:642
msgid "Done"
-msgstr ""
+msgstr "Zrobione"
#: networking.c:300
#, c-format
@@ -456,7 +458,7 @@ msgid ""
"list those interfaces which have ethernet attached. If you change this "
"setting, a network restart will be required, and you will have to "
"reconfigure the network driver assignments."
-msgstr ""
+msgstr "Wybierz konfigurację sieci dla %s. Poniższe typy konfiguracji wyświetlają interfejsy z przyłączonym ethernetem. Jeśli zmienisz te ustawienia, wymagany będzie restart sieci, i trzeba będzie zrekonfigurować przydziały sterowników kart sieciowych. "
#: networking.c:307
#, c-format
@@ -464,35 +466,35 @@ msgid ""
"Not enough netcards for your choice.\n"
"\n"
"Needed: %d - Available: %d\n"
-msgstr ""
+msgstr "Niewystarczająca liczba kart sieciowych.\n\nPotrzebne: %d - Dostępne: %d\n"
#: networking.c:359
msgid ""
"Configure network drivers, and which interface each card is assigned to. The current configuration is as follows:\n"
"\n"
-msgstr ""
+msgstr "Skonfiguruj sterowniki kart sieciowych, i przydziel karty do odpowiednich interfejsów. Obecna konfiguracja wygląda tak:\n\n"
#: networking.c:408
msgid "Do you wish to change these settings?"
-msgstr ""
+msgstr "Czy chcesz zmienić te ustawienia ?"
#: networking.c:447
msgid "Restarting non-local network..."
-msgstr ""
+msgstr "Ponowne uruchamianie sieci innych, niż lokalna..."
#: networking.c:464
msgid ""
"Please choose the interface you wish to change.\n"
"\n"
-msgstr ""
+msgstr "Wybierz interfejs, który chcesz zmienić.\n\n"
#: networking.c:519
msgid "Assigned Cards"
-msgstr ""
+msgstr "Przypisane Karty"
#: networking.c:520
msgid "Remove"
-msgstr ""
+msgstr "Usuń"
#: networking.c:556 networking.c:649
#, c-format
@@ -501,84 +503,84 @@ msgid ""
"connection to the %s machine will be broken, and you will have to reconnect "
"on the new IP. This is a risky operation, and should only be attempted if "
"you have physical access to the machine, should something go wrong."
-msgstr ""
+msgstr "Jeśli zmienisz ten adres IP, a jesteś zalogowany zdalnie, Twoje połączenie do maszyny %s zostanie zerwane, i trzeba będzie połączyć się ponownie na nowy adres IP. To ryzykowna operacja, która powinna byc podejmowana tylko w przypadku posiadania bezpośredniego, fizycznego dostępu do maszyny na wypadek, gdyby coś poszło źle."
#: networking.c:641
msgid "Select the interface you wish to reconfigure."
-msgstr ""
+msgstr "Zaznacz interfejs, który chcesz zrekonfigurować."
#: networking.c:729
msgid "Default gateway:"
-msgstr ""
+msgstr "Brama domyślna:"
#: networking.c:744
msgid ""
"Enter the DNS and gateway information. These settings are used only with "
"Static IP (and DHCP if DNS set) on the RED interface."
-msgstr ""
+msgstr "Wprowadź informacje o serwerze DNS i bramie. Te ustawienia stosuje się tylko do statycznego IP (i DHCP, gdzie DNS ustawia się ręcznie) na interfejsie RED."
#: networking.c:773
msgid "Default gateway"
-msgstr ""
+msgstr "Brama domyślna"
#: networking.c:780
msgid "Secondary DNS specified without a Primary DNS"
-msgstr ""
+msgstr "Podano adres Zapasowego DNS bez podania adresu Podstawowego DNS."
#: passwords.c:33
msgid ""
"Enter the 'root' user password. Login as this user for commandline access."
-msgstr ""
+msgstr "Wprowadź hasło użytkownika 'root'. Zaloguj się jako ten użytkownik, aby uzyskać dostęp do linii poleceń."
#: passwords.c:38 passwords.c:61
msgid "Setting password"
-msgstr ""
+msgstr "Ustawienie hasła"
#: passwords.c:38
msgid "Setting 'root' password...."
-msgstr ""
+msgstr "Ustawianie hasła użytkownika 'root'...."
#: passwords.c:39
msgid "Problem setting 'root' password."
-msgstr ""
+msgstr "Problem z ustawieniem hasła użytkownika 'root'."
#: passwords.c:53
#, c-format
msgid ""
"Enter %s 'admin' user password. This is the user to use for logging into the"
" %s web administration pages."
-msgstr ""
+msgstr "Wprowadź haslo użytkownika 'admin' systemu %s. Zalogowanie się na tego użytkownika umożliwi dostęp do administracyjnej strony WWW %s."
#: passwords.c:60
#, c-format
msgid "Setting %s 'admin' user password..."
-msgstr ""
+msgstr "Ustawianie hasła użytkownika 'admin' systemu %s..."
#: passwords.c:62
#, c-format
msgid "Problem setting %s 'admin' user password."
-msgstr ""
+msgstr "Problem z ustawieniem hasła użytkownika 'admin' systemu %s."
#: passwords.c:76
msgid "Password:"
-msgstr ""
+msgstr "Hasło:"
#: passwords.c:77
msgid "Again:"
-msgstr ""
+msgstr "Ponownie:"
#: passwords.c:95
msgid "Password cannot be blank."
-msgstr ""
+msgstr "Hasło nie może być puste."
#: passwords.c:102
msgid "Passwords do not match."
-msgstr ""
+msgstr "Hasła nie są zgodne."
#: passwords.c:109
msgid "Password cannot contain spaces."
-msgstr ""
+msgstr "Hasło nie może zawierać spacji."
#: timezone.c:77
msgid "Choose the timezone you are in from the list below."
-msgstr ""
+msgstr "Wybierz strefę czasową w której się znajdujesz z listy poniżej."
diff --git a/src/setup/po/ru.po b/src/setup/po/ru.po
index 34b1ac4..1a03f0b 100644
--- a/src/setup/po/ru.po
+++ b/src/setup/po/ru.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Andrei Skipin <skian2007(a)yandex.ru>, 2014
# bubnov_pi <ipfire(a)bubnov.su>, 2014
msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-21 15:12+0000\n"
-"PO-Revision-Date: 2014-08-21 15:13+0000\n"
-"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
+"PO-Revision-Date: 2014-12-10 10:22+0000\n"
+"Last-Translator: Andrei Skipin <skian2007(a)yandex.ru>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/ipfire/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -189,19 +190,19 @@ msgstr ""
#: main.c:98
msgid "Select the item you wish to configure."
-msgstr ""
+msgstr "Выберите пункт меню для настройки"
#: main.c:99
msgid "Quit"
-msgstr ""
+msgstr "Выход"
#: main.c:172
msgid "Setup is complete."
-msgstr ""
+msgstr "Установка завершена"
#: main.c:174 netstuff.c:733 networking.c:560 networking.c:653
msgid "Warning"
-msgstr ""
+msgstr "Предупреждение"
#: main.c:175
msgid ""
@@ -220,15 +221,15 @@ msgstr ""
#: misc.c:76
msgid "Unable to write /etc/hosts."
-msgstr ""
+msgstr "Недоступна запись в /etc/hosts."
#: misc.c:117
msgid "Unable to write /etc/hosts.deny."
-msgstr ""
+msgstr "Недоступна запись в /etc/hosts.deny."
#: misc.c:125
msgid "Unable to write /etc/hosts.allow."
-msgstr ""
+msgstr "Недоступна запись в /etc/hosts.allow."
#: misc.c:136
msgid "Unable to set hostname."
@@ -236,7 +237,7 @@ msgstr ""
#: misc.c:147
msgid "Scanning and configuring ISDN devices."
-msgstr ""
+msgstr "Сканирование и конфигурирование ISDN устройств."
#: misc.c:148
msgid "Unable to scan for ISDN devices."
@@ -245,7 +246,7 @@ msgstr ""
#: netstuff.c:86
#, c-format
msgid "Interface - %s"
-msgstr ""
+msgstr "Интерфейс - %s"
#: netstuff.c:91
#, c-format
@@ -254,7 +255,7 @@ msgstr ""
#: netstuff.c:103
msgid "Static"
-msgstr ""
+msgstr "Статический"
#: netstuff.c:104
msgid "DHCP"
@@ -266,7 +267,7 @@ msgstr ""
#: netstuff.c:113
msgid "DHCP Hostname:"
-msgstr ""
+msgstr "Имя хоста DHCP:"
#: netstuff.c:115
msgid "Force DHCP MTU:"
@@ -274,11 +275,11 @@ msgstr ""
#: netstuff.c:134
msgid "IP address:"
-msgstr ""
+msgstr "IP-адрес:"
#: netstuff.c:146
msgid "Network mask:"
-msgstr ""
+msgstr "Сетевая маска:"
#: netstuff.c:173 networking.c:749
msgid "The following fields are invalid:"
@@ -286,15 +287,15 @@ msgstr ""
#: netstuff.c:183
msgid "IP address"
-msgstr ""
+msgstr "IP-адрес"
#: netstuff.c:189
msgid "Network mask"
-msgstr ""
+msgstr "Сетевая маска"
#: netstuff.c:198
msgid "DHCP hostname"
-msgstr ""
+msgstr "Имя хоста DHCP"
#: netstuff.c:396 netstuff.c:709
msgid "Unset"
@@ -307,11 +308,11 @@ msgstr ""
#: netstuff.c:672
msgid "Extended Network Menu"
-msgstr ""
+msgstr "Расширенное сетевое меню"
#: netstuff.c:673 networking.c:520
msgid "Select"
-msgstr ""
+msgstr "Выберите"
#: netstuff.c:673
msgid "Identify"
@@ -340,7 +341,7 @@ msgstr ""
#: netstuff.c:755
msgid "Select network driver"
-msgstr ""
+msgstr "Выберите сетевой драйвер"
#: netstuff.c:755
msgid "Set additional module parameters"
@@ -348,11 +349,11 @@ msgstr ""
#: netstuff.c:762
msgid "Loading module..."
-msgstr ""
+msgstr "Модуль загружается..."
#: netstuff.c:777
msgid "Unable to load driver module."
-msgstr ""
+msgstr "Невозможно загрузить драйвер модуля."
#: netstuff.c:780
msgid "Module name cannot be blank."
@@ -360,11 +361,11 @@ msgstr ""
#: networking.c:110
msgid "Stopping network..."
-msgstr ""
+msgstr "Остановка сети.."
#: networking.c:115
msgid "Restarting network..."
-msgstr ""
+msgstr "Перезапуск сети..."
#: networking.c:146
msgid "No GREEN interface assigned."
@@ -408,11 +409,11 @@ msgstr ""
#: networking.c:217
msgid "Misssing DNS."
-msgstr ""
+msgstr "Отсутствует DNS."
#: networking.c:224
msgid "Missing Default Gateway."
-msgstr ""
+msgstr "Отсутствует шлюз по умолчанию."
#: networking.c:237 networking.c:304
msgid "Network configuration type"
@@ -444,11 +445,11 @@ msgstr ""
#: networking.c:268
msgid "Network configuration menu"
-msgstr ""
+msgstr "Меню настройки сети"
#: networking.c:269 networking.c:520 networking.c:642
msgid "Done"
-msgstr ""
+msgstr "Успешно завершено."
#: networking.c:300
#, c-format
@@ -493,7 +494,7 @@ msgstr ""
#: networking.c:520
msgid "Remove"
-msgstr ""
+msgstr "Удалить"
#: networking.c:556 networking.c:649
#, c-format
@@ -510,7 +511,7 @@ msgstr ""
#: networking.c:729
msgid "Default gateway:"
-msgstr ""
+msgstr "Шлюз по умолчанию:"
#: networking.c:744
msgid ""
@@ -520,7 +521,7 @@ msgstr ""
#: networking.c:773
msgid "Default gateway"
-msgstr ""
+msgstr "Шлюз по умолчанию"
#: networking.c:780
msgid "Secondary DNS specified without a Primary DNS"
@@ -533,11 +534,11 @@ msgstr ""
#: passwords.c:38 passwords.c:61
msgid "Setting password"
-msgstr ""
+msgstr "Установка пароля"
#: passwords.c:38
msgid "Setting 'root' password...."
-msgstr ""
+msgstr "Установка 'root' пароля..."
#: passwords.c:39
msgid "Problem setting 'root' password."
@@ -562,23 +563,23 @@ msgstr ""
#: passwords.c:76
msgid "Password:"
-msgstr ""
+msgstr "Пароль:"
#: passwords.c:77
msgid "Again:"
-msgstr ""
+msgstr "Повторите пароль:"
#: passwords.c:95
msgid "Password cannot be blank."
-msgstr ""
+msgstr "Пароль не может быть пустым."
#: passwords.c:102
msgid "Passwords do not match."
-msgstr ""
+msgstr "Пароли не совпадают"
#: passwords.c:109
msgid "Password cannot contain spaces."
-msgstr ""
+msgstr "Пароль не может содержать пробелы"
#: timezone.c:77
msgid "Choose the timezone you are in from the list below."
diff --git a/src/setup/po/rw.po b/src/setup/po/rw.po
new file mode 100644
index 0000000..0bd98ee
--- /dev/null
+++ b/src/setup/po/rw.po
@@ -0,0 +1,584 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The IPFire Project (www.ipfire.org)
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: IPFire Project\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-08-21 15:12+0000\n"
+"PO-Revision-Date: 2014-08-12 10:08+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Kinyarwanda (http://www.transifex.com/projects/p/ipfire/language/rw/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: rw\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: dhcp.c:50
+msgid "Start address:"
+msgstr ""
+
+#: dhcp.c:51
+msgid "End address:"
+msgstr ""
+
+#: dhcp.c:52 networking.c:717
+msgid "Primary DNS:"
+msgstr ""
+
+#: dhcp.c:53 networking.c:723
+msgid "Secondary DNS:"
+msgstr ""
+
+#: dhcp.c:54
+msgid "Default lease (mins):"
+msgstr ""
+
+#: dhcp.c:55
+msgid "Max lease (mins):"
+msgstr ""
+
+#: dhcp.c:56
+msgid "Domain name suffix:"
+msgstr ""
+
+#: dhcp.c:86 dhcp.c:93 dhcp.c:101 domainname.c:34 hostname.c:37 keymap.c:70
+#: misc.c:40 misc.c:52 netstuff.c:377 netstuff.c:566 netstuff.c:704
+#: networking.c:134 networking.c:255 networking.c:291 networking.c:346
+#: networking.c:442 networking.c:552 networking.c:603 networking.c:610
+#: networking.c:713 timezone.c:63
+msgid "Unable to open settings file"
+msgstr ""
+
+#: dhcp.c:111
+msgid "DHCP server configuration"
+msgstr ""
+
+#: dhcp.c:116
+msgid "Configure the DHCP server by entering the settings information."
+msgstr ""
+
+#: dhcp.c:125
+msgid "Enabled"
+msgstr ""
+
+#: dhcp.c:142 domainname.c:43 hostname.c:47 keymap.c:86 main.c:99 main.c:172
+#: main.c:174 netstuff.c:157 netstuff.c:733 netstuff.c:756 networking.c:163
+#: networking.c:269 networking.c:305 networking.c:409 networking.c:560
+#: networking.c:642 networking.c:653 networking.c:746 passwords.c:89
+#: timezone.c:78
+msgid "OK"
+msgstr ""
+
+#: dhcp.c:143 domainname.c:43 hostname.c:47 keymap.c:86 netstuff.c:158
+#: netstuff.c:673 netstuff.c:733 netstuff.c:756 networking.c:305
+#: networking.c:410 networking.c:560 networking.c:653 networking.c:746
+#: passwords.c:89 timezone.c:78
+msgid "Cancel"
+msgstr ""
+
+#: dhcp.c:156
+msgid ""
+"The following fields are invalid:\n"
+"\n"
+msgstr ""
+
+#: dhcp.c:159
+msgid "Start address"
+msgstr ""
+
+#: dhcp.c:165
+msgid "End address"
+msgstr ""
+
+#: dhcp.c:173 networking.c:755
+msgid "Primary DNS"
+msgstr ""
+
+#: dhcp.c:182 networking.c:764
+msgid "Secondary DNS"
+msgstr ""
+
+#: dhcp.c:189
+msgid "Default lease time"
+msgstr ""
+
+#: dhcp.c:195
+msgid "Max. lease time"
+msgstr ""
+
+#: domainname.c:42 main.c:70
+msgid "Domain name"
+msgstr ""
+
+#: domainname.c:42
+msgid "Enter Domain name"
+msgstr ""
+
+#: domainname.c:48
+msgid "Domain name cannot be empty."
+msgstr ""
+
+#: domainname.c:50
+msgid "Domain name cannot contain spaces."
+msgstr ""
+
+#: domainname.c:53
+msgid "Domain name may only contain letters, numbers, hyphens and periods."
+msgstr ""
+
+#: hostname.c:46 main.c:69
+msgid "Hostname"
+msgstr ""
+
+#: hostname.c:46
+msgid "Enter the machine's hostname."
+msgstr ""
+
+#: hostname.c:53
+msgid "Hostname cannot be empty."
+msgstr ""
+
+#: hostname.c:55
+msgid "Hostname cannot contain spaces."
+msgstr ""
+
+#: hostname.c:58
+msgid "Hostname may only contain letters, numbers and hyphens."
+msgstr ""
+
+#: keymap.c:84 main.c:67
+msgid "Keyboard mapping"
+msgstr ""
+
+#: keymap.c:85
+msgid "Choose the type of keyboard you are using from the list below."
+msgstr ""
+
+#: main.c:68 timezone.c:77
+msgid "Timezone"
+msgstr ""
+
+#: main.c:71 networking.c:110 networking.c:115 networking.c:447
+msgid "Networking"
+msgstr ""
+
+#: main.c:72 misc.c:147
+msgid "ISDN"
+msgstr ""
+
+#: main.c:73
+msgid "'root' password"
+msgstr ""
+
+#: main.c:74
+msgid "'admin' password"
+msgstr ""
+
+#: main.c:90
+msgid " <Tab>/<Alt-Tab> between elements | <Space> selects"
+msgstr ""
+
+#: main.c:97
+msgid "Section menu"
+msgstr ""
+
+#: main.c:98
+msgid "Select the item you wish to configure."
+msgstr ""
+
+#: main.c:99
+msgid "Quit"
+msgstr ""
+
+#: main.c:172
+msgid "Setup is complete."
+msgstr ""
+
+#: main.c:174 netstuff.c:733 networking.c:560 networking.c:653
+msgid "Warning"
+msgstr ""
+
+#: main.c:175
+msgid ""
+"Initial setup was not entirely complete. You must ensure that Setup is "
+"properly finished by running setup again at the shell."
+msgstr ""
+
+#: misc.c:62
+#, c-format
+msgid "Unable to write %s/main/hostname.conf"
+msgstr ""
+
+#: misc.c:71
+msgid "Unable to open main hosts file."
+msgstr ""
+
+#: misc.c:76
+msgid "Unable to write /etc/hosts."
+msgstr ""
+
+#: misc.c:117
+msgid "Unable to write /etc/hosts.deny."
+msgstr ""
+
+#: misc.c:125
+msgid "Unable to write /etc/hosts.allow."
+msgstr ""
+
+#: misc.c:136
+msgid "Unable to set hostname."
+msgstr ""
+
+#: misc.c:147
+msgid "Scanning and configuring ISDN devices."
+msgstr ""
+
+#: misc.c:148
+msgid "Unable to scan for ISDN devices."
+msgstr ""
+
+#: netstuff.c:86
+#, c-format
+msgid "Interface - %s"
+msgstr ""
+
+#: netstuff.c:91
+#, c-format
+msgid "Enter the IP address information for the %s interface."
+msgstr ""
+
+#: netstuff.c:103
+msgid "Static"
+msgstr ""
+
+#: netstuff.c:104
+msgid "DHCP"
+msgstr ""
+
+#: netstuff.c:105
+msgid "PPP DIALUP (PPPoE, modem, ATM ...)"
+msgstr ""
+
+#: netstuff.c:113
+msgid "DHCP Hostname:"
+msgstr ""
+
+#: netstuff.c:115
+msgid "Force DHCP MTU:"
+msgstr ""
+
+#: netstuff.c:134
+msgid "IP address:"
+msgstr ""
+
+#: netstuff.c:146
+msgid "Network mask:"
+msgstr ""
+
+#: netstuff.c:173 networking.c:749
+msgid "The following fields are invalid:"
+msgstr ""
+
+#: netstuff.c:183
+msgid "IP address"
+msgstr ""
+
+#: netstuff.c:189
+msgid "Network mask"
+msgstr ""
+
+#: netstuff.c:198
+msgid "DHCP hostname"
+msgstr ""
+
+#: netstuff.c:396 netstuff.c:709
+msgid "Unset"
+msgstr ""
+
+#: netstuff.c:669
+#, c-format
+msgid "Please choose a networkcard for the following interface - %s."
+msgstr ""
+
+#: netstuff.c:672
+msgid "Extended Network Menu"
+msgstr ""
+
+#: netstuff.c:673 networking.c:520
+msgid "Select"
+msgstr ""
+
+#: netstuff.c:673
+msgid "Identify"
+msgstr ""
+
+#: netstuff.c:678
+msgid "Device Identification"
+msgstr ""
+
+#: netstuff.c:678
+msgid "The lights on the selected port should flash now for 10 seconds..."
+msgstr ""
+
+#: netstuff.c:679
+msgid "Identification is not supported by this interface."
+msgstr ""
+
+#: netstuff.c:691
+msgid "There are no unassigned interfaces on your system."
+msgstr ""
+
+#: netstuff.c:732
+#, c-format
+msgid "Do you really want to remove the assigned %s interface?"
+msgstr ""
+
+#: netstuff.c:755
+msgid "Select network driver"
+msgstr ""
+
+#: netstuff.c:755
+msgid "Set additional module parameters"
+msgstr ""
+
+#: netstuff.c:762
+msgid "Loading module..."
+msgstr ""
+
+#: netstuff.c:777
+msgid "Unable to load driver module."
+msgstr ""
+
+#: netstuff.c:780
+msgid "Module name cannot be blank."
+msgstr ""
+
+#: networking.c:110
+msgid "Stopping network..."
+msgstr ""
+
+#: networking.c:115
+msgid "Restarting network..."
+msgstr ""
+
+#: networking.c:146
+msgid "No GREEN interface assigned."
+msgstr ""
+
+#: networking.c:152
+msgid "Missing an IP address on GREEN."
+msgstr ""
+
+#: networking.c:163
+msgid "Error"
+msgstr ""
+
+#: networking.c:163
+msgid "Ignore"
+msgstr ""
+
+#: networking.c:164
+msgid "No RED interface assigned."
+msgstr ""
+
+#: networking.c:173
+msgid "Missing an IP address on RED."
+msgstr ""
+
+#: networking.c:183
+msgid "No ORANGE interface assigned."
+msgstr ""
+
+#: networking.c:189
+msgid "Missing an IP address on ORANGE."
+msgstr ""
+
+#: networking.c:199
+msgid "No BLUE interface assigned."
+msgstr ""
+
+#: networking.c:205
+msgid "Missing an IP address on BLUE."
+msgstr ""
+
+#: networking.c:217
+msgid "Misssing DNS."
+msgstr ""
+
+#: networking.c:224
+msgid "Missing Default Gateway."
+msgstr ""
+
+#: networking.c:237 networking.c:304
+msgid "Network configuration type"
+msgstr ""
+
+#: networking.c:238 networking.c:409
+msgid "Drivers and card assignments"
+msgstr ""
+
+#: networking.c:239 networking.c:640
+msgid "Address settings"
+msgstr ""
+
+#: networking.c:240 networking.c:743
+msgid "DNS and Gateway settings"
+msgstr ""
+
+#: networking.c:260
+msgid "When configuration is complete, a network restart will be required."
+msgstr ""
+
+#: networking.c:267
+#, c-format
+msgid ""
+"Current config: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: networking.c:268
+msgid "Network configuration menu"
+msgstr ""
+
+#: networking.c:269 networking.c:520 networking.c:642
+msgid "Done"
+msgstr ""
+
+#: networking.c:300
+#, c-format
+msgid ""
+"Select the network configuration for %s. The following configuration types "
+"list those interfaces which have ethernet attached. If you change this "
+"setting, a network restart will be required, and you will have to "
+"reconfigure the network driver assignments."
+msgstr ""
+
+#: networking.c:307
+#, c-format
+msgid ""
+"Not enough netcards for your choice.\n"
+"\n"
+"Needed: %d - Available: %d\n"
+msgstr ""
+
+#: networking.c:359
+msgid ""
+"Configure network drivers, and which interface each card is assigned to. The current configuration is as follows:\n"
+"\n"
+msgstr ""
+
+#: networking.c:408
+msgid "Do you wish to change these settings?"
+msgstr ""
+
+#: networking.c:447
+msgid "Restarting non-local network..."
+msgstr ""
+
+#: networking.c:464
+msgid ""
+"Please choose the interface you wish to change.\n"
+"\n"
+msgstr ""
+
+#: networking.c:519
+msgid "Assigned Cards"
+msgstr ""
+
+#: networking.c:520
+msgid "Remove"
+msgstr ""
+
+#: networking.c:556 networking.c:649
+#, c-format
+msgid ""
+"If you change this IP address, and you are logged in remotely, your "
+"connection to the %s machine will be broken, and you will have to reconnect "
+"on the new IP. This is a risky operation, and should only be attempted if "
+"you have physical access to the machine, should something go wrong."
+msgstr ""
+
+#: networking.c:641
+msgid "Select the interface you wish to reconfigure."
+msgstr ""
+
+#: networking.c:729
+msgid "Default gateway:"
+msgstr ""
+
+#: networking.c:744
+msgid ""
+"Enter the DNS and gateway information. These settings are used only with "
+"Static IP (and DHCP if DNS set) on the RED interface."
+msgstr ""
+
+#: networking.c:773
+msgid "Default gateway"
+msgstr ""
+
+#: networking.c:780
+msgid "Secondary DNS specified without a Primary DNS"
+msgstr ""
+
+#: passwords.c:33
+msgid ""
+"Enter the 'root' user password. Login as this user for commandline access."
+msgstr ""
+
+#: passwords.c:38 passwords.c:61
+msgid "Setting password"
+msgstr ""
+
+#: passwords.c:38
+msgid "Setting 'root' password...."
+msgstr ""
+
+#: passwords.c:39
+msgid "Problem setting 'root' password."
+msgstr ""
+
+#: passwords.c:53
+#, c-format
+msgid ""
+"Enter %s 'admin' user password. This is the user to use for logging into the"
+" %s web administration pages."
+msgstr ""
+
+#: passwords.c:60
+#, c-format
+msgid "Setting %s 'admin' user password..."
+msgstr ""
+
+#: passwords.c:62
+#, c-format
+msgid "Problem setting %s 'admin' user password."
+msgstr ""
+
+#: passwords.c:76
+msgid "Password:"
+msgstr ""
+
+#: passwords.c:77
+msgid "Again:"
+msgstr ""
+
+#: passwords.c:95
+msgid "Password cannot be blank."
+msgstr ""
+
+#: passwords.c:102
+msgid "Passwords do not match."
+msgstr ""
+
+#: passwords.c:109
+msgid "Password cannot contain spaces."
+msgstr ""
+
+#: timezone.c:77
+msgid "Choose the timezone you are in from the list below."
+msgstr ""
diff --git a/src/setup/po/sr.po b/src/setup/po/sr.po
new file mode 100644
index 0000000..7c71314
--- /dev/null
+++ b/src/setup/po/sr.po
@@ -0,0 +1,584 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The IPFire Project (www.ipfire.org)
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: IPFire Project\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-08-21 15:12+0000\n"
+"PO-Revision-Date: 2014-08-12 10:08+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian (http://www.transifex.com/projects/p/ipfire/language/sr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: dhcp.c:50
+msgid "Start address:"
+msgstr ""
+
+#: dhcp.c:51
+msgid "End address:"
+msgstr ""
+
+#: dhcp.c:52 networking.c:717
+msgid "Primary DNS:"
+msgstr ""
+
+#: dhcp.c:53 networking.c:723
+msgid "Secondary DNS:"
+msgstr ""
+
+#: dhcp.c:54
+msgid "Default lease (mins):"
+msgstr ""
+
+#: dhcp.c:55
+msgid "Max lease (mins):"
+msgstr ""
+
+#: dhcp.c:56
+msgid "Domain name suffix:"
+msgstr ""
+
+#: dhcp.c:86 dhcp.c:93 dhcp.c:101 domainname.c:34 hostname.c:37 keymap.c:70
+#: misc.c:40 misc.c:52 netstuff.c:377 netstuff.c:566 netstuff.c:704
+#: networking.c:134 networking.c:255 networking.c:291 networking.c:346
+#: networking.c:442 networking.c:552 networking.c:603 networking.c:610
+#: networking.c:713 timezone.c:63
+msgid "Unable to open settings file"
+msgstr ""
+
+#: dhcp.c:111
+msgid "DHCP server configuration"
+msgstr ""
+
+#: dhcp.c:116
+msgid "Configure the DHCP server by entering the settings information."
+msgstr ""
+
+#: dhcp.c:125
+msgid "Enabled"
+msgstr ""
+
+#: dhcp.c:142 domainname.c:43 hostname.c:47 keymap.c:86 main.c:99 main.c:172
+#: main.c:174 netstuff.c:157 netstuff.c:733 netstuff.c:756 networking.c:163
+#: networking.c:269 networking.c:305 networking.c:409 networking.c:560
+#: networking.c:642 networking.c:653 networking.c:746 passwords.c:89
+#: timezone.c:78
+msgid "OK"
+msgstr ""
+
+#: dhcp.c:143 domainname.c:43 hostname.c:47 keymap.c:86 netstuff.c:158
+#: netstuff.c:673 netstuff.c:733 netstuff.c:756 networking.c:305
+#: networking.c:410 networking.c:560 networking.c:653 networking.c:746
+#: passwords.c:89 timezone.c:78
+msgid "Cancel"
+msgstr ""
+
+#: dhcp.c:156
+msgid ""
+"The following fields are invalid:\n"
+"\n"
+msgstr ""
+
+#: dhcp.c:159
+msgid "Start address"
+msgstr ""
+
+#: dhcp.c:165
+msgid "End address"
+msgstr ""
+
+#: dhcp.c:173 networking.c:755
+msgid "Primary DNS"
+msgstr ""
+
+#: dhcp.c:182 networking.c:764
+msgid "Secondary DNS"
+msgstr ""
+
+#: dhcp.c:189
+msgid "Default lease time"
+msgstr ""
+
+#: dhcp.c:195
+msgid "Max. lease time"
+msgstr ""
+
+#: domainname.c:42 main.c:70
+msgid "Domain name"
+msgstr ""
+
+#: domainname.c:42
+msgid "Enter Domain name"
+msgstr ""
+
+#: domainname.c:48
+msgid "Domain name cannot be empty."
+msgstr ""
+
+#: domainname.c:50
+msgid "Domain name cannot contain spaces."
+msgstr ""
+
+#: domainname.c:53
+msgid "Domain name may only contain letters, numbers, hyphens and periods."
+msgstr ""
+
+#: hostname.c:46 main.c:69
+msgid "Hostname"
+msgstr ""
+
+#: hostname.c:46
+msgid "Enter the machine's hostname."
+msgstr ""
+
+#: hostname.c:53
+msgid "Hostname cannot be empty."
+msgstr ""
+
+#: hostname.c:55
+msgid "Hostname cannot contain spaces."
+msgstr ""
+
+#: hostname.c:58
+msgid "Hostname may only contain letters, numbers and hyphens."
+msgstr ""
+
+#: keymap.c:84 main.c:67
+msgid "Keyboard mapping"
+msgstr ""
+
+#: keymap.c:85
+msgid "Choose the type of keyboard you are using from the list below."
+msgstr ""
+
+#: main.c:68 timezone.c:77
+msgid "Timezone"
+msgstr ""
+
+#: main.c:71 networking.c:110 networking.c:115 networking.c:447
+msgid "Networking"
+msgstr ""
+
+#: main.c:72 misc.c:147
+msgid "ISDN"
+msgstr ""
+
+#: main.c:73
+msgid "'root' password"
+msgstr ""
+
+#: main.c:74
+msgid "'admin' password"
+msgstr ""
+
+#: main.c:90
+msgid " <Tab>/<Alt-Tab> between elements | <Space> selects"
+msgstr ""
+
+#: main.c:97
+msgid "Section menu"
+msgstr ""
+
+#: main.c:98
+msgid "Select the item you wish to configure."
+msgstr ""
+
+#: main.c:99
+msgid "Quit"
+msgstr ""
+
+#: main.c:172
+msgid "Setup is complete."
+msgstr ""
+
+#: main.c:174 netstuff.c:733 networking.c:560 networking.c:653
+msgid "Warning"
+msgstr ""
+
+#: main.c:175
+msgid ""
+"Initial setup was not entirely complete. You must ensure that Setup is "
+"properly finished by running setup again at the shell."
+msgstr ""
+
+#: misc.c:62
+#, c-format
+msgid "Unable to write %s/main/hostname.conf"
+msgstr ""
+
+#: misc.c:71
+msgid "Unable to open main hosts file."
+msgstr ""
+
+#: misc.c:76
+msgid "Unable to write /etc/hosts."
+msgstr ""
+
+#: misc.c:117
+msgid "Unable to write /etc/hosts.deny."
+msgstr ""
+
+#: misc.c:125
+msgid "Unable to write /etc/hosts.allow."
+msgstr ""
+
+#: misc.c:136
+msgid "Unable to set hostname."
+msgstr ""
+
+#: misc.c:147
+msgid "Scanning and configuring ISDN devices."
+msgstr ""
+
+#: misc.c:148
+msgid "Unable to scan for ISDN devices."
+msgstr ""
+
+#: netstuff.c:86
+#, c-format
+msgid "Interface - %s"
+msgstr ""
+
+#: netstuff.c:91
+#, c-format
+msgid "Enter the IP address information for the %s interface."
+msgstr ""
+
+#: netstuff.c:103
+msgid "Static"
+msgstr ""
+
+#: netstuff.c:104
+msgid "DHCP"
+msgstr ""
+
+#: netstuff.c:105
+msgid "PPP DIALUP (PPPoE, modem, ATM ...)"
+msgstr ""
+
+#: netstuff.c:113
+msgid "DHCP Hostname:"
+msgstr ""
+
+#: netstuff.c:115
+msgid "Force DHCP MTU:"
+msgstr ""
+
+#: netstuff.c:134
+msgid "IP address:"
+msgstr ""
+
+#: netstuff.c:146
+msgid "Network mask:"
+msgstr ""
+
+#: netstuff.c:173 networking.c:749
+msgid "The following fields are invalid:"
+msgstr ""
+
+#: netstuff.c:183
+msgid "IP address"
+msgstr ""
+
+#: netstuff.c:189
+msgid "Network mask"
+msgstr ""
+
+#: netstuff.c:198
+msgid "DHCP hostname"
+msgstr ""
+
+#: netstuff.c:396 netstuff.c:709
+msgid "Unset"
+msgstr ""
+
+#: netstuff.c:669
+#, c-format
+msgid "Please choose a networkcard for the following interface - %s."
+msgstr ""
+
+#: netstuff.c:672
+msgid "Extended Network Menu"
+msgstr ""
+
+#: netstuff.c:673 networking.c:520
+msgid "Select"
+msgstr ""
+
+#: netstuff.c:673
+msgid "Identify"
+msgstr ""
+
+#: netstuff.c:678
+msgid "Device Identification"
+msgstr ""
+
+#: netstuff.c:678
+msgid "The lights on the selected port should flash now for 10 seconds..."
+msgstr ""
+
+#: netstuff.c:679
+msgid "Identification is not supported by this interface."
+msgstr ""
+
+#: netstuff.c:691
+msgid "There are no unassigned interfaces on your system."
+msgstr ""
+
+#: netstuff.c:732
+#, c-format
+msgid "Do you really want to remove the assigned %s interface?"
+msgstr ""
+
+#: netstuff.c:755
+msgid "Select network driver"
+msgstr ""
+
+#: netstuff.c:755
+msgid "Set additional module parameters"
+msgstr ""
+
+#: netstuff.c:762
+msgid "Loading module..."
+msgstr ""
+
+#: netstuff.c:777
+msgid "Unable to load driver module."
+msgstr ""
+
+#: netstuff.c:780
+msgid "Module name cannot be blank."
+msgstr ""
+
+#: networking.c:110
+msgid "Stopping network..."
+msgstr ""
+
+#: networking.c:115
+msgid "Restarting network..."
+msgstr ""
+
+#: networking.c:146
+msgid "No GREEN interface assigned."
+msgstr ""
+
+#: networking.c:152
+msgid "Missing an IP address on GREEN."
+msgstr ""
+
+#: networking.c:163
+msgid "Error"
+msgstr ""
+
+#: networking.c:163
+msgid "Ignore"
+msgstr ""
+
+#: networking.c:164
+msgid "No RED interface assigned."
+msgstr ""
+
+#: networking.c:173
+msgid "Missing an IP address on RED."
+msgstr ""
+
+#: networking.c:183
+msgid "No ORANGE interface assigned."
+msgstr ""
+
+#: networking.c:189
+msgid "Missing an IP address on ORANGE."
+msgstr ""
+
+#: networking.c:199
+msgid "No BLUE interface assigned."
+msgstr ""
+
+#: networking.c:205
+msgid "Missing an IP address on BLUE."
+msgstr ""
+
+#: networking.c:217
+msgid "Misssing DNS."
+msgstr ""
+
+#: networking.c:224
+msgid "Missing Default Gateway."
+msgstr ""
+
+#: networking.c:237 networking.c:304
+msgid "Network configuration type"
+msgstr ""
+
+#: networking.c:238 networking.c:409
+msgid "Drivers and card assignments"
+msgstr ""
+
+#: networking.c:239 networking.c:640
+msgid "Address settings"
+msgstr ""
+
+#: networking.c:240 networking.c:743
+msgid "DNS and Gateway settings"
+msgstr ""
+
+#: networking.c:260
+msgid "When configuration is complete, a network restart will be required."
+msgstr ""
+
+#: networking.c:267
+#, c-format
+msgid ""
+"Current config: %s\n"
+"\n"
+"%s"
+msgstr ""
+
+#: networking.c:268
+msgid "Network configuration menu"
+msgstr ""
+
+#: networking.c:269 networking.c:520 networking.c:642
+msgid "Done"
+msgstr ""
+
+#: networking.c:300
+#, c-format
+msgid ""
+"Select the network configuration for %s. The following configuration types "
+"list those interfaces which have ethernet attached. If you change this "
+"setting, a network restart will be required, and you will have to "
+"reconfigure the network driver assignments."
+msgstr ""
+
+#: networking.c:307
+#, c-format
+msgid ""
+"Not enough netcards for your choice.\n"
+"\n"
+"Needed: %d - Available: %d\n"
+msgstr ""
+
+#: networking.c:359
+msgid ""
+"Configure network drivers, and which interface each card is assigned to. The current configuration is as follows:\n"
+"\n"
+msgstr ""
+
+#: networking.c:408
+msgid "Do you wish to change these settings?"
+msgstr ""
+
+#: networking.c:447
+msgid "Restarting non-local network..."
+msgstr ""
+
+#: networking.c:464
+msgid ""
+"Please choose the interface you wish to change.\n"
+"\n"
+msgstr ""
+
+#: networking.c:519
+msgid "Assigned Cards"
+msgstr ""
+
+#: networking.c:520
+msgid "Remove"
+msgstr ""
+
+#: networking.c:556 networking.c:649
+#, c-format
+msgid ""
+"If you change this IP address, and you are logged in remotely, your "
+"connection to the %s machine will be broken, and you will have to reconnect "
+"on the new IP. This is a risky operation, and should only be attempted if "
+"you have physical access to the machine, should something go wrong."
+msgstr ""
+
+#: networking.c:641
+msgid "Select the interface you wish to reconfigure."
+msgstr ""
+
+#: networking.c:729
+msgid "Default gateway:"
+msgstr ""
+
+#: networking.c:744
+msgid ""
+"Enter the DNS and gateway information. These settings are used only with "
+"Static IP (and DHCP if DNS set) on the RED interface."
+msgstr ""
+
+#: networking.c:773
+msgid "Default gateway"
+msgstr ""
+
+#: networking.c:780
+msgid "Secondary DNS specified without a Primary DNS"
+msgstr ""
+
+#: passwords.c:33
+msgid ""
+"Enter the 'root' user password. Login as this user for commandline access."
+msgstr ""
+
+#: passwords.c:38 passwords.c:61
+msgid "Setting password"
+msgstr ""
+
+#: passwords.c:38
+msgid "Setting 'root' password...."
+msgstr ""
+
+#: passwords.c:39
+msgid "Problem setting 'root' password."
+msgstr ""
+
+#: passwords.c:53
+#, c-format
+msgid ""
+"Enter %s 'admin' user password. This is the user to use for logging into the"
+" %s web administration pages."
+msgstr ""
+
+#: passwords.c:60
+#, c-format
+msgid "Setting %s 'admin' user password..."
+msgstr ""
+
+#: passwords.c:62
+#, c-format
+msgid "Problem setting %s 'admin' user password."
+msgstr ""
+
+#: passwords.c:76
+msgid "Password:"
+msgstr ""
+
+#: passwords.c:77
+msgid "Again:"
+msgstr ""
+
+#: passwords.c:95
+msgid "Password cannot be blank."
+msgstr ""
+
+#: passwords.c:102
+msgid "Passwords do not match."
+msgstr ""
+
+#: passwords.c:109
+msgid "Password cannot contain spaces."
+msgstr ""
+
+#: timezone.c:77
+msgid "Choose the timezone you are in from the list below."
+msgstr ""
diff --git a/src/setup/po/tr.po b/src/setup/po/tr.po
index 758a66e..dcb417d 100644
--- a/src/setup/po/tr.po
+++ b/src/setup/po/tr.po
@@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# Kudret Emre <kudretemre(a)hotmail.com.tr>, 2014
msgid ""
msgstr ""
"Project-Id-Version: IPFire Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-21 15:12+0000\n"
-"PO-Revision-Date: 2014-08-21 15:13+0000\n"
-"Last-Translator: Michael Tremer <michael.tremer(a)ipfire.org>\n"
+"PO-Revision-Date: 2014-09-30 20:41+0000\n"
+"Last-Translator: Kudret Emre <kudretemre(a)hotmail.com.tr>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/ipfire/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,31 +20,31 @@ msgstr ""
#: dhcp.c:50
msgid "Start address:"
-msgstr ""
+msgstr "Başlangıç adresi:"
#: dhcp.c:51
msgid "End address:"
-msgstr ""
+msgstr "Bitiş adresi:"
#: dhcp.c:52 networking.c:717
msgid "Primary DNS:"
-msgstr ""
+msgstr "Birincil DNS:"
#: dhcp.c:53 networking.c:723
msgid "Secondary DNS:"
-msgstr ""
+msgstr "İkincil DNS:"
#: dhcp.c:54
msgid "Default lease (mins):"
-msgstr ""
+msgstr "Varsayılan kira (dakika):"
#: dhcp.c:55
msgid "Max lease (mins):"
-msgstr ""
+msgstr "En fazla kira (dakika):"
#: dhcp.c:56
msgid "Domain name suffix:"
-msgstr ""
+msgstr "Etki alanı adı son eki:"
#: dhcp.c:86 dhcp.c:93 dhcp.c:101 domainname.c:34 hostname.c:37 keymap.c:70
#: misc.c:40 misc.c:52 netstuff.c:377 netstuff.c:566 netstuff.c:704
@@ -51,19 +52,19 @@ msgstr ""
#: networking.c:442 networking.c:552 networking.c:603 networking.c:610
#: networking.c:713 timezone.c:63
msgid "Unable to open settings file"
-msgstr ""
+msgstr "Ayar dosyası açılamıyor"
#: dhcp.c:111
msgid "DHCP server configuration"
-msgstr ""
+msgstr "DHCP sunucu yapılandırması"
#: dhcp.c:116
msgid "Configure the DHCP server by entering the settings information."
-msgstr ""
+msgstr "Ayarlar bilgisini girerek DHCP sunucusunu yapılandırın."
#: dhcp.c:125
msgid "Enabled"
-msgstr ""
+msgstr "Etkin"
#: dhcp.c:142 domainname.c:43 hostname.c:47 keymap.c:86 main.c:99 main.c:172
#: main.c:174 netstuff.c:157 netstuff.c:733 netstuff.c:756 networking.c:163
@@ -71,367 +72,367 @@ msgstr ""
#: networking.c:642 networking.c:653 networking.c:746 passwords.c:89
#: timezone.c:78
msgid "OK"
-msgstr ""
+msgstr "Tamam"
#: dhcp.c:143 domainname.c:43 hostname.c:47 keymap.c:86 netstuff.c:158
#: netstuff.c:673 netstuff.c:733 netstuff.c:756 networking.c:305
#: networking.c:410 networking.c:560 networking.c:653 networking.c:746
#: passwords.c:89 timezone.c:78
msgid "Cancel"
-msgstr ""
+msgstr "İptal"
#: dhcp.c:156
msgid ""
"The following fields are invalid:\n"
"\n"
-msgstr ""
+msgstr "Aşağıdaki alanlar geçersiz:\n\n"
#: dhcp.c:159
msgid "Start address"
-msgstr ""
+msgstr "Başlangış adresi"
#: dhcp.c:165
msgid "End address"
-msgstr ""
+msgstr "Bitiş adresi"
#: dhcp.c:173 networking.c:755
msgid "Primary DNS"
-msgstr ""
+msgstr "Birincil DNS"
#: dhcp.c:182 networking.c:764
msgid "Secondary DNS"
-msgstr ""
+msgstr "İkincil DNS"
#: dhcp.c:189
msgid "Default lease time"
-msgstr ""
+msgstr "Varsayılan kira süresi"
#: dhcp.c:195
msgid "Max. lease time"
-msgstr ""
+msgstr "En fazla kira süresi"
#: domainname.c:42 main.c:70
msgid "Domain name"
-msgstr ""
+msgstr "Etki alanı adı"
#: domainname.c:42
msgid "Enter Domain name"
-msgstr ""
+msgstr "Etki alanı adını girin"
#: domainname.c:48
msgid "Domain name cannot be empty."
-msgstr ""
+msgstr "Etki alanı adı boş olamaz."
#: domainname.c:50
msgid "Domain name cannot contain spaces."
-msgstr ""
+msgstr "Etki alanı adı boşluk içeremez."
#: domainname.c:53
msgid "Domain name may only contain letters, numbers, hyphens and periods."
-msgstr ""
+msgstr "Etki alanı adı sadece harf, sayı, tire ve nokta içerebilir."
#: hostname.c:46 main.c:69
msgid "Hostname"
-msgstr ""
+msgstr "Ana bilgisayar adı"
#: hostname.c:46
msgid "Enter the machine's hostname."
-msgstr ""
+msgstr "Makinanın ana bilgisayar adını girin."
#: hostname.c:53
msgid "Hostname cannot be empty."
-msgstr ""
+msgstr "Ana bilgisaya adı boş olamaz."
#: hostname.c:55
msgid "Hostname cannot contain spaces."
-msgstr ""
+msgstr "Ana bilgisayaradı boşluk içeremez."
#: hostname.c:58
msgid "Hostname may only contain letters, numbers and hyphens."
-msgstr ""
+msgstr "Ana bilgisayar adı sadece harf, sayı ve tire içerebilir."
#: keymap.c:84 main.c:67
msgid "Keyboard mapping"
-msgstr ""
+msgstr "Klavye eşlemesi"
#: keymap.c:85
msgid "Choose the type of keyboard you are using from the list below."
-msgstr ""
+msgstr "Aşağıdaki listeden kullandığınız klavye tipini seçin."
#: main.c:68 timezone.c:77
msgid "Timezone"
-msgstr ""
+msgstr "Zaman dilimi"
#: main.c:71 networking.c:110 networking.c:115 networking.c:447
msgid "Networking"
-msgstr ""
+msgstr "Ağ"
#: main.c:72 misc.c:147
msgid "ISDN"
-msgstr ""
+msgstr "ISDN"
#: main.c:73
msgid "'root' password"
-msgstr ""
+msgstr "'root' şifresi"
#: main.c:74
msgid "'admin' password"
-msgstr ""
+msgstr "'admin' şifresi"
#: main.c:90
msgid " <Tab>/<Alt-Tab> between elements | <Space> selects"
-msgstr ""
+msgstr " <Tab>/<Alt-Tab> elementler arası geçiş | <Space> seç"
#: main.c:97
msgid "Section menu"
-msgstr ""
+msgstr "Bölüm menüsü"
#: main.c:98
msgid "Select the item you wish to configure."
-msgstr ""
+msgstr "Yapılandırmak istediğiniz öğeyi seçin"
#: main.c:99
msgid "Quit"
-msgstr ""
+msgstr "Çıkış"
#: main.c:172
msgid "Setup is complete."
-msgstr ""
+msgstr "Kurulum tamamlandı."
#: main.c:174 netstuff.c:733 networking.c:560 networking.c:653
msgid "Warning"
-msgstr ""
+msgstr "Uyarı"
#: main.c:175
msgid ""
"Initial setup was not entirely complete. You must ensure that Setup is "
"properly finished by running setup again at the shell."
-msgstr ""
+msgstr "İlk kurulum tamamen yapılamadı. Kurulumun kabuktan yeniden başlatılıp düzgünce bitirildiğinden emin olmalısınız."
#: misc.c:62
#, c-format
msgid "Unable to write %s/main/hostname.conf"
-msgstr ""
+msgstr "%s/main/hostname.conf yazılamıyor"
#: misc.c:71
msgid "Unable to open main hosts file."
-msgstr ""
+msgstr "Ana hosts dosyası açılamıyor."
#: misc.c:76
msgid "Unable to write /etc/hosts."
-msgstr ""
+msgstr "/etc/hosts yazılamıyor."
#: misc.c:117
msgid "Unable to write /etc/hosts.deny."
-msgstr ""
+msgstr " /etc/hosts.deny yazılamıyor."
#: misc.c:125
msgid "Unable to write /etc/hosts.allow."
-msgstr ""
+msgstr "/etc/hosts.allow yazılamıyor."
#: misc.c:136
msgid "Unable to set hostname."
-msgstr ""
+msgstr "Ana bilgisayar adı ayarlanamıyor."
#: misc.c:147
msgid "Scanning and configuring ISDN devices."
-msgstr ""
+msgstr "ISDN cihazları taranıyor ve yapılandırılıyor."
#: misc.c:148
msgid "Unable to scan for ISDN devices."
-msgstr ""
+msgstr "ISDN cihazları için tarama yapılamıyor."
#: netstuff.c:86
#, c-format
msgid "Interface - %s"
-msgstr ""
+msgstr "Arayüz - %s"
#: netstuff.c:91
#, c-format
msgid "Enter the IP address information for the %s interface."
-msgstr ""
+msgstr "%s arayüzü için IP adresi bilgisini girin."
#: netstuff.c:103
msgid "Static"
-msgstr ""
+msgstr "Statik"
#: netstuff.c:104
msgid "DHCP"
-msgstr ""
+msgstr "DHCP"
#: netstuff.c:105
msgid "PPP DIALUP (PPPoE, modem, ATM ...)"
-msgstr ""
+msgstr "PPP DIALUP (PPPoE, modem, ATM ...)"
#: netstuff.c:113
msgid "DHCP Hostname:"
-msgstr ""
+msgstr "DHCP Ana bilgisayar adı:"
#: netstuff.c:115
msgid "Force DHCP MTU:"
-msgstr ""
+msgstr "Force DHCP MTU:"
#: netstuff.c:134
msgid "IP address:"
-msgstr ""
+msgstr "IP adresi:"
#: netstuff.c:146
msgid "Network mask:"
-msgstr ""
+msgstr "Ağ maskesi:"
#: netstuff.c:173 networking.c:749
msgid "The following fields are invalid:"
-msgstr ""
+msgstr "Aşağıdaki alanlar geçersiz:"
#: netstuff.c:183
msgid "IP address"
-msgstr ""
+msgstr "IP adresi"
#: netstuff.c:189
msgid "Network mask"
-msgstr ""
+msgstr "Ağ maskesi"
#: netstuff.c:198
msgid "DHCP hostname"
-msgstr ""
+msgstr "DHCP Ana bilgisayar adı"
#: netstuff.c:396 netstuff.c:709
msgid "Unset"
-msgstr ""
+msgstr "Unset"
#: netstuff.c:669
#, c-format
msgid "Please choose a networkcard for the following interface - %s."
-msgstr ""
+msgstr "Lütfen %s arayüzü için bit ağ kartı seçin."
#: netstuff.c:672
msgid "Extended Network Menu"
-msgstr ""
+msgstr "Genişletilmiş Ağ Menüsü"
#: netstuff.c:673 networking.c:520
msgid "Select"
-msgstr ""
+msgstr "Seç"
#: netstuff.c:673
msgid "Identify"
-msgstr ""
+msgstr "Tanımla"
#: netstuff.c:678
msgid "Device Identification"
-msgstr ""
+msgstr "Cihaz Tanımlama"
#: netstuff.c:678
msgid "The lights on the selected port should flash now for 10 seconds..."
-msgstr ""
+msgstr "Seçilen porttaki ışıklar şimdi 10 saniye boyunca yanıp sönmeli..."
#: netstuff.c:679
msgid "Identification is not supported by this interface."
-msgstr ""
+msgstr "Bu arayüz kimdik doğrulamayı desteklemiyor."
#: netstuff.c:691
msgid "There are no unassigned interfaces on your system."
-msgstr ""
+msgstr "Sisteminizde atanmamış arayüz yok."
#: netstuff.c:732
#, c-format
msgid "Do you really want to remove the assigned %s interface?"
-msgstr ""
+msgstr "Atanmış %s arayüzü gerçekten kaldırmak istiyor musunuz?"
#: netstuff.c:755
msgid "Select network driver"
-msgstr ""
+msgstr "Ağ sürücüsünü seç"
#: netstuff.c:755
msgid "Set additional module parameters"
-msgstr ""
+msgstr "Ek modül parametrelerini ayarla"
#: netstuff.c:762
msgid "Loading module..."
-msgstr ""
+msgstr "Modül yükleniyor..."
#: netstuff.c:777
msgid "Unable to load driver module."
-msgstr ""
+msgstr "Sürücü modülü yüklenemiyor."
#: netstuff.c:780
msgid "Module name cannot be blank."
-msgstr ""
+msgstr "Modül ismi boş olamaz."
#: networking.c:110
msgid "Stopping network..."
-msgstr ""
+msgstr "Ağ durduruluyor..."
#: networking.c:115
msgid "Restarting network..."
-msgstr ""
+msgstr "Ağ yeniden başlatılıyor..."
#: networking.c:146
msgid "No GREEN interface assigned."
-msgstr ""
+msgstr "Atanmış YEŞİL arayüz yok."
#: networking.c:152
msgid "Missing an IP address on GREEN."
-msgstr ""
+msgstr "YEŞİL üzerinde kayıp IP adresi."
#: networking.c:163
msgid "Error"
-msgstr ""
+msgstr "Hata"
#: networking.c:163
msgid "Ignore"
-msgstr ""
+msgstr "Yoksay"
#: networking.c:164
msgid "No RED interface assigned."
-msgstr ""
+msgstr "Atanmış KIRMIZI arayüz yok."
#: networking.c:173
msgid "Missing an IP address on RED."
-msgstr ""
+msgstr "KIRMIZI üzerinde kayıp IP adresi."
#: networking.c:183
msgid "No ORANGE interface assigned."
-msgstr ""
+msgstr "Atanmış TURUNCU arayüz yok."
#: networking.c:189
msgid "Missing an IP address on ORANGE."
-msgstr ""
+msgstr "TURUNCU üzerinde kayıp IP adresi."
#: networking.c:199
msgid "No BLUE interface assigned."
-msgstr ""
+msgstr "Atanmış MAVİ arayüz yok."
#: networking.c:205
msgid "Missing an IP address on BLUE."
-msgstr ""
+msgstr "MAVİ üzerinde kayıp IP adresi."
#: networking.c:217
msgid "Misssing DNS."
-msgstr ""
+msgstr "Kayıp DNS."
#: networking.c:224
msgid "Missing Default Gateway."
-msgstr ""
+msgstr "Kayıp Varsayılan Ağ Geçidi"
#: networking.c:237 networking.c:304
msgid "Network configuration type"
-msgstr ""
+msgstr "Ağ yapılandırma tipi"
#: networking.c:238 networking.c:409
msgid "Drivers and card assignments"
-msgstr ""
+msgstr "Sürücüler ve kart atamaları"
#: networking.c:239 networking.c:640
msgid "Address settings"
-msgstr ""
+msgstr "Adres ayarları"
#: networking.c:240 networking.c:743
msgid "DNS and Gateway settings"
-msgstr ""
+msgstr "DNS ve Ağ Geçidi ayarları"
#: networking.c:260
msgid "When configuration is complete, a network restart will be required."
-msgstr ""
+msgstr "Yapılandırma tamamlandığında yeniden başlatma gerekecek."
#: networking.c:267
#, c-format
@@ -439,15 +440,15 @@ msgid ""
"Current config: %s\n"
"\n"
"%s"
-msgstr ""
+msgstr "Geçerli yapılandırma: %s\n\n%s"
#: networking.c:268
msgid "Network configuration menu"
-msgstr ""
+msgstr "Ağ yapılandırma menüsü"
#: networking.c:269 networking.c:520 networking.c:642
msgid "Done"
-msgstr ""
+msgstr "Tamam"
#: networking.c:300
#, c-format
@@ -456,7 +457,7 @@ msgid ""
"list those interfaces which have ethernet attached. If you change this "
"setting, a network restart will be required, and you will have to "
"reconfigure the network driver assignments."
-msgstr ""
+msgstr "%s için ağ yapılandırmasını seçin. Aşağıdaki yapılandırma tipi listesi ethernet ayarı yapılmış olan arayüzleri gösterir. Eğer bu ayarları değiştirirseniz, ağın yeniden başlatılması ve ağ sürücüleri atamalarını tekrar yapılandırmanız gerekecektir."
#: networking.c:307
#, c-format
@@ -464,35 +465,35 @@ msgid ""
"Not enough netcards for your choice.\n"
"\n"
"Needed: %d - Available: %d\n"
-msgstr ""
+msgstr "Seçiminiz için yeterli kart yok.\n\nGereken: %d - Kullanılabilir: %d\n"
#: networking.c:359
msgid ""
"Configure network drivers, and which interface each card is assigned to. The current configuration is as follows:\n"
"\n"
-msgstr ""
+msgstr "Ağ sürücülerini ve her bir kart için atanmış arayüzleri yapılandırın. Geçerli yapılandırma aşağıdaki gibidir:\n\n"
#: networking.c:408
msgid "Do you wish to change these settings?"
-msgstr ""
+msgstr "Bu ayarları değiştirmek istiyor musunuz?"
#: networking.c:447
msgid "Restarting non-local network..."
-msgstr ""
+msgstr "Yerel olmayan ağ yeniden başlatılıyor..."
#: networking.c:464
msgid ""
"Please choose the interface you wish to change.\n"
"\n"
-msgstr ""
+msgstr "Lütfen değiştirmek istediğiniz arayüzü seçin.\n\n"
#: networking.c:519
msgid "Assigned Cards"
-msgstr ""
+msgstr "Atanmış Kartlar"
#: networking.c:520
msgid "Remove"
-msgstr ""
+msgstr "Kaldır"
#: networking.c:556 networking.c:649
#, c-format
@@ -501,84 +502,84 @@ msgid ""
"connection to the %s machine will be broken, and you will have to reconnect "
"on the new IP. This is a risky operation, and should only be attempted if "
"you have physical access to the machine, should something go wrong."
-msgstr ""
+msgstr "Eğer bu IP adresini değiştirirseniz, ve uzaktan oturum açmışsanız, %s makinesine olan bağlantınız kopacaktır ve yeni IP adresine tekrar bağlanmanız gerekecektir. Bu riskli bir işlemdir ve bir şeylerin ters gitmesi durumunda makineye fiziksel erişiminiz varsa kullanmalısınız."
#: networking.c:641
msgid "Select the interface you wish to reconfigure."
-msgstr ""
+msgstr "Yeniden yapılandırmak istediğiniz arayüzü seçin."
#: networking.c:729
msgid "Default gateway:"
-msgstr ""
+msgstr "Varsayılan ağ geçidi:"
#: networking.c:744
msgid ""
"Enter the DNS and gateway information. These settings are used only with "
"Static IP (and DHCP if DNS set) on the RED interface."
-msgstr ""
+msgstr "DNS ve ağ geçidi bilgisini girin. Bu ayarlar sadece KIRMIZI arayüzde Statik IP (ve eğer DNS ayarlanmışsa DHCP) ile kullanılacaktır."
#: networking.c:773
msgid "Default gateway"
-msgstr ""
+msgstr "Varsayılan ağ geçidi"
#: networking.c:780
msgid "Secondary DNS specified without a Primary DNS"
-msgstr ""
+msgstr "Birincil DNS olmadan İkincil DNS belirtildi."
#: passwords.c:33
msgid ""
"Enter the 'root' user password. Login as this user for commandline access."
-msgstr ""
+msgstr "'root' kullanıcı şifresini girin. Komut satırına erişmek için bu kullanıcıyla oturum açın."
#: passwords.c:38 passwords.c:61
msgid "Setting password"
-msgstr ""
+msgstr "Şifre ayarlanıyor"
#: passwords.c:38
msgid "Setting 'root' password...."
-msgstr ""
+msgstr "'root' şifresi ayarlanıyor..."
#: passwords.c:39
msgid "Problem setting 'root' password."
-msgstr ""
+msgstr "'root' şifresi ayarlama sorunu."
#: passwords.c:53
#, c-format
msgid ""
"Enter %s 'admin' user password. This is the user to use for logging into the"
" %s web administration pages."
-msgstr ""
+msgstr "%s 'admin' kullanıcısı için şifre girin. Bu kullanıcı, %s web yönetim sayfalarını kullanmak için oturum açılacak kullanıcıdır."
#: passwords.c:60
#, c-format
msgid "Setting %s 'admin' user password..."
-msgstr ""
+msgstr "%s 'admin' kullanıcısının şifresi ayarlanıyor..."
#: passwords.c:62
#, c-format
msgid "Problem setting %s 'admin' user password."
-msgstr ""
+msgstr "%s 'admin' kullanıcı şifresi ayarlama sorunu."
#: passwords.c:76
msgid "Password:"
-msgstr ""
+msgstr "Şifre:"
#: passwords.c:77
msgid "Again:"
-msgstr ""
+msgstr "Tekrar:"
#: passwords.c:95
msgid "Password cannot be blank."
-msgstr ""
+msgstr "Şifre boş olamaz."
#: passwords.c:102
msgid "Passwords do not match."
-msgstr ""
+msgstr "Şifreler eşleşmiyor."
#: passwords.c:109
msgid "Password cannot contain spaces."
-msgstr ""
+msgstr "Şifre boşluk içeremez."
#: timezone.c:77
msgid "Choose the timezone you are in from the list below."
-msgstr ""
+msgstr "Aşağıdaki listeden içinde bulunduğunuz zaman dilimini seçin."
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 7168162ef13be445996ff2f65d12e5643ef0f2b2
by git＠ipfire.org 24 Dec '14
by git＠ipfire.org 24 Dec '14
24 Dec '14
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via 7168162ef13be445996ff2f65d12e5643ef0f2b2 (commit)
from 75f3abe29d048b3e4096c28ef1ce32121fe69795 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7168162ef13be445996ff2f65d12e5643ef0f2b2
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Dec 24 14:49:11 2014 +0100
fix missing "-" in version string.
-----------------------------------------------------------------------
Summary of changes:
make.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Difference in files:
diff --git a/make.sh b/make.sh
index 7b211c7..fa7fb55 100755
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.17" # Version number
-CORE="86beta1" # Core Level (Filename)
+CORE="86-beta1" # Core Level (Filename)
PAKFIRE_CORE="86" # Core Level (PAKFIRE)
GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 75f3abe29d048b3e4096c28ef1ce32121fe69795
by git＠ipfire.org 22 Dec '14
by git＠ipfire.org 22 Dec '14
22 Dec '14
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via 75f3abe29d048b3e4096c28ef1ce32121fe69795 (commit)
from 81f315bff2e161073c12733a01a635b22e97f89f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 75f3abe29d048b3e4096c28ef1ce32121fe69795
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Dec 22 20:51:42 2014 +0100
core86: fix init restart.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/86/update.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Difference in files:
diff --git a/config/rootfiles/core/86/update.sh b/config/rootfiles/core/86/update.sh
index db38844..bdb96fc 100644
--- a/config/rootfiles/core/86/update.sh
+++ b/config/rootfiles/core/86/update.sh
@@ -128,7 +128,7 @@ tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /
#
#restart init because glibc was updated.
-telinit i
+telinit u
# Check diskspace on boot
BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 4579e6806acab5ccde4a16686569936b018ce9e3
by git＠ipfire.org 22 Dec '14
by git＠ipfire.org 22 Dec '14
22 Dec '14
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via 4579e6806acab5ccde4a16686569936b018ce9e3 (commit)
via 6cd485c8929f8a529326bcf711890520a772531d (commit)
via b62ccb4eb66b007cc4f82c57c4e2106e5b39e290 (commit)
via 30e7e32c50186dbe630179bc37ef69a389a4f2d7 (commit)
via 08748e57d48d8a1f09bd8a6d76f23c48b844060c (commit)
via 46481a44dab16acc5f0fc7d5566b038448d4b237 (commit)
via 858366befe6c92acf300b8c4c8d465ebe12f7711 (commit)
from 4f3d5107d7f1f8a459538262afe0078f1f9189fc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4579e6806acab5ccde4a16686569936b018ce9e3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Dec 22 17:29:35 2014 +0100
ntp: Update to 4.2.8
CVE-2014-9293 ntp: automatic generation of weak default key in config_auth()
CVE-2014-9294 ntp: ntp-keygen uses weak random number generator and seed when generating MD5 keys
CVE-2014-9295 ntp: Multiple buffer overflows via specially-crafted packets
CVE-2014-9296 ntp: receive() missing return on error
commit 6cd485c8929f8a529326bcf711890520a772531d
Merge: b62ccb4 858366b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Dec 10 14:19:52 2014 +0100
Merge remote-tracking branch 'stevee/plymouth-update'
commit b62ccb4eb66b007cc4f82c57c4e2106e5b39e290
Merge: 30e7e32 46481a4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Dec 10 14:19:17 2014 +0100
Merge remote-tracking branch 'stevee/grub2-fix'
commit 30e7e32c50186dbe630179bc37ef69a389a4f2d7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Dec 10 14:17:06 2014 +0100
kernel: Add patch to make RT5592 chipsets more stable
Reduces massive power consumption which makes the module
and USB bus very unstable.
From: http://git.ipfire.org/?p=ipfire-2.x.git;a=commit;h=e71475c13afeef652ae94a54…
commit 08748e57d48d8a1f09bd8a6d76f23c48b844060c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Dec 10 14:16:30 2014 +0100
ddns: New package (version 005)
commit 46481a44dab16acc5f0fc7d5566b038448d4b237
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Dec 7 15:47:17 2014 +0100
grub: Disable hardening for grub-script-check binary.
This binary requires the following disabled PaX flags:
* PAGEEXEC
* MPROTECT
* RANDEXEC
* EMUTRAMP
If one of these flags in enabled the binary will crash during the execution of
"grub-mkconfig" and the grub configuration file cannot be updated.
commit 858366befe6c92acf300b8c4c8d465ebe12f7711
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Dec 7 15:42:24 2014 +0100
plymouth: Update to 0.9.0.
-----------------------------------------------------------------------
Summary of changes:
ddns/ddns.nm | 57 +++
grub/grub.nm | 5 +-
kernel/kernel.nm | 2 +-
...linux-3.14.25-rt5592_no_special_txop_init.patch | 13 +
ntp/ntp.nm | 40 +-
ntp/patches/ntp-4.2.4p7-getprecision.patch | 12 -
ntp/patches/ntp-4.2.6p1-cmsgalign.patch | 14 -
ntp/patches/ntp-4.2.6p1-linkfastmath.patch | 12 -
ntp/patches/ntp-4.2.6p1-logdefault.patch | 12 -
ntp/patches/ntp-4.2.6p1-retcode.patch | 12 -
ntp/patches/ntp-4.2.6p1-sleep.patch | 495 ---------------------
ntp/patches/ntp-4.2.6p2-multiopts.patch | 21 -
ntp/patches/ntp-4.2.6p3-bcast.patch | 93 ----
ntp/patches/ntp-4.2.6p3-broadcastdelay.patch | 31 --
ntp/patches/ntp-4.2.6p4-droproot.patch | 207 ---------
ntp/patches/ntp-4.2.6p4-htmldoc.patch | 76 ----
ntp/patches/ntp-4.2.6p4-mlock.patch | 140 ------
ntp/patches/ntp-4.2.6p4-rtnetlink.patch | 15 -
ntp/patches/ntp-4.2.6p5-delaycalib.patch | 12 -
ntp/patches/ntp-4.2.6p5-fipsmd5.patch | 47 --
...ymouth-0.9.0-everything-is-better-in-red.patch} | 12 +-
plymouth/plymouth-update-initrd | 2 -
plymouth/plymouth.nm | 29 +-
23 files changed, 91 insertions(+), 1268 deletions(-)
create mode 100644 ddns/ddns.nm
create mode 100644 kernel/patches/linux-3.14.25-rt5592_no_special_txop_init.patch
delete mode 100644 ntp/patches/ntp-4.2.4p7-getprecision.patch
delete mode 100644 ntp/patches/ntp-4.2.6p1-cmsgalign.patch
delete mode 100644 ntp/patches/ntp-4.2.6p1-linkfastmath.patch
delete mode 100644 ntp/patches/ntp-4.2.6p1-logdefault.patch
delete mode 100644 ntp/patches/ntp-4.2.6p1-retcode.patch
delete mode 100644 ntp/patches/ntp-4.2.6p1-sleep.patch
delete mode 100644 ntp/patches/ntp-4.2.6p2-multiopts.patch
delete mode 100644 ntp/patches/ntp-4.2.6p3-bcast.patch
delete mode 100644 ntp/patches/ntp-4.2.6p3-broadcastdelay.patch
delete mode 100644 ntp/patches/ntp-4.2.6p4-droproot.patch
delete mode 100644 ntp/patches/ntp-4.2.6p4-htmldoc.patch
delete mode 100644 ntp/patches/ntp-4.2.6p4-mlock.patch
delete mode 100644 ntp/patches/ntp-4.2.6p4-rtnetlink.patch
delete mode 100644 ntp/patches/ntp-4.2.6p5-delaycalib.patch
delete mode 100644 ntp/patches/ntp-4.2.6p5-fipsmd5.patch
rename plymouth/patches/{plymouth-0.8.0-everything-is-better-in-red.patch => plymouth-0.9.0-everything-is-better-in-red.patch} (52%)
delete mode 100644 plymouth/plymouth-update-initrd
Difference in files:
diff --git a/ddns/ddns.nm b/ddns/ddns.nm
new file mode 100644
index 0000000..cf5f94f
--- /dev/null
+++ b/ddns/ddns.nm
@@ -0,0 +1,57 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = ddns
+version = 005
+release = 1
+arch = noarch
+
+groups = System/Tools
+url = http://www.ipfire.org
+license = GPLv3
+summary = A python based dynamic DNS updater.
+
+description
+ ddns is a simple, extensible, cross-distribution, cross-platform dynamic DNS updater
+ written in Python.
+end
+
+source_dl = http://source.ipfire.org/releases/ddns/
+sources = %{thisapp}.tar.xz
+
+build
+ requires
+ autoconf
+ automake
+ gettext-devel
+ intltool
+ m4
+ end
+
+ configure_options += \
+ --prefix=%{prefix} \
+ --sysconfdir=%{sysconfdir}
+
+ prepare_cmds
+ ./autogen.sh
+ end
+
+ install_cmds
+ # Ship an empty configuration file.
+ touch %{BUILDROOT}%{sysconfdir}/%{name}/ddns.conf
+ end
+end
+
+packages
+ package %{name}
+ recommends
+ %{bindir}/nsupdate
+ end
+
+ configfiles
+ %{sysconfdir}/%{name}/ddns.conf
+ end
+ end
+end
diff --git a/grub/grub.nm b/grub/grub.nm
index 59893e2..b109a2a 100644
--- a/grub/grub.nm
+++ b/grub/grub.nm
@@ -5,7 +5,7 @@
name = grub
version = 2.00
-release = 4
+release = 5
sup_arches = x86_64 i686
groups = System/Boot
@@ -97,6 +97,9 @@ build
paxctl -mpes \
%{BUILDROOT}%{sbindir}/grub-bios-setup \
%{BUILDROOT}%{sbindir}/grub-probe
+
+ paxctl -mpex \
+ %{BUILDROOT}%{bindir}/grub-script-check
end
debuginfo_strict_build_id = false
diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index 9ad7578..eec42b0 100644
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
name = kernel
version = 3.17.4
-release = 1
+release = 2
thisapp = linux-%{version}
maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
diff --git a/kernel/patches/linux-3.14.25-rt5592_no_special_txop_init.patch b/kernel/patches/linux-3.14.25-rt5592_no_special_txop_init.patch
new file mode 100644
index 0000000..fe30c9e
--- /dev/null
+++ b/kernel/patches/linux-3.14.25-rt5592_no_special_txop_init.patch
@@ -0,0 +1,13 @@
+diff -Naur linux-3.14.25.org/drivers/net/wireless/rt2x00/rt2800lib.c linux-3.14.25/drivers/net/wireless/rt2x00/rt2800lib.c
+--- linux-3.14.25.org/drivers/net/wireless/rt2x00/rt2800lib.c 2014-11-21 18:23:44.000000000 +0100
++++ linux-3.14.25/drivers/net/wireless/rt2x00/rt2800lib.c 2014-12-03 11:30:58.813355413 +0100
+@@ -4847,7 +4847,8 @@
+ rt2x00_set_field32(®, TXOP_CTRL_CFG_EXT_CWMIN, 0);
+ rt2800_register_write(rt2x00dev, TXOP_CTRL_CFG, reg);
+
+- reg = rt2x00_rt(rt2x00dev, RT5592) ? 0x00000082 : 0x00000002;
++// reg = rt2x00_rt(rt2x00dev, RT5592) ? 0x00000082 : 0x00000002;
++ reg = 0x00000002;
+ rt2800_register_write(rt2x00dev, TXOP_HLDR_ET, reg);
+
+ rt2800_register_read(rt2x00dev, TX_RTS_CFG, ®);
diff --git a/ntp/ntp.nm b/ntp/ntp.nm
index 9c8bb56..ba72e62 100644
--- a/ntp/ntp.nm
+++ b/ntp/ntp.nm
@@ -4,9 +4,9 @@
###############################################################################
name = ntp
-version = %{ver_major}.6p5
+version = %{ver_major}.8
ver_major = 4.2
-release = 2
+release = 1
groups = System/Daemons
url = http://www.ntp.org/
@@ -61,9 +61,6 @@ build
make ${PARALLELISMFLAGS}
- sed -i 's|$ntpq = "ntpq"|$ntpq = "%{sbindir}/ntpq"|' scripts/ntptrace
- sed -i 's|ntpq -c |%{sbindir}/ntpq -c |' scripts/ntp-wait
-
# Build ntpstat.
make -C ntpstat-0.2
end
@@ -191,39 +188,6 @@ packages
end
end
- package %{name}-perl
- summary = NTP utilities written in Perl.
- description
- This package contains Perl scripts ntp-wait and ntptrace.
- end
- groups = Applications/System
-
- requires
- %{name} = %{thisver}
- end
-
- files
- %{sbindir}/ntp-wait
- %{sbindir}/ntptrace
- %{mandir}/man8/ntp-wait.8*
- %{mandir}/man8/ntptrace.8*
- %{unitdir}/ntp-wait.service
- end
-
- script preun
- systemctl --no-reload disable ntp-wait.service >/dev/null 2>&1 || :
- systemctl stop ntp-wait.service >/dev/null 2>&1 || :
- end
-
- script postun
- systemctl daemon-reload >/dev/null 2>&1 || :
- end
-
- script postup
- systemctl daemon-reload >/dev/null 2>&1 || :
- end
- end
-
package %{name}-devel
template DEVEL
end
diff --git a/ntp/patches/ntp-4.2.4p7-getprecision.patch b/ntp/patches/ntp-4.2.4p7-getprecision.patch
deleted file mode 100644
index ecf6def..0000000
--- a/ntp/patches/ntp-4.2.4p7-getprecision.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ntp-4.2.4p7/ntpd/ntp_proto.c.getprecision ntp-4.2.4p7/ntpd/ntp_proto.c
---- ntp-4.2.4p7/ntpd/ntp_proto.c.getprecision 2009-09-29 14:16:22.000000000 +0200
-+++ ntp-4.2.4p7/ntpd/ntp_proto.c 2009-09-29 14:18:13.000000000 +0200
-@@ -3099,7 +3099,7 @@ peer_unfit(
- /*
- * Find the precision of this particular machine
- */
--#define MINSTEP 100e-9 /* minimum clock increment (s) */
-+#define MINSTEP 10e-9 /* minimum clock increment (s) */
- #define MAXSTEP 20e-3 /* maximum clock increment (s) */
- #define MINLOOPS 5 /* minimum number of step samples */
-
diff --git a/ntp/patches/ntp-4.2.6p1-cmsgalign.patch b/ntp/patches/ntp-4.2.6p1-cmsgalign.patch
deleted file mode 100644
index 0e4b8cc..0000000
--- a/ntp/patches/ntp-4.2.6p1-cmsgalign.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up ntp-4.2.6p1/ntpd/ntp_io.c.cmsgalign ntp-4.2.6p1/ntpd/ntp_io.c
---- ntp-4.2.6p1/ntpd/ntp_io.c.cmsgalign 2010-03-04 18:28:53.000000000 +0100
-+++ ntp-4.2.6p1/ntpd/ntp_io.c 2010-03-04 18:30:34.000000000 +0100
-@@ -3194,8 +3194,8 @@ read_network_packet(
- msghdr.msg_namelen = fromlen;
- msghdr.msg_iov = &iovec;
- msghdr.msg_iovlen = 1;
-- msghdr.msg_control = (void *)&control;
-- msghdr.msg_controllen = sizeof(control);
-+ msghdr.msg_control = (void *)((long)(control + 7) & -8); /* align to 8 bytes */
-+ msghdr.msg_controllen = sizeof(control) - 8;
- msghdr.msg_flags = 0;
- rb->recv_length = recvmsg(fd, &msghdr, 0);
- #endif
diff --git a/ntp/patches/ntp-4.2.6p1-linkfastmath.patch b/ntp/patches/ntp-4.2.6p1-linkfastmath.patch
deleted file mode 100644
index 5a859d3..0000000
--- a/ntp/patches/ntp-4.2.6p1-linkfastmath.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ntp-4.2.6p1/ntpd/Makefile.in.linkfastmath ntp-4.2.6p1/ntpd/Makefile.in
---- ntp-4.2.6p1/ntpd/Makefile.in.linkfastmath 2010-02-09 11:19:25.000000000 +0100
-+++ ntp-4.2.6p1/ntpd/Makefile.in 2010-03-03 16:57:40.000000000 +0100
-@@ -365,7 +365,7 @@ man_MANS = $(srcdir)/ntpd.1
- # sqrt ntp_control.o
- # floor refclock_wwv.o
- # which are (usually) provided by -lm.
--ntpd_LDADD = $(LDADD) $(LIBOPTS_LDADD) ../libntp/libntp.a -lm @LCRYPTO@ @LSCF@
-+ntpd_LDADD = $(LDADD) $(LIBOPTS_LDADD) ../libntp/libntp.a -lm -ffast-math @LCRYPTO@ @LSCF@
- ntpdsim_LDADD = $(LDADD) $(LIBOPTS_LDADD) ../libntp/libntpsim.a -lm @LCRYPTO@ @LSCF@
- ntpdsim_CFLAGS = $(CFLAGS) -DSIM
- check_y2k_LDADD = $(LDADD) ../libntp/libntp.a
diff --git a/ntp/patches/ntp-4.2.6p1-logdefault.patch b/ntp/patches/ntp-4.2.6p1-logdefault.patch
deleted file mode 100644
index ae816b7..0000000
--- a/ntp/patches/ntp-4.2.6p1-logdefault.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ntp-4.2.6p1/ntpd/ntp_config.c.logdefault ntp-4.2.6p1/ntpd/ntp_config.c
---- ntp-4.2.6p1/ntpd/ntp_config.c.logdefault 2010-01-24 11:01:45.000000000 +0100
-+++ ntp-4.2.6p1/ntpd/ntp_config.c 2010-03-09 17:44:09.000000000 +0100
-@@ -3794,7 +3794,7 @@ getconfig(
-
- #endif /* SYS_WINNT */
- res_fp = NULL;
-- ntp_syslogmask = NLOG_SYNCMASK; /* set more via logconfig */
-+ ntp_syslogmask = NLOG_SYNCMASK | NLOG_EVENT | NLOG_STATUS; /* set more via logconfig */
-
- /*
- * install a non default variable with this daemon version
diff --git a/ntp/patches/ntp-4.2.6p1-retcode.patch b/ntp/patches/ntp-4.2.6p1-retcode.patch
deleted file mode 100644
index 6d676d2..0000000
--- a/ntp/patches/ntp-4.2.6p1-retcode.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ntp-4.2.6p1/ntpd/ntp_proto.c.retcode ntp-4.2.6p1/ntpd/ntp_proto.c
---- ntp-4.2.6p1/ntpd/ntp_proto.c.retcode 2009-12-09 08:36:36.000000000 +0100
-+++ ntp-4.2.6p1/ntpd/ntp_proto.c 2010-03-03 16:06:00.000000000 +0100
-@@ -269,7 +269,7 @@ transmit(
- "ntpd: no servers found");
- printf(
- "ntpd: no servers found\n");
-- exit (0);
-+ exit (1);
- }
- }
- }
diff --git a/ntp/patches/ntp-4.2.6p1-sleep.patch b/ntp/patches/ntp-4.2.6p1-sleep.patch
deleted file mode 100644
index 577ef26..0000000
--- a/ntp/patches/ntp-4.2.6p1-sleep.patch
+++ /dev/null
@@ -1,495 +0,0 @@
-diff -up ntp-4.2.6p1/include/ntp_refclock.h.sleep ntp-4.2.6p1/include/ntp_refclock.h
---- ntp-4.2.6p1/include/ntp_refclock.h.sleep 2009-12-09 08:36:35.000000000 +0100
-+++ ntp-4.2.6p1/include/ntp_refclock.h 2010-03-10 19:27:46.000000000 +0100
-@@ -260,6 +260,7 @@ extern void refclock_control (sockaddr_u
- struct refclockstat *);
- extern int refclock_open (char *, u_int, u_int);
- extern int refclock_setup (int, u_int, u_int);
-+extern int refclock_timer_needed (struct peer *);
- extern void refclock_timer (struct peer *);
- extern void refclock_transmit (struct peer *);
- extern int refclock_ioctl (int, u_int);
-diff -up ntp-4.2.6p1/include/ntp_stdlib.h.sleep ntp-4.2.6p1/include/ntp_stdlib.h
---- ntp-4.2.6p1/include/ntp_stdlib.h.sleep 2009-12-09 08:36:35.000000000 +0100
-+++ ntp-4.2.6p1/include/ntp_stdlib.h 2010-03-10 19:27:46.000000000 +0100
-@@ -116,6 +116,7 @@ extern const char * FindConfig (const ch
- extern void signal_no_reset (int, RETSIGTYPE (*func)(int));
-
- extern void getauthkeys (const char *);
-+extern int auth_agekeys_needed (void);
- extern void auth_agekeys (void);
- extern void rereadkeys (void);
-
-diff -up ntp-4.2.6p1/include/ntpd.h.sleep ntp-4.2.6p1/include/ntpd.h
---- ntp-4.2.6p1/include/ntpd.h.sleep 2009-12-09 08:36:35.000000000 +0100
-+++ ntp-4.2.6p1/include/ntpd.h 2010-03-10 19:27:46.000000000 +0100
-@@ -112,8 +112,10 @@ extern void block_io_and_alarm (void);
- /* ntp_loopfilter.c */
- extern void init_loopfilter(void);
- extern int local_clock(struct peer *, double);
--extern void adj_host_clock(void);
-+extern int adj_host_clock_needed(void);
-+extern void adj_host_clock(int);
- extern void loop_config(int, double);
-+extern int huffpuff_enabled(void);
- extern void huffpuff(void);
- extern u_long sys_clocktime;
- extern u_int sys_tai;
-@@ -219,6 +221,8 @@ extern void hack_restrict (int, sockaddr
- /* ntp_timer.c */
- extern void init_timer (void);
- extern void reinit_timer (void);
-+extern double get_timeout (l_fp *);
-+extern int timer_elapsed (l_fp, int);
- extern void timer (void);
- extern void timer_clr_stats (void);
- extern void timer_interfacetimeout (u_long);
-diff -up ntp-4.2.6p1/libntp/authkeys.c.sleep ntp-4.2.6p1/libntp/authkeys.c
---- ntp-4.2.6p1/libntp/authkeys.c.sleep 2009-12-09 08:36:35.000000000 +0100
-+++ ntp-4.2.6p1/libntp/authkeys.c 2010-03-10 19:27:46.000000000 +0100
-@@ -445,6 +445,25 @@ auth_delkeys(void)
- }
- }
-
-+int
-+auth_agekeys_needed(void) {
-+ struct savekey *sk;
-+ int i;
-+
-+ if (authnumkeys > 20)
-+ return 1;
-+
-+ for (i = 0; i < HASHSIZE; i++) {
-+ sk = key_hash[i];
-+ while (sk != 0) {
-+ if (sk->lifetime > 0)
-+ return 1;
-+ sk = sk->next;
-+ }
-+ }
-+ return 0;
-+}
-+
- /*
- * auth_agekeys - delete keys whose lifetimes have expired
- */
-diff -up ntp-4.2.6p1/ntpd/ntp_loopfilter.c.sleep ntp-4.2.6p1/ntpd/ntp_loopfilter.c
---- ntp-4.2.6p1/ntpd/ntp_loopfilter.c.sleep 2009-12-09 08:36:36.000000000 +0100
-+++ ntp-4.2.6p1/ntpd/ntp_loopfilter.c 2010-03-10 19:27:46.000000000 +0100
-@@ -677,6 +677,13 @@ local_clock(
- #endif /* LOCKCLOCK */
- }
-
-+int
-+adj_host_clock_needed(void)
-+{
-+ return !(!ntp_enable || mode_ntpdate || (pll_control &&
-+ kern_enable));
-+}
-+
-
- /*
- * adj_host_clock - Called once every second to update the local clock.
-@@ -686,7 +693,7 @@ local_clock(
- */
- void
- adj_host_clock(
-- void
-+ int time_elapsed
- )
- {
- double adjustment;
-@@ -698,7 +705,7 @@ adj_host_clock(
- * since the poll interval can exceed one day, the old test
- * would be counterproductive.
- */
-- sys_rootdisp += clock_phi;
-+ sys_rootdisp += clock_phi * time_elapsed;
-
- #ifndef LOCKCLOCK
- /*
-@@ -819,6 +826,12 @@ set_freq(
- #endif /* KERNEL_PLL */
- }
-
-+int
-+huffpuff_enabled(void)
-+{
-+ return sys_huffpuff != NULL;
-+}
-+
- /*
- * huff-n'-puff filter
- */
-diff -up ntp-4.2.6p1/ntpd/ntp_refclock.c.sleep ntp-4.2.6p1/ntpd/ntp_refclock.c
---- ntp-4.2.6p1/ntpd/ntp_refclock.c.sleep 2009-12-09 08:36:36.000000000 +0100
-+++ ntp-4.2.6p1/ntpd/ntp_refclock.c 2010-03-10 19:27:46.000000000 +0100
-@@ -268,6 +268,21 @@ refclock_unpeer(
- }
-
-
-+int
-+refclock_timer_needed(
-+ struct peer *peer /* peer structure pointer */
-+ )
-+{
-+ u_char clktype;
-+ int unit;
-+
-+ clktype = peer->refclktype;
-+ unit = peer->refclkunit;
-+ if (refclock_conf[clktype]->clock_timer != noentry)
-+ return 1;
-+ return 0;
-+}
-+
- /*
- * refclock_timer - called once per second for housekeeping.
- */
-diff -up ntp-4.2.6p1/ntpd/ntp_timer.c.sleep ntp-4.2.6p1/ntpd/ntp_timer.c
---- ntp-4.2.6p1/ntpd/ntp_timer.c.sleep 2009-12-09 08:36:35.000000000 +0100
-+++ ntp-4.2.6p1/ntpd/ntp_timer.c 2010-03-11 15:23:59.000000000 +0100
-@@ -56,7 +56,6 @@ static u_long adjust_timer; /* second ti
- static u_long stats_timer; /* stats timer */
- static u_long huffpuff_timer; /* huff-n'-puff timer */
- u_long leapsec; /* leapseconds countdown */
--l_fp sys_time; /* current system time */
- #ifdef OPENSSL
- static u_long revoke_timer; /* keys revoke timer */
- static u_long keys_timer; /* session key timer */
-@@ -74,6 +73,12 @@ volatile u_long alarm_overflow;
- #define DAY (24 * HOUR)
-
- u_long current_time; /* seconds since startup */
-+l_fp timer_base;
-+int time_elapsed;
-+
-+#define TIMEOUT_TS_SIZE 2
-+l_fp timeout_ts[TIMEOUT_TS_SIZE];
-+unsigned int timeout_ts_index;
-
- /*
- * Stats. Number of overflows and number of calls to transmit().
-@@ -110,6 +115,8 @@ static RETSIGTYPE alarming (int);
- void
- reinit_timer(void)
- {
-+ get_systime(&timer_base);
-+#if 0
- #if !defined(SYS_WINNT) && !defined(VMS)
- # if defined(HAVE_TIMER_CREATE) && defined(HAVE_TIMER_SETTIME)
- timer_gettime(ntpd_timerid, &itimer);
-@@ -143,6 +150,7 @@ reinit_timer(void)
- setitimer(ITIMER_REAL, &itimer, (struct itimerval *)0);
- # endif
- # endif /* VMS */
-+#endif
- }
-
- /*
-@@ -165,6 +173,12 @@ init_timer(void)
- timer_xmtcalls = 0;
- timer_timereset = 0;
-
-+ get_systime(&timer_base);
-+
-+ for (timeout_ts_index = 0; timeout_ts_index < TIMEOUT_TS_SIZE; timeout_ts_index++)
-+ L_CLR(&timeout_ts[timeout_ts_index]);
-+ timeout_ts_index = 0;
-+#if 0
- #if !defined(SYS_WINNT)
- /*
- * Set up the alarm interrupt. The first comes 2**EVENT_TIMEOUT
-@@ -226,6 +240,7 @@ init_timer(void)
- }
-
- #endif /* SYS_WINNT */
-+#endif
- }
-
- #if defined(SYS_WINNT)
-@@ -236,6 +251,104 @@ get_timer_handle(void)
- }
- #endif
-
-+double
-+get_timeout(l_fp *now)
-+{
-+ register struct peer *peer, *next_peer;
-+ u_int n;
-+ double r;
-+ int next;
-+ l_fp ts;
-+
-+ ts = *now;
-+ L_SUB(&ts, &timeout_ts[timeout_ts_index]);
-+ timeout_ts[timeout_ts_index] = *now;
-+ timeout_ts_index = (timeout_ts_index + 1) % TIMEOUT_TS_SIZE;
-+
-+ /* don't waste CPU time if called too frequently */
-+ if (ts.l_ui == 0) {
-+ next = 1;
-+ goto finish;
-+ }
-+
-+ next = current_time + HOUR;
-+
-+ if (adj_host_clock_needed()) {
-+ next = 1;
-+ goto finish;
-+ }
-+ for (n = 0; n < NTP_HASH_SIZE; n++) {
-+ for (peer = peer_hash[n]; peer != 0; peer = next_peer) {
-+ next_peer = peer->next;
-+#ifdef REFCLOCK
-+ if (peer->flags & FLAG_REFCLOCK && refclock_timer_needed(peer)) {
-+ next = 1;
-+ goto finish;
-+ }
-+#endif /* REFCLOCK */
-+ if (peer->action)
-+ next = min(next, peer->nextaction);
-+ next = min(next, peer->nextdate);
-+ }
-+ }
-+
-+ if (leapsec > 0)
-+ next = min(next, leapsec);
-+
-+ if (huffpuff_enabled())
-+ next = min(next, huffpuff_timer);
-+
-+#ifdef OPENSSL
-+ if (auth_agekeys_needed())
-+ next = min(next, keys_timer);
-+ if (sys_leap != LEAP_NOTINSYNC)
-+ next = min(next, revoke_timer);
-+#endif /* OPENSSL */
-+
-+ if (interface_interval)
-+ next = min(next, interface_timer);
-+
-+ next = min(next, stats_timer);
-+
-+ next -= current_time;
-+ if (next <= 0)
-+ next = 1;
-+finish:
-+ ts = timer_base;
-+ ts.l_ui += next;
-+ L_SUB(&ts, now);
-+ LFPTOD(&ts, r);
-+#ifdef DEBUG
-+ DPRINTF(2, ("timer: timeout %f\n", r));
-+#endif
-+
-+ return r;
-+}
-+
-+int
-+timer_elapsed(l_fp now, int timeout)
-+{
-+ int elapsed;
-+
-+ L_SUB(&now, &timer_base);
-+ elapsed = now.l_i;
-+ if (elapsed < 0 || elapsed > timeout + 10) {
-+#ifdef DEBUG
-+ DPRINTF(2, ("timer: unexpected time jump\n"));
-+#endif
-+ elapsed = 0;
-+ reinit_timer();
-+
-+ }
-+ timer_base.l_ui += elapsed;
-+ time_elapsed += elapsed;
-+ current_time += elapsed;
-+#ifdef DEBUG
-+ DPRINTF(2, ("timer: time elapsed %d\n", time_elapsed));
-+#endif
-+ return time_elapsed;
-+}
-+
- /*
- * timer - event timer
- */
-@@ -251,11 +364,9 @@ timer(void)
- * kiss-o'-deatch function and implement the association
- * polling function..
- */
-- current_time++;
-- get_systime(&sys_time);
- if (adjust_timer <= current_time) {
-- adjust_timer += 1;
-- adj_host_clock();
-+ adjust_timer += time_elapsed;
-+ adj_host_clock(time_elapsed);
- #ifdef REFCLOCK
- for (n = 0; n < NTP_HASH_SIZE; n++) {
- for (peer = peer_hash[n]; peer != 0; peer = next_peer) {
-@@ -286,7 +397,7 @@ timer(void)
- * 128 s or less.
- */
- if (peer->throttle > 0)
-- peer->throttle--;
-+ peer->throttle -= min(peer->throttle, time_elapsed);
- if (peer->nextdate <= current_time) {
- #ifdef REFCLOCK
- if (peer->flags & FLAG_REFCLOCK)
-@@ -333,7 +444,7 @@ timer(void)
- * set.
- */
- if (leapsec > 0) {
-- leapsec--;
-+ leapsec -= min(leapsec, time_elapsed);
- if (leapsec == 0) {
- sys_leap = LEAP_NOWARNING;
- sys_tai = leap_tai;
-@@ -398,11 +509,15 @@ timer(void)
- * Finally, write hourly stats.
- */
- if (stats_timer <= current_time) {
-+ l_fp sys_time;
-+ get_systime(&sys_time);
- stats_timer += HOUR;
- write_stats();
- if (sys_tai != 0 && sys_time.l_ui > leap_expire)
- report_event(EVNT_LEAPVAL, NULL, NULL);
- }
-+
-+ time_elapsed = 0;
- }
-
-
-diff -up ntp-4.2.6p1/ntpd/ntpd.c.sleep ntp-4.2.6p1/ntpd/ntpd.c
---- ntp-4.2.6p1/ntpd/ntpd.c.sleep 2010-03-10 19:27:46.000000000 +0100
-+++ ntp-4.2.6p1/ntpd/ntpd.c 2010-03-10 19:27:46.000000000 +0100
-@@ -195,8 +195,6 @@ extern const char *Version;
-
- char const *progname;
-
--int was_alarmed;
--
- #ifdef DECL_SYSCALL
- /*
- * We put this here, since the argument profile is syscall-specific
-@@ -1033,7 +1031,7 @@ getgroup:
- #else /* normal I/O */
-
- BLOCK_IO_AND_ALARM();
-- was_alarmed = 0;
-+
- for (;;)
- {
- # if !defined(HAVE_SIGNALED_IO)
-@@ -1041,42 +1039,39 @@ getgroup:
- extern int maxactivefd;
-
- fd_set rdfdes;
-- int nfound;
--# endif
-+ int nfound, time_elapsed;
-
-- if (alarm_flag) /* alarmed? */
-- {
-- was_alarmed = 1;
-- alarm_flag = 0;
-- }
-+ time_elapsed = 0;
-+# endif
-
-- if (!was_alarmed && has_full_recv_buffer() == ISC_FALSE)
-+ if (has_full_recv_buffer() == ISC_FALSE)
- {
- /*
- * Nothing to do. Wait for something.
- */
- # ifndef HAVE_SIGNALED_IO
-+ double timeout;
-+
- rdfdes = activefds;
--# if defined(VMS) || defined(SYS_VXWORKS)
-- /* make select() wake up after one second */
-- {
-- struct timeval t1;
-+ get_systime(&now);
-+ timeout = get_timeout(&now);
-
-- t1.tv_sec = 1; t1.tv_usec = 0;
-+ if (timeout > 0.0) {
-+ struct timeval t1;
-+
-+ t1.tv_sec = timeout;
-+ t1.tv_usec = (timeout - t1.tv_sec) * 1000000;
- nfound = select(maxactivefd+1, &rdfdes, (fd_set *)0,
- (fd_set *)0, &t1);
-- }
--# else
-- nfound = select(maxactivefd+1, &rdfdes, (fd_set *)0,
-- (fd_set *)0, (struct timeval *)0);
--# endif /* VMS */
-- if (nfound > 0)
-- {
-- l_fp ts;
-+ get_systime(&now);
-+ } else
-+ nfound = 0;
-
-- get_systime(&ts);
-+ time_elapsed = timer_elapsed(now, timeout);
-
-- (void)input_handler(&ts);
-+ if (nfound > 0)
-+ {
-+ (void)input_handler(&now);
- }
- else if (nfound == -1 && errno != EINTR)
- msyslog(LOG_ERR, "select() error: %m");
-@@ -1085,17 +1080,13 @@ getgroup:
- msyslog(LOG_DEBUG, "select(): nfound=%d, error: %m", nfound);
- # endif /* DEBUG */
- # else /* HAVE_SIGNALED_IO */
-+# error not supported by sleep patch
-
- wait_for_signal();
- # endif /* HAVE_SIGNALED_IO */
-- if (alarm_flag) /* alarmed? */
-- {
-- was_alarmed = 1;
-- alarm_flag = 0;
-- }
- }
-
-- if (was_alarmed)
-+ if (time_elapsed > 0)
- {
- UNBLOCK_IO_AND_ALARM();
- /*
-@@ -1103,7 +1094,6 @@ getgroup:
- * to process expiry.
- */
- timer();
-- was_alarmed = 0;
- BLOCK_IO_AND_ALARM();
- }
-
-@@ -1121,19 +1111,8 @@ getgroup:
- rbuf = get_full_recv_buffer();
- while (rbuf != NULL)
- {
-- if (alarm_flag)
-- {
-- was_alarmed = 1;
-- alarm_flag = 0;
-- }
- UNBLOCK_IO_AND_ALARM();
-
-- if (was_alarmed)
-- { /* avoid timer starvation during lengthy I/O handling */
-- timer();
-- was_alarmed = 0;
-- }
--
- /*
- * Call the data procedure to handle each received
- * packet.
diff --git a/ntp/patches/ntp-4.2.6p2-multiopts.patch b/ntp/patches/ntp-4.2.6p2-multiopts.patch
deleted file mode 100644
index c4ea459..0000000
--- a/ntp/patches/ntp-4.2.6p2-multiopts.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up ntp-4.2.6p2/ntpd/ntpd-opts.c.multiopts ntp-4.2.6p2/ntpd/ntpd-opts.c
---- ntp-4.2.6p2/ntpd/ntpd-opts.c.multiopts 2010-09-15 17:37:10.000000000 +0200
-+++ ntp-4.2.6p2/ntpd/ntpd-opts.c 2010-10-01 13:28:49.000000000 +0200
-@@ -755,7 +755,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
- { /* entry idx, value */ 18, VALUE_OPT_PIDFILE,
- /* equiv idx, value */ 18, VALUE_OPT_PIDFILE,
- /* equivalenced to */ NO_EQUIVALENT,
-- /* min, max, act ct */ 0, 1, 0,
-+ /* min, max, act ct */ 0, 2, 0,
- /* opt state flags */ PIDFILE_FLAGS, 0,
- /* last opt argumnt */ { NULL },
- /* arg list/cookie */ NULL,
-@@ -839,7 +839,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
- { /* entry idx, value */ 25, VALUE_OPT_USER,
- /* equiv idx, value */ 25, VALUE_OPT_USER,
- /* equivalenced to */ NO_EQUIVALENT,
-- /* min, max, act ct */ 0, 1, 0,
-+ /* min, max, act ct */ 0, 2, 0,
- /* opt state flags */ USER_FLAGS, 0,
- /* last opt argumnt */ { NULL },
- /* arg list/cookie */ NULL,
diff --git a/ntp/patches/ntp-4.2.6p3-bcast.patch b/ntp/patches/ntp-4.2.6p3-bcast.patch
deleted file mode 100644
index 57581f3..0000000
--- a/ntp/patches/ntp-4.2.6p3-bcast.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -up ntp-4.2.6p3/ntpd/ntp_io.c.bcast ntp-4.2.6p3/ntpd/ntp_io.c
---- ntp-4.2.6p3/ntpd/ntp_io.c.bcast 2010-12-25 10:40:36.000000000 +0100
-+++ ntp-4.2.6p3/ntpd/ntp_io.c 2011-01-05 17:46:13.820049150 +0100
-@@ -151,6 +151,8 @@ int ninterfaces; /* Total number of in
-
- int disable_dynamic_updates; /* scan interfaces once only */
-
-+static int pktinfo_status = 0; /* is IP_PKTINFO on wildipv4 iface enabled? */
-+
- #ifdef REFCLOCK
- /*
- * Refclock stuff. We keep a chain of structures with data concerning
-@@ -2254,6 +2256,17 @@ set_reuseaddr(
- #endif /* ! SO_EXCLUSIVEADDRUSE */
- }
-
-+static void
-+set_pktinfo(int flag)
-+{
-+ if (wildipv4 == NULL)
-+ return;
-+ if (setsockopt(wildipv4->fd, SOL_IP, IP_PKTINFO, &flag, sizeof (flag))) {
-+ msyslog(LOG_ERR, "set_pktinfo: setsockopt(IP_PKTINFO, %s) failed: %m", flag ? "on" : "off");
-+ } else
-+ pktinfo_status = flag;
-+}
-+
- /*
- * This is just a wrapper around an internal function so we can
- * make other changes as necessary later on
-@@ -2659,6 +2672,7 @@ io_setbclient(void)
- }
- }
- set_reuseaddr(0);
-+ set_pktinfo(1);
- if (nif > 0)
- DPRINTF(1, ("io_setbclient: Opened broadcast clients\n"));
- else if (!nif)
-@@ -2685,6 +2699,7 @@ io_unsetbclient(void)
- continue;
- socket_broadcast_disable(ep, &ep->sin);
- }
-+ set_pktinfo(0);
- }
-
- /*
-@@ -3392,7 +3407,8 @@ read_network_packet(
- #ifdef HAVE_TIMESTAMP
- struct msghdr msghdr;
- struct iovec iovec;
-- char control[TIMESTAMP_CTLMSGBUF_SIZE];
-+ char control[sizeof (struct cmsghdr) * 2 + sizeof (struct timeval) +
-+ sizeof (struct in_pktinfo) + 32];
- #endif
-
- /*
-@@ -3403,7 +3419,7 @@ read_network_packet(
- */
-
- rb = get_free_recv_buffer();
-- if (NULL == rb || itf->ignore_packets) {
-+ if (NULL == rb || (itf->ignore_packets && !(pktinfo_status && itf == wildipv4))) {
- char buf[RX_BUFF_SIZE];
- sockaddr_u from;
-
-@@ -3463,6 +3479,27 @@ read_network_packet(
- return (buflen);
- }
-
-+ if (pktinfo_status && itf->ignore_packets && itf == wildipv4) {
-+ /* check for broadcast on 255.255.255.255, exception allowed on wildipv4 */
-+ struct cmsghdr *cmsg;
-+ struct in_pktinfo *pktinfo = NULL;
-+
-+ if ((cmsg = CMSG_FIRSTHDR(&msghdr)))
-+ do {
-+ if (cmsg->cmsg_level == SOL_IP && cmsg->cmsg_type == IP_PKTINFO)
-+ pktinfo = (struct in_pktinfo *) CMSG_DATA(cmsg);
-+ } while ((cmsg = CMSG_NXTHDR(&msghdr, cmsg)));
-+ if (pktinfo && pktinfo->ipi_addr.s_addr == INADDR_BROADCAST) {
-+ DPRINTF(4, ("INADDR_BROADCAST\n"));
-+ } else {
-+ DPRINTF(4, ("%s on (%lu) fd=%d from %s\n", "ignore",
-+ free_recvbuffs(), fd, stoa(&rb->recv_srcadr)));
-+ packets_ignored++;
-+ freerecvbuf(rb);
-+ return (buflen);
-+ }
-+ }
-+
- DPRINTF(3, ("read_network_packet: fd=%d length %d from %s\n",
- fd, buflen, stoa(&rb->recv_srcadr)));
-
diff --git a/ntp/patches/ntp-4.2.6p3-broadcastdelay.patch b/ntp/patches/ntp-4.2.6p3-broadcastdelay.patch
deleted file mode 100644
index f9c1929..0000000
--- a/ntp/patches/ntp-4.2.6p3-broadcastdelay.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-==== ntpd/ntp_proto.c ====
-2010-10-22 01:55:45-04:00, stenn(a)deacon.udel.edu +2 -5
- [Bug 1670] Fix peer->bias and broadcastdelay
-
---- 1.307/ntpd/ntp_proto.c 2010-10-11 21:06:05 -07:00
-+++ 1.308/ntpd/ntp_proto.c 2010-10-21 22:55:45 -07:00
-@@ -929,7 +929,6 @@ receive(
-
- } else {
- peer->delay = sys_bdelay;
-- peer->bias = -sys_bdelay / 2.;
- }
- break;
- }
-@@ -1570,7 +1569,6 @@ process_packet(
- p_del = fabs(t21 - t34);
- p_offset = (t21 + t34) / 2.;
- }
-- p_offset += peer->bias;
- p_disp = LOGTOD(sys_precision) + LOGTOD(peer->precision) +
- clock_phi * p_del;
-
-@@ -1647,7 +1645,7 @@ process_packet(
- /*
- * That was awesome. Now hand off to the clock filter.
- */
-- clock_filter(peer, p_offset, p_del, p_disp);
-+ clock_filter(peer, p_offset + peer->bias, p_del, p_disp);
-
- /*
- * If we are in broadcast calibrate mode, return to broadcast
diff --git a/ntp/patches/ntp-4.2.6p4-droproot.patch b/ntp/patches/ntp-4.2.6p4-droproot.patch
deleted file mode 100644
index 1d953d1..0000000
--- a/ntp/patches/ntp-4.2.6p4-droproot.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-diff -up ntp-4.2.6p4/html/ntpdate.html.droproot ntp-4.2.6p4/html/ntpdate.html
---- ntp-4.2.6p4/html/ntpdate.html.droproot 2011-07-11 04:18:25.000000000 +0200
-+++ ntp-4.2.6p4/html/ntpdate.html 2011-10-05 15:47:29.643634928 +0200
-@@ -18,7 +18,7 @@
- <hr>
- <p>Disclaimer: The functionality of this program is now available in the <tt>ntpd</tt> program. See the <tt>-q</tt> command line option in the <a href="ntpd.html"><tt>ntpd</tt> - Network Time Protocol (NTP) daemon</a> page. After a suitable period of mourning, the <tt>ntpdate</tt> program is to be retired from this distribution</p>
- <h4>Synopsis</h4>
-- <tt>ntpdate [ -46bBdqsuv ] [ -a <i>key</i> ] [ -e <i>authdelay</i> ] [ -k <i>keyfile</i> ] [ -o <i>version</i> ] [ -p <i>samples</i> ] [ -t <i>timeout</i> ] <i>server</i> [ ... ]</tt>
-+ <tt>ntpdate [ -46bBdqsuv ] [ -a <i>key</i> ] [ -e <i>authdelay</i> ] [ -k <i>keyfile</i> ] [ -o <i>version</i> ] [ -p <i>samples</i> ] [ -t <i>timeout</i> ] [ -U <i>user_name</i> ] <i>server</i> [ ... ]</tt>
- <h4>Description</h4>
- <p><tt>ntpdate</tt> sets the local date and time by polling the Network Time Protocol (NTP) server(s) given as the <i>server</i> arguments to determine the correct time. It must be run as root on the local host. A number of samples are obtained from each of the servers specified and a subset of the NTP clock filter and selection algorithms are applied to select the best of these. Note that the accuracy and reliability of <tt>ntpdate</tt> depends on the number of servers, the number of polls each time it is run and the interval between runs.</p>
- <p><tt>ntpdate</tt> can be run manually as necessary to set the host clock, or it can be run from the host startup script to set the clock at boot time. This is useful in some cases to set the clock initially before starting the NTP daemon <tt>ntpd</tt>. It is also possible to run <tt>ntpdate</tt> from a <tt>cron</tt> script. However, it is important to note that <tt>ntpdate</tt> with contrived <tt>cron</tt> scripts is no substitute for the NTP daemon, which uses sophisticated algorithms to maximize accuracy and reliability while minimizing resource use. Finally, since <tt>ntpdate</tt> does not discipline the host clock frequency as does <tt>ntpd</tt>, the accuracy using <tt>ntpdate</tt> is limited.</p>
-@@ -58,6 +58,10 @@
- <dd>Direct <tt>ntpdate</tt> to use an unprivileged port for outgoing packets. This is most useful when behind a firewall that blocks incoming traffic to privileged ports, and you want to synchronize with hosts beyond the firewall. Note that the <tt>-d</tt> option always uses unprivileged ports.
- <dt><tt>-<i>v</i></tt>
- <dd>Be verbose. This option will cause <tt>ntpdate</tt>'s version identification string to be logged.
-+ <dt><tt>-U <i>user_name</i></tt></dt>
-+ <dd>ntpdate process drops root privileges and changes user ID to
-+ <i>user_name</i> and group ID to the primary group of
-+ <i>server_user</i>.
- </dl>
- <h4>Diagnostics</h4>
- <tt>ntpdate</tt>'s exit status is zero if it finds a server and updates the clock, and nonzero otherwise.
-diff -up ntp-4.2.6p4/ntpdate/ntpdate.c.droproot ntp-4.2.6p4/ntpdate/ntpdate.c
---- ntp-4.2.6p4/ntpdate/ntpdate.c.droproot 2011-05-25 07:06:09.000000000 +0200
-+++ ntp-4.2.6p4/ntpdate/ntpdate.c 2011-10-05 15:45:39.570555972 +0200
-@@ -49,6 +49,12 @@
-
- #include <arpa/inet.h>
-
-+/* Linux capabilities */
-+#include <sys/capability.h>
-+#include <sys/prctl.h>
-+#include <pwd.h>
-+#include <grp.h>
-+
- #ifdef SYS_VXWORKS
- # include "ioLib.h"
- # include "sockLib.h"
-@@ -153,6 +159,11 @@ int simple_query = 0;
- int unpriv_port = 0;
-
- /*
-+ * Use capabilities to drop privileges and switch uids
-+ */
-+char *server_user;
-+
-+/*
- * Program name.
- */
- char *progname;
-@@ -294,6 +305,88 @@ void clear_globals()
- static ni_namelist *getnetinfoservers (void);
- #endif
-
-+/* This patch is adapted (copied) from Chris Wings drop root patch
-+ * for xntpd.
-+ */
-+void drop_root(uid_t server_uid, gid_t server_gid)
-+{
-+ cap_t caps;
-+
-+ if (prctl(PR_SET_KEEPCAPS, 1)) {
-+ if (syslogit) {
-+ msyslog(LOG_ERR, "prctl(PR_SET_KEEPCAPS, 1) failed");
-+ }
-+ else {
-+ fprintf(stderr, "prctl(PR_SET_KEEPCAPS, 1) failed.\n");
-+ }
-+ exit(1);
-+ }
-+
-+ if ( setgroups(0, NULL) == -1 ) {
-+ if (syslogit) {
-+ msyslog(LOG_ERR, "setgroups failed.");
-+ }
-+ else {
-+ fprintf(stderr, "setgroups failed.\n");
-+ }
-+ exit(1);
-+ }
-+
-+ if ( setegid(server_gid) == -1 || seteuid(server_uid) == -1 ) {
-+ if (syslogit) {
-+ msyslog(LOG_ERR, "setegid/seteuid to uid=%d/gid=%d failed.", server_uid,
-+ server_gid);
-+ }
-+ else {
-+ fprintf(stderr, "setegid/seteuid to uid=%d/gid=%d failed.\n", server_uid,
-+ server_gid);
-+ }
-+ exit(1);
-+ }
-+
-+ caps = cap_from_text("cap_sys_time=epi");
-+ if (caps == NULL) {
-+ if (syslogit) {
-+ msyslog(LOG_ERR, "cap_from_text failed.");
-+ }
-+ else {
-+ fprintf(stderr, "cap_from_text failed.\n");
-+ }
-+ exit(1);
-+ }
-+
-+ if (cap_set_proc(caps) == -1) {
-+ if (syslogit) {
-+ msyslog(LOG_ERR, "cap_set_proc failed.");
-+ }
-+ else {
-+ fprintf(stderr, "cap_set_proc failed.\n");
-+ }
-+ exit(1);
-+ }
-+
-+ /* Try to free the memory from cap_from_text */
-+ cap_free( caps );
-+
-+ if ( setregid(server_gid, server_gid) == -1 ||
-+ setreuid(server_uid, server_uid) == -1 ) {
-+ if (syslogit) {
-+ msyslog(LOG_ERR, "setregid/setreuid to uid=%d/gid=%d failed.",
-+ server_uid, server_gid);
-+ }
-+ else {
-+ fprintf(stderr, "setregid/setreuid to uid=%d/gid=%d failed.\n",
-+ server_uid, server_gid);
-+ }
-+ exit(1);
-+ }
-+
-+ if (syslogit) {
-+ msyslog(LOG_DEBUG, "running as uid(%d)/gid(%d) euid(%d)/egid(%d).",
-+ getuid(), getgid(), geteuid(), getegid());
-+ }
-+}
-+
- /*
- * Main program. Initialize us and loop waiting for I/O and/or
- * timer expiries.
-@@ -341,6 +434,8 @@ ntpdatemain (
-
- init_lib(); /* sets up ipv4_works, ipv6_works */
-
-+ server_user = NULL;
-+
- /* Check to see if we have IPv6. Otherwise default to IPv4 */
- if (!ipv6_works)
- ai_fam_templ = AF_INET;
-@@ -352,7 +447,7 @@ ntpdatemain (
- /*
- * Decode argument list
- */
-- while ((c = ntp_getopt(argc, argv, "46a:bBde:k:o:p:qst:uv")) != EOF)
-+ while ((c = ntp_getopt(argc, argv, "46a:bBde:k:o:p:qst:uvU:")) != EOF)
- switch (c)
- {
- case '4':
-@@ -429,6 +524,14 @@ ntpdatemain (
- case 'u':
- unpriv_port = 1;
- break;
-+ case 'U':
-+ if (ntp_optarg) {
-+ server_user = strdup(ntp_optarg);
-+ }
-+ else {
-+ ++errflg;
-+ }
-+ break;
- case '?':
- ++errflg;
- break;
-@@ -438,7 +541,7 @@ ntpdatemain (
-
- if (errflg) {
- (void) fprintf(stderr,
-- "usage: %s [-46bBdqsuv] [-a key#] [-e delay] [-k file] [-p samples] [-o version#] [-t timeo] server ...\n",
-+ "usage: %s [-46bBdqsuv] [-a key#] [-e delay] [-k file] [-p samples] [-o version#] [-t timeo] [-U username] server ...\n",
- progname);
- exit(2);
- }
-@@ -544,6 +647,24 @@ ntpdatemain (
- initializing = 0;
- was_alarmed = 0;
-
-+ if (server_user) {
-+ struct passwd *pwd = NULL;
-+
-+ /* Lookup server_user uid/gid before chroot/chdir */
-+ pwd = getpwnam( server_user );
-+ if ( pwd == NULL ) {
-+ if (syslogit) {
-+ msyslog(LOG_ERR, "Failed to lookup user '%s'.", server_user);
-+ }
-+ else {
-+ fprintf(stderr, "Failed to lookup user '%s'.\n", server_user);
-+ }
-+ exit(1);
-+ }
-+ drop_root(pwd->pw_uid, pwd->pw_gid);
-+ }
-+
-+
- while (complete_servers < sys_numservers) {
- #ifdef HAVE_POLL_H
- struct pollfd* rdfdes;
diff --git a/ntp/patches/ntp-4.2.6p4-htmldoc.patch b/ntp/patches/ntp-4.2.6p4-htmldoc.patch
deleted file mode 100644
index 2b2dab7..0000000
--- a/ntp/patches/ntp-4.2.6p4-htmldoc.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -up ntp-4.2.6p4/html/authopt.html.htmldoc ntp-4.2.6p4/html/authopt.html
---- ntp-4.2.6p4/html/authopt.html.htmldoc 2011-07-11 04:18:25.000000000 +0200
-+++ ntp-4.2.6p4/html/authopt.html 2011-10-05 17:30:09.463244610 +0200
-@@ -364,7 +364,7 @@ UTC</p>
- are left unspecified, the default names are used as described below. Unless
- the complete path and name of the file are specified, the location of a file
- is relative to the keys directory specified in the <tt>keysdir</tt> configuration
-- command or default <tt>/usr/local/etc</tt>. Following are the options.</dd>
-+ command or default <tt>/etc/ntp/crypto</tt>. Following are the options.</dd>
-
- <dd><dl>
-
-@@ -396,7 +396,7 @@ UTC</p>
- <dd>Specifies the complete path to the MD5 key file containing the keys and key IDs used by <tt>ntpd</tt>, <tt>ntpq</tt> and <tt>ntpdc</tt> when operating with symmetric key cryptography. This is the same operation as the <tt>-k </tt>command line option. Note that the directory path for Autokey media is specified by the <tt>keysdir</tt> command.</dd>
-
- <dt id="keysdir"><tt>keysdir <i>path</i></tt>K</dt>
--<dd>This command specifies the default directory path for Autokey cryptographic keys, parameters and certificates. The default is <tt>/usr/local/etc/</tt>. Note that the path for the symmetric keys file is specified by the <tt>keys</tt> command.</dd>
-+<dd>This command specifies the default directory path for Autokey cryptographic keys, parameters and certificates. The default is <tt>/etc/ntp/crypto</tt>. Note that the path for the symmetric keys file is specified by the <tt>keys</tt> command.</dd>
-
- <dt id="requestkey"><tt>requestkey <i>keyid</i></tt></dt>
- <dd>Specifies the key ID to use with the
-diff -up ntp-4.2.6p4/html/keygen.html.htmldoc ntp-4.2.6p4/html/keygen.html
---- ntp-4.2.6p4/html/keygen.html.htmldoc 2011-07-11 04:18:26.000000000 +0200
-+++ ntp-4.2.6p4/html/keygen.html 2011-10-05 17:30:09.463244610 +0200
-@@ -206,7 +206,6 @@
- <p>All cryptographically sound key generation schemes must have means to randomize the entropy seed used to initialize the internal pseudo-random number generator used by the OpenSSL library routines. If a site supports <tt>ssh</tt>, it is very likely that means to do this are already available. The entropy seed used by the OpenSSL library is contained in a file, usually called <tt>.rnd</tt>, which must be available when starting the <tt>ntp-keygen</tt> program or <tt>ntpd</tt> daemon.</p>
-
- <p>The OpenSSL library looks for the file using the path specified by the <tt>RANDFILE</tt> environment variable in the user home directory, whether root or some other user. If the <tt>RANDFILE</tt> environment variable is not present, the library looks for the <tt>.rnd</tt> file in the user home directory. Since both the <tt>ntp-keygen</tt> program and <tt>ntpd</tt> daemon must run as root, the logical place to put this file is in <tt>/.rnd</tt> or <tt>/root/.rnd</tt>. If the file is not available or cannot be written, the program exits with a message to the system log.</p>
--<p>On systems that provide /dev/urandom, the randomness device is used instead and the file specified by the <tt>randfile</tt> subcommand or the <tt>RANDFILE</tt> environment variable is ignored.</p>
-
- <h4 id="priv">Cryptographic Data Files</h4>
-
-diff -up ntp-4.2.6p4/html/ntpd.html.htmldoc ntp-4.2.6p4/html/ntpd.html
---- ntp-4.2.6p4/html/ntpd.html.htmldoc 2011-07-11 04:18:26.000000000 +0200
-+++ ntp-4.2.6p4/html/ntpd.html 2011-10-05 17:34:07.545384008 +0200
-@@ -214,14 +214,14 @@
- </tr>
- <tr>
- <td width="30%">statistics path</td>
-- <td width="30%"><tt>/var/NTP</tt></td>
-+ <td width="30%"><tt>/var/log/ntpstats/</tt></td>
- <td width="20%"><tt>-s</tt></td>
- <td width="20%"><tt>statsdir</tt></td>
- </tr>
- <tr>
- <td width="30%">keys path</td>
-- <td width="30%"><tt>/usr/local/etc</tt></td>
-- <td width="20%"><tt>-k</tt></td>
-+ <td width="30%"><tt>/etc/ntp/crypto</tt></td>
-+ <td width="20%"><tt>none</tt></td>
- <td width="20%"><tt>keysdir</tt></td>
- </tr>
- </table>
-diff -up ntp-4.2.6p4/html/ntpdate.html.htmldoc ntp-4.2.6p4/html/ntpdate.html
---- ntp-4.2.6p4/html/ntpdate.html.htmldoc 2011-10-05 17:30:09.438244595 +0200
-+++ ntp-4.2.6p4/html/ntpdate.html 2011-10-05 17:36:24.195463971 +0200
-@@ -43,7 +43,7 @@
- <dt><tt>-e <i>authdelay</i></tt>
- <dd>Specify the processing delay to perform an authentication function as the value <i>authdelay</i>, in seconds and fraction (see <tt>ntpd</tt> for details). This number is usually small enough to be negligible for most purposes, though specifying a value may improve timekeeping on very slow CPU's.
- <dt><tt>-k <i>keyfile</i></tt>
-- <dd>Specify the path for the authentication key file as the string <i>keyfile</i>. The default is <tt>/etc/ntp.keys</tt>. This file should be in the format described in <tt>ntpd</tt>.
-+ <dd>Specify the path for the authentication key file as the string <i>keyfile</i>. The default is <tt>/etc/ntp/keys</tt>. This file should be in the format described in <tt>ntpd</tt>.
- <dt><tt>-o <i>version</i></tt>
- <dd>Specify the NTP version for outgoing packets as the integer <i>version</i>, which can be 1 or 2. The default is 4. This allows <tt>ntpdate</tt> to be used with older NTP versions.
- <dt><tt>-p <i>samples</i></tt>
-@@ -66,7 +66,7 @@
- <h4>Diagnostics</h4>
- <tt>ntpdate</tt>'s exit status is zero if it finds a server and updates the clock, and nonzero otherwise.
- <h4>Files</h4>
-- <tt>/etc/ntp.keys</tt> - encryption keys used by <tt>ntpdate</tt>.
-+ <tt>/etc/ntp/keys</tt> - encryption keys used by <tt>ntpdate</tt>.
- <h4>Bugs</h4>
- The slew adjustment is actually 50% larger than the measured offset, since this (it is argued) will tend to keep a badly drifting clock more accurate. This is probably not a good idea and may cause a troubling hunt for some values of the kernel variables <tt>tick</tt> and <tt>tickadj</tt>.
- <hr>
-diff -up ntp-4.2.6p4/html/ntpdc.html.htmldoc ntp-4.2.6p4/html/ntpdc.html
-diff -up ntp-4.2.6p4/html/ntpq.html.htmldoc ntp-4.2.6p4/html/ntpq.html
diff --git a/ntp/patches/ntp-4.2.6p4-mlock.patch b/ntp/patches/ntp-4.2.6p4-mlock.patch
deleted file mode 100644
index 354f7d5..0000000
--- a/ntp/patches/ntp-4.2.6p4-mlock.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-diff -up ntp-4.2.6p4/html/ntpd.html.mlock ntp-4.2.6p4/html/ntpd.html
---- ntp-4.2.6p4/html/ntpd.html.mlock 2011-10-06 13:08:50.897274352 +0200
-+++ ntp-4.2.6p4/html/ntpd.html 2011-10-06 13:08:50.909274362 +0200
-@@ -32,7 +32,7 @@
- </ul>
- <hr>
- <h4 id="synop">Synopsis</h4>
-- <tt>ntpd [ -46aAbdDgLnNqx ] [ -c <i>conffile</i> ] [ -f <i>driftfile</i> ] [ -i <i>jaildir</i> ] [ -I <i>iface</i> ] [ -k <i>keyfile</i> ] [ -l <i>logfile</i> ] [ -p <i>pidfile</i> ] [ -P <i>priority</i> ] [ -r <i>broadcastdelay</i> ] [ -s <i>statsdir</i> ] [ -t <i>key</i> ] [ -u <i>user</i>[:<i>group</i>] ] [ -U <i>interface_update_interval</i> ] [ -v <i>variable</i> ] [ -V <i>variable</i> ]</tt>
-+ <tt>ntpd [ -46aAbdDgLmnNqx ] [ -c <i>conffile</i> ] [ -f <i>driftfile</i> ] [ -i <i>jaildir</i> ] [ -I <i>iface</i> ] [ -k <i>keyfile</i> ] [ -l <i>logfile</i> ] [ -p <i>pidfile</i> ] [ -P <i>priority</i> ] [ -r <i>broadcastdelay</i> ] [ -s <i>statsdir</i> ] [ -t <i>key</i> ] [ -u <i>user</i>[:<i>group</i>] ] [ -U <i>interface_update_interval</i> ] [ -v <i>variable</i> ] [ -V <i>variable</i> ]</tt>
- <h4 id="descr">Description</h4>
- <p>The <tt>ntpd</tt> program is an operating system daemon that synchronises the system clock with remote NTP time servers or local reference clocks. It is a complete implementation of the Network Time Protocol (NTP) version 4, but also retains compatibility with version 3, as defined by RFC-1305, and version 1 and 2, as defined by RFC-1059 and RFC-1119, respectively. The program can operate in any of several modes, as described on the <a href="assoc.html">Association Management</a> page, and with both symmetric key and public key cryptography, as described on the <a href="manyopt.html">Authentication Options</a> page.</p>
- <p>The <tt>ntpd</tt> program ordinarily requires a configuration file as desccribe on the Configuration Commands and Options collection above. However a client can discover remote servers and configure them automatically. This makes it possible to deploy a fleet of workstations without specifying configuration details specific to the local environment. Further details are on the <a href="manyopt.html">Automatic Server Discovery</a> page.</p>
-@@ -123,6 +123,8 @@
- <dd>Do not listen to virtual interfaces, defined as those with names containing a colon. This option is deprecated. Please consider using the configuration file <a href="miscopt.html#interface">interface</a> command, which is more versatile.</dd>
- <dt><tt>-M</tt></dt>
- <dd>Raise scheduler precision to its maximum (1 msec) using timeBeginPeriod. (Windows only)</dd>
-+ <dt><tt>-m</tt>
-+ <dd>Lock memory.
- <dt><tt>-n</tt></dt>
- <dd>Don't fork.</dd>
- <dt><tt>-N</tt></dt>
-diff -up ntp-4.2.6p4/ntpd/ntpd-opts.c.mlock ntp-4.2.6p4/ntpd/ntpd-opts.c
---- ntp-4.2.6p4/ntpd/ntpd-opts.c.mlock 2011-09-23 05:36:04.000000000 +0200
-+++ ntp-4.2.6p4/ntpd/ntpd-opts.c 2011-10-06 13:10:54.082360146 +0200
-@@ -276,6 +276,15 @@ static char const zNice_Name[]
- #define NICE_FLAGS (OPTST_DISABLED)
-
- /*
-+ * Mlock option description:
-+ */
-+static char const zMlockText[] =
-+ "Lock memory";
-+static char const zMlock_NAME[] = "MLOCK";
-+static char const zMlock_Name[] = "mlock";
-+#define MLOCK_FLAGS (OPTST_DISABLED)
-+
-+/*
- * Pidfile option description:
- */
- static char const zPidfileText[] =
-@@ -903,6 +912,18 @@ static tOptDesc optDesc[OPTION_CT] = {
- /* desc, NAME, name */ zPccfreqText, zPccfreq_NAME, zPccfreq_Name,
- /* disablement strs */ NULL, NULL },
-
-+ { /* entry idx, value */ 32, VALUE_OPT_MLOCK,
-+ /* equiv idx, value */ 32, VALUE_OPT_MLOCK,
-+ /* equivalenced to */ NO_EQUIVALENT,
-+ /* min, max, act ct */ 0, 1, 0,
-+ /* opt state flags */ MLOCK_FLAGS, 0,
-+ /* last opt argumnt */ { NULL },
-+ /* arg list/cookie */ NULL,
-+ /* must/cannot opts */ NULL, NULL,
-+ /* option proc */ NULL,
-+ /* desc, NAME, name */ zMlockText, zMlock_NAME, zMlock_Name,
-+ /* disablement strs */ NULL, NULL },
-+
- { /* entry idx, value */ INDEX_OPT_VERSION, VALUE_OPT_VERSION,
- /* equiv idx value */ NO_EQUIVALENT, 0,
- /* equivalenced to */ NO_EQUIVALENT,
-@@ -1018,7 +1039,7 @@ tOptions ntpdOptions = {
- NO_EQUIVALENT, /* '-#' option index */
- NO_EQUIVALENT /* index of default opt */
- },
-- 35 /* full option count */, 32 /* user option count */,
-+ 36 /* full option count */, 33 /* user option count */,
- ntpd_full_usage, ntpd_short_usage,
- NULL, NULL,
- PKGDATADIR, ntpd_packager_info
-diff -up ntp-4.2.6p4/ntpd/ntpd-opts.h.mlock ntp-4.2.6p4/ntpd/ntpd-opts.h
---- ntp-4.2.6p4/ntpd/ntpd-opts.h.mlock 2011-09-23 05:36:04.000000000 +0200
-+++ ntp-4.2.6p4/ntpd/ntpd-opts.h 2011-10-06 13:08:50.910274363 +0200
-@@ -81,6 +81,7 @@ typedef enum {
-- INDEX_OPT_VERSION = 32,
-- INDEX_OPT_HELP = 33,
-- INDEX_OPT_MORE_HELP = 34
-+ INDEX_OPT_MLOCK = 32,
-+ INDEX_OPT_VERSION = 33,
-+ INDEX_OPT_HELP = 34,
-+ INDEX_OPT_MORE_HELP = 35
- } teOptIndex;
-
--#define OPTION_CT 35
-+#define OPTION_CT 36
-@@ -187,6 +188,10 @@ typedef enum {
- # warning undefining MODIFYMMTIMER due to option name conflict
- # undef MODIFYMMTIMER
- # endif
-+# ifdef MLOCK
-+# warning undefining MLOCK due to option name conflict
-+# undef MLOCK
-+# endif
- # ifdef NOFORK
- # warning undefining NOFORK due to option name conflict
- # undef NOFORK
-@@ -268,6 +273,7 @@ typedef enum {
- # undef LOGFILE
- # undef NOVIRTUALIPS
- # undef MODIFYMMTIMER
-+# undef MLOCK
- # undef NOFORK
- # undef NICE
- # undef PIDFILE
-@@ -306,6 +312,7 @@ typedef enum {
- #define VALUE_OPT_LOGFILE 'l'
- #define VALUE_OPT_NOVIRTUALIPS 'L'
- #define VALUE_OPT_MODIFYMMTIMER 'M'
-+#define VALUE_OPT_MLOCK 'm'
- #define VALUE_OPT_NOFORK 'n'
- #define VALUE_OPT_NICE 'N'
- #define VALUE_OPT_PIDFILE 'p'
-diff -up ntp-4.2.6p4/ntpd/ntpd.c.mlock ntp-4.2.6p4/ntpd/ntpd.c
---- ntp-4.2.6p4/ntpd/ntpd.c.mlock 2011-10-06 13:08:50.869274334 +0200
-+++ ntp-4.2.6p4/ntpd/ntpd.c 2011-10-06 13:08:50.911274363 +0200
-@@ -723,7 +723,8 @@ ntpdmain(
- }
- #endif
-
--#if defined(HAVE_MLOCKALL) && defined(MCL_CURRENT) && defined(MCL_FUTURE)
-+#if defined(MCL_CURRENT) && defined(MCL_FUTURE)
-+ if (HAVE_OPT( MLOCK )) {
- # ifdef HAVE_SETRLIMIT
- /*
- * Set the stack limit to something smaller, so that we don't lock a lot
-@@ -749,7 +750,7 @@ ntpdmain(
- * fail if we drop root privlege. To be useful the value
- * has to be larger than the largest ntpd resident set size.
- */
-- rl.rlim_cur = rl.rlim_max = 32*1024*1024;
-+ rl.rlim_cur = rl.rlim_max = 64*1024*1024;
- if (setrlimit(RLIMIT_MEMLOCK, &rl) == -1) {
- msyslog(LOG_ERR, "Cannot set RLIMIT_MEMLOCK: %m");
- }
-@@ -761,6 +762,7 @@ ntpdmain(
- */
- if (mlockall(MCL_CURRENT|MCL_FUTURE) < 0)
- msyslog(LOG_ERR, "mlockall(): %m");
-+ }
- #else /* not (HAVE_MLOCKALL && MCL_CURRENT && MCL_FUTURE) */
- # ifdef HAVE_PLOCK
- # ifdef PROCLOCK
diff --git a/ntp/patches/ntp-4.2.6p4-rtnetlink.patch b/ntp/patches/ntp-4.2.6p4-rtnetlink.patch
deleted file mode 100644
index 06d2e87..0000000
--- a/ntp/patches/ntp-4.2.6p4-rtnetlink.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up ntp-4.2.6p4/ntpd/ntp_io.c.rtnetlink ntp-4.2.6p4/ntpd/ntp_io.c
---- ntp-4.2.6p4/ntpd/ntp_io.c.rtnetlink 2011-10-05 15:49:17.061711033 +0200
-+++ ntp-4.2.6p4/ntpd/ntp_io.c 2011-10-05 15:49:17.074711042 +0200
-@@ -4549,10 +4549,7 @@ init_async_notifications()
- #ifdef HAVE_RTNETLINK
- memset(&sa, 0, sizeof(sa));
- sa.nl_family = PF_NETLINK;
-- sa.nl_groups = RTMGRP_LINK | RTMGRP_IPV4_IFADDR
-- | RTMGRP_IPV6_IFADDR | RTMGRP_IPV4_ROUTE
-- | RTMGRP_IPV4_MROUTE | RTMGRP_IPV6_ROUTE
-- | RTMGRP_IPV6_MROUTE;
-+ sa.nl_groups = RTMGRP_IPV4_IFADDR | RTMGRP_IPV6_IFADDR;
- if (bind(fd, (struct sockaddr *)&sa, sizeof(sa)) < 0) {
- msyslog(LOG_ERR,
- "bind failed on routing socket (%m) - using polled interface update");
diff --git a/ntp/patches/ntp-4.2.6p5-delaycalib.patch b/ntp/patches/ntp-4.2.6p5-delaycalib.patch
deleted file mode 100644
index 7e9a310..0000000
--- a/ntp/patches/ntp-4.2.6p5-delaycalib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ntp-4.2.6p5/ntpd/ntp_proto.c.delaycalib ntp-4.2.6p5/ntpd/ntp_proto.c
---- ntp-4.2.6p5/ntpd/ntp_proto.c.delaycalib 2012-02-28 15:57:57.000000000 +0100
-+++ ntp-4.2.6p5/ntpd/ntp_proto.c 2012-02-28 16:01:30.080135978 +0100
-@@ -1514,7 +1514,7 @@ process_packet(
- */
- if (FLAG_BC_VOL & peer->flags) {
- peer->flags &= ~FLAG_BC_VOL;
-- peer->delay = (peer->offset - p_offset) * 2;
-+ peer->delay = fabs(peer->offset - p_offset) * 2;
- }
- p_del = peer->delay;
- p_offset += p_del / 2;
diff --git a/ntp/patches/ntp-4.2.6p5-fipsmd5.patch b/ntp/patches/ntp-4.2.6p5-fipsmd5.patch
deleted file mode 100644
index b6d8889..0000000
--- a/ntp/patches/ntp-4.2.6p5-fipsmd5.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -up ntp-4.2.6p5/libntp/a_md5encrypt.c.fipsmd5 ntp-4.2.6p5/libntp/a_md5encrypt.c
---- ntp-4.2.6p5/libntp/a_md5encrypt.c.fipsmd5 2011-12-01 03:55:17.000000000 +0100
-+++ ntp-4.2.6p5/libntp/a_md5encrypt.c 2012-10-24 16:24:04.972358878 +0200
-@@ -38,7 +38,11 @@ MD5authencrypt(
- * was creaded.
- */
- INIT_SSL();
-- EVP_DigestInit(&ctx, EVP_get_digestbynid(type));
-+ if (!EVP_DigestInit(&ctx, EVP_get_digestbynid(type))) {
-+ msyslog(LOG_ERR,
-+ "MAC encrypt: digest init failed");
-+ return (0);
-+ }
- EVP_DigestUpdate(&ctx, key, (u_int)cache_keylen);
- EVP_DigestUpdate(&ctx, (u_char *)pkt, (u_int)length);
- EVP_DigestFinal(&ctx, digest, &len);
-@@ -71,7 +75,11 @@ MD5authdecrypt(
- * was created.
- */
- INIT_SSL();
-- EVP_DigestInit(&ctx, EVP_get_digestbynid(type));
-+ if (!EVP_DigestInit(&ctx, EVP_get_digestbynid(type))) {
-+ msyslog(LOG_ERR,
-+ "MAC decrypt: digest init failed");
-+ return (0);
-+ }
- EVP_DigestUpdate(&ctx, key, (u_int)cache_keylen);
- EVP_DigestUpdate(&ctx, (u_char *)pkt, (u_int)length);
- EVP_DigestFinal(&ctx, digest, &len);
-@@ -101,7 +109,16 @@ addr2refid(sockaddr_u *addr)
- return (NSRCADR(addr));
-
- INIT_SSL();
-- EVP_DigestInit(&ctx, EVP_get_digestbynid(NID_md5));
-+ EVP_MD_CTX_init(&ctx);
-+#ifdef EVP_MD_CTX_FLAG_NON_FIPS_ALLOW
-+ /* MD5 is not used as a crypto hash here. */
-+ EVP_MD_CTX_set_flags(&ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
-+#endif
-+ if (!EVP_DigestInit_ex(&ctx, EVP_md5(), NULL)) {
-+ msyslog(LOG_ERR,
-+ "MD5 init failed");
-+ exit(1);
-+ }
- EVP_DigestUpdate(&ctx, (u_char *)PSOCK_ADDR6(addr),
- sizeof(struct in6_addr));
- EVP_DigestFinal(&ctx, digest, &len);
diff --git a/plymouth/patches/plymouth-0.8.0-everything-is-better-in-red.patch b/plymouth/patches/plymouth-0.8.0-everything-is-better-in-red.patch
deleted file mode 100644
index 7dba9f7..0000000
--- a/plymouth/patches/plymouth-0.8.0-everything-is-better-in-red.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up plymouth-0.8.0/src/plugins/splash/text/plugin.c.red plymouth-0.8.0/src/plugins/splash/text/plugin.c
---- plymouth-0.8.0/src/plugins/splash/text/plugin.c.red 2009-11-19 14:40:24.000000000 -0500
-+++ plymouth-0.8.0/src/plugins/splash/text/plugin.c 2009-11-19 14:41:40.000000000 -0500
-@@ -184,10 +184,10 @@ view_start_animation (view_t *view)
- 0xffffff);
- ply_terminal_set_color_hex_value (terminal,
- PLY_TERMINAL_COLOR_BLUE,
-- 0x0073B3);
-+ 0xCC0A00);
- ply_terminal_set_color_hex_value (terminal,
- PLY_TERMINAL_COLOR_BROWN,
-- 0x00457E);
-+ 0x880400);
-
- ply_text_display_set_background_color (view->display,
- PLY_TERMINAL_COLOR_BLACK);
diff --git a/plymouth/patches/plymouth-0.9.0-everything-is-better-in-red.patch b/plymouth/patches/plymouth-0.9.0-everything-is-better-in-red.patch
new file mode 100644
index 0000000..f2981ca
--- /dev/null
+++ b/plymouth/patches/plymouth-0.9.0-everything-is-better-in-red.patch
@@ -0,0 +1,16 @@
+diff -Nur plymouth-0.9.0_orig/src/plugins/splash/text/plugin.c plymouth-0.9.0/src/plugins/splash/text/plugin.c
+--- plymouth-0.9.0_orig/src/plugins/splash/text/plugin.c 2014-04-21 17:18:19.000000000 +0200
++++ plymouth-0.9.0/src/plugins/splash/text/plugin.c 2014-12-07 14:57:09.344789424 +0100
+@@ -177,10 +177,10 @@
+ 0xffffff);
+ ply_terminal_set_color_hex_value (terminal,
+ PLY_TERMINAL_COLOR_BLUE,
+- 0x3465a4);
++ 0xCC0A00);
+ ply_terminal_set_color_hex_value (terminal,
+ PLY_TERMINAL_COLOR_BROWN,
+- 0x979a9b);
++ 0x880400);
+
+ ply_text_display_set_background_color (view->display,
+ PLY_TERMINAL_COLOR_BLACK);
diff --git a/plymouth/plymouth-update-initrd b/plymouth/plymouth-update-initrd
deleted file mode 100644
index c07b561..0000000
--- a/plymouth/plymouth-update-initrd
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-/sbin/new-kernel-pkg --package kernel --mkinitrd --dracut --depmod --install $(uname -r)
diff --git a/plymouth/plymouth.nm b/plymouth/plymouth.nm
index cbecf07..257aef6 100644
--- a/plymouth/plymouth.nm
+++ b/plymouth/plymouth.nm
@@ -4,7 +4,7 @@
###############################################################################
name = plymouth
-version = 0.8.8
+version = 0.9.0
release = 1
groups = System/Base
@@ -27,23 +27,14 @@ build
autoconf
automake
cairo-devel
+ docbook-xsl
glib2-devel
pkgconfig(libdrm)
- pkgconfig(libdrm_radeon)
- pkgconfig(libdrm_nouveau)
libpng-devel
+ libudev-devel
pango-devel
end
- enable_libdrm_intel = 0
-
- if "%{DISTRO_PLATFORM}" == "x86"
- enable_libdrm_intel = 1
- requires += pkgconfig(libdrm_intel)
- end
-
- CFLAGS += -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
-
configure_options += \
--libexecdir=/usr/lib \
--disable-libkms \
@@ -60,10 +51,6 @@ build
--without-rhgb-compat-link \
--without-log-viewer
- if "%{enable_libdrm_intel}" == "0"
- configure_options += --disable-libdrm_intel
- end
-
prepare_cmds
autoreconf -vfi
end
@@ -80,10 +67,10 @@ build
cp -vf %{DIR_SOURCE}/boot-duration \
%{BUILDROOT}%{localstatedir}/lib/plymouth
- # Override plymouth-update-initrd to work dracut or mkinitrd
- cp -vf %{DIR_SOURCE}/plymouth-update-initrd \
- %{BUILDROOT}/usr/lib/plymouth/plymouth-update-initrd
- chmod 755 %{BUILDROOT}/usr/lib/plymouth/plymouth-update-initrd
+ # The "glow" theme isn't quite ready for primetime, so drop it.
+ rm -rvf %{BUILDROOT}%{datadir}/plymouth/themes/glow
+ rm -rvf %{BUILDROOT}%{datadir}/plymouth/glow/
+ rm -rvf %{BUILDROOT}%{libdir}/plymouth/glow.so
end
end
@@ -277,7 +264,7 @@ packages
end
script postun
- if [ "$(%{sbindir}/plymouth-set-default-theme)" = %{theme_name}" ]; then
+ if [ "$(%{sbindir}/plymouth-set-default-theme)" = "%{theme_name}" ]; then
%{sbindir}/plymouth-set-default-theme --reset
/usr/lib/plymouth/plymouth-generate-initrd
fi
hooks/post-receive
--
IPFire 3.x development tree
1
0