[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6f704a3c85dc453e1a8cebafbca5446e59aab6d6
by git＠ipfire.org 06 Feb '13
by git＠ipfire.org 06 Feb '13
06 Feb '13
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 6f704a3c85dc453e1a8cebafbca5446e59aab6d6 (commit)
from 1d76272bd30ec4933a268be3a6a41c72a43a43f4 (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 6f704a3c85dc453e1a8cebafbca5446e59aab6d6
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Feb 6 20:08:02 2013 +0100
kernel: update to 3.2.38.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/66/update.sh | 6 +++---
lfs/linux | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/66/update.sh b/config/rootfiles/core/66/update.sh
index d764c43..e0a7875 100644
--- a/config/rootfiles/core/66/update.sh
+++ b/config/rootfiles/core/66/update.sh
@@ -78,7 +78,7 @@ fi
#
#
-KVER="3.2.37"
+KVER="3.2.38"
MOUNT=`grep "kernel" /boot/grub/grub.conf 2>/dev/null | tail -n 1 `
# Nur den letzten Parameter verwenden
echo $MOUNT > /dev/null
@@ -328,8 +328,8 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
"core-update-$core: WARNING not enough space for pae kernel."
else
echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
- echo "ProgVersion: 3.2.37" >> /opt/pakfire/db/installed/meta-linux-pae
- echo "Release: 26" >> /opt/pakfire/db/installed/meta-linux-pae
+ echo "ProgVersion: 3.2.38" >> /opt/pakfire/db/installed/meta-linux-pae
+ echo "Release: 27" >> /opt/pakfire/db/installed/meta-linux-pae
fi
fi
diff --git a/lfs/linux b/lfs/linux
index 2bdb9a5..e46a2d4 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,7 +24,7 @@
include Config
-VER = 3.2.37
+VER = 3.2.38
RPI_PATCHES = linux-3.2.27-ada8b44
@@ -35,7 +35,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
CFLAGS =
CXXFLAGS =
-PAK_VER = 27
+PAK_VER = 28
DEPS = ""
VERSUFIX=ipfire$(KCFG)
@@ -71,7 +71,7 @@ objects =$(DL_FILE) \
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
-$(DL_FILE)_MD5 = 741f0ee132734b8ed887ad1d87cc202b
+$(DL_FILE)_MD5 = 16ea59fd8701f82d7d7c534a6e4bb923
rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 966687ff27e450e04ff50e0da829dc00
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1d76272bd30ec4933a268be3a6a41c72a43a43f4
by git＠ipfire.org 06 Feb '13
by git＠ipfire.org 06 Feb '13
06 Feb '13
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 1d76272bd30ec4933a268be3a6a41c72a43a43f4 (commit)
via 707ca1fb846cbbdca61c7107f4f1e44b0b089c92 (commit)
from 18b39b38aed96e348b3996f7e69aed88c7c95d4f (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 1d76272bd30ec4933a268be3a6a41c72a43a43f4
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Feb 5 23:59:38 2013 +0100
installer: fix dutch language.
commit 707ca1fb846cbbdca61c7107f4f1e44b0b089c92
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Feb 5 23:33:43 2013 +0100
configroot: rootfile update.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/configroot | 1 +
src/install+setup/install/main.c | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
Difference in files:
diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 1d2fc9d..51fd388 100644
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -59,6 +59,7 @@ var/ipfire/langs
#var/ipfire/langs/es.pl
#var/ipfire/langs/fr.pl
#var/ipfire/langs/list
+#var/ipfire/langs/nl.pl
#var/ipfire/langs/pl.pl
#var/ipfire/langs/ru.pl
var/ipfire/logging
diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 04942fa..14139b5 100644
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -35,6 +35,7 @@ extern char *en_tr[];
extern char *es_tr[];
extern char *de_tr[];
extern char *fr_tr[];
+extern char *nl_tr[];
extern char *pl_tr[];
extern char *ru_tr[];
@@ -45,7 +46,7 @@ int main(int argc, char *argv[])
char *langnames[] = { "Deutsch", "English", "Français", "Español", "Nederlands", "Polski", "Русский", NULL };
char *shortlangnames[] = { "de", "en", "fr", "es", "nl", "pl", "ru", NULL };
- char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, pl_tr, ru_tr, NULL };
+ char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, nl_tr, pl_tr, ru_tr, NULL };
char hdletter;
char harddrive[30], sourcedrive[5]; /* Device holder. */
char harddrive_info[STRING_SIZE]; /* Additional infos about target */
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 18b39b38aed96e348b3996f7e69aed88c7c95d4f
by git＠ipfire.org 05 Feb '13
by git＠ipfire.org 05 Feb '13
05 Feb '13
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 18b39b38aed96e348b3996f7e69aed88c7c95d4f (commit)
via d1f2931c85b8c117ffefed0c14d04dda09af105d (commit)
from 778ac3ed83223d9bd234e5516456407ee1404157 (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 18b39b38aed96e348b3996f7e69aed88c7c95d4f
Merge: d1f2931 778ac3e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Feb 5 22:37:05 2013 +0100
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit d1f2931c85b8c117ffefed0c14d04dda09af105d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Feb 5 22:32:16 2013 +0100
libsmooth: add dutch language.
-----------------------------------------------------------------------
Summary of changes:
src/install+setup/libsmooth/main.c | 1 +
1 file changed, 1 insertion(+)
Difference in files:
diff --git a/src/install+setup/libsmooth/main.c b/src/install+setup/libsmooth/main.c
index 17adcc7..39cde7b 100644
--- a/src/install+setup/libsmooth/main.c
+++ b/src/install+setup/libsmooth/main.c
@@ -346,6 +346,7 @@ int replace(char filename1[], char *from, char *to)
#include "lang_fr.c"
#include "lang_pl.c"
#include "lang_ru.c"
+ #include "lang_nl.c"
#endif
// returns a pointer to the actual running version number of IPFire.
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 778ac3ed83223d9bd234e5516456407ee1404157
by git＠ipfire.org 05 Feb '13
by git＠ipfire.org 05 Feb '13
05 Feb '13
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 778ac3ed83223d9bd234e5516456407ee1404157 (commit)
from be82627d34d1255c504569c170da11ba5470f114 (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 778ac3ed83223d9bd234e5516456407ee1404157
Author: Daniel Weismüller <daniel.weismueller(a)ipfire.org>
Date: Tue Feb 5 21:35:16 2013 +0100
Close console after 10 minutes idle.
For security reasons, all local consoles get closed
after 10 min idle. This does not count for screen or ssh sessions.
-----------------------------------------------------------------------
Summary of changes:
config/bash/dot_bashrc | 6 ++++++
1 file changed, 6 insertions(+)
Difference in files:
diff --git a/config/bash/dot_bashrc b/config/bash/dot_bashrc
index 6e6d1e1..90b96b4 100644
--- a/config/bash/dot_bashrc
+++ b/config/bash/dot_bashrc
@@ -10,3 +10,9 @@ alias mv='mv -i'
if [ -f /etc/bashrc ]; then
. /etc/bashrc
fi
+
+# Automatically logout only console users after 10 minutes.
+export TMOUT=0
+if [ -z "${SSH_TTY}" ] && [ -z "${STY}" ]; then
+ export TMOUT=600
+fi
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. be82627d34d1255c504569c170da11ba5470f114
by git＠ipfire.org 05 Feb '13
by git＠ipfire.org 05 Feb '13
05 Feb '13
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 be82627d34d1255c504569c170da11ba5470f114 (commit)
from 45a4448a9628b33c81ce86a84305d52c5d3c4bf0 (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 be82627d34d1255c504569c170da11ba5470f114
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Feb 5 21:19:41 2013 +0100
setup: Add Dutch language selection.
-----------------------------------------------------------------------
Summary of changes:
src/install+setup/setup/main.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Difference in files:
diff --git a/src/install+setup/setup/main.c b/src/install+setup/setup/main.c
index 65878f9..d078a52 100644
--- a/src/install+setup/setup/main.c
+++ b/src/install+setup/setup/main.c
@@ -26,6 +26,7 @@ extern char *fr_tr[];
extern char *es_tr[];
extern char *pl_tr[];
extern char *ru_tr[];
+extern char *nl_tr[];
int main(int argc, char *argv[])
{
@@ -33,8 +34,8 @@ int main(int argc, char *argv[])
char *shortlangnames[] = { "en", NULL };
char **langtrs[] = { en_tr, NULL };
#else
- char *shortlangnames[] = { "de", "en", "fr", "es", "pl", "ru", NULL };
- char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, pl_tr, ru_tr, NULL };
+ char *shortlangnames[] = { "de", "en", "fr", "es", "nl", "pl", "ru", NULL };
+ char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, nl_tr, pl_tr, ru_tr, NULL };
#endif
int choice;
char *sections[11]; /* need to fill this out AFTER knowning lang */
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 45a4448a9628b33c81ce86a84305d52c5d3c4bf0
by git＠ipfire.org 05 Feb '13
by git＠ipfire.org 05 Feb '13
05 Feb '13
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 45a4448a9628b33c81ce86a84305d52c5d3c4bf0 (commit)
via b34dac1ff503f405f08144b89f6bc290a624f762 (commit)
via c28be8fda09b6a6587408e28a024b3c04db62272 (commit)
via 09c8a88a54ed9f399f98e86748e7bb3e0daa105f (commit)
from f8622265fa476c1d53874184dc7e1abaec878d64 (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 45a4448a9628b33c81ce86a84305d52c5d3c4bf0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Feb 5 21:17:31 2013 +0100
Language cleanups by ./make.sh lang.
commit b34dac1ff503f405f08144b89f6bc290a624f762
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Feb 5 21:17:06 2013 +0100
make.sh: Add Dutch to the language management code.
commit c28be8fda09b6a6587408e28a024b3c04db62272
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Feb 5 21:16:42 2013 +0100
wui: Add Dutch language selection.
commit 09c8a88a54ed9f399f98e86748e7bb3e0daa105f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Feb 5 21:15:48 2013 +0100
installer: Add Dutch language selection.
-----------------------------------------------------------------------
Summary of changes:
doc/language_issues.de | 5 +++++
doc/language_issues.en | 4 ++++
doc/language_issues.es | 6 ++++++
doc/language_issues.fr | 6 ++++++
doc/language_issues.pl | 6 ++++++
doc/language_issues.ru | 6 ++++++
doc/language_missings | 4 ++++
langs/en/cgi-bin/en.pl | 2 +-
langs/list | 1 +
langs/nl/cgi-bin/nl.pl | 4 ++--
src/install+setup/install/main.c | 4 ++--
tools/make-functions | 2 ++
12 files changed, 45 insertions(+), 5 deletions(-)
Difference in files:
diff --git a/doc/language_issues.de b/doc/language_issues.de
index 137217c..40ad311 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -293,6 +293,7 @@ WARNING: translation string unused: original
WARNING: translation string unused: other countries
WARNING: translation string unused: out
WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname
+WARNING: translation string unused: override mtu
WARNING: translation string unused: ovpn
WARNING: translation string unused: ovpn config
WARNING: translation string unused: ovpn dl
@@ -457,9 +458,12 @@ WARNING: translation string unused: use dov
WARNING: translation string unused: use ibod
WARNING: translation string unused: view log
WARNING: translation string unused: vpn aggrmode
+WARNING: translation string unused: vpn incompatible use of defaultroute
+WARNING: translation string unused: vpn mtu invalid
WARNING: translation string unused: vpn on blue
WARNING: translation string unused: vpn on green
WARNING: translation string unused: vpn on orange
+WARNING: translation string unused: vpn watch
WARNING: translation string unused: warn when traffic reaches
WARNING: translation string unused: web proxy configuration
WARNING: translation string unused: week-graph
@@ -476,3 +480,4 @@ WARNING: untranslated string: route config changed
WARNING: untranslated string: routing config added
WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
+WARNING: untranslated string: wlanap country
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 68fef77..2ad18eb 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -320,6 +320,7 @@ WARNING: translation string unused: original
WARNING: translation string unused: other countries
WARNING: translation string unused: out
WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname
+WARNING: translation string unused: override mtu
WARNING: translation string unused: ovpn
WARNING: translation string unused: ovpn config
WARNING: translation string unused: ovpn dl
@@ -489,9 +490,12 @@ WARNING: translation string unused: use dov
WARNING: translation string unused: use ibod
WARNING: translation string unused: view log
WARNING: translation string unused: vpn aggrmode
+WARNING: translation string unused: vpn incompatible use of defaultroute
+WARNING: translation string unused: vpn mtu invalid
WARNING: translation string unused: vpn on blue
WARNING: translation string unused: vpn on green
WARNING: translation string unused: vpn on orange
+WARNING: translation string unused: vpn watch
WARNING: translation string unused: warn when traffic reaches
WARNING: translation string unused: web proxy configuration
WARNING: translation string unused: week-graph
diff --git a/doc/language_issues.es b/doc/language_issues.es
index eca067d..eb45ffb 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -317,6 +317,7 @@ WARNING: translation string unused: other countries
WARNING: translation string unused: out
WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname
WARNING: translation string unused: outgoing firewall p2p description
+WARNING: translation string unused: override mtu
WARNING: translation string unused: ovpn
WARNING: translation string unused: ovpn config
WARNING: translation string unused: ovpn dl
@@ -486,9 +487,12 @@ WARNING: translation string unused: use dov
WARNING: translation string unused: use ibod
WARNING: translation string unused: view log
WARNING: translation string unused: vpn aggrmode
+WARNING: translation string unused: vpn incompatible use of defaultroute
+WARNING: translation string unused: vpn mtu invalid
WARNING: translation string unused: vpn on blue
WARNING: translation string unused: vpn on green
WARNING: translation string unused: vpn on orange
+WARNING: translation string unused: vpn watch
WARNING: translation string unused: warn when traffic reaches
WARNING: translation string unused: web proxy configuration
WARNING: translation string unused: week-graph
@@ -499,6 +503,7 @@ WARNING: translation string unused: yearly firewallhits
WARNING: untranslated string: Async logging enabled
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: Set time on boot
+WARNING: untranslated string: advproxy errmsg cache
WARNING: untranslated string: advproxy errmsg invalid upstream proxy
WARNING: untranslated string: attention
WARNING: untranslated string: bytes
@@ -608,3 +613,4 @@ WARNING: untranslated string: static routes
WARNING: untranslated string: system information
WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn keyexchange
+WARNING: untranslated string: wlanap country
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 91beb6f..f2f3e00 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -316,6 +316,7 @@ WARNING: translation string unused: original
WARNING: translation string unused: other countries
WARNING: translation string unused: out
WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname
+WARNING: translation string unused: override mtu
WARNING: translation string unused: ovpn
WARNING: translation string unused: ovpn config
WARNING: translation string unused: ovpn dl
@@ -487,9 +488,12 @@ WARNING: translation string unused: use dov
WARNING: translation string unused: use ibod
WARNING: translation string unused: view log
WARNING: translation string unused: vpn aggrmode
+WARNING: translation string unused: vpn incompatible use of defaultroute
+WARNING: translation string unused: vpn mtu invalid
WARNING: translation string unused: vpn on blue
WARNING: translation string unused: vpn on green
WARNING: translation string unused: vpn on orange
+WARNING: translation string unused: vpn watch
WARNING: translation string unused: warn when traffic reaches
WARNING: translation string unused: web proxy configuration
WARNING: translation string unused: week-graph
@@ -498,6 +502,7 @@ WARNING: translation string unused: xtaccess bad transfert
WARNING: translation string unused: year-graph
WARNING: translation string unused: yearly firewallhits
WARNING: untranslated string: Scan for Songs
+WARNING: untranslated string: advproxy errmsg cache
WARNING: untranslated string: advproxy errmsg invalid upstream proxy
WARNING: untranslated string: attention
WARNING: untranslated string: bytes
@@ -598,6 +603,7 @@ WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn keyexchange
WARNING: untranslated string: wlanap access point
WARNING: untranslated string: wlanap channel
+WARNING: untranslated string: wlanap country
WARNING: untranslated string: wlanap debugging
WARNING: untranslated string: wlanap del interface
WARNING: untranslated string: wlanap encryption
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index eca067d..eb45ffb 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -317,6 +317,7 @@ WARNING: translation string unused: other countries
WARNING: translation string unused: out
WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname
WARNING: translation string unused: outgoing firewall p2p description
+WARNING: translation string unused: override mtu
WARNING: translation string unused: ovpn
WARNING: translation string unused: ovpn config
WARNING: translation string unused: ovpn dl
@@ -486,9 +487,12 @@ WARNING: translation string unused: use dov
WARNING: translation string unused: use ibod
WARNING: translation string unused: view log
WARNING: translation string unused: vpn aggrmode
+WARNING: translation string unused: vpn incompatible use of defaultroute
+WARNING: translation string unused: vpn mtu invalid
WARNING: translation string unused: vpn on blue
WARNING: translation string unused: vpn on green
WARNING: translation string unused: vpn on orange
+WARNING: translation string unused: vpn watch
WARNING: translation string unused: warn when traffic reaches
WARNING: translation string unused: web proxy configuration
WARNING: translation string unused: week-graph
@@ -499,6 +503,7 @@ WARNING: translation string unused: yearly firewallhits
WARNING: untranslated string: Async logging enabled
WARNING: untranslated string: Scan for Songs
WARNING: untranslated string: Set time on boot
+WARNING: untranslated string: advproxy errmsg cache
WARNING: untranslated string: advproxy errmsg invalid upstream proxy
WARNING: untranslated string: attention
WARNING: untranslated string: bytes
@@ -608,3 +613,4 @@ WARNING: untranslated string: static routes
WARNING: untranslated string: system information
WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn keyexchange
+WARNING: untranslated string: wlanap country
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index e36449a..e83f42b 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -310,6 +310,7 @@ WARNING: translation string unused: original
WARNING: translation string unused: other countries
WARNING: translation string unused: out
WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname
+WARNING: translation string unused: override mtu
WARNING: translation string unused: ovpn
WARNING: translation string unused: ovpn config
WARNING: translation string unused: ovpn dl
@@ -479,9 +480,12 @@ WARNING: translation string unused: use dov
WARNING: translation string unused: use ibod
WARNING: translation string unused: view log
WARNING: translation string unused: vpn aggrmode
+WARNING: translation string unused: vpn incompatible use of defaultroute
+WARNING: translation string unused: vpn mtu invalid
WARNING: translation string unused: vpn on blue
WARNING: translation string unused: vpn on green
WARNING: translation string unused: vpn on orange
+WARNING: translation string unused: vpn watch
WARNING: translation string unused: warn when traffic reaches
WARNING: translation string unused: web proxy configuration
WARNING: translation string unused: weekly firewallhits
@@ -490,6 +494,7 @@ WARNING: translation string unused: yearly firewallhits
WARNING: untranslated string: Add a route
WARNING: untranslated string: Edit an existing route
WARNING: untranslated string: Scan for Songs
+WARNING: untranslated string: advproxy errmsg cache
WARNING: untranslated string: advproxy errmsg invalid upstream proxy
WARNING: untranslated string: attention
WARNING: untranslated string: bytes
@@ -572,3 +577,4 @@ WARNING: untranslated string: server restart
WARNING: untranslated string: static routes
WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn keyexchange
+WARNING: untranslated string: wlanap country
diff --git a/doc/language_missings b/doc/language_missings
index 83fbf90..1682950 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -11,6 +11,7 @@
############################################################################
# Checking cgi-bin translations for language: fr #
############################################################################
+< advproxy errmsg cache
< advproxy errmsg invalid upstream proxy
< attention
< ccd add
@@ -132,6 +133,7 @@
############################################################################
# Checking cgi-bin translations for language: es #
############################################################################
+< advproxy errmsg cache
< advproxy errmsg invalid upstream proxy
< Async logging enabled
< attention
@@ -246,6 +248,7 @@
############################################################################
# Checking cgi-bin translations for language: pl #
############################################################################
+< advproxy errmsg cache
< advproxy errmsg invalid upstream proxy
< attention
< ccd add
@@ -336,6 +339,7 @@
# Checking cgi-bin translations for language: ru #
############################################################################
< Add a route
+< advproxy errmsg cache
< advproxy errmsg invalid upstream proxy
< attention
< ccd add
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 7990e2a..c4629a5 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2235,8 +2235,8 @@
'wireless config changed' => 'Wireless config changed',
'wireless configuration' => 'Wireless Configuration',
'wlanap access point' => 'Access Point',
-'wlanap country' => 'Country Code',
'wlanap channel' => 'Channel',
+'wlanap country' => 'Country Code',
'wlanap debugging' => 'Debugging',
'wlanap del interface' => 'Remove selected interface?',
'wlanap encryption' => 'Encryption',
diff --git a/langs/list b/langs/list
index 94828cd..d7ea4e8 100644
--- a/langs/list
+++ b/langs/list
@@ -4,3 +4,4 @@ fr:Français:French
es:Español:Spanish
pl:Polski:Polish
ru:Русский:Russian
+nl:Nederlands:Dutch
diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl
index 1bec570..d8f9eee 100644
--- a/langs/nl/cgi-bin/nl.pl
+++ b/langs/nl/cgi-bin/nl.pl
@@ -1094,7 +1094,7 @@
'ipfire side' => 'IPFire-zijde:',
'ipfire side is invalid' => 'IPFire-zijde is ongeldig.',
'ipfires hostname' => 'IPFire\'s Hostnaam',
-'ipinfo' => 'IP info',
+'ipinfo' => 'IP info',
'iptable rules' => 'IPTable regels',
'iptmangles' => 'IPTable Mangles',
'iptnats' => 'IPTable Network Adrestranslatie',
@@ -2234,8 +2234,8 @@
'wireless config changed' => ' Draadloze configuratie gewijzigd',
'wireless configuration' => 'Draadloze configuratie',
'wlanap access point' => 'Access Point',
-'wlanap country' => 'Landcode',
'wlanap channel' => 'Kanaal',
+'wlanap country' => 'Landcode',
'wlanap debugging' => 'Debugging',
'wlanap del interface' => 'Verwijder geselecteerde interface?',
'wlanap encryption' => 'Encryptie',
diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 258b3e4..04942fa 100644
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -43,8 +43,8 @@ int main(int argc, char *argv[])
char discl_msg[40000] = "Disclaimer\n";
- char *langnames[] = { "Deutsch", "English", "Français", "Español", "Polski", "Русский", NULL };
- char *shortlangnames[] = { "de", "en", "fr", "es", "pl", "ru", NULL };
+ char *langnames[] = { "Deutsch", "English", "Français", "Español", "Nederlands", "Polski", "Русский", NULL };
+ char *shortlangnames[] = { "de", "en", "fr", "es", "nl", "pl", "ru", NULL };
char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, pl_tr, ru_tr, NULL };
char hdletter;
char harddrive[30], sourcedrive[5]; /* Device holder. */
diff --git a/tools/make-functions b/tools/make-functions
index 5af0b4b..16352b4 100644
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -555,12 +555,14 @@ update_langs() {
$BASEDIR/tools/sort_strings.pl es
$BASEDIR/tools/sort_strings.pl pl
$BASEDIR/tools/sort_strings.pl ru
+ $BASEDIR/tools/sort_strings.pl nl
$BASEDIR/tools/check_strings.pl en > $BASEDIR/doc/language_issues.en
$BASEDIR/tools/check_strings.pl de > $BASEDIR/doc/language_issues.de
$BASEDIR/tools/check_strings.pl fr > $BASEDIR/doc/language_issues.fr
$BASEDIR/tools/check_strings.pl es > $BASEDIR/doc/language_issues.es
$BASEDIR/tools/check_strings.pl es > $BASEDIR/doc/language_issues.pl
$BASEDIR/tools/check_strings.pl ru > $BASEDIR/doc/language_issues.ru
+ $BASEDIR/tools/check_strings.pl nl > $BASEDIR/doc/language_issues.nl
$BASEDIR/tools/check_langs.sh > $BASEDIR/doc/language_missings
beautify message DONE
}
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f8622265fa476c1d53874184dc7e1abaec878d64
by git＠ipfire.org 05 Feb '13
by git＠ipfire.org 05 Feb '13
05 Feb '13
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 f8622265fa476c1d53874184dc7e1abaec878d64 (commit)
from f1a58c3322701040090efd1b7949f448c3128d5a (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 f8622265fa476c1d53874184dc7e1abaec878d64
Author: H. Horsten <dutchtux(a)gmail.com>
Date: Tue Feb 5 21:11:02 2013 +0100
Add Nederlands (Dutch) language support.
-----------------------------------------------------------------------
Summary of changes:
doc/{language_issues.en => language_issues.nl} | 5 +
langs/nl/cgi-bin/nl.pl | 2271 ++++++++++++++++++++++++
langs/nl/install/lang_nl.c | 590 ++++++
3 files changed, 2866 insertions(+)
copy doc/{language_issues.en => language_issues.nl} (99%)
create mode 100644 langs/nl/cgi-bin/nl.pl
create mode 100644 langs/nl/install/lang_nl.c
Difference in files:
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
new file mode 100644
index 0000000..f43280a
--- /dev/null
+++ b/doc/language_issues.nl
@@ -0,0 +1,514 @@
+WARNING: translation string unused: Client status and controlc
+WARNING: translation string unused: ConnSched scheduler
+WARNING: translation string unused: ConnSched select profile
+WARNING: translation string unused: HDD temperature
+WARNING: translation string unused: Level7 rule
+WARNING: translation string unused: Local VPN IP
+WARNING: translation string unused: Ping
+WARNING: translation string unused: Remote IP
+WARNING: translation string unused: Remote VPN IP
+WARNING: translation string unused: Resolv
+WARNING: translation string unused: TOS Bits
+WARNING: translation string unused: Verbose
+WARNING: translation string unused: access refused with this oinkcode
+WARNING: translation string unused: add network
+WARNING: translation string unused: add new ovpn
+WARNING: translation string unused: add service
+WARNING: translation string unused: add-route
+WARNING: translation string unused: admin user password has been changed
+WARNING: translation string unused: administrator user password
+WARNING: translation string unused: advproxy LDAP auth
+WARNING: translation string unused: advproxy NTLM auth
+WARNING: translation string unused: advproxy advanced proxy
+WARNING: translation string unused: advproxy chgwebpwd ERROR
+WARNING: translation string unused: advproxy chgwebpwd SUCCESS
+WARNING: translation string unused: advproxy chgwebpwd change password
+WARNING: translation string unused: advproxy chgwebpwd change web password
+WARNING: translation string unused: advproxy chgwebpwd new password
+WARNING: translation string unused: advproxy chgwebpwd new password confirm
+WARNING: translation string unused: advproxy chgwebpwd old password
+WARNING: translation string unused: advproxy chgwebpwd username
+WARNING: translation string unused: advproxy cre disabled
+WARNING: translation string unused: advproxy errmsg change fail
+WARNING: translation string unused: advproxy errmsg change success
+WARNING: translation string unused: advproxy errmsg invalid user
+WARNING: translation string unused: advproxy errmsg no password
+WARNING: translation string unused: advproxy errmsg password incorrect
+WARNING: translation string unused: advproxy no cre groups
+WARNING: translation string unused: advproxy ssadvanced proxy
+WARNING: translation string unused: advproxy update information
+WARNING: translation string unused: advproxy update notification
+WARNING: translation string unused: alcatelusb help
+WARNING: translation string unused: alcatelusb upload
+WARNING: translation string unused: all interfaces
+WARNING: translation string unused: all updates installed
+WARNING: translation string unused: allmsg
+WARNING: translation string unused: alt information
+WARNING: translation string unused: alt ovpn
+WARNING: translation string unused: and
+WARNING: translation string unused: ansi t1.483
+WARNING: translation string unused: apply
+WARNING: translation string unused: archive not exist
+WARNING: translation string unused: available updates
+WARNING: translation string unused: backup archive
+WARNING: translation string unused: backup clear archive
+WARNING: translation string unused: backup config floppy
+WARNING: translation string unused: backup configuration
+WARNING: translation string unused: backup erase key
+WARNING: translation string unused: backup explain key
+WARNING: translation string unused: backup explain key li1
+WARNING: translation string unused: backup explain key li2
+WARNING: translation string unused: backup explain key li3
+WARNING: translation string unused: backup explain key no1
+WARNING: translation string unused: backup explain key no2
+WARNING: translation string unused: backup export key
+WARNING: translation string unused: backup extract key
+WARNING: translation string unused: backup generate key
+WARNING: translation string unused: backup import dat file
+WARNING: translation string unused: backup import key
+WARNING: translation string unused: backup key
+WARNING: translation string unused: backup key file
+WARNING: translation string unused: backup key info
+WARNING: translation string unused: backup media info
+WARNING: translation string unused: backup missing key
+WARNING: translation string unused: backup password
+WARNING: translation string unused: backup protect key password
+WARNING: translation string unused: backup sets
+WARNING: translation string unused: backup to floppy
+WARNING: translation string unused: bad characters in
+WARNING: translation string unused: bewan adsl pci st
+WARNING: translation string unused: bewan adsl usb
+WARNING: translation string unused: bitrate
+WARNING: translation string unused: bleeding rules
+WARNING: translation string unused: blue access use hint
+WARNING: translation string unused: blue interface
+WARNING: translation string unused: cache management
+WARNING: translation string unused: cache size
+WARNING: translation string unused: calamaris report interval (in minutes)
+WARNING: translation string unused: calc traffic all x minutes
+WARNING: translation string unused: capsinactive
+WARNING: translation string unused: ccd err iroute
+WARNING: translation string unused: ccd err netadr
+WARNING: translation string unused: cfg restart
+WARNING: translation string unused: check for net traffic update
+WARNING: translation string unused: choose config
+WARNING: translation string unused: choose media
+WARNING: translation string unused: clear cache
+WARNING: translation string unused: compression
+WARNING: translation string unused: connect
+WARNING: translation string unused: connect the modem
+WARNING: translation string unused: core notice 1
+WARNING: translation string unused: core notice 2
+WARNING: translation string unused: core notice 3
+WARNING: translation string unused: could not connect to
+WARNING: translation string unused: could not connect to www ipcop org
+WARNING: translation string unused: could not connect to www ipfire org
+WARNING: translation string unused: could not create directory
+WARNING: translation string unused: could not download latest patch list
+WARNING: translation string unused: could not download the available updates list
+WARNING: translation string unused: could not open available updates file
+WARNING: translation string unused: could not open installed updates file
+WARNING: translation string unused: could not open update information file
+WARNING: translation string unused: create
+WARNING: translation string unused: create new backup
+WARNING: translation string unused: current dynamic leases
+WARNING: translation string unused: current media
+WARNING: translation string unused: current ovpn
+WARNING: translation string unused: current profile
+WARNING: translation string unused: custom networks
+WARNING: translation string unused: custom services
+WARNING: translation string unused: daily firewallhits
+WARNING: translation string unused: dat without key
+WARNING: translation string unused: day-graph
+WARNING: translation string unused: dbfile
+WARNING: translation string unused: ddns help dnsmadeeasy
+WARNING: translation string unused: ddns help freedns
+WARNING: translation string unused: ddns help plus
+WARNING: translation string unused: debugme
+WARNING: translation string unused: deep scan directories
+WARNING: translation string unused: default networks
+WARNING: translation string unused: default services
+WARNING: translation string unused: dhcp base ip fixed lease
+WARNING: translation string unused: dhcp create fixed leases
+WARNING: translation string unused: dhcp fixed lease err1
+WARNING: translation string unused: dhcp fixed lease help1
+WARNING: translation string unused: dhcp mode
+WARNING: translation string unused: dhcp server disabled on blue interface
+WARNING: translation string unused: dhcp server enabled on blue interface
+WARNING: translation string unused: dial user password
+WARNING: translation string unused: dial user password has been changed
+WARNING: translation string unused: dialup settings
+WARNING: translation string unused: disconnect
+WARNING: translation string unused: display traffic at home
+WARNING: translation string unused: dns server
+WARNING: translation string unused: do not log this port list
+WARNING: translation string unused: donation-link
+WARNING: translation string unused: done
+WARNING: translation string unused: driver
+WARNING: translation string unused: dynamic dns client
+WARNING: translation string unused: eciadsl help
+WARNING: translation string unused: eciadsl upload
+WARNING: translation string unused: edit network
+WARNING: translation string unused: edit service
+WARNING: translation string unused: editor
+WARNING: translation string unused: email server can not be empty
+WARNING: translation string unused: enable javascript
+WARNING: translation string unused: enabled on
+WARNING: translation string unused: enabledtitle
+WARNING: translation string unused: encrypted
+WARNING: translation string unused: err bk 1
+WARNING: translation string unused: err bk 10 password
+WARNING: translation string unused: err bk 2 key
+WARNING: translation string unused: err bk 3 tar
+WARNING: translation string unused: err bk 4 gz
+WARNING: translation string unused: err bk 5 encrypt
+WARNING: translation string unused: err rs 1
+WARNING: translation string unused: err rs 6 decrypt
+WARNING: translation string unused: err rs 7 untartst
+WARNING: translation string unused: err rs 8 untar
+WARNING: translation string unused: error config
+WARNING: translation string unused: error external access
+WARNING: translation string unused: expected
+WARNING: translation string unused: exportkey
+WARNING: translation string unused: external access rule changed
+WARNING: translation string unused: extrahd unable to read
+WARNING: translation string unused: extrahd unable to write
+WARNING: translation string unused: filename
+WARNING: translation string unused: firewall graphs
+WARNING: translation string unused: firewall log viewer
+WARNING: translation string unused: firmware
+WARNING: translation string unused: firmware upload
+WARNING: translation string unused: force update
+WARNING: translation string unused: frequency
+WARNING: translation string unused: fritzdsl help
+WARNING: translation string unused: fritzdsl upload
+WARNING: translation string unused: from email adr
+WARNING: translation string unused: from email pw
+WARNING: translation string unused: from email server
+WARNING: translation string unused: from email user
+WARNING: translation string unused: from warn email bad
+WARNING: translation string unused: g.dtm
+WARNING: translation string unused: g.lite
+WARNING: translation string unused: gen static key
+WARNING: translation string unused: generate
+WARNING: translation string unused: genkey
+WARNING: translation string unused: green interface
+WARNING: translation string unused: gz with key
+WARNING: translation string unused: hint
+WARNING: translation string unused: host
+WARNING: translation string unused: host configuration
+WARNING: translation string unused: hostname and domain already in use
+WARNING: translation string unused: hour-graph
+WARNING: translation string unused: hours2
+WARNING: translation string unused: ibod for dual isdn only
+WARNING: translation string unused: icmp selected but no type
+WARNING: translation string unused: icmp type
+WARNING: translation string unused: id
+WARNING: translation string unused: ids preprocessor
+WARNING: translation string unused: import
+WARNING: translation string unused: importkey
+WARNING: translation string unused: in
+WARNING: translation string unused: incorrect password
+WARNING: translation string unused: insert floppy
+WARNING: translation string unused: insert removable device
+WARNING: translation string unused: install new update
+WARNING: translation string unused: installed
+WARNING: translation string unused: installed updates
+WARNING: translation string unused: intrusion detection system log viewer
+WARNING: translation string unused: invalid cache size
+WARNING: translation string unused: invalid date entered
+WARNING: translation string unused: invalid downlink speed
+WARNING: translation string unused: invalid loaded file
+WARNING: translation string unused: invalid md5sum
+WARNING: translation string unused: invalid port list
+WARNING: translation string unused: invalid time entered
+WARNING: translation string unused: invalid uplink speed
+WARNING: translation string unused: invalid upstream proxy username or password setting
+WARNING: translation string unused: invert
+WARNING: translation string unused: ip address in use
+WARNING: translation string unused: ipfire side
+WARNING: translation string unused: iptable rules
+WARNING: translation string unused: isdn
+WARNING: translation string unused: isdn settings
+WARNING: translation string unused: isdn1
+WARNING: translation string unused: isdn2
+WARNING: translation string unused: javascript menu error1
+WARNING: translation string unused: javascript menu error2
+WARNING: translation string unused: kernel version
+WARNING: translation string unused: key stuff
+WARNING: translation string unused: lateprompting
+WARNING: translation string unused: length
+WARNING: translation string unused: line
+WARNING: translation string unused: loaded modules
+WARNING: translation string unused: local hard disk
+WARNING: translation string unused: localkeyfile
+WARNING: translation string unused: log enabled
+WARNING: translation string unused: log viewer
+WARNING: translation string unused: loosedirectorychecking
+WARNING: translation string unused: ls_dhcpd
+WARNING: translation string unused: ls_disk space
+WARNING: translation string unused: ls_free/swan
+WARNING: translation string unused: ls_httpd
+WARNING: translation string unused: ls_init
+WARNING: translation string unused: ls_kernel
+WARNING: translation string unused: ls_modprobe
+WARNING: translation string unused: ls_pam_unix
+WARNING: translation string unused: ls_sshd
+WARNING: translation string unused: ls_syslogd
+WARNING: translation string unused: mac address error not 00
+WARNING: translation string unused: manage ovpn
+WARNING: translation string unused: manual control and status
+WARNING: translation string unused: marked
+WARNING: translation string unused: max incoming size
+WARNING: translation string unused: max outgoing size
+WARNING: translation string unused: max size
+WARNING: translation string unused: mbmon fan in
+WARNING: translation string unused: mbmon graphs
+WARNING: translation string unused: mbmon temp in
+WARNING: translation string unused: mbmon value
+WARNING: translation string unused: min size
+WARNING: translation string unused: missing dat
+WARNING: translation string unused: missing gz
+WARNING: translation string unused: modem on com1
+WARNING: translation string unused: modem on com2
+WARNING: translation string unused: modem on com3
+WARNING: translation string unused: modem on com4
+WARNING: translation string unused: modem on com5
+WARNING: translation string unused: modulation
+WARNING: translation string unused: month-graph
+WARNING: translation string unused: monthly firewallhits
+WARNING: translation string unused: monthly start day bad
+WARNING: translation string unused: monthly traffic bad
+WARNING: translation string unused: monthly volume
+WARNING: translation string unused: monthly volume start day
+WARNING: translation string unused: monthly volume start day short
+WARNING: translation string unused: mount
+WARNING: translation string unused: nat-traversal
+WARNING: translation string unused: net address
+WARNING: translation string unused: net config type
+WARNING: translation string unused: net config type help
+WARNING: translation string unused: net-traffic configuration
+WARNING: translation string unused: network added
+WARNING: translation string unused: network configuration
+WARNING: translation string unused: network removed
+WARNING: translation string unused: network status information
+WARNING: translation string unused: network traffic graphs
+WARNING: translation string unused: network updated
+WARNING: translation string unused: networks settings
+WARNING: translation string unused: new optionsfw must boot
+WARNING: translation string unused: no alcatelusb firmware
+WARNING: translation string unused: no cfg upload
+WARNING: translation string unused: no eciadsl synch.bin file
+WARNING: translation string unused: no fritzdsl driver
+WARNING: translation string unused: no information available
+WARNING: translation string unused: no modem selected
+WARNING: translation string unused: no set selected
+WARNING: translation string unused: nonetworkname
+WARNING: translation string unused: noservicename
+WARNING: translation string unused: notes
+WARNING: translation string unused: o-no
+WARNING: translation string unused: o-yes
+WARNING: translation string unused: online help en
+WARNING: translation string unused: only red
+WARNING: translation string unused: openvpn disabled
+WARNING: translation string unused: openvpn enabled
+WARNING: translation string unused: optional data
+WARNING: translation string unused: optionsfw portlist hint
+WARNING: translation string unused: optionsfw warning
+WARNING: translation string unused: or
+WARNING: translation string unused: original
+WARNING: translation string unused: other countries
+WARNING: translation string unused: out
+WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname
+WARNING: translation string unused: override mtu
+WARNING: translation string unused: ovpn
+WARNING: translation string unused: ovpn config
+WARNING: translation string unused: ovpn dl
+WARNING: translation string unused: ovpn log
+WARNING: translation string unused: ovpn_fastio
+WARNING: translation string unused: ovpn_fragment
+WARNING: translation string unused: ovpn_mssfix
+WARNING: translation string unused: ovpn_mtudisc
+WARNING: translation string unused: ovpn_processprio
+WARNING: translation string unused: ovpn_processprioD
+WARNING: translation string unused: ovpn_processprioED
+WARNING: translation string unused: ovpn_processprioEH
+WARNING: translation string unused: ovpn_processprioEN
+WARNING: translation string unused: ovpn_processprioH
+WARNING: translation string unused: ovpn_processprioLN
+WARNING: translation string unused: ovpn_processprioN
+WARNING: translation string unused: ovpn_processprioVD
+WARNING: translation string unused: ovpn_processprioVH
+WARNING: translation string unused: ovpnstatus log
+WARNING: translation string unused: ovpnsys log
+WARNING: translation string unused: package failed to install
+WARNING: translation string unused: pakfire core update auto
+WARNING: translation string unused: pakfire updates
+WARNING: translation string unused: password contains illegal characters
+WARNING: translation string unused: password crypting key
+WARNING: translation string unused: passwords must be at least 6 characters in length
+WARNING: translation string unused: phonebook entry
+WARNING: translation string unused: ping disabled
+WARNING: translation string unused: polfile
+WARNING: translation string unused: ports
+WARNING: translation string unused: pots
+WARNING: translation string unused: pppoe
+WARNING: translation string unused: present
+WARNING: translation string unused: profiles
+WARNING: translation string unused: proxy access graphs
+WARNING: translation string unused: proxy no proxy extend
+WARNING: translation string unused: proxy no proxy local
+WARNING: translation string unused: proxy port
+WARNING: translation string unused: psk
+WARNING: translation string unused: quick control
+WARNING: translation string unused: reboot schedule
+WARNING: translation string unused: rebooting
+WARNING: translation string unused: refresh update list
+WARNING: translation string unused: released
+WARNING: translation string unused: removable device advice
+WARNING: translation string unused: reportfile
+WARNING: translation string unused: requested data
+WARNING: translation string unused: restore hardware settings
+WARNING: translation string unused: root
+WARNING: translation string unused: root path
+WARNING: translation string unused: root user password
+WARNING: translation string unused: route subnet is invalid
+WARNING: translation string unused: router ip
+WARNING: translation string unused: rules already up to date
+WARNING: translation string unused: safe removal of umounted device
+WARNING: translation string unused: save error
+WARNING: translation string unused: select media
+WARNING: translation string unused: selecttraffic
+WARNING: translation string unused: send email notification
+WARNING: translation string unused: send test mail
+WARNING: translation string unused: server reserved
+WARNING: translation string unused: service added
+WARNING: translation string unused: service removed
+WARNING: translation string unused: service updated
+WARNING: translation string unused: servicename
+WARNING: translation string unused: services settings
+WARNING: translation string unused: shaping add options
+WARNING: translation string unused: shaping list options
+WARNING: translation string unused: show areas
+WARNING: translation string unused: show lines
+WARNING: translation string unused: shutdown control
+WARNING: translation string unused: shutdown2
+WARNING: translation string unused: shutting down
+WARNING: translation string unused: sitekeyfile
+WARNING: translation string unused: smbreload
+WARNING: translation string unused: sort ascending
+WARNING: translation string unused: sort descending
+WARNING: translation string unused: squid extension methods
+WARNING: translation string unused: squid extension methods invalid
+WARNING: translation string unused: squid fix cache
+WARNING: translation string unused: ssh access tip
+WARNING: translation string unused: ssh1 disabled
+WARNING: translation string unused: ssh1 enabled
+WARNING: translation string unused: ssh1 support
+WARNING: translation string unused: ssnetwork status
+WARNING: translation string unused: sspasswords
+WARNING: translation string unused: ssproxy graphs
+WARNING: translation string unused: sssystem status
+WARNING: translation string unused: sstraffic graphs
+WARNING: translation string unused: subject test
+WARNING: translation string unused: subject warn
+WARNING: translation string unused: subnet
+WARNING: translation string unused: subnet is invalid
+WARNING: translation string unused: successfully refreshed updates list
+WARNING: translation string unused: system graphs
+WARNING: translation string unused: system log viewer
+WARNING: translation string unused: system status information
+WARNING: translation string unused: test
+WARNING: translation string unused: test email could not be sent
+WARNING: translation string unused: test email was sent
+WARNING: translation string unused: the following update was successfully installed
+WARNING: translation string unused: there are updates
+WARNING: translation string unused: there are updates available
+WARNING: translation string unused: this feature has been sponsored by
+WARNING: translation string unused: this is not a valid archive
+WARNING: translation string unused: this is not an authorised update
+WARNING: translation string unused: this months volume
+WARNING: translation string unused: this update is already installed
+WARNING: translation string unused: this weeks volume
+WARNING: translation string unused: time date manually reset
+WARNING: translation string unused: to email adr
+WARNING: translation string unused: to install an update
+WARNING: translation string unused: to warn email bad
+WARNING: translation string unused: too long 80 char max
+WARNING: translation string unused: traffic back
+WARNING: translation string unused: traffic calc time
+WARNING: translation string unused: traffic calc time bad
+WARNING: translation string unused: traffic info messages
+WARNING: translation string unused: traffic monitor
+WARNING: translation string unused: traffic shaping
+WARNING: translation string unused: traffic shaping settings
+WARNING: translation string unused: traffic warn level bad
+WARNING: translation string unused: trafficblue
+WARNING: translation string unused: trafficdate
+WARNING: translation string unused: trafficfrom
+WARNING: translation string unused: trafficgreen
+WARNING: translation string unused: trafficin
+WARNING: translation string unused: trafficorange
+WARNING: translation string unused: trafficout
+WARNING: translation string unused: trafficred
+WARNING: translation string unused: trafficsum
+WARNING: translation string unused: trafficto
+WARNING: translation string unused: transfer limits
+WARNING: translation string unused: transparent on
+WARNING: translation string unused: umount
+WARNING: translation string unused: umount removable media before to unplug
+WARNING: translation string unused: unencrypted
+WARNING: translation string unused: unknown
+WARNING: translation string unused: update transcript
+WARNING: translation string unused: updates
+WARNING: translation string unused: updates is old1
+WARNING: translation string unused: updates is old2
+WARNING: translation string unused: updxlrtr children
+WARNING: translation string unused: updxlrtr invalid num of children
+WARNING: translation string unused: updxlrtr unknown
+WARNING: translation string unused: updxlrtr update information
+WARNING: translation string unused: updxlrtr update notification
+WARNING: translation string unused: upload fcdsl.o
+WARNING: translation string unused: upload file
+WARNING: translation string unused: upload static key
+WARNING: translation string unused: upload successful
+WARNING: translation string unused: upload synch.bin
+WARNING: translation string unused: upload update file
+WARNING: translation string unused: upstream password
+WARNING: translation string unused: upstream proxy host:port
+WARNING: translation string unused: upstream username
+WARNING: translation string unused: uptime and users
+WARNING: translation string unused: urlfilter background image
+WARNING: translation string unused: urlfilter background text
+WARNING: translation string unused: urlfilter enable jpeg
+WARNING: translation string unused: urlfilter update information
+WARNING: translation string unused: urlfilter update notification
+WARNING: translation string unused: urlfilter update results
+WARNING: translation string unused: urlfilter upload background
+WARNING: translation string unused: use
+WARNING: translation string unused: use dov
+WARNING: translation string unused: use ibod
+WARNING: translation string unused: view log
+WARNING: translation string unused: vpn aggrmode
+WARNING: translation string unused: vpn incompatible use of defaultroute
+WARNING: translation string unused: vpn mtu invalid
+WARNING: translation string unused: vpn on blue
+WARNING: translation string unused: vpn on green
+WARNING: translation string unused: vpn on orange
+WARNING: translation string unused: vpn watch
+WARNING: translation string unused: warn when traffic reaches
+WARNING: translation string unused: web proxy configuration
+WARNING: translation string unused: week-graph
+WARNING: translation string unused: weekly firewallhits
+WARNING: translation string unused: xtaccess bad transfert
+WARNING: translation string unused: year-graph
+WARNING: translation string unused: yearly firewallhits
+WARNING: untranslated string: Scan for Songs
+WARNING: untranslated string: bytes
+WARNING: untranslated string: ccd iroute2
+WARNING: untranslated string: new
+WARNING: untranslated string: outgoing firewall reserved groupname
+WARNING: untranslated string: route config changed
+WARNING: untranslated string: routing config added
+WARNING: untranslated string: routing config changed
+WARNING: untranslated string: routing table
diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl
new file mode 100644
index 0000000..1bec570
--- /dev/null
+++ b/langs/nl/cgi-bin/nl.pl
@@ -0,0 +1,2271 @@
+%tr = (
+%tr,
+
+'Act as' => 'Fungeren als:',
+'Add Level7 rule' => 'Voeg Level7 regel toe',
+'Add Port Rule' => 'Voeg poortregel toe',
+'Add Rule' => 'Voeg regel toe',
+'Add a route' => 'Voeg een route toe',
+'Async logging enabled' => 'Inschakelen a-synchroon schrijven van het syslogbestand',
+'Choose Rule' => 'Kies <u>een</u> van de volgende regels.',
+'Class' => 'Klasse',
+'Class was deleted' => 'met mogelijke sub-klasse is verwijderd',
+'Client status and controlc' => 'Client status en controle:',
+'ConnSched action' => 'Actie:',
+'ConnSched add action' => 'Voeg actie toe',
+'ConnSched change profile title' => 'Gebruik profiel:',
+'ConnSched days' => 'Dagen:',
+'ConnSched down' => 'Omlaag',
+'ConnSched ipsecstart' => 'IPSec (her)starten',
+'ConnSched ipsecstop' => 'IPSec stoppen',
+'ConnSched reconnect' => 'Opnieuw verbinden',
+'ConnSched scheduled actions' => 'Ingeplande acties',
+'ConnSched scheduler' => 'Scheduler',
+'ConnSched select profile' => 'Selecteer profiel',
+'ConnSched time' => 'Tijd:',
+'ConnSched up' => 'Omhoog',
+'ConnSched weekdays' => 'Dagen van de week:',
+'Edit an existing route' => 'Wijzig een bestaande route',
+'Enter TOS' => 'Activeer of deactiveer TOS-bits <br /> en klik dan op <i>Save</i>.',
+'Existing Files' => 'Bestanden in database',
+'HDD temperature' => 'HDD temperatuur',
+'Level7 Protocol' => 'Level7-Protocol',
+'Level7 Rule' => 'Level7-Regel',
+'Level7 rule' => 'Level7 regel',
+'Local VPN IP' => 'Intern Netwerk (GROEN):',
+'MTU' => 'MTU grootte:',
+'Number of IPs for the pie chart' => 'Aantal IPs voor de taartdiagram',
+'Number of Ports for the pie chart' => 'Aantal poorten voor de taartdiagram',
+'OVPN' => 'OpenVPN',
+'OpenVPN' => 'OpenVPN',
+'Pages' => 'Pagina\'s',
+'Ping' => 'Ping:',
+'Port Rule' => 'Poort-Regel',
+'QoS not enabled' => 'QoS is niet ingeschakeld!',
+'Queuelenght' => 'Wachtrijlengte',
+'Remote IP' => 'Remote IP / Hostnaam (DynDNS):',
+'Remote VPN IP' => 'VPN Subnet (bijv. 10.0.10.0/255.255.255.0):',
+'Resolv' => 'Resolv-Retry:',
+'Scan for Files' => 'Scan voor bestanden',
+'Scan from Directory' => 'Scan vanuit directory',
+'Set time on boot' => 'Stel de tijd van de systeemklok in tijdens opstarten',
+'Subclass' => 'Sub-klasse',
+'TOS Bits' => 'TOS-Bits',
+'TOS Rule' => 'TOS-Regel',
+'TOS rule' => 'TOS-regel',
+'The class number does not match the specified interface.' => 'Het klasse-nummer komt niet overeen met de gespecificeerde interface.',
+'The destination IP address is invalid.' => 'Het doel IP-adres is ongeldig.',
+'The source IP address is invalid.' => 'Het bron IP-adres is ongeldig.',
+'Utilization on' => 'Verbruik op',
+'Verbose' => 'Uitgebreid:',
+'WakeOnLan' => 'Wake On Lan',
+'a ca certificate with this name already exists' => 'Een CA-certificaat met deze naam bestaat al.',
+'a connection with this common name already exists' => 'Een verbinding met deze algemene naam bestaat al.',
+'a connection with this name already exists' => 'Een verbinding met deze naam bestaat al.',
+'abort' => 'afbreken',
+'access allowed' => 'Toegang toegestaan van:',
+'access refused with this oinkcode' => 'Toegang geweigerd met deze Oink code.',
+'accounting' => 'Boekhouding',
+'accounting user nonpdc' => 'Boekhouding - niet-PDC Modus',
+'accounting user pdc' => 'Boekhouding - PDC-Modus',
+'action' => 'Actie',
+'activate' => 'Activeren',
+'activate user' => 'Activeer gebruiker',
+'active' => 'Actief',
+'add' => 'Toevoegen',
+'add a host' => 'Voeg een host toe:',
+'add a new rule' => 'Voeg een nieuwe regel toe:',
+'add cron' => 'Voeg een cronjob toe',
+'add device' => 'Voeg een apparaat toe',
+'add network' => 'Voeg een netwerk toe',
+'add new alias' => 'Voeg een nieuwe alias toe:',
+'add new lease' => 'Voeg een nieuwe vaste-lease toe',
+'add new ovpn' => 'OpenVPN Instellingen:',
+'add printer' => 'Voeg een printer toe',
+'add service' => 'Voeg een dienst toe',
+'add share' => 'Voeg een gedeelde schijf toe',
+'add subclass' => 'Voeg een sub-klasse toe',
+'add user' => 'Voeg gebruiker toe',
+'add xtaccess' => 'Voeg een externe toegang toe',
+'add-route' => 'Extra push route',
+'added from dhcp lease list' => 'Toegevoegd van DHCP lease-lijst.',
+'admin user password has been changed' => 'Beheerderswachtwoord is gewijzigd.',
+'admin users' => 'Gebruiker met beheerdersrechten.',
+'administrator user password' => 'Beheerderswachtwoord:',
+'adsl settings' => 'ADSL instellingen',
+'advanced' => 'Geavanceerd',
+'advanced server' => 'Geavanceerde server opties',
+'advproxy AUTH always required' => 'Authenticatie vereist voor ongelimiteerde bronadressen.',
+'advproxy AUTH auth cache TTL' => 'Authenticatie cache TTL (in minuten)',
+'advproxy AUTH global settings' => 'Globale authenticatie instellingen',
+'advproxy AUTH limit of IP addresses' => 'Limiet van aantal IP-adressen per gebruiker',
+'advproxy AUTH method' => 'Authenticatiemethode',
+'advproxy AUTH method ident' => 'identd',
+'advproxy AUTH method ldap' => 'LDAP',
+'advproxy AUTH method ncsa' => 'Lokaal',
+'advproxy AUTH method none' => 'Geen',
+'advproxy AUTH method ntlm' => 'Windows',
+'advproxy AUTH method radius' => 'RADIUS',
+'advproxy AUTH no auth' => 'Domeinen zonder authenticatie (een per regel)',
+'advproxy AUTH number of auth processes' => 'Aantal authenticatieprocessen',
+'advproxy AUTH realm' => 'Authenticatie domeinmelding',
+'advproxy AUTH user IP cache TTL' => 'Gebruiker/IP cache TTL (in minuten)',
+'advproxy IDENT authorized users' => 'Geautoriseerde gebruikers (een per regel)',
+'advproxy IDENT aware hosts' => 'Hosts die Ident ondersteunen (een per regel)',
+'advproxy IDENT identd settings' => 'Algemene identd instellingen',
+'advproxy IDENT required' => 'Vereist identd authenticatie',
+'advproxy IDENT timeout' => 'Ident time-out (in seconden)',
+'advproxy IDENT unauthorized users' => 'Ongeautoriseerde gebruikers (een per regel)',
+'advproxy IDENT use negative access list' => 'Gebruik negatieve toegangscontrole',
+'advproxy IDENT use positive access list' => 'Gebruik positieve toegangscontrole',
+'advproxy IDENT user based access restrictions' => 'Gebruikersgebaseerde toegangsrestricties',
+'advproxy LDAP ADS' => 'Active Directory',
+'advproxy LDAP NDS' => 'Novell eDirectory',
+'advproxy LDAP V2' => 'LDAP versie 2',
+'advproxy LDAP V3' => 'LDAP versie 3',
+'advproxy LDAP auth' => 'LDAP authenticatie',
+'advproxy LDAP basedn' => 'Base DN',
+'advproxy LDAP binddn password' => 'Bind DN wachtwoord',
+'advproxy LDAP binddn settings' => 'Bind DN instellingen',
+'advproxy LDAP binddn username' => 'Bind DN gebruikersnaam',
+'advproxy LDAP common settings' => 'Algemene LDAP instellingen',
+'advproxy LDAP group access control' => 'Groepsgebaseerde toegangscontrole',
+'advproxy LDAP group required' => 'Vereiste groep',
+'advproxy LDAP port' => 'Poort',
+'advproxy LDAP server' => 'LDAP Server',
+'advproxy LDAP type' => 'LDAP type',
+'advproxy MIME block types' => ' Blokkeer deze MIME types (een per regel)',
+'advproxy MIME filter' => 'MIME type filter',
+'advproxy NCSA auth' => 'Lokale gebruiker authenticatie',
+'advproxy NCSA create user' => 'Aanmaken gebruiker',
+'advproxy NCSA group' => 'Groep',
+'advproxy NCSA group membership' => 'Groepslidmaatschap',
+'advproxy NCSA grp disabled' => 'Uitgeschakeld',
+'advproxy NCSA grp extended' => 'Uitgebreid',
+'advproxy NCSA grp standard' => 'Standaard',
+'advproxy NCSA min password length' => 'Minimale wachtwoordlengte',
+'advproxy NCSA no accounts' => 'Geen gebruikersaccounts beschikbaar',
+'advproxy NCSA password' => 'Wachtwoord',
+'advproxy NCSA password confirm' => 'Wachtwoord (bevestig)',
+'advproxy NCSA redirector bypass' => 'Omzeil omleidingen voor leden van de groep',
+'advproxy NCSA update user' => 'Bijwerken gebruiker',
+'advproxy NCSA user accounts' => 'Gebruikersaccounts',
+'advproxy NCSA user management' => 'Gebruikersbeheer',
+'advproxy NCSA username' => 'Gebruikersnaam',
+'advproxy NTLM BDC hostname' => 'BDC hostnaam',
+'advproxy NTLM PDC hostname' => 'PDC hostnaam',
+'advproxy NTLM auth' => 'Windows NT/2003 authenticatie',
+'advproxy NTLM auth mode' => 'Authenticatie modus',
+'advproxy NTLM authorized users' => 'Geautoriseerde domeingebruikers (een per regel)',
+'advproxy NTLM domain' => 'Domein',
+'advproxy NTLM domain settings' => 'Algemene domeininstellingen',
+'advproxy NTLM unauthorized users' => 'Ongeautoriseerde domeingebruikers (een per regel)',
+'advproxy NTLM use integrated auth' => 'Gebruik Windows geïntegreerde authenticatie',
+'advproxy NTLM use negative access list' => 'Gebruik negatieve toegangscontrole',
+'advproxy NTLM use positive access list' => 'Gebruik positieve toegangscontrole',
+'advproxy NTLM user based access restrictions' => 'Gebruikersgebaseerde toegangsrestrictie',
+'advproxy RADIUS authorized users' => 'Geautoriseerde gebruikers (een per regel)',
+'advproxy RADIUS identifier' => 'Identificatie',
+'advproxy RADIUS port' => 'Poort',
+'advproxy RADIUS radius settings' => 'Algemene RADIUS instellingen',
+'advproxy RADIUS secret' => 'Gedeeld geheim',
+'advproxy RADIUS server' => 'RADIUS Server',
+'advproxy RADIUS unauthorized users' => 'Ongeautoriseerde gebruikers (een per regel)',
+'advproxy RADIUS use negative access list' => 'Gebruik negatieve toegangscontrole',
+'advproxy RADIUS use positive access list' => 'Gebruik positieve toegangscontrole',
+'advproxy RADIUS user based access restrictions' => 'Gebruikersgebaseerde toegangsrestrictie',
+'advproxy UA enable filter' => 'Gebruik browsercontrole',
+'advproxy access' => 'Toegang',
+'advproxy admin mail' => 'Cache beheerder e-mail',
+'advproxy advanced proxy' => 'Geavanceerde Proxy',
+'advproxy advanced web proxy' => 'Geavanceerde Web Proxy',
+'advproxy advanced web proxy configuration' => 'Geavanceerde web proxy configuratie',
+'advproxy allowed subnets' => 'Toegestane subnets (een per regel)',
+'advproxy allowed web browsers' => 'Toegestane clients voor web toegang',
+'advproxy back to main page' => 'Terug naar hoofdpagina',
+'advproxy banned ip clients' => 'Verboden IP-adressen (een per regel)',
+'advproxy banned mac clients' => 'Verboden MAC-adressen (een per regel)',
+'advproxy cache management' => 'Cache beheer',
+'advproxy cache replacement policy' => 'Cache vervangingsbeleid',
+'advproxy chgwebpwd ERROR' => 'F O U T :',
+'advproxy chgwebpwd SUCCESS' => 'S U C C E S V O L :',
+'advproxy chgwebpwd change password' => 'Wijzig wachtwoord',
+'advproxy chgwebpwd change web password' => 'W i j z i g w e b t o e g a n g w a c h t w o o r d',
+'advproxy chgwebpwd new password' => 'Nieuw wachtwoord',
+'advproxy chgwebpwd new password confirm' => 'Nieuw wachtwoord (bevestig)',
+'advproxy chgwebpwd old password' => 'Huidig wachtwoord',
+'advproxy chgwebpwd username' => 'Gebruikersnaam',
+'advproxy classroom extensions' => 'Klaslokaal uitbreidingen',
+'advproxy clear cache' => 'Cache opschonen',
+'advproxy client IP forwarding' => 'Client IP-adres doorsturen',
+'advproxy common settings' => 'Algemene instellingen',
+'advproxy content based throttling' => 'Gebruik bandbreedtebeperking op basis van inhoud',
+'advproxy cre disabled' => 'De beheerinterface is uitgeschakeld door de beheerder',
+'advproxy cre group definitions' => 'Klaslokaal groepsdefinities',
+'advproxy cre supervisors' => 'Supervisor IP-adressen (een per regel)',
+'advproxy destination ports' => 'Bestemmingspoorten',
+'advproxy download throttling' => 'Downloadbeperkingen',
+'advproxy enabled' => 'Ingeschakeld',
+'advproxy enabled on' => 'Ingeschakeld op',
+'advproxy errmsg acl cannot be empty' => 'De toegangscontrolelijst kan niet leeg zijn',
+'advproxy errmsg auth cache ttl' => 'Ongeldige waarde voor authenticatie cache TTL',
+'advproxy errmsg auth children' => 'Ongeldig aantal authenticatieprocessen',
+'advproxy errmsg auth ipcache may not be null' => 'Authenticatie cache mag niet 0 zijn als IP-adres beperkingen gebruikt worden',
+'advproxy errmsg auth ipcache ttl' => 'Ongeldige waarde voor gebruiker/IP cache TTL',
+'advproxy errmsg cache' => 'De RAM cache-grootte is groter dan de harddisk cache-grootte:',
+'advproxy errmsg change fail' => 'Wachtwoord kon niet worden gewijzigd',
+'advproxy errmsg change success' => 'Wachtwoord voor webtoegang succesvol gewijzigd',
+'advproxy errmsg hdd cache size' => 'Ongeldige waarde voor harddisk cache-grootte (min 10 MB vereist)',
+'advproxy errmsg ident timeout' => 'Ongeldige ident time-out',
+'advproxy errmsg invalid bdc' => 'Ongeldige hostnaam voor back-up domeincontroller',
+'advproxy errmsg invalid destination port' => 'Ongeldige bestemmingspoort',
+'advproxy errmsg invalid ip or mask' => 'Ongeldig IP-adres of netwerkmasker',
+'advproxy errmsg invalid mac' => 'Ongeldig MAC-adres',
+'advproxy errmsg invalid pdc' => 'Ongeldige hostnaam voor primaire domeincontroller',
+'advproxy errmsg invalid proxy port' => 'Ongeldige proxy poort',
+'advproxy errmsg invalid upstream proxy' => 'Ongeldig upstream proxy IP-adres',
+'advproxy errmsg invalid upstream proxy username or password setting' => 'Ongeldige upstream proxy gebruikersnaam of wachtwoord instelling',
+'advproxy errmsg invalid user' => 'Gebruikersnaam bestaat niet',
+'advproxy errmsg ldap base dn' => 'LDAP base DN vereist',
+'advproxy errmsg ldap bind dn' => 'LDAP bind DN gebruikersnaam en wachtwoord zijn vereist',
+'advproxy errmsg ldap port' => 'Ongeldig LDAP poortnummer',
+'advproxy errmsg ldap server' => 'Ongeldig IP-adres voor LDAP Server',
+'advproxy errmsg max userip' => 'Ongeldig aantal IP-adressen per gebruiker',
+'advproxy errmsg mem cache size' => 'Ongeldige waarde voor de geheugen cache-grootte',
+'advproxy errmsg no browser' => 'Tenminste één browser of client moet geselecteerd worden voor webtoegang',
+'advproxy errmsg no password' => 'Wachtwoord mag niet leeg zijn',
+'advproxy errmsg no username' => 'Gebruikersnaam mag niet leeg zijn',
+'advproxy errmsg non-transparent proxy required' => 'Web proxy moet in niet-transparante modus draaien voor authenticatie',
+'advproxy errmsg ntlm domain' => 'Windows domeinnaam vereist',
+'advproxy errmsg ntlm pdc' => 'Hostnaam voor primaire domeincontroller vereist',
+'advproxy errmsg password incorrect' => 'Wachtwoord onjuist',
+'advproxy errmsg password length' => 'Ongeldige waarde voor wachtwoordlengte',
+'advproxy errmsg password length 1' => 'Wachtwoord moet tenminste ',
+'advproxy errmsg password length 2' => ' tekens bevatten',
+'advproxy errmsg passwords different' => 'Wachtwoorden zijn niet gelijk',
+'advproxy errmsg radius port' => 'Ongeldig RADIUS poortnummer',
+'advproxy errmsg radius secret' => 'RADIUS gedeeld geheim vereist',
+'advproxy errmsg radius server' => 'Ongeldig IP-adres voor RADIUS server',
+'advproxy errmsg time restriction' => 'Ongeldige tijdsbeperking',
+'advproxy error design' => 'Opmaak foutmeldingen',
+'advproxy error language' => 'Taal foutmeldingen',
+'advproxy fake referer' => 'Nepverwijzing die wordt gestuurd naar externe sites',
+'advproxy fake useragent' => 'Nep useragent die wordt gestuurd naar externe sites',
+'advproxy friday' => 'Vri',
+'advproxy from' => 'Van',
+'advproxy hdd cache size' => 'Harddisk cache-grootte (MB)',
+'advproxy invalid num of children' => 'Ongeldig aantal filterprocessen',
+'advproxy log enabled' => 'Log ingeschakeld',
+'advproxy log query' => 'Log zoektermen',
+'advproxy log settings' => 'Log instellingen',
+'advproxy log useragent' => 'Log useragents',
+'advproxy max download size' => 'Max. downloadgrootte (KB)',
+'advproxy max size' => 'Max. objectgrootte (KB)',
+'advproxy max upload size' => 'Max. uploadgrootte (KB)',
+'advproxy memory replacement policy' => 'Geheugen vervangingsbeleid',
+'advproxy min size' => 'Min. objectgrootte (KB)',
+'advproxy mode allow' => 'sta toe',
+'advproxy mode deny' => 'sta niet toe',
+'advproxy monday' => 'Maa',
+'advproxy network based access' => 'Netwerkgebaseerde toegangscontrole',
+'advproxy no cache sites' => 'Cache deze domeinen niet (een per regel)',
+'advproxy no clients defined' => 'Geen clients gedefinieerd',
+'advproxy no connection auth' => 'Geen verbindingsgerichte authenticatie doorsturen',
+'advproxy no cre groups' => 'Er zijn geen toegangsgroepen beschikbaar',
+'advproxy no internal proxy on blue' => 'Schakel interne proxytoegang uit van BLAUW naar andere subnetten',
+'advproxy no internal proxy on green' => 'Schakel interne proxytoegang uit naar GROEN vanaf andere subnetten',
+'advproxy number of L1 dirs' => 'Aantal nivo-1 subdirectory\'s',
+'advproxy off' => 'Proxy uit',
+'advproxy offline mode' => 'Schakel offline modus in',
+'advproxy on' => 'Proxy aan',
+'advproxy privacy' => 'Privacy',
+'advproxy proxy port' => 'Proxy poort',
+'advproxy ram cache size' => 'Geheugen cache-grootte (MB)',
+'advproxy redirector children' => 'Aantal filterprocessen',
+'advproxy reset' => 'Reset',
+'advproxy saturday' => 'Zat',
+'advproxy save and restart' => 'Opslaan en herstarten',
+'advproxy squid version' => 'Squid cache versie',
+'advproxy squidclamav' => 'SquidClamav',
+'advproxy ssadvanced proxy' => 'geavanceerde proxy',
+'advproxy ssl ports' => 'Toegestane SSL poorten (een per regel)',
+'advproxy standard' => 'Standaard',
+'advproxy standard ports' => 'Toegestane standaard poorten (een per regel)',
+'advproxy sunday' => 'Zon',
+'advproxy supervisor password' => 'Beheerderswachtwoord',
+'advproxy suppress version' => 'Onderdruk versie-informatie',
+'advproxy throttle binary' => 'Binaire bestanden',
+'advproxy throttle dskimg' => 'CD images',
+'advproxy throttle mmedia' => 'Multimedia',
+'advproxy throttling per host on' => 'Limiet per host op',
+'advproxy throttling total on' => 'Overall limiet op',
+'advproxy throttling unlimited' => 'ongelimiteerd',
+'advproxy thursday' => 'Don',
+'advproxy time restrictions' => 'Tijdrestricties',
+'advproxy to' => 'Tot',
+'advproxy transfer limits' => 'Transfer limieten',
+'advproxy transparent on' => 'Transparant op',
+'advproxy tuesday' => 'Din',
+'advproxy unknown' => 'Onbekend',
+'advproxy unrestricted ip clients' => 'Onbeperkte IP-adressen (een per regel)',
+'advproxy unrestricted mac clients' => 'Onbeperkte MAC-adressen (een per regel)',
+'advproxy update accelerator' => 'Update versneller',
+'advproxy update information' => 'Er is een geÃŒpdatete versie beschikbaar. Bezoek <a href="http://www.advproxy.net" target="_blank">http://www.advproxy.net</a> voor meer informatie.',
+'advproxy update notification' => 'Update notificatie!',
+'advproxy upstream password' => 'Upstream wachtwoord',
+'advproxy upstream proxy' => 'Upstream proxy',
+'advproxy upstream proxy host:port' => 'Upstream proxy (host:poort)',
+'advproxy upstream username' => 'Upstream gebruikersnaam',
+'advproxy url filter' => 'URL filter',
+'advproxy username forwarding' => 'Gebruikersnaam doorsturen',
+'advproxy via forwarding' => 'Proxy-adres doorsturen',
+'advproxy visible hostname' => 'Zichtbare hostnaam',
+'advproxy web browser' => 'Webbrowser',
+'advproxy wednesday' => 'Woe',
+'again' => 'Nogmaals:',
+'aktiv' => 'Actief',
+'album' => 'Album',
+'alcatelusb help' => 'Om gebruik te kunnen maken van de SpeedTouch 330 of SpeedTouch USB modem moet u eerst de firmware naar uw IPFire machine uploaden. U kunt de <b>Embedded Firmware</b> voor de SpeedTouch 330 downloaden van speedtouch.com. Pak het uit en upload het juiste bestand naar uw modem: KQD6_3.xxx als Rev<4 of ZZZL_3.xxx, voor Rev=4 gebruik het formulier hieronder.',
+'alcatelusb upload' => 'Upload Speedtouch USB firmware',
+'alias ip' => 'Alias IP',
+'aliases' => 'Aliassen',
+'aliases not active' => 'Aliassen zullen niet worden geactiveerd tenzij uw RODE interface STATISCH is.',
+'all' => 'Alle',
+'all interfaces' => 'Alle Interfaces',
+'all services' => 'Alle Diensten',
+'all updates installed' => 'Alle updates zijn geinstalleerd',
+'allmsg' => 'toon alles',
+'alt dialup' => 'Inbellen',
+'alt home' => 'Home',
+'alt information' => 'Informatie',
+'alt logs' => 'Logs',
+'alt ovpn' => 'OpenVPN',
+'alt proxy' => 'Proxy',
+'alt services' => 'Diensten',
+'alt system' => 'Systeem',
+'alt vpn' => 'VPN\'s',
+'and' => 'En',
+'ansi t1.483' => 'WORDT VERWIJDERD',
+'apcupsd' => 'APC-UPS status',
+'apply' => 'Nu toepassen',
+'april' => 'April',
+'archive not exist' => 'Configuratie archief bestaat niet',
+'are you sure' => 'Weet u het zeker?',
+'arp table entries' => 'ARP Tabelingangen:',
+'artist' => 'Artiest',
+'attemps' => 'Pogingen',
+'attention' => 'LET OP',
+'august' => 'Augustus',
+'authentication' => 'Authenticatie:',
+'automatic' => 'Automatisch',
+'available updates' => 'Beschikbare updates:',
+'average' => 'Gemiddeld',
+'avoid dod' => 'Gebruik deze optie niet met inbellen op afroep! Wordt voornamelijk gebruikt als IPFire achter een router staat. Uw RODE IP moet dan binnen het bereik vallen van een van de drie gereserveerde netwerken, bijv. 10/8, 172.16/12, 192.168/16',
+'back' => 'TERUG',
+'backup' => 'Back-up',
+'backup archive' => 'Back-up bestand (.dat)',
+'backup clear archive' => 'Opschonen Back-up bestand (.gz)',
+'backup config floppy' => 'Back-up configuratie - Floppy Disk',
+'backup configuration' => 'Back-up configuratie:',
+'backup erase key' => 'Wis sleutel',
+'backup explain key' => 'Back-ups zijn gecodeerd m.b.v. een sleutel. Om illegale manipulatie te voorkomen, zal IPFire alleen back-ups terugzetten die zijn gecodeerd met de sleutel die u hier opgeeft. Er zijn drie opties beschikbaar',
+'backup explain key li1' => 'Laat IPFire een sleutel voor u aanmaken.',
+'backup explain key li2' => 'Importeer een opgeslagen sleutel (mogelijk beveiligd met wachtwoord).',
+'backup explain key li3' => 'Extraheer een sleutel uit een niet-gecodeerde 1.4.10 back-up.',
+'backup explain key no1' => 'U moet deze sleutel bewaren als u van plan bent om nieuwe machines terug te zetten, IPFire accepteert slechts eenmaal het aanmaken/importeren van een sleutel',
+'backup explain key no2' => 'oude floppy back-ups zijn niet te gebruiken met deze sleutel.',
+'backup export key' => 'Exporteer sleutel',
+'backup extract key' => 'Extraheer sleutel',
+'backup from' => 'Back-up van',
+'backup generate key' => 'Genereer sleutel',
+'backup import dat file' => 'Importeer een back-up (.dat) bestand',
+'backup import key' => 'Importeer sleutel',
+'backup key' => 'Back-up encryptiesleutel',
+'backup key file' => 'Back-up sleutelbestand',
+'backup key info' => 'IPFire beperkt de toegang tot de back-upsleutel, dus u moet het root wachtwoord kennen. U heeft de mogelijkheid om deze sleutel buiten IPFire te beveiligen met een wachtwoord.',
+'backup media info' => 'Floppy\'s en/of ongeformateerde media kunnen vreemde partitie-groottes weergeven. In dit geval selecteert u het gehele apparaat. Vergeet niet de harddisk te ontkoppelen alvorens het apparaat te verwijderen. Let op: floppy\'s die hier worden aangemaakt kunnen niet worden gebruikt met het IPFire installatieprogramma!',
+'backup missing key' => 'De back-up sleutel is nodig om een set te herstellen',
+'backup password' => 'Back-up wachtwoord',
+'backup protect key password' => 'Back-up sleutelwachtwoord',
+'backup sets' => 'Back-up sets',
+'backup to floppy' => 'Back-up naar floppy',
+'backupaddon' => 'Back-up toevoeging',
+'backupprofile' => 'In geval het opnieuw verbinden mislukt, schakel dan over naar profiel',
+'backups' => 'back-ups',
+'backupwarning' => 'Zet a.u.b. eerst uw hoofdback-ups terug en daarna de toevoegde back-ups. Gebruik de originele bestandsnaam die u gebruikt heeft voor de download.',
+'bad characters in' => 'Ongeldige tekens in ',
+'bad characters in script field' => 'Ongeldige tekens in scriptveld',
+'bad characters in the telephone number field' => 'Ongeldige tekens in telefoonnummerveld',
+'bad destination range' => 'De bestemmingspoort heeft een eerste waarde die groter dan of gelijk is aan de tweede waarde.',
+'bad ignore filter' => 'Ongeldig negeer-filter:',
+'bad return code' => 'Helper-programma gaf een foutcode terug',
+'bad source range' => 'De bronpoort heeft een eerste waarde die groter dan of gelijk is aan de tweede waarde',
+'bandwidth usage' => 'bandbreedtegebruik (extern)',
+'bandwitherror' => 'U kunt de bandbreedte-instellingen niet wijzigen als QoS aanstaat. Zet QoS eerst uit.<p>',
+'bandwithsettings' => 'Bandbreedte-instellingen',
+'basic options' => 'Basis opties',
+'beep when ppp connects or disconnects' => 'Geef pieptoon als IPFire verbinding maakt of verbreekt.',
+'behind a proxy' => 'Achter een proxy:',
+'bewan adsl pci st' => 'WORDT VERWIJDERD',
+'bewan adsl usb' => 'WORDT VERWIJDERD',
+'bitrate' => 'Bitsnelheid',
+'bleeding rules' => 'Nieuwste Snort regels',
+'blue' => 'BLAUW',
+'blue access' => 'Blauwe toegang',
+'blue access use hint' => 'U moet een MAC-adres of een IP-adres invoeren voor een apparaat. U kunt ook beide invoeren.',
+'blue interface' => 'Blauwe Interface',
+'broadcast' => 'Broadcast',
+'broken pipe' => 'Broken pipe',
+'buffered memory' => 'Gebufferd geheugen',
+'buffers' => 'buffers',
+'bytes per second' => 'Bytes per seconde',
+'bytes received' => 'Bytes ontvangen',
+'bytes sent' => 'Bytes verzonden',
+'ca certificate' => 'CA Certificaat',
+'ca name' => 'CA naam',
+'cache management' => 'Cache beheer',
+'cache size' => 'Cache-grootte (MB):',
+'cached' => 'gecached',
+'cached memory' => 'Gecached geheugen ',
+'cached swap' => 'Gecached Swap',
+'calamaris available reports' => 'Beschikbare rapporten',
+'calamaris byte unit' => 'Byte unit',
+'calamaris create report' => 'Aanmaken rapport',
+'calamaris enable content report' => 'Gebruik content rapport',
+'calamaris enable distribution histogram' => 'Gebruik distributie histogram',
+'calamaris enable domain report' => 'Gebruik domein rapport',
+'calamaris enable performance report' => 'Gebruik performance rapport',
+'calamaris enable requester report' => 'Gebruik aanvrager rapport',
+'calamaris enable verbose reporting' => 'Gebruik uitgebreide rapportage',
+'calamaris high' => 'hoog',
+'calamaris histogram resolution' => 'Histogram resolutie',
+'calamaris low' => 'laag',
+'calamaris medium' => 'gemiddeld',
+'calamaris no reports available' => 'Geen rapporten beschikbaar',
+'calamaris none' => 'geen',
+'calamaris number of content types' => 'Aantal content types',
+'calamaris number of domains' => 'Aantal domeinen',
+'calamaris number of requested urls' => 'Aantal gevraagde URL\'s',
+'calamaris number of requesting hosts' => 'Aantal aanvragen hosts',
+'calamaris performance options' => 'Performance opties',
+'calamaris proxy reports' => 'Proxy Rapporten',
+'calamaris refresh list' => 'Ververs lijst',
+'calamaris report interval (in minutes)' => 'Rapportinterval (in minuten)',
+'calamaris report options' => 'Rapportopties',
+'calamaris report period' => 'Rapportage periode',
+'calamaris run as background task' => 'Draai als achtergrond taak',
+'calamaris show usernames' => 'Toon gebruikersnamen',
+'calamaris skip archived logfiles' => 'Gearchiveerde logbestanden overslaan',
+'calamaris unlimited' => 'ongelimiteerd',
+'calamaris view' => 'Bekijk',
+'calamaris view report' => 'Bekijk rapport',
+'calc traffic all x minutes' => 'Bereken verkeer van alle x minuten',
+'cancel' => 'Annuleren',
+'cancel-adv-options' => 'Annuleren',
+'cannot enable both nat traversal and compression' => 'Kan niet zowel NAT traversal als compressie inschakelen.',
+'cannot enable ntp without specifying primary' => 'Kan NTP niet gebruiken zonder primaire server.',
+'cannot specify secondary dns without specifying primary' => 'Kan geen tweede DNS server specificeren zonder primaire server.',
+'cannot specify secondary ntp without specifying primary' => 'Kan geen tweede NTP server specificeren zonder primaire server.',
+'cannot specify secondary wins without specifying primary' => 'Kan geen tweede WINS server specificeren zonder primaire server',
+'cant change certificates' => 'Kan certificaten niet veranderen.',
+'cant enable xtaccess' => 'De bijbehorende port-doorstuur regel is uitgeschakeld, daarom kunt u de externe toegang voor deze regel niet inschakelen.',
+'cant start openssl' => 'Kan OpenSSL niet starten',
+'caps all' => 'ALLE',
+'capsclosed' => 'VERBROKEN',
+'capsinactive' => 'INACTIEF',
+'capsopen' => 'VERBONDEN',
+'capswarning' => 'WAARSCHUWING',
+'caption' => 'Onderschrift',
+'ccd add' => 'Voeg netwerk toe',
+'ccd choose net' => 'Kies netwerk',
+'ccd client options' => 'Geavanceerde client opties',
+'ccd clientip' => 'Hostadres',
+'ccd dynrange' => 'Dynamische OpenVPN IP-adrespool',
+'ccd err blue' => 'Dit is het BLAUWE subnet.',
+'ccd err green' => 'Dit is het GROENE subnet.',
+'ccd err hostinnet' => 'U kunt dit netwerk niet verwijderen zolang het nog clients bevat.',
+'ccd err inuse' => 'Al in gebruik door een andere client.',
+'ccd err invalidname' => 'Ongeldige naam. Toegestane tekens zijn A-Z, a-z, koppelteken en spatie.',
+'ccd err invalidnet' => 'Ongeldig IP-adres. Formaat: 192.168.0.0/24 of 192.168.0.0/255.255.255.0.',
+'ccd err iroute' => 'Netwerkadres voor route is ongeldig.',
+'ccd err irouteexist' => 'Deze route is al in gebruik.',
+'ccd err isipsecnet' => 'Het gegeven subnet-adres is al in gebruik door een IPsec netwerk.',
+'ccd err isovpnnet' => 'Subnet-adres is al in gebruik voor OpenVPN Server.',
+'ccd err issubnet' => 'Subnet-adres is al in gebruik.',
+'ccd err name' => 'Kies een naam.',
+'ccd err nameexist' => 'Naam bestaat al.',
+'ccd err netadr' => 'Subnet-adres is ongeldig of bereik is te groot.',
+'ccd err netadrexist' => 'Netwerk bestaat al.',
+'ccd err orange' => 'Dit is het ORANJE subnet.',
+'ccd err red' => 'Dit is het RODE subnet.',
+'ccd err routeovpn' => 'Al in gebruik door OpenVPN server.',
+'ccd err routeovpn2' => 'Al verstuurd van OpenVPN server.',
+'ccd hint' => 'Op deze pagina kunt u statische netwerken definiëren vanwaar de roadwarrior clients vaste IP-adressen toegewezen kunnen krijgen.',
+'ccd invalid' => 'Ongeldig.',
+'ccd iroute' => 'IPFire heeft toegang tot deze netwerken aan de klant-site.',
+'ccd iroutehint' => 'Attentie! Als u deze instellingen wijzigt, moet u de OpenVPN server herstarten om deze instellingen actief te laten worden!',
+'ccd modify' => 'Wijzig netwerk',
+'ccd name' => 'Naam',
+'ccd net' => 'Statische IP-adrespools',
+'ccd noaddnet' => 'U kunt alleen nieuwe statische netwerken toevoegen als de OpenVPN server is gestopt.',
+'ccd none' => 'Geen',
+'ccd routes' => 'Routering:',
+'ccd subnet' => 'Subnet',
+'ccd used' => 'Gebruikte adressen',
+'cert' => 'Certificaat',
+'certificate' => 'Certificaat',
+'certificate authorities' => 'Certificaatinstanties',
+'certificate does not have a valid ca associated with it' => 'Certificaat heeft geen geldig CA hiermee verbonden.',
+'certificate file move failed' => 'Verplaatsen van certificaat bestand is mislukt',
+'cfg restart' => 'Een herstart wordt voorgesteld nadat de configuratie-archieven zijn teruggeplaatst.',
+'chain' => 'Keten',
+'change passwords' => 'Wijzig wachtwoorden',
+'change share' => 'Wijzig share-opties',
+'check for net traffic update' => 'Controleer op Net-Traffic updates',
+'check vpn lr' => 'Controle',
+'choose config' => 'Kies configuratie',
+'choose media' => 'Kies media',
+'cipher' => 'Encryptie:',
+'city' => 'Stad',
+'class in use' => 'Deze klasse is al in gebruik.',
+'clear cache' => 'Opschonen Cache',
+'clear playlist' => 'Lege speellijst',
+'clenabled' => 'Lever tijd aan het lokale netwerk',
+'click to disable' => 'Ingeschakeld (klik om uit te schakelen)',
+'click to enable' => 'Uitgeschakeld (klik om in te schakelen)',
+'client' => 'Naam werkstation',
+'clock has not been synchronized' => 'Klok is nog niet gesynchroniseerd.',
+'clock last synchronized at' => 'Klok was voor het laatst gesynchroniseerd om',
+'comment' => 'Omschrijving:',
+'common name' => 'Algemene naam',
+'community rules' => 'Emergingthreats.net community regels',
+'comp-lzo' => 'LZO-Compressie:',
+'compression' => 'Compressie:',
+'computer to modem rate' => 'Computer naar modem rato:',
+'concentrator name' => 'Concentrator naam:',
+'confirmation' => 'bevestiging',
+'connect' => 'OVPN Start / Verbind',
+'connect the modem' => 'Verbind de modem',
+'connect timeout' => 'Verbinding time-out:',
+'connected' => 'Verbonden',
+'connecting' => 'Verbinden...',
+'connection' => 'Connectie',
+'connection closed' => 'Niet verbonden...',
+'connection debugging' => 'Connectie debugging',
+'connection status and controlc' => 'Verbindingsstatus en controle:',
+'connection tracking' => 'IPTables verbindingen volgen',
+'connection type' => 'Verbindingstype',
+'connection type is invalid' => 'Verbindingstype is ongeldig.',
+'connections' => 'Verbindingen',
+'connections are associated with this ca. deleting the ca will delete these connections as well.' => 'verbindingen zijn geassocieerd met deze CA. Als deze CA wordt verwijderd worden de verbindingen ook verwijderd.',
+'connscheduler' => 'Verbinding taakplanner',
+'core notice 1' => '<strong>Let op:</strong> Er is een core-update van',
+'core notice 2' => 'naar',
+'core notice 3' => 'beschikbaar.',
+'could not be opened' => 'kan niet worden geopend.',
+'could not connect to' => 'Kan niet verbinden',
+'could not connect to www ipcop org' => 'Kan niet verbinden met www.ipfire.org',
+'could not connect to www ipfire org' => 'Kan niet verbinden met www.ipfire.org',
+'could not create directory' => 'kan directory niet aanmaken.',
+'could not download latest patch list' => 'Kan laatste patchlijst niet downloaden (niet verbonden).',
+'could not download latest updates' => 'Kan laatste updates niet downloaden.',
+'could not download the available updates list' => 'Kan de update-lijst niet downloaden.',
+'could not open available updates file' => 'Kan de update-lijst niet openen.',
+'could not open installed updates file' => 'Kan het geïnstalleerde update-bestand niet openen.',
+'could not open update information file' => 'Kan het update informatiebestand niet openen. Het update-bestand is beschadigd.',
+'could not retrieve common name from certificate' => 'Kan de gemeenschappelijke naam van het certificaat niet bepalen.',
+'country' => 'Land',
+'cpu frequency per' => 'CPU frequentie per',
+'cpu idle usage' => 'Idle CPU gebruik',
+'cpu interrupt usage' => 'Interrupt CPU gebruik',
+'cpu iowait usage' => 'CPU wacht op IO',
+'cpu irq usage' => 'IRQ CPU gebruik',
+'cpu nice usage' => 'Nice CPU gebruik',
+'cpu steal usage' => 'Steal CPU gebruik',
+'cpu system usage' => 'Systeem CPU gebruik',
+'cpu usage per' => 'CPU gebruik per',
+'cpu user usage' => 'Gebruikers CPU gebruik',
+'create' => 'Aanmaken',
+'create mask' => 'UNIX rechten voor nieuw aangemaakte bestanden',
+'create new backup' => 'Maak een nieuwe back-up set aan',
+'credits' => 'Credits',
+'crl' => 'Certificaatintrekkingslijst',
+'cron server' => 'CRON Server',
+'current' => 'Huidig',
+'current aliases' => 'Huidige aliassen:',
+'current class' => 'Huidige klasse',
+'current devices' => 'Huidige apparaten',
+'current dhcp leases on blue' => 'Huidige DHCP leases op BLAUW',
+'current dynamic leases' => 'Huidige dynamische leases',
+'current fixed leases' => 'Huidige vaste leases',
+'current hosts' => 'Huidige hosts:',
+'current media' => 'Huidige media',
+'current ovpn' => 'Actieve OVPN-Connectie:',
+'current playlist' => 'Huidige speellijst',
+'current profile' => 'Huidig profiel:',
+'current rules' => 'Huidige regels:',
+'custom networks' => 'Aangepaste netwerken',
+'custom services' => 'Aangepaste Diensten',
+'daily firewallhits' => 'dagelijkse firewalltreffers',
+'dat without key' => 'Een gecodeerd archief kan niet worden teruggezet zonder sleutel.',
+'date' => 'Datum',
+'date not in logs' => 'Geen (of gedeeltelijke) log bestaat voor de gevraagde dag',
+'day' => 'Dag',
+'day after' => 'Volgende dag',
+'day before' => 'Vorige dag',
+'day-graph' => 'Dag',
+'days' => 'dagen',
+'dbfile' => 'Db bestand',
+'ddns help dnsmadeeasy' => 'Voer uw ID in in het veld hostnaamveld (of een lijst met ID\'s gescheiden met een ;)',
+'ddns help freedns' => 'In the fied username enter your connect string',
+'ddns help plus' => '<b>+</b> marks a mandatory field',
+'ddns hostname added' => 'Dynamische DNS hostnaam toegevoegd',
+'ddns hostname modified' => 'Dynamische DNS hostnaam gewijzigd',
+'ddns hostname removed' => 'Dynamische DNS hostnaam verwijderd',
+'ddns minimize updates' => 'Minimaliseer updates: vóór de update, vergelijk het DNS IP-adres voor hostnaam "[host.]domein" met ROOD IP-adres.',
+'ddns noip prefix' => 'Om no-ip in groepsmodus te gebruiken, zet <b>%</b> voor de hostnaam',
+'deactivate' => 'deactiveer',
+'deactivate user' => 'deactiveer gebruiker',
+'debugme' => 'Nog niet geïmplementeerd',
+'december' => 'December',
+'deep scan directories' => 'Scan recursief',
+'def lease time' => 'Standaard leasetijd',
+'default lease time' => 'Standaard leasetijd (min.):',
+'default networks' => 'Standaard netwerken',
+'default renewal time' => 'Standaard vernieuwtijd',
+'default services' => 'Standaard Diensten',
+'defaultwarning' => 'WAARSCHUWING â Uw instellingen gaan verloren en worden vervangen door de standaard waarden.',
+'delete' => 'Verwijderen',
+'delete cron' => 'Verwijder cron-taak',
+'delete pc' => 'Verwijder werkstation',
+'delete share' => 'Verwijder share',
+'delete user' => 'Verwijder gebruiker',
+'demon login script' => 'Daemon inlogscript',
+'deprecated fs warn' => 'Verouderd bestandssysteem! Nieuwere kernels ondersteunen dit niet meer. Back-up en formateer opnieuw!',
+'description' => 'Omschrijving',
+'dest ip and port' => 'Best. IP: Poort',
+'destination' => 'Bestemming',
+'destination ip' => 'Bestemming IP',
+'destination ip bad' => 'Ongeldig bestemming-IP',
+'destination ip or net' => 'Bestemming IP of -net',
+'destination net' => 'Bestemmingsnet',
+'destination port' => 'Bestemmingspoort',
+'destination port numbers' => 'Bestemmingspoort moet een geldig poortnummer of poortreeks zijn.',
+'destination port overlaps' => 'Bestemming-poortreeks overlapt een bestaande poortreeks.',
+'detail level' => 'Detailniveau',
+'device' => 'Apparaat',
+'devices on blue' => 'Apparaten op BLAUW',
+'dhcp advopt add' => 'Voeg een DHCP optie toe',
+'dhcp advopt added' => 'DHCP optie toegevoegd',
+'dhcp advopt blank value' => 'DHCP optiewaarde kan niet leeg zijn.',
+'dhcp advopt custom definition' => 'Uw eigen optie definitie',
+'dhcp advopt definition' => 'Definitie',
+'dhcp advopt definition exists' => 'Deze definitie-optie bestaat al. U kunt het alleen wijzigen of verwijderen.',
+'dhcp advopt edit' => 'Wijzig een DHCP optie',
+'dhcp advopt help' => 'Toon optielijst',
+'dhcp advopt list' => 'Extra DHCP opties',
+'dhcp advopt modified' => 'DHCP optie aangepast',
+'dhcp advopt name' => 'Optienaam',
+'dhcp advopt removed' => 'DHCP optie verwijderd',
+'dhcp advopt scope' => 'Optiescope',
+'dhcp advopt scope global' => 'Globaal',
+'dhcp advopt scope help' => 'Globale scope of beperkte scope voor geselecteerde interfaces.',
+'dhcp advopt unknown' => 'DHCP optienaam niet herkend',
+'dhcp advopt value' => 'Optiewaarde',
+'dhcp allow bootp' => 'bootp clients toegestaan',
+'dhcp base ip fixed lease' => 'Basis IP voor aanmaken van vaste leases',
+'dhcp bootp pxe data' => 'Voer optionele bootp pxe data in voor deze vaste lease',
+'dhcp configuration' => 'DHCP configuratie',
+'dhcp create fixed leases' => 'Aanmaken vaste leases',
+'dhcp fixed lease err1' => 'Voor een vaste lease moet u het MAC-adres of de hostnaam invoeren, of beide.',
+'dhcp fixed lease help1' => 'IP-adressen mogen ook als FQDN worden ingevoerd',
+'dhcp mode' => 'DHCP',
+'dhcp server' => 'DHCP Server',
+'dhcp server disabled' => 'DHCP server uitgeschakeld. Gestopt.',
+'dhcp server disabled on blue interface' => 'DHCP server uitgeschakeld op de BLAUWE interface',
+'dhcp server enabled' => 'DHCP server ingeschakeld. Herstarten.',
+'dhcp server enabled on blue interface' => 'DHCP server ingeschakeld op de BLAUWE interface',
+'dhcp-options' => 'DHCP push opties',
+'dial' => 'Verbind',
+'dial profile' => 'Verbind met profile',
+'dial user password' => 'Inbel gebruikerswachtwoord:',
+'dial user password has been changed' => 'Inbel gebruikerswachtwoord is gewijzigd.',
+'dialing mode' => 'Inbelmodus:',
+'dialup red not ppp' => 'Inbelprofielen kunnen alleen gebruikt worden als <b>ROOD</b> op <b>PPP Inbellen</b> staat.<BR>Controleer de netwerkinstellingen.',
+'dialup settings' => 'Inbelinstellingen',
+'directory mask' => 'UNIX directory rechten',
+'directory writeable' => 'directory schrijfbaar',
+'disabled' => 'uitgeschakeld',
+'disconnect' => 'OVPN Stop / Verbreek',
+'disconnects' => 'Verbreekt',
+'disk access per' => 'Schijftoegang per',
+'disk usage' => 'Schijfgebruik',
+'display' => 'Scherm',
+'display charset' => 'Scherm tekenset',
+'display hostname in window title' => 'Toon hostnaam in venstertitel',
+'display traffic at home' => 'Toon netwerkverkeer op startpagina',
+'display webinterface effects' => 'Activeer effecten',
+'dl client arch' => 'Download clientpakket (zip)',
+'dmz' => 'DMZ',
+'dmz pinhole configuration' => 'DMZ pinhole configuratie',
+'dmz pinhole rule added' => 'DMZ pinhole regel toegevoegd; DMZ regel wordt herstart.',
+'dmz pinhole rule removed' => 'DMZ pinhole regel verwijderd; DMZ wordt herstart',
+'dmzpinholes for same net not necessary' => 'DMZ Pinholes zijn niet per se nodig voor hetzelfde net. Selecteer verschillende bron- of bestemmings-net.',
+'dns address deleted' => 'Succesvol verwijderd!',
+'dns address deleted txt' => 'De DNS-Server adressen zijn succesvol verwijderd.<br />U moet herstarten of opnieuw verbinden om de wijzigingen actief te laten worden!',
+'dns address done' => 'De DNS-server adresinstellingen zullen worden opgeslagen.',
+'dns address recon' => 'Probeert opnieuw te verbinden!',
+'dns check failed' => 'DNS check mislukt',
+'dns desc' => 'Als de rode interface de IP-adres informatie via DHCP ontvangt, zal de DNS server automatisch ingesteld worden. Hier kunt u de DNS instellingen wijzigen met uw eigen gegevens.',
+'dns error 0' => 'De IP-adressen van de <strong>primaire</strong> DNS server is niet geldig, controleer uw invoer!<br />Het opgegeven <strong>secondaire</strong> DNS server adres is geldig.',
+'dns error 01' => 'Het ingevoerde IP-adres van de <strong>primaire</strong> en <strong>secondaire</strong> DNS server zijn niet geldig, controleer uw invoer!',
+'dns error 1' => 'Het IP-adres van de <strong>secondaire</strong> DNS server is niet geldig, controleer uw invoer!<br />Het ingevoerde <strong>primaire</strong> DNS server adres is geldig.',
+'dns header' => 'Toekennen DNS server adressen alleen voor DHCP op rood',
+'dns list' => 'Lijst van publieke DNS servers',
+'dns menu' => 'Toekennen DNS server',
+'dns new 0' => 'Nieuw <strong>primair</strong> DNS server IP:',
+'dns new 1' => 'Nieuw <strong>secondair</strong> DNS server IP:',
+'dns proxy server' => 'DNS Proxy Server',
+'dns saved' => 'Succesvol opgeslagen!',
+'dns saved txt' => 'De twee ingevoerde DNS serveradressen zijn succesvol opgeslagen.<br />U moet herstarten of opnieuw verbinden om de wijzigingen actief te laten worden!',
+'dns server' => 'DNS Server',
+'dns title' => 'Domein Naam Systeem',
+'do not log this port list' => 'Negeer deze poorten voordat ze worden gelogd (vermindert loggrootte)',
+'dod' => 'Inbellen op afroep',
+'dod for dns' => 'Inbellen op afroep voor DNS:',
+'dod not compatible with ddns' => 'Inkiezen op afroep compatibel met de dynamische DNS Diesten',
+'dod waiting' => 'Inkiezen op afroep is wachtende',
+'domain' => 'Domein',
+'domain master' => 'Domein Master',
+'domain name' => 'Domeinnaam',
+'domain name suffix' => 'Domeinnaam toevoeging:',
+'domain not set' => 'Domein niet ingesteld.',
+'donation' => 'Donatie',
+'donation-link' => 'https://www.paypal.com/en_US/GB/i/btn/btn_donateCC_LG.gif',
+'donation-text' => '<strong>IPFire</strong> wordt ontwikkeld en onderhouden door vrijwilligers in hun vrije tijd. Om dit project draaiend te houden, zouden we het erg op prijs stellen als u een kleine donatie maakt.',
+'done' => 'Doe het',
+'dos charset' => 'DOS tekenset',
+'down and up speed' => 'Voer uw down- en uploadsnelheid in<br /> en klik dan op <i>Opslaan</i>.',
+'downlink speed' => 'Downlink snelheid (kbit/sec)',
+'downlink std class' => 'downlink standaard klasse',
+'download' => 'download',
+'download ca certificate' => 'Download CA certificaat',
+'download certificate' => 'Download certificaat',
+'download host certificate' => 'Download host certificaat',
+'download new ruleset' => 'Download nieuwe regelset',
+'download pkcs12 file' => 'Download PKCS12 bestand',
+'download root certificate' => 'Download root certificaat',
+'dpd action' => 'Dead peer-detectie actie',
+'driver' => 'Driver',
+'drop input' => 'Log geblokkeerde input pakketten',
+'drop newnotsyn' => 'Log geblokkeerde new-not-syn pakketten',
+'drop output' => 'Log geblokkeerde output pakketten',
+'drop portscan' => 'Log geblokkeerde poort-scan pakketten',
+'drop proxy' => 'Blokkeer alle pakketten die niet zijn geadresseerd aan de proxy',
+'drop samba' => 'Blokkeer alle Microsoft poorten 135,137,138,139,445,1025',
+'drop wirelessforward' => 'Log geblokkeerde draadloze forward-pakketten',
+'drop wirelessinput' => 'Log geblokkeerde draadloze input-pakketten',
+'dst port' => 'Best. poort',
+'dstprt range overlaps' => 'Bestemmingspoortreeks overlapt een al bestaande poort.',
+'dstprt within existing' => 'Bestemmingspoort ligt binnen een al bestaande reeks.',
+'duplicate ip' => 'Bestaand IP-adres ingevoerd',
+'duplicate ip bold' => 'Bestaande adressen zijn in <b>vet</b>',
+'duplicate mac' => 'Bestaand MAC-adres ingevoerd',
+'duplicate name' => 'Deze naam wordt al gebruikt, kies a.u.b. een andere naam.',
+'dyn dns source choice' => 'Dynamische DNS leverancier(s) zullen een IP-adres ontvangen voor deze IPFire van:',
+'dynamic dns' => 'Dynamische DNS',
+'dynamic dns client' => 'Dynamische DNS Client',
+'e-mail address too long' => 'E-mailadres is te lang; het mag niet langer zijn dan 40 tekens.',
+'eciadsl help' => 'Om het ECI ADSL modem te kunnen gebruiken moet u eerst het synch.bin bestand naar uw IPFire machine uploaden. Download het bestand van de ECIADSL website en upload dan het bestand <b>synch.bin</b> m.b.v. het formulier hieronder.',
+'eciadsl upload' => 'Uploadt ECI ADSL synch.bin bestand',
+'edit' => 'Wijzigen',
+'edit a rule' => 'Wijzig een bestaande regel:',
+'edit advanced settings when done' => 'Wijzig geavanceerde instellingen als u klaar bent.',
+'edit an existing alias' => 'Wijzig een bestaande alias',
+'edit an existing host' => 'Wijzig een bestaande host',
+'edit an existing lease' => 'Wijzig een bestaande lease',
+'edit device' => 'Wijzig apparaat',
+'edit hosts' => 'Wijzig hosts',
+'edit network' => 'Wijzig netwerk',
+'edit printer' => 'Wijzig printer',
+'edit service' => 'Wijzig service',
+'edit share' => 'Wijzig share',
+'editor' => 'Wijziger',
+'eg' => 'bijv.:',
+'email server can not be empty' => 'E-mailserver mag niet leeg zijn',
+'emailreportlevel' => 'E-mailrapport detailniveau',
+'empty' => 'Dit veld mag niet leeg worden gelaten',
+'empty profile' => 'leeg',
+'enable ignore filter' => 'Inschakelen negeer-filter',
+'enable javascript' => 'Inschakelen javascript',
+'enable wildcards' => 'Inschakelen wildcards:',
+'enabled' => 'Ingeschakeld:',
+'enabled on' => 'Ingeschakeld op',
+'enabledtitle' => 'Ingeschakeld',
+'encapsulation' => 'Inkapseling',
+'encrypted' => 'Gecodeerd',
+'end address' => 'Eindadres:',
+'enter ack class' => 'Voer de ACK-klasse in <br /> en klik dan op <i>Opslaan</i>.',
+'enter data' => 'Maak uw instellingen <br /> en klik dan op <i>Opslaan</i>.',
+'err bk 1' => 'Fout bij aanmaken van archief',
+'err bk 10 password' => 'Fout met het back-up wachtwoord',
+'err bk 2 key' => 'Fout bij het aanmaken van een sleutelbestand',
+'err bk 3 tar' => 'Fout bij het toevoegen van bestanden aan een archief',
+'err bk 4 gz' => 'Fout bij het comprimeren van archief',
+'err bk 5 encrypt' => 'Fout bij het coderen van archief',
+'err rs 1' => 'Fout bij het terugzetten van archief',
+'err rs 6 decrypt' => 'Fout bij het decoderen van archief',
+'err rs 7 untartst' => 'Ongeldig gedecodeerd archief',
+'err rs 8 untar' => 'Fout bij het uitpakken van archief',
+'error config' => 'Kan /var/ipfire/ovpn/config/ZERINA.ovpn niet openen',
+'error external access' => 'Kan /var/ipfire/xtaccess/config niet openen (externe toegang kon niet worden toegekend)',
+'error messages' => 'Foutmeldingen:',
+'esp encryption' => 'ESP Encryptie:',
+'esp grouptype' => 'ESP Groeptype:',
+'esp integrity' => 'ESP Integriteit:',
+'esp keylife' => 'ESP Sleutel levensduur:',
+'esp keylife should be between 1 and 24 hours' => 'ESP Sleutel levensduur moet tussen 1 en 24 uur liggen.',
+'every' => 'Iedere',
+'exampel' => 'voorbeeld',
+'exclude logfiles' => 'Exclusief logbestanden',
+'excluding buffers and cache' => '-/+ buffers/cache',
+'expected' => 'Verwacht',
+'expertoptions' => 'Expertopties',
+'expires' => 'Verloopt',
+'export' => 'Exporteren',
+'exportkey' => 'Exporteer PSK',
+'external access' => 'Externe toegang',
+'external access configuration' => 'Externe toegangsconfiguratie',
+'external access rule added' => 'Externe toegangsregel toegevoegd; herstarten van toegangscontroller',
+'external access rule changed' => 'Externe toegangsregel gewijzigd; herstarten van toegangscontroller',
+'external access rule removed' => ' Externe toegangsregel verwijderd; herstarten van toegangscontroller ',
+'external aliases configuration' => 'Externe aliassenconfiguratie',
+'extrahd' => 'Extra HD',
+'extrahd because there is already a device mounted' => ', omdat er al een apparaat gekoppeld is',
+'extrahd cant umount' => 'Kan niet ontkoppelen',
+'extrahd detected drives' => 'gedetecteerde schijfstations',
+'extrahd install or load driver' => 'Als uw apparaat hier niet tussen staat, dan moet u de driver installeren of laden.<br />Als u het apparaat kan zien maar geen partities, dan moet u er eerst een aanmaken.',
+'extrahd maybe the device is in use' => '. Misschien is het apparaat in gebruik',
+'extrahd to' => 'naar',
+'extrahd to root' => 'naar root',
+'extrahd unable to read' => 'Kan niet lezen',
+'extrahd unable to write' => 'Kan niet schrijven',
+'extrahd you cant mount' => 'U kan het niet aankoppelen',
+'false classnumber' => 'Het klasse-nummer komt niet overeen met de interface.',
+'false max bandwith' => 'Maximum bandbreedte is ongeldig.',
+'false min bandwith' => 'Minimum bandbreedte is ongeldig.',
+'february' => 'Februari',
+'fetch ip from' => 'Bepaal het echte publieke IP-adres met behulp van een externe server',
+'filename' => 'Bestandsnaam',
+'filesystem full' => 'Bestandssysteem is vol',
+'fireinfo ipfire version' => 'IPFire versie',
+'fireinfo is disabled' => 'Fireinfo is uitgeschakeld',
+'fireinfo is enabled' => 'Fireinfo is ingeschakeld',
+'fireinfo is submitted' => 'Uw profiel is verzonden naar de fireinfo service.',
+'fireinfo is submitted button' => 'Nee, ik wil mijn profiel niet langer meer verzenden',
+'fireinfo kernel version' => 'Kernelversie',
+'fireinfo not submitted' => 'Uw profiel is niet naar de pakfire service verzonden.',
+'fireinfo not submitted button' => 'Ja, ik wil mijn profiel verzenden',
+'fireinfo pakfire version' => 'Pakfire versie',
+'fireinfo please enable' => 'Schakel a.u.b. de fireinfo service in.',
+'fireinfo settings' => 'Fireinfo instellingen',
+'fireinfo system version' => 'Systeemversies',
+'fireinfo why descr1' => 'Het is zeer belangrijk voor ontwikkelaars van IPFire dat u dit inschakelt',
+'fireinfo why descr2' => 'service. ',
+'fireinfo why enable' => 'Waarom moet ik fireinfo inschakelen?',
+'fireinfo why read more' => 'Lees meer over de redenen.',
+'fireinfo your profile id' => 'Uw profiel ID',
+'firewall' => 'Firewall',
+'firewall graphs' => 'Firewallgrafieken',
+'firewall hits' => 'Totaal aantal firewalltreffers voor',
+'firewall hits per' => 'firewalltreffers per',
+'firewall log' => 'Firewall log',
+'firewall log viewer' => 'Firewall Log Viewer',
+'firewall logs' => 'Firewall Logs',
+'firewall logs ip' => 'Fw-Logdgrafieken (IP)',
+'firewall logs port' => 'Fw-Loggrafieken (Poort)',
+'firewallhits' => 'firewalltreffers',
+'firmware' => 'Firmware',
+'firmware upload' => 'Upload Firmware/Drivers',
+'fixed ip lease added' => 'Vast IP-lease toegevoegd',
+'fixed ip lease modified' => 'Vast IP-lease gewijzigd',
+'fixed ip lease removed' => 'Vast IP-lease verwijderd',
+'force update' => 'Forceer update',
+'force user' => 'forceer alle nieuwe bestanden naar de gebruiker',
+'forwarding rule added' => 'Forwarding regel toegevoegd; herstarten van forwarder',
+'forwarding rule removed' => 'Forwarding regel verwijderd; herstarten van forwarder',
+'forwarding rule updated' => 'Forwarding regel bijgewerkt; herstarten van forwarder',
+'free' => 'Beschikbaar',
+'free memory' => 'Beschikbaar geheugen ',
+'free swap' => 'Beschikbare Swap',
+'frequency' => 'Frequentie',
+'friday' => 'Vrijdag',
+'fritzdsl help' => 'Om een Fritz!DSL fcdsl / fcdslsl / fcdsl2 / fcdslusb / fcdslslusb modem te kunnen gebruiken, moet u eerst een pakket naar uw IPFire machine sturen. Download de tarball die correspondeert met uw versie van de IPFire website en upload dan de gehele <b>fcdsl-(uw_versien).tgz</b> m.b.v. het formulier hieronder.',
+'fritzdsl upload' => 'Upload Fritz!DSL driver',
+'from' => 'Van',
+'from email adr' => 'Van e-mailadres',
+'from email pw' => 'Van e-mailwachtwoord',
+'from email server' => 'Van e-mail server',
+'from email user' => 'Van e-mail gebruiker',
+'from warn email bad' => 'Het van e-mailadres is niet geldig',
+'fw blue' => 'Firewallopties voor de BLAUWE interface',
+'fw logging' => 'Firewall logging',
+'g.dtm' => 'WORDT VERWIJDERD',
+'g.lite' => 'WORDT VERWIJDERD',
+'gateway' => 'Gateway',
+'gateway ip' => 'Gateway IP',
+'gen static key' => 'Genereer een statische sleutel',
+'generate' => 'Genereer root/host certificaat',
+'generate a certificate' => 'Genereer een certificaat:',
+'generate iso' => 'Genereer ISO',
+'generate root/host certificates' => 'Genereer root/host certificaten',
+'generate tripwire keys and init' => 'genereer tripwire-sleutels en init',
+'generatekeys' => 'Genereer sleutels',
+'generatepolicy' => 'Genereer nieuw beleid',
+'generatereport' => 'Genereer nieuw rapport',
+'generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient' => 'Het genereren van de root- en hostcertificaten kan enige tijd duren. Een moment geduld alstublieft.',
+'genkey' => 'Genereer PSK',
+'genre' => 'Genre',
+'global settings' => 'Globale instellingen',
+'gpl i accept these terms and conditions' => 'Ik accepteer deze voorwaarden en condities.',
+'gpl license agreement' => 'Licentieovereenkomst',
+'gpl please read carefully the general public license and accept it below' => 'Lees alstublieft de General Public License aandachtig door en accepteer het hieronder',
+'gpl unofficial translation of the general public license v3' => 'Onofficiële vertaling van de General Public License v3',
+'graph' => 'Grafiek',
+'graph per' => 'per',
+'green' => 'GROEN',
+'green interface' => 'Groene Interface',
+'guaranteed bandwith' => 'Gegarandeerde bandbreedte',
+'guardian alertfile' => 'Meldingenbestand',
+'guardian configuration' => 'Guardian configuratie',
+'guardian ignorefile' => 'Negeerbestand',
+'guardian interface' => 'Interface',
+'guardian logfile' => 'Logbestand',
+'guardian timelimit' => 'Tijdlimiet',
+'guest ok' => 'verleen gasten toegang',
+'gui settings' => 'Gebruikersinterface',
+'gz with key' => 'Alleen gecodeerde archieven kunnen worden teruggezet op deze machine.',
+'hangup' => 'Verbreek',
+'hangup string' => 'Ophangen:',
+'harddisk temperature' => 'Harddisk temperatuur',
+'harddisk temperature graphs' => 'hdd temperatuurgrafieken',
+'hardware graphs' => 'Hardware grafieken',
+'hdd temperature in' => 'Harddisk temperatuur in',
+'help' => 'Help',
+'high' => 'Hoog',
+'high memory usage' => 'Verhoogd geheugengebruik',
+'hint' => 'Hint:',
+'holdoff' => 'Uitsteltijd (in seconden)',
+'host' => 'Host',
+'host allow' => 'lijst met toegestane hosts',
+'host certificate' => 'Hostcertificaat',
+'host configuration' => 'Hostconfiguratie',
+'host deny' => 'lijst met geweigerde hosts',
+'host ip' => 'Host IP-adres',
+'host to net vpn' => 'Host-naar-Net Virtual Private Network (RoadWarrior)',
+'hostname' => 'Hostnaam',
+'hostname and domain already in use' => 'Hostnaam en domein zijn al in gebruik.',
+'hostname cant be empty' => 'Hostnaam mag niet leeg zijn.',
+'hostname not set' => 'Hostnaam niet opgegeven.',
+'hosts config added' => 'Hosts configuratie toegevoegd',
+'hosts config changed' => 'Hosts configuratie gewijzigd',
+'hour' => 'Uur',
+'hour-graph' => 'Uur',
+'hours' => 'uren',
+'hours2' => 'Uren',
+'ibod for dual isdn only' => 'iBOD kan alleen gebruikt worden met Dual ISDN.',
+'icmp selected but no type' => 'ICMP als protocol geselecteerd, maar er is geen ICMP type gespecificeerd.',
+'icmp type' => 'ICMP Type',
+'id' => 'ID',
+'idle' => 'Idle',
+'idle timeout' => 'Idle time-out (min; 0 om uit te schakelen):',
+'idle timeout not set' => 'Idle time-out niet ingesteld.',
+'ids log viewer' => 'IDS log viewer',
+'ids logs' => 'IDS Logs',
+'ids preprocessor' => 'IDS pre-processor',
+'ids rules license' => 'Om de Sourcefire VRT Certified Rules te kunnen gebruiken, moet u zich registreren op',
+'ids rules license1' => '.',
+'ids rules license2' => 'Accepteer de licentie, activeer uw account door op link te klikken die naar u is gemaild. Ga dan naar',
+'ids rules license3' => 'klik op de "Genereer code"-knop en kopieer de 40 tekens lange Oinkcode naar het veld hieronder.',
+'ids rules update' => 'Snort regels bijwerken',
+'iface' => 'Iface',
+'ignore filter' => 'Negeerfilter',
+'ike encryption' => 'IKE Encryptie:',
+'ike grouptype' => 'IKE Groepstype:',
+'ike integrity' => 'IKE Integriteit:',
+'ike lifetime' => 'IKE Levensduur:',
+'ike lifetime should be between 1 and 8 hours' => 'IKE levensduur moet tussen 1 en 8 uur liggen.',
+'import' => 'Importeer',
+'importkey' => 'Importeer PSK',
+'in' => 'In',
+'inactive' => 'inactief',
+'include logfiles' => 'Inclusief logbestanden',
+'incoming' => 'inkomend',
+'incoming traffic in bytes per second' => 'Inkomend verkeer',
+'incorrect password' => 'Onjuist wachtwoord',
+'info' => 'Info',
+'init string' => 'Initieer:',
+'insert floppy' => 'Om een back-up naar floppy te maken, plaatst u een geformatteerde floppy in de drive en klik <i>back-up naar floppy</i> om de systeemconfiguratie op te slaan. Bekijk de resultaten om er zeker van te zijn dat de back-up succesvol is verlopen. Het kan even duren voordat deze opdracht is voltooid, dus even geduld a.u.b.<p>',
+'insert removable device' => 'Plaats een verwisselbaar apparaat',
+'install' => 'Installeren',
+'install new update' => 'Installeer nieuwe update:',
+'installed' => 'Geïnstalleerd',
+'installed updates' => 'Geïnstalleerde updates:',
+'instant update' => 'Directe update',
+'interface' => 'Interface',
+'interfaces' => 'Interfaces',
+'internet' => 'INTERNET',
+'intrusion detection' => 'Inbraakdetectie',
+'intrusion detection system' => 'Inbraakdetectie systeem',
+'intrusion detection system log viewer' => 'Inbraakdetectie systeem Log Viewer',
+'intrusion detection system rules' => 'inbraakdetectie systeem regels',
+'intrusion detection system2' => 'Inbraakdetectiesysteem:',
+'invalid broadcast ip' => 'Ongeldig broadcast IP',
+'invalid cache size' => 'Ongeldige cache grootte.',
+'invalid characters found in pre-shared key' => 'Ongeldige tekens gevonden in de pre-shared sleutel.',
+'invalid date entered' => 'Ongeldige datum ingevoerd.',
+'invalid default lease time' => 'Ongeldige standaard leasetijd.',
+'invalid domain name' => 'Ongeldige domeinnaam.',
+'invalid downlink speed' => 'Ongeldige downlink snelheid.',
+'invalid end address' => 'Ongeldig eind-adres.',
+'invalid fixed ip address' => 'Ongeldig vast IP-adres',
+'invalid fixed mac address' => 'Ongeldig vast MAC-adres',
+'invalid hostname' => 'Ongeldige hostnaam.',
+'invalid input' => 'Ongeldige invoer',
+'invalid input for authentication method' => 'Ongeldige invoer voor authenticatiemethode.',
+'invalid input for city' => 'Ongeldige invoer voor stad.',
+'invalid input for country' => ' Ongeldige invoer voor land.',
+'invalid input for department' => ' Ongeldige invoer voor afdeling.',
+'invalid input for dhcp dns' => ' Ongeldige invoer voor DHCP DNS',
+'invalid input for dhcp domain' => ' Ongeldige invoer voor DHCP domein',
+'invalid input for dhcp wins' => ' Ongeldige invoer voor DHCP WINS',
+'invalid input for e-mail address' => ' Ongeldige invoer voor e-mailadres.',
+'invalid input for esp keylife' => ' Ongeldige invoer voor ESP sleutel levensduur',
+'invalid input for hostname' => ' Ongeldige invoer voor hostnaam.',
+'invalid input for ike lifetime' => ' Ongeldige invoer voor IKE levensduur',
+'invalid input for keepalive 1' => ' Ongeldige invoer voor keepalive ping',
+'invalid input for keepalive 1:2' => ' Ongeldige invoer voor keepalive gebruik tenminste een ratio van 1:2',
+'invalid input for keepalive 2' => ' Ongeldige invoer voor keepalive ping-herstart',
+'invalid input for max clients' => ' Ongeldige invoer voor max. clients',
+'invalid input for name' => ' Ongeldige invoer voor gebruikersnaam of systeemhostnaam',
+'invalid input for oink code' => ' Ongeldige invoer voor Oink code',
+'invalid input for organization' => ' Ongeldige invoer voor organisatie',
+'invalid input for remote host/ip' => ' Ongeldige invoer voor remote host/ip.',
+'invalid input for state or province' => ' Ongeldige invoer voor provincie.',
+'invalid ip' => 'Ongeldig IP-adres',
+'invalid keep time' => 'Keep-tijd moet een geldig getal zijn',
+'invalid key' => 'Ongeldige sleutel.',
+'invalid loaded file' => 'Ongeldig bestand geladen',
+'invalid local-remote id' => 'lokaal & remote ID mogen niet gelijk zijn en beginnen met een "@" teken. Dit zijn de leftid en rightid in strongswan terminologie.',
+'invalid logserver address' => 'Ongeldig syslogd serveradres',
+'invalid mac address' => 'Ongeldig MAC-adres',
+'invalid max lease time' => 'Ongeldige max. leasetijd.',
+'invalid maximum incoming size' => 'Ongeldige maximum inkomende grootte.',
+'invalid maximum object size' => 'Ongeldige maximum objectgrootte.',
+'invalid maximum outgoing size' => 'Ongeldige maximum uitgaande grootte.',
+'invalid md5sum' => 'Ongeldige MD5Sum.',
+'invalid minimum object size' => 'Ongeldige minimum objectgrootte.',
+'invalid mtu input' => 'Ongeldige MTU',
+'invalid netmask' => 'Ongeldig netmasker',
+'invalid port' => 'Ongeldige poort. Moet een geldig poortnummer zijn.',
+'invalid port list' => 'Poortlijst syntax is: poort[,poort]... waarbij poort is in /etc/services of getal',
+'invalid primary dns' => 'Ongeldige primaire DNS.',
+'invalid primary ntp' => 'Ongeldig primaire NTP serveradres',
+'invalid secondary dns' => ' Ongeldige secundaire DNS.',
+'invalid secondary ntp' => ' Ongeldig secundaire NTP serveradres',
+'invalid start address' => ' Ongeldig beginadres.',
+'invalid time entered' => ' Ongeldige tijd ingevoerd.',
+'invalid time period' => ' Ongeldige tijdsperiode',
+'invalid uplink speed' => ' Ongeldige uplink-snelheid.',
+'invalid upstream proxy username or password setting' => ' Ongeldige upstream proxy gebruikersnaam of wachtwoord.',
+'invalid users' => 'lijst met gebruikers die toegang is geweigerd',
+'invalid vpi vpci' => 'Ongeldige VPI/VPCI instellingen',
+'invalid wins address' => ' Ongeldig WINS serveradres.',
+'invert' => 'Inverteer',
+'ip address' => 'IP-adres',
+'ip address in use' => 'IP-adres is al in gebruik',
+'ip address outside subnets' => 'IP-adres ligt buiten subnets',
+'ip alias added' => 'Extern IP-alias toegevoegd',
+'ip alias changed' => 'Extern IP-alias gewijzigd',
+'ip alias removed' => 'Extern IP-alias verwijderd',
+'ip info' => 'IP Informatie',
+'ipfire has now rebooted' => 'IPFire is nu aan het herstarten.',
+'ipfire has now shutdown' => 'IPFire is nu aan het afsluiten.',
+'ipfire side' => 'IPFire-zijde:',
+'ipfire side is invalid' => 'IPFire-zijde is ongeldig.',
+'ipfires hostname' => 'IPFire\'s Hostnaam',
+'ipinfo' => 'IP info',
+'iptable rules' => 'IPTable regels',
+'iptmangles' => 'IPTable Mangles',
+'iptnats' => 'IPTable Network Adrestranslatie',
+'ipts' => 'IPTables',
+'isdn' => 'ISDN',
+'isdn settings' => 'Extra ISDN instellingen:',
+'isdn1' => 'Single ISDN',
+'isdn2' => 'Dual ISDN',
+'january' => 'Januari',
+'javascript menu error1' => 'Als de menu\'s niet werken, schakel dan javascript uit op de',
+'javascript menu error2' => 'pagina.',
+'july' => 'Juli',
+'june' => 'Juni',
+'kernel' => 'Kernel',
+'kernel logging server' => 'Kernel Logging Server',
+'kernel version' => 'Kernelversie:',
+'key stuff' => '2. Sleutels en certificaten',
+'keyreset' => 'Reset sleutels',
+'keys' => 'sleutels',
+'lan' => 'LAN',
+'lang' => 'nl',
+'languagepurpose' => 'Selecteer de taal die u wilt gebruiken voor IPFire:',
+'last activity' => 'Laatste activiteit',
+'lateprompting' => 'Laat-prompting',
+'lease expires' => 'Lease verloopt',
+'legend' => 'Legenda',
+'length' => 'Lengte',
+'line' => 'Lijn',
+'linkq' => 'Lijnkwaliteit',
+'load printer' => 'Laad printer',
+'loaded modules' => 'Geladen modules:',
+'local hard disk' => 'Harddisk',
+'local master' => 'Lokale Master',
+'local ntp server specified but not enabled' => 'Lokale NTP server is gespecificeerd, maar niet ingeschakeld',
+'local subnet' => 'Lokaal subnet:',
+'local subnet is invalid' => 'Lokaal subnet is ongeldig.',
+'local vpn hostname/ip' => 'Lokale VPN-hostnaam/IP',
+'localkey' => 'Lokale sleutel',
+'localkeyfile' => 'Lokaal sleutelbestand',
+'log' => 'Log:',
+'log enabled' => 'Log ingeschakeld',
+'log level' => 'Log-niveau',
+'log lines per page' => 'Regels per pagina',
+'log server address' => 'Syslogserver:',
+'log settings' => 'Log-instellingen',
+'log summaries' => 'Log-samenvattingen',
+'log summary' => 'Log-samenvatting',
+'log var messages' => 'Instellingen voor /var/log/messages:',
+'log view' => 'Log-view',
+'log viewer' => 'Log-viewer',
+'log viewing options' => 'Log viewing opties',
+'log-options' => 'Logbestand opties',
+'loged in at' => 'Ingelogd om',
+'logging' => 'Logging',
+'logging server' => 'Loggingserver',
+'loginlogout' => 'Login/Logout',
+'logs' => 'logs',
+'lookup failed' => 'Reverse lookup mislukt',
+'loosedirectorychecking' => 'Loosedirectorychecking',
+'low' => 'Laag',
+'ls_dhcpd' => 'DHCP Server:',
+'ls_disk space' => 'Schijfruimte:',
+'ls_free/swan' => 'VPN:',
+'ls_httpd' => 'HTTP Server:',
+'ls_init' => 'Init:',
+'ls_kernel' => 'Kernel en Firewall:',
+'ls_modprobe' => 'Module loader:',
+'ls_pam_unix' => 'Lokale gebruikers logins:',
+'ls_sshd' => 'Remote gebruikers logins:',
+'ls_syslogd' => 'Syslogd:',
+'mac address' => 'MAC-adres',
+'mac address deleted' => 'Succesvol verwijderd!',
+'mac address deleted txt' => 'Het MAC-adres is succesvol verwijderd, maar de wijzigingen worden pas actief na <strong>herstart</strong>.',
+'mac address done' => 'De MAC-adres instellingen worden opgeslagen.',
+'mac address error not 00' => 'MAC-adres moet beginnen met 00!',
+'mac address error not valid' => 'MAC-adres is ongeldig!',
+'mac address header' => 'MAC-adres op red0',
+'mac address in use' => 'MAC-adres is al in gebruik',
+'mac address menu' => 'Toekennen MAC-adres',
+'mac address recon' => 'Probeert opnieuw te verbinden!',
+'mac address saved' => 'Succesvol opgeslagen!',
+'mac address saved txt' => 'Het MAC-adres is succesvol opgeslagen, maar de wijzigingen worden pas actief na een herstart of opnieuw verbinden.',
+'mac address title' => 'Medium Access Control Adres',
+'mac desc' => 'Hier kunt u het MAC-adres van red0 wijzigen. Het adres moet in hexadecimale waarden (0-9,a-f) ingevoerd worden, <br />bijv. 00-01-02-0e-b8-d6 of 00:01:02:0e:b8:d6.',
+'mac new' => 'nieuw MAC-adres:',
+'mac1 new' => 'nieuw MAC-adres 1 (vdsl-inet):',
+'mac2 new' => 'nieuw MAC-adres 2 (vdsl-iptv):',
+'magic packet send to:' => 'Magic-pakket verstuurd naar:',
+'mailmethod' => 'Mailmethode',
+'mailprogramm' => 'Mailprogramma',
+'main page' => 'Hoofdpagina',
+'manage ovpn' => '5. Tunnelbeheer:',
+'manage printers' => 'beheer printers',
+'manage shares' => 'beheer shares',
+'manual' => 'Handmatig',
+'manual control and status' => 'Handmatige controle en status:',
+'manually' => 'Handmatig',
+'map to guest' => 'Toewijzen aan gast',
+'march' => 'Maart',
+'marked' => 'Gemarkeerd',
+'max bandwith' => 'Maximum bandbreedte',
+'max incoming size' => 'Max. inkomende grootte (KB):',
+'max lease time' => 'Max. leasetijd (min.):',
+'max outgoing size' => 'Max. uitgaande grootte (KB):',
+'max reliability' => 'Maximum betrouwbaarheid',
+'max renewal time' => 'Maximum vernieuwingstijd',
+'max retries not set' => 'Max. aantal pogingen niet ingesteld.',
+'max size' => 'Max. objectgrootte (KB):',
+'max throughput' => 'Maximum doorvoersnelheid',
+'maximal' => 'Maximaal',
+'maximum retries' => 'Maximum aantal pogingen:',
+'may' => 'Mei',
+'mbmon display' => 'Display',
+'mbmon fan' => 'Fan-snelheid',
+'mbmon fan in' => 'Fan-snelheid in',
+'mbmon graphs' => 'mbmon grafieken',
+'mbmon label' => 'Label',
+'mbmon settings' => 'mbmon grafiekinstellingen',
+'mbmon temp' => 'Temperatuur',
+'mbmon temp in' => 'Temperatuur in',
+'mbmon value' => 'Waarde',
+'mbmon volt' => 'Voltage',
+'meaning' => 'betekenis',
+'media' => 'Media',
+'media information' => 'media-informatie',
+'medium' => 'Gemiddeld',
+'memory' => 'Geheugen',
+'memory information' => 'geheugen informatie',
+'memory usage per' => 'Geheugengebruik per',
+'messages logging' => 'Log-instellingen voor /var/log/messages',
+'method' => 'Methode:',
+'min costs' => 'Minimum kosten',
+'min delay' => 'Minimum vertraging',
+'min size' => 'Min. objectgrootte (KB):',
+'minimal' => 'Minimaal',
+'minute' => 'Minuut',
+'minutes' => 'Minuten',
+'misc-options' => 'Overige opties',
+'missing dat' => 'Gecodeerd archief niet gevonden',
+'missing gz' => 'Ongecodeerd archief niet gevonden',
+'mode' => 'Modus',
+'modem' => 'Modem',
+'modem configuration' => 'Modemconfiguratie',
+'modem on com1' => 'Modem op COM1',
+'modem on com2' => 'Modem op COM2',
+'modem on com3' => 'Modem op COM3',
+'modem on com4' => 'Modem op COM4',
+'modem on com5' => 'Modem op COM5',
+'modem settings have errors' => 'Modeminstellingen bevatten fouten',
+'modem speaker on' => 'Modemspeaker aan:',
+'modify' => 'Wijzig',
+'modulation' => 'Modulatie',
+'monday' => 'Maandag',
+'month' => 'Maand',
+'month-graph' => 'Maand',
+'monthly firewallhits' => 'maandelijkse firewalltreffers',
+'monthly start day bad' => 'Maandelijkse startdag is niet correct',
+'monthly traffic bad' => 'Maandelijks volume is niet correct',
+'monthly volume' => 'Maandelijks volume',
+'monthly volume start day' => 'Eerste dag van de maandelijkse periode',
+'monthly volume start day short' => 'Eerste dag',
+'months' => 'maanden',
+'more' => 'meer',
+'mount' => 'Koppelen',
+'mounted on' => 'Gekoppeld op',
+'mpfire' => 'Mediaspeler voor IPFire',
+'mpfire controls' => 'MPFire Controle',
+'mpfire playlist' => 'MPFire afspeellijst',
+'mpfire scanning' => 'Zoeken naar nieuwe bestanden',
+'mpfire search' => 'MPFire Zoeken',
+'mpfire songs' => 'MPFire lijst met nummers',
+'mpfire webradio' => 'MPFire Webradio',
+'mtu QoS' => 'Dit verandert niet de globale MTU, het zet alleen de MTU voor QoS.',
+'my new share' => 'Mijn nieuwe share',
+'name' => 'Naam',
+'name is invalid' => 'Naam is ongeldig',
+'name must only contain characters' => 'Naam mag alleen letters bevatten.',
+'name too long' => 'Gebruikersnaam of systeemhostnaam is te lang',
+'nat-traversal' => 'Nat Traversal:',
+'needreboot' => 'Een update vereist een herstart',
+'net' => 'Net',
+'net address' => 'net-adres',
+'net config' => 'Netwerkconfiguratie',
+'net config type' => 'type netwerkconfiguratie',
+'net config type help' => 'GROEN is het lokale netwerk, ROOD is het internet, BLAUW is WLAN, ORANJE is de DMZ.',
+'net to net vpn' => 'Net-to-Net Virtual Private Network',
+'net traffic newversion' => 'Nieuwe Net-Traffic versie is beschikbaar:',
+'net-traffic configuration' => 'Net-Traffic configuratie',
+'netbios name' => 'Netbios-naam',
+'netmask' => 'Netmasker',
+'network' => 'Netwerk',
+'network added' => 'Aangepast netwerk toegevoegd',
+'network configuration' => 'Netwerkconfiguratie',
+'network internal' => 'Netwerk (intern)',
+'network options' => 'Netwerkopties',
+'network other' => 'Netwerk (overig)',
+'network red' => 'Netwerk (extern)',
+'network removed' => 'Aangepast netwerk verwijderd',
+'network status information' => 'Netwerk statusinformatie',
+'network time' => 'Gebruik een netwerktijdsserver:',
+'network time from' => 'Ontvang de tijd van een netwerktijdsserver',
+'network traffic graphs' => 'Netwerkverkeer grafieken',
+'network traffic graphs external' => 'Netwerkgebruik grafieken (extern)',
+'network traffic graphs internal' => 'Netwerkgebruik grafieken (intern)',
+'network traffic graphs others' => 'Netwerk (overig)',
+'network updated' => 'Aangepast netwerk bijgewerkt',
+'networks settings' => 'Firewall - Netwerkinstellingen',
+'new optionsfw later' => 'Uw wijziging(en) worden actief na de volgende herstart',
+'new optionsfw must boot' => 'U moet IPFire herstarten',
+'newer' => 'Nieuwer',
+'next' => 'volgende',
+'no' => 'Nee',
+'no alcatelusb firmware' => 'Geen Alcatel USB firmware. Bestand uploaden a.u.b.',
+'no cfg upload' => 'Er was geen data geÃŒpload',
+'no dhcp lease' => 'Er kon geen DHCP lease worden verkregen',
+'no eciadsl synch.bin file' => 'Geen ECI ADSL synch.bin bestand. Bestand uploaden a.u.b.',
+'no filter pass' => 'Geef de standaard-klasse voor niet-gefilterde pakketten.',
+'no fritzdsl driver' => 'Geen Fritz!DSL driver. Bestand uploaden a.u.b.',
+'no information available' => 'Geen informatie beschikbaar.',
+'no log selected' => 'Geen log geselecteerd',
+'no modem selected' => 'Geen modem geselecteerd',
+'no set selected' => 'Geen set geselecteerd',
+'no time limit' => 'onbeperkte tijd',
+'none found' => 'niets gevonden',
+'nonetworkname' => 'Geen netwerknaam ingevoerd',
+'noservicename' => 'Geen servicenaam ingevoerd',
+'not a valid ca certificate' => 'Geen geldig CA certificaat.',
+'not enough disk space' => 'Onvoldoende schijfruimte',
+'not present' => '<b>Niet</b> aanwezig',
+'not running' => 'loopt niet',
+'not set' => 'niet gezet',
+'notes' => 'Notities',
+'november' => 'November',
+'ntp common settings' => 'Algemene instellingen',
+'ntp configuration' => 'NTP configuratie',
+'ntp must be enabled to have clients' => 'NTP moet ingeschakeld zijn om klanten te bedienen.',
+'ntp server' => 'NTP Server',
+'ntp sync' => 'Synchronisatie',
+'ntp syncro disabled' => 'NTP synchronisatie uitgeschakeld',
+'ntp syncro enabled' => 'NTP synchronisatie ingeschakeld',
+'ntpd restarted' => 'ntpd herstart',
+'number' => 'Nummer:',
+'o-no' => 'Inactief',
+'o-yes' => 'Actief',
+'october' => 'Oktober',
+'off' => 'uit',
+'ok' => 'OK',
+'older' => 'Ouder',
+'on' => 'aan',
+'online help en' => 'Online help (in Engels)',
+'only digits allowed in holdoff field' => 'Alleen cijfers toegestaan in holdoff veld',
+'only digits allowed in max retries field' => 'Alleen cijfers toegestaan in max.pogingen veld.',
+'only digits allowed in the idle timeout' => ' Alleen cijfers toegestaan in het idle time-out veld.',
+'only red' => 'Alleen ROOD',
+'open to all' => 'Geef externe toegang voor ALLEN',
+'openssl produced an error' => 'OpenSSL gaf een fout',
+'openvpn client' => 'OpenVPN client',
+'openvpn default' => 'Standaard',
+'openvpn destination port used' => 'De bestemmingspoort is al in gebruik door een andere OpenVPN server.',
+'openvpn disabled' => 'UITGESCHAKELD',
+'openvpn enabled' => 'INGESCHAKELD',
+'openvpn fragment allowed with udp' => 'Het gebruik van fragment is alleen toegestaan met het UDP protocol.',
+'openvpn log' => 'OpenVPN Log',
+'openvpn mssfix allowed with udp' => 'Het gebruik van "mssfix" is alleen toegestaan met het UDP protocol.',
+'openvpn prefix local subnet' => 'Het gebruik van de prefix notatie wordt niet ondersteunt op het lokale subnet. Geef a.u.b. een ander subnetmasker zoals 255.255.255.0.',
+'openvpn prefix openvpn subnet' => 'Het gebruik van de prefix notatie wordt niet ondersteund voor het OpenVPN subnet. Geef a.u.b. een ander subnetmasker zoals 255.255.255.0.',
+'openvpn prefix remote subnet' => 'Het gebruik van de prefix notatie wordt niet ondersteund voor het remote subnet. Geef a.u.b. een ander subnetmasker zoals 255.255.255.0.',
+'openvpn server' => 'OpenVPN server',
+'openvpn subnet is used' => 'Het gegeven subnet is in gebruik door een andere OpenVPN server.',
+'optional at cmd' => 'optioneel AT commando',
+'optional data' => '3. Optionele instellingen:',
+'options' => 'Opties',
+'options fw' => 'Firewall Opties',
+'optionsfw portlist hint' => 'De lijst met poorten moet gescheiden zijn met komma\'s (bijv. 137,138). U kunt tot maximaal 15 poorten per protocol opgeven.',
+'optionsfw warning' => 'Het wijzigen van deze opties betekent het herstarten van de firewall',
+'or' => 'of',
+'orange' => 'ORANJE',
+'organization cant be empty' => 'Organisatie mag niet leeg zijn.',
+'organization name' => 'Organisatienaam',
+'organization too long' => 'Organisatie is te lang; mag niet langer zijn dan 60 tekens.',
+'original' => 'Origineel',
+'os level' => 'OS niveau',
+'other' => 'Andere',
+'other countries' => 'Andere landen',
+'other login script' => 'Ander inlog script',
+'otherip' => 'ander IP',
+'otherport' => 'andere poort',
+'our donors' => 'Onze donateurs',
+'out' => 'Uit',
+'outgoing' => 'uitgaand',
+'outgoing firewall' => 'Uitgaande Firewall',
+'outgoing firewall add ip group' => 'Toevoegen IP-adresgroep',
+'outgoing firewall add mac group' => 'Toevoegen MAC-adresgroep',
+'outgoing firewall edit ip group' => 'Wijzig IP-adresgroep',
+'outgoing firewall edit mac group' => 'Wijzig MAC-adresgroep',
+'outgoing firewall group error' => 'Een groep met dezelfde naam bestaat al.',
+'outgoing firewall groups' => 'Firewallgroepen',
+'outgoing firewall ip groups' => 'Uitgaande Firewall IP-adresgroepen',
+'outgoing firewall mac groups' => 'Uitgaande Firewall MAC-adresgroepen',
+'outgoing firewall mode0' => 'Als u deze modus gebruikt kunnen alle clients zonder enige restrictie het internet benaderen.',
+'outgoing firewall mode1' => 'Als u deze modus gebruikt kunnen alleen verbindingen worden opgezet die door de gedefinieerde regels toegestaan zijn.',
+'outgoing firewall mode2' => 'Als u deze modus gebruikt worden alle verbindingen toegestaan, behalve de gedefinieerde blokkeringsregels.',
+'outgoing firewall outgoing firewall reserved groupname' => 'Gebruik een andere groepsnaam a.u.b., deze naam is gereserveerd.',
+'outgoing firewall p2p allow' => 'p2p protocol is toegestaan',
+'outgoing firewall p2p deny' => 'p2p protocol is niet toegestaan',
+'outgoing firewall p2p description 1' => 'De knop',
+'outgoing firewall p2p description 2' => 'betekent dat het p2p protocol is toegestaan of',
+'outgoing firewall p2p description 3' => 'dat het p2p protocol niet is toegestaan.',
+'outgoing firewall reset' => 'Reset alles',
+'outgoing firewall view group' => 'Bekijk groep',
+'outgoing firewall warning' => 'Het niet selecteren van bron IP of MAC negeert ze',
+'outgoing traffic in bytes per second' => 'Uitgaand verkeer',
+'override mtu' => 'Overschrijf standaard MTU',
+'ovpn' => 'OpenVPN',
+'ovpn con stat' => 'OpenVPN connectiestatistieken',
+'ovpn config' => 'OVPN-Configuratie',
+'ovpn device' => 'OpenVPN apparaat:',
+'ovpn dl' => 'OVPN-Configuratie download',
+'ovpn errmsg green already pushed' => 'Route voor het groene netwerk is altijd aangezet',
+'ovpn errmsg invalid ip or mask' => 'Ongeldig netwerkadres of subnetmasker',
+'ovpn log' => 'OVPN-Log',
+'ovpn mtu-disc' => 'Pad MTU Discovery',
+'ovpn mtu-disc and mtu not 1500' => 'Pad MTU Discovery vereist een MTU van 1500.',
+'ovpn mtu-disc maybe' => 'Optioneel',
+'ovpn mtu-disc no' => 'Nooit',
+'ovpn mtu-disc off' => 'Uitgeschakeld',
+'ovpn mtu-disc with mssfix or fragment' => 'Pad MTU Discovery kan niet worden gebruikt met mssfix of fragment.',
+'ovpn mtu-disc yes' => 'Geforceerd',
+'ovpn on blue' => 'OpenVPN op BLAUW',
+'ovpn on orange' => 'OpenVPN op ORANJE',
+'ovpn on red' => 'OpenVPN op ROOD',
+'ovpn routes push' => 'Routes (een per regel):',
+'ovpn routes push options' => 'Route push opties',
+'ovpn server status' => 'Huidige OpenVPN server status:',
+'ovpn subnet' => 'OpenVPN subnet (bijv. 10.0.10.0/255.255.255.0)',
+'ovpn subnet is invalid' => 'OpenVPN subnet is ongeldig.',
+'ovpn subnet overlap' => 'OpenVPN subnet overlapt met : ',
+'ovpn_fastio' => 'Fast-IO',
+'ovpn_fragment' => 'Fragmentgrootte',
+'ovpn_mssfix' => 'MSSFIX-grootte',
+'ovpn_mtudisc' => 'MTU-Discovery',
+'ovpn_processprio' => 'Procesprioriteit',
+'ovpn_processprioD' => 'Laag',
+'ovpn_processprioED' => 'Extreem laag',
+'ovpn_processprioEH' => 'Extreem hoog',
+'ovpn_processprioEN' => 'Hoger dan normaal',
+'ovpn_processprioH' => 'Hoog',
+'ovpn_processprioLN' => 'Lager dan normaal',
+'ovpn_processprioN' => 'Normaal',
+'ovpn_processprioVD' => 'Zeer laag',
+'ovpn_processprioVH' => 'Zeer hoog',
+'ovpnstatus log' => 'OVPN-Status-Log',
+'ovpnsys log' => 'OVPN-Systeem-Log',
+'package failed to install' => 'Pakket kon niet worden geïnstalleerd.',
+'pagerefresh' => 'Pagina wordt ververst, wacht even a.u.b.',
+'pakfire accept all' => 'Wilt u alle pakketten installeren?',
+'pakfire ago' => 'geleden.',
+'pakfire available addons' => 'Beschikbare extensies:',
+'pakfire configuration' => 'Pakfire configuratie',
+'pakfire core update auto' => 'Installeer core- en extensie-updates automatisch:',
+'pakfire core update level' => 'Core-updateniveau',
+'pakfire health check' => 'Controleer of de mirror bereikbaar is (ping):',
+'pakfire install description' => 'Kies een of meer items uit de lijst hieronder en <br /> klik op de plus om te installeren.',
+'pakfire install package' => 'U wilt de volgende pakketten installeren: ',
+'pakfire installed addons' => 'Geïnstalleerde extensies:',
+'pakfire last core list update' => 'Laatste core-lijst update gemaakt',
+'pakfire last package update' => 'Laatste pakketlijst update gemaakt',
+'pakfire last serverlist update' => 'Laatste serverlijst update gemaakt',
+'pakfire last update' => 'Laatste update gemaakt',
+'pakfire possible dependency' => ' Er kunnen pakketafhankelijkheden zijn, hier is een lijst met pakketten die moeten worden geïnstalleerd.',
+'pakfire register' => 'Registreer bij de pakfire-server:',
+'pakfire system state' => 'Systeemstatus',
+'pakfire uninstall description' => 'Kies een of meer items uit de lijst hieronder en <br /> klik op de min om te deinstalleren.',
+'pakfire uninstall package' => 'U wilt de volgende pakketten deinstalleren: ',
+'pakfire update daily' => 'Zoek dagelijks naar updates:',
+'pakfire updates' => 'Beschikbare update:',
+'pakfire working' => 'Pakfire is bezig ... Wacht a.u.b. totdat alle handelingen succesvol zijn afgerond.',
+'pap or chap' => 'PAP of CHAP',
+'parentclass' => 'Parent-klasse',
+'parentclass add' => 'Voeg parent-klasse toe',
+'password' => 'Wachtwoord:',
+'password contains illegal characters' => 'Wachtwoord bevat ongeldige tekens.',
+'password crypting key' => 'Wachtwoord codeert de sleutel',
+'password not set' => 'Wachtwoord niet ingesteld.',
+'password too short' => 'Wachtwoord is te kort.',
+'passwords do not match' => 'Wachtwoorden komen niet overeen.',
+'passwords must be at least 6 characters in length' => 'Wachtwoorden moeten tenminste 6 tekens lang zijn',
+'path to directory' => 'pad naar de share',
+'pc' => 'Werkstation',
+'pc add' => 'Workstation toevoegen',
+'pdc options' => 'PDC opties',
+'percentage' => 'Percentage',
+'persistent' => 'Persistent',
+'pfs yes no' => 'Perfect Forward Secrecy (PFS)',
+'phase1 group' => 'Fase1 groep',
+'phonebook entry' => 'Telefoonboek entry:',
+'ping disabled' => 'Uitschakelen ping response',
+'pkcs12 file password' => 'PKCS12 bestandswachtwoord',
+'play' => 'Afspelen',
+'polfile' => 'Pol-bestand',
+'policy' => 'Beleid',
+'port' => 'Poort',
+'port forwarding configuration' => 'Poort-doorsturen configuratie',
+'ports' => 'Poorten',
+'portscans' => 'poortscans',
+'pots' => 'Klassieke analoge lijn',
+'ppp setup' => 'PPP setup',
+'pppoe' => 'PPPoE',
+'pppoe settings' => 'Extra PPPoE instellingen:',
+'pptp settings' => 'Extra PPTP instellingen:',
+'pre-shared key is too short' => 'Pre-shared sleutel is te kort.',
+'prefered master' => 'Voorkeur master',
+'present' => 'Aanwezig',
+'prev' => 'vorige',
+'primary dns' => 'Primaire DNS:',
+'primary ntp server' => 'Primaire NTP server',
+'primary wins server address' => 'Primaire WINS serveradres',
+'printcap name' => 'Printercap naam',
+'printer' => 'Printer',
+'printername' => 'Printernaam',
+'printing' => 'Printen',
+'printing options' => 'printopties',
+'priority' => 'Prioriteit',
+'processes' => 'Processen',
+'profile' => 'Profiel',
+'profile deleted' => 'Profiel verwijderd: ',
+'profile has errors' => 'Profiel bevat fouten',
+'profile made current' => 'Huidig profiel: ',
+'profile name' => 'Profielnaam:',
+'profile name not given' => 'Profielnaam niet opgegeven.',
+'profile saved' => 'Profiel opgeslagen: ',
+'profiles' => 'Profielen:',
+'proto' => 'Proto',
+'protocol' => 'Protocol:',
+'proxy' => 'Proxy',
+'proxy access graphs' => 'Proxy toegangsgrafieken',
+'proxy admin password' => 'Cache beheerder wachtwoord',
+'proxy cachemgr' => 'Activeer cachebeheer',
+'proxy errmsg filedescriptors' => 'Verkeerd aantal bestandsindicators',
+'proxy filedescriptors' => 'Aantal bestandsindicators',
+'proxy log viewer' => 'Proxy logviewer',
+'proxy logs' => 'Proxy Logs',
+'proxy no proxy extend' => 'of specificeer een lijst met niet-geproxyde bestemmingen',
+'proxy no proxy local' => 'Verbied lokale proxying op BLAUW/GROEN netwerken',
+'proxy port' => 'Proxypoort',
+'proxy reconfigure' => 'Opslaan en herstarten',
+'proxy reports' => 'Proxy Rapporten',
+'proxy reports daily' => 'Dagelijkse rapporten',
+'proxy reports monthly' => 'Maandelijkse rapporten',
+'proxy reports today' => 'Vandaag',
+'proxy reports weekly' => 'Wekelijkse rapporten',
+'psk' => 'PSK',
+'pulse' => 'Puls',
+'pulse dial' => 'Pulskiezen:',
+'qos add subclass' => 'Voeg sub-klasse toe',
+'qos graphs' => 'QoS grafieken',
+'qos warning' => 'De regel <strong>moet</strong> worden opgeslagen, anders zal het worden genegeerd!',
+'quick control' => 'Quick controle',
+'quick playlist' => 'Quick afspeellijst',
+'ram' => 'RAM',
+'read bytes' => 'Lees Bytes',
+'read list' => 'lijst met readonly hosts',
+'real address' => 'Echte adressen',
+'reboot' => 'Herstarten',
+'reboot ask' => 'Herstarten?',
+'reboot question' => 'Extra vraag voor herstart en afsluiten',
+'reboot schedule' => 'Inplannen IPFire herstarts',
+'reboot sure' => 'Weet u zeker dat u wilt herstarten?',
+'rebooting' => 'Herstarten',
+'rebooting ipfire' => 'IPFire aan het herstarten',
+'reconnect' => 'Opnieuw verbinden',
+'reconnection' => 'Opnieuw verbinding',
+'red' => 'Internet',
+'references' => 'Referenties',
+'refresh' => 'Ververs',
+'refresh index page while connected' => 'Ververs de index.cgi pagina terwijl verbonden',
+'refresh update list' => 'Ververs update-lijst',
+'registered user rules' => 'Sourcefire VRT regels voor geregistreerde gebruikers',
+'released' => 'Released',
+'reload' => 'herlaad',
+'remark' => 'Opmerking',
+'remark title' => 'Opmerking:',
+'remote access' => 'Remote toegang',
+'remote announce' => 'Remote aankondiging',
+'remote browse sync' => 'Remote Browse Sync',
+'remote host/ip' => 'Remote host/IP',
+'remote logging' => 'Remote logging',
+'remote subnet' => 'Remote subnet:',
+'remote subnet is invalid' => 'Remote subnet is ongeldig.',
+'removable device advice' => 'Plug een apparaat in, ververs, selecteer en koppel voor gebruik. Ontkoppel voor verwijderen van apparaat.',
+'remove' => 'Verwijderen',
+'remove ca certificate' => 'Verwijder CA certificaten',
+'remove x509' => 'Verwijder x509',
+'repeat' => 'Herhaal',
+'reportfile' => 'Rapportbestand',
+'reportlevel' => 'Rapportniveau',
+'request' => 'Verzoek',
+'requested data' => '1. Connectie-instellingen:',
+'reserved dst port' => 'Bestemmingspoort is gereserveerd voor IPFire:',
+'reserved src port' => 'Bronpoort is gereserveerd voor IPFire:',
+'reset' => 'Reset',
+'reset shares' => 'Reset share',
+'resetglobals' => 'Reset globale instellingen',
+'resetpolicy' => 'Reset beleid naar standaard',
+'resetshares' => 'Reset shares?',
+'resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections' => 'door resetten van de vpn configuratie zullen de root CA, het hostcertificaat en alle certificaatgebaseerde verbindingen worden verwijderd',
+'restart' => 'Herstart',
+'restart ovpn server' => 'Herstart OpenVPN server',
+'restore' => 'Herstellen',
+'restore defaults' => 'Herstel standaard',
+'restore hardware settings' => 'Herstel hardware-instellingen',
+'restore settings' => 'Reset instellingen',
+'reverse sort' => 'Sorteer in omgekeerde chronologische volgorde',
+'root' => 'Root',
+'root certificate' => 'Rootcertificaat',
+'root path' => 'Root pad',
+'root user password' => 'Root wachtwoord',
+'route subnet is invalid' => 'Additionele push route subnet is ongeldig',
+'router ip' => 'Router IP-adres:',
+'routing table entries' => 'Routeringstabel entries:',
+'rsvd dst port overlap' => 'Bestemmingspoortreeks overlapt een poort die gereserveerd is voor IPFire:',
+'rsvd src port overlap' => 'Bronpoortreeks overlapt een poort die gereserveerd is voor IPFire:',
+'rules already up to date' => 'Regels zijn al bijgewerkt',
+'running' => 'LOOPT',
+'safe removal of umounted device' => 'U kunt het ontkoppelde apparaat veilig verwijderen',
+'samba' => 'Samba',
+'samba status' => 'Samba Status',
+'saturday' => 'Zaterdag',
+'save' => 'Opslaan',
+'save config' => 'opslaan instellingen',
+'save error' => 'Kan configuratie-archief niet opslaan',
+'save settings' => 'Opslaan instellingen',
+'save-adv-options' => 'Opslaan geavanceerde opties',
+'script name' => 'Scriptnaam:',
+'secondary dns' => 'Secondaire DNS:',
+'secondary ntp server' => 'Secondaire NTP server',
+'secondary wins server address' => 'Secondaire WINS serveradres',
+'seconds' => 'Sec.',
+'section' => 'Sectie',
+'secure shell server' => 'Secure Shell Server',
+'security' => 'Beveiliging',
+'security options' => 'Beveiligingsopties',
+'select' => 'Selecteer',
+'select dest net' => 'Selecteer een bestemmingsnet.',
+'select media' => 'Selecteer media <br />(alleen FAT wordt ondersteund voor verwijderbare media)',
+'select source net' => 'Selecteer een bron net. Als u geen ORANJE of BLAUW netwerk heeft geconfigureerd, dan heeft u geen DMZ pinholes nodig.',
+'selecttraffic' => 'Selecteer verbruiksoverzicht:',
+'send cr' => 'ISP vereist Carriage Return:',
+'send email notification' => 'Ingeschakeld, stuur e-mail notificatie',
+'send test mail' => 'Verstuur test e-mail',
+'september' => 'September',
+'serial' => 'Serieel',
+'server reserved' => 'De verbindingsnaam is gereserveerd en niet toegestaan',
+'server restart' => 'U kunt geen wijzigingen opslaan als de OpenVPN server actief is.',
+'server string' => 'Server String',
+'service' => 'Dienst',
+'service added' => 'Aangepaste netwerkdienst toegevoegd',
+'service name' => 'Dienstennaam:',
+'service removed' => 'Aangepaste netwerkdienst verwijderd',
+'service updated' => 'Aangepaste netwerkdienst bijgewerkt',
+'servicename' => 'Dienstennaam',
+'services' => 'Diensten',
+'services settings' => 'Firewall - Diensteninstellingen',
+'set' => 'zet',
+'set time now' => 'Tijd nu gelijk zetten',
+'set time now help' => 'Om een synchronisatiegebeurtenis aan de wachtrij toe te voegen (zelfs als er een herhaalschema wordt gebruikt), klik op de <i>Tijd nu gelijk zetten</i>-knop. Mogelijk moet u 5 minuten of langer wachten voordat de synchronisatie plaatsvindt.',
+'settings' => 'Instellingen',
+'shaping add options' => 'Service toevoegen',
+'shaping list options' => 'Verkeersregeling diensten',
+'shared' => 'gedeeld',
+'sharename' => 'Sharenaam',
+'shares' => 'Shares',
+'show ajax speedmeter in footer' => 'Toon Ajax snelheidsmeter',
+'show areas' => 'toon gebieden',
+'show ca certificate' => 'Toon CA certificaten',
+'show certificate' => 'Toon certificaat',
+'show crl' => 'Toon lijst met ingetrokken certificaten',
+'show host certificate' => 'Toon host certificaat',
+'show last x lines' => 'Toon laatste x regels',
+'show lines' => 'Toon regels',
+'show root certificate' => 'Toon root certificaat',
+'show share options' => 'Toon shares opties',
+'shuffle' => 'Willekeurige volgorde',
+'shutdown' => 'Afsluiten',
+'shutdown ask' => 'Afsluiten?',
+'shutdown control' => 'Afsluit controle',
+'shutdown sure' => 'Weet u zeker dat u wilt afsluiten?',
+'shutdown2' => 'Afsluiten:',
+'shutting down' => 'Nu aan het afsluiten',
+'shutting down ipfire' => 'IPFire aan het afsluiten',
+'since' => 'sinds',
+'sitekey' => 'Sitesleutel',
+'sitekeyfile' => 'Site sleutelbestand',
+'size' => 'Grootte',
+'smart information' => 'S.M.A.R.T. informatie',
+'smartwarn1' => 'Apparaat:',
+'smartwarn2' => 'rapporteert S.M.A.R.T. fout',
+'smbreload' => 'Samba opnieuw laden',
+'smbrestart' => 'Samba herstarten',
+'smbstart' => 'Start samba',
+'smbstop' => 'Stop samba',
+'smtphost' => 'SMTP host',
+'smtpport' => 'SMTP poort',
+'snort hits' => 'Totaal aantal inbraakregels geactiveerd voor',
+'snort working' => 'Snort is bezig ... Wacht a.u.b. totdat alle handelingen succesvol zijn afgerond.',
+'socket options' => 'Socket opties',
+'sort ascending' => 'Sorteer oplopend',
+'sort descending' => 'Sorteer aflopend',
+'sound' => 'Geluid',
+'source' => 'Bron',
+'source ip' => 'Bron IP',
+'source ip and port' => 'Bron IP: Poort',
+'source ip bad' => 'Geen geldig IP-adres of netwerkadres.',
+'source ip in use' => 'Bron IP in gebruik:',
+'source ip or net' => 'Bron IP of Net',
+'source net' => 'Bron Net',
+'source network' => 'Bron IP, of netwerk (leeg voor "ALLE"):',
+'source port' => 'Bronpoort',
+'source port in use' => 'Bronpoort in gebruik:',
+'source port numbers' => 'Bronpoort moet een geldig poortnummer of poortreeks zijn.',
+'source port overlaps' => 'Bronpoortreeks overlapt een bestaande poortreeks.',
+'speaker off' => 'Speaker uit:',
+'speaker on' => 'Speaker aan:',
+'squid extension methods' => 'Uw <tt>extensie_methoden</tt> lijst',
+'squid extension methods invalid' => 'Uw \'extensie_methoden\' lijst mag alleen hoofdletters en cijfers bevatten, gescheiden door een spatie. ',
+'squid fix cache' => 'Repareer cache',
+'src port' => 'Bronpoort',
+'srcprt range overlaps' => 'Bronpoortreeks overlapt met een al gedefinieerde poort.',
+'srcprt within existing' => 'Bronpoort ligt binnen een al gedefinieerde poortreeks.',
+'ssdmz pinholes' => 'DMZ Pinholes',
+'ssh access' => 'SSH toegang',
+'ssh access tip' => 'IPFire SSH gebruikt niet de standaard poort 222!',
+'ssh fingerprint' => 'Vingerafdruk',
+'ssh host keys' => 'SSH Hostsleutels',
+'ssh is disabled' => 'SSH is uitgeschakeld. Stoppen.',
+'ssh is enabled' => 'SSH is ingeschakeld. Herstarten.',
+'ssh key' => 'Sleutel',
+'ssh key size' => 'Grootte (bits)',
+'ssh keys' => 'Toestaan van authenticatie m.b.v. publieke sleutel',
+'ssh no auth' => 'U heeft geen authenticatiemethoden toegestaan; u kunt dan niet inloggen',
+'ssh passwords' => 'Toestaan van authenticatie m.b.v. een wachtwoord',
+'ssh port' => 'SSH poort gezet op 22 (standaard is 222)',
+'ssh portfw' => 'Toestaan van TCP forwarding',
+'ssh tempstart15' => 'Stop SSH daemon over 15 minuten',
+'ssh tempstart30' => 'Stop SSH daemon over 30 minuten',
+'ssh1 disabled' => 'SSHv1 is uitgeschakeld, een versie 2 client is vereist',
+'ssh1 enabled' => 'SSHv1 is ingeschakeld, oudere clients zullen ondersteund worden.',
+'ssh1 support' => 'Ondersteun SSH protocol versie 1 (alleen noodzakelijk voor oudere clients)',
+'ssnetwork status' => 'Netwerkstatus',
+'sspasswords' => 'Wachtwoorden',
+'ssport forwarding' => 'Poort doorsturen',
+'ssproxy graphs' => 'Proxy grafieken',
+'sssystem status' => 'Systeemstatus',
+'sstraffic' => 'Netwerkgebruik',
+'sstraffic graphs' => 'Verkeersgrafieken',
+'standard login script' => 'Standaard inlogscript',
+'start' => 'Start',
+'start address' => 'Beginadres:',
+'start ovpn server' => 'Start OpenVPN Server',
+'state or province' => 'Provincie',
+'static ip' => 'Statisch IP',
+'static routes' => 'Statische routes',
+'status' => 'Status',
+'status information' => 'Statusinformatie',
+'status ovpn' => '4. OpenVPN Status / Configuratie:',
+'std classes' => 'Standaardklassen',
+'stop' => 'Stop',
+'stop ovpn server' => 'Stop OpenVPN Server',
+'stopped' => 'GESTOPT',
+'subject' => 'Onderwerp',
+'subject test' => 'Test e-mail',
+'subject warn' => 'Waarschuwing â waarschuwingsniveau bereikt',
+'subnet' => 'Subnet',
+'subnet is invalid' => 'Netmasker is ongeldig',
+'subscripted user rules' => 'Sourcefire VRT regels met abonnement',
+'successfully refreshed updates list' => 'Lijst succesvol bijgewerkt.',
+'summaries kept' => 'Bewaar samenvattingen voor',
+'sunday' => 'Zondag',
+'swap' => 'Swap',
+'swap usage per' => 'Swap gebruik per',
+'system' => 'Systeem',
+'system graphs' => 'Systeemgrafieken',
+'system information' => 'Systeeminformatie',
+'system log viewer' => 'Systeem Log Viewer',
+'system logs' => 'Systeem logs',
+'system status information' => 'Systeem Status Informatie',
+'telephone not set' => 'Telefoon niet ingesteld.',
+'template' => 'Vooringesteld',
+'template warning' => 'U heeft twee opties voor QoS. Bij de eerste klikt u op de knop opslaan en genereert u zelf de klassen en regels. Voor de tweede klikt u op de "vooringesteld" knop en worden de regels middels een sjabloon voor u ingesteld.',
+'test' => 'test',
+'test email could not be sent' => 'Kon de test e-mail niet verzenden',
+'test email was sent' => 'Test e-mail is succesvol verzonden',
+'the following update was successfully installed' => 'De volgende update was succesvol geïnstalleerd',
+'the statistics were last updated at' => 'De statistieken zijn voor het laatst bijgewerkt op',
+'theme' => 'Thema',
+'there are updates' => 'Er zijn updates beschikbaar voor uw systeem. Ga naar de "updates" sectie voor meer informatie.',
+'there are updates available' => 'Er zijn updates beschikbaar voor uw systeem. Het wordt aangeraden om deze zo snel mogelijk te installeren.',
+'there was no file upload' => 'Er is geen bestand geÃŒpload.',
+'this feature has been sponsored by' => 'Deze feature wordt gesponsord door',
+'this field may be blank' => 'Dit veld mag leeg blijven.',
+'this is not a valid archive' => 'Dit is geen geldig archief.',
+'this is not an authorised update' => 'Dit is geen geautoriseerde update.',
+'this months volume' => 'Volume van deze maand',
+'this update is already installed' => 'Deze update is al geïnstalleerd.',
+'this weeks volume' => 'Volume van deze week',
+'thursday' => 'Donderdag',
+'time' => 'Tijd',
+'time date manually reset' => 'Handmatige datum/tijd reset.',
+'time server' => 'Tijdserver',
+'timeout must be a number' => 'Time-out moet een getal zijn.',
+'title' => 'Titel',
+'to' => 'Naar',
+'to email adr' => 'Naar e-mailadres',
+'to install an update' => 'Om te installeren uploadt u het .tgz.gpg bestand hieronder:',
+'to warn email bad' => 'Naar e-mailadres is ongeldig',
+'toggle' => 'pauze/vervolg',
+'toggle enable disable' => 'Inschakelen of uitschakelen',
+'tone' => 'Toon',
+'tone dial' => 'Toonkiezen:',
+'too long 80 char max' => ' is te lang, maximaal 80 tekens toegestaan',
+'total connection time' => 'Totale verbindingstijd',
+'total hits for log section' => 'Totaal aantal treffers voor logsectie',
+'traffic back' => 'Terug',
+'traffic calc time' => 'Berekeningstijd',
+'traffic calc time bad' => 'Berekeningstijd is niet juist',
+'traffic info messages' => 'Info berichten',
+'traffic monitor' => 'Verkeersmonitor',
+'traffic on' => 'Verkeer op',
+'traffic shaping' => 'Verkeersregeling',
+'traffic shaping settings' => 'Verkeersregeling instellingen',
+'traffic warn level bad' => 'Waarschuwingsniveau is onjuist',
+'trafficblue' => 'WLAN',
+'trafficdate' => 'Datum',
+'trafficfrom' => 'Van',
+'trafficgreen' => 'Intern net',
+'trafficin' => 'Input',
+'trafficorange' => 'DMZ',
+'trafficout' => 'Output',
+'trafficred' => 'Internet',
+'traffics' => 'Verbruiksoverzicht:',
+'trafficsum' => 'Totalen',
+'trafficto' => 'Naar',
+'transfer limits' => 'Transferlimieten',
+'transparent on' => 'Transparant op',
+'tripwire' => 'Tripwire',
+'tripwire cronjob' => 'tripwire cronjob',
+'tripwire functions' => 'tripwire functies',
+'tripwire reports' => 'tripwire rapporten',
+'tripwireoperating' => 'Het proces is gestart. Dit kan enige minuten duren, het scherm wordt automatisch ververst nadat het proces is beëindigd.',
+'tripwirewarningdatabase' => 'WAARSCHUWING â Uw database wordt bijgewerkt met de data van het laatste rapport. Om ongeautoriseerde wijzigingen te voorkomen wordt de lokale sleutel gebruikt.',
+'tripwirewarningkeys' => 'WAARSCHUWING â Dit zal uw huidige sleutels, configuratie en database wissen en opnieuw aanmaken.',
+'tripwirewarningpolicy' => 'WAARSCHUWING â Uw tripwire-beleid zal opnieuw worden opgebouwd, hierna wordt uw database opnieuw geïnitialiseerd. Daarvoor zijn de site-sleutel en de lokale sleutel noodzakelijk.',
+'tuesday' => 'Dinsdag',
+'type' => 'Type',
+'umount' => 'Ontkoppelen',
+'umount removable media before to unplug' => 'Ontkoppel verwijderbare media voordat u het apparaat verwijdert',
+'unable to alter profiles while red is active' => 'Kan profielen niet wijzigen zolang ROOD actief is.',
+'unable to contact' => 'Kan geen contact maken',
+'unencrypted' => 'Ongecodeerd',
+'uninstall' => 'Deinstalleer',
+'unix charset' => 'UNIX karakterset',
+'unix group' => ' UNIX gebruikersgroep',
+'unix password sync' => 'Unix wachtwoordsynchronisatie',
+'unix shell' => 'UNIX Shell',
+'unknown' => 'ONBEKEND',
+'unnamed' => 'Onbenoemd',
+'update' => 'Vernieuwen',
+'update accelerator' => 'Updateversneller',
+'update time' => 'Bijwerken van de tijd:',
+'update transcript' => 'Update transcript',
+'updatedatabase' => 'Update database met het laatste rapport',
+'updates' => 'Updates',
+'updates installed' => 'Regelset bijgwerkt op',
+'updates is old1' => 'Uw updatebestand is ',
+'updates is old2' => 'dagen oud. We raden u aan om te updaten op de <b>Systeem > Updates</b> pagina.',
+'updxlrtr 3 months' => 'drie maanden',
+'updxlrtr 6 months' => 'zes maanden',
+'updxlrtr all files' => 'alle bestanden ...',
+'updxlrtr cache dir' => 'Cache directory',
+'updxlrtr cache maintenance' => 'Cache onderhoud',
+'updxlrtr cache size' => 'Cache grootte (bytes)',
+'updxlrtr cache statistics' => 'Cache statistieken',
+'updxlrtr cancel download' => 'Annuleer download',
+'updxlrtr children' => 'Aantal versnellerprocessen',
+'updxlrtr common settings' => 'Algemene instellingen',
+'updxlrtr condition download' => 'Download',
+'updxlrtr condition nosource' => 'Geen bron',
+'updxlrtr condition ok' => 'Actueel',
+'updxlrtr condition outdated' => 'Verouderd',
+'updxlrtr condition suspended' => 'Uitgesteld',
+'updxlrtr condition unknown' => 'Onbekend',
+'updxlrtr configuration' => 'Updateversneller configuratie',
+'updxlrtr current downloads' => 'Bestanden worden opgeslagen in de lokale cache',
+'updxlrtr current files' => 'Huidige bestanden in de lokale cache',
+'updxlrtr daily' => 'dagelijks',
+'updxlrtr data from cache' => 'Data van cache (bytes)',
+'updxlrtr disk usage' => 'Schijfgebruik',
+'updxlrtr efficiency index' => 'Cache efficiency index',
+'updxlrtr empty repository' => 'Lokale cache is leeg',
+'updxlrtr enable autocheck' => 'Inschakelen automatische broncontrole',
+'updxlrtr enable log' => 'Inschakelen log',
+'updxlrtr filename' => 'Naam',
+'updxlrtr files' => 'Bestanden',
+'updxlrtr filesize' => 'Grootte',
+'updxlrtr full autosync' => 'Vervang verouderde bestanden gedurende controle',
+'updxlrtr invalid disk usage' => 'Ongeldige waarde voor max. schijfgebruik',
+'updxlrtr invalid download rate' => 'Ongeldige waarde voor max. downloadsnelheid',
+'updxlrtr invalid num of children' => 'Ongeldig aantal versnellerprocessen',
+'updxlrtr last access' => 'Laatste cache-opvraag',
+'updxlrtr last checkup' => 'Laatste broncontrole',
+'updxlrtr low download priority' => 'Lagere CPU prioriteit voor downloads',
+'updxlrtr maintenance' => 'Onderhoud',
+'updxlrtr marked as' => 'gemarkeerd als',
+'updxlrtr max disk usage' => 'Max. schijfgebruik',
+'updxlrtr max download rate' => 'Max. externe downloadsnelheid (kBit/s)',
+'updxlrtr month' => 'een maand',
+'updxlrtr monthly' => 'maandelijks',
+'updxlrtr not accessed' => 'niet benaderd sinds',
+'updxlrtr not enabled' => 'Updateversneller is niet ingeschakeld op de webproxy pagina',
+'updxlrtr other' => 'Overig',
+'updxlrtr passive mode' => 'Inschakelen passieve modus',
+'updxlrtr pending downloads' => 'Wachtrij downloads',
+'updxlrtr performance options' => 'Performance opties',
+'updxlrtr progress' => 'Voortgang',
+'updxlrtr purge' => 'Opschonen',
+'updxlrtr remove file' => 'Verwijder uit cache',
+'updxlrtr save and restart' => 'Opslaan en herstarten',
+'updxlrtr source' => 'Bron',
+'updxlrtr source checkup' => 'Broncontrole',
+'updxlrtr source checkup schedule' => 'Broncontrole planning',
+'updxlrtr statistics' => 'Statistieken',
+'updxlrtr statistics by source' => 'Statistieken per bron',
+'updxlrtr summary' => 'Samenvatting',
+'updxlrtr total cache size' => 'Totale cachegrootte (bytes)',
+'updxlrtr total data from cache' => 'Totale hoeveelheid data geleverd uit cache (bytes)',
+'updxlrtr total files' => 'Totaal aantal bestanden in cache',
+'updxlrtr unknown' => 'Onbekend',
+'updxlrtr update accelerator' => 'Updateversneller',
+'updxlrtr update information' => 'Er is een nieuwere versie beschikbaar voor download. Bezoek <a href="http://update-accelerator.advproxy.net" target="_blank">http://update-accelerator.advproxy.net</a> voor meer informatie.',
+'updxlrtr update notification' => 'Update notificatie!',
+'updxlrtr web proxy service required' => 'Web proxy service moet ingeschakeld zijn om de updateversneller te kunnen gebruiken.',
+'updxlrtr week' => 'een week',
+'updxlrtr weekly' => 'wekelijks',
+'updxlrtr year' => 'een jaar',
+'upgrade' => 'upgrade',
+'uplink speed' => 'Uplink snelheid (kbit/sec)',
+'uplink std class' => 'uplink standaardklasse',
+'upload' => 'Upload',
+'upload a certificate' => 'Upload een certificaat:',
+'upload a certificate request' => 'Upload een certificaatverzoek:',
+'upload ca certificate' => 'Upload CA certificaat',
+'upload fcdsl.o' => 'WORDT VERWIJDERD',
+'upload file' => 'Upload bestand',
+'upload new ruleset' => 'Upload nieuwe regelset',
+'upload p12 file' => 'Upload PKCS12 bestand',
+'upload static key' => 'Upload een statische sleutel',
+'upload successful' => 'Upload succesvol.',
+'upload synch.bin' => 'Upload synch.bin',
+'upload update file' => 'Upload updatebestand:',
+'upstream password' => 'Upstream wachtwoord:',
+'upstream proxy host:port' => 'Upstream proxy (host:poort)',
+'upstream username' => 'Upstream gebruikersnaam:',
+'uptime and users' => 'Bedrijfstijd en gebruikers:',
+'url filter' => 'Inhoudsfilter',
+'urlfilter access' => 'Toegang',
+'urlfilter activity detection' => 'Activiteitsdetectie',
+'urlfilter add new time constraint rule' => 'Voeg nieuwe tijdslimietregel toe',
+'urlfilter add new user quota rule' => 'Voeg nieuwe gebruikersquotum regel toe',
+'urlfilter add rule' => 'Toevoegen',
+'urlfilter advanced settings' => 'Geavanceerde instellingen',
+'urlfilter allow' => 'Toestaan',
+'urlfilter allow access' => 'Toegang toestaan',
+'urlfilter allowed domains' => 'Toegestane domeinen (een per regel)',
+'urlfilter allowed urls' => 'Toegestane URL\'s (een per regel)',
+'urlfilter assigned quota users' => 'Toegekende gebruikers (een per regel)',
+'urlfilter assigned users' => 'Toegekende gebruikers',
+'urlfilter automatic blacklist update' => 'Automatische zwarte lijst update',
+'urlfilter automatic update schedule' => 'Automatisch updaterooster',
+'urlfilter back to main page' => 'Terug naar hoofdpagina',
+'urlfilter background image' => 'urlfilter achtergrondafbeelding',
+'urlfilter background text' => 'Om een eigen achtergrondafbeelding te gebruiken voor de blokkeringspagina, upload het .jpg bestand hieronder',
+'urlfilter backup' => 'Aanmaken back-up bestand',
+'urlfilter backup error' => 'Kan back-up bestand niet aanmaken',
+'urlfilter backup settings' => 'Back-up URL filterinstellingen',
+'urlfilter banned clients' => 'Verboden IP-adressen',
+'urlfilter blacklist age 1' => 'Laatste succesvolle zwarte lijst update was',
+'urlfilter blacklist age 2' => 'dagen geleden',
+'urlfilter blacklist category name' => 'Zwarte lijst categorienaam',
+'urlfilter blacklist editor' => 'Zwarte lijstbewerker',
+'urlfilter blacklist editor info' => 'Aanmaken en wijzigen van uw eigen zwartelijst',
+'urlfilter blacklist name' => 'Naam zwarte lijst',
+'urlfilter blacklist update' => 'Zwarte lijst update',
+'urlfilter block' => 'Blokkeer',
+'urlfilter block access' => 'Blokkeer toegang',
+'urlfilter block all' => 'Blokkeer alle URL\'s die niet expliciet zijn toegestaan',
+'urlfilter block archives' => 'Blokkeer ingepakte archiefbestanden',
+'urlfilter block audio-video' => 'Blokkeer audio/video bestanden',
+'urlfilter block categories' => 'Blokkeer categorieën',
+'urlfilter block executables' => 'Blokkeer uitvoerbare bestanden',
+'urlfilter block ip' => 'Blokkeer sitetoegang middels het IP-adres',
+'urlfilter block settings' => 'Blokkeerpagina instellingen',
+'urlfilter blocked domains' => 'Geblokkeerde domeinen (een per regel)',
+'urlfilter blocked expressions' => 'Geblokkeerde expressies (als reguliere expressies)',
+'urlfilter blocked urls' => 'Geblokkeerde URL\'s (een per regel)',
+'urlfilter category' => 'Categorie',
+'urlfilter category all' => 'iedere',
+'urlfilter category data error' => 'Zwarte lijst is leeg',
+'urlfilter category log' => 'Splits log in categorieën',
+'urlfilter category name error' => 'Zwarte lijst categorienaam is vereist',
+'urlfilter client' => 'Client',
+'urlfilter configuration' => 'URL filterconfiguratie',
+'urlfilter constraint definition' => 'Definitie',
+'urlfilter constraint outside' => 'buiten',
+'urlfilter constraint within' => 'binnen',
+'urlfilter copy rule' => 'Kopieer',
+'urlfilter current files' => 'Huidige bestanden in lokale repository',
+'urlfilter custom blacklist' => 'Eigen zwarte lijst',
+'urlfilter custom expression list' => 'Eigen expressielijst',
+'urlfilter custom url' => 'Eigen bron-URL',
+'urlfilter custom url required' => 'Eigen bron-URL vereist',
+'urlfilter custom whitelist' => 'Eigen witte lijst',
+'urlfilter daily' => 'dagelijks',
+'urlfilter disabled' => 'uitgeschakeld',
+'urlfilter domains' => 'Domeinen (een per regel)',
+'urlfilter dont restart urlfilter' => 'Herstart URL filter niet',
+'urlfilter dst' => 'Bestemming',
+'urlfilter dst error' => 'Er moet tenminste een categorie zijn geselecteerd',
+'urlfilter edit domains urls expressions' => 'Wijzig domeinen, URL\'s en expressies',
+'urlfilter edit time constraint rule' => 'Wijzig een bestaande tijdregel',
+'urlfilter edit user quota rule' => 'Wijzig een bestaande gebruikersquotum regel',
+'urlfilter empty ads' => 'Blokkeer "ads" met leeg tijdvenster',
+'urlfilter empty repository' => 'Lokale repository is leeg',
+'urlfilter enable automatic blacklist update' => 'Inschakelen automatische update',
+'urlfilter enable custom blacklist' => 'Inschakelen eigen zwarte lijst',
+'urlfilter enable custom expression list' => 'Inschakelen eigen expressielijst',
+'urlfilter enable custom whitelist' => 'Inschakelen eigen witte lijst',
+'urlfilter enable expression lists' => 'Inschakelen eigen expressielijst',
+'urlfilter enable full backup' => 'Inclusief complete zwarte lijst',
+'urlfilter enable jpeg' => 'Inschakelen achtergrondafbeelding',
+'urlfilter enable log' => 'Inschakelen log',
+'urlfilter enable rewrite rules' => 'Inschakelen lokaal bestand omleiden',
+'urlfilter enabled' => 'Ingeschakeld:',
+'urlfilter example' => 'Voorbeeld: www.domein.com',
+'urlfilter example ads' => 'Voorbeeld: www.domein.com/ads/',
+'urlfilter export blacklist' => 'Exporteer zwarte lijst',
+'urlfilter export error' => 'Kan exportbestand niet aanmaken',
+'urlfilter expressions' => 'Expressies (een per regel)',
+'urlfilter file ext block' => 'Bestandsextensie blokkering',
+'urlfilter filename' => 'Naam',
+'urlfilter filesize' => 'Grootte',
+'urlfilter filter settings' => 'URL-filter instellingen',
+'urlfilter fri' => 'V',
+'urlfilter friday' => 'Vrij',
+'urlfilter from' => 'Van',
+'urlfilter hourly' => 'per uur',
+'urlfilter import blacklist' => 'Importeer zwarte lijst',
+'urlfilter import text' => 'Om een eerder opgeslagen zwarte lijst te importeren, upload het .tar.gz bestand hieronder',
+'urlfilter install blacklist' => 'Installeer zwarte lijst',
+'urlfilter install information' => 'De nieuwe zwarte lijst zal automatisch worden samengesteld voor uw ingebouwde databases. Afhankelijk van de grootte van de zwarte lijst kan dit tot enige minuten duren.',
+'urlfilter invalid content' => 'Bestand is geen squidGuard compatibele zwarte lijst',
+'urlfilter invalid import file' => 'Bestand is geen geldige URL-filter zwarte lijst',
+'urlfilter invalid ip or mask error' => 'Ongeldig IP-adres of netwerkmasker',
+'urlfilter invalid restore file' => 'Bestand is geen geldig URL-filter back-up bestand',
+'urlfilter invalid user error' => 'Ongeldige gebruikersnaam',
+'urlfilter load blacklist' => 'Laad zwarte lijst',
+'urlfilter local file redirection' => 'Lokale bestandsomleiding',
+'urlfilter log' => 'urlfilter log',
+'urlfilter log summary' => 'Totaal aantal URL-filter treffers voor',
+'urlfilter log viewer' => 'URL-filter logviewer',
+'urlfilter logs' => 'URL-Filterlogs',
+'urlfilter maintenance' => 'URL-filter onderhoud',
+'urlfilter manage local file repository' => 'Beheer lokale bestandsrepository',
+'urlfilter manage repository' => 'Beheer repository',
+'urlfilter minutes' => 'minuten',
+'urlfilter mode allow' => 'toestaan',
+'urlfilter mode block' => 'blokkeer',
+'urlfilter mon' => 'M',
+'urlfilter monday' => 'Maa',
+'urlfilter monthly' => 'maandelijks',
+'urlfilter msg text 1' => 'Berichtregel 1',
+'urlfilter msg text 2' => 'Berichtregel 2',
+'urlfilter msg text 3' => 'Berichtregel 3',
+'urlfilter network access control' => 'Netwerkgebaseerde toegangscontrole',
+'urlfilter no categories' => 'Geen categorieën beschikbaar',
+'urlfilter not enabled' => 'URL-filter is niet ingeschakeld op de Web proxy pagina',
+'urlfilter quota restart message' => 'Noot: de tellers worden gereset voor alle gebruikers als het URL-filter wordt herstart',
+'urlfilter quota time error' => 'Ongeldige waarde voor tijdsquotum',
+'urlfilter quota user error' => 'Tenminste een gebruikersnaam is vereist',
+'urlfilter redirectpage' => 'Omleiden naar deze URL',
+'urlfilter remove file' => 'Verwijder bestand uit repository',
+'urlfilter renewal' => 'Vernieuwing',
+'urlfilter renewal period' => 'Vernieuwingsperiode',
+'urlfilter repository information' => 'Downloadverzoeken voor deze bestanden zullen worden omgeleid van de originele bron naar de lokale repository.',
+'urlfilter reset' => 'Reset',
+'urlfilter restart' => 'Herstart URL-filter',
+'urlfilter restart message' => 'Het URL-filter moet herstart worden om de wijzigingen te activeren',
+'urlfilter restart notification' => 'Activeer gewijzigde regels',
+'urlfilter restore' => 'Importeer back-upbestand',
+'urlfilter restore results' => 'Herstelresultaten',
+'urlfilter restore settings' => 'Herstel URL-filter instellingen',
+'urlfilter restore success' => 'URL-filter configuratie is hersteld. Het URL-filter moet worden herstart om de de nieuwe instellingen te activeren.',
+'urlfilter restore text' => 'Om een eerder opgeslagen configuratie te gebruiken uploadt u het .tar.gz back-upbestand hieronder',
+'urlfilter safesearch' => 'Inschakelen SafeSearch',
+'urlfilter sat' => 'Z',
+'urlfilter saturday' => 'Zat',
+'urlfilter save and restart' => 'Opslaan en herstarten',
+'urlfilter save schedule' => 'Opslaan update-instellingen',
+'urlfilter select blacklist' => 'Selecteer bestaande zwarte lijst',
+'urlfilter select multi' => 'Gebruik de ctrl-toets om meerdere categorieën te selecteren',
+'urlfilter select source' => 'Selecteer downloadbron',
+'urlfilter set time constraints' => 'Instellen tijdsbeperkingen',
+'urlfilter set user quota' => 'Instellen gebruikersquotum',
+'urlfilter show category' => 'Toon categorie op blokkeerpagina',
+'urlfilter show dnserror' => 'Gebruik "DNS fout" om URL\'s te blokkeren',
+'urlfilter show ip' => 'Toon IP op blokkeerpagina',
+'urlfilter show url' => 'Toon URL op blokkeerpagina',
+'urlfilter source' => 'Bronhost(s) of netwerk(en)',
+'urlfilter src' => 'Bron',
+'urlfilter src error' => 'Bron mag niet leeg zijn',
+'urlfilter sun' => 'Z',
+'urlfilter sunday' => 'Zon',
+'urlfilter tar error' => 'Kan archief niet uitpakken',
+'urlfilter thu' => 'D',
+'urlfilter thursday' => 'Don',
+'urlfilter time' => 'Tijd',
+'urlfilter time quota' => 'Tijdquotum',
+'urlfilter time space' => 'Tijdvenster',
+'urlfilter timebased access control' => 'Tijdgebaseerde toegangscontrole',
+'urlfilter timespace error' => 'Fout in tijdsvenster declaratie',
+'urlfilter to' => 'Tot',
+'urlfilter tue' => 'D',
+'urlfilter tuesday' => 'Din',
+'urlfilter unfiltered clients' => 'Ongefilterde IP-adressen',
+'urlfilter update information' => 'Er is een nieuwere versie beschikbaar om te downloaden. Bezoek <a href="http://www.urlfilter.net" target="_blank">http://www.urlfilter.net</a> voor meer informatie.',
+'urlfilter update notification' => 'Update notificatie!',
+'urlfilter update now' => 'Update nu',
+'urlfilter update results' => 'Zware lijst update-resultaten',
+'urlfilter update rule' => 'Update',
+'urlfilter upload background' => 'Upload afbeelding',
+'urlfilter upload blacklist' => 'Upload zwarte lijst',
+'urlfilter upload file' => 'Upload bestand',
+'urlfilter upload file information 1' => 'Noot',
+'urlfilter upload file information 2' => 'Het URL-filter moet herstart worden om de wijzigingen in de repository te activeren.',
+'urlfilter upload file text' => 'Upload het bestand hieronder om het aan de lokale repository toe te voegen',
+'urlfilter upload information' => 'De nieuwe zwarte lijst zal automatisch worden samengesteld voor uw databases. Afhankelijk van de grootte van de zwarte lijst kan dit tot enige minuten duren. Wacht a.u.b. totdat dit proces is beëindigd alvorens het URL-filter te herstarten.',
+'urlfilter upload success' => 'Zwarte lijst upload succesvol afgerond.',
+'urlfilter upload text' => 'Upload het .tar.gz bestand hieronder om een bijgewerkte zwarte lijst te installeren',
+'urlfilter url filter' => 'URL-filter',
+'urlfilter urlfilter blacklist editor' => 'URL-filter zwarte lijstbewerker',
+'urlfilter urls' => 'URL\'s (een per regel)',
+'urlfilter user time quota' => 'Tijdquotum (in minuten)',
+'urlfilter username' => 'Gebruikersnaam',
+'urlfilter username log' => 'Log gebruikersnaam',
+'urlfilter web proxy service required' => 'Webproxy service moet ingeschakeld zijn om het URL-filter te gebruiken',
+'urlfilter wed' => 'W',
+'urlfilter wednesday' => 'Woe',
+'urlfilter weekday error' => 'Er moet tenminste een dag geselecteerd zijn',
+'urlfilter weekly' => 'wekelijks',
+'urlfilter whitelist always allowed' => 'Toestaan gebruik van eigen witte lijst voor verboden clients',
+'urlfilter wrong filetype' => 'Bestand heeft niet de extensie .tar.gz',
+'usb modem on acm0' => 'USB Modem op ACM0',
+'usb modem on acm1' => 'USB Modem op ACM1',
+'usb modem on acm2' => 'USB Modem op ACM2',
+'usb modem on acm3' => 'USB Modem op ACM3',
+'use' => 'Gebruik',
+'use a pre-shared key' => 'Gebruik een pre-shared sleutel:',
+'use dov' => 'Gebruik data over voice (DOV):',
+'use ibod' => 'Gebruik bandbreedte op verzoek (iBOD):',
+'use ipfire red ip' => 'Het klassieke RODE IP gebruikt door IPFire gedurende de verbinding',
+'use only proposed settings' => 'Gebruik alleen voorgestelde instellingen.',
+'used' => 'Gebruikt',
+'used memory' => 'Gebruikt geheugen ',
+'used swap' => 'Gebruikt swap',
+'user' => 'Gebruiker',
+'user log' => 'Gebruiker log',
+'user proxy logs' => 'gebruiker proxy log',
+'username' => 'Gebruikersnaam:',
+'username not set' => 'Gebruikersnaam niet ingesteld.',
+'users department' => 'Gebruikersafdeling',
+'users email' => 'E-mailadres gebruiker',
+'users fullname or system hostname' => 'Volledige naam gebruiker of systeemnaam',
+'valid root certificate already exists' => 'Een geldig root certificaat bestaat al.',
+'valid till' => 'Geldig tot',
+'vci number' => 'VCI nummer:',
+'view log' => 'bekijk log',
+'virtual address' => 'Virtueel adres',
+'virtual private networking' => 'Virtual Private Networking',
+'visible in browselist' => 'zichtbaar in bladerlijst',
+'visit us at' => 'Bezoek ons op',
+'voldown10' => 'Verlaag volume met 10',
+'voldown5' => 'Verlaag volume met 5',
+'volup10' => 'Verhoog volume met 10',
+'volup5' => 'Verhoog volume met 5',
+'vpi number' => 'VPI nummer:',
+'vpn' => 'VPN',
+'vpn aggrmode' => 'IKE agressieve modus toegestaan. Vermijd als mogelijk (preshared sleutel wordt verstuurd als zichtbare tekst)!',
+'vpn altname syntax' => 'SubjectAltName is een komma-gescheiden lijst van e-mail, dns, uri, rid and ip objecten.<br />email:een e-mailadres. Syntax e-mail:copy neemt het e-mailveld van het certificaat dat wordt gebruikt.<br />DNS:een geldige domeinnaam.<br />URI:iedere geldige URI.<br />RID:geregistreerde object identifier.<br />IP:een IP-adres.<br />Noot:tekenset is beperkt en hoofdletter gevoelig.<br />Voorbeeld:<br /><b>e-mail:</b>ipfire(a)foo.org<b>,email:</b>copy<b>,DNS:</b>www.ipfire.org<b>,IP:</b>127.0.0.1<b>,URI:</b>http://url/naar/iets',
+'vpn auth-dn' => 'Peer is geïdentificeerd door IPV4_ADDR, FQDN, USER_FQDN of DER_ASN1_DN tekenreeks in âremote IDâ veld',
+'vpn configuration main' => 'VPN configuratie - Hoofdpagina',
+'vpn delayed start' => 'Vertraging voor starten VPN (seconden)',
+'vpn delayed start help' => 'Als dit noodzakelijk is, dan kan deze vertraging gebruikt worden om dynamische DNS updates op de juiste wijze te propageren. 60 seconden is a gebruikelijke waarde als ROOD een dynamisch IP-adres heeft.',
+'vpn incompatible use of defaultroute' => 'hostnaam=%defaultroute niet toegestaan',
+'vpn keyexchange' => 'Sleuteluitwisseling',
+'vpn local id' => 'Lokale ID',
+'vpn missing remote id' => 'U moet de juiste unieke naam/Distinguished Name (DN) opgeven voor deze authenticatie.',
+'vpn mtu invalid' => 'MTU moet een numerieke waarde zijn!',
+'vpn no full pki' => 'mist private sleutel om het certificaat te genereren',
+'vpn on blue' => 'VPN op BLAUW',
+'vpn on green' => 'VPN op GROEN',
+'vpn on orange' => 'VPN op ORANJE',
+'vpn payload compression' => 'Onderhandelen payload compressie',
+'vpn red name' => 'Publiek IP of FQDN voor RODE interface of <%defaultroute>',
+'vpn remote id' => 'Remote ID',
+'vpn subjectaltname' => 'Onderwerp Alt Naam',
+'vpn vhost' => 'Roadwarrior virtual IP (Ook wel Inner-IP genoemd)',
+'vpn watch' => 'Herstart net-to-net vpn wanneer remote peer IP verandert (dyndns).',
+'waiting to synchronize clock' => 'Wachten op synchronisatie van klok',
+'warn when traffic reaches' => 'Waarschuw wanneer verkeer x % bereikt',
+'warning messages' => 'Waarschuwingsmeldingen',
+'was deleted' => 'was verwijderd',
+'web hits' => 'Totaal aantal websites die overeenkomen met de geselecteerde criteria',
+'web proxy' => 'Web Proxy',
+'web proxy configuration' => 'Web proxy configuratie',
+'web server' => 'Web Server',
+'webradio playlist' => 'Webradio Afspeellijst',
+'website' => 'Website',
+'wednesday' => 'Woensdag',
+'week' => 'Week',
+'week-graph' => 'Week',
+'weekly firewallhits' => 'wekelijkse firewalltreffers',
+'weeks' => 'weken',
+'wildcards' => 'Wildcards',
+'wins server' => 'Wins Server',
+'wins support' => 'Wins Support',
+'wireless' => 'Draadloos',
+'wireless config added' => 'Draadloze configuratie toegevoegd',
+'wireless config changed' => ' Draadloze configuratie gewijzigd',
+'wireless configuration' => 'Draadloze configuratie',
+'wlanap access point' => 'Access Point',
+'wlanap country' => 'Landcode',
+'wlanap channel' => 'Kanaal',
+'wlanap debugging' => 'Debugging',
+'wlanap del interface' => 'Verwijder geselecteerde interface?',
+'wlanap encryption' => 'Encryptie',
+'wlanap informations' => 'Informatie',
+'wlanap interface' => 'Selecteer interface',
+'wlanap invalid wpa' => 'Ongeldige lengte voor WPA wachtwoord. Moet tussen de 8 en 63 tekens zijn.',
+'wlanap link dhcp' => 'Draadloze LAN DHCP configuratie',
+'wlanap link wireless' => 'Activeer draadloze LAN clients',
+'wlanap no interface' => 'Geselecteerde interface is geen draadloze LAN kaart!',
+'wlanap none' => 'geen',
+'wlanap notifications' => 'Notificaties',
+'wlanap select interface' => 'Selecteer de draadloze LAN interface.',
+'wlanap verbose' => 'Uitgebreid',
+'wlanap warnings' => 'Waarschuwingen',
+'wlanap wlan card' => 'WLan kaart',
+'wlanap wlan services' => 'WLan Diensten',
+'wlanap wlan settings' => 'WLan Instellingen',
+'wlanap wlan status' => 'WLan Status',
+'wol wakeup' => 'Ontwaken',
+'workgroup' => 'Werkgroep',
+'written bytes' => 'Geschreven bytes',
+'xtaccess all error' => 'U kunt een externe toegang niet op ALLEN zetten, dat wordt gedaan in het poort forwarding deel.',
+'xtaccess bad transfert' => 'Als u een bestemmingspoort reeks opgeeft, dan moet de bronreeks identiek zijn!',
+'year' => 'Jaar',
+'year-graph' => 'Jaar',
+'yearly firewallhits' => 'jaarlijkse firewalltreffers',
+'yes' => 'Ja',
+'you can only define one roadwarrior connection when using pre-shared key authentication' => 'U kunt slechts een Roadwarrior verbinding definiëren als u pre-shared sleutelauthenticatie gebruikt.<br />Ofwel u heeft al een Roadwarrior verbinding met pre-shared sleutelauthenticatie, of u probeert er nu een toe te voegen.',
+'your department' => 'Uw afdeling',
+'your e-mail' => 'Uw e-mailadres',
+);
+
+#EOF
diff --git a/langs/nl/install/lang_nl.c b/langs/nl/install/lang_nl.c
new file mode 100644
index 0000000..40b64d2
--- /dev/null
+++ b/langs/nl/install/lang_nl.c
@@ -0,0 +1,590 @@
+/*
+ * Dutch (nl) Data File
+ *
+ * This file is part of the IPFire.
+ *
+ * IPCop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * IPCop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with IPCop; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * (c) IPFire Team <info(a)ipfire.org>
+ *
+ * based on work of SmoothWall and IPCop
+ *
+ * (c) The SmoothWall Team
+ *
+ */
+
+#include "libsmooth.h"
+
+char *nl_tr[] = {
+
+/* TR_ISDN */
+"ISDN",
+/* TR_ERROR_PROBING_ISDN */
+"Niet in staat om te scannen op ISDN-apparaten.",
+/* TR_PROBING_ISDN */
+"Scannen en configureren van ISDN-apparaten.",
+/* TR_MISSING_GREEN_IP */
+"Groen IP-adres ontbreekt!",
+/* TR_CHOOSE_FILESYSTEM */
+"Kies uw bestandssysteem:",
+/* TR_NOT_ENOUGH_INTERFACES */
+"Onvoldoende netwerkkaarten voor uw keuze.\n\nNodig: %d - Beschikbaar: %d\n",
+/* TR_INTERFACE_CHANGE */
+"Kies de interface die u wilt wijzigen.\n\n",
+/* TR_NETCARD_COLOR */
+"Toegewezen kaarten",
+/* TR_REMOVE */
+"Verwijder",
+/* TR_MISSING_DNS */
+"DNS ontbreekt.\n",
+/* TR_MISSING_DEFAULT */
+"Standaard gateway ontbreekt.\n",
+/* TR_JOURNAL_EXT3 */
+"Aanmaken journal voor Ext3...",
+/* TR_CHOOSE_NETCARD */
+"Kies een netwerkkaart voor de volgende interface - %s.",
+/* TR_NETCARDMENU2 */
+"Uitgebreide Netwerkmenu",
+/* TR_ERROR_INTERFACES */
+"Er zijn geen vrije interfaces op uw systeem.",
+/* TR_REMOVE_CARD */
+"Moet de toewijzing voor de netwerkkaart worden verwijderd? - %s",
+/* TR_JOURNAL_ERROR */
+"Kon het journaalboek niet aanmaken, valt terug op gebruik van ext2.",
+/* TR_FILESYSTEM */
+"Kies uw bestandssysteem",
+/* TR_ADDRESS_SETTINGS */
+"Adresinstellingen",
+/* TR_ADMIN_PASSWORD */
+"'admin' wachtwoord",
+/* TR_AGAIN_PROMPT */
+"Nogmaals:",
+/* TR_ALL_CARDS_SUCCESSFULLY_ALLOCATED */
+"Alle kaarten zijn succesvol toegewezen.",
+/* TR_AUTODETECT */
+"* AUTODETECT *",
+/* TR_BUILDING_INITRD */
+"Aanmaken ramdisk...",
+/* TR_CANCEL */
+"Annuleren",
+/* TR_CARD_ASSIGNMENT */
+"Kaart toewijzing",
+/* TR_CHECKING */
+"Controleert URL...",
+/* TR_CHECKING_FOR */
+"Controleert voor: %s",
+/* TR_CHOOSE_THE_ISDN_CARD_INSTALLED */
+"Kies de ISDN-kaart die geïnstalleerd is op deze computer.",
+/* TR_CHOOSE_THE_ISDN_PROTOCOL */
+"Kies het ISDN-protocol dat u nodig heeft.",
+/* TR_CONFIGURE_DHCP */
+"Configureer de DHCP server door de instellingen in te voeren.",
+/* TR_CONFIGURE_NETWORKING */
+"Configureer het netwerk",
+/* TR_CONFIGURE_NETWORKING_LONG */
+"U moet nu het netwerk configureren door eerst de juiste driver te laden voor de GROENE interface. U kunt dit doen door ofwel automatisch te zoeken naar een netwerkkaart, of door de juiste driver te kiezen uit een lijst. Als u meer dan een kaart in uw machine heeft, dan kunt u die later in het installatieproces configureren. Mocht u meer dan een kaart van hetzelfde type als GROEN gebruiken en iedere kaart vereist speciale moduleparameters, dan moet u de parameters voor alle kaarten van dit type invoeren zodat alle kaarten actief kunnen worden waneer u de GROENE interface configureert.",
+/* TR_CONFIGURE_NETWORK_DRIVERS */
+"Configureer netwerkdrivers, en bepaal welke interface iedere kaart krijgt toegewezen. De huidige configuratie is als volgt:\n\n",
+/* TR_CONFIGURE_THE_CDROM */
+"Configureer de CDROM door het juiste IO-adres en/of IRQ te kiezen.",
+/* TR_CONGRATULATIONS */
+"Gefeliciteerd!",
+/* TR_CONGRATULATIONS_LONG */
+"%s is succesvol geïnstalleerd. Verwijder a.u.b. de CDROM's in uw computer. U kunt nu de netwerkkaarten en ISDN configureren en de systeemwachtwoorden instellen. Nadat de setup is afgerond, kunt u met de webbrowser naar https://%s:444 (of hoe u %s ook genoemd heeft) en het inbelnetwerk configureren (als nodig) en de remote toegang.",
+/* TR_CONTINUE_NO_SWAP */
+"Uw vaste schijf is erg klein, maar u kunt verder gaan met een zeer kleine swap. (Wees hier voorzichtig mee).",
+/* TR_CURRENT_CONFIG */
+"Huidige configuratie: %s%s",
+/* TR_DEFAULT_GATEWAY */
+"Standaard Gateway:",
+/* TR_DEFAULT_GATEWAY_CR */
+"Standaard Gateway\n",
+/* TR_DEFAULT_LEASE */
+"Standaard lease (min.):",
+/* TR_DEFAULT_LEASE_CR */
+"Standaard leasetijd\n",
+/* TR_DETECTED */
+"Gedetecteerd: %s",
+/* TR_DHCP_HOSTNAME */
+"DHCP Hostnaam:",
+/* TR_DHCP_HOSTNAME_CR */
+"DHCP Hostnaam\n",
+/* TR_DHCP_SERVER_CONFIGURATION */
+"DHCP serverconfiguratie",
+/* TR_DISABLED */
+"Uitgeschakeld",
+/* TR_DISABLE_ISDN */
+"ISDN uitschakelen",
+/* TR_DISK_TOO_SMALL */
+"Uw vaste schijf is te klein.",
+/* TR_DNS_AND_GATEWAY_SETTINGS */
+"DNS en Gateway instellingen",
+/* TR_DNS_AND_GATEWAY_SETTINGS_LONG */
+"Voer de DNS en gateway informatie in. Deze instellingen worden alleen gebruikt met statische IP-adressen (en DHCP als DNS is ingesteld) op de RODE interface.",
+/* TR_DNS_GATEWAY_WITH_GREEN */
+"Uw configuratie gebruikt geen ethernetadapter voor z'n RODE interface. DNS en gateway voor inbelgebruikers worden automatisch geconfigureerd tijdens inbellen.",
+/* TR_DOMAINNAME */
+"Domeinnaam",
+/* TR_DOMAINNAME_CANNOT_BE_EMPTY */
+"Domeinnaam mag niet leeg zijn.",
+/* TR_DOMAINNAME_CANNOT_CONTAIN_SPACES */
+"Domeinnaam mag geen spaties bevatten.",
+/* TR_DOMAINNAME_NOT_VALID_CHARS */
+"Domeinnaam mag alleen letters, getallen, koppeltekens en punten bevatten.",
+/* TR_DOMAIN_NAME_SUFFIX */
+"Domeinnaam toevoeging:",
+/* TR_DOMAIN_NAME_SUFFIX_CR */
+"Domeinnaam toevoeging\n",
+/* TR_DONE */
+"Klaar",
+/* TR_DO_YOU_WISH_TO_CHANGE_THESE_SETTINGS */
+"\nWilt u deze instellingen wijzigen?",
+/* TR_DRIVERS_AND_CARD_ASSIGNMENTS */
+"Drivers en kaarttoewijzingen",
+/* TR_ENABLED */
+"Ingeschakeld",
+/* TR_ENABLE_ISDN */
+"Inschakelen ISDN",
+/* TR_END_ADDRESS */
+"Eindadres:",
+/* TR_END_ADDRESS_CR */
+"Eindadres\n",
+/* TR_ENTER_ADDITIONAL_MODULE_PARAMS */
+"Bepaalde ISDN-kaarten (met name de ISA-kaarten) kunnen extra moduleparameters vereisen voor het instellen van IRQ- en IO-adressen. Als u zo'n ISDN-kaart heeft, voer deze parameters dan hier in. Bijvoorbeeld: \"io=0x280 irq=9\". Deze gegevens worden gebruikt tijdens de kaartdetectie.",
+/* TR_ENTER_ADMIN_PASSWORD */
+"Voer het %s 'admin' wachtwoord in. Dit is de gebruikersnaam die gebruikt wordt om in te loggen op de %s webbeheerpagina's.",
+/* TR_ENTER_DOMAINNAME */
+"Invoeren domeinnaam",
+/* TR_ENTER_HOSTNAME */
+"Invoeren machinehostnaam.",
+/* TR_ENTER_IP_ADDRESS_INFO */
+"Invoeren IP-adres informatie",
+/* TR_ENTER_NETWORK_DRIVER */
+"Automatisch detecteren van netwerkkaart is mislukt. Voer de drivernaam en optionele parameters in voor de netwerkkaart.",
+/* TR_ENTER_ROOT_PASSWORD */
+"Invoeren van het 'root' wachtwoord. Log in als deze gebruiker voor commandoregel toegang.",
+/* TR_ENTER_SETUP_PASSWORD */
+"WORDT VERWIJDERD",
+/* TR_ENTER_THE_IP_ADDRESS_INFORMATION */
+"Invoeren van IP-adres informatie voor de %s interface.",
+/* TR_ENTER_THE_LOCAL_MSN */
+"Invoeren van lokaal telefoonnummer (MSN/EAZ).",
+/* TR_ENTER_URL */
+"Invoeren van URL-pad naar de ipcop-<versie>.tgz en images/scsidrv-<versie>.img bestanden. WAARSCHUWING: DNS is niet beschikbaar! Dit zou http://X.X.X.X/<directory> moeten zijn",
+/* TR_ERROR */
+"Fout",
+/* TR_ERROR_PROBING_CDROM */
+"Geen CDROM-speler gevonden.",
+/* TR_ERROR_WRITING_CONFIG */
+"Fout bij wegschrijven van configuratie informatie.",
+/* TR_EURO_EDSS1 */
+"Euro (EDSS1)",
+/* TR_EXTRACTING_MODULES */
+"Uitpakken modules...",
+/* TR_FAILED_TO_FIND */
+"URL-bestand niet gevonden.",
+/* TR_FOUND_NIC */
+"%s heeft de volgende NIC in uw machine gedetecteerd: %s",
+/* TR_GERMAN_1TR6 */
+"German 1TR6",
+/* TR_HELPLINE */
+" <Tab>/<Alt-Tab> schakelen tussen elementen | <Spatie> selecteert",
+/* TR_HOSTNAME */
+"Hostnaam",
+/* TR_HOSTNAME_CANNOT_BE_EMPTY */
+"Hostnaam mag niet leeg zijn.",
+/* TR_HOSTNAME_CANNOT_CONTAIN_SPACES */
+"Hostnaam mag geen spaties bevatten.",
+/* TR_HOSTNAME_NOT_VALID_CHARS */
+"Hostnaam mag alleen letters, getallen en koppeltekens bevatten.",
+/* TR_INITIALISING_ISDN */
+"Initialiseert ISDN...",
+/* TR_INSERT_CDROM */
+"Plaats de %s CD in the CDROM-speler a.u.b.",
+/* TR_INSERT_FLOPPY */
+"Plaats de %s driver-diskette in het station a.u.b.",
+/* TR_INSTALLATION_CANCELED */
+"Installatie afgebroken.",
+/* TR_INSTALLING_FILES */
+"Installeert bestanden...",
+/* TR_INSTALLING_GRUB */
+"Installeert GRUB...",
+/* TR_INSTALLING_LANG_CACHE */
+"Installeert taalbestanden...",
+/* TR_INTERFACE */
+"Interface - %s",
+/* TR_INTERFACE_FAILED_TO_COME_UP */
+"Interface kwam niet op.",
+/* TR_INVALID_FIELDS */
+"De volgende velden zijn ongeldig:\n\n",
+/* TR_INVALID_IO */
+"De ingevoerde IO-poortgegevens zijn ongeldig. ",
+/* TR_INVALID_IRQ */
+"De ingevoerde IRQ gegevens zijn ongeldig.",
+/* TR_IP_ADDRESS_CR */
+"IP-adres\n",
+/* TR_IP_ADDRESS_PROMPT */
+"IP-adres:",
+/* TR_ISDN_CARD */
+"ISDN-kaart",
+/* TR_ISDN_CARD_NOT_DETECTED */
+"ISDN-kaart niet gedetecteerd. Mogelijk dient u extra moduleparameters op te geven als het een ISA type betreft of heeft het speciale eisen.",
+/* TR_ISDN_CARD_SELECTION */
+"ISDN kaartselectie",
+/* TR_ISDN_CONFIGURATION */
+"ISDN configuratie",
+/* TR_ISDN_CONFIGURATION_MENU */
+"ISDN configuratiemenu",
+/* TR_ISDN_NOT_SETUP */
+"ISDN niet ingesteld. Sommige items zijn niet geselecteerd.",
+/* TR_ISDN_NOT_YET_CONFIGURED */
+"ISDN is nog niet geconfigureerd. Selecteer het item dat u wilt configureren.",
+/* TR_ISDN_PROTOCOL_SELECTION */
+"ISDN protocolselectie",
+/* TR_ISDN_STATUS */
+"ISDN is momenteel %s.\n\n Protocol: %s\n Kaart: %s\n Lokaal telefoonnummer: %s\n\nSelecteer het item dat u wilt herconfigureren, of kies voor de huidige instellingen.",
+/* TR_KEYBOARD_MAPPING */
+"Toetsenbordindeling",
+/* TR_KEYBOARD_MAPPING_LONG */
+"Kies het type toetsenbord dat u gebruikt uit de lijst hieronder.",
+/* TR_LEASED_LINE */
+"Vaste verbinding",
+/* TR_LOADING_MODULE */
+"Laadt module...",
+/* TR_LOADING_PCMCIA */
+"Laadt PCMCIA modules...",
+/* TR_LOOKING_FOR_NIC */
+"Zoekt naar: %s",
+/* TR_MAKING_BOOT_FILESYSTEM */
+"Aanmaken boot bestandssysteem...",
+/* TR_MAKING_LOG_FILESYSTEM */
+"Aanmaken log bestandssysteem...",
+/* TR_MAKING_ROOT_FILESYSTEM */
+"Aanmaken root bestandssysteem...",
+/* TR_MAKING_SWAPSPACE */
+"Aanmaken swap...",
+/* TR_MANUAL */
+"* HANDMATIG *",
+/* TR_MAX_LEASE */
+"Max. lease (min.):",
+/* TR_MAX_LEASE_CR */
+"Max. leasetijd\n",
+/* TR_MISSING_BLUE_IP */
+"Ontbrekende IP-informatie op de BLAUWE interface.",
+/* TR_MISSING_ORANGE_IP */
+"Ontbrekende IP-informatie op de ORANJE interface.",
+/* TR_MISSING_RED_IP */
+"Ontbrekende IP-informatie op de RODE interface.",
+/* TR_MODULE_NAME_CANNOT_BE_BLANK */
+"Modulenaam mag niet leeg zijn.",
+/* TR_MODULE_PARAMETERS */
+"Invoeren van de modulenaam en parameters voor de driver die u nodig hebt.",
+/* TR_MOUNTING_BOOT_FILESYSTEM */
+"Koppelen van het boot bestandssysteem...",
+/* TR_MOUNTING_LOG_FILESYSTEM */
+"Koppelen van het log bestandssysteem...",
+/* TR_MOUNTING_ROOT_FILESYSTEM */
+"Koppelen van het root bestandssysteem...",
+/* TR_MOUNTING_SWAP_PARTITION */
+"Koppelen van de swap partitie...",
+/* TR_MSN_CONFIGURATION */
+"Lokaal telefoonnummer (MSN/EAZ)",
+/* TR_NETMASK_PROMPT */
+"Netwerkmasker:",
+/* TR_NETWORKING */
+"Netwerk",
+/* TR_NETWORK_ADDRESS_CR */
+"Netwerkadres\n",
+/* TR_NETWORK_ADDRESS_PROMPT */
+"Netwerkadres:",
+/* TR_NETWORK_CONFIGURATION_MENU */
+"Netwerk configuratiemenu",
+/* TR_NETWORK_CONFIGURATION_TYPE */
+"Netwerk configuratietype",
+/* TR_NETWORK_CONFIGURATION_TYPE_LONG */
+"Selecteer de netwerkconfiguratie voor %s. De volgende configuratiesoorten vermelden welke interfaces op ethernet aangesloten zijn. Als u deze instellingen wijzigt, dan is een netwerk herstart nodig en u moet de netwerkdriver toewijzingen opnieuw maken.",
+/* TR_NETWORK_MASK_CR */
+"Netwerkmasker\n",
+/* TR_NETWORK_SETUP_FAILED */
+"Netwerkinstelling mislukt.",
+/* TR_NOT_ENOUGH_CARDS_WERE_ALLOCATED */
+"Er zijn onvoldoende kaarten toegewezen.",
+/* TR_NO_BLUE_INTERFACE */
+"Er is geen BLAUWE interface toegewezen.",
+/* TR_NO_CDROM */
+"Geen CD-ROM gevonden.",
+/* TR_NO_GREEN_INTERFACE */
+"Er is geen GROENE interface toegewezen.",
+/* TR_NO_HARDDISK */
+"Geen vaste schijf gevonden.",
+/* TR_NO_IPCOP_TARBALL_FOUND */
+"Er is geen ipcop tarball gevonden op de webserver.",
+/* TR_NO_ORANGE_INTERFACE */
+"Er is geen ORANJE interface toegewezen.",
+/* TR_NO_RED_INTERFACE */
+"Er is geen RODE interface toegewezen.",
+/* TR_NO_SCSI_IMAGE_FOUND */
+"Er is geen SCSI image gevonden op de webserver.",
+/* TR_NO_UNALLOCATED_CARDS */
+"Er zijn geen vrije kaarten over, er zijn er meer vereist. U kunt automatisch detecteren proberen en op zoek gaan naar meer kaarten, of u kiest een driver uit de lijst.",
+/* TR_OK */
+"Ok",
+/* TR_PARTITIONING_DISK */
+"Partitioneert schijf...",
+/* TR_PASSWORDS_DO_NOT_MATCH */
+"Wachtwoorden komen niet overeen.",
+/* TR_PASSWORD_CANNOT_BE_BLANK */
+"Wachtwoord mag niet leeg zijn.",
+/* TR_PASSWORD_CANNOT_CONTAIN_SPACES */
+"Wachtwoord mag geen spaties bevatten.",
+/* TR_PASSWORD_PROMPT */
+"Wachtwoord:",
+/* TR_PHONENUMBER_CANNOT_BE_EMPTY */
+"Telefoonnummer mag niet leeg zijn.",
+/* TR_PREPARE_HARDDISK */
+"Het installatieprogramma zal nu de vaste schijf voorbereiden op %s. Eerst wordt de schijf gepartitioneerd, daarna zullen de bestandssystemen erop worden gezet.",
+/* TR_PRESS_OK_TO_REBOOT */
+"Klik Ok om te herstarten.",
+/* TR_PRIMARY_DNS */
+"Primaire DNS:",
+/* TR_PRIMARY_DNS_CR */
+"Primaire DNS\n",
+/* TR_PROBE */
+"Opsporen",
+/* TR_PROBE_FAILED */
+"Automatisch detecteren mislukt.",
+/* TR_PROBING_HARDWARE */
+"Opsporen van hardware...",
+/* TR_PROBING_FOR_NICS */
+"Zoeken naar NIC's...",
+/* TR_PROBLEM_SETTING_ADMIN_PASSWORD */
+"Er is een probleem met het instellen van %s 'admin' gebruikerswachtwoord.",
+/* TR_PROBLEM_SETTING_ROOT_PASSWORD */
+"Er is een probleem met het instellen van %s 'root' gebruikerswachtwoord.",
+/* TR_PROBLEM_SETTING_SETUP_PASSWORD */
+"WORDT VERWIJDERD",
+/* TR_PROTOCOL_COUNTRY */
+"Protocol/Land",
+/* TR_PULLING_NETWORK_UP */
+"Netwerk opbrengen...",
+/* TR_PUSHING_NETWORK_DOWN */
+"Netwerk stoppen...",
+/* TR_PUSHING_NON_LOCAL_NETWORK_DOWN */
+"Niet-lokaal netwerk stoppen...",
+/* TR_QUIT */
+"Stoppen",
+/* TR_RED_IN_USE */
+"ISDN (of een andere externe verbinding) is momenteel in gebruik. U kunt ISDN niet configureren zolang de RODE interface actief is.",
+/* TR_RESTART_REQUIRED */
+"\n\nAls de configuratie gereed is moet het netwerk herstart worden.",
+/* TR_RESTORE */
+"Terugzetten",
+/* TR_RESTORE_CONFIGURATION */
+"Als u een diskette heeft met een %s systeemconfiguratie daarop, plaats dan de diskette in het station en klik op de terugzetten-knop.",
+/* TR_ROOT_PASSWORD */
+"'root' wachtwoord",
+/* TR_SECONDARY_DNS */
+"Secundaire DNS:",
+/* TR_SECONDARY_DNS_CR */
+"Secundaire DNS\n",
+/* TR_SECONDARY_WITHOUT_PRIMARY_DNS */
+"Secundaire DNS opgegeven zonder een primaire DNS",
+/* TR_SECTION_MENU */
+"Sectiemenu",
+/* TR_SELECT */
+"Selecteer",
+/* TR_SELECT_CDROM_TYPE */
+"Selecteer CDROM type",
+/* TR_SELECT_CDROM_TYPE_LONG */
+"Er is geen CD-ROM gedetecteerd in deze machine. Maak een keuze uit de volgende drivers waarmee %s de CD-ROM kan benaderen.",
+/* TR_SELECT_INSTALLATION_MEDIA */
+"Selecteer installatiemedium",
+/* TR_SELECT_INSTALLATION_MEDIA_LONG */
+"%s kan worden geïnstalleerd vanuit verschillende bronnen. De eenvoudigste manier is om de CDROM-speler van de machine te gebruiken. Als de computer geen CDROM-speler heeft, dan kunt vanaf een andere machine installeren die de installatiebestanden beschikbaar kan maken over het netwerk via HTTP of FTP.",
+/* TR_SELECT_NETWORK_DRIVER */
+"Selecteer netwerkdriver",
+/* TR_SELECT_NETWORK_DRIVER_LONG */
+"Selecteer de netwerkdriver voor de aanwezige kaart in deze machine. Als u HANDMATIG selecteert, krijgt u de mogelijkheid om de driver modulenaam en parameters op te geven voor drivers met speciale eisen, zoals voor ISA-kaarten.",
+/* TR_SELECT_THE_INTERFACE_YOU_WISH_TO_RECONFIGURE */
+"Selecteer de interface die u wilt herconfigureren.",
+/* TR_SELECT_THE_ITEM */
+"Selecteer het item dat u wilt configureren.",
+/* TR_SETTING_ADMIN_PASSWORD */
+"Instellen van %s 'admin' gebruikerswachtwoord...",
+/* TR_SETTING_ROOT_PASSWORD */
+"Instellen van 'root' wachtwoord....",
+/* TR_SETTING_SETUP_PASSWORD */
+"WORDT VERWIJDERD",
+/* TR_SETUP_FINISHED */
+"Setup is afgerond. Klik Ok.",
+/* TR_SETUP_NOT_COMPLETE */
+"Initiële setup was niet volledig afgerond. Verzeker u ervan dat de setup goed is afgerond door het setup programma nogmaals vanaf de commandoregel te draaien.",
+/* TR_SETUP_PASSWORD */
+"WORDT VERWIJDERD",
+/* TR_SET_ADDITIONAL_MODULE_PARAMETERS */
+"Instellen additionele moduleparameters",
+/* TR_SINGLE_GREEN */
+"Uw configuratie is ingesteld voor een enkele GROENE interface.",
+/* TR_SKIP */
+"Overslaan",
+/* TR_START_ADDRESS */
+"Beginadres:",
+/* TR_START_ADDRESS_CR */
+"Beginadres\n",
+/* TR_STATIC */
+"Statisch",
+/* TR_SUGGEST_IO */
+"(voorstel %x)",
+/* TR_SUGGEST_IRQ */
+"(voorstel %d)",
+/* TR_THIS_DRIVER_MODULE_IS_ALREADY_LOADED */
+"Deze drivermodule is al geladen.",
+/* TR_TIMEZONE */
+"Tijdzone",
+/* TR_TIMEZONE_LONG */
+"Kies de tijdzone waar u zich bevindt uit de lijst hieronder.",
+/* TR_UNABLE_TO_EJECT_CDROM */
+"Kan de CDROM niet uitwerpen.",
+/* TR_UNABLE_TO_EXTRACT_MODULES */
+"Kan de modules niet uitpakken.",
+/* TR_UNABLE_TO_FIND_ANY_ADDITIONAL_DRIVERS */
+"Kan geen additionele drivers vinden.",
+/* TR_UNABLE_TO_FIND_AN_ISDN_CARD */
+"Kan geen ISDN-kaart vinden in deze computer. U kunt extra module parameters opgeven als het een ISA-kaart betreft of als het speciale eisen heeft.",
+/* TR_UNABLE_TO_INITIALISE_ISDN */
+"Kan de ISDN-kaart niet initialiseren.",
+/* TR_UNABLE_TO_INSTALL_FILES */
+"Kan de bestanden niet installeren.",
+/* TR_UNABLE_TO_INSTALL_LANG_CACHE */
+"Kan de taalbestanden niet installeren.",
+/* TR_UNABLE_TO_INSTALL_GRUB */
+"Kan GRUB niet installeren.",
+/* TR_UNABLE_TO_LOAD_DRIVER_MODULE */
+"Kan de drivermodule niet laden.",
+/* TR_UNABLE_TO_MAKE_BOOT_FILESYSTEM */
+"Kan het boot bestandssysteem niet aanmaken.",
+/* TR_UNABLE_TO_MAKE_LOG_FILESYSTEM */
+"Kan het log bestandssysteem niet aanmaken.",
+/* TR_UNABLE_TO_MAKE_ROOT_FILESYSTEM */
+"Kan het root bestandssysteem niet aanmaken.",
+/* TR_UNABLE_TO_MAKE_SWAPSPACE */
+"Kan het swap bestandssysteem niet aanmaken.",
+/* TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK */
+"Kan de symlink /dev/harddisk niet aanmaken.",
+/* TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK1 */
+"Kan de symlink /dev/harddisk1 niet aanmaken.",
+/* TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK2 */
+"Kan de symlink /dev/harddisk2 niet aanmaken.",
+/* TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK3 */
+"Kan de symlink /dev/harddisk3 niet aanmaken.",
+/* TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK4 */
+"Kan de symlink /dev/harddisk4 niet aanmaken.",
+/* TR_UNABLE_TO_MAKE_SYMLINK_DEV_ROOT */
+"Kan de symlink /dev/root niet aanmaken.",
+/* TR_UNABLE_TO_MOUNT_BOOT_FILESYSTEM */
+"Kan het boot bestandssysteem niet koppelen.",
+/* TR_UNABLE_TO_MOUNT_LOG_FILESYSTEM */
+"Kan het log bestandssysteem niet koppelen.",
+/* TR_UNABLE_TO_MOUNT_PROC_FILESYSTEM */
+"Kan het proc bestandssysteem niet koppelen.",
+/* TR_UNABLE_TO_MOUNT_ROOT_FILESYSTEM */
+"Kan het root bestandssysteem niet koppelen.",
+/* TR_UNABLE_TO_MOUNT_SWAP_PARTITION */
+"Kan de swap partitie niet koppelen.",
+/* TR_UNABLE_TO_OPEN_HOSTS_FILE */
+"Kan het hosts-bestand niet openen.",
+/* TR_UNABLE_TO_OPEN_SETTINGS_FILE */
+"Kan het instellingenbestand niet openen",
+/* TR_UNABLE_TO_PARTITION */
+"Kan de schijf niet partitioneren.",
+/* TR_UNABLE_TO_REMOVE_TEMP_FILES */
+"Kan de tijdelijke gedownloade bestanden niet verwijderen.",
+/* TR_UNABLE_TO_SET_HOSTNAME */
+"Kan de hostnaam niet instellen.",
+/* TR_UNABLE_TO_UNMOUNT_CDROM */
+"Kan het CDROM-/diskettestation niet ontkoppelen.",
+/* TR_UNABLE_TO_UNMOUNT_HARDDISK */
+"Kan de vaste schijf niet ontkoppelen.",
+/* TR_UNABLE_TO_WRITE_ETC_FSTAB */
+"Kan /etc/fstab niet wegschrijven",
+/* TR_UNABLE_TO_WRITE_ETC_HOSTNAME */
+"Kan /etc/hostname niet wegschrijven",
+/* TR_UNABLE_TO_WRITE_ETC_HOSTS */
+"Kan /etc/hosts niet wegschrijven.",
+/* TR_UNABLE_TO_WRITE_ETC_HOSTS_ALLOW */
+"Kan /etc/hosts.allow niet wegschrijven.",
+/* TR_UNABLE_TO_WRITE_ETC_HOSTS_DENY */
+"Kan /etc/hosts.deny niet wegschrijven.",
+/* TR_UNABLE_TO_WRITE_VAR_SMOOTHWALL_ETHERNET_SETTINGS */
+"Kan %s/ethernet/settings niet wegschrijven.",
+/* TR_UNABLE_TO_WRITE_VAR_SMOOTHWALL_MAIN_HOSTNAMECONF */
+"Kan %s/main/hostname.conf niet wegschrijven.",
+/* TR_UNABLE_TO_WRITE_VAR_SMOOTHWALL_MAIN_SETTINGS */
+"Kan %s/main/settings niet wegschrijven.",
+/* TR_UNCLAIMED_DRIVER */
+"Er is een ongebruikte ethernetkaart van het type:\n%s\n\nU kunt deze toewijzen aan:",
+/* TR_UNKNOWN */
+"ONBEKEND",
+/* TR_UNSET */
+"NIET INGESTELD",
+/* TR_USB_KEY_VFAT_ERR */
+"Deze USB-sleutel is ongeldig (geen vfat partitie gevonden).",
+/* TR_US_NI1 */
+"US NI1",
+/* TR_WARNING */
+"WAARSCHUWING",
+/* TR_WARNING_LONG */
+"Als u dit IP-adres wijzigt, en u bent op afstand ingelogd, dan zal de verbinding naar de %s machine worden verbroken en u zult opnieuw moeten verbinden naar het nieuwe IP-adres. Dit is een riskante handeling en moet alleen geprobeerd worden als u fysieke toegang tot de machine hebt, in het geval er iets fout gaat.",
+/* TR_WELCOME */
+"Welkom bij het %s installatieprogramma. Als u 'annuleren' op een van de volgende schermen selecteert zal de computer herstarten.",
+/* TR_YOUR_CONFIGURATION_IS_SINGLE_GREEN_ALREADY_HAS_DRIVER */
+"Uw configuratie is ingesteld voor een enkele GROENE interface, welke al een driver toegewezen heeft.",
+/* TR_YES */
+"Ja",
+/* TR_NO */
+"Nee",
+/* TR_AS */
+"als",
+/* TR_IGNORE */
+"Negeer",
+/* TR_PPP_DIALUP */
+"PPP DIALUP (PPPoE, modem, ATM ...)",
+/* TR_DHCP */
+"DHCP",
+/* TR_DHCP_STARTSERVER */
+"Start DHCP-server ...",
+/* TR_DHCP_STOPSERVER */
+"Stopt DHCP-server ...",
+/* TR_LICENSE_ACCEPT */
+"Ik accepteer deze licentie.",
+/* TR_LICENSE_NOT_ACCEPTED */
+"Licentie niet geaccepteerd. Stopt!",
+/* TR_EXT2FS_DESCR */
+"Ext2 - Bestandssysteem zonder journal (geschikt voor flashdrives)",
+/* TR_EXT3FS_DESCR */
+"Ext3 - Bestandssysteem met journal",
+/* TR_EXT4FS_DESCR */
+"Ext4 - Bestandssysteem met journal",
+/* TR_REISERFS_DESCR */
+"ReiserFS - Bestandssysteem met journal",
+/* TR_NO_LOCAL_SOURCE */
+"Geen lokale bronmedia gevonden. Start download.",
+/* TR_DOWNLOADING_ISO */
+"Downloaden van installatie-image ...",
+/* TR_DOWNLOAD_ERROR */
+"Fout tijdens downloaden!",
+/* TR_DHCP_FORCE_MTU */
+"Forceer DHCP mtu:",
+};
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. bde92f73c29dc1ad3c0a5599ea3a80485a70f2b7
by git＠ipfire.org 05 Feb '13
by git＠ipfire.org 05 Feb '13
05 Feb '13
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 bde92f73c29dc1ad3c0a5599ea3a80485a70f2b7 (commit)
via 1617a3bc6bfba56fec06b940cc7dded718c43f26 (commit)
via 083fd89fcb6b1b2d9b18c2b43dbf1094e5cbe5c4 (commit)
via 20df70587f962aa6fb972267c14f164508f97887 (commit)
via 6a135c6a0912f2d0566f82bba2396c9479caf728 (commit)
via 668803d7a2bfa51a13d9f6431f24374a604d872c (commit)
via a9103f8e5ad0a9072f750be5d4a930cb4815def2 (commit)
via b437ac8a803995934a8a0fc8f0c71d1776f15880 (commit)
via 825f07179b71b2dcfa7e509b311447bf8097c53c (commit)
via a64cbd4f503e4cc5b4488d17d940fe4c9f082d26 (commit)
via 8990ff58454f0ad5d849c613a98610a602beb09e (commit)
via eabec94692ed5d1fed0f96e03f3760933f16816a (commit)
via 36c2933d58462cf4498d0d6241be61d7f0a5654e (commit)
via 291f526bfb81f7019fbcdb665bf1193be856d8de (commit)
via 3f15a003e4dc1ca23f81e099e2aedc950191fe9d (commit)
via 10f8bcda0d26cbc927b8fc83d9803683f3a144fd (commit)
via c9e3e45f4bdb995bf4e040ae4a6158494b0d0410 (commit)
via ecd09a169e63a82476a4592b9af1105adf3cbc74 (commit)
via 35e1166b93fd8892efd7dc7de08c40e44fd54e41 (commit)
via 6d313e8026e18738f35fe46878396ccb628e6a96 (commit)
via d55006b517afb68c0edff0861e42000b64f6897a (commit)
via 9b9b4e0bb5035882f09b7b7695e70ccf2824e73c (commit)
via 5be4df2923359219d5ad1a19a3b124ee3dfce436 (commit)
via 77c0d18f0946d41007b08b3b155e0be43a868e53 (commit)
via 13a9b75bd0c50a94c05a05a5b321b091d5be3a4d (commit)
via e65d6e24ece6ade4f03254299194ae43da8427ec (commit)
via b0c30d9f039b0937d7d2f9b59190173798c69ef4 (commit)
via 0e7de72a5476b5d3c75c72f5e2e8a0b24a25359b (commit)
via f67d2be9576884351f9ae99544857fdbb20029ac (commit)
via a8a70bcd9d4dd5f875a09efb97ea238e6c7fd214 (commit)
via 8ee028360a14b5e9a0b046c6c0278d06a03521c2 (commit)
via f46f5d7e5b1a5816793d9cfe42de572d51cf6709 (commit)
via 6105a142e0eb8a6f2415e4c9b140cbc557c8bd3e (commit)
via a914ff3c65f93b5c3832f0fb1207836a0eeb32de (commit)
via f7854ff04156ccd371d5da1839b889767e00f76f (commit)
via 276d862367ac1147b56fe2492d698f97d98493b7 (commit)
via fe93c03235094951aa3503bd8e7b5eae15d6c30a (commit)
via c3d8d31b79711b8e574e3e3a256692f642bbeb6a (commit)
via bd72a807340596bcb0afee2b80d4a370a415e686 (commit)
via bc44731f53861de413e90812f57c9115ffca4d39 (commit)
via a9dc467c1c17a32c1bf59ae7d6b6639db3c0463a (commit)
via cd2aa2036632f57c678c8731feab106b2bab583a (commit)
from 60b00d18b96a7c7243fbdd50a1eddb4a0b9a5a00 (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 bde92f73c29dc1ad3c0a5599ea3a80485a70f2b7
Merge: 60b00d1 1617a3b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Feb 5 20:56:30 2013 +0100
Merge remote-tracking branch 'stevee/x-system-update'
commit 1617a3bc6bfba56fec06b940cc7dded718c43f26
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Tue Feb 5 20:39:24 2013 +0100
xorg-x11-drv-nv: Drop package.
This package is replaced by xorg-x11-drv-nouveau, which contains the new default driver
for Nividia GPU's.
commit 083fd89fcb6b1b2d9b18c2b43dbf1094e5cbe5c4
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Tue Feb 5 20:38:56 2013 +0100
xorg-x11-drv-nouveau: New package.
This is the new default driver for nvidia GPU's. Obsoletes the old xorg-x11-drv-nv package.
commit 20df70587f962aa6fb972267c14f164508f97887
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Tue Feb 5 20:38:19 2013 +0100
xorg-x11-drv-vmware: Update to 13.0.0.
This is a major update to the latest stable version.
commit 6a135c6a0912f2d0566f82bba2396c9479caf728
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Tue Feb 5 20:37:55 2013 +0100
xorg-x11-drv-modesetting: New package.
This is a fallback driver for devices which supports KMS.
commit 668803d7a2bfa51a13d9f6431f24374a604d872c
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Tue Feb 5 20:37:21 2013 +0100
xorg-x11-drv-vesa: Update to 2.3.2.
This is a major update to the latest stable version.
Requires xorg-x11-server-devel >= 1.13.2 to be sure to compile for the new version of the x-server.
commit a9103f8e5ad0a9072f750be5d4a930cb4815def2
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Tue Feb 5 20:36:51 2013 +0100
xorg-x11-drv-mouse: Update to 1.8.1.
This is a major update to the latest stable version.
Requires xorg-x11-server-devel >= 1.13.2 to be sure to compile for the new version of the x-server.
commit b437ac8a803995934a8a0fc8f0c71d1776f15880
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Tue Feb 5 20:36:26 2013 +0100
xorg-x11-drv-keyboard: Update to 1.6.2.
This is a major update to the latest stable version.
Requires xorg-x11-server-devel >= 1.13.2 to be sure to compile for the new version of the x-server.
commit 825f07179b71b2dcfa7e509b311447bf8097c53c
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Tue Feb 5 20:35:32 2013 +0100
xorg-x11-drv-intel: Update to 2.21.0.
This is a major update to the latest stable version.
Requires xorg-x11-server-devel >= 1.13.2 to be sure to compile for the new version of the x-server.
commit a64cbd4f503e4cc5b4488d17d940fe4c9f082d26
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Tue Feb 5 20:34:48 2013 +0100
xorg-x11-drv-evdev: Update to 2.7.3.
This is a major update to the latest stable version.
Requires xorg-x11-server-devel >= 1.13.2 to be sure to compile for the new version of the x-server.
commit 8990ff58454f0ad5d849c613a98610a602beb09e
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Tue Feb 5 20:21:35 2013 +0100
xorg-x11-drv-ati: Update to 7.1.0.
This is a major update to the latest stable version.
Requires xorg-x11-server-devel >= 1.13.2 to be sure to compile for the new version of the x-server.
commit eabec94692ed5d1fed0f96e03f3760933f16816a
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Tue Feb 5 20:20:53 2013 +0100
xorg-x11-xinit: Update to 1.3.2.
This is a major update to the latest stable version.
commit 36c2933d58462cf4498d0d6241be61d7f0a5654e
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Tue Feb 5 20:18:49 2013 +0100
xorg-x11-server: Update to 1.13.2.
This is a major update to the latest stable version.
Add all X/Driver to recommends to provide a full useable X11 server after installation.
commit 291f526bfb81f7019fbcdb665bf1193be856d8de
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Tue Feb 5 18:36:41 2013 +0100
mesa: Update to 9.0.2.
This is major update to the latest stable version.
Splitt mesa package into several subpackages.
There is no package called mesa anymore.
Keep mesa-devel for compatiblity reasons, which provides libGL-devel and contains
all development stuff of mesa.
commit 3f15a003e4dc1ca23f81e099e2aedc950191fe9d
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Mon Feb 4 17:51:05 2013 +0100
libdrm: Update to 2.4.40.
This is a major update to the latest stable release.
commit 10f8bcda0d26cbc927b8fc83d9803683f3a144fd
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 3 22:21:38 2013 +0100
xorg-x11-util-macros: Update to 1.17.
Major update of the xorg X11 macros.
commit c9e3e45f4bdb995bf4e040ae4a6158494b0d0410
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 3 22:20:55 2013 +0100
libxslt: Update to 1.1.28.
Update to the latest stable version.
commit ecd09a169e63a82476a4592b9af1105adf3cbc74
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 3 22:19:50 2013 +0100
libxkbfile: Update to 1.0.8.
Update to the latest stable version.
commit 35e1166b93fd8892efd7dc7de08c40e44fd54e41
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 3 22:19:01 2013 +0100
libpciaccess: Update to 0.13.1.
Major update to the latest stable version.
commit 6d313e8026e18738f35fe46878396ccb628e6a96
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 3 22:18:10 2013 +0100
libfontec: Update to 1.1.1.
Update to the latest stable version.
commit d55006b517afb68c0edff0861e42000b64f6897a
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 3 22:17:36 2013 +0100
libXxf86vm: Update to 1.1.2.
Update to the latest stable version.
commit 9b9b4e0bb5035882f09b7b7695e70ccf2824e73c
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 3 22:16:36 2013 +0100
xorg-x11-proto-devel: Update to 7.7.
Tiny update which contains the latest proto improvements.
commit 5be4df2923359219d5ad1a19a3b124ee3dfce436
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 3 22:15:41 2013 +0100
libXvMC: Update to 1.0.7.
Update to the latest stable version.
commit 77c0d18f0946d41007b08b3b155e0be43a868e53
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 3 22:14:13 2013 +0100
libXv: Update to 1.0.7.
Update to the latest stable version.
commit 13a9b75bd0c50a94c05a05a5b321b091d5be3a4d
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 3 22:13:13 2013 +0100
libXtst: Update to 1.2.1.
Update to the latest stable version.
commit e65d6e24ece6ade4f03254299194ae43da8427ec
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 3 22:12:36 2013 +0100
libXres: Update to 1.0.6.
Update to the latest stable version.
commit b0c30d9f039b0937d7d2f9b59190173798c69ef4
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 3 22:12:02 2013 +0100
libxcb: Update to 1.9.
Major update to the latest stable version.
commit 0e7de72a5476b5d3c75c72f5e2e8a0b24a25359b
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 3 22:11:18 2013 +0100
xcb-proto: Update to 1.8.
Update to the latest stable version.
commit f67d2be9576884351f9ae99544857fdbb20029ac
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 3 22:10:32 2013 +0100
libXrandr: Update to 1.4.0.
This is a major update to the latest stable version.
commit a8a70bcd9d4dd5f875a09efb97ea238e6c7fd214
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 3 22:09:37 2013 +0100
libXpm: Update to 3.5.10.
Update to the latest stable version.
commit 8ee028360a14b5e9a0b046c6c0278d06a03521c2
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 3 22:08:59 2013 +0100
libXmu: Update to 1.1.1.
Update to the latest stable version.
commit f46f5d7e5b1a5816793d9cfe42de572d51cf6709
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 3 22:08:11 2013 +0100
libXi: Update to 1.6.2.
Update to the latest stable version.
commit 6105a142e0eb8a6f2415e4c9b140cbc557c8bd3e
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 3 22:07:30 2013 +0100
libXfont: Update to 1.4.5.
Update to the latest stable version.
commit a914ff3c65f93b5c3832f0fb1207836a0eeb32de
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 3 22:06:21 2013 +0100
libXfixes: Update to 5.0.
This is a major update to the latest stable version.
commit f7854ff04156ccd371d5da1839b889767e00f76f
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 3 22:05:36 2013 +0100
libXdmcp: Update to 1.1.3.
Update to the latest stable version.
commit 276d862367ac1147b56fe2492d698f97d98493b7
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 3 22:05:03 2013 +0100
libXdamage: Update to 1.1.4.
Update to the latest stable version.
commit fe93c03235094951aa3503bd8e7b5eae15d6c30a
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 3 22:04:13 2013 +0100
libXft: Update to 2.3.1.
Update to the latest stable version.
commit c3d8d31b79711b8e574e3e3a256692f642bbeb6a
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 3 22:03:14 2013 +0100
libXt: Update to 1.1.3.
Update to the latest stable version.
commit bd72a807340596bcb0afee2b80d4a370a415e686
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 3 22:01:33 2013 +0100
libXaw: Update to 1.0.11.
Update to the latest stable version.
commit bc44731f53861de413e90812f57c9115ffca4d39
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 3 22:00:47 2013 +0100
libSM: Update to 1.2.1.
Update to the latest stable version.
commit a9dc467c1c17a32c1bf59ae7d6b6639db3c0463a
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 3 22:00:15 2013 +0100
libICE: Update to 1.0.8.
Major update to the latest stable version.
commit cd2aa2036632f57c678c8731feab106b2bab583a
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Feb 3 21:57:12 2013 +0100
libXau: Update to 1.0.7.
Major update to the latest stable version.
-----------------------------------------------------------------------
Summary of changes:
libICE/libICE.nm | 6 +-
libSM/libSM.nm | 6 +-
libXau/libXau.nm | 19 +-
libXaw/libXaw.nm | 6 +-
libXdamage/libXdamage.nm | 6 +-
libXdmcp/libXdmcp.nm | 6 +-
libXfixes/libXfixes.nm | 8 +-
libXfont/libXfont.nm | 6 +-
libXft/libXft.nm | 6 +-
libXi/libXi.nm | 6 +-
libXmu/libXmu.nm | 6 +-
libXpm/libXpm.nm | 6 +-
libXrandr/libXrandr.nm | 6 +-
libXrandr/patches/libXrandr-1.3.0-fixes.patch | 102 ---
libXres/libXres.nm | 8 +-
libXt/libXt.nm | 6 +-
libXt/patches/libXt-1.0.7-libsm-fix.patch | 11 -
libXtst/libXtst.nm | 6 +-
libXv/libXv.nm | 6 +-
libXvMC/libXvMC.nm | 6 +-
libXxf86vm/libXxf86vm.nm | 6 +-
libdrm/libdrm.nm | 2 +-
libfontenc/libfontenc.nm | 5 +-
libpciaccess/libpciaccess.nm | 16 +-
libxcb/libxcb.nm | 11 +-
libxkbfile/libxkbfile.nm | 21 +-
libxslt/libxslt.nm | 9 +-
mesa/mesa.nm | 65 +-
mesa/patches/mesa-7.11-generic-wmb.patch | 12 -
xcb-proto/xcb-proto.nm | 6 +-
xorg-x11-drv-ati/xorg-x11-drv-ati.nm | 18 +-
xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm | 16 +-
.../patches/intel-2.10.0-add-mbp-backlight.patch | 12 -
.../patches/intel-2.11-lvds-first.patch | 37 -
.../patches/intel-2.11-no-pageflipping.patch | 33 -
.../patches/intel-2.11.0-vga-clock-max.patch | 16 -
.../patches/intel-2.12-fix-uxa-planemask.patch | 40 -
.../patches/intel-2.8.0-kms-get-crtc.patch | 23 -
xorg-x11-drv-intel/patches/kill-svideo.patch | 23 -
xorg-x11-drv-intel/patches/uevent.patch | 146 ----
xorg-x11-drv-intel/xorg-x11-drv-intel.nm | 18 +-
xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm | 16 +-
.../xorg-x11-drv-modesetting.nm | 29 +-
xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm | 18 +-
.../xorg-x11-drv-nouveau.nm | 33 +-
xorg-x11-drv-nv/patches/nv-2.1.6-panel-fix.patch | 36 -
xorg-x11-drv-nv/patches/nv-2.1.6-starvation.patch | 24 -
.../patches/nv-2.1.8-g80-no-doublescan.patch | 24 -
xorg-x11-drv-nv/patches/nv-reserve-fbarea.patch | 55 --
xorg-x11-drv-nv/patches/nv-save-rom.patch | 45 -
xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm | 19 +-
xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm | 16 +-
xorg-x11-proto-devel/xorg-x11-proto-devel.nm | 11 +-
...erver-1.12-Xext-fix-selinux-build-failure.patch | 52 ++
.../patches/xserver-1.4.99-pic-libxf86config.patch | 25 -
.../patches/xserver-1.4.99-ssh-isnt-local.patch | 34 +-
.../patches/xserver-1.5.0-bg-none-root.patch | 155 ----
.../patches/xserver-1.5.0-projector-fb-size.patch | 32 -
.../patches/xserver-1.5.1-mode-debug.patch | 26 -
.../xserver-1.6.0-less-acpi-brokenness.patch | 24 +-
.../patches/xserver-1.6.99-default-modes.patch | 35 -
.../xserver-1.6.99-randr-error-debugging.patch | 42 -
.../patches/xserver-1.6.99-right-of.patch | 156 ++--
.../xserver-1.7.0-randr-gamma-restore.patch | 36 -
.../patches/xserver-1.7.1-gamma-kdm-fix.patch | 34 -
.../patches/xserver-1.7.1-multilib.patch | 55 --
.../patches/xserver-1.8-disable-vboxvideo.patch | 25 -
.../patches/xserver-1.8-no-connected-outputs.patch | 142 ----
.../patches/xserver-1.8-randr-initial.patch | 35 -
.../patches/xserver-1.8-udev-warning.patch | 37 -
.../xserver-1.8.2-XTEST-PointerKeys-fixes.patch | 909 ---------------------
.../patches/xserver-autobind-hotplug.patch | 106 +++
xorg-x11-server/xorg-x11-server.nm | 32 +-
xorg-x11-util-macros/xorg-x11-util-macros.nm | 7 +-
.../patches/xinit-1.0.2-client-session.patch | 39 +
.../xorg-x11-xinit-1.3.2-systemd-logind.patch | 27 +
xorg-x11-xinit/xorg-x11-xinit.nm | 10 +-
77 files changed, 609 insertions(+), 2565 deletions(-)
delete mode 100644 libXrandr/patches/libXrandr-1.3.0-fixes.patch
delete mode 100644 libXt/patches/libXt-1.0.7-libsm-fix.patch
delete mode 100644 mesa/patches/mesa-7.11-generic-wmb.patch
delete mode 100644 xorg-x11-drv-intel/patches/intel-2.10.0-add-mbp-backlight.patch
delete mode 100644 xorg-x11-drv-intel/patches/intel-2.11-lvds-first.patch
delete mode 100644 xorg-x11-drv-intel/patches/intel-2.11-no-pageflipping.patch
delete mode 100644 xorg-x11-drv-intel/patches/intel-2.11.0-vga-clock-max.patch
delete mode 100644 xorg-x11-drv-intel/patches/intel-2.12-fix-uxa-planemask.patch
delete mode 100644 xorg-x11-drv-intel/patches/intel-2.8.0-kms-get-crtc.patch
delete mode 100644 xorg-x11-drv-intel/patches/kill-svideo.patch
delete mode 100644 xorg-x11-drv-intel/patches/uevent.patch
copy xorg-x11-drv-nv/xorg-x11-drv-nv.nm => xorg-x11-drv-modesetting/xorg-x11-drv-modesetting.nm (69%)
rename xorg-x11-drv-nv/xorg-x11-drv-nv.nm => xorg-x11-drv-nouveau/xorg-x11-drv-nouveau.nm (68%)
delete mode 100644 xorg-x11-drv-nv/patches/nv-2.1.6-panel-fix.patch
delete mode 100644 xorg-x11-drv-nv/patches/nv-2.1.6-starvation.patch
delete mode 100644 xorg-x11-drv-nv/patches/nv-2.1.8-g80-no-doublescan.patch
delete mode 100644 xorg-x11-drv-nv/patches/nv-reserve-fbarea.patch
delete mode 100644 xorg-x11-drv-nv/patches/nv-save-rom.patch
create mode 100644 xorg-x11-server/patches/xserver-1.12-Xext-fix-selinux-build-failure.patch
delete mode 100644 xorg-x11-server/patches/xserver-1.4.99-pic-libxf86config.patch
delete mode 100644 xorg-x11-server/patches/xserver-1.5.0-bg-none-root.patch
delete mode 100644 xorg-x11-server/patches/xserver-1.5.0-projector-fb-size.patch
delete mode 100644 xorg-x11-server/patches/xserver-1.5.1-mode-debug.patch
delete mode 100644 xorg-x11-server/patches/xserver-1.6.99-default-modes.patch
delete mode 100644 xorg-x11-server/patches/xserver-1.6.99-randr-error-debugging.patch
delete mode 100644 xorg-x11-server/patches/xserver-1.7.0-randr-gamma-restore.patch
delete mode 100644 xorg-x11-server/patches/xserver-1.7.1-gamma-kdm-fix.patch
delete mode 100644 xorg-x11-server/patches/xserver-1.7.1-multilib.patch
delete mode 100644 xorg-x11-server/patches/xserver-1.8-disable-vboxvideo.patch
delete mode 100644 xorg-x11-server/patches/xserver-1.8-no-connected-outputs.patch
delete mode 100644 xorg-x11-server/patches/xserver-1.8-randr-initial.patch
delete mode 100644 xorg-x11-server/patches/xserver-1.8-udev-warning.patch
delete mode 100644 xorg-x11-server/patches/xserver-1.8.2-XTEST-PointerKeys-fixes.patch
create mode 100644 xorg-x11-server/patches/xserver-autobind-hotplug.patch
create mode 100644 xorg-x11-xinit/patches/xinit-1.0.2-client-session.patch
create mode 100644 xorg-x11-xinit/patches/xorg-x11-xinit-1.3.2-systemd-logind.patch
Difference in files:
diff --git a/libICE/libICE.nm b/libICE/libICE.nm
index 6b2c67e..7042328 100644
--- a/libICE/libICE.nm
+++ b/libICE/libICE.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libICE
-version = 1.0.6
+version = 1.0.8
release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -17,8 +17,7 @@ description
X.Org X11 libICE development package.
end
-source_dl =
-sources = %{thisapp}.tar.bz2
+source_dl = http://ftp.x.org/pub/individual/lib/
build
requires
@@ -33,7 +32,6 @@ end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/libSM/libSM.nm b/libSM/libSM.nm
index 2aae4d1..e375091 100644
--- a/libSM/libSM.nm
+++ b/libSM/libSM.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libSM
-version = 1.1.1
+version = 1.2.1
release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -17,8 +17,7 @@ description
X.Org X11 libSM development package.
end
-source_dl =
-sources = %{thisapp}.tar.bz2
+source_dl = http://ftp.x.org/pub/individual/lib/
build
requires
@@ -34,7 +33,6 @@ end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/libXau/libXau.nm b/libXau/libXau.nm
index 920f882..b23f5eb 100644
--- a/libXau/libXau.nm
+++ b/libXau/libXau.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libXau
-version = 1.0.6
+version = 1.0.7
release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -14,16 +14,15 @@ license = MIT
summary = Sample Authorization Protocol for X.
description
- This is a very simple mechanism for providing individual access \
- to an X Window System display.It uses existing core protocol and \
- library hooks for specifying authorization data in the connection \
- setup block to restrict use of the display to only those clients \
- that show that they know a server-specific key called a \
+ This is a very simple mechanism for providing individual access
+ to an X Window System display.It uses existing core protocol and
+ library hooks for specifying authorization data in the connection
+ setup block to restrict use of the display to only those clients
+ that show that they know a server-specific key called a
magic cookie.
end
-source_dl =
-sources = %{thisapp}.tar.bz2
+source_dl = http://ftp.x.org/pub/individual/lib/
build
requires
@@ -33,14 +32,10 @@ build
configure_options +=\
--disable-static
-
- #make_install_targets +=\
- # INSTALL="install -p"
end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/libXaw/libXaw.nm b/libXaw/libXaw.nm
index 0fb6d25..7dd6b4e 100644
--- a/libXaw/libXaw.nm
+++ b/libXaw/libXaw.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libXaw
-version = 1.0.7
+version = 1.0.11
release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -17,8 +17,7 @@ description
Xaw is a widget set based on the X Toolkit Intrinsics (Xt) Library.
end
-source_dl =
-sources = %{thisapp}.tar.bz2
+source_dl = http://ftp.x.org/pub/individual/lib/
build
requires
@@ -39,7 +38,6 @@ end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/libXdamage/libXdamage.nm b/libXdamage/libXdamage.nm
index b1f54cc..279b4b3 100644
--- a/libXdamage/libXdamage.nm
+++ b/libXdamage/libXdamage.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libXdamage
-version = 1.1.3
+version = 1.1.4
release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -17,8 +17,7 @@ description
X.Org X11 libXdamage runtime library.
end
-source_dl =
-sources = %{thisapp}.tar.bz2
+source_dl = http://ftp.x.org/pub/individual/lib/
build
requires
@@ -34,7 +33,6 @@ end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/libXdmcp/libXdmcp.nm b/libXdmcp/libXdmcp.nm
index 352a36e..f72ce55 100644
--- a/libXdmcp/libXdmcp.nm
+++ b/libXdmcp/libXdmcp.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libXdmcp
-version = 1.0.3
+version = 1.1.1
release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -17,8 +17,7 @@ description
X Display Manager Control Protocol library.
end
-source_dl =
-sources = %{thisapp}.tar.bz2
+source_dl = http://ftp.x.org/pub/individual/lib/
build
requires
@@ -32,7 +31,6 @@ end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/libXfixes/libXfixes.nm b/libXfixes/libXfixes.nm
index 561b928..565807e 100644
--- a/libXfixes/libXfixes.nm
+++ b/libXfixes/libXfixes.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libXfixes
-version = 4.0.5
+version = 5.0
release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -13,14 +13,11 @@ url = http://www.x.org/
license = MIT
summary = X Fixes library.
-PKG_PACKAGES += %{name}-devel
-
description
X Fixes library.
end
-source_dl =
-sources = %{thisapp}.tar.bz2
+source_dl = http://ftp.x.org/pub/individual/lib/
build
requires
@@ -35,7 +32,6 @@ end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/libXfont/libXfont.nm b/libXfont/libXfont.nm
index 27ef216..55de1ee 100644
--- a/libXfont/libXfont.nm
+++ b/libXfont/libXfont.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libXfont
-version = 1.4.2
+version = 1.4.5
release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -17,8 +17,7 @@ description
X.Org X11 libXfont development package.
end
-source_dl =
-sources = %{thisapp}.tar.bz2
+source_dl = http://ftp.x.org/pub/individual/lib/
build
requires
@@ -36,7 +35,6 @@ end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/libXft/libXft.nm b/libXft/libXft.nm
index e1bea3b..bf726f4 100644
--- a/libXft/libXft.nm
+++ b/libXft/libXft.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libXft
-version = 2.1.14
+version = 2.3.1
release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -17,8 +17,7 @@ description
X.Org X11 libXft runtime library.
end
-source_dl =
-sources = %{thisapp}.tar.bz2
+source_dl = http://ftp.x.org/pub/individual/lib/
build
requires
@@ -35,7 +34,6 @@ end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/libXi/libXi.nm b/libXi/libXi.nm
index 45337e4..444e2c2 100644
--- a/libXi/libXi.nm
+++ b/libXi/libXi.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libXi
-version = 1.3.2
+version = 1.6.2
release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -17,8 +17,7 @@ description
X.Org X11 libXi runtime library.
end
-source_dl =
-sources = %{thisapp}.tar.bz2
+source_dl = http://ftp.x.org/pub/individual/lib/
build
requires
@@ -35,7 +34,6 @@ end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/libXmu/libXmu.nm b/libXmu/libXmu.nm
index 2c0b86c..5b52635 100644
--- a/libXmu/libXmu.nm
+++ b/libXmu/libXmu.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libXmu
-version = 1.0.5
+version = 1.1.1
release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -17,8 +17,7 @@ description
X.Org X11 libXmu/libXmuu runtime libraries.
end
-source_dl =
-sources = %{thisapp}.tar.bz2
+source_dl = http://ftp.x.org/pub/individual/lib/
build
requires
@@ -38,7 +37,6 @@ end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/libXpm/libXpm.nm b/libXpm/libXpm.nm
index 406d342..74366a5 100644
--- a/libXpm/libXpm.nm
+++ b/libXpm/libXpm.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libXpm
-version = 3.5.8
+version = 3.5.10
release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -17,8 +17,7 @@ description
X.Org X11 libXpm runtime library.
end
-source_dl =
-sources = %{thisapp}.tar.bz2
+source_dl = http://ftp.x.org/pub/individual/lib/
build
requires
@@ -39,7 +38,6 @@ end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/libXrandr/libXrandr.nm b/libXrandr/libXrandr.nm
index 4076515..2522d90 100644
--- a/libXrandr/libXrandr.nm
+++ b/libXrandr/libXrandr.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libXrandr
-version = 1.3.0
+version = 1.4.0
release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -17,8 +17,7 @@ description
X.Org X11 libXrandr runtime library.
end
-source_dl =
-sources = %{thisapp}.tar.bz2
+source_dl = http://ftp.x.org/pub/individual/lib/
build
requires
@@ -35,7 +34,6 @@ end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/libXrandr/patches/libXrandr-1.3.0-fixes.patch b/libXrandr/patches/libXrandr-1.3.0-fixes.patch
deleted file mode 100644
index 44f8ca9..0000000
--- a/libXrandr/patches/libXrandr-1.3.0-fixes.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index a018667..09c5d8d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -32,7 +32,7 @@ dnl protocol, so Xrandr version l.n.m corresponds to protocol version l.n
- dnl
- AC_INIT(libXrandr, 1.3.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXrandr)
- AC_CONFIG_AUX_DIR(.)
--AM_INIT_AUTOMAKE([dist-bzip2])
-+AM_INIT_AUTOMAKE([foreign dist-bzip2])
- AM_MAINTAINER_MODE
-
- # Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
-diff --git a/include/X11/extensions/Xrandr.h b/include/X11/extensions/Xrandr.h
-index a411321..6b756a7 100644
---- a/include/X11/extensions/Xrandr.h
-+++ b/include/X11/extensions/Xrandr.h
-@@ -197,6 +197,7 @@ Time XRRTimes (Display *dpy, int screen, Time *config_timestamp);
-
- /* Version 1.2 additions */
-
-+/* despite returning a Status, this returns 1 for success */
- Status
- XRRGetScreenSizeRange (Display *dpy, Window window,
- int *minWidth, int *minHeight,
-diff --git a/src/XrrConfig.c b/src/XrrConfig.c
-index db7a1ae..34ff3ef 100644
---- a/src/XrrConfig.c
-+++ b/src/XrrConfig.c
-@@ -409,6 +409,7 @@ Status XRRSetScreenConfigAndRate (Display *dpy,
-
- (void) _XReply (dpy, (xReply *) &rep, 0, xTrue);
-
-+ /* actually .errorCode in struct xError */
- if (rep.status == RRSetConfigSuccess) {
- /* if we succeed, set our view of reality to what we set it to */
- config->config_timestamp = rep.newConfigTimestamp;
-diff --git a/src/XrrCrtc.c b/src/XrrCrtc.c
-index db9d0b4..697987a 100644
---- a/src/XrrCrtc.c
-+++ b/src/XrrCrtc.c
-@@ -167,7 +167,7 @@ XRRGetCrtcGammaSize (Display *dpy, RRCrtc crtc)
- req->crtc = crtc;
-
- if (!_XReply (dpy, (xReply *) &rep, 0, xFalse))
-- rep.status = RRSetConfigFailed;
-+ rep.size = 0;
- UnlockDisplay (dpy);
- SyncHandle ();
- return rep.size;
-@@ -179,7 +179,7 @@ XRRGetCrtcGamma (Display *dpy, RRCrtc crtc)
- XExtDisplayInfo *info = XRRFindDisplay(dpy);
- xRRGetCrtcGammaReply rep;
- xRRGetCrtcGammaReq *req;
-- XRRCrtcGamma *crtc_gamma;
-+ XRRCrtcGamma *crtc_gamma = NULL;
- long nbytes;
- long nbytesRead;
-
-@@ -192,7 +192,7 @@ XRRGetCrtcGamma (Display *dpy, RRCrtc crtc)
- req->crtc = crtc;
-
- if (!_XReply (dpy, (xReply *) &rep, 0, xFalse))
-- rep.status = RRSetConfigFailed;
-+ goto out;
-
- nbytes = (long) rep.length << 2;
-
-@@ -204,9 +204,7 @@ XRRGetCrtcGamma (Display *dpy, RRCrtc crtc)
- if (!crtc_gamma)
- {
- _XEatData (dpy, (unsigned long) nbytes);
-- UnlockDisplay (dpy);
-- SyncHandle ();
-- return NULL;
-+ goto out;
- }
- _XRead16 (dpy, crtc_gamma->red, rep.size * 2);
- _XRead16 (dpy, crtc_gamma->green, rep.size * 2);
-@@ -214,7 +212,8 @@ XRRGetCrtcGamma (Display *dpy, RRCrtc crtc)
-
- if (nbytes > nbytesRead)
- _XEatData (dpy, (unsigned long) (nbytes - nbytesRead));
--
-+
-+out:
- UnlockDisplay (dpy);
- SyncHandle ();
- return crtc_gamma;
-diff --git a/src/XrrProperty.c b/src/XrrProperty.c
-index 9554f9a..1a125b2 100644
---- a/src/XrrProperty.c
-+++ b/src/XrrProperty.c
-@@ -272,7 +272,7 @@ XRRGetOutputProperty (Display *dpy, RROutput output,
- {
- UnlockDisplay (dpy);
- SyncHandle ();
-- return 1;
-+ return ((xError *)&rep)->errorCode;
- }
-
- *prop = (unsigned char *) NULL;
diff --git a/libXres/libXres.nm b/libXres/libXres.nm
index d732b51..d84d1ee 100644
--- a/libXres/libXres.nm
+++ b/libXres/libXres.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libXres
-version = 1.0.4
+version = 1.0.6
release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -14,12 +14,11 @@ license = MIT
summary = X-Resource extension client library.
description
- X-Resource is an extension that allows a client to query \
+ X-Resource is an extension that allows a client to query
the X server about its usage of various resources.
end
-source_dl =
-sources = %{thisapp}.tar.bz2
+source_dl = http://ftp.x.org/pub/individual/lib/
build
requires
@@ -37,7 +36,6 @@ end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/libXt/libXt.nm b/libXt/libXt.nm
index 69bb3c9..9491465 100644
--- a/libXt/libXt.nm
+++ b/libXt/libXt.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libXt
-version = 1.0.7
+version = 1.1.3
release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -17,8 +17,7 @@ description
X.Org X11 libXt runtime library.
end
-source_dl =
-sources = %{thisapp}.tar.bz2
+source_dl = http://ftp.x.org/pub/individual/lib/
build
requires
@@ -37,7 +36,6 @@ end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/libXt/patches/libXt-1.0.7-libsm-fix.patch b/libXt/patches/libXt-1.0.7-libsm-fix.patch
deleted file mode 100644
index 309aea8..0000000
--- a/libXt/patches/libXt-1.0.7-libsm-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libXt-1.0.2/xt.pc.in.libsm-fix 2006-06-28 14:56:37.000000000 -0400
-+++ libXt-1.0.2/xt.pc.in 2006-06-28 14:56:51.000000000 -0400
-@@ -7,7 +7,7 @@
- Name: Xt
- Description: X Toolkit Library
- Version: @VERSION@
--Requires: xproto x11 sm
-+Requires: xproto x11
- Requires.private: x11 sm
- Cflags: -I${includedir}
- Libs: -L${libdir} -lXt
diff --git a/libXtst/libXtst.nm b/libXtst/libXtst.nm
index d44de71..d249ee8 100644
--- a/libXtst/libXtst.nm
+++ b/libXtst/libXtst.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libXtst
-version = 1.1.0
+version = 1.2.1
release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -17,8 +17,7 @@ description
X.Org X11 libXtst development package.
end
-source_dl =
-sources = %{thisapp}.tar.bz2
+source_dl = http://ftp.x.org/pub/individual/lib/
build
requires
@@ -35,7 +34,6 @@ end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/libXv/libXv.nm b/libXv/libXv.nm
index 8583fb2..011aed0 100644
--- a/libXv/libXv.nm
+++ b/libXv/libXv.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libXv
-version = 1.0.5
+version = 1.0.7
release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -18,8 +18,7 @@ description
X.Org X11 libXv runtime library.
end
-source_dl =
-sources = %{thisapp}.tar.bz2
+source_dl = http://ftp.x.org/pub/individual/lib/
build
requires
@@ -35,7 +34,6 @@ end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/libXvMC/libXvMC.nm b/libXvMC/libXvMC.nm
index 7fbd0be..fb3bae7 100644
--- a/libXvMC/libXvMC.nm
+++ b/libXvMC/libXvMC.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libXvMC
-version = 1.0.6
+version = 1.0.7
release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -17,8 +17,7 @@ description
X.Org X11 libXvMC runtime library.
end
-source_dl =
-sources = %{thisapp}.tar.bz2
+source_dl = http://ftp.x.org/pub/individual/lib/
build
requires
@@ -35,7 +34,6 @@ end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/libXxf86vm/libXxf86vm.nm b/libXxf86vm/libXxf86vm.nm
index 5e7ad7e..cbfdb62 100644
--- a/libXxf86vm/libXxf86vm.nm
+++ b/libXxf86vm/libXxf86vm.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libXxf86vm
-version = 1.1.0
+version = 1.1.2
release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -17,8 +17,7 @@ description
X.Org X11 libXxf86vm runtime library.
end
-source_dl =
-sources = %{thisapp}.tar.bz2
+source_dl = http://ftp.x.org/pub/individual/lib/
build
requires
@@ -34,7 +33,6 @@ end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/libdrm/libdrm.nm b/libdrm/libdrm.nm
index e434c0f..39f56e1 100644
--- a/libdrm/libdrm.nm
+++ b/libdrm/libdrm.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libdrm
-version = 2.4.31
+version = 2.4.40
release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
diff --git a/libfontenc/libfontenc.nm b/libfontenc/libfontenc.nm
index 5009601..2c4eb8a 100644
--- a/libfontenc/libfontenc.nm
+++ b/libfontenc/libfontenc.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libfontenc
-version = 1.0.5
+version = 1.1.1
release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -17,7 +17,7 @@ description
X.Org X11 libfontenc runtime library.
end
-source_dl =
+source_dl = http://ftp.x.org/pub/individual/lib/
build
requires
@@ -32,7 +32,6 @@ end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/libpciaccess/libpciaccess.nm b/libpciaccess/libpciaccess.nm
index 1caed55..48adbc6 100644
--- a/libpciaccess/libpciaccess.nm
+++ b/libpciaccess/libpciaccess.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libpciaccess
-version = 0.11.0
+version = 0.13.1
release = 1
groups = Applications/Virtualization
@@ -13,22 +13,28 @@ license = LGPLv2.1+
summary = Generic PCI access library.
description
- A toolkit to interact with the virtualization capabilities of recent \
+ A toolkit to interact with the virtualization capabilities of recent
versions of Linux.
end
-source_dl =
-sources = %{thisapp}.tar.bz2
+source_dl = http://cgit.freedesktop.org/xorg/lib/libpciaccess/snapshot/
build
requires
+ autoconf
+ automake
pkg-config
+ libtool
+ xorg-x11-util-macros
+ end
+
+ prepare_cmds
+ ./autogen.sh
end
end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/libxcb/libxcb.nm b/libxcb/libxcb.nm
index c5713b0..c136327 100644
--- a/libxcb/libxcb.nm
+++ b/libxcb/libxcb.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libxcb
-version = 1.7
+version = 1.9
release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -14,12 +14,12 @@ license = MIT
summary = A C binding to the X11 protocol.
description
- The X protocol C-language Binding (XCB) is a replacement for Xlib \
- featuring a small footprint, latency hiding, direct access to the \
+ The X protocol C-language Binding (XCB) is a replacement for Xlib
+ featuring a small footprint, latency hiding, direct access to the
protocol, improved threading support, and extensibility.
end
-source_dl =
+source_dl = http://xcb.freedesktop.org/dist/
build
requires
@@ -30,7 +30,7 @@ build
libxslt-devel
pkg-config
python-devel
- xcb-proto
+ xcb-proto >= 1.7
xorg-x11-proto-devel
end
@@ -45,7 +45,6 @@ end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/libxkbfile/libxkbfile.nm b/libxkbfile/libxkbfile.nm
index 6084282..3f88e83 100644
--- a/libxkbfile/libxkbfile.nm
+++ b/libxkbfile/libxkbfile.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libxkbfile
-version = 1.0.6
+version = 1.0.8
release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -14,18 +14,18 @@ license = MIT
summary = X.Org X11 libxkbfile runtime library.
description
- The flex program generates scanners. Scanners are programs which can \
- recognize lexical patterns in text. Flex takes pairs of regular \
- expressions and C code as input and generates a C source file as \
- output. The output file is compiled and linked with a library to \
- produce an executable. The executable searches through its input for \
- occurrences of the regular expressions. When a match is found, it \
- executes the corresponding C code. Flex was designed to work with \
- both Yacc and Bison, and is used by many programs as part of their \
+ The flex program generates scanners. Scanners are programs which can
+ recognize lexical patterns in text. Flex takes pairs of regular
+ expressions and C code as input and generates a C source file as
+ output. The output file is compiled and linked with a library to
+ produce an executable. The executable searches through its input for
+ occurrences of the regular expressions. When a match is found, it
+ executes the corresponding C code. Flex was designed to work with
+ both Yacc and Bison, and is used by many programs as part of their
build process.
end
-source_dl =
+source_dl = http://ftp.x.org/pub/individual/lib/
build
requires
@@ -37,7 +37,6 @@ end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/libxslt/libxslt.nm b/libxslt/libxslt.nm
index 5566cfe..9bd7154 100644
--- a/libxslt/libxslt.nm
+++ b/libxslt/libxslt.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libxslt
-version = 1.1.26
+version = 1.1.28
release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -14,12 +14,12 @@ license = MIT
summary = Library providing the Gnome XSLT engine.
description
- This C library allows to transform XML files into other XML files \
- (or HTML, text, ...) using the standard XSLT stylesheet transformation \
+ This C library allows to transform XML files into other XML files
+ (or HTML, text, ...) using the standard XSLT stylesheet transformation
mechanism.
end
-source_dl =
+source_dl = ftp://xmlsoft.org/libxslt/
build
requires
@@ -32,7 +32,6 @@ end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/mesa/mesa.nm b/mesa/mesa.nm
index e8ab26f..ab71259 100644
--- a/mesa/mesa.nm
+++ b/mesa/mesa.nm
@@ -4,8 +4,8 @@
###############################################################################
name = mesa
-version = 7.11.2
-release = 2
+version = 9.0.2
+release = 1
groups = Development/Tools
url = http://www.mesa3d.org
@@ -21,6 +21,8 @@ sources = MesaLib-%{version}.tar.bz2
build
requires
+ autoconf
+ automake
bison
expat-devel
flex
@@ -31,9 +33,11 @@ build
libXext-devel
libXfixes-devel
libXxf86vm-devel
- libdrm-devel
+ libdrm-devel >= 2.4.40
libselinux-devel
+ libtool
libxcb-devel
+ libxml2-devel
makedepend
xorg-x11-proto-devel
end
@@ -50,13 +54,10 @@ build
--enable-pic \
--enable-selinux \
--enable-pic \
- --with-driver=dri \
+ --enable-dri \
--with-dri-drivers="nouveau,radeon,r200%{platform_drivers}" \
--with-gallium-drivers=swrast \
--disable-asm \
- --disable-glw \
- --disable-glu \
- --disable-glut \
--disable-gallium-llvm \
--disable-gallium-egl \
--disable-egl \
@@ -66,11 +67,59 @@ build
prepare_cmds
# Defaults to dri (not xlib) for libGL on all arches.
sed -i 's/^default_driver.*$/default_driver="dri"/' configure.ac
+
+ # Regenerate build system.
+ autoreconf -vfi
end
end
packages
- package %{name}
+ package dri-drivers
+ summary = Mesa-based DRI drivers.
+ description
+ This package contains the Mesa-based DRI drivers.
+ end
+
+ obsoletes
+ mesa <= 7.11.2-2
+ end
+
+ files
+ %{sysconfdir}/drirc
+ %{libdir}/libdri*.so.*
+ %{libdir}/dri/*
+ end
+ end
+
+ package libGL
+ summary = Mesa libGL runtime library.
+ description
+ This package contains the Mesa libGL runtime libraries.
+ end
+
+ obsoletes
+ mesa <= 7.11.2-2
+ end
+
+ files
+ %{libdir}/libGL.so.*
+ end
+ end
+
+ package libglapi
+ summary = Mesa shared glapi.
+ description
+ This package contains the shared glapi of Mesa.
+ end
+
+ obsoletes
+ mesa <= 7.11.2-2
+ end
+
+ files
+ %{libdir}/libglapi.so.*
+ end
+ end
package %{name}-devel
template DEVEL
diff --git a/mesa/patches/mesa-7.11-generic-wmb.patch b/mesa/patches/mesa-7.11-generic-wmb.patch
deleted file mode 100644
index 618d836..0000000
--- a/mesa/patches/mesa-7.11-generic-wmb.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up Mesa-7.11/src/mesa/drivers/dri/sis/sis_context.h.jx Mesa-7.11/src/mesa/drivers/dri/sis/sis_context.h
---- Mesa-7.11/src/mesa/drivers/dri/sis/sis_context.h.jx 2010-12-14 16:43:15.000000000 -0500
-+++ Mesa-7.11/src/mesa/drivers/dri/sis/sis_context.h 2011-09-09 11:47:56.454465358 -0400
-@@ -405,7 +405,7 @@ struct sis_context
- #elif defined(__ia64__)
- #define MMIO_WMB() __asm __volatile("mf" : : : "memory")
- #else
--#error platform needs WMB
-+#define MMIO_WMB() __sync_synchronize()
- #endif
-
- #define mEndPrimitive() \
diff --git a/xcb-proto/xcb-proto.nm b/xcb-proto/xcb-proto.nm
index 67bb577..787b8a2 100644
--- a/xcb-proto/xcb-proto.nm
+++ b/xcb-proto/xcb-proto.nm
@@ -4,8 +4,8 @@
###############################################################################
name = xcb-proto
-version = 1.6
-release = 2
+version = 1.8
+release = 1
arch = noarch
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -21,7 +21,6 @@ description
end
source_dl = http://xcb.freedesktop.org/dist/
-sources = %{thisapp}.tar.gz
build
requires
@@ -37,5 +36,4 @@ end
packages
package %{name}
- end
end
diff --git a/xorg-x11-drv-ati/xorg-x11-drv-ati.nm b/xorg-x11-drv-ati/xorg-x11-drv-ati.nm
index 2a76462..dec8261 100644
--- a/xorg-x11-drv-ati/xorg-x11-drv-ati.nm
+++ b/xorg-x11-drv-ati/xorg-x11-drv-ati.nm
@@ -4,7 +4,7 @@
###############################################################################
name = xorg-x11-drv-ati
-version = 6.13.1
+version = 7.1.0
release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -17,23 +17,25 @@ description
X.Org X11 ati video driver.
end
+# Specify the X Server version to build for.
+x11_server_ver = 1.13.2
+
+thisapp = xf86-video-ati-%{version}
+
source_dl = http://ftp.x.org/pub/individual/driver/
-sources = xf86-video-ati-%{version}.tar.bz2
build
requires
libdrm-devel
libpciaccess-devel
libX11-devel
- mesa-devel
+ mesa-devel >= 9.0.2
pkg-config
xorg-x11-proto-devel
- xorg-x11-server-devel
+ xorg-x11-server-devel >= %{x11_server_ver}
xorg-x11-util-macros
end
- DIR_APP = %{DIR_SRC}/xf86-video-ati-%{version}
-
CFLAGS += -Wl,-z,lazy
configure_options += \
@@ -47,6 +49,10 @@ end
packages
package %{name}
+ requires
+ dri-drivers >= 9.0.2
+ xorg-x11-server >= %{x11_server_ver}
+ end
end
package %{name}-debuginfo
diff --git a/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm b/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm
index 56b0c56..a4da9c2 100644
--- a/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm
+++ b/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm
@@ -4,7 +4,7 @@
###############################################################################
name = xorg-x11-drv-evdev
-version = 2.4.99.901
+version = 2.7.3
release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -17,20 +17,23 @@ description
X.Org X11 evdev input driver.
end
+# Specify the X Server version to build for.
+x11_server_ver = 1.13.2
+
+thisapp = xf86-input-evdev-%{version}
+
source_dl = http://ftp.x.org/pub/individual/driver/
-sources = xf86-input-evdev-%{version}.tar.bz2
build
requires
+ libudev-devel
libxkbfile-devel
pkg-config
xorg-x11-proto-devel
- xorg-x11-server-devel
+ xorg-x11-server-devel >= %{x11_server_ver}
xorg-x11-util-macros
end
- DIR_APP = %{DIR_SRC}/xf86-input-evdev-%{version}
-
CFLAGS += -Wl,-z,lazy
configure_options += \
@@ -43,6 +46,9 @@ end
packages
package %{name}
+ requires
+ xorg-x11-server >= %{x11_server_ver}
+ end
end
package %{name}-devel
diff --git a/xorg-x11-drv-intel/patches/intel-2.10.0-add-mbp-backlight.patch b/xorg-x11-drv-intel/patches/intel-2.10.0-add-mbp-backlight.patch
deleted file mode 100644
index ddaab89..0000000
--- a/xorg-x11-drv-intel/patches/intel-2.10.0-add-mbp-backlight.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: xf86-video-intel-2.11.0/src/drmmode_display.c
-===================================================================
---- xf86-video-intel-2.11.0/src/drmmode_display.c
-+++ xf86-video-intel-2.11.0/src/drmmode_display.c 2010-04-29 00:18:34.000000000 +0200
-@@ -103,6 +103,7 @@
- "asus-laptop",
- "eeepc",
- "thinkpad_screen",
-+ "mbp_backlight",
- "acpi_video1",
- "acpi_video0",
- "fujitsu-laptop",
diff --git a/xorg-x11-drv-intel/patches/intel-2.11-lvds-first.patch b/xorg-x11-drv-intel/patches/intel-2.11-lvds-first.patch
deleted file mode 100644
index 5e4a44d..0000000
--- a/xorg-x11-drv-intel/patches/intel-2.11-lvds-first.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -up xf86-video-intel-20100319/src/drmmode_display.c.jx xf86-video-intel-20100319/src/drmmode_display.c
---- xf86-video-intel-20100319/src/drmmode_display.c.jx 2010-03-22 13:24:13.483183499 -0400
-+++ xf86-video-intel-20100319/src/drmmode_display.c 2010-03-22 13:25:59.810184060 -0400
-@@ -1452,7 +1452,7 @@ Bool drmmode_pre_init(ScrnInfoPtr scrn,
- intel_screen_private *intel = intel_get_screen_private(scrn);
- struct drm_i915_getparam gp;
- drmmode_ptr drmmode;
-- unsigned int i;
-+ unsigned int i, lvds = -1;
- int has_flipping = 0;
-
- drmmode = xnfalloc(sizeof *drmmode);
-@@ -1473,9 +1473,22 @@ Bool drmmode_pre_init(ScrnInfoPtr scrn,
- drmmode->mode_res->max_height);
- for (i = 0; i < drmmode->mode_res->count_crtcs; i++)
- drmmode_crtc_init(scrn, drmmode, i);
-+
-+ /* do LVDS first */
-+ for (i = 0; i < drmmode->mode_res->count_connectors; i++) {
-+ drmModeConnectorPtr koutput =
-+ drmModeGetConnector(drmmode->fd,
-+ drmmode->mode_res->connectors[i]);
-+ if (koutput->connector_type == DRM_MODE_CONNECTOR_LVDS) {
-+ drmmode_output_init(scrn, drmmode, i);
-+ lvds = i;
-+ }
-+ drmModeFreeConnector(koutput);
-+ }
-
- for (i = 0; i < drmmode->mode_res->count_connectors; i++)
-- drmmode_output_init(scrn, drmmode, i);
-+ if (i != lvds)
-+ drmmode_output_init(scrn, drmmode, i);
-
- xf86InitialConfiguration(scrn, TRUE);
-
-
diff --git a/xorg-x11-drv-intel/patches/intel-2.11-no-pageflipping.patch b/xorg-x11-drv-intel/patches/intel-2.11-no-pageflipping.patch
deleted file mode 100644
index 39500e2..0000000
--- a/xorg-x11-drv-intel/patches/intel-2.11-no-pageflipping.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up xf86-video-intel-2.11.0/src/drmmode_display.c.no-flip xf86-video-intel-2.11.0/src/drmmode_display.c
---- xf86-video-intel-2.11.0/src/drmmode_display.c.no-flip 2010-05-03 15:30:19.000000000 -0400
-+++ xf86-video-intel-2.11.0/src/drmmode_display.c 2010-05-03 15:30:59.000000000 -0400
-@@ -1504,10 +1504,15 @@ Bool drmmode_pre_init(ScrnInfoPtr scrn,
- gp.value = &has_flipping;
- (void)drmCommandWriteRead(intel->drmSubFD, DRM_I915_GETPARAM, &gp,
- sizeof(gp));
-+
-+ xf86DrvMsg(scrn->scrnIndex, X_INFO,
-+ "Pageflipping %s in kernel, %s disabled in X\n",
-+ has_flipping ? "enabled" : "disabled",
-+ has_flipping ? "but" : "and");
- if (has_flipping) {
- xf86DrvMsg(scrn->scrnIndex, X_INFO,
-- "Kernel page flipping support detected, enabling\n");
-- intel->use_pageflipping = TRUE;
-+ "Don't panic: https://bugzilla.redhat.com/588421\n");
-+ intel->use_pageflipping = FALSE;
- drmmode->flip_count = 0;
- drmmode->event_context.version = DRM_EVENT_CONTEXT_VERSION;
- drmmode->event_context.vblank_handler = drmmode_vblank_handler;
-diff -up xf86-video-intel-2.11.0/src/i830_dri.c.no-flip xf86-video-intel-2.11.0/src/i830_dri.c
---- xf86-video-intel-2.11.0/src/i830_dri.c.no-flip 2010-03-29 14:23:02.000000000 -0400
-+++ xf86-video-intel-2.11.0/src/i830_dri.c 2010-05-03 15:30:19.000000000 -0400
-@@ -1013,7 +1013,7 @@ Bool I830DRI2ScreenInit(ScreenPtr screen
-
- info.CopyRegion = I830DRI2CopyRegion;
- #if DRI2INFOREC_VERSION >= 4
-- if (intel->use_pageflipping) {
-+ if (intel->use_pageflipping || 1) {
- info.version = 4;
- info.ScheduleSwap = I830DRI2ScheduleSwap;
- info.GetMSC = I830DRI2GetMSC;
diff --git a/xorg-x11-drv-intel/patches/intel-2.11.0-vga-clock-max.patch b/xorg-x11-drv-intel/patches/intel-2.11.0-vga-clock-max.patch
deleted file mode 100644
index 80eeb07..0000000
--- a/xorg-x11-drv-intel/patches/intel-2.11.0-vga-clock-max.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up xf86-video-intel-2.11.0/src/drmmode_display.c.jx xf86-video-intel-2.11.0/src/drmmode_display.c
---- xf86-video-intel-2.11.0/src/drmmode_display.c.jx 2010-04-16 10:28:08.000000000 -0400
-+++ xf86-video-intel-2.11.0/src/drmmode_display.c 2010-04-26 15:28:58.000000000 -0400
-@@ -689,6 +689,12 @@ drmmode_output_mode_valid(xf86OutputPtr
- else
- return MODE_OK;
- }
-+
-+ /* I don't actually believe any VGA is this good */
-+ if (koutput->connector_type == DRM_MODE_CONNECTOR_VGA)
-+ if (pModes->Clock > 250000)
-+ return MODE_CLOCK_HIGH;
-+
- return MODE_OK;
- }
-
diff --git a/xorg-x11-drv-intel/patches/intel-2.12-fix-uxa-planemask.patch b/xorg-x11-drv-intel/patches/intel-2.12-fix-uxa-planemask.patch
deleted file mode 100644
index eb89433..0000000
--- a/xorg-x11-drv-intel/patches/intel-2.12-fix-uxa-planemask.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From feff2ec80eeeba5074d19efcddf4867adf639b4f Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied(a)redhat.com>
-Date: Mon, 5 Jul 2010 09:07:08 +1000
-Subject: [PATCH] uxa: don't compare planemask with FB_ALLONES.
-
-planemask is an unsigned long initialised to ~0, on 64-bit this is not equal
-to an (unsigned int)-1.
-
-Use the macro provided to do this.
-
-Signed-off-by: Dave Airlie <airlied(a)redhat.com>
----
- uxa/uxa-accel.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/uxa/uxa-accel.c b/uxa/uxa-accel.c
-index ded66a1..633b433 100644
---- a/uxa/uxa-accel.c
-+++ b/uxa/uxa-accel.c
-@@ -81,7 +81,7 @@ uxa_fill_spans(DrawablePtr pDrawable, GCPtr pGC, int n,
- if (!dst_pixmap)
- goto fallback;
-
-- if (pGC->alu != GXcopy || pGC->planemask != FB_ALLONES)
-+ if (pGC->alu != GXcopy || !UXA_PM_IS_SOLID(pDrawable, pGC->planemask))
- goto solid;
-
- format = PictureMatchFormat(screen,
-@@ -1048,7 +1048,7 @@ uxa_fill_region_solid(DrawablePtr pDrawable,
- extents = REGION_EXTENTS(screen, pRegion);
-
- /* Using GEM, the relocation costs outweigh the advantages of the blitter */
-- if (nbox == 1 || (alu != GXcopy && alu != GXclear) || planemask != FB_ALLONES) {
-+ if (nbox == 1 || (alu != GXcopy && alu != GXclear) || !UXA_PM_IS_SOLID(&pixmap->drawable, planemask)) {
- try_solid:
- if (uxa_screen->info->check_solid &&
- !uxa_screen->info->check_solid(&pixmap->drawable, alu, planemask))
---
-1.7.1
-
diff --git a/xorg-x11-drv-intel/patches/intel-2.8.0-kms-get-crtc.patch b/xorg-x11-drv-intel/patches/intel-2.8.0-kms-get-crtc.patch
deleted file mode 100644
index e7e8569..0000000
--- a/xorg-x11-drv-intel/patches/intel-2.8.0-kms-get-crtc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up xf86-video-intel-20090908/src/drmmode_display.c.jx xf86-video-intel-20090908/src/drmmode_display.c
---- xf86-video-intel-20090908/src/drmmode_display.c.jx 2009-09-08 14:30:55.000000000 -0400
-+++ xf86-video-intel-20090908/src/drmmode_display.c 2009-09-08 14:31:09.000000000 -0400
-@@ -1195,8 +1195,19 @@ drmmode_output_get_property(xf86OutputPt
- return TRUE;
- }
-
-+#ifdef RANDR_GET_CRTC_INTERFACE
-+static xf86CrtcPtr
-+drmmode_get_crtc(xf86OutputPtr output)
-+{
-+ return output->crtc;
-+}
-+#endif
-+
- static const xf86OutputFuncsRec drmmode_output_funcs = {
- .create_resources = drmmode_output_create_resources,
-+#ifdef RANDR_GET_CRTC_INTERFACE
-+ .get_crtc = drmmode_get_crtc,
-+#endif
- #ifdef RANDR_12_INTERFACE
- .set_property = drmmode_output_set_property,
- .get_property = drmmode_output_get_property,
diff --git a/xorg-x11-drv-intel/patches/kill-svideo.patch b/xorg-x11-drv-intel/patches/kill-svideo.patch
deleted file mode 100644
index 607c5a7..0000000
--- a/xorg-x11-drv-intel/patches/kill-svideo.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index d50e640..d6c7cd3 100644
---- a/src/drmmode_display.c
-+++ b/src/drmmode_display.c
-@@ -412,6 +412,18 @@ drmmode_output_detect(xf86OutputPtr output)
- drmmode_output->mode_output =
- drmModeGetConnector(drmmode->fd, drmmode_output->output_id);
-
-+ switch (drmmode_output->mode_output->connector_type) {
-+ case DRM_MODE_CONNECTOR_SVIDEO:
-+ /* FIXME: KMS svideo detection is flaky an causes X to
-+ * come up in 1024x768 when it tries to pick a clone
-+ * mode that fits both the panel and the tv out. Once
-+ * KMS learns how to detect svideo better we can
-+ * remove this. */
-+ return DRM_MODE_UNKNOWNCONNECTION;
-+ default:
-+ break;
-+ }
-+
- switch (drmmode_output->mode_output->connection) {
- case DRM_MODE_CONNECTED:
- status = XF86OutputStatusConnected;
diff --git a/xorg-x11-drv-intel/patches/uevent.patch b/xorg-x11-drv-intel/patches/uevent.patch
deleted file mode 100644
index ab040fa..0000000
--- a/xorg-x11-drv-intel/patches/uevent.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-diff -up xf86-video-intel-2.12.0/src/i830_driver.c.uevent xf86-video-intel-2.12.0/src/i830_driver.c
---- xf86-video-intel-2.12.0/src/i830_driver.c.uevent 2010-06-24 16:29:49.000000000 -0400
-+++ xf86-video-intel-2.12.0/src/i830_driver.c 2010-06-25 11:40:01.335975581 -0400
-@@ -81,6 +81,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
- #include "i915_drm.h"
- #include <xf86drmMode.h>
-
-+#include "libudev.h"
-+
- #define BIT(x) (1 << (x))
- #define MAX(a,b) ((a) > (b) ? (a) : (b))
- #define NB_OF(x) (sizeof (x) / sizeof (*x))
-@@ -996,6 +998,80 @@ int i830_crtc_to_pipe(xf86CrtcPtr crtc)
- return drmmode_get_pipe_from_crtc_id(intel->bufmgr, crtc);
- }
-
-+static void
-+I830HandleUEvents(int fd, void *closure)
-+{
-+ ScrnInfoPtr scrn = closure;
-+ intel_screen_private *intel = intel_get_screen_private(scrn);
-+ struct udev_device *dev;
-+
-+ dev = udev_monitor_receive_device(intel->uevent_monitor);
-+ if (!dev)
-+ return;
-+
-+ /*
-+ * technically we should inspect the event to see that it's a hotplug.
-+ * but we know it's a hotplug, we don't get events for anything else.
-+ * XXX but we should definitely trim by drm node
-+ */
-+
-+ RRGetInfo(screenInfo.screens[scrn->scrnIndex], TRUE);
-+
-+ udev_device_unref(dev);
-+}
-+
-+static void
-+I830UeventInit(ScrnInfoPtr scrn)
-+{
-+ intel_screen_private *intel = intel_get_screen_private(scrn);
-+ struct udev *u;
-+ struct udev_monitor *mon;
-+
-+ u = udev_new();
-+ if (!u)
-+ return;
-+
-+ mon = udev_monitor_new_from_netlink(u, "udev");
-+
-+ if (!mon) {
-+ udev_unref(u);
-+ return;
-+ }
-+
-+ if (udev_monitor_filter_add_match_subsystem_devtype(mon,
-+ "drm",
-+ "drm_minor") < 0 ||
-+ udev_monitor_enable_receiving(mon) < 0)
-+ {
-+ udev_monitor_unref(mon);
-+ udev_unref(u);
-+ return;
-+ }
-+
-+ intel->uevent_handler =
-+ xf86AddGeneralHandler(udev_monitor_get_fd(mon),
-+ I830HandleUEvents,
-+ scrn);
-+
-+ intel->uevent_monitor = mon;
-+}
-+
-+static void
-+I830UeventFini(ScrnInfoPtr scrn)
-+{
-+ intel_screen_private *intel = intel_get_screen_private(scrn);
-+
-+ if (intel->uevent_handler)
-+ {
-+ struct udev *u = udev_monitor_get_udev(intel->uevent_monitor);
-+
-+ xf86RemoveGeneralHandler(intel->uevent_handler);
-+
-+ udev_monitor_unref(intel->uevent_monitor);
-+ udev_unref(u);
-+ }
-+}
-+
- static Bool
- I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv)
- {
-@@ -1233,6 +1309,8 @@ I830ScreenInit(int scrnIndex, ScreenPtr
-
- intel->suspended = FALSE;
-
-+ I830UeventInit(scrn);
-+
- return uxa_resources_init(screen);
- }
-
-@@ -1306,7 +1384,8 @@ static Bool I830CloseScreen(int scrnInde
- {
- ScrnInfoPtr scrn = xf86Screens[scrnIndex];
- intel_screen_private *intel = intel_get_screen_private(scrn);
--
-+
-+ I830UeventFini(scrn);
- if (scrn->vtSema == TRUE) {
- I830LeaveVT(scrnIndex, 0);
- }
-diff -up xf86-video-intel-2.12.0/src/i830.h.uevent xf86-video-intel-2.12.0/src/i830.h
---- xf86-video-intel-2.12.0/src/i830.h.uevent 2010-06-24 16:29:49.000000000 -0400
-+++ xf86-video-intel-2.12.0/src/i830.h 2010-06-25 11:39:15.665029821 -0400
-@@ -47,6 +47,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
- #ifndef _I830_H_
- #define _I830_H_
-
-+#include "libudev.h"
-+
- #include "xf86_OSproc.h"
- #include "compiler.h"
- #include "xf86PciInfo.h"
-@@ -432,6 +434,9 @@ typedef struct intel_screen_private {
- */
- Bool fallback_debug;
- unsigned debug_flush;
-+
-+ struct udev_monitor *uevent_monitor;
-+ InputHandlerProc uevent_handler;
- } intel_screen_private;
-
- enum {
-diff -up xf86-video-intel-2.12.0/src/Makefile.am.uevent xf86-video-intel-2.12.0/src/Makefile.am
---- xf86-video-intel-2.12.0/src/Makefile.am.uevent 2010-06-24 16:29:37.000000000 -0400
-+++ xf86-video-intel-2.12.0/src/Makefile.am 2010-06-25 11:39:15.665029821 -0400
-@@ -32,7 +32,7 @@ AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @
- intel_drv_la_LTLIBRARIES = intel_drv.la
- intel_drv_la_LDFLAGS = -module -avoid-version
- intel_drv_ladir = @moduledir@/drivers
--intel_drv_la_LIBADD = -lm @DRM_LIBS@ -ldrm_intel ../uxa/libuxa.la
-+intel_drv_la_LIBADD = -ludev -lm @DRM_LIBS@ -ldrm_intel ../uxa/libuxa.la
- intel_drv_la_LIBADD += @PCIACCESS_LIBS@
-
- INTEL_DRI_SRCS = \
diff --git a/xorg-x11-drv-intel/xorg-x11-drv-intel.nm b/xorg-x11-drv-intel/xorg-x11-drv-intel.nm
index 9c2ae1d..2153355 100644
--- a/xorg-x11-drv-intel/xorg-x11-drv-intel.nm
+++ b/xorg-x11-drv-intel/xorg-x11-drv-intel.nm
@@ -4,7 +4,7 @@
###############################################################################
name = xorg-x11-drv-intel
-version = 2.12.0
+version = 2.21.0
release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -17,8 +17,12 @@ description
X.Org X11 intel video driver.
end
+# Specify the X Server version to build for.
+x11_server_ver = 1.13.2
+
+thisapp = xf86-video-intel-%{version}
+
source_dl = http://ftp.x.org/pub/individual/driver/
-sources = xf86-video-intel-%{version}.tar.bz2
build
requires
@@ -30,16 +34,14 @@ build
libXvMC-devel
libxcb-devel
libtool
- mesa-devel
+ mesa-devel >= 9.0.2
pkg-config
xcb-util-devel
xorg-x11-proto-devel
- xorg-x11-server-devel
+ xorg-x11-server-devel >= %{x11_server_ver}
xorg-x11-util-macros
end
- DIR_APP = %{DIR_SRC}/xf86-video-intel-%{version}
-
CFLAGS += -Wl,-z,lazy
configure_options += \
@@ -62,6 +64,10 @@ end
packages
package %{name}
+ requires
+ dri-drivers >= 9.0.2
+ xorg-x11-server >= %{x11_server_ver}
+ end
end
package %{name}-debuginfo
diff --git a/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm b/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm
index bcaa6a7..091383d 100644
--- a/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm
+++ b/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm
@@ -4,7 +4,7 @@
###############################################################################
name = xorg-x11-drv-keyboard
-version = 1.4.0
+version = 1.6.2
release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -17,19 +17,21 @@ description
X.Org X11 keyboard input driver.
end
+# Specify the X Server version to build for.
+x11_server_ver = 1.13.2
+
+thisapp = xf86-input-keyboard-%{version}
+
source_dl = http://ftp.x.org/pub/individual/driver/
-sources = xf86-input-keyboard-%{version}.tar.bz2
build
requires
pkg-config
- xorg-x11-server-devel
+ xorg-x11-server-devel >= %{x11_server_ver}
xorg-x11-proto-devel
xorg-x11-util-macros
end
- DIR_APP = %{DIR_SRC}/xf86-input-keyboard-%{version}
-
CFLAGS += -Wl,-z,lazy
configure_options += \
@@ -42,6 +44,10 @@ end
packages
package %{name}
+ requires
+ xorg-x11-server >= %{x11_server_ver}
+ end
+ end
package %{name}-debuginfo
template DEBUGINFO
diff --git a/xorg-x11-drv-modesetting/xorg-x11-drv-modesetting.nm b/xorg-x11-drv-modesetting/xorg-x11-drv-modesetting.nm
new file mode 100644
index 0000000..8ce3bdd
--- /dev/null
+++ b/xorg-x11-drv-modesetting/xorg-x11-drv-modesetting.nm
@@ -0,0 +1,58 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = xorg-x11-drv-modesetting
+version = 0.6.0
+release = 1
+
+maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
+groups = X/Driver
+url = http://www.x.org/
+license = MIT
+summary = Xorg X11 modesetting video driver.
+
+description
+ X.Org X11 modesetting video driver.
+end
+
+# Specify the X Server version to build for.
+x11_server_ver = 1.13.2
+
+thisapp = xf86-video-modesetting-%{version}
+
+source_dl = http://ftp.x.org/pub/individual/driver/
+
+build
+ requires
+ libX11-devel
+ libdrm-devel
+ libudev-devel
+ pkg-config
+ xorg-x11-proto-devel
+ xorg-x11-server-devel >= %{x11_server_ver}
+ xorg-x11-util-macros
+ end
+
+ CFLAGS += -Wl,-z,lazy
+
+ configure_options += \
+ --disable-static
+end
+
+quality-agent
+ permit_not_full_relro = yes
+end
+
+packages
+ package %{name}
+ requires
+ xorg-x11-server >= %{x11_server_ver}
+ end
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
diff --git a/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm b/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm
index 538fef2..38d9d5a 100644
--- a/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm
+++ b/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm
@@ -4,8 +4,8 @@
###############################################################################
name = xorg-x11-drv-mouse
-version = 1.5.0
-release = 2
+version = 1.8.1
+release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
groups = X/Driver
@@ -17,19 +17,21 @@ description
X.Org X11 mouse input driver.
end
+# Specify the X Server version to build for.
+x11_server_ver = 1.13.2
+
+thisapp = xf86-input-mouse-%{version}
+
source_dl = http://ftp.x.org/pub/individual/driver/
-sources = xf86-input-mouse-%{version}.tar.bz2
build
requires
pkg-config
xorg-x11-proto-devel
- xorg-x11-server-devel
+ xorg-x11-server-devel >= %{x11_server_ver}
xorg-x11-util-macros
end
- DIR_APP = %{DIR_SRC}/xf86-input-mouse-%{version}
-
CFLAGS += -Wl,-z,lazy
configure_options += \
@@ -42,6 +44,10 @@ end
packages
package %{name}
+ requires
+ xorg-x11-server >= %{x11_server_ver}
+ end
+ end
package %{name}-debuginfo
template DEBUGINFO
diff --git a/xorg-x11-drv-nouveau/xorg-x11-drv-nouveau.nm b/xorg-x11-drv-nouveau/xorg-x11-drv-nouveau.nm
new file mode 100644
index 0000000..0a8c01a
--- /dev/null
+++ b/xorg-x11-drv-nouveau/xorg-x11-drv-nouveau.nm
@@ -0,0 +1,64 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = xorg-x11-drv-nouveau
+version = 1.0.6
+release = 1
+
+maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
+groups = X/Driver
+url = http://www.x.org/
+license = MIT
+summary = Xorg X11 nouveau video driver.
+
+description
+ X.Org X11 nv video driver.
+end
+
+# Specify the X Server version to build for.
+x11_server_ver = 1.13.2
+
+thisapp = xf86-video-nouveau-%{version}
+
+source_dl = http://ftp.x.org/pub/individual/driver/
+
+build
+ requires
+ libX11-devel
+ libdrm-devel
+ libudev-devel
+ mesa-devel >= 9.0.2
+ pkg-config
+ xorg-x11-proto-devel
+ xorg-x11-server-devel >= %{x11_server_ver}
+ xorg-x11-util-macros
+ end
+
+ CFLAGS += -Wl,-z,lazy
+
+ configure_options += \
+ --disable-static
+end
+
+quality-agent
+ permit_not_full_relro = yes
+end
+
+packages
+ package %{name}
+ obsoletes
+ xorg-x11-drv-nv
+ end
+
+ requires
+ dri-drivers >= 9.0.2
+ xorg-x11-server >= %{x11_server_ver}
+ end
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
diff --git a/xorg-x11-drv-nv/patches/nv-2.1.6-panel-fix.patch b/xorg-x11-drv-nv/patches/nv-2.1.6-panel-fix.patch
deleted file mode 100644
index afe2e5a..0000000
--- a/xorg-x11-drv-nv/patches/nv-2.1.6-panel-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up xf86-video-nv-2.1.6/src/nv_setup.c.jx xf86-video-nv-2.1.6/src/nv_setup.c
---- xf86-video-nv-2.1.6/src/nv_setup.c.jx 2007-09-17 17:17:51.000000000 -0400
-+++ xf86-video-nv-2.1.6/src/nv_setup.c 2008-02-12 10:19:54.000000000 -0500
-@@ -668,27 +668,14 @@ NVCommonSetup(ScrnInfoPtr pScrn)
- }
-
- if(monitorA) {
-- if((monitorA->features.input_type && pNv->FlatPanel) ||
-- (!monitorA->features.input_type && !pNv->FlatPanel))
-- {
-- if(monitorB) {
-- free(monitorB);
-- monitorB = NULL;
-- }
-- } else {
-- free(monitorA);
-- monitorA = NULL;
-- }
-+ if(monitorB) {
-+ free(monitorB);
-+ monitorB = NULL;
-+ }
- }
-
- if(monitorB) {
-- if((monitorB->features.input_type && !pNv->FlatPanel) ||
-- (!monitorB->features.input_type && pNv->FlatPanel))
-- {
-- free(monitorB);
-- } else {
-- monitorA = monitorB;
-- }
-+ monitorA = monitorB;
- monitorB = NULL;
- }
-
diff --git a/xorg-x11-drv-nv/patches/nv-2.1.6-starvation.patch b/xorg-x11-drv-nv/patches/nv-2.1.6-starvation.patch
deleted file mode 100644
index ca00e61..0000000
--- a/xorg-x11-drv-nv/patches/nv-2.1.6-starvation.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up xf86-video-nv-2.1.6/src/nv_driver.c.jx xf86-video-nv-2.1.6/src/nv_driver.c
---- xf86-video-nv-2.1.6/src/nv_driver.c.jx 2007-09-26 20:59:50.000000000 -0400
-+++ xf86-video-nv-2.1.6/src/nv_driver.c 2008-01-22 16:11:24.000000000 -0500
-@@ -1148,12 +1148,19 @@ NVFreeScreen(int scrnIndex, int flags)
- static ModeStatus
- NVValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
- {
-- NVPtr pNv = NVPTR(xf86Screens[scrnIndex]);
-+ ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+ NVPtr pNv = NVPTR(pScrn);
-
- if(pNv->fpWidth && pNv->fpHeight)
- if((pNv->fpWidth < mode->HDisplay) || (pNv->fpHeight < mode->VDisplay))
- return (MODE_PANEL);
-
-+ /* avoid starving the chip on scanout */
-+ if (pNv->Architecture == NV_ARCH_04 &&
-+ (mode->HDisplay * mode->VDisplay * (pScrn->bitsPerPixel / 8) >
-+ pScrn->videoRam * 952)) /* 1024 * 0.93, yay magic numbers */
-+ return MODE_BANDWIDTH;
-+
- return (MODE_OK);
- }
-
diff --git a/xorg-x11-drv-nv/patches/nv-2.1.8-g80-no-doublescan.patch b/xorg-x11-drv-nv/patches/nv-2.1.8-g80-no-doublescan.patch
deleted file mode 100644
index 6c75db1..0000000
--- a/xorg-x11-drv-nv/patches/nv-2.1.8-g80-no-doublescan.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up xf86-video-nv-2.1.8/src/g80_dac.c.jx xf86-video-nv-2.1.8/src/g80_dac.c
---- xf86-video-nv-2.1.8/src/g80_dac.c.jx 2008-01-29 20:55:21.000000000 -0500
-+++ xf86-video-nv-2.1.8/src/g80_dac.c 2008-04-29 16:44:08.000000000 -0400
-@@ -205,7 +205,7 @@ G80CreateDac(ScrnInfoPtr pScrn, ORNum or
- pPriv->set_pclk = G80DacSetPClk;
- output->driver_private = pPriv;
- output->interlaceAllowed = TRUE;
-- output->doubleScanAllowed = TRUE;
-+ output->doubleScanAllowed = FALSE;
-
- return output;
- }
-diff -up xf86-video-nv-2.1.8/src/g80_sor.c.jx xf86-video-nv-2.1.8/src/g80_sor.c
---- xf86-video-nv-2.1.8/src/g80_sor.c.jx 2008-03-06 15:33:15.000000000 -0500
-+++ xf86-video-nv-2.1.8/src/g80_sor.c 2008-04-29 16:44:16.000000000 -0400
-@@ -510,7 +510,7 @@ G80CreateSor(ScrnInfoPtr pScrn, ORNum or
- pPriv->set_pclk = G80SorSetPClk;
- output->driver_private = pPriv;
- output->interlaceAllowed = TRUE;
-- output->doubleScanAllowed = TRUE;
-+ output->doubleScanAllowed = FALSE;
-
- return output;
- }
diff --git a/xorg-x11-drv-nv/patches/nv-reserve-fbarea.patch b/xorg-x11-drv-nv/patches/nv-reserve-fbarea.patch
deleted file mode 100644
index b86b83c..0000000
--- a/xorg-x11-drv-nv/patches/nv-reserve-fbarea.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 4bcc391..6252dd2 100644
---- a/src/nv_driver.c
-+++ b/src/nv_driver.c
-@@ -32,6 +32,8 @@
- #include "xf86int10.h"
- #include "vbeModes.h"
-
-+#define NV_ALIGN(x,bytes) (((x) + ((bytes) - 1)) & ~((bytes) - 1))
-+
- const OptionInfoRec * RivaAvailableOptions(int chipid, int busid);
- Bool RivaGetScrnInfoRec(PciChipsets *chips, int chip);
- Bool G80GetScrnInfoRec(PciChipsets *chips, int chip);
-@@ -2266,7 +2268,7 @@ NVScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- unsigned char *FBStart;
- int width, height, displayWidth, offscreenHeight, shadowHeight;
- BoxRec AvailFBArea;
--
-+ FBAreaPtr fbarea;
- /*
- * First get the ScrnInfoRec
- */
-@@ -2421,7 +2423,31 @@ NVScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- AvailFBArea.y1 = 0;
- AvailFBArea.x2 = pScrn->displayWidth;
- AvailFBArea.y2 = offscreenHeight;
-- xf86InitFBManager(pScreen, &AvailFBArea);
-+
-+
-+ if (!xf86InitFBManager(pScreen, &AvailFBArea)) {
-+ xf86DrvMsg(scrnIndex, X_ERROR,
-+ "Memory manager initialized to (%d,%d) (%d,%d) failed\n",
-+ AvailFBArea.x1, AvailFBArea.y1, AvailFBArea.x2, AvailFBArea.y2);
-+ return FALSE;
-+ }
-+
-+ xf86DrvMsg(scrnIndex, X_INFO,
-+ "Memory manager initialized to (%d,%d) (%d,%d)\n",
-+ AvailFBArea.x1, AvailFBArea.y1, AvailFBArea.x2, AvailFBArea.y2);
-+
-+ if ((fbarea = xf86AllocateOffscreenArea(pScreen,
-+ pScrn->displayWidth,
-+ NV_ALIGN(pScrn->virtualY, 64) -
-+ pScrn->virtualY + 2,
-+ 0, NULL, NULL, NULL))) {
-+ xf86DrvMsg(scrnIndex, X_INFO,
-+ "Reserved area from (%d,%d) to (%d,%d)\n",
-+ fbarea->box.x1, fbarea->box.y1,
-+ fbarea->box.x2, fbarea->box.y2);
-+ } else {
-+ xf86DrvMsg(scrnIndex, X_ERROR, "Unable to reserve area\n");
-+ }
-
- if (!pNv->NoAccel)
- NVAccelInit(pScreen);
diff --git a/xorg-x11-drv-nv/patches/nv-save-rom.patch b/xorg-x11-drv-nv/patches/nv-save-rom.patch
deleted file mode 100644
index 98564ba..0000000
--- a/xorg-x11-drv-nv/patches/nv-save-rom.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -up xf86-video-nv-2.1.14/src/g80_driver.c.da xf86-video-nv-2.1.14/src/g80_driver.c
---- xf86-video-nv-2.1.14/src/g80_driver.c.da 2009-08-04 16:03:45.000000000 +1000
-+++ xf86-video-nv-2.1.14/src/g80_driver.c 2009-08-04 16:04:06.000000000 +1000
-@@ -27,6 +27,9 @@
- #endif
-
- #include <string.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
-
- #include <xf86.h>
- #include <xf86_OSproc.h>
-@@ -163,6 +166,7 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
- char *s;
- CARD32 tmp;
- memType BAR1sizeKB;
-+ int fd;
-
- if(flags & PROBE_DETECT)
- return TRUE;
-@@ -390,6 +394,14 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
- else
- pNv->table1 -= 0x10000;
-
-+ /* Gag me with a horse */
-+
-+ fd = open ("/var/run/video.rom", O_CREAT|O_RDWR|O_EXCL, 0700);
-+ if(fd != -1) {
-+ write (fd, pNv->table1, 0x10000);
-+ close (fd);
-+ }
-+
- xf86CrtcConfigInit(pScrn, &randr12_screen_funcs);
- xf86CrtcSetSizeRange(pScrn, 320, 200, 8192, 8192);
-
-@@ -939,6 +951,8 @@ G80EnterVT(int scrnIndex, int flags)
- ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
- G80Ptr pNv = G80PTR(pScrn);
-
-+ G80DispPreInit(pScrn);
-+
- /* Reinit the hardware */
- if(pNv->xaa)
- G80InitHW(pScrn);
diff --git a/xorg-x11-drv-nv/xorg-x11-drv-nv.nm b/xorg-x11-drv-nv/xorg-x11-drv-nv.nm
deleted file mode 100644
index af61d9e..0000000
--- a/xorg-x11-drv-nv/xorg-x11-drv-nv.nm
+++ /dev/null
@@ -1,59 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = xorg-x11-drv-nv
-version = 2.1.18
-release = 1
-
-maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
-groups = X/Driver
-url = http://www.x.org/
-license = MIT
-summary = Xorg X11 nv video driver.
-
-description
- X.Org X11 nv video driver.
-end
-
-source_dl = http://ftp.x.org/pub/individual/driver/
-sources = xf86-video-nv-%{version}.tar.bz2
-
-build
- requires
- autoconf
- automake
- libX11-devel
- libdrm-devel
- libtool
- pkg-config
- xorg-x11-proto-devel
- xorg-x11-server-devel
- xorg-x11-util-macros
- end
-
- DIR_APP = %{DIR_SRC}/xf86-video-nv-%{version}
-
- CFLAGS += -Wl,-z,lazy
-
- configure_options += \
- --disable-static
-
- prepare_cmds
- autoreconf -vi
- end
-end
-
-quality-agent
- permit_not_full_relro = yes
-end
-
-packages
- package %{name}
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm b/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm
index eee113a..4215f03 100644
--- a/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm
+++ b/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm
@@ -4,7 +4,7 @@
###############################################################################
name = xorg-x11-drv-vesa
-version = 2.3.0
+version = 2.3.2
release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -17,23 +17,23 @@ description
X.Org X11 vesa video driver.
end
-source_dl = http://ftp.x.org/pub/individual/driver/
-sources = xf86-video-vesa-%{version}.tar.bz2
+# Specify the X Server version to build for.
+x11_server_ver = 1.13.2
+
+thisapp = xf86-video-vesa-%{version}
-DIR_APP = $(DIR_SRC)/xf86-video-vesa-$(PKG_VER)
+source_dl = http://ftp.x.org/pub/individual/driver/
build
requires
libX11-devel
- libpciaccess-devel
+ libpciaccess-devel >= 0.13.1
pkg-config
xorg-x11-proto-devel
- xorg-x11-server-devel
+ xorg-x11-server-devel >= %{x11_server_ver}
xorg-x11-util-macros
end
- DIR_APP = %{DIR_SRC}/xf86-video-vesa-%{version}
-
CFLAGS += -Wl,-z,lazy
configure_options += \
@@ -46,6 +46,9 @@ end
packages
package %{name}
+ requires
+ xorg-x11-server >= %{x11_server_ver}
+ end
end
package %{name}-debuginfo
diff --git a/xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm b/xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm
index 15d6eaa..795f718 100644
--- a/xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm
+++ b/xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm
@@ -4,7 +4,7 @@
###############################################################################
name = xorg-x11-drv-vmware
-version = 11.0.2
+version = 13.0.0
release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -17,8 +17,12 @@ description
X.Org X11 vmware video driver.
end
+# Specify the X Server version to build for.
+x11_server_ver = 1.13.2
+
+thisapp = xf86-video-vmware-%{version}
+
source_dl = http://ftp.x.org/pub/individual/driver/
-sources = xf86-video-vmware-%{version}.tar.bz2
build
requires
@@ -27,13 +31,10 @@ build
libpciaccess-devel
pkg-config
xorg-x11-proto-devel
- xorg-x11-server-devel
+ xorg-x11-server-devel >= %{x11_server_ver}
xorg-x11-util-macros
end
-
- DIR_APP = %{DIR_SRC}/xf86-video-vmware-%{version}
-
CFLAGS += -Wl,-z,lazy
configure_options += \
@@ -46,6 +47,9 @@ end
packages
package %{name}
+ requires
+ xorg-x11-server >= %{x11_server_ver}
+ end
end
package %{name}-debuginfo
diff --git a/xorg-x11-proto-devel/xorg-x11-proto-devel.nm b/xorg-x11-proto-devel/xorg-x11-proto-devel.nm
index ec1eb9c..ee53046 100644
--- a/xorg-x11-proto-devel/xorg-x11-proto-devel.nm
+++ b/xorg-x11-proto-devel/xorg-x11-proto-devel.nm
@@ -4,7 +4,7 @@
###############################################################################
name = xorg-x11-proto-devel
-version = 7.6
+version = 7.7
release = 1
arch = noarch
@@ -18,8 +18,6 @@ description
Development headers for X.org X11 protocol.
end
-build_requires += pkg-config
-
source_dl = http://ftp.x.org/pub/individual/proto/
sources = \
bigreqsproto-1.1.2.tar.bz2 \
@@ -31,7 +29,7 @@ sources = \
fixesproto-5.0.tar.bz2 \
fontsproto-2.1.2.tar.bz2 \
glproto-1.4.16.tar.bz2 \
- inputproto-2.2.tar.bz2 \
+ inputproto-2.2.99.1.tar.bz2 \
kbproto-1.0.6.tar.bz2 \
randrproto-1.4.0.tar.bz2 \
recordproto-1.14.2.tar.bz2 \
@@ -51,6 +49,11 @@ sources = \
xproxymanagementprotocol-1.0.3.tar.bz2
build
+ requires
+ pkg-config
+ xorg-x11-util-macros
+ end
+
prepare
# Extract all source tarballs.
for object in %{sources}; do
diff --git a/xorg-x11-server/patches/xserver-1.12-Xext-fix-selinux-build-failure.patch b/xorg-x11-server/patches/xserver-1.12-Xext-fix-selinux-build-failure.patch
new file mode 100644
index 0000000..a48a013
--- /dev/null
+++ b/xorg-x11-server/patches/xserver-1.12-Xext-fix-selinux-build-failure.patch
@@ -0,0 +1,52 @@
+From 5d16c39108c72b08478b6bd548494d6c675495ee Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer(a)who-t.net>
+Date: Wed, 4 Jan 2012 09:31:51 +1000
+Subject: [PATCH 6/7] Xext: fix selinux build failure
+
+The server builds with -Werror=missing-braces, causing
+
+xselinux_hooks.c: In function 'SELinuxFlaskInit':
+xselinux_hooks.c:851:12: error: missing braces around initializer
+[-Werror=missing-braces]
+xselinux_hooks.c:851:12: error: (near initialization for
+'avc_option.<anonymous>') [-Werror=missing-braces]
+cc1: some warnings being treated as errors
+
+Source is libselinux' libselinux-rhat.patch which changes struct selinux_opt
+from { int, char * } to { int, union { char*, char** }}.
+
+Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
+---
+ Xext/xselinux_hooks.c | 2 +-
+ Xext/xselinux_label.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Xext/xselinux_hooks.c b/Xext/xselinux_hooks.c
+index e9c7e93..0302f2f 100644
+--- a/Xext/xselinux_hooks.c
++++ b/Xext/xselinux_hooks.c
+@@ -851,7 +851,7 @@ SELinuxFlaskReset(void)
+ void
+ SELinuxFlaskInit(void)
+ {
+- struct selinux_opt avc_option = { AVC_OPT_SETENFORCE, (char *) 0 };
++ struct selinux_opt avc_option = { AVC_OPT_SETENFORCE, { (char *) 0 } };
+ security_context_t ctx;
+ int ret = TRUE;
+
+diff --git a/Xext/xselinux_label.c b/Xext/xselinux_label.c
+index 2c33d1c..81f2f36 100644
+--- a/Xext/xselinux_label.c
++++ b/Xext/xselinux_label.c
+@@ -361,7 +361,7 @@ SELinuxDefaultClientLabel(void)
+ void
+ SELinuxLabelInit(void)
+ {
+- struct selinux_opt selabel_option = { SELABEL_OPT_VALIDATE, (char *) 1 };
++ struct selinux_opt selabel_option = { SELABEL_OPT_VALIDATE, { (char *)1 } };
+
+ label_hnd = selabel_open(SELABEL_CTX_X, &selabel_option, 1);
+ if (!label_hnd)
+--
+1.7.10.1
+
diff --git a/xorg-x11-server/patches/xserver-1.4.99-pic-libxf86config.patch b/xorg-x11-server/patches/xserver-1.4.99-pic-libxf86config.patch
deleted file mode 100644
index d040900..0000000
--- a/xorg-x11-server/patches/xserver-1.4.99-pic-libxf86config.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 04bd8e2fa6be557f58a0e417b0f3befc56f5ef59 Mon Sep 17 00:00:00 2001
-From: Fedora X Ninjas <x(a)fedoraproject.org>
-Date: Thu, 1 Jul 2010 15:45:03 +1000
-Subject: [PATCH] Build libxf86config with -fPIC.
-
----
- hw/xfree86/parser/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am
-index caf7079..655e73f 100644
---- a/hw/xfree86/parser/Makefile.am
-+++ b/hw/xfree86/parser/Makefile.am
-@@ -32,7 +32,7 @@ libxf86config_internal_la_SOURCES = \
-
- libxf86config_a_SOURCES = \
- $(INTERNAL_SOURCES)
--libxf86config_a_CFLAGS = $(AM_CFLAGS)
-+libxf86config_a_CFLAGS = $(AM_CFLAGS) -fPIC -fvisibility=hidden
-
- AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) \
- -DSYSCONFDIR=\"$(sysconfdir)\" \
---
-1.7.1
-
diff --git a/xorg-x11-server/patches/xserver-1.4.99-ssh-isnt-local.patch b/xorg-x11-server/patches/xserver-1.4.99-ssh-isnt-local.patch
index d532fe1..2d33bed 100644
--- a/xorg-x11-server/patches/xserver-1.4.99-ssh-isnt-local.patch
+++ b/xorg-x11-server/patches/xserver-1.4.99-ssh-isnt-local.patch
@@ -1,22 +1,22 @@
-From 4306b434038de7e2b17d3c4a6cfd87db469d3bda Mon Sep 17 00:00:00 2001
+From 66a3b14e118e90db80f96fcab52af4df35bc2377 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax(a)redhat.com>
Date: Mon, 10 Dec 2007 11:26:57 -0500
Subject: [PATCH] Hack for proper MIT-SHM rejection for ssh-forwarded clients.
---
- Xext/shm.c | 15 +++++++++++++++
- 1 files changed, 15 insertions(+), 0 deletions(-)
+ Xext/shm.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
diff --git a/Xext/shm.c b/Xext/shm.c
-index 5937a03..5376c19 100644
+index de48020..c011210 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
-@@ -381,8 +381,21 @@
+@@ -321,8 +321,21 @@ shm_access(ClientPtr client, SHMPERM_TYPE * perm, int readonly)
mode_t mask;
int uidset = 0, gidset = 0;
LocalClientCredRec *lcc;
+ Bool is_ssh = FALSE;
-
+
if (GetLocalClientCreds(client, &lcc) != -1) {
+#ifdef linux
+ if (lcc->fieldsSet & LCC_PID_SET) {
@@ -31,18 +31,18 @@ index 5937a03..5376c19 100644
+ }
+#endif
- if (lcc->fieldsSet & LCC_UID_SET) {
- uid = lcc->euid;
-@@ -401,6 +414,9 @@
- }
+ if (lcc->fieldsSet & LCC_UID_SET) {
+ uid = lcc->euid;
+@@ -342,6 +355,9 @@ shm_access(ClientPtr client, SHMPERM_TYPE * perm, int readonly)
#endif
- FreeLocalClientCreds(lcc);
+ FreeLocalClientCreds(lcc);
+
++ if (is_ssh)
++ return -1;
+
-+ if (is_ssh)
-+ return -1;
-
- if (uidset) {
- /* User id 0 always gets access */
+ if (uidset) {
+ /* User id 0 always gets access */
+ if (uid == 0) {
--
-1.5.3.4
+1.7.10.1
diff --git a/xorg-x11-server/patches/xserver-1.5.0-bg-none-root.patch b/xorg-x11-server/patches/xserver-1.5.0-bg-none-root.patch
deleted file mode 100644
index ae65d0b..0000000
--- a/xorg-x11-server/patches/xserver-1.5.0-bg-none-root.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From eff3bb9c6f0b71a57705885a3fe6e6469d252d2b Mon Sep 17 00:00:00 2001
-From: Fedora X Ninjas <x(a)fedoraproject.org>
-Date: Wed, 20 Jan 2010 14:46:12 +1300
-Subject: [PATCH] Add nr for background=none root
-
----
- dix/globals.c | 1 +
- dix/window.c | 12 +++++++-----
- hw/xfree86/common/xf86Init.c | 11 +++++++++++
- hw/xfree86/common/xf86str.h | 5 ++++-
- include/opaque.h | 1 +
- os/utils.c | 3 +++
- 6 files changed, 27 insertions(+), 6 deletions(-)
-
-diff --git a/dix/globals.c b/dix/globals.c
-index c24a94f..907a5e8 100644
---- a/dix/globals.c
-+++ b/dix/globals.c
-@@ -124,6 +124,7 @@ FontPtr defaultFont; /* not declared in dix.h to avoid including font.h in
- CursorPtr rootCursor;
- Bool party_like_its_1989 = FALSE;
- Bool whiteRoot = FALSE;
-+Bool bgNoneRoot = FALSE;
-
- int cursorScreenDevPriv[MAXSCREENS];
-
-diff --git a/dix/window.c b/dix/window.c
-index caff1cb..be1d1c4 100644
---- a/dix/window.c
-+++ b/dix/window.c
-@@ -466,22 +466,24 @@ InitRootWindow(WindowPtr pWin)
- pWin->optional->cursor = rootCursor;
- rootCursor->refcnt++;
-
-+ pWin->backingStore = defaultBackingStore;
-+ pWin->forcedBS = (defaultBackingStore != NotUseful);
-
- if (party_like_its_1989) {
- MakeRootTile(pWin);
- backFlag |= CWBackPixmap;
-+ pScreen->ChangeWindowAttributes(pWin, backFlag);
-+ } else if (bgNoneRoot) {
-+ /* nothing, handled in xf86CreateRootWindow */
- } else {
- if (whiteRoot)
- pWin->background.pixel = pScreen->whitePixel;
- else
- pWin->background.pixel = pScreen->blackPixel;
- backFlag |= CWBackPixel;
-- }
-
-- pWin->backingStore = defaultBackingStore;
-- pWin->forcedBS = (defaultBackingStore != NotUseful);
-- /* We SHOULD check for an error value here XXX */
-- (*pScreen->ChangeWindowAttributes)(pWin, backFlag);
-+ pScreen->ChangeWindowAttributes(pWin, backFlag);
-+ }
-
- MapWindow(pWin, serverClient);
- }
-diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
-index 6707448..776b898 100644
---- a/hw/xfree86/common/xf86Init.c
-+++ b/hw/xfree86/common/xf86Init.c
-@@ -77,6 +77,7 @@
- #ifdef RENDER
- #include "picturestr.h"
- #endif
-+#include "xace.h"
-
- #include "xf86VGAarbiter.h"
- #include "globals.h"
-@@ -254,6 +255,7 @@ xf86CreateRootWindow(WindowPtr pWin)
- int ret = TRUE;
- int err = Success;
- ScreenPtr pScreen = pWin->drawable.pScreen;
-+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- RootWinPropPtr pProp;
- CreateWindowProcPtr CreateWindow = (CreateWindowProcPtr)
- dixLookupPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey);
-@@ -305,6 +307,15 @@ xf86CreateRootWindow(WindowPtr pWin)
- }
- }
-
-+ if (bgNoneRoot && pScrn->canDoBGNoneRoot) {
-+ pWin->backgroundState = XaceBackgroundNoneState(pWin);
-+ pWin->background.pixel = pScreen->whitePixel;
-+ pScreen->ChangeWindowAttributes(pWin, CWBackPixmap | CWBorderPixel | CWCursor | CWBackingStore);
-+ } else {
-+ pWin->background.pixel = pScreen->blackPixel;
-+ pScreen->ChangeWindowAttributes(pWin, CWBackPixel | CWBorderPixel | CWCursor | CWBackingStore);
-+ }
-+
- DebugF("xf86CreateRootWindow() returns %d\n", ret);
- return (ret);
- }
-diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
-index de1f1b6..5c3aa00 100644
---- a/hw/xfree86/common/xf86str.h
-+++ b/hw/xfree86/common/xf86str.h
-@@ -503,7 +503,7 @@ typedef struct _confdrirec {
- } confDRIRec, *confDRIPtr;
-
- /* These values should be adjusted when new fields are added to ScrnInfoRec */
--#define NUM_RESERVED_INTS 16
-+#define NUM_RESERVED_INTS 15
- #define NUM_RESERVED_POINTERS 14
- #define NUM_RESERVED_FUNCS 11
-
-@@ -775,6 +775,9 @@ typedef struct _ScrnInfoRec {
- ClockRangePtr clockRanges;
- int adjustFlags;
-
-+ /* -nr support */
-+ int canDoBGNoneRoot;
-+
- /*
- * These can be used when the minor ABI version is incremented.
- * The NUM_* parameters must be reduced appropriately to keep the
-diff --git a/include/opaque.h b/include/opaque.h
-index b3c7c70..fcc8c95 100644
---- a/include/opaque.h
-+++ b/include/opaque.h
-@@ -71,6 +71,7 @@ extern _X_EXPORT Bool defeatAccessControl;
- extern _X_EXPORT long maxBigRequestSize;
- extern _X_EXPORT Bool party_like_its_1989;
- extern _X_EXPORT Bool whiteRoot;
-+extern _X_EXPORT Bool bgNoneRoot;
-
- extern _X_EXPORT Bool CoreDump;
-
-diff --git a/os/utils.c b/os/utils.c
-index d7c8388..40583d0 100644
---- a/os/utils.c
-+++ b/os/utils.c
-@@ -513,6 +513,7 @@ void UseMsg(void)
- #endif
- ErrorF("-nolisten string don't listen on protocol\n");
- ErrorF("-noreset don't reset after last client exists\n");
-+ ErrorF("-nr create root window with no background\n");
- ErrorF("-reset reset after last client exists\n");
- ErrorF("-p # screen-saver pattern duration (minutes)\n");
- ErrorF("-pn accept failure to listen on all ports\n");
-@@ -856,6 +857,8 @@ ProcessCommandLine(int argc, char *argv[])
- defaultBackingStore = WhenMapped;
- else if ( strcmp( argv[i], "-wr") == 0)
- whiteRoot = TRUE;
-+ else if ( strcmp( argv[i], "-nr") == 0)
-+ bgNoneRoot = TRUE;
- else if ( strcmp( argv[i], "-maxbigreqsize") == 0) {
- if(++i < argc) {
- long reqSizeArg = atol(argv[i]);
---
-1.6.6
-
diff --git a/xorg-x11-server/patches/xserver-1.5.0-projector-fb-size.patch b/xorg-x11-server/patches/xserver-1.5.0-projector-fb-size.patch
deleted file mode 100644
index c6178b8..0000000
--- a/xorg-x11-server/patches/xserver-1.5.0-projector-fb-size.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From dc5cedd61e00afec33cbfaa7fdfbb6c357074dbd Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= <sandmann(a)redhat.com>
-Date: Thu, 11 Sep 2008 12:51:31 -0400
-Subject: [PATCH] Make room for an external monitor if we have enough video RAM
-
----
- hw/xfree86/modes/xf86Crtc.c | 9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index 4de7e05..9bcf81b 100644
---- a/hw/xfree86/modes/xf86Crtc.c
-+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -987,6 +987,15 @@ xf86DefaultScreenLimits (ScrnInfoPtr scrn, int *widthp, int *heightp,
- if (crtc_height > height)
- height = crtc_height;
- }
-+
-+ /* Make room for an external monitor if we have enough video ram */
-+ if (scrn->videoRam >= 65536)
-+ width += 1920;
-+ else if (scrn->videoRam >= 32768)
-+ width += 1280;
-+ else if (scrn->videoRam >= 16384)
-+ width += 1024;
-+
- if (config->maxWidth && width > config->maxWidth) width = config->maxWidth;
- if (config->maxHeight && height > config->maxHeight) height = config->maxHeight;
- if (config->minWidth && width < config->minWidth) width = config->minWidth;
---
-1.6.0.1
-
diff --git a/xorg-x11-server/patches/xserver-1.5.1-mode-debug.patch b/xorg-x11-server/patches/xserver-1.5.1-mode-debug.patch
deleted file mode 100644
index 11fe5ad..0000000
--- a/xorg-x11-server/patches/xserver-1.5.1-mode-debug.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 079910986a1b8f5042e16ee2ba3ad9ed843b67ca Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax(a)redhat.com>
-Date: Tue, 7 Oct 2008 11:09:14 -0400
-Subject: [PATCH] Force ModeDebug on.
-
----
- hw/xfree86/modes/xf86Crtc.c | 3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index 9bcf81b..a953c8a 100644
---- a/hw/xfree86/modes/xf86Crtc.c
-+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -2084,8 +2084,7 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
- xf86ProcessOptions (scrn->scrnIndex,
- scrn->options,
- config->options);
-- config->debug_modes = xf86ReturnOptValBool (config->options,
-- OPTION_MODEDEBUG, FALSE);
-+ config->debug_modes = TRUE;
-
- if (scrn->display->virtualX)
- width = scrn->display->virtualX;
---
-1.6.0.1
-
diff --git a/xorg-x11-server/patches/xserver-1.6.0-less-acpi-brokenness.patch b/xorg-x11-server/patches/xserver-1.6.0-less-acpi-brokenness.patch
index cc80e6c..b42c2d7 100644
--- a/xorg-x11-server/patches/xserver-1.6.0-less-acpi-brokenness.patch
+++ b/xorg-x11-server/patches/xserver-1.6.0-less-acpi-brokenness.patch
@@ -1,31 +1,25 @@
-From a8079882f1884edc62a9de28af915bd8b65dfbbe Mon Sep 17 00:00:00 2001
+From 0002cde5312e785529b2901d7f8a82d5623e4ca7 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax(a)redhat.com>
-Date: Wed, 11 Mar 2009 14:02:11 -0400
-Subject: [PATCH] Don't build the ACPI code.
+Date: Wed, 9 Nov 2011 11:52:06 +1000
+Subject: [PATCH 2/7] Don't build the ACPI code.
No good can come of this.
---
- configure.ac | 2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
+ configure.ac | 1 -
+ 1 file changed, 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index 72ae67e..04716f8 100644
+index a12783c..54f4464 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1269,13 +1269,11 @@ if test "x$XORG" = xyes; then
- case $host_cpu in
- ia64*)
- linux_ia64=yes
-- linux_acpi="yes"
- ;;
- alpha*)
+@@ -1620,7 +1620,6 @@ if test "x$XORG" = xyes; then
linux_alpha=yes
;;
- i*86|amd64*|x86_64*)
+ i*86|amd64*|x86_64*|ia64*)
- linux_acpi="yes"
;;
*)
;;
--
-1.6.1.3
+1.7.10.1
diff --git a/xorg-x11-server/patches/xserver-1.6.99-default-modes.patch b/xorg-x11-server/patches/xserver-1.6.99-default-modes.patch
deleted file mode 100644
index 0f0ba27..0000000
--- a/xorg-x11-server/patches/xserver-1.6.99-default-modes.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From ca85ebddd804305322014c6a71b4122a56c5e634 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax(a)redhat.com>
-Date: Thu, 4 Mar 2010 15:18:38 +1000
-Subject: [PATCH] tweak default mode list yet again
-
----
- hw/xfree86/modes/xf86Crtc.c | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index 03277be..571ffd0 100644
---- a/hw/xfree86/modes/xf86Crtc.c
-+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -1582,7 +1582,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
- int min_clock = 0;
- int max_clock = 0;
- double clock;
-- Bool add_default_modes = TRUE;
-+ Bool add_default_modes;
- Bool debug_modes = config->debug_modes ||
- xf86Initialising;
- enum det_monrec_source sync_source = sync_default;
-@@ -1628,6 +1628,9 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
- }
-
- output_modes = (*output->funcs->get_modes) (output);
-+
-+ /* if the driver found modes, don't second-guess it */
-+ add_default_modes = (output_modes == NULL);
-
- edid_monitor = output->MonInfo;
-
---
-1.6.6.1
-
diff --git a/xorg-x11-server/patches/xserver-1.6.99-randr-error-debugging.patch b/xorg-x11-server/patches/xserver-1.6.99-randr-error-debugging.patch
deleted file mode 100644
index 0e7a6ba..0000000
--- a/xorg-x11-server/patches/xserver-1.6.99-randr-error-debugging.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 16be69ef1e2ea9f19cd596b99b5ede7567d374b8 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax(a)redhat.com>
-Date: Mon, 27 Jul 2009 16:52:42 -0400
-Subject: [PATCH 11/16] additional randr debugging
-
----
- randr/randr.c | 16 +++++++++++++++-
- 1 files changed, 15 insertions(+), 1 deletions(-)
-
-diff --git a/randr/randr.c b/randr/randr.c
-index 1c1d0c4..accf614 100644
---- a/randr/randr.c
-+++ b/randr/randr.c
-@@ -477,10 +477,24 @@ RRVerticalRefresh (xRRModeInfo *mode)
- static int
- ProcRRDispatch (ClientPtr client)
- {
-+ int ret;
- REQUEST(xReq);
- if (stuff->data >= RRNumberRequests || !ProcRandrVector[stuff->data])
- return BadRequest;
-- return (*ProcRandrVector[stuff->data]) (client);
-+ ret = ProcRandrVector[stuff->data](client);
-+
-+ if (ret) {
-+ int i;
-+ ErrorF("RANDR failure: %d (extension base %d)\n", ret, RRErrorBase);
-+ for (i = 0; i < stuff->length; i++) {
-+ ErrorF("%08x ", ((unsigned int *)stuff) + i);
-+ if ((i+1) % 4 == 0)
-+ ErrorF("\n");
-+ }
-+ ErrorF("\n");
-+ }
-+
-+ return ret;
- }
-
- static int
---
-1.6.4.2
-
diff --git a/xorg-x11-server/patches/xserver-1.6.99-right-of.patch b/xorg-x11-server/patches/xserver-1.6.99-right-of.patch
index 06c1183..bf7e7c8 100644
--- a/xorg-x11-server/patches/xserver-1.6.99-right-of.patch
+++ b/xorg-x11-server/patches/xserver-1.6.99-right-of.patch
@@ -1,47 +1,37 @@
-From 1766ae8a69daa06730e41d094fdddf53db3a1a9e Mon Sep 17 00:00:00 2001
+From 291bc9f827188461ff9717efccec1e350db537e8 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax(a)redhat.com>
Date: Tue, 28 Jul 2009 11:07:13 -0400
-Subject: [PATCH] RANDR: right-of placement by default
+Subject: [PATCH 3/7] RANDR: right-of placement by default
[Enhanced to add a new prefer clone option for drivers. This
allows for servers like RN50 where two heads are disjoint. - airlied]
-
-[Enhanced to ignore rightof on single crtc cards - airlied]
---
- hw/xfree86/common/xf86str.h | 9 ++++-
- hw/xfree86/modes/xf86Crtc.c | 77 +++++++++++++++++++++++++++++++++++++++----
- 2 files changed, 77 insertions(+), 9 deletions(-)
+ hw/xfree86/common/xf86str.h | 8 ++++-
+ hw/xfree86/modes/xf86Crtc.c | 76 ++++++++++++++++++++++++++++++++++++++-----
+ 2 files changed, 75 insertions(+), 9 deletions(-)
diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h
-index 5c3aa00..8224668 100644
+index 0590262..d246634 100644
--- a/hw/xfree86/common/xf86str.h
+++ b/hw/xfree86/common/xf86str.h
-@@ -503,10 +503,13 @@ typedef struct _confdrirec {
+@@ -508,10 +508,13 @@ typedef struct _confdrirec {
} confDRIRec, *confDRIPtr;
/* These values should be adjusted when new fields are added to ScrnInfoRec */
--#define NUM_RESERVED_INTS 15
-+#define NUM_RESERVED_INTS 14
+-#define NUM_RESERVED_INTS 16
++#define NUM_RESERVED_INTS 15
#define NUM_RESERVED_POINTERS 14
- #define NUM_RESERVED_FUNCS 11
+ #define NUM_RESERVED_FUNCS 10
+/* let clients know they can use this */
+#define XF86_SCRN_HAS_PREFER_CLONE 1
+
- typedef pointer (*funcPointer)(void);
+ typedef pointer (*funcPointer) (void);
/* flags for depth 24 pixmap options */
-@@ -672,7 +675,6 @@ typedef void xf86SetOverscanProc (ScrnInfoPtr, int);
- * are to be dependent on compile-time defines.
- */
-
--
- typedef struct _ScrnInfoRec {
- int driverVersion;
- char * driverName; /* canonical name used in */
-@@ -778,6 +780,9 @@ typedef struct _ScrnInfoRec {
- /* -nr support */
- int canDoBGNoneRoot;
+@@ -769,6 +772,9 @@ typedef struct _ScrnInfoRec {
+ ClockRangePtr clockRanges;
+ int adjustFlags;
+ /* initial rightof support disable */
+ int preferClone;
@@ -50,26 +40,26 @@ index 5c3aa00..8224668 100644
* These can be used when the minor ABI version is incremented.
* The NUM_* parameters must be reduced appropriately to keep the
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index a66c979..4d14f57 100644
+index 154f684..c58088d 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -1146,6 +1146,15 @@ xf86InitialOutputPositions (ScrnInfoPtr scrn, DisplayModePtr *modes)
- int o;
- int min_x, min_y;
-
+@@ -1130,6 +1130,15 @@ xf86InitialOutputPositions(ScrnInfoPtr scrn, DisplayModePtr * modes)
+ int o;
+ int min_x, min_y;
+
+ /* check for initial right-of heuristic */
+ for (o = 0; o < config->num_output; o++)
+ {
-+ xf86OutputPtr output = config->output[o];
++ xf86OutputPtr output = config->output[o];
+
-+ if (output->initial_x || output->initial_y)
++ if (output->initial_x || output->initial_y)
+ return TRUE;
+ }
+
- for (o = 0; o < config->num_output; o++)
- {
- xf86OutputPtr output = config->output[o];
-@@ -2028,6 +2037,60 @@ bestModeForAspect(xf86CrtcConfigPtr config, Bool *enabled, float aspect)
+ for (o = 0; o < config->num_output; o++) {
+ xf86OutputPtr output = config->output[o];
+
+@@ -1998,6 +2007,57 @@ bestModeForAspect(xf86CrtcConfigPtr config, Bool *enabled, float aspect)
return match;
}
@@ -85,43 +75,40 @@ index a66c979..4d14f57 100644
+
+static Bool
+xf86TargetRightOf(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
-+ DisplayModePtr *modes, Bool *enabled,
-+ int width, int height)
++ DisplayModePtr *modes, Bool *enabled,
++ int width, int height)
+{
+ int o;
+ int w = 0;
+
-+ if (config->num_crtc == 1)
-+ return FALSE;
-+
+ if (scrn->preferClone)
-+ return FALSE;
++ return FALSE;
+
+ if (numEnabledOutputs(config, enabled) < 2)
-+ return FALSE;
++ return FALSE;
+
+ for (o = -1; nextEnabledOutput(config, enabled, &o); ) {
-+ DisplayModePtr mode =
-+ xf86OutputHasPreferredMode(config->output[o], width, height);
++ DisplayModePtr mode =
++ xf86OutputHasPreferredMode(config->output[o], width, height);
+
-+ if (!mode)
-+ return FALSE;
++ if (!mode)
++ return FALSE;
+
-+ w += mode->HDisplay;
++ w += mode->HDisplay;
+ }
+
+ if (w > width)
-+ return FALSE;
++ return FALSE;
+
+ w = 0;
+ for (o = -1; nextEnabledOutput(config, enabled, &o); ) {
-+ DisplayModePtr mode =
-+ xf86OutputHasPreferredMode(config->output[o], width, height);
++ DisplayModePtr mode =
++ xf86OutputHasPreferredMode(config->output[o], width, height);
+
-+ config->output[o]->initial_x = w;
-+ w += mode->HDisplay;
++ config->output[o]->initial_x = w;
++ w += mode->HDisplay;
+
-+ modes[o] = mode;
++ modes[o] = mode;
+ }
+
+ return TRUE;
@@ -129,44 +116,47 @@ index a66c979..4d14f57 100644
+
static Bool
xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
- DisplayModePtr *modes, Bool *enabled,
-@@ -2085,13 +2148,9 @@ xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
- * biggest mode for its aspect ratio, assuming one exists.
+ DisplayModePtr * modes, Bool *enabled,
+@@ -2074,14 +2134,10 @@ xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
*/
- if (!ret) do {
-- int i = 0;
- float aspect = 0.0;
+ if (!ret)
+ do {
+- int i = 0;
+ float aspect = 0.0;
+ DisplayModePtr a = NULL, b = NULL;
-- /* count the number of enabled outputs */
-- for (i = 0, p = -1; nextEnabledOutput(config, enabled, &p); i++) ;
+- /* count the number of enabled outputs */
+- for (i = 0, p = -1; nextEnabledOutput(config, enabled, &p); i++);
-
-- if (i != 1)
-+ if (numEnabledOutputs(config, enabled) != 1)
- break;
-
- p = -1;
-@@ -2378,6 +2437,8 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
+- if (i != 1)
++ if (numEnabledOutputs(config, enabled) != 1)
+ break;
- if (xf86TargetUserpref(scrn, config, modes, enabled, width, height))
- xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n");
-+ else if (xf86TargetRightOf(scrn, config, modes, enabled, width, height))
-+ xf86DrvMsg(i, X_INFO, "Using spanning desktop for initial modes\n");
- else if (xf86TargetPreferred(scrn, config, modes, enabled, width, height))
- xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n");
- else if (xf86TargetAspect(scrn, config, modes, enabled, width, height))
-@@ -2394,8 +2455,10 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
- config->output[o]->name);
- else
- xf86DrvMsg (scrn->scrnIndex, X_INFO,
-- "Output %s using initial mode %s\n",
-- config->output[o]->name, modes[o]->name);
-+ "Output %s using initial mode %s +%d+%d\n",
-+ config->output[o]->name, modes[o]->name,
+ p = -1;
+@@ -2385,6 +2441,8 @@ xf86InitialConfiguration(ScrnInfoPtr scrn, Bool canGrow)
+ else {
+ if (xf86TargetUserpref(scrn, config, modes, enabled, width, height))
+ xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n");
++ else if (xf86TargetRightOf(scrn, config, modes, enabled, width, height))
++ xf86DrvMsg(i, X_INFO, "Using spanning desktop for initial modes\n");
+ else if (xf86TargetPreferred
+ (scrn, config, modes, enabled, width, height))
+ xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n");
+@@ -2404,9 +2462,11 @@ xf86InitialConfiguration(ScrnInfoPtr scrn, Bool canGrow)
+ "Output %s enabled but has no modes\n",
+ config->output[o]->name);
+ else
+- xf86DrvMsg(scrn->scrnIndex, X_INFO,
+- "Output %s using initial mode %s\n",
+- config->output[o]->name, modes[o]->name);
++ xf86DrvMsg (scrn->scrnIndex, X_INFO,
++ "Output %s using initial mode %s +%d+%d\n",
++ config->output[o]->name, modes[o]->name,
+ config->output[o]->initial_x,
+ config->output[o]->initial_y);
}
/*
--
-1.7.0.1
+1.7.10.4
diff --git a/xorg-x11-server/patches/xserver-1.7.0-randr-gamma-restore.patch b/xorg-x11-server/patches/xserver-1.7.0-randr-gamma-restore.patch
deleted file mode 100644
index 5206141..0000000
--- a/xorg-x11-server/patches/xserver-1.7.0-randr-gamma-restore.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 18d2bd8cb513a0436739916620532247f13dbf03 Mon Sep 17 00:00:00 2001
-From: Fedora X Ninjas <x(a)fedoraproject.org>
-Date: Thu, 8 Oct 2009 15:25:24 -0400
-Subject: [PATCH] randr gamma reload hack
-
----
- hw/xfree86/loader/sdksyms.c | 4 ++++
- hw/xfree86/modes/xf86RandR12.c | 6 ++++++
- 2 files changed, 10 insertions(+), 0 deletions(-)
-
-diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
-index 6ea9d26..41bac11 100644
---- a/hw/xfree86/modes/xf86RandR12.c
-+++ b/hw/xfree86/modes/xf86RandR12.c
-@@ -1746,12 +1746,18 @@ xf86RandR12EnterVT (int screen_index, int flags)
- {
- ScreenPtr pScreen = screenInfo.screens[screen_index];
- XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
-+ rrScrPrivPtr rp = rrGetScrPriv(pScreen);
-
- if (randrp->orig_EnterVT) {
- if (!randrp->orig_EnterVT (screen_index, flags))
- return FALSE;
- }
-
-+ /* reload gamma */
-+ int i;
-+ for (i = 0; i < rp->numCrtcs; i++)
-+ xf86RandR12CrtcSetGamma(pScreen, rp->crtcs[i]);
-+
- return RRGetInfo (pScreen, TRUE); /* force a re-probe of outputs and notify clients about changes */
- }
-
---
-1.6.5.rc2
-
diff --git a/xorg-x11-server/patches/xserver-1.7.1-gamma-kdm-fix.patch b/xorg-x11-server/patches/xserver-1.7.1-gamma-kdm-fix.patch
deleted file mode 100644
index c62837e..0000000
--- a/xorg-x11-server/patches/xserver-1.7.1-gamma-kdm-fix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From acc64ce5be7383c09e88a23aab06ebc2403f2ca3 Mon Sep 17 00:00:00 2001
-From: Bill Nottingham <notting(a)redhat.com>
-Date: Fri, 6 Nov 2009 10:32:27 +1000
-Subject: [PATCH] fix KDM gamma issue on vt switch
-
----
- hw/xfree86/modes/xf86RandR12.c | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
-index 6ea9d26..ece12b9 100644
---- a/hw/xfree86/modes/xf86RandR12.c
-+++ b/hw/xfree86/modes/xf86RandR12.c
-@@ -1761,6 +1761,7 @@ xf86RandR12Init12 (ScreenPtr pScreen)
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- rrScrPrivPtr rp = rrGetScrPriv(pScreen);
- XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
-+ int i;
-
- rp->rrGetInfo = xf86RandR12GetInfo12;
- rp->rrScreenSetSize = xf86RandR12ScreenSetSize;
-@@ -1790,6 +1791,9 @@ xf86RandR12Init12 (ScreenPtr pScreen)
- */
- if (!xf86RandR12SetInfo12 (pScreen))
- return FALSE;
-+ for (i = 0; i < rp->numCrtcs; i++) {
-+ xf86RandR12CrtcGetGamma(pScreen, rp->crtcs[i]);
-+ }
- return TRUE;
- }
-
---
-1.6.5.1
-
diff --git a/xorg-x11-server/patches/xserver-1.7.1-multilib.patch b/xorg-x11-server/patches/xserver-1.7.1-multilib.patch
deleted file mode 100644
index 6435999..0000000
--- a/xorg-x11-server/patches/xserver-1.7.1-multilib.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 6d9585ba6a5784328de479c6b648d7b7d6cec64c Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax(a)redhat.com>
-Date: Thu, 29 Oct 2009 19:04:10 -0400
-Subject: [PATCH] multilib fix for -devel subpackage
-
----
- include/colormapst.h | 4 ++--
- include/xorg-server.h.in | 7 ++++---
- 2 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/include/colormapst.h b/include/colormapst.h
-index f1fc8eb..274cd65 100644
---- a/include/colormapst.h
-+++ b/include/colormapst.h
-@@ -103,12 +103,12 @@ typedef struct _ColormapRec
- {
- VisualPtr pVisual;
- short class; /* PseudoColor or DirectColor */
--#if defined(_XSERVER64)
-+#ifdef __LP64__
- short pad0;
- XID pad1;
- #endif
- XID mid; /* client's name for colormap */
--#if defined(_XSERVER64) && (X_BYTE_ORDER == X_LITTLE_ENDIAN)
-+#if defined(__LP64__) && (X_BYTE_ORDER == X_LITTLE_ENDIAN)
- XID pad2;
- #endif
- ScreenPtr pScreen; /* screen map is associated with */
-diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
-index 76cab16..081b8f3 100644
---- a/include/xorg-server.h.in
-+++ b/include/xorg-server.h.in
-@@ -157,9 +157,6 @@
- /* Name of X server */
- #undef __XSERVERNAME__
-
--/* Define to 1 if unsigned long is 64 bits. */
--#undef _XSERVER64
--
- /* Building vgahw module */
- #undef WITH_VGAHW
-
-@@ -187,4 +184,8 @@
- /* X Access Control Extension */
- #undef XACE
-
-+#ifdef __LP64__
-+#define _XSERVER64 1
-+#endif
-+
- #endif /* _XORG_SERVER_H_ */
---
-1.6.5.2
-
diff --git a/xorg-x11-server/patches/xserver-1.8-disable-vboxvideo.patch b/xorg-x11-server/patches/xserver-1.8-disable-vboxvideo.patch
deleted file mode 100644
index 60c0dce..0000000
--- a/xorg-x11-server/patches/xserver-1.8-disable-vboxvideo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1f315578bf759c85261b1f2295efbf0dba852f73 Mon Sep 17 00:00:00 2001
-From: Adam Williamson <adamwill(a)shaw.ca>
-Date: Thu, 25 Feb 2010 10:34:49 -0800
-Subject: [PATCH] disable vboxvideo driver in autodetect code
-
----
- hw/xfree86/common/xf86AutoConfig.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
-index 7f4ada8..4e944ea 100644
---- a/hw/xfree86/common/xf86AutoConfig.c
-+++ b/hw/xfree86/common/xf86AutoConfig.c
-@@ -220,7 +220,7 @@ videoPtrToDriverList(struct pci_device *dev,
- case 0x1011: driverList[0] = "tga"; break;
- case 0x1023: driverList[0] = "trident"; break;
- case 0x100c: driverList[0] = "tseng"; break;
-- case 0x80ee: driverList[0] = "vboxvideo"; break;
-+ case 0x80ee: driverList[0] = "vesa"; break;
- case 0x15ad: driverList[0] = "vmware"; break;
- case 0x18ca:
- if (dev->device_id == 0x47)
---
-1.7.0
-
diff --git a/xorg-x11-server/patches/xserver-1.8-no-connected-outputs.patch b/xorg-x11-server/patches/xserver-1.8-no-connected-outputs.patch
deleted file mode 100644
index 3ee8542..0000000
--- a/xorg-x11-server/patches/xserver-1.8-no-connected-outputs.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From b27f93c6dbe0a6e416db2c65738e996c70a403c1 Mon Sep 17 00:00:00 2001
-From: Fedora X Ninjas <airlied(a)redhat.com>
-Date: Thu, 6 May 2010 12:55:34 +1000
-Subject: [PATCH] xf86: allow for no outputs connected at startup operation.
-
-When nothing is connected at startup and we canGrow, allow the server to start with a 1024x768 framebuffer, and when the drivers send hotplug events this will expand to the correct size dynamically.
-
-Signed-off-by: Dave Airlie <airlied(a)redhat.com>
----
- hw/xfree86/modes/xf86Crtc.c | 66 ++++++++++++++++++++++++++++++------------
- 1 files changed, 47 insertions(+), 19 deletions(-)
-
-diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index 571ffd0..99082ec 100644
---- a/hw/xfree86/modes/xf86Crtc.c
-+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -48,6 +48,8 @@
-
- #include "xf86xv.h"
-
-+#define NO_OUTPUT_DEFAULT_WIDTH 1024
-+#define NO_OUTPUT_DEFAULT_HEIGHT 768
- /*
- * Initialize xf86CrtcConfig structure
- */
-@@ -1946,7 +1948,7 @@ xf86SetScrnInfoModes (ScrnInfoPtr scrn)
- #endif
- }
-
--static void
-+static Bool
- xf86CollectEnabledOutputs(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
- Bool *enabled)
- {
-@@ -1961,8 +1963,10 @@ xf86CollectEnabledOutputs(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
- "No outputs definitely connected, trying again...\n");
-
- for (o = 0; o < config->num_output; o++)
-- enabled[o] = xf86OutputEnabled(config->output[o], FALSE);
-+ any_enabled |= enabled[o] = xf86OutputEnabled(config->output[o], FALSE);
- }
-+
-+ return any_enabled;
- }
-
- static Bool
-@@ -2409,6 +2413,8 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
- Bool *enabled;
- int width, height;
- int i = scrn->scrnIndex;
-+ Bool have_outputs = TRUE;
-+ Bool ret;
-
- /* Set up the device options */
- config->options = xnfalloc (sizeof (xf86DeviceOptions));
-@@ -2433,20 +2439,26 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
- modes = xnfcalloc (config->num_output, sizeof (DisplayModePtr));
- enabled = xnfcalloc (config->num_output, sizeof (Bool));
-
-- xf86CollectEnabledOutputs(scrn, config, enabled);
--
-- if (xf86TargetUserpref(scrn, config, modes, enabled, width, height))
-- xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n");
-- else if (xf86TargetRightOf(scrn, config, modes, enabled, width, height))
-- xf86DrvMsg(i, X_INFO, "Using spanning desktop for initial modes\n");
-- else if (xf86TargetPreferred(scrn, config, modes, enabled, width, height))
-- xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n");
-- else if (xf86TargetAspect(scrn, config, modes, enabled, width, height))
-- xf86DrvMsg(i, X_INFO, "Using fuzzy aspect match for initial modes\n");
-- else if (xf86TargetFallback(scrn, config, modes, enabled, width, height))
-- xf86DrvMsg(i, X_INFO, "Using sloppy heuristic for initial modes\n");
-- else
-- xf86DrvMsg(i, X_WARNING, "Unable to find initial modes\n");
-+ ret = xf86CollectEnabledOutputs(scrn, config, enabled);
-+ if (ret == FALSE && canGrow) {
-+ xf86DrvMsg(i, X_WARNING, "Unable to find connected outputs - setting %dx%d initial framebuffer\n",
-+ NO_OUTPUT_DEFAULT_WIDTH, NO_OUTPUT_DEFAULT_HEIGHT);
-+ have_outputs = FALSE;
-+ }
-+ else {
-+ if (xf86TargetUserpref(scrn, config, modes, enabled, width, height))
-+ xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n");
-+ else if (xf86TargetRightOf(scrn, config, modes, enabled, width, height))
-+ xf86DrvMsg(i, X_INFO, "Using spanning desktop for initial modes\n");
-+ else if (xf86TargetPreferred(scrn, config, modes, enabled, width, height))
-+ xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n");
-+ else if (xf86TargetAspect(scrn, config, modes, enabled, width, height))
-+ xf86DrvMsg(i, X_INFO, "Using fuzzy aspect match for initial modes\n");
-+ else if (xf86TargetFallback(scrn, config, modes, enabled, width, height))
-+ xf86DrvMsg(i, X_INFO, "Using sloppy heuristic for initial modes\n");
-+ else
-+ xf86DrvMsg(i, X_WARNING, "Unable to find initial modes\n");
-+ }
-
- for (o = -1; nextEnabledOutput(config, enabled, &o); ) {
- if (!modes[o])
-@@ -2479,7 +2491,7 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
- /*
- * Assign CRTCs to fit output configuration
- */
-- if (!xf86PickCrtcs (scrn, crtcs, modes, 0, width, height))
-+ if (have_outputs && !xf86PickCrtcs (scrn, crtcs, modes, 0, width, height))
- {
- xfree (crtcs);
- xfree (modes);
-@@ -2541,6 +2553,13 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
- */
- xf86DefaultScreenLimits (scrn, &width, &height, canGrow);
-
-+ if (have_outputs == FALSE) {
-+ if (width < NO_OUTPUT_DEFAULT_WIDTH && height < NO_OUTPUT_DEFAULT_HEIGHT) {
-+ width = NO_OUTPUT_DEFAULT_WIDTH;
-+ height = NO_OUTPUT_DEFAULT_HEIGHT;
-+ }
-+ }
-+
- scrn->display->virtualX = width;
- scrn->display->virtualY = height;
- }
-@@ -2566,8 +2585,17 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
- width, height);
- }
-
-- /* Mirror output modes to scrn mode list */
-- xf86SetScrnInfoModes (scrn);
-+ if (have_outputs) {
-+ /* Mirror output modes to scrn mode list */
-+ xf86SetScrnInfoModes (scrn);
-+ } else {
-+ /* Clear any existing modes from scrn->modes */
-+ while (scrn->modes != NULL)
-+ xf86DeleteMode(&scrn->modes, scrn->modes);
-+ scrn->modes = xf86ModesAdd(scrn->modes,
-+ xf86CVTMode(width, height, 60, 0, 0));
-+ }
-+
-
- xfree (crtcs);
- xfree (modes);
---
-1.7.0.1
-
diff --git a/xorg-x11-server/patches/xserver-1.8-randr-initial.patch b/xorg-x11-server/patches/xserver-1.8-randr-initial.patch
deleted file mode 100644
index 2db8a8c..0000000
--- a/xorg-x11-server/patches/xserver-1.8-randr-initial.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From f22b6f8a5899f125de63738e69aaddc2dd0a5d0a Mon Sep 17 00:00:00 2001
-From: Ben Skeggs <bskeggs(a)redhat.com>
-Date: Mon, 7 Jun 2010 10:10:10 +1000
-Subject: [PATCH] randr: prevent an unnecessary screen resize with multiple displays
-
-crtc->{x,y} is always 0 when xf86DefaultScreenLimits() is called, so we
-calculate too small an area for the initial framebuffer and force a resize
-to happen.
-
-This commit fixes the code to use desired{X,Y} instead, which contains the
-initial output positions.
-
-Signed-off-by: Ben Skeggs <bskeggs(a)redhat.com>
----
- hw/xfree86/modes/xf86Crtc.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index 51e7b5a..c2ad7bc 100644
---- a/hw/xfree86/modes/xf86Crtc.c
-+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -1041,8 +1041,8 @@ xf86DefaultScreenLimits (ScrnInfoPtr scrn, int *widthp, int *heightp,
-
- if (crtc->enabled)
- {
-- crtc_width = crtc->x + xf86ModeWidth (&crtc->desiredMode, crtc->desiredRotation);
-- crtc_height = crtc->y + xf86ModeHeight (&crtc->desiredMode, crtc->desiredRotation);
-+ crtc_width = crtc->desiredX + xf86ModeWidth (&crtc->desiredMode, crtc->desiredRotation);
-+ crtc_height = crtc->desiredY + xf86ModeHeight (&crtc->desiredMode, crtc->desiredRotation);
- }
- if (!canGrow) {
- for (o = 0; o < config->num_output; o++)
---
-1.6.6
-
diff --git a/xorg-x11-server/patches/xserver-1.8-udev-warning.patch b/xorg-x11-server/patches/xserver-1.8-udev-warning.patch
deleted file mode 100644
index 93071fd..0000000
--- a/xorg-x11-server/patches/xserver-1.8-udev-warning.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 57a188877b0472edb12bdf707b1550abbeb85af8 Mon Sep 17 00:00:00 2001
-From: Fedora X Ninjas <x(a)fedoraproject.org>
-Date: Wed, 17 Feb 2010 11:12:36 +1000
-Subject: [PATCH] Stick giant warning into logfiles about udev configuration changes.
-
-Signed-off-by: Fedora X Ninjas <x(a)fedoraproject.org>
----
- hw/xfree86/common/xf86Config.c | 13 +++++++++++++
- 1 files changed, 13 insertions(+), 0 deletions(-)
-
-diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index 132e8bc..b1722cd 100644
---- a/hw/xfree86/common/xf86Config.c
-+++ b/hw/xfree86/common/xf86Config.c
-@@ -1472,6 +1472,19 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
- "input devices.\n\tIf no devices become available, "
- "reconfigure %s or disable AutoAddDevices.\n",
- config_backend, config_backend);
-+
-+ xf86Msg(X_INFO, "\n"
-+ "***************************************************************\n"
-+ "***************************************************************\n"
-+ "** Fedora switched to udev-based device detection with **\n"
-+ "** xorg-x11-server-1.7.99.901-1. Custom HAL configuration **\n"
-+ "** stored in /etc/hal/fdi/policy will not be seen by this **\n"
-+ "** server version. If you have such configuration you will **\n"
-+ "** need to update it to the new format. **\n"
-+ "** For more information, see the Fedora wiki page **\n"
-+ "** https://fedoraproject.org/wiki/Input_device_configuration **\n"
-+ "***************************************************************\n"
-+ "***************************************************************\n");
- #else
- xf86Msg(X_INFO, "Hotplugging is disabled and no input devices were configured.\n"
- "\tTry disabling AllowEmptyInput.\n");
---
-1.6.6.1
-
diff --git a/xorg-x11-server/patches/xserver-1.8.2-XTEST-PointerKeys-fixes.patch b/xorg-x11-server/patches/xserver-1.8.2-XTEST-PointerKeys-fixes.patch
deleted file mode 100644
index ece8a6c..0000000
--- a/xorg-x11-server/patches/xserver-1.8.2-XTEST-PointerKeys-fixes.patch
+++ /dev/null
@@ -1,909 +0,0 @@
-From deab888bb3bb2a56963da50ff551bd66fbd858a1 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer(a)who-t.net>
-Date: Tue, 29 Jun 2010 13:49:27 +1000
-Subject: [PATCH 1/5] xkb: Mark switch case fallthrough with comment.
-
-Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
----
- xkb/xkbActions.c | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
-index 4c7bce2..6a7f36d 100644
---- a/xkb/xkbActions.c
-+++ b/xkb/xkbActions.c
-@@ -625,6 +625,8 @@ _XkbFilterPointerBtn( XkbSrvInfoPtr xkbi,
- break;
- }
- xkbi->lockedPtrButtons&= ~(1<<button);
-+
-+ /* fallthrough */
- case XkbSA_PtrBtn:
- XkbDDXFakeDeviceButton(xkbi->device, 0, button);
- break;
---
-1.7.1
-
-From 50b6311dbd2594acc36d6856fdde8623459f1374 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer(a)who-t.net>
-Date: Tue, 29 Jun 2010 12:12:53 +1000
-Subject: [PATCH 2/5] xkb: merge lockedPtrButtons state from all attached SDs.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Problem:
-lockedPtrButtons keeps the state of the buttons locked by a PointerKeys button
-press. Unconditionally clearing the bits may cause stuck buttons in this
-sequence of events:
-
-1. type Shift + NumLock to enable PointerKeys
-2. type 0/Ins on keypad to emulate Button 1 press
- → button1 press event to client
-3. press and release button 1 on physical mouse
- → button1 release event to client
-
-Button 1 on the MD is now stuck and cannot be released.
-
-Cause:
-XKB PointerKeys button events are posted through the XTEST pointer device.
-Once a press is generated, the XTEST device's button is down. The DIX merges
-the button state of all attached SDs, hence the MD will have a button down
-while the XTEST device has a button down.
-
-PointerKey button events are only generated on the master device to avoid
-duplicate events (see XkbFakeDeviceButton()). If the MD has the
-lockedPtrButtons bit cleared by a release event on a physical device, no
-such event is generated when a keyboard device triggers the PointerKey
-ButtonRelease trigger. Since the event - if generated - is posted through
-the XTEST pointer device, lack of a generated ButtonRelease event on the
-XTEST pointer device means the button is never released, resulting in the
-stuck button observed above.
-
-Solution:
-This patch merges the MD's lockedPtrButtons with the one of all attached
-slave devices on release events. Thus, as long as one attached keyboard has
-a lockedPtrButtons bit set, this bit is kept in the MD. Once a PointerKey
-button is released on all keyboards, the matching release event is emulated
-from the MD through the XTEST pointer device, thus also releasing the button
-in the DIX.
-
-Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
----
- include/xkbsrv.h | 3 +++
- xkb/xkbAccessX.c | 18 +++++++++++++++++-
- xkb/xkbActions.c | 8 ++++++++
- xkb/xkbUtils.c | 26 ++++++++++++++++++++++++++
- 4 files changed, 54 insertions(+), 1 deletions(-)
-
-diff --git a/include/xkbsrv.h b/include/xkbsrv.h
-index c0cd501..f0db0e4 100644
---- a/include/xkbsrv.h
-+++ b/include/xkbsrv.h
-@@ -933,6 +933,9 @@ extern int XkbGetEffectiveGroup(
- XkbStatePtr /* xkbstate */,
- CARD8 /* keycode */);
-
-+extern void XkbMergeLockedPtrBtns(
-+ DeviceIntPtr /* master */);
-+
- #include "xkbfile.h"
- #include "xkbrules.h"
-
-diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
-index be1dcee..e3fdc06 100644
---- a/xkb/xkbAccessX.c
-+++ b/xkb/xkbAccessX.c
-@@ -707,8 +707,24 @@ DeviceEvent *event = &ev->device_event;
- changed |= XkbPointerButtonMask;
- }
- else if (event->type == ET_ButtonRelease) {
-- if (xkbi)
-+ if (xkbi) {
- xkbi->lockedPtrButtons&= ~(1 << (event->detail.key & 0x7));
-+
-+ /* Merge this MD's lockedPtrButtons with the one of all
-+ * attached slave devices.
-+ * The DIX uses a merged button state for MDs, not
-+ * releasing buttons until the last SD has released
-+ * thenm. If we unconditionally clear the
-+ * lockedPtrButtons bit on the MD, a PointerKeys button
-+ * release on the SD keyboard won't generate the required fake button
-+ * event on the XTEST pointer, thus never processing the
-+ * button event in the DIX and the XTEST pointer's
-+ * buttons stay down - result is a stuck button.
-+ */
-+ if (IsMaster(dev))
-+ XkbMergeLockedPtrBtns(dev);
-+ }
-+
- changed |= XkbPointerButtonMask;
- }
-
-diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
-index 6a7f36d..ab52b6a 100644
---- a/xkb/xkbActions.c
-+++ b/xkb/xkbActions.c
-@@ -626,6 +626,14 @@ _XkbFilterPointerBtn( XkbSrvInfoPtr xkbi,
- }
- xkbi->lockedPtrButtons&= ~(1<<button);
-
-+ if (IsMaster(xkbi->device))
-+ {
-+ XkbMergeLockedPtrBtns(xkbi->device);
-+ /* One SD still has lock set, don't post event */
-+ if ((xkbi->lockedPtrButtons & (1 << button)) != 0)
-+ break;
-+ }
-+
- /* fallthrough */
- case XkbSA_PtrBtn:
- XkbDDXFakeDeviceButton(xkbi->device, 0, button);
-diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
-index b1e0e55..d7d1935 100644
---- a/xkb/xkbUtils.c
-+++ b/xkb/xkbUtils.c
-@@ -2190,3 +2190,29 @@ XkbGetEffectiveGroup(XkbSrvInfoPtr xkbi, XkbStatePtr xkbState, CARD8 keycode)
-
- return effectiveGroup;
- }
-+
-+/* Merge the lockedPtrButtons from all attached SDs for the given master
-+ * device into the MD's state.
-+ */
-+void
-+XkbMergeLockedPtrBtns(DeviceIntPtr master)
-+{
-+ DeviceIntPtr d = inputInfo.devices;
-+ XkbSrvInfoPtr xkbi = NULL;
-+
-+ if (!IsMaster(master))
-+ return;
-+
-+ if (!master->key)
-+ return;
-+
-+ xkbi = master->key->xkbInfo;
-+ xkbi->lockedPtrButtons = 0;
-+
-+ for (; d; d = d->next) {
-+ if (IsMaster(d) || GetMaster(d, MASTER_KEYBOARD) != master || !d->key)
-+ continue;
-+
-+ xkbi->lockedPtrButtons |= d->key->xkbInfo->lockedPtrButtons;
-+ }
-+}
---
-1.7.1
-
-From 4a4224f5d786035af88c251a9ee177217e8f77fd Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer(a)who-t.net>
-Date: Wed, 14 Apr 2010 10:54:29 +1000
-Subject: [PATCH 3/5] xkb: rename XkbFakeDeviceButton and XkbFakeDeviceMotion, move into xkbActions.c
-
-The name XkbDDXFakeDeviceButton and XkbDDXFakeDeviceMotion is somewhat
-misleading, there's no DDX involved in the game at all anymore.
-
-This removes XkbFakeDeviceMotion and XkbFakeDeviceButton from the API where
-it arguably shouldn't have been in the first place.
-
-Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
-Reviewed-by: Daniel Stone <daniel(a)fooishbar.org>
-Reviewed-by: Dan Nicholson <dbn.lists(a)gmail.com>
----
- include/xkbsrv.h | 13 -------
- xkb/Makefile.am | 4 +--
- xkb/ddxDevBtn.c | 69 --------------------------------------
- xkb/ddxFakeMtn.c | 64 -----------------------------------
- xkb/xkbActions.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++-------
- 5 files changed, 85 insertions(+), 162 deletions(-)
- delete mode 100644 xkb/ddxDevBtn.c
- delete mode 100644 xkb/ddxFakeMtn.c
-
-diff --git a/include/xkbsrv.h b/include/xkbsrv.h
-index f0db0e4..d1cbd1a 100644
---- a/include/xkbsrv.h
-+++ b/include/xkbsrv.h
-@@ -768,19 +768,6 @@ extern _X_EXPORT void XkbDDXUpdateDeviceIndicators(
- CARD32 /* newState */
- );
-
--extern _X_EXPORT void XkbDDXFakePointerMotion(
-- DeviceIntPtr /* dev */,
-- unsigned int /* flags */,
-- int /* x */,
-- int /* y */
--);
--
--extern _X_EXPORT void XkbDDXFakeDeviceButton(
-- DeviceIntPtr /* dev */,
-- Bool /* press */,
-- int /* button */
--);
--
- extern _X_EXPORT int XkbDDXTerminateServer(
- DeviceIntPtr /* dev */,
- KeyCode /* key */,
-diff --git a/xkb/Makefile.am b/xkb/Makefile.am
-index e54ce59..fb3ccbf 100644
---- a/xkb/Makefile.am
-+++ b/xkb/Makefile.am
-@@ -5,11 +5,9 @@ AM_CFLAGS = $(DIX_CFLAGS)
- DDX_SRCS = \
- ddxBeep.c \
- ddxCtrls.c \
-- ddxFakeMtn.c \
- ddxLEDs.c \
- ddxLoad.c \
-- ddxList.c \
-- ddxDevBtn.c
-+ ddxList.c
-
- DIX_SRCS = \
- xkb.c \
-diff --git a/xkb/ddxDevBtn.c b/xkb/ddxDevBtn.c
-deleted file mode 100644
-index b8a1255..0000000
---- a/xkb/ddxDevBtn.c
-+++ /dev/null
-@@ -1,69 +0,0 @@
--/************************************************************
--Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
--
--Permission to use, copy, modify, and distribute this
--software and its documentation for any purpose and without
--fee is hereby granted, provided that the above copyright
--notice appear in all copies and that both that copyright
--notice and this permission notice appear in supporting
--documentation, and that the name of Silicon Graphics not be
--used in advertising or publicity pertaining to distribution
--of the software without specific prior written permission.
--Silicon Graphics makes no representation about the suitability
--of this software for any purpose. It is provided "as is"
--without any express or implied warranty.
--
--SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
--SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
--AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
--GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
--DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
--DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
--OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
--THE USE OR PERFORMANCE OF THIS SOFTWARE.
--
--********************************************************/
--
--#ifdef HAVE_DIX_CONFIG_H
--#include <dix-config.h>
--#endif
--
--#include "inputstr.h"
--#include <xkbsrv.h>
--#include "mi.h"
--
--void
--XkbDDXFakeDeviceButton(DeviceIntPtr dev,Bool press,int button)
--{
-- EventListPtr events;
-- int nevents, i;
-- DeviceIntPtr ptr;
--
-- /* If dev is a slave device, and the SD is attached, do nothing. If we'd
-- * post through the attached master pointer we'd get duplicate events.
-- *
-- * if dev is a master keyboard, post through the XTEST device
-- *
-- * if dev is a floating slave, post through the device itself.
-- */
--
-- if (IsMaster(dev))
-- ptr = GetXTestDevice(GetMaster(dev, MASTER_POINTER));
-- else if (!dev->u.master)
-- ptr = dev;
-- else
-- return;
--
-- events = InitEventList(GetMaximumEventsNum());
-- OsBlockSignals();
-- nevents = GetPointerEvents(events, ptr,
-- press ? ButtonPress : ButtonRelease, button,
-- 0 /* flags */, 0 /* first */,
-- 0 /* num_val */, NULL);
-- OsReleaseSignals();
--
-- for (i = 0; i < nevents; i++)
-- mieqProcessDeviceEvent(ptr, (InternalEvent*)events[i].event, NULL);
--
-- FreeEventList(events, GetMaximumEventsNum());
--}
-diff --git a/xkb/ddxFakeMtn.c b/xkb/ddxFakeMtn.c
-deleted file mode 100644
-index b383716..0000000
---- a/xkb/ddxFakeMtn.c
-+++ /dev/null
-@@ -1,64 +0,0 @@
--/************************************************************
--Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc.
--
--Permission to use, copy, modify, and distribute this
--software and its documentation for any purpose and without
--fee is hereby granted, provided that the above copyright
--notice appear in all copies and that both that copyright
--notice and this permission notice appear in supporting
--documentation, and that the name of Silicon Graphics not be
--used in advertising or publicity pertaining to distribution
--of the software without specific prior written permission.
--Silicon Graphics makes no representation about the suitability
--of this software for any purpose. It is provided "as is"
--without any express or implied warranty.
--
--SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
--SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
--AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
--GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
--DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
--DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
--OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
--THE USE OR PERFORMANCE OF THIS SOFTWARE.
--
--********************************************************/
--
--#ifdef HAVE_DIX_CONFIG_H
--#include <dix-config.h>
--#endif
--
--#include "inputstr.h"
--#include <xkbsrv.h>
--#include "mi.h"
--
--void
--XkbDDXFakePointerMotion(DeviceIntPtr dev, unsigned flags,int x,int y)
--{
-- EventListPtr events;
-- int nevents, i;
-- DeviceIntPtr ptr;
-- int gpe_flags = 0;
--
-- if (!dev->u.master)
-- ptr = dev;
-- else
-- ptr = GetXTestDevice(GetMaster(dev, MASTER_POINTER));
--
-- if (flags & XkbSA_MoveAbsoluteX || flags & XkbSA_MoveAbsoluteY)
-- gpe_flags = POINTER_ABSOLUTE;
-- else
-- gpe_flags = POINTER_RELATIVE;
--
-- events = InitEventList(GetMaximumEventsNum());
-- OsBlockSignals();
-- nevents = GetPointerEvents(events, ptr,
-- MotionNotify, 0,
-- gpe_flags, 0, 2, (int[]){x, y});
-- OsReleaseSignals();
--
-- for (i = 0; i < nevents; i++)
-- mieqProcessDeviceEvent(ptr, (InternalEvent*)events[i].event, NULL);
--
-- FreeEventList(events, GetMaximumEventsNum());
--}
-diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
-index ab52b6a..2817e39 100644
---- a/xkb/xkbActions.c
-+++ b/xkb/xkbActions.c
-@@ -40,11 +40,15 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
- #include <xkbsrv.h>
- #include "xkb.h"
- #include <ctype.h>
-+#include "mi.h"
- #define EXTENSION_EVENT_BASE 64
-
- static int xkbDevicePrivateKeyIndex;
- DevPrivateKey xkbDevicePrivateKey = &xkbDevicePrivateKeyIndex;
-
-+static void XkbFakeDeviceButton(DeviceIntPtr dev,Bool press,int button);
-+static void XkbFakePointerMotion(DeviceIntPtr dev, unsigned flags,int x,int y);
-+
- void
- xkbUnwrapProc(DeviceIntPtr device, DeviceHandleProc proc,
- pointer data)
-@@ -479,7 +483,7 @@ int dx,dy;
- dx= xkbi->mouseKeysDX;
- dy= xkbi->mouseKeysDY;
- }
-- XkbDDXFakePointerMotion(xkbi->device, xkbi->mouseKeysFlags,dx,dy);
-+ XkbFakePointerMotion(xkbi->device, xkbi->mouseKeysFlags,dx,dy);
- return xkbi->desc->ctrls->mk_interval;
- }
-
-@@ -507,7 +511,7 @@ Bool accel;
- accel= ((pAction->ptr.flags&XkbSA_NoAcceleration)==0);
- x= XkbPtrActionX(&pAction->ptr);
- y= XkbPtrActionY(&pAction->ptr);
-- XkbDDXFakePointerMotion(xkbi->device, pAction->ptr.flags,x,y);
-+ XkbFakePointerMotion(xkbi->device, pAction->ptr.flags,x,y);
- AccessXCancelRepeatKey(xkbi,keycode);
- xkbi->mouseKeysAccel= accel&&
- (xkbi->desc->ctrls->enabled_ctrls&XkbMouseKeysAccelMask);
-@@ -554,7 +558,7 @@ _XkbFilterPointerBtn( XkbSrvInfoPtr xkbi,
- ((pAction->btn.flags&XkbSA_LockNoLock)==0)) {
- xkbi->lockedPtrButtons|= (1<<button);
- AccessXCancelRepeatKey(xkbi,keycode);
-- XkbDDXFakeDeviceButton(xkbi->device, 1, button);
-+ XkbFakeDeviceButton(xkbi->device, 1, button);
- filter->upAction.type= XkbSA_NoAction;
- }
- break;
-@@ -565,12 +569,12 @@ _XkbFilterPointerBtn( XkbSrvInfoPtr xkbi,
- if (pAction->btn.count>0) {
- nClicks= pAction->btn.count;
- for (i=0;i<nClicks;i++) {
-- XkbDDXFakeDeviceButton(xkbi->device, 1, button);
-- XkbDDXFakeDeviceButton(xkbi->device, 0, button);
-+ XkbFakeDeviceButton(xkbi->device, 1, button);
-+ XkbFakeDeviceButton(xkbi->device, 0, button);
- }
- filter->upAction.type= XkbSA_NoAction;
- }
-- else XkbDDXFakeDeviceButton(xkbi->device, 1, button);
-+ else XkbFakeDeviceButton(xkbi->device, 1, button);
- }
- break;
- case XkbSA_SetPtrDflt:
-@@ -636,7 +640,7 @@ _XkbFilterPointerBtn( XkbSrvInfoPtr xkbi,
-
- /* fallthrough */
- case XkbSA_PtrBtn:
-- XkbDDXFakeDeviceButton(xkbi->device, 0, button);
-+ XkbFakeDeviceButton(xkbi->device, 0, button);
- break;
- }
- filter->active = 0;
-@@ -974,7 +978,7 @@ int button;
- if ((pAction->devbtn.flags&XkbSA_LockNoLock)||
- BitIsOn(dev->button->down, button))
- return 0;
-- XkbDDXFakeDeviceButton(dev,TRUE,button);
-+ XkbFakeDeviceButton(dev,TRUE,button);
- filter->upAction.type= XkbSA_NoAction;
- break;
- case XkbSA_DeviceBtn:
-@@ -982,12 +986,12 @@ int button;
- int nClicks,i;
- nClicks= pAction->btn.count;
- for (i=0;i<nClicks;i++) {
-- XkbDDXFakeDeviceButton(dev,TRUE,button);
-- XkbDDXFakeDeviceButton(dev,FALSE,button);
-+ XkbFakeDeviceButton(dev,TRUE,button);
-+ XkbFakeDeviceButton(dev,FALSE,button);
- }
- filter->upAction.type= XkbSA_NoAction;
- }
-- else XkbDDXFakeDeviceButton(dev,TRUE,button);
-+ else XkbFakeDeviceButton(dev,TRUE,button);
- break;
- }
- }
-@@ -1006,10 +1010,10 @@ int button;
- if ((filter->upAction.devbtn.flags&XkbSA_LockNoUnlock)||
- !BitIsOn(dev->button->down, button))
- return 0;
-- XkbDDXFakeDeviceButton(dev,FALSE,button);
-+ XkbFakeDeviceButton(dev,FALSE,button);
- break;
- case XkbSA_DeviceBtn:
-- XkbDDXFakeDeviceButton(dev,FALSE,button);
-+ XkbFakeDeviceButton(dev,FALSE,button);
- break;
- }
- filter->active = 0;
-@@ -1326,3 +1330,70 @@ xkbStateNotify sn;
- return;
- }
-
-+static void
-+XkbFakePointerMotion(DeviceIntPtr dev, unsigned flags,int x,int y)
-+{
-+ EventListPtr events;
-+ int nevents, i;
-+ DeviceIntPtr ptr;
-+ int gpe_flags = 0;
-+
-+ if (!dev->u.master)
-+ ptr = dev;
-+ else
-+ ptr = GetXTestDevice(GetMaster(dev, MASTER_POINTER));
-+
-+ if (flags & XkbSA_MoveAbsoluteX || flags & XkbSA_MoveAbsoluteY)
-+ gpe_flags = POINTER_ABSOLUTE;
-+ else
-+ gpe_flags = POINTER_RELATIVE;
-+
-+ events = InitEventList(GetMaximumEventsNum());
-+ OsBlockSignals();
-+ nevents = GetPointerEvents(events, ptr,
-+ MotionNotify, 0,
-+ gpe_flags, 0, 2, (int[]){x, y});
-+ OsReleaseSignals();
-+
-+ for (i = 0; i < nevents; i++)
-+ mieqProcessDeviceEvent(ptr, (InternalEvent*)events[i].event, NULL);
-+
-+ FreeEventList(events, GetMaximumEventsNum());
-+}
-+
-+static void
-+XkbFakeDeviceButton(DeviceIntPtr dev,Bool press,int button)
-+{
-+ EventListPtr events;
-+ int nevents, i;
-+ DeviceIntPtr ptr;
-+
-+ /* If dev is a slave device, and the SD is attached, do nothing. If we'd
-+ * post through the attached master pointer we'd get duplicate events.
-+ *
-+ * if dev is a master keyboard, post through the XTEST device
-+ *
-+ * if dev is a floating slave, post through the device itself.
-+ */
-+
-+ if (IsMaster(dev))
-+ ptr = GetXTestDevice(GetMaster(dev, MASTER_POINTER));
-+ else if (!dev->u.master)
-+ ptr = dev;
-+ else
-+ return;
-+
-+ events = InitEventList(GetMaximumEventsNum());
-+ OsBlockSignals();
-+ nevents = GetPointerEvents(events, ptr,
-+ press ? ButtonPress : ButtonRelease, button,
-+ 0 /* flags */, 0 /* first */,
-+ 0 /* num_val */, NULL);
-+ OsReleaseSignals();
-+
-+
-+ for (i = 0; i < nevents; i++)
-+ mieqProcessDeviceEvent(ptr, (InternalEvent*)events[i].event, NULL);
-+
-+ FreeEventList(events, GetMaximumEventsNum());
-+}
---
-1.7.1
-
-From dcb46252f959893f1934232698e2ae26390a8a5b Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer(a)who-t.net>
-Date: Tue, 29 Jun 2010 15:24:51 +1000
-Subject: [PATCH 4/5] xkb: emulate PointerKeys events only on the master device.
-
-This patch replicates the behaviour for button events. Only generate a
-PointerKeys motion event on the master device, not on the slave device.
-Fixes the current issue of PointerKey motion events generating key events as
-well.
-
-Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
----
- xkb/xkbActions.c | 9 ++++-----
- 1 files changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
-index 2817e39..391c375 100644
---- a/xkb/xkbActions.c
-+++ b/xkb/xkbActions.c
-@@ -496,9 +496,6 @@ _XkbFilterPointerMove( XkbSrvInfoPtr xkbi,
- int x,y;
- Bool accel;
-
-- if (xkbi->device == inputInfo.keyboard)
-- return 0;
--
- if (filter->keycode==0) { /* initial press */
- filter->keycode = keycode;
- filter->active = 1;
-@@ -1338,10 +1335,12 @@ XkbFakePointerMotion(DeviceIntPtr dev, unsigned flags,int x,int y)
- DeviceIntPtr ptr;
- int gpe_flags = 0;
-
-- if (!dev->u.master)
-+ if (IsMaster(dev))
-+ ptr = GetXTestDevice(GetMaster(dev, MASTER_POINTER));
-+ else if (!dev->u.master)
- ptr = dev;
- else
-- ptr = GetXTestDevice(GetMaster(dev, MASTER_POINTER));
-+ return;
-
- if (flags & XkbSA_MoveAbsoluteX || flags & XkbSA_MoveAbsoluteY)
- gpe_flags = POINTER_ABSOLUTE;
---
-1.7.1
-
-From 40941fb2e9ae763add7b74850e8a0471ac754db6 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer(a)who-t.net>
-Date: Thu, 1 Jul 2010 12:44:57 +1000
-Subject: [PATCH 5/5] xkb: release XTEST pointer buttons on physical releases. (#28808)
-
-If a button release event is posted for the MD pointer, post a release event
-through the matching XTEST device. This way, a client who posts a button
-press through the XTEST extension cannot inadvertedly lock the button.
-
-This behaviour is required for historical reasons, until server 1.7 the core
-pointer would release a button press on physical events, regardless of the
-XTEST state. Clients seem to rely on this behaviour, causing seemingly stuck
-grabs.
-
-The merged behaviour is kept for multiple keyboard PointerKey events, if two
-physical keyboards hold the button down as a result of PointerKey actions,
-the button is not released until the last keyboard releases the button.
-
-X.Org Bug 28808 <http://bugs.freedesktop.org/show_bug.cgi?id=28808>
-
-Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
----
- include/xkbsrv.h | 6 ++++++
- xkb/xkbAccessX.c | 23 ++++++++++-------------
- xkb/xkbActions.c | 4 ++--
- 3 files changed, 18 insertions(+), 15 deletions(-)
-
-diff --git a/include/xkbsrv.h b/include/xkbsrv.h
-index d1cbd1a..a96ca56 100644
---- a/include/xkbsrv.h
-+++ b/include/xkbsrv.h
-@@ -923,6 +923,12 @@ extern int XkbGetEffectiveGroup(
- extern void XkbMergeLockedPtrBtns(
- DeviceIntPtr /* master */);
-
-+extern void XkbFakeDeviceButton(
-+ DeviceIntPtr /* dev */,
-+ int /* press */,
-+ int /* button */);
-+
-+
- #include "xkbfile.h"
- #include "xkbrules.h"
-
-diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
-index e3fdc06..d3f9652 100644
---- a/xkb/xkbAccessX.c
-+++ b/xkb/xkbAccessX.c
-@@ -710,19 +710,16 @@ DeviceEvent *event = &ev->device_event;
- if (xkbi) {
- xkbi->lockedPtrButtons&= ~(1 << (event->detail.key & 0x7));
-
-- /* Merge this MD's lockedPtrButtons with the one of all
-- * attached slave devices.
-- * The DIX uses a merged button state for MDs, not
-- * releasing buttons until the last SD has released
-- * thenm. If we unconditionally clear the
-- * lockedPtrButtons bit on the MD, a PointerKeys button
-- * release on the SD keyboard won't generate the required fake button
-- * event on the XTEST pointer, thus never processing the
-- * button event in the DIX and the XTEST pointer's
-- * buttons stay down - result is a stuck button.
-- */
-- if (IsMaster(dev))
-- XkbMergeLockedPtrBtns(dev);
-+ if (IsMaster(dev))
-+ {
-+ DeviceIntPtr source;
-+ int rc;
-+ rc = dixLookupDevice(&source, event->sourceid, serverClient, DixWriteAccess);
-+ if (rc != Success)
-+ ErrorF("[xkb] bad sourceid '%d' on button release event.\n", event->sourceid);
-+ else if (!IsXTestDevice(source, GetMaster(dev, MASTER_POINTER)))
-+ XkbFakeDeviceButton(dev, FALSE, event->detail.key);
-+ }
- }
-
- changed |= XkbPointerButtonMask;
-diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
-index 391c375..5d40199 100644
---- a/xkb/xkbActions.c
-+++ b/xkb/xkbActions.c
-@@ -46,7 +46,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
- static int xkbDevicePrivateKeyIndex;
- DevPrivateKey xkbDevicePrivateKey = &xkbDevicePrivateKeyIndex;
-
--static void XkbFakeDeviceButton(DeviceIntPtr dev,Bool press,int button);
-+void XkbFakeDeviceButton(DeviceIntPtr dev,Bool press,int button);
- static void XkbFakePointerMotion(DeviceIntPtr dev, unsigned flags,int x,int y);
-
- void
-@@ -1360,7 +1360,7 @@ XkbFakePointerMotion(DeviceIntPtr dev, unsigned flags,int x,int y)
- FreeEventList(events, GetMaximumEventsNum());
- }
-
--static void
-+void
- XkbFakeDeviceButton(DeviceIntPtr dev,Bool press,int button)
- {
- EventListPtr events;
---
-1.7.1
-
-From 7273832bcdc6f43e9a5a8fdbb56844466efb710a Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer(a)who-t.net>
-Date: Fri, 23 Jul 2010 11:46:30 +1000
-Subject: [PATCH 1/3] xkb: post-fix PointerKeys button events with a DeviceChangedEvent.
-
-commit 14327858391ebe929b806efb53ad79e789361883
- xkb: release XTEST pointer buttons on physical releases. (#28808)
-revealed a bug with the XTEST/PointerKeys interaction.
-
-Events resulting from PointerKeys are injected into the event processing
-stream, not appended to the event queue. The events generated for the fake
-button press include a DeviceChangedEvent (DCE), a raw button event and the
-button event itself. The DCE causes the master to switch classes to the
-attached XTEST pointer device.
-
-Once the fake button is processed, normal event processing continues with
-events in the EQ. The master still contains the XTEST classes, causing some
-events to be dropped if e.g. the number of valuators of the event in the
-queue exceeds the XTEST device's number of valuators.
-
-Example: the EQ contains the following events, processed one-by-one, left to
-right.
-
-[DCE (dev)][Btn down][Btn up][Motion][Motion][...]
- ^ XkbFakeDeviceButton injects [DCE (XTEST)][Btn up]
-
-Thus the event sequence processed looks like this:
-
-[DCE (dev)][Btn down][Btn up][DCE (XTEST)][Btn up][Motion][Motion][...]
-
-The first DCE causes the master to switch to the device. The button up event
-injects a DCE to the XTEST device, causing the following Motion events to be
-processed with the master still being on XTEST classes.
-
-This patch post-fixes the injected event sequence with a DCE to restore the
-classes of the original slave device, resulting in an event sequence like
-this:
-[DCE (dev)][Btn down][Btn up][DCE (XTEST)][Btn up][DCE (dev)][Motion][Motion]
-
-Note that this is a simplified description. The event sequence injected by
-the PointerKeys code is injected for the master device only and the matching
-slave device that caused the injection has already finished processing on
-the slave. Furthermore, the injection happens as part of the the XKB layer,
-before the unwrapping of the processInputProc takes us into the DIX where
-the DCE is actually handled.
-
-Bug reproducible with a device that reports more than 2 valuators. Simply
-cause button releases on the device and wait for a "too many valuators"
-warning message.
-
-Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
----
- xkb/xkbActions.c | 26 +++++++++++++++++++-------
- 1 files changed, 19 insertions(+), 7 deletions(-)
-
-diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
-index 5d40199..2afd46d 100644
---- a/xkb/xkbActions.c
-+++ b/xkb/xkbActions.c
-@@ -1365,34 +1365,46 @@ XkbFakeDeviceButton(DeviceIntPtr dev,Bool press,int button)
- {
- EventListPtr events;
- int nevents, i;
-- DeviceIntPtr ptr;
-+ DeviceIntPtr ptr, mpointer, lastSlave;
-
- /* If dev is a slave device, and the SD is attached, do nothing. If we'd
- * post through the attached master pointer we'd get duplicate events.
- *
- * if dev is a master keyboard, post through the XTEST device
-- *
- * if dev is a floating slave, post through the device itself.
-+ *
-+ * The event is injected into the event processing, not the EQ. Thus,
-+ * ensure that we restore the master after the event sequence to the
-+ * original set of classes. Otherwise, the master remains on the XTEST
-+ * classes and drops events that don't fit into the XTEST layout (e.g.
-+ * events with more than 2 valuators).
-+ * To do so, we remember the lastSlave that posted through the master
-+ * and add a DeviceChangedEvent to the end of the list.
- */
-
-- if (IsMaster(dev))
-- ptr = GetXTestDevice(GetMaster(dev, MASTER_POINTER));
-- else if (!dev->u.master)
-+ if (IsMaster(dev)) {
-+ mpointer = GetMaster(dev, MASTER_POINTER);
-+ lastSlave = mpointer->u.lastSlave;
-+ ptr = GetXTestDevice(mpointer);
-+ } else if (!dev->u.master)
- ptr = dev;
- else
- return;
-
-- events = InitEventList(GetMaximumEventsNum());
-+ events = InitEventList(GetMaximumEventsNum() + 1);
- OsBlockSignals();
- nevents = GetPointerEvents(events, ptr,
- press ? ButtonPress : ButtonRelease, button,
- 0 /* flags */, 0 /* first */,
- 0 /* num_val */, NULL);
-+ if (IsMaster(dev) && (lastSlave && lastSlave != ptr))
-+ CreateClassesChangedEvent(&events[nevents++], mpointer,
-+ lastSlave, DEVCHANGE_POINTER_EVENT);
- OsReleaseSignals();
-
-
- for (i = 0; i < nevents; i++)
- mieqProcessDeviceEvent(ptr, (InternalEvent*)events[i].event, NULL);
-
-- FreeEventList(events, GetMaximumEventsNum());
-+ FreeEventList(events, GetMaximumEventsNum() + 1);
- }
---
-1.7.2
-
-From 817e031a996a5f5aa16fc789d7e570cc589d96cb Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer(a)who-t.net>
-Date: Wed, 28 Jul 2010 14:24:59 +1000
-Subject: [PATCH 3/3] Xi: reset the unused classes pointer after copying
-
-After copying the unused_classes into the device, reset the original
-pointer. Otherwise we have two pointers pointing to the same field and both
-get freed on device removal.
-
-Some classes already have this behaviour since 51c8fd69.
-
-Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
----
- Xi/exevents.c | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/Xi/exevents.c b/Xi/exevents.c
-index 566b0ef..a6160dd 100644
---- a/Xi/exevents.c
-+++ b/Xi/exevents.c
-@@ -227,6 +227,7 @@ DeepCopyFeedbackClasses(DeviceIntPtr from, DeviceIntPtr to)
- classes = dixLookupPrivate(&to->devPrivates,
- UnusedClassesPrivateKey);
- to->intfeed = classes->intfeed;
-+ classes->intfeed = NULL;
- }
-
- i = &to->intfeed;
-@@ -263,6 +264,7 @@ DeepCopyFeedbackClasses(DeviceIntPtr from, DeviceIntPtr to)
- classes = dixLookupPrivate(&to->devPrivates,
- UnusedClassesPrivateKey);
- to->stringfeed = classes->stringfeed;
-+ classes->stringfeed = NULL;
- }
-
- s = &to->stringfeed;
-@@ -299,6 +301,7 @@ DeepCopyFeedbackClasses(DeviceIntPtr from, DeviceIntPtr to)
- classes = dixLookupPrivate(&to->devPrivates,
- UnusedClassesPrivateKey);
- to->bell = classes->bell;
-+ classes->bell = NULL;
- }
-
- b = &to->bell;
-@@ -336,6 +339,7 @@ DeepCopyFeedbackClasses(DeviceIntPtr from, DeviceIntPtr to)
- classes = dixLookupPrivate(&to->devPrivates,
- UnusedClassesPrivateKey);
- to->leds = classes->leds;
-+ classes->leds = NULL;
- }
-
- l = &to->leds;
-@@ -387,6 +391,7 @@ DeepCopyKeyboardClasses(DeviceIntPtr from, DeviceIntPtr to)
- to->kbdfeed = classes->kbdfeed;
- if (!to->kbdfeed)
- InitKeyboardDeviceStruct(to, NULL, NULL, NULL);
-+ classes->kbdfeed = NULL;
- }
-
- k = &to->kbdfeed;
-@@ -517,6 +522,7 @@ DeepCopyPointerClasses(DeviceIntPtr from, DeviceIntPtr to)
- classes = dixLookupPrivate(&to->devPrivates,
- UnusedClassesPrivateKey);
- to->ptrfeed = classes->ptrfeed;
-+ classes->ptrfeed = NULL;
- }
-
- p = &to->ptrfeed;
---
-1.7.2
-
diff --git a/xorg-x11-server/patches/xserver-autobind-hotplug.patch b/xorg-x11-server/patches/xserver-autobind-hotplug.patch
new file mode 100644
index 0000000..7d05f27
--- /dev/null
+++ b/xorg-x11-server/patches/xserver-autobind-hotplug.patch
@@ -0,0 +1,106 @@
+From 536626891b60039c0f3f9b4cd96156e9fe810f39 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied(a)redhat.com>
+Date: Fri, 17 Aug 2012 09:49:24 +1000
+Subject: [PATCH] autobind GPUs to the screen, (v2)
+
+this is racy and really not what we want for hotplug going forward,
+but until DE support is in GNOME its probably for the best.
+
+v2: fix if config or slave config is NULL
+DO NOT UPSTREAM.
+---
+ hw/xfree86/common/xf86Init.c | 12 ++++++++++++
+ hw/xfree86/common/xf86platformBus.c | 3 +++
+ hw/xfree86/modes/xf86Crtc.c | 28 ++++++++++++++++++++++++++++
+ 3 files changed, 43 insertions(+)
+
+diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
+index d231ced..89629c1 100644
+--- a/hw/xfree86/common/xf86Init.c
++++ b/hw/xfree86/common/xf86Init.c
+@@ -361,6 +361,16 @@ xf86CreateRootWindow(WindowPtr pWin)
+ return ret;
+ }
+
++extern void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master);
++static void
++xf86AutoConfigOutputDevices(void)
++{
++ int i;
++
++ for (i = 0; i < xf86NumGPUScreens; i++)
++ xf86AutoConfigOutputDevice(xf86GPUScreens[i], xf86Screens[0]);
++}
++
+ static void
+ InstallSignalHandlers(void)
+ {
+@@ -926,6 +936,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
+ for (i = 0; i < xf86NumGPUScreens; i++)
+ AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
+
++ xf86AutoConfigOutputDevices();
++
+ xf86VGAarbiterWrapFunctions();
+ if (sigio_blocked)
+ OsReleaseSIGIO();
+diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
+index a73aea2..3810076 100644
+--- a/hw/xfree86/common/xf86platformBus.c
++++ b/hw/xfree86/common/xf86platformBus.c
+@@ -387,6 +387,8 @@ xf86platformProbeDev(DriverPtr drvp)
+ return foundScreen;
+ }
+
++extern void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master);
++
+ int
+ xf86platformAddDevice(int index)
+ {
+@@ -446,6 +448,7 @@ xf86platformAddDevice(int index)
+
+ /* attach unbound to 0 protocol screen */
+ AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen);
++ xf86AutoConfigOutputDevice(xf86GPUScreens[i], xf86Screens[0]);
+
+ return 0;
+ }
+diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
+index 8f05c53..ba84e6b 100644
+--- a/hw/xfree86/modes/xf86Crtc.c
++++ b/hw/xfree86/modes/xf86Crtc.c
+@@ -3321,3 +3321,31 @@ xf86DetachAllCrtc(ScrnInfoPtr scrn)
+ crtc->x = crtc->y = 0;
+ }
+ }
++
++
++void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master)
++{
++ RRProviderPtr master_provider;
++ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(master);
++ xf86CrtcConfigPtr slave_config = XF86_CRTC_CONFIG_PTR(pScrn);
++
++ if (!config || !slave_config)
++ return;
++
++ master_provider = config->randr_provider;
++
++ if ((master->capabilities & RR_Capability_SinkOffload) &&
++ pScrn->capabilities & RR_Capability_SourceOffload) {
++ /* source offload */
++
++ DetachUnboundGPU(pScrn->pScreen);
++ AttachOffloadGPU(master->pScreen, pScrn->pScreen);
++ slave_config->randr_provider->offload_sink = master_provider;
++ } else if ((master->capabilities & RR_Capability_SourceOutput) &&
++ pScrn->capabilities & RR_Capability_SinkOutput) {
++ /* sink offload */
++ DetachUnboundGPU(pScrn->pScreen);
++ AttachOutputGPU(master->pScreen, pScrn->pScreen);
++ slave_config->randr_provider->output_source = master_provider;
++ }
++}
+--
+1.7.10.2
+
diff --git a/xorg-x11-server/xorg-x11-server.nm b/xorg-x11-server/xorg-x11-server.nm
index bc14fa5..f2d933c 100644
--- a/xorg-x11-server/xorg-x11-server.nm
+++ b/xorg-x11-server/xorg-x11-server.nm
@@ -4,8 +4,8 @@
###############################################################################
name = xorg-x11-server
-version = 1.8.2
-release = 7
+version = 1.13.2
+release = 1
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
groups = X/Server
@@ -20,8 +20,9 @@ description
upon.
end
-sources_dl = http://ftp.x.org/pub/individual/xserver/
-sources = xorg-server-%{version}.tar.bz2
+thisapp = xorg-server-%{version}
+
+source_dl = http://ftp.x.org/pub/individual/xserver/
build
requires
@@ -47,29 +48,25 @@ build
libudev-devel
libxcb-devel
libxkbfile-devel
- mesa-devel
+ mesa-devel >= 9.0.2
openssl-devel
pixman-devel
pkg-config
xorg-x11-font-utils-devel
xorg-x11-util-macros
- xorg-x11-proto-devel
+ xorg-x11-proto-devel >= 7.7
xorg-x11-xtrans-devel
end
- DIR_APP = %{DIR_SRC}/xorg-server-%{version}
-
CFLAGS += -Wstrict-overflow -rdynamic
configure_options += \
--enable-xvfb \
- --enable-xsdl \
--enable-xfake \
--enable-xfbdev \
--enable-xorg \
--disable-static \
--disable-xnest \
- --disable-xdmx \
--disable-xephyr \
--with-pic \
--enable-maintainer-mode \
@@ -100,7 +97,6 @@ build
-e "s/^CCASFLAGS.*/& -Wl,-z,lazy/" \
\
hw/xfree86/dixmods/Makefile \
- hw/xfree86/dixmods/extmod/Makefile \
hw/xfree86/dri/Makefile \
hw/xfree86/dri2/Makefile \
hw/xfree86/exa/Makefile \
@@ -110,7 +106,6 @@ build
hw/xfree86/shadowfb/Makefile \
hw/xfree86/vbe/Makefile \
hw/xfree86/vgahw/Makefile \
- hw/xfree86/xaa/Makefile
end
make_install_targets += \
@@ -133,10 +128,21 @@ end
packages
package %{name}
requires
- mesa
pixman
udev
xkeyboard-config
+ end
+
+ recommends
+ xorg-x11-drv-ati
+ xorg-x11-drv-evdev
+ xorg-x11-drv-intel
+ xorg-x11-drv-keyboard
+ xorg-x11-drv-modesetting
+ xorg-x11-drv-mouse
+ xorg-x11-drv-nouveau
+ xorg-x11-drv-vesa
+ xorg-x11-drv-vmware
xorg-x11-fonts
xorg-x11-font-utils
xorg-x11-xkb-utils
diff --git a/xorg-x11-util-macros/xorg-x11-util-macros.nm b/xorg-x11-util-macros/xorg-x11-util-macros.nm
index 20f170e..478570b 100644
--- a/xorg-x11-util-macros/xorg-x11-util-macros.nm
+++ b/xorg-x11-util-macros/xorg-x11-util-macros.nm
@@ -4,7 +4,7 @@
###############################################################################
name = xorg-x11-util-macros
-version = 1.10.0
+version = 1.17
release = 1
arch = noarch
@@ -19,17 +19,16 @@ description
packages that comprise the X Window System.
end
+thisapp = util-macros-%{version}
+
source_dl = http://ftp.x.org/pub/individual/util/
-sources = util-macros-%{version}.tar.bz2
build
requires
pkg-config
end
- DIR_APP = %{DIR_SRC}/util-macros-%{version}
-
configure_options += \
--disable-static
diff --git a/xorg-x11-xinit/patches/xinit-1.0.2-client-session.patch b/xorg-x11-xinit/patches/xinit-1.0.2-client-session.patch
new file mode 100644
index 0000000..a38c883
--- /dev/null
+++ b/xorg-x11-xinit/patches/xinit-1.0.2-client-session.patch
@@ -0,0 +1,39 @@
+Index: xinit-1.3.1/xinit.c
+===================================================================
+--- xinit-1.3.1.orig/xinit.c
++++ xinit-1.3.1/xinit.c
+@@ -91,6 +91,8 @@ char xserverrcbuf[256];
+
+ #define TRUE 1
+ #define FALSE 0
++#define OK_EXIT 0
++#define ERR_EXIT 1
+
+ static char *default_server = "X";
+ static char *default_display = ":0"; /* choose most efficient */
+@@ -561,6 +563,7 @@ startClient(char *client[])
+ {
+ clientpid = fork();
+ if (clientpid == 0) {
++ int fd;
+ set_environment();
+ setWindowPath();
+
+@@ -568,7 +571,16 @@ startClient(char *client[])
+ Error("cannot change uid");
+ _exit(EXIT_FAILURE);
+ }
+- setpgid(0, getpid());
++ fd = open ("/dev/null", O_RDONLY);
++
++ if (fd < 0) {
++ Error("cannot open /dev/null: %s\n", strerror(errno));
++ _exit(ERR_EXIT);
++ }
++ close (STDIN_FILENO);
++ dup2 (fd, STDIN_FILENO);
++ close (fd);
++ setsid();
+ Execute(client);
+ Error("Unable to run program \"%s\"", client[0]);
+
diff --git a/xorg-x11-xinit/patches/xorg-x11-xinit-1.3.2-systemd-logind.patch b/xorg-x11-xinit/patches/xorg-x11-xinit-1.3.2-systemd-logind.patch
new file mode 100644
index 0000000..85261da
--- /dev/null
+++ b/xorg-x11-xinit/patches/xorg-x11-xinit-1.3.2-systemd-logind.patch
@@ -0,0 +1,27 @@
+diff -Nur xinit-1.3.2.orig/startx.cpp xinit-1.3.2/startx.cpp
+--- xinit-1.3.2.orig/startx.cpp 2012-09-29 11:55:06.661264745 -0600
++++ xinit-1.3.2/startx.cpp 2012-09-29 11:56:24.849771316 -0600
+@@ -80,6 +80,7 @@
+ defaultdisplay=":0"
+ clientargs=""
+ serverargs=""
++tty_num=$(tty | grep -oE '[0-9]+$')
+
+ #ifdef __APPLE__
+
+@@ -135,6 +136,15 @@
+ enable_xauth=1
+ #endif
+
++if [ x"$tty_num" != x ]; then
++ # Specify TTY number directly to avoid recognizing startx session as
++ # inactive: RHBZ#820675
++ serverargs=${serverargs}" vt"${tty_num}
++else
++ echo "Error getting tty num"
++ exit 1
++fi
++
+ XCOMM Automatically determine an unused $DISPLAY
+ d=0
+ while true ; do
diff --git a/xorg-x11-xinit/xorg-x11-xinit.nm b/xorg-x11-xinit/xorg-x11-xinit.nm
index c9991fb..c3ad690 100644
--- a/xorg-x11-xinit/xorg-x11-xinit.nm
+++ b/xorg-x11-xinit/xorg-x11-xinit.nm
@@ -4,7 +4,7 @@
###############################################################################
name = xorg-x11-xinit
-version = 1.2.1
+version = 1.3.2
release = 1
thisapp = xinit-%{version}
@@ -21,9 +21,17 @@ source_dl = http://ftp.x.org/pub/individual/app/
build
requires
+ autoconf
+ automake
libX11-devel
+ libtool
xorg-x11-util-macros
end
+
+ prepare_cmds
+ # Regenerate build system.
+ autoreconf -vfi
+ end
end
packages
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 60b00d18b96a7c7243fbdd50a1eddb4a0b9a5a00
by git＠ipfire.org 05 Feb '13
by git＠ipfire.org 05 Feb '13
05 Feb '13
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 60b00d18b96a7c7243fbdd50a1eddb4a0b9a5a00 (commit)
via d4f1083def69c208acc68a2b29821e902418613d (commit)
via 3ecb669f5bd190500e739f5390dd32f23772dcdc (commit)
from 02a43f996a257b62d81d344f4fb3f07bd61bd854 (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 60b00d18b96a7c7243fbdd50a1eddb4a0b9a5a00
Merge: d4f1083 02a43f9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Feb 5 20:55:08 2013 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit d4f1083def69c208acc68a2b29821e902418613d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Feb 5 20:09:50 2013 +0100
gnutls: Update to 3.1.7.
Security fix #10299.
commit 3ecb669f5bd190500e739f5390dd32f23772dcdc
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Feb 5 20:01:03 2013 +0100
polarssl: Update to 1.2.5.
Security update #10298.
-----------------------------------------------------------------------
Summary of changes:
gnutls/gnutls.nm | 6 ++++--
polarssl/polarssl.nm | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
Difference in files:
diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm
index d634615..7ba949e 100644
--- a/gnutls/gnutls.nm
+++ b/gnutls/gnutls.nm
@@ -4,7 +4,9 @@
###############################################################################
name = gnutls
-version = 3.1.4
+version = %{ver_maj}.%{ver_min}
+ver_maj = 3.1
+ver_min = 7
release = 1
groups = System/Libraries
@@ -19,7 +21,7 @@ description
TLS working group.
end
-source_dl = ftp://ftp.gnu.org/gnu/gnutls/
+source_dl = ftp://ftp.gnutls.org/gcrypt/gnutls/v%{ver_maj}/
sources = %{thisapp}.tar.xz
build
diff --git a/polarssl/polarssl.nm b/polarssl/polarssl.nm
index 4186ac5..7d7a5eb 100644
--- a/polarssl/polarssl.nm
+++ b/polarssl/polarssl.nm
@@ -4,7 +4,7 @@
###############################################################################
name = polarssl
-version = 1.1.4
+version = 1.2.5
release = 1
groups = System/Libraries
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f1a58c3322701040090efd1b7949f448c3128d5a
by git＠ipfire.org 05 Feb '13
by git＠ipfire.org 05 Feb '13
05 Feb '13
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 f1a58c3322701040090efd1b7949f448c3128d5a (commit)
via 7a26d28aa4f4c3602970cccdf0697d555b39ef3c (commit)
from ea31a62aadf428e37a686568e5b95caf0fbc07b6 (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 f1a58c3322701040090efd1b7949f448c3128d5a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Feb 5 19:26:58 2013 +0100
openssh: Update to 6.1p1.
commit 7a26d28aa4f4c3602970cccdf0697d555b39ef3c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Feb 5 19:01:11 2013 +0100
openssl: Update to 0.9.8y.
Fixes the "Lucky Thirteen" issue: http://www.isg.rhul.ac.uk/tls/
also known as CVE-2013-0169
http://www.openssl.org/news/secadv_20130205.txt
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/openssl | 1 -
config/rootfiles/{oldcore/36 => core/66}/filelists/openssh | 0
lfs/openssh | 4 ++--
lfs/openssl | 4 ++--
4 files changed, 4 insertions(+), 5 deletions(-)
copy config/rootfiles/{oldcore/36 => core/66}/filelists/openssh (100%)
Difference in files:
diff --git a/config/rootfiles/common/openssl b/config/rootfiles/common/openssl
index 296a0c0..bc1ac49 100644
--- a/config/rootfiles/common/openssl
+++ b/config/rootfiles/common/openssl
@@ -1164,7 +1164,6 @@ usr/lib/libssl.so.0.9.8
#usr/share/man/man3/md5.3
#usr/share/man/man3/mdc2.3
#usr/share/man/man3/pem.3
-#usr/share/man/man3/rand.3
#usr/share/man/man3/rc4.3
#usr/share/man/man3/ripemd.3
#usr/share/man/man3/rsa.3
diff --git a/config/rootfiles/core/66/filelists/openssh b/config/rootfiles/core/66/filelists/openssh
new file mode 120000
index 0000000..d8c77fd
--- /dev/null
+++ b/config/rootfiles/core/66/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file
diff --git a/lfs/openssh b/lfs/openssh
index 26ac555..774e18a 100644
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -24,7 +24,7 @@
include Config
-VER = 6.0p1
+VER = 6.1p1
THISAPP = openssh-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 3c9347aa67862881c5da3f3b1c08da7b
+$(DL_FILE)_MD5 = 3345cbf4efe90ffb06a78670ab2d05d5
install : $(TARGET)
diff --git a/lfs/openssl b/lfs/openssl
index 9aef173..b9d2617 100644
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -24,7 +24,7 @@
include Config
-VER = 0.9.8x
+VER = 0.9.8y
THISAPP = openssl-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ee17e9bc805c8cc7d0afac3b0ef78eda
+$(DL_FILE)_MD5 = 47c7fb37f78c970f1d30aa2f9e9e26d8
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree
1
0