[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. be267b17a2808f436334944364b0d47f3c084243
by git＠ipfire.org 08 Mar '10
by git＠ipfire.org 08 Mar '10
08 Mar '10
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via be267b17a2808f436334944364b0d47f3c084243 (commit)
from 912a6366ac1fc43d254fc9301b8e653dd0ccb50f (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 be267b17a2808f436334944364b0d47f3c084243
Author: Jorrit de Jonge <jorritdejonge(a)gmail.com>
Date: Mon Mar 8 02:31:42 2010 -0800
Updated gutenprint to version 5.2.5
Signed-off-by: Schantl Stefan <Stevee(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
lfs/gutenprint | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Difference in files:
diff --git a/lfs/gutenprint b/lfs/gutenprint
index 81b3660..8e3b276 100644
--- a/lfs/gutenprint
+++ b/lfs/gutenprint
@@ -24,7 +24,7 @@
include Config
-VER = 5.0.2
+VER = 5.2.5
THISAPP = gutenprint-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ca6c45616caa720e9e185817272b08d7
+$(DL_FILE)_MD5 = 10a0a9fac081d8116ec5ed47fbc1591c
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
hooks/post-receive
--
IPFire 2.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. ba48a4a5d521e5d68ae52cbaf579e54cc9d31a61
by git＠ipfire.org 08 Mar '10
by git＠ipfire.org 08 Mar '10
08 Mar '10
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 ba48a4a5d521e5d68ae52cbaf579e54cc9d31a61 (commit)
from 82705b6e9953f42d91ecdcfa516bd6adfa5183d3 (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 ba48a4a5d521e5d68ae52cbaf579e54cc9d31a61
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Mar 8 11:53:27 2010 +0100
Fix cyrus-sasl autorun.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/initscripts | 3 +++
lfs/initscripts | 4 +++-
src/paks/cyrus-sasl/install.sh | 29 -----------------------------
src/paks/cyrus-sasl/uninstall.sh | 27 ---------------------------
src/paks/cyrus-sasl/update.sh | 26 --------------------------
5 files changed, 6 insertions(+), 83 deletions(-)
delete mode 100644 src/paks/cyrus-sasl/install.sh
delete mode 100644 src/paks/cyrus-sasl/uninstall.sh
delete mode 100644 src/paks/cyrus-sasl/update.sh
Difference in files:
diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts
index ae40f4a..c641821 100644
--- a/config/rootfiles/common/initscripts
+++ b/config/rootfiles/common/initscripts
@@ -196,3 +196,6 @@ etc/rc.d/rc6.d/K85tmpfs
#etc/rc.d/rc6.d/K01miau
#etc/rc.d/init.d/netsnmpd
#etc/rc.d/init.d/mdadm
+etc/rc.d/rc0.d/K49cyrus-sasl
+etc/rc.d/rc3.d/S24cyrus-sasl
+etc/rc.d/rc6.d/K49cyrus-sasl
diff --git a/lfs/initscripts b/lfs/initscripts
index 9e9484b..56c4222 100644
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -144,7 +144,9 @@ $(TARGET) :
ln -sf ../init.d/motion /etc/rc.d/rc3.d/S99motion
ln -sf ../init.d/motion /etc/rc.d/rc0.d/K01motion
ln -sf ../init.d/motion /etc/rc.d/rc6.d/K01motion
-
+ ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc0.d/K49cyrus-sasl
+ ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc3.d/S24cyrus-sasl
+ ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc6.d/K49cyrus-sasl
ln -sf ../init.d/mountkernfs /etc/rc.d/rcsysinit.d/S00mountkernfs
ln -sf ../init.d/modules /etc/rc.d/rcsysinit.d/S05modules
ln -sf ../init.d/udev /etc/rc.d/rcsysinit.d/S10udev
diff --git a/src/paks/cyrus-sasl/install.sh b/src/paks/cyrus-sasl/install.sh
deleted file mode 100644
index 7a0b71c..0000000
--- a/src/paks/cyrus-sasl/install.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire is free software; you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation; either version 2 of the License, or #
-# (at your option) any later version. #
-# #
-# IPFire is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-extract_files
-ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc0.d/K49cyrus-sasl
-ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc3.d/S24cyrus-sasl
-ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc6.d/K49cyrus-sasl
-start_service ${NAME}
diff --git a/src/paks/cyrus-sasl/uninstall.sh b/src/paks/cyrus-sasl/uninstall.sh
deleted file mode 100644
index b3b4d55..0000000
--- a/src/paks/cyrus-sasl/uninstall.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire is free software; you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation; either version 2 of the License, or #
-# (at your option) any later version. #
-# #
-# IPFire is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-stop_service ${NAME}
-remove_files
-rm -rvf /etc/rc.d/rc*.d/*cyrus-sasl
diff --git a/src/paks/cyrus-sasl/update.sh b/src/paks/cyrus-sasl/update.sh
deleted file mode 100644
index 89c40d0..0000000
--- a/src/paks/cyrus-sasl/update.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire is free software; you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation; either version 2 of the License, or #
-# (at your option) any later version. #
-# #
-# IPFire is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-./uninstall.sh
-./install.sh
hooks/post-receive
--
IPFire 2.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 912a6366ac1fc43d254fc9301b8e653dd0ccb50f
by git＠ipfire.org 08 Mar '10
by git＠ipfire.org 08 Mar '10
08 Mar '10
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via 912a6366ac1fc43d254fc9301b8e653dd0ccb50f (commit)
via d7a707a87fd4ea7514a7b27466797f00048496b6 (commit)
from e317c06e0398b7782d88f3b47bcaa26f0be1639b (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 912a6366ac1fc43d254fc9301b8e653dd0ccb50f
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Mar 8 11:53:48 2010 +0100
Fix cyrus-sasl autorun with core37.
commit d7a707a87fd4ea7514a7b27466797f00048496b6
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Mar 8 11:53:27 2010 +0100
Fix cyrus-sasl autorun.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/initscripts | 3 +++
config/rootfiles/core/37/update.sh | 5 +++++
lfs/initscripts | 4 +++-
src/paks/cyrus-sasl/install.sh | 29 -----------------------------
src/paks/cyrus-sasl/uninstall.sh | 27 ---------------------------
src/paks/cyrus-sasl/update.sh | 26 --------------------------
6 files changed, 11 insertions(+), 83 deletions(-)
delete mode 100644 src/paks/cyrus-sasl/install.sh
delete mode 100644 src/paks/cyrus-sasl/uninstall.sh
delete mode 100644 src/paks/cyrus-sasl/update.sh
Difference in files:
diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts
index ae40f4a..c641821 100644
--- a/config/rootfiles/common/initscripts
+++ b/config/rootfiles/common/initscripts
@@ -196,3 +196,6 @@ etc/rc.d/rc6.d/K85tmpfs
#etc/rc.d/rc6.d/K01miau
#etc/rc.d/init.d/netsnmpd
#etc/rc.d/init.d/mdadm
+etc/rc.d/rc0.d/K49cyrus-sasl
+etc/rc.d/rc3.d/S24cyrus-sasl
+etc/rc.d/rc6.d/K49cyrus-sasl
diff --git a/config/rootfiles/core/37/update.sh b/config/rootfiles/core/37/update.sh
index e78621e..e363f89 100644
--- a/config/rootfiles/core/37/update.sh
+++ b/config/rootfiles/core/37/update.sh
@@ -36,6 +36,11 @@ extract_files
#Delete sensors config to force new scan
rm -f /etc/sysconfig/lm_sensors
+#Create cyrus-sasl autostart links
+ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc0.d/K49cyrus-sasl
+ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc3.d/S24cyrus-sasl
+ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc6.d/K49cyrus-sasl
+
#
#Update Language cache
perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
diff --git a/lfs/initscripts b/lfs/initscripts
index 9e9484b..56c4222 100644
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -144,7 +144,9 @@ $(TARGET) :
ln -sf ../init.d/motion /etc/rc.d/rc3.d/S99motion
ln -sf ../init.d/motion /etc/rc.d/rc0.d/K01motion
ln -sf ../init.d/motion /etc/rc.d/rc6.d/K01motion
-
+ ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc0.d/K49cyrus-sasl
+ ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc3.d/S24cyrus-sasl
+ ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc6.d/K49cyrus-sasl
ln -sf ../init.d/mountkernfs /etc/rc.d/rcsysinit.d/S00mountkernfs
ln -sf ../init.d/modules /etc/rc.d/rcsysinit.d/S05modules
ln -sf ../init.d/udev /etc/rc.d/rcsysinit.d/S10udev
diff --git a/src/paks/cyrus-sasl/install.sh b/src/paks/cyrus-sasl/install.sh
deleted file mode 100644
index 7a0b71c..0000000
--- a/src/paks/cyrus-sasl/install.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire is free software; you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation; either version 2 of the License, or #
-# (at your option) any later version. #
-# #
-# IPFire is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-extract_files
-ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc0.d/K49cyrus-sasl
-ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc3.d/S24cyrus-sasl
-ln -sf ../init.d/cyrus-sasl /etc/rc.d/rc6.d/K49cyrus-sasl
-start_service ${NAME}
diff --git a/src/paks/cyrus-sasl/uninstall.sh b/src/paks/cyrus-sasl/uninstall.sh
deleted file mode 100644
index b3b4d55..0000000
--- a/src/paks/cyrus-sasl/uninstall.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire is free software; you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation; either version 2 of the License, or #
-# (at your option) any later version. #
-# #
-# IPFire is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-stop_service ${NAME}
-remove_files
-rm -rvf /etc/rc.d/rc*.d/*cyrus-sasl
diff --git a/src/paks/cyrus-sasl/update.sh b/src/paks/cyrus-sasl/update.sh
deleted file mode 100644
index 89c40d0..0000000
--- a/src/paks/cyrus-sasl/update.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire is free software; you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation; either version 2 of the License, or #
-# (at your option) any later version. #
-# #
-# IPFire is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with IPFire; if not, write to the Free Software #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
-# #
-# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-./uninstall.sh
-./install.sh
hooks/post-receive
--
IPFire 2.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 82705b6e9953f42d91ecdcfa516bd6adfa5183d3
by git＠ipfire.org 07 Mar '10
by git＠ipfire.org 07 Mar '10
07 Mar '10
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 82705b6e9953f42d91ecdcfa516bd6adfa5183d3 (commit)
from 5ab7c89392bd2758e42484ee9528540f04d7d3f9 (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 82705b6e9953f42d91ecdcfa516bd6adfa5183d3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Mar 7 23:45:06 2010 +0100
Add some patches to grub.
-----------------------------------------------------------------------
Summary of changes:
lfs/grub | 42 ++-
src/patches/grub-0.90-append.patch | 111 ++++
src/patches/grub-0.90-symlinkmenulst.patch | 16 +
src/patches/grub-0.93-configfile.patch | 75 +++
src/patches/grub-0.93-endedit.patch | 77 +++
src/patches/grub-0.94-installcopyonly.patch | 85 +++
src/patches/grub-0.95-hiddenmenu-tweak.patch | 39 ++
src/patches/grub-0.95-md-mbr.patch | 11 +
src/patches/grub-0.95-md-rework.patch | 183 ++++++
src/patches/grub-0.95-md.patch | 183 ++++++
src/patches/grub-0.95-nonmbr.patch | 14 +
src/patches/grub-0.95-odirect.patch | 115 ++++
src/patches/grub-0.95-recheck-bad.patch | 83 +++
src/patches/grub-0.95-staticcurses.patch | 14 +
src/patches/grub-0.97-bz429187-cciss.patch | 75 +++
src/patches/grub-0.97-cmdline-size.patch | 45 ++
src/patches/grub-0.97-datadir.patch | 229 ++++++++
src/patches/grub-0.97-dmraid-partition-names.patch | 10 +
src/patches/grub-0.97-dmraid-recheck-bad.patch | 17 +
src/patches/grub-0.97-dmraid.patch | 92 +++
src/patches/grub-0.97-install.in.patch | 34 ++
src/patches/grub-0.97-mactel-kbd.patch | 100 ++++
src/patches/grub-0.97-mdadm-path.patch | 27 +
src/patches/grub-0.97-mpath.patch | 18 +
src/patches/grub-0.97-nx-multiinstall.patch | 60 ++
src/patches/grub-0.97-nxstack.patch | 615 ++++++++++++++++++++
src/patches/grub-0.97-once.patch | 513 ++++++++++++++++
src/patches/grub-0.97-prototypes.patch | 11 +
src/patches/grub-0.97-stderr.patch | 102 ++++
29 files changed, 2990 insertions(+), 6 deletions(-)
create mode 100644 src/patches/grub-0.90-append.patch
create mode 100644 src/patches/grub-0.90-symlinkmenulst.patch
create mode 100644 src/patches/grub-0.93-configfile.patch
create mode 100644 src/patches/grub-0.93-endedit.patch
create mode 100644 src/patches/grub-0.94-installcopyonly.patch
create mode 100644 src/patches/grub-0.95-hiddenmenu-tweak.patch
create mode 100644 src/patches/grub-0.95-md-mbr.patch
create mode 100644 src/patches/grub-0.95-md-rework.patch
create mode 100644 src/patches/grub-0.95-md.patch
create mode 100644 src/patches/grub-0.95-nonmbr.patch
create mode 100644 src/patches/grub-0.95-odirect.patch
create mode 100644 src/patches/grub-0.95-recheck-bad.patch
create mode 100644 src/patches/grub-0.95-staticcurses.patch
create mode 100644 src/patches/grub-0.97-bz429187-cciss.patch
create mode 100644 src/patches/grub-0.97-cmdline-size.patch
create mode 100644 src/patches/grub-0.97-datadir.patch
create mode 100644 src/patches/grub-0.97-dmraid-partition-names.patch
create mode 100644 src/patches/grub-0.97-dmraid-recheck-bad.patch
create mode 100644 src/patches/grub-0.97-dmraid.patch
create mode 100644 src/patches/grub-0.97-install.in.patch
create mode 100644 src/patches/grub-0.97-mactel-kbd.patch
create mode 100644 src/patches/grub-0.97-mdadm-path.patch
create mode 100644 src/patches/grub-0.97-mpath.patch
create mode 100644 src/patches/grub-0.97-nx-multiinstall.patch
create mode 100644 src/patches/grub-0.97-nxstack.patch
create mode 100644 src/patches/grub-0.97-once.patch
create mode 100644 src/patches/grub-0.97-prototypes.patch
create mode 100644 src/patches/grub-0.97-stderr.patch
Difference in files:
diff --git a/lfs/grub b/lfs/grub
index ed801f8..8b9f0eb 100644
--- a/lfs/grub
+++ b/lfs/grub
@@ -73,15 +73,45 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-disk_geometry-1.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-graphics.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.90-append.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.90-symlinkmenulst.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.91-splashimagehelp.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.93-configfile.patch
+ cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/grub-0.93-endedit.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.93-graphics-bootterm.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-xpmjunk.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-splash-error-term.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.93-special-device-names.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-moreraid.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.94-i2o.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97_grub-install_virtio.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-graphics.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-hiddenmenu-tweak.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-md.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-md-rework.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-md-mbr.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-moreraid.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-nonmbr.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-odirect.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-recheck-bad.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-staticcurses.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-xpmjunk.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-cmdline-size.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-datadir.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-dmraid.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-dmraid-partition-names.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-install.in.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-mactel-kbd.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-mpath.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-nxstack.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-nx-multiinstall.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-once.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.95-splash-error-term.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.94-installcopyonly.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-prototypes.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-stderr.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-bz429187-cciss.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-dmraid-recheck-bad.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97-mdadm-path.patch
+
+ # XXX Does not work anymore
+ #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-0.97_grub-install_virtio.patch
cd $(DIR_APP) && perl -pi -e 's,/usr/lib/grub/i386-pc,/usr/share/grub/i386-pc,' docs/grub.texi
cd $(DIR_APP) && sed -i 's/AM_INIT_AUTOMAKE/&\nAM_PROG_AS/' configure.ac
@@ -94,7 +124,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# grub files
mkdir -vp /boot/grub
- cp -v /usr/lib/grub/i386-pc/stage{1,2} /boot/grub
+ cp -v /usr/share/grub/i386-pc/stage{1,2} /boot/grub
for i in $(DIR_SRC)/config/grub/*; do \
[ -f $$i ] && cp -f $$i /boot/grub; \
done
diff --git a/src/patches/grub-0.90-append.patch b/src/patches/grub-0.90-append.patch
new file mode 100644
index 0000000..88f79d0
--- /dev/null
+++ b/src/patches/grub-0.90-append.patch
@@ -0,0 +1,111 @@
+--- grub-0.90/stage2/stage2.c.append Thu Dec 20 08:20:48 2001
++++ grub-0.90/stage2/stage2.c Thu Dec 20 17:01:20 2001
+@@ -500,7 +500,8 @@
+ if (config_entries)
+ printf ("\
+ Press enter to boot the selected OS, \'e\' to edit the\n\
+- commands before booting, or \'c\' for a command-line.");
++ commands before booting, \'a\' to modify the kernel arguments\n\
++ before booting, or \'c\' for a command-line.");
+ else
+ printf ("\
+ Press \'b\' to boot, \'e\' to edit the selected command in the\n\
+@@ -787,6 +788,98 @@
+ enter_cmdline (heap, 0);
+ goto restart;
+ }
++ if (config_entries && c == 'a')
++ {
++ int new_num_entries = 0, i = 0, j;
++ int needs_padding, amount;
++ char *new_heap;
++ char * entries;
++ char * entry_copy;
++ char * append_line;
++ char * start;
++
++ entry_copy = new_heap = heap;
++ cur_entry = get_entry (config_entries, first_entry + entryno,
++ 1);
++
++ do
++ {
++ while ((*(new_heap++) = cur_entry[i++]) != 0);
++ new_num_entries++;
++ }
++ while (config_entries && cur_entry[i]);
++
++ /* this only needs to be done if config_entries is non-NULL,
++ but it doesn't hurt to do it always */
++ *(new_heap++) = 0;
++
++ new_heap = heap + NEW_HEAPSIZE + 1;
++
++ entries = entry_copy;
++ while (*entries)
++ {
++ if ((strstr(entries, "kernel") == entries) &&
++ isspace(entries[6]))
++ break;
++
++ while (*entries) entries++;
++ entries++;
++ }
++
++ if (!*entries)
++ goto restart;
++
++ start = entries + 6;
++
++ /* skip the white space */
++ while (*start && isspace(*start)) start++;
++ /* skip the kernel name */
++ while (*start && !isspace(*start)) start++;
++
++ /* skip the white space */
++ needs_padding = (!*start || !isspace(*start));
++ while (*start && isspace(*start)) start++;
++
++ append_line = new_heap;
++ grub_strcpy(append_line, start);
++
++ cls();
++ print_cmdline_message (CMDLINE_EDIT_MODE);
++
++ if (get_cmdline(PACKAGE " append> ",
++ append_line, NEW_HEAPSIZE + 1,
++ 0, 1))
++ goto restart;
++
++ /* have new args; append_line points to the
++ new args and start points to the old
++ args */
++
++ i = grub_strlen(start);
++ j = grub_strlen(append_line);
++
++ if (i > (j + needs_padding))
++ amount = i;
++ else
++ amount = j + needs_padding;
++
++ /* align rest of commands properly */
++ memmove (start + j + needs_padding, start + i,
++ ((int) append_line) - ((int) start) - (amount));
++
++ if (needs_padding)
++ *start = ' ';
++
++ /* copy command to correct area */
++ memmove (start + needs_padding, append_line, j);
++
++ /* set up this entry to boot */
++ config_entries = NULL;
++ cur_entry = entry_copy;
++ heap = new_heap;
++
++ break;
++ }
+ #ifdef GRUB_UTIL
+ if (c == 'q')
+ {
diff --git a/src/patches/grub-0.90-symlinkmenulst.patch b/src/patches/grub-0.90-symlinkmenulst.patch
new file mode 100644
index 0000000..553d15a
--- /dev/null
+++ b/src/patches/grub-0.90-symlinkmenulst.patch
@@ -0,0 +1,16 @@
+Only in grub: ChangeLog~
+diff -ur grub-0.90/util/grub-install.in grub/util/grub-install.in
+--- grub-0.90/util/grub-install.in Wed Sep 5 15:50:06 2001
++++ grub/util/grub-install.in Wed Sep 5 15:50:24 2001
+@@ -320,6 +320,10 @@
+ exit 1
+ fi
+
++if ! test -e ${grubdir}/grub.conf ; then
++ test -e ${grubdir}/menu.lst && ln -s ./menu.lst ${grubdir}/grub.conf
++fi
++
+ # Create a safe temporary file.
+ test -x /bin/mktemp && log_file=`/bin/mktemp /tmp/grub-install.log.XXXXXX`
+
+Only in grub/util: grub-install.in.orig
diff --git a/src/patches/grub-0.93-configfile.patch b/src/patches/grub-0.93-configfile.patch
new file mode 100644
index 0000000..9cb1182
--- /dev/null
+++ b/src/patches/grub-0.93-configfile.patch
@@ -0,0 +1,75 @@
+--- grub-0.93/stage2/asm.S.config 2002-12-02 18:18:56.000000000 -0500
++++ grub-0.93/stage2/asm.S 2002-12-28 22:01:24.000000000 -0500
+@@ -97,7 +97,7 @@
+ .string VERSION
+ VARIABLE(config_file)
+ #ifndef STAGE1_5
+- .string "/boot/grub/menu.lst"
++ .string "/boot/grub/grub.conf"
+ #else /* STAGE1_5 */
+ .long 0xffffffff
+ .string "/boot/grub/stage2"
+--- grub-0.93/stage2/builtins.c.config 2002-12-03 23:41:57.000000000 -0500
++++ grub-0.93/stage2/builtins.c 2002-12-28 22:01:24.000000000 -0500
+@@ -3838,7 +3838,7 @@
+
+ /* The prefix was determined. */
+ grub_sprintf (stage2, "%s%s", prefix, "/stage2");
+- grub_sprintf (config_filename, "%s%s", prefix, "/menu.lst");
++ grub_sprintf (config_filename, "%s%s", prefix, "/grub.conf");
+ *real_config_filename = 0;
+
+ /* Check if stage2 exists. */
+--- grub-0.93/grub/asmstub.c.config 2002-12-02 18:20:45.000000000 -0500
++++ grub-0.93/grub/asmstub.c 2002-12-28 22:01:24.000000000 -0500
+@@ -71,7 +71,7 @@
+ unsigned long boot_drive = 0;
+ int saved_entryno = 0;
+ char version_string[] = VERSION;
+-char config_file[128] = "/boot/grub/menu.lst"; /* FIXME: arbitrary */
++char config_file[128] = "/boot/grub/grub.conf"; /* FIXME: arbitrary */
+ unsigned long linux_text_len = 0;
+ char *linux_data_tmp_addr = 0;
+ char *linux_data_real_addr = 0;
+--- grub-0.93/docs/grub.8.config 2002-12-07 22:17:59.000000000 -0500
++++ grub-0.93/docs/grub.8 2002-12-28 22:01:24.000000000 -0500
+@@ -15,7 +15,7 @@
+ specify stage2 boot_drive [default=0x0]
+ .TP
+ \fB\-\-config\-file\fR=\fIFILE\fR
+-specify stage2 config_file [default=/boot/grub/menu.lst]
++specify stage2 config_file [default=/boot/grub/grub.conf]
+ .TP
+ \fB\-\-device\-map\fR=\fIFILE\fR
+ use the device map file FILE
+--- grub-0.93/docs/grub.texi.config 2002-12-02 17:35:28.000000000 -0500
++++ grub-0.93/docs/grub.texi 2002-12-28 22:01:24.000000000 -0500
+@@ -989,7 +989,7 @@
+ keys) that will do everything to boot an OS.
+
+ To enable the menu, you need a configuration file,
+-(a)file{menu.lst} under the boot directory. We'll analyze an example
++(a)file{grub.conf} under the boot directory. We'll analyze an example
+ file.
+
+ The file first contains some general settings, the menu interface
+@@ -1596,8 +1596,8 @@
+
+ An absolute file name resembles a Unix absolute file name, using
+ @samp{/} for the directory separator (not @samp{\} as in DOS). One
+-example is @samp{(hd0,0)/boot/grub/menu.lst}. This means the file
+-(a)file{/boot/grub/menu.lst} in the first partition of the first hard
++example is @samp{(hd0,0)/boot/grub/grub.conf}. This means the file
++(a)file{/boot/grub/grub.conf} in the first partition of the first hard
+ disk. If you omit the device name in an absolute file name, GRUB uses
+ GRUB's @dfn{root device} implicitly. So if you set the root device to,
+ say, @samp{(hd1,0)} by the command @command{root} (@pxref{root}), then
+@@ -3249,7 +3249,7 @@
+
+ @item --config-file=@var{file}
+ Read the configuration file @var{file} instead of
+-(a)file{/boot/grub/menu.lst}. The format is the same as the normal GRUB
++(a)file{/boot/grub/grub.conf}. The format is the same as the normal GRUB
+ syntax. See @ref{Filesystem}, for more information.
+
+ @item --boot-drive=@var{drive}
diff --git a/src/patches/grub-0.93-endedit.patch b/src/patches/grub-0.93-endedit.patch
new file mode 100644
index 0000000..eb0463c
--- /dev/null
+++ b/src/patches/grub-0.93-endedit.patch
@@ -0,0 +1,77 @@
+Index: stage2/cmdline.c
+===================================================================
+RCS file: /cvsroot/grub/grub/stage2/cmdline.c,v
+retrieving revision 1.27
+diff -u -r1.27 cmdline.c
+--- stage2/cmdline.c 3 Dec 2002 00:02:53 -0000 1.27
++++ stage2/cmdline.c 6 Jan 2003 05:33:33 -0000
+@@ -48,12 +48,17 @@
+
+ /* Print a helpful message for the command-line interface. */
+ void
+-print_cmdline_message (int forever)
++print_cmdline_message (int type)
+ {
+ printf (" [ Minimal BASH-like line editing is supported. For the first word, TAB\n"
+ " lists possible command completions. Anywhere else TAB lists the possible\n"
+- " completions of a device/filename.%s ]\n",
+- (forever ? "" : " ESC at any time exits."));
++ " completions of a device/filename.");
++ if (type == CMDLINE_NORMAL_MODE)
++ printf(" ESC at any time exits.");
++ if (type == CMDLINE_EDIT_MODE)
++ printf(" ESC at any time cancels. ENTER \n"
++ " at any time accepts your changes.");
++ printf("]\n");
+ }
+
+ /* Find the builtin whose command name is COMMAND and return the
+@@ -128,7 +133,7 @@
+ print_network_configuration ();
+ grub_putchar ('\n');
+ #endif
+- print_cmdline_message (forever);
++ print_cmdline_message (forever ? CMDLINE_FOREVER_MODE : CMDLINE_NORMAL_MODE);
+
+ while (1)
+ {
+Index: stage2/shared.h
+===================================================================
+RCS file: /cvsroot/grub/grub/stage2/shared.h,v
+retrieving revision 1.90
+diff -u -r1.90 shared.h
+--- stage2/shared.h 3 Dec 2002 00:02:53 -0000 1.90
++++ stage2/shared.h 6 Jan 2003 05:33:33 -0000
+@@ -843,9 +843,15 @@
+ void init_config (void);
+ char *skip_to (int after_equal, char *cmdline);
+ struct builtin *find_command (char *command);
+-void print_cmdline_message (int forever);
+ void enter_cmdline (char *heap, int forever);
+ int run_script (char *script, char *heap);
++
++/* the flags for the cmdline message */
++#define CMDLINE_FOREVER_MODE 0x0
++#define CMDLINE_NORMAL_MODE 0x1
++#define CMDLINE_EDIT_MODE 0x2
++
++void print_cmdline_message (int type);
+ #endif
+
+ /* C library replacement functions with identical semantics. */
+Index: stage2/stage2.c
+===================================================================
+RCS file: /cvsroot/grub/grub/stage2/stage2.c,v
+retrieving revision 1.42
+diff -u -r1.42 stage2.c
+--- stage2/stage2.c 4 Dec 2002 00:55:45 -0000 1.42
++++ stage2/stage2.c 6 Jan 2003 05:33:33 -0000
+@@ -655,7 +655,7 @@
+ else
+ {
+ cls ();
+- print_cmdline_message (0);
++ print_cmdline_message (CMDLINE_EDIT_MODE);
+
+ new_heap = heap + NEW_HEAPSIZE + 1;
+
diff --git a/src/patches/grub-0.94-installcopyonly.patch b/src/patches/grub-0.94-installcopyonly.patch
new file mode 100644
index 0000000..a2e38fb
--- /dev/null
+++ b/src/patches/grub-0.94-installcopyonly.patch
@@ -0,0 +1,85 @@
+--- grub-0.94/util/grub-install.in.copyonly 2004-02-02 16:33:29.172127985 -0500
++++ grub-0.94/util/grub-install.in 2004-02-02 16:34:26.027454320 -0500
+@@ -40,6 +40,7 @@
+ force_lba=
+ recheck=no
+ debug=no
++justcopy=no
+
+ # look for secure tempfile creation wrappers on this platform
+ if test -x /bin/tempfile; then
+@@ -221,6 +222,17 @@
+ echo "$tmp_fname"
+ }
+
++copy_images() {
++ # Copy the GRUB images to the GRUB directory.
++ for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do
++ rm -f $file || exit 1
++ done
++ for file in \
++ ${pkgdatadir}/stage1 ${pkgdatadir}/stage2 ${pkgdatadir}/*stage1_5; do
++ cp -f $file ${grubdir} || exit 1
++ done
++}
++
+ # Check the arguments.
+ for option in "$@"; do
+ case "$option" in
+@@ -240,6 +252,8 @@
+ force_lba="--force-lba" ;;
+ --recheck)
+ recheck=yes ;;
++ --just-copy)
++ justcopy=yes ;;
+ # This is an undocumented feature...
+ --debug)
+ debug=yes ;;
+@@ -258,12 +272,6 @@
+ esac
+ done
+
+-if test "x$install_device" = x; then
+- echo "install_device not specified." 1>&2
+- usage
+- exit 1
+-fi
+-
+ # If the debugging feature is enabled, print commands.
+ if test $debug = yes; then
+ set -x
+@@ -286,6 +294,18 @@
+ grubdir=${bootdir}/grub
+ device_map=${grubdir}/device.map
+
++# if they just want the images copied, copy the images and then exit
++if test $justcopy = yes; then
++ copy_images
++ exit 0
++fi
++
++if test "x$install_device" = x; then
++ echo "install_device not specified." 1>&2
++ usage
++ exit 1
++fi
++
+ # Check if GRUB is installed.
+ # This is necessary, because the user can specify "grub --read-only".
+ set $grub_shell dummy
+@@ -317,14 +337,7 @@
+ test -d "$bootdir" || mkdir "$bootdir" || exit 1
+ test -d "$grubdir" || mkdir "$grubdir" || exit 1
+
+-# Copy the GRUB images to the GRUB directory.
+-for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do
+- rm -f $file || exit 1
+-done
+-for file in \
+- ${pkgdatadir}/stage1 ${pkgdatadir}/stage2 ${pkgdatadir}/*stage1_5; do
+- cp -f $file ${grubdir} || exit 1
+-done
++copy_images
+
+ # If --recheck is specified, remove the device map, if present.
+ if test $recheck = yes; then
diff --git a/src/patches/grub-0.95-hiddenmenu-tweak.patch b/src/patches/grub-0.95-hiddenmenu-tweak.patch
new file mode 100644
index 0000000..56fb083
--- /dev/null
+++ b/src/patches/grub-0.95-hiddenmenu-tweak.patch
@@ -0,0 +1,39 @@
+--- grub-0.95/stage2/stage2.c.hidden 2004-09-30 16:39:38.028893664 -0400
++++ grub-0.95/stage2/stage2.c 2004-09-30 16:42:07.981097464 -0400
+@@ -235,6 +235,8 @@
+ char *cur_entry = 0;
+ struct term_entry *prev_term = NULL;
+
++ cls();
++
+ /*
+ * Main loop for menu UI.
+ */
+@@ -262,14 +264,16 @@
+ /* Get current time. */
+ while ((time1 = getrtsecs ()) == 0xFF)
+ ;
++ grub_printf("\rPress any key to enter the menu\n\n\n");
+
+ while (1)
+ {
+ /* Check if ESC is pressed. */
+- if (checkkey () != -1 && ASCII_CHAR (getkey ()) == '\e')
++ if (checkkey () != -1)
+ {
+ grub_timeout = -1;
+ show_menu = 1;
++ getkey ();
+ break;
+ }
+
+@@ -288,7 +292,8 @@
+ grub_timeout--;
+
+ /* Print a message. */
+- grub_printf ("\rPress `ESC' to enter the menu... %d ",
++ grub_printf ("\rBooting %s in %d seconds...",
++ get_entry(menu_entries, first_entry + entryno, 0),
+ grub_timeout);
+ }
+ }
diff --git a/src/patches/grub-0.95-md-mbr.patch b/src/patches/grub-0.95-md-mbr.patch
new file mode 100644
index 0000000..1aaa3e9
--- /dev/null
+++ b/src/patches/grub-0.95-md-mbr.patch
@@ -0,0 +1,11 @@
+--- grub-0.95/util/grub-install.in.md-mbr 2005-02-20 17:56:48.000000000 -0500
++++ grub-0.95/util/grub-install.in 2005-02-20 17:57:12.000000000 -0500
+@@ -444,7 +444,7 @@
+ /dev/*)
+ install_device=`resolve_symlink "$install_device"`
+ for install_drive in `find_real_devs $install_device` ; do
+- install_drive=`convert $install_drive`
++ install_drive=`convert $install_drive | sed 's/,[0-9]*)/)/'`
+ if [ "x$install_drive" = "x" ]; then
+ exit 1
+ fi
diff --git a/src/patches/grub-0.95-md-rework.patch b/src/patches/grub-0.95-md-rework.patch
new file mode 100644
index 0000000..cff1977
--- /dev/null
+++ b/src/patches/grub-0.95-md-rework.patch
@@ -0,0 +1,183 @@
+--- grub-0.95/util/grub-install.in.md2 2005-01-03 14:49:18.133866107 -0500
++++ grub-0.95/util/grub-install.in 2005-01-03 16:35:44.923732271 -0500
+@@ -35,6 +35,7 @@
+ rootdir=
+ grub_prefix=/boot/grub
+
++install_drives=
+ install_device=
+ no_floppy=
+ force_lba=
+@@ -272,6 +273,30 @@
+ done
+ }
+
++
++dump_boot_block () {
++ sync
++ $grub_shell --batch $no_floppy --device-map=$device_map <<EOF >$log_file
++dump ${root_drive}${tmp} ${img_file}
++quit
++EOF
++}
++
++
++install_boot_block () {
++ # Before all invocations of the grub shell, call sync to make sure
++ # the raw device is in sync with any bufferring in filesystems.
++ sync
++
++ # Now perform the installation.
++ $grub_shell --batch $no_floppy --device-map=$device_map <<EOF >>$log_file
++root $1
++setup $force_lba --stage2=$grubdir/stage2 --prefix=$grub_prefix $2
++quit
++EOF
++}
++
++
+ # Check the arguments.
+ for option in "$@"; do
+ case "$option" in
+@@ -416,28 +441,32 @@
+ # Check for INSTALL_DEVICE.
+ case "$install_device" in
+ /dev/*)
+- # If we are running md on a Linux box, just use the first physical device
+- # at this point.
+ install_device=`resolve_symlink "$install_device"`
+- install_device=`find_real_devs $install_device | awk '{print $1}'`
+-
+- install_drive=`convert "$install_device"`
+- # I don't know why, but some shells wouldn't die if exit is
+- # called in a function.
+- if test "x$install_drive" = x; then
++ for install_drive in `find_real_devs $install_device` ; do
++ install_drive=`convert $install_drive`
++ if [ "x$install_drive" = "x" ]; then
++ exit 1
++ fi
++ install_drives="${install_drives} ${install_drive}"
++ done
++ unset install_drive
++
++ if test "x$install_drives" = x ; then
+ exit 1
+ fi ;;
+ \([hf]d[0-9]*\))
+- install_drive="$install_device" ;;
++ install_drives="$install_device" ;;
+ [hf]d[0-9]*)
+ # The GRUB format with no parenthesis.
+- install_drive="($install_device)" ;;
++ install_drives="($install_device)" ;;
+ *)
+ echo "Format of install_device not recognized." 1>&2
+ usage
+ exit 1 ;;
+ esac
+
++unset install_device
++
+ # Get the root drive.
+ root_device=`find_device ${rootdir}`
+ bootdir_device=`find_device ${bootdir}`
+@@ -465,41 +494,39 @@
+ test -n "$mkimg" && img_file=`$mkimg`
+ test -n "$mklog" && log_file=`$mklog`
+
+-for real_device in `find_real_devs $root_device`; do
+- # Convert the root deviceto a GRUB drive.
+- root_drive=`convert "$real_device"`
+- if [ "x$root_drive" = x ]; then
+- exit 1
+- fi
++# There's not a real root device, so just pick the first
++if is_raid1_device $root_device ; then
++ root_device=`find_real_devs $root_device | awk '{print $1}'`
++fi
+
+- for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do
+- count=5
+- tmp=`echo $file | sed "s|^${grubdir}|${grub_prefix}|"`
+- while test $count -gt 0; do
+- sync
+- $grub_shell --batch $no_floppy --device-map=$device_map \
+- <<EOF >$log_file
+-dump ${root_drive}${tmp} ${img_file}
+-quit
+-EOF
+- if grep "Error [0-9]*: " $log_file >/dev/null; then
+- :
+- elif cmp $file $img_file >/dev/null; then
+- break
+- fi
+- sleep 1
+- count=`expr $count - 1`
+- done
+- if test $count -eq 0; then
+- echo "The file $file not read correctly." 1>&2
+- exit 1
+- fi
+- done
++# Convert the root deviceto a GRUB drive.
++root_drive=`convert "$root_device"`
++if [ "x$root_drive" = x ]; then
++ exit 1
++fi
+
+- rm -f $img_file
+- rm -f $log_file
++for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do
++ count=5
++ tmp=`echo $file | sed "s|^${grubdir}|${grub_prefix}|"`
++ while test $count -gt 0; do
++ dump_boot_block $root_drive $img_file
++ if grep "Error [0-9]*: " $log_file >/dev/null; then
++ :
++ elif cmp $file $img_file >/dev/null; then
++ break
++ fi
++ sleep 1
++ count=`expr $count - 1`
++ done
++ if test $count -eq 0; then
++ echo "The file $file not read correctly." 1>&2
++ exit 1
++ fi
+ done
+
++rm -f $img_file
++rm -f $log_file
++
+ if ! test -e ${grubdir}/grub.conf ; then
+ test -e ${grubdir}/menu.lst && ln -s ./menu.lst ${grubdir}/grub.conf
+ fi
+@@ -507,24 +534,13 @@
+ # Create a safe temporary file.
+ test -n "$mklog" && log_file=`$mklog`
+
+-for real_device in `find_real_devs $root_device`; do
++for install_drive in $install_drives; do
+ # Convert the root deviceto a GRUB drive.
+- root_drive=`convert "$real_device"`
++ root_drive=`convert "$root_device"`
+ if [ "x$root_drive" = x ]; then
+ exit 1
+ fi
+-
+- # Before all invocations of the grub shell, call sync to make sure
+- # the raw device is in sync with any bufferring in filesystems.
+- sync
+-
+- # Now perform the installation.
+- $grub_shell --batch $no_floppy --device-map=$device_map <<EOF >>$log_file
+-root $root_drive
+-setup $force_lba --stage2=$grubdir/stage2 --prefix=$grub_prefix $root_drive
+-quit
+-EOF
+-
++ install_boot_block $root_drive $install_drive
+ done
+
+ if grep "Error [0-9]*: " $log_file >/dev/null ; then
diff --git a/src/patches/grub-0.95-md.patch b/src/patches/grub-0.95-md.patch
new file mode 100644
index 0000000..9e4ff89
--- /dev/null
+++ b/src/patches/grub-0.95-md.patch
@@ -0,0 +1,183 @@
+--- grub-0.95/util/grub-install.in.support_md 2004-12-17 17:50:45.000000000 -0500
++++ grub-0.95/util/grub-install.in 2004-12-19 19:19:20.509409160 -0500
+@@ -207,6 +207,43 @@
+ echo "$tmp_fname"
+ }
+
++# Usage: is_raid1_device devicename
++# Returns 0 if devicename is a raid1 md device, 1 if it is not.
++is_raid1_device () {
++ case "$host_os" in
++ linux*)
++ level=`mdadm --query --detail $1 2>/dev/null | \
++ awk '/Raid Level :/ {print $4}'`
++ if [ "$level" = "raid1" ]; then
++ return 0
++ fi
++ ;;
++ esac
++ return 1
++}
++
++# Usage: find_real_devs device
++# Returns space separated list of devices for linux if device is
++# a raid1 device. In all other cases, the provided value is returned.
++find_real_devs () {
++ source_device=$1
++ case "$host_os" in
++ linux*)
++ if is_raid1_device $source_device ; then
++ list=""
++ for device in `mdadm --query --detail "${source_device}" | \
++ awk '/\/dev\/[^(md)]/ {print $7}'` ; do
++ list="$list $device"
++ done
++ echo $list
++ return 0
++ fi
++ ;;
++ esac
++ echo $source_device
++ return 0
++}
++
+ # Usage: find_device file
+ # Find block device on which the file resides.
+ find_device () {
+@@ -219,7 +256,7 @@
+ exit 1
+ fi
+
+- tmp_fname=`resolve_symlink $tmp_fname`
++ tmp_fname=`resolve_symlink $tmp_fname`
+
+ echo "$tmp_fname"
+ }
+@@ -379,7 +416,11 @@
+ # Check for INSTALL_DEVICE.
+ case "$install_device" in
+ /dev/*)
++ # If we are running md on a Linux box, just use the first physical device
++ # at this point.
+ install_device=`resolve_symlink "$install_device"`
++ install_device=`find_real_devs $install_device | awk '{print $1}'`
++
+ install_drive=`convert "$install_device"`
+ # I don't know why, but some shells wouldn't die if exit is
+ # called in a function.
+@@ -408,14 +449,7 @@
+ grub_prefix="/grub"
+ fi
+
+-# Convert the root device to a GRUB drive.
+-root_drive=`convert "$root_device"`
+-if test "x$root_drive" = x; then
+- exit 1
+-fi
+-
+-# Check if the root directory exists in the same device as the grub
+-# directory.
++# Check if the root directory exists in the same device as the grub directory.
+ grubdir_device=`find_device ${grubdir}`
+
+ if test "x$grubdir_device" != "x$root_device"; then
+@@ -431,30 +465,40 @@
+ test -n "$mkimg" && img_file=`$mkimg`
+ test -n "$mklog" && log_file=`$mklog`
+
+-for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do
+- count=5
+- tmp=`echo $file | sed "s|^${grubdir}|${grub_prefix}|"`
+- while test $count -gt 0; do
+- $grub_shell --batch $no_floppy --device-map=$device_map <<EOF >$log_file
++for real_device in `find_real_devs $root_device`; do
++ # Convert the root deviceto a GRUB drive.
++ root_drive=`convert "$real_device"`
++ if [ "x$root_drive" = x ]; then
++ exit 1
++ fi
++
++ for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do
++ count=5
++ tmp=`echo $file | sed "s|^${grubdir}|${grub_prefix}|"`
++ while test $count -gt 0; do
++ sync
++ $grub_shell --batch $no_floppy --device-map=$device_map \
++ <<EOF >$log_file
+ dump ${root_drive}${tmp} ${img_file}
+ quit
+ EOF
+- if grep "Error [0-9]*: " $log_file >/dev/null; then
+- :
+- elif cmp $file $img_file >/dev/null; then
+- break
++ if grep "Error [0-9]*: " $log_file >/dev/null; then
++ :
++ elif cmp $file $img_file >/dev/null; then
++ break
++ fi
++ sleep 1
++ count=`expr $count - 1`
++ done
++ if test $count -eq 0; then
++ echo "The file $file not read correctly." 1>&2
++ exit 1
+ fi
+- sleep 1
+- count=`expr $count - 1`
+ done
+- if test $count -eq 0; then
+- echo "The file $file not read correctly." 1>&2
+- exit 1
+- fi
+-done
+
+-rm -f $img_file
+-rm -f $log_file
++ rm -f $img_file
++ rm -f $log_file
++done
+
+ if ! test -e ${grubdir}/grub.conf ; then
+ test -e ${grubdir}/menu.lst && ln -s ./menu.lst ${grubdir}/grub.conf
+@@ -463,21 +507,33 @@
+ # Create a safe temporary file.
+ test -n "$mklog" && log_file=`$mklog`
+
+-# Before all invocations of the grub shell, call sync to make sure
+-# the raw device is in sync with any bufferring in filesystems.
+-sync
++for real_device in `find_real_devs $root_device`; do
++ # Convert the root deviceto a GRUB drive.
++ root_drive=`convert "$real_device"`
++ if [ "x$root_drive" = x ]; then
++ exit 1
++ fi
++
++ # Before all invocations of the grub shell, call sync to make sure
++ # the raw device is in sync with any bufferring in filesystems.
++ sync
+
+-# Now perform the installation.
+-$grub_shell --batch $no_floppy --device-map=$device_map <<EOF >$log_file
++ # Now perform the installation.
++ $grub_shell --batch $no_floppy --device-map=$device_map <<EOF >>$log_file
+ root $root_drive
+-setup $force_lba --stage2=$grubdir/stage2 --prefix=$grub_prefix $install_drive
++setup $force_lba --stage2=$grubdir/stage2 --prefix=$grub_prefix $root_drive
+ quit
+ EOF
+
+-if grep "Error [0-9]*: " $log_file >/dev/null || test $debug = yes; then
++done
++
++if grep "Error [0-9]*: " $log_file >/dev/null ; then
+ cat $log_file 1>&2
+ exit 1
+ fi
++if test $debug = yes; then
++ cat $log_file 1>&2
++fi
+
+ rm -f $log_file
+
diff --git a/src/patches/grub-0.95-nonmbr.patch b/src/patches/grub-0.95-nonmbr.patch
new file mode 100644
index 0000000..35bd5f3
--- /dev/null
+++ b/src/patches/grub-0.95-nonmbr.patch
@@ -0,0 +1,14 @@
+--- grub-0.95/util/grub-install.in.nonmbr 2005-03-16 10:02:50.000000000 -0500
++++ grub-0.95/util/grub-install.in 2005-03-16 10:02:13.000000000 -0500
+@@ -444,7 +444,10 @@
+ /dev/*)
+ install_device=`resolve_symlink "$install_device"`
+ for install_drive in `find_real_devs $install_device` ; do
+- install_drive=`convert $install_drive | sed 's/,[0-9]*)/)/'`
++ install_drive=`convert $install_drive`
++ if is_raid1_device $install_device; then
++ install_drive=`echo $install_drive | sed 's/,[0-9]*)/)/'`
++ fi
+ if [ "x$install_drive" = "x" ]; then
+ exit 1
+ fi
diff --git a/src/patches/grub-0.95-odirect.patch b/src/patches/grub-0.95-odirect.patch
new file mode 100644
index 0000000..12dd9d9
--- /dev/null
+++ b/src/patches/grub-0.95-odirect.patch
@@ -0,0 +1,115 @@
+--- grub-0.95/grub/asmstub.c.odirect 2004-11-30 16:58:06.577019488 -0500
++++ grub-0.95/grub/asmstub.c 2004-11-30 16:59:56.057375944 -0500
+@@ -53,6 +53,9 @@
+ # ifndef BLKFLSBUF
+ # define BLKFLSBUF _IO (0x12,97) /* flush buffer cache */
+ # endif /* ! BLKFLSBUF */
++# ifndef O_DIRECT
++# define O_DIRECT 040000
++# endif /* ! O_DIRECT */
+ #endif /* __linux__ */
+
+ /* We want to prevent any circularararity in our stubs, as well as
+@@ -764,7 +767,7 @@
+ {
+ /* The unpartitioned device name: /dev/XdX */
+ char *devname = device_map[drive];
+- char buf[512];
++ char * buf, * buf_unaligned;
+
+ if (! devname)
+ return -1;
+@@ -775,13 +778,13 @@
+
+ /* Open read/write, or read-only if that failed. */
+ if (! read_only)
+- disks[drive].flags = open (devname, O_RDWR);
++ disks[drive].flags = open (devname, O_RDWR | O_DIRECT);
+
+ if (disks[drive].flags == -1)
+ {
+ if (read_only || errno == EACCES || errno == EROFS || errno == EPERM)
+ {
+- disks[drive].flags = open (devname, O_RDONLY);
++ disks[drive].flags = open (devname, O_RDONLY | O_DIRECT);
+ if (disks[drive].flags == -1)
+ {
+ assign_device_name (drive, 0);
+@@ -795,6 +798,10 @@
+ }
+ }
+
++ buf_unaligned = malloc((512 * sizeof(char)) + 4095);
++ buf = (char *) (((unsigned long)buf_unaligned + 4096 - 1) &
++ (~(4096-1)));
++
+ /* Attempt to read the first sector. */
+ if (read (disks[drive].flags, buf, 512) != 512)
+ {
+@@ -806,6 +813,7 @@
+
+ if (disks[drive].flags != -1)
+ get_drive_geometry (&disks[drive], device_map, drive);
++ free(buf_unaligned);
+ }
+
+ if (disks[drive].flags == -1)
+@@ -827,24 +835,34 @@
+ nread (int fd, char *buf, size_t len)
+ {
+ int size = len;
++ char * buf_unaligned, * buff, * obuff;
++ int ret;
++
++ buf_unaligned = malloc((len * sizeof(char)) + 4095);
++ obuff = buff = (char *) (((unsigned long)buf_unaligned + 4096 - 1) &
++ (~(4096-1)));
++
+
+ while (len)
+ {
+- int ret = read (fd, buf, len);
++ ret = read (fd, buff, len);
+
+ if (ret <= 0)
+ {
+ if (errno == EINTR)
+ continue;
+ else
+- return ret;
++ break;
+ }
+
+ len -= ret;
+- buf += ret;
++ buff += ret;
+ }
+
+- return size;
++ if (!len) ret = size;
++
++ buf = memcpy(buf, obuff, size);
++ return ret;
+ }
+
+ /* Write LEN bytes from BUF to FD. Return less than or equal to zero if an
+@@ -853,10 +871,18 @@
+ nwrite (int fd, char *buf, size_t len)
+ {
+ int size = len;
++ char * buf_unaligned, * buff;
++
++ buf_unaligned = malloc((len * sizeof(char)) + 4095);
++ buff = (char *) (((unsigned long)buf_unaligned + 4096 - 1) &
++ (~(4096-1)));
+
+ while (len)
+ {
+- int ret = write (fd, buf, len);
++ int ret;
++
++ memcpy(buff, buf, len);
++ ret = write (fd, buff, len);
+
+ if (ret <= 0)
+ {
diff --git a/src/patches/grub-0.95-recheck-bad.patch b/src/patches/grub-0.95-recheck-bad.patch
new file mode 100644
index 0000000..b55c6ae
--- /dev/null
+++ b/src/patches/grub-0.95-recheck-bad.patch
@@ -0,0 +1,83 @@
+--- grub-0.95/docs/grub.texi.recheck-bad 2005-07-25 17:55:57.000000000 -0400
++++ grub-0.95/docs/grub.texi 2005-07-25 17:58:00.000000000 -0400
+@@ -3417,8 +3417,9 @@
+
+ @item --recheck
+ Recheck the device map, even if @file{/boot/grub/device.map} already
+-exists. You should use this option whenever you add/remove a disk
+-into/from your computer.
++exists.
++
++This option is unreliable and its use is strongly discouraged.
+ @end table
+
+
+--- grub-0.95/util/grub-install.in.recheck-bad 2005-07-25 17:58:19.000000000 -0400
++++ grub-0.95/util/grub-install.in 2005-07-25 18:05:14.000000000 -0400
+@@ -68,6 +68,8 @@
+ --force-lba force GRUB to use LBA mode even for a buggy
+ BIOS
+ --recheck probe a device map even if it already exists
++ This flag is unreliable and its use is
++ strongly discouraged.
+
+ INSTALL_DEVICE can be a GRUB device name or a system device filename.
+
+@@ -328,7 +330,7 @@
+
+ # If --recheck is specified, remove the device map, if present.
+ if test $recheck = yes; then
+- rm -f $device_map
++ mv $device_map ${device_map}.backup
+ fi
+
+ # Create the device map file if it is not present.
+@@ -357,7 +359,22 @@
+ tmp=`sed -n '/^([fh]d[0-9]*)/s/\(^(.*)\).*/\1/p' $device_map \
+ | sort | uniq -d | sed -n 1p`
+ if test -n "$tmp"; then
+- echo "The drive $tmp is defined multiple times in the device map $device_map" 1>&2
++ echo "The drive $tmp is defined multiple times in the new device map." 1>&2
++ if test $recheck = yes; then
++ echo "Reverting to backed up copy." 1>&2
++ mv ${device_map}.backup $device_map
++ fi
++ exit 1
++fi
++
++# Make sure device.map has at least one hd device
++grep -q "^(hd[0-9]\+)" $device_map
++if [ "x$?" != "x0" ]; then
++ echo "No suitable drive was found in the generated device map." 1>&2
++ if test $recheck = yes; then
++ echo "Reverting to backed up copy." 1>&2
++ mv ${device_map}.backup $device_map
++ fi
+ exit 1
+ fi
+
+--- grub-0.95/docs/grub-install.8.recheck-bad 2004-06-13 13:44:59.000000000 -0400
++++ grub-0.95/docs/grub-install.8 2005-07-25 18:15:02.000000000 -0400
+@@ -30,6 +30,8 @@
+ .TP
+ \fB\-\-recheck\fR
+ probe a device map even if it already exists
++
++This option is unreliable and its use is strongly discouraged.
+ .PP
+ INSTALL_DEVICE can be a GRUB device name or a system device filename.
+ .SH "REPORTING BUGS"
+--- grub-0.95/docs/grub.info.recheck-bad 2004-05-11 08:22:54.000000000 -0400
++++ grub-0.95/docs/grub.info 2005-07-25 18:16:09.000000000 -0400
+@@ -3373,9 +3373,9 @@
+
+ `--recheck'
+ Recheck the device map, even if `/boot/grub/device.map' already
+- exists. You should use this option whenever you add/remove a disk
+- into/from your computer.
++ exists.
+
++ This option is unreliable and its use is strongly discouraged.
+
+ File: grub.info, Node: Invoking grub-md5-crypt, Next: Invoking grub-terminfo, Prev: Invoking grub-install, Up: Top
+
diff --git a/src/patches/grub-0.95-staticcurses.patch b/src/patches/grub-0.95-staticcurses.patch
new file mode 100644
index 0000000..ff87dd3
--- /dev/null
+++ b/src/patches/grub-0.95-staticcurses.patch
@@ -0,0 +1,14 @@
+--- grub-0.95/configure.ac.static 2004-06-13 13:38:17.000000000 -0400
++++ grub-0.95/configure.ac 2004-06-18 17:35:23.513374336 -0400
+@@ -207,9 +207,9 @@
+
+ # Unless the user specify --without-curses, check for curses.
+ if test "x$with_curses" != "xno"; then
+- AC_CHECK_LIB(ncurses, wgetch, [GRUB_LIBS="$GRUB_LIBS -lncurses"
++ AC_CHECK_LIB(ncurses, wgetch, [GRUB_LIBS="$GRUB_LIBS -Wl,-Bstatic -lncurses -Wl,-Bdynamic"
+ AC_DEFINE(HAVE_LIBCURSES, 1, [Define if you have a curses library])],
+- [AC_CHECK_LIB(curses, wgetch, [GRUB_LIBS="$GRUB_LIBS -lcurses"
++ [AC_CHECK_LIB(curses, wgetch, [GRUB_LIBS="$GRUB_LIBS -Wl,-Bstatic -lcurses -Wl,-Bdynamic"
+ AC_DEFINE(HAVE_LIBCURSES, 1, [Define if you have a curses library])])])
+ fi
+
diff --git a/src/patches/grub-0.97-bz429187-cciss.patch b/src/patches/grub-0.97-bz429187-cciss.patch
new file mode 100644
index 0000000..32f18bc
--- /dev/null
+++ b/src/patches/grub-0.97-bz429187-cciss.patch
@@ -0,0 +1,75 @@
+diff -up grub-0.97/util/grub-install.in.cciss grub-0.97/util/grub-install.in
+--- grub-0.97/util/grub-install.in.cciss 2008-02-04 14:30:31.000000000 -0500
++++ grub-0.97/util/grub-install.in 2008-02-07 18:34:14.000000000 -0500
+@@ -100,25 +100,56 @@ convert () {
+ # Break the device name into the disk part and the partition part.
+ case "$host_os" in
+ linux*)
++ # formats that need to be handled (disk name -> partition name):
++ # floppies: /dev/fd0
++ # normal sd/hd devices: /dev/hda -> /dev/hda3
++ # md: /dev/md0 -> /dev/md0p0
++ # ide raid devs: /dev/ide/host0/bus0/target0/lun0/disc
++ # -> /dev/ide/host0/bus0/target0/lun0/part1
++ # cciss: /dev/cciss/c0d0 -> /dev/cciss/c0d0p1
++ # mpath devs: /dev/mapper/mpath0 -> /dev/mapper/mpath0p1
++ # /dev/mapper/lalala -> /dev/mapper/lalalap1
++ # dmraid devs: /dev/mapper/via_abcdef -> /dev/mapper/via_abcdefp1
++ # /dev/mapper/isw_Volume0_abcdef -> /dev/mapper/isw_Volume0_abcdefp1
++ # the known list (to me) is (X means we should handle it):
++ # X asr_[unfettered crap]
++ # hpt[0-9]+x_[0-9]+-[0-9]+
++ # X hpt[0-9]+x_[0-9]+
++ # hpt[0-9]+x_SPARE
++ # isw_[a-z]+_[a-z]+[0-9]+
++ # X isw_[a-z]+
++ # jm_[0-9]+-[0-9]+
++ # X jm_[0-9]+
++ # lsi_[0-9]+-[0-9]+
++ # X lsi_[0-9]+
++ # nvidia_[a-z]+-[0-9]+
++ # X nvidia_[a-z]+
++ # pdc_[a-z]+-[0-9]+
++ # X pdc_[a-z]+
++ # sil_[0-9]+-[0-9]+
++ # X sil_[0-9]+
++ # via_[a-z]+-[0-9]+
++ # X via_[a-z]+
++ #
++ # more?
+ tmp_disk=`echo "$1" | grep -v '/mapper/control$' |
+- grep -v '/mapper/[[:alnum:]]\+-[[:alnum:]]\+$' | uniq |
++ grep -v '/mapper/[[:alnum:]_]\+-[[:digit:]]\+$' | uniq |
+ sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%' \
+- -e 's%\(d[0-9]*\)p[0-9]*$%\1%' \
+- -e 's%\(fd[0-9]*\)$%\1%' \
+- -e 's%/part[0-9]*$%/disc%' \
+- -e 's%\(c[0-7]d[0-9]*\).*$%\1%' \
+- -e 's%\(/mapper/[[:alpha:]]\+[[:digit:]]\+\)p[[:digit:]]\+$%\1%' \
+- -e 's%\(/mapper/[[:alpha:]]\+_[[:alpha:]]\+\)[[:digit:]]\+$%\1%'`
++ -e 's%\(/c[0-9]\+d[0-9]\+\).*$%\1%' \
++ -e 's%\(fd[0-9]*\)$%\1%' \
++ -e 's%/part[0-9]*$%/disc%' \
++ -e 's%\(/mapper/[[:alnum:]_-]\+\)\+p[[:digit:]]\+$%\1%'\
++ -e 's%\(/mapper/[[:alnum:]]\+\(_[[:alnum:]]\+\)\+\)\p[[:digit:]]\+$%\1%'`
+ tmp_part=`echo "$1" | grep -v '/mapper/control$' |
+- grep -v '/mapper/[[:alnum:]]\+-[[:alnum:]]\+$' | uniq |
++ grep -v '/mapper/[[:alnum:]_]\+-[[:digit:]]\+$' | uniq |
+ sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \
+- -e 's%.*d[0-9]*p%%' \
+- -e 's%.*/fd[0-9]*$%%' \
+- -e 's%.*/floppy/[0-9]*$%%' \
+- -e 's%.*/\(disc\|part\([0-9]*\)\)$%\2%' \
+- -e 's%.*c[0-7]d[0-9]*p%%' \
+- -e 's%.*/mapper/[[:alpha:]]\+[[:digit:]]\+p\([[:digit:]]\+\)$%\1%' \
+- -e 's%.*/mapper/[[:alpha:]]\+_[[:alpha:]]\+\([[:digit:]]\+\)$%\1%' |
++ -e 's%.*/c[0-9]\+d[0-9]\+p\([[:digit:]]\+\)%\1%' \
++ -e 's%.*/c[0-9]\+d[0-9]\+$%%' \
++ -e 's%.*/fd[0-9]\+$%%' \
++ -e 's%.*/floppy/[0-9]*$%%' \
++ -e 's%.*/\(disc\|part\([0-9]*\)\)$%\2%' \
++ -e 's%.*/mapper/[[:alpha:]]\+[[:digit:]]\+p\([[:digit:]]\+\)$%\1%' \
++ -e 's%.*/mapper/[[:alnum:]]\+\(_[[:alpha:]]\+[[:digit:]]*\)\+p\([[:digit:]]\+\)$%\2%' |
+ grep -v '.*/mapper/.*'`
+ ;;
+ gnu*)
diff --git a/src/patches/grub-0.97-cmdline-size.patch b/src/patches/grub-0.97-cmdline-size.patch
new file mode 100644
index 0000000..e93aa98
--- /dev/null
+++ b/src/patches/grub-0.97-cmdline-size.patch
@@ -0,0 +1,45 @@
+diff --git a/stage2/boot.c b/stage2/boot.c
+index bf442e1..a6872e0 100644
+--- a/stage2/boot.c
++++ b/stage2/boot.c
+@@ -241,6 +241,7 @@ load_image (char *kernel, char *arg, kernel_t suggested_type,
+ }
+
+ if (lh->version >= 0x0202)
++ /* version 0x0202 and higher can handle 4096 */
+ lh->cmd_line_ptr = linux_data_real_addr + LINUX_CL_OFFSET;
+ else
+ {
+@@ -403,8 +404,10 @@ load_image (char *kernel, char *arg, kernel_t suggested_type,
+ {
+ char *src = skip_to (0, arg);
+ char *dest = linux_data_tmp_addr + LINUX_CL_OFFSET;
+-
+- while (dest < linux_data_tmp_addr + LINUX_CL_END_OFFSET && *src)
++ unsigned long cl_end_offset = lh->version < 0x0202 ?
++ LINUX_CL_END_OFFSET : LINUX_CL_END_OFFSET_202;
++
++ while (dest < linux_data_tmp_addr + cl_end_offset && *src)
+ *(dest++) = *(src++);
+
+ /* Old Linux kernels have problems determining the amount of
+diff --git a/stage2/shared.h b/stage2/shared.h
+index d05644b..c052480 100644
+--- a/stage2/shared.h
++++ b/stage2/shared.h
+@@ -160,10 +160,13 @@ extern void *grub_scratch_mem;
+ #define LINUX_VID_MODE_ASK 0xFFFD
+
+ #define LINUX_CL_OFFSET 0x9000
+-#define LINUX_CL_END_OFFSET 0x90FF
+-#define LINUX_SETUP_MOVE_SIZE 0x9100
+ #define LINUX_CL_MAGIC 0xA33F
+
++#define LINUX_CL_END_OFFSET 0x90FF
++#define LINUX_CL_END_OFFSET_202 0x9FFF /* version 0x0202 or higher */
++#define LINUX_SETUP_MOVE_SIZE 0xA000 /* where am I putting it? */
++
++
+ /*
+ * General disk stuff
+ */
diff --git a/src/patches/grub-0.97-datadir.patch b/src/patches/grub-0.97-datadir.patch
new file mode 100644
index 0000000..eaa89f0
--- /dev/null
+++ b/src/patches/grub-0.97-datadir.patch
@@ -0,0 +1,229 @@
+--- grub-0.97/stage1/Makefile.am.datadir 2005-12-14 11:07:01.000000000 -0500
++++ grub-0.97/stage1/Makefile.am 2005-12-14 11:07:21.000000000 -0500
+@@ -1,7 +1,7 @@
+-pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
+-nodist_pkglib_DATA = stage1
++pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
++nodist_pkgdata_DATA = stage1
+
+-CLEANFILES = $(nodist_pkglib_DATA)
++CLEANFILES = $(nodist_pkgdata_DATA)
+
+ # We can't use builtins or standard includes.
+ AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc
+--- grub-0.97/stage1/Makefile.in.datadir 2005-05-07 22:42:36.000000000 -0400
++++ grub-0.97/stage1/Makefile.in 2005-12-14 11:08:13.000000000 -0500
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.4 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,8 +15,6 @@
+ @SET_MAKE@
+
+
+-SOURCES = $(stage1_exec_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -67,13 +65,13 @@
+ *) f=$$p;; \
+ esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(pkglibdir)"
+-nodist_pkglibDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(nodist_pkglib_DATA)
++am__installdirs = "$(DESTDIR)$(pkgdatadir)"
++nodist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(nodist_pkgdata_DATA)
+ ETAGS = etags
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
++pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -102,6 +100,8 @@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ FSYS_CFLAGS = @FSYS_CFLAGS@
++GRAPHICS_SUPPORT_FALSE = @GRAPHICS_SUPPORT_FALSE@
++GRAPHICS_SUPPORT_TRUE = @GRAPHICS_SUPPORT_TRUE@
+ GRUB_CFLAGS = @GRUB_CFLAGS@
+ GRUB_LIBS = @GRUB_LIBS@
+ HERCULES_SUPPORT_FALSE = @HERCULES_SUPPORT_FALSE@
+@@ -172,6 +172,7 @@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
++datadir = @datadir@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+@@ -183,8 +184,8 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-nodist_pkglib_DATA = stage1
+-CLEANFILES = $(nodist_pkglib_DATA)
++nodist_pkgdata_DATA = stage1
++CLEANFILES = $(nodist_pkgdata_DATA)
+
+ # We can't use builtins or standard includes.
+ AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc
+@@ -242,22 +243,22 @@
+ .S.obj:
+ $(CCASCOMPILE) -c `$(CYGPATH_W) '$<'`
+ uninstall-info-am:
+-install-nodist_pkglibDATA: $(nodist_pkglib_DATA)
++install-nodist_pkgdataDATA: $(nodist_pkgdata_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
+- @list='$(nodist_pkglib_DATA)'; for p in $$list; do \
++ test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
++ @list='$(nodist_pkgdata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+- echo " $(nodist_pkglibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
+- $(nodist_pkglibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
++ echo " $(nodist_pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
++ $(nodist_pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
+ done
+
+-uninstall-nodist_pkglibDATA:
++uninstall-nodist_pkgdataDATA:
+ @$(NORMAL_UNINSTALL)
+- @list='$(nodist_pkglib_DATA)'; for p in $$list; do \
++ @list='$(nodist_pkgdata_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
+- rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
++ echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
++ rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
+ done
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+@@ -339,7 +340,7 @@
+ check: check-am
+ all-am: Makefile $(PROGRAMS) $(DATA)
+ installdirs:
+- for dir in "$(DESTDIR)$(pkglibdir)"; do \
++ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
+ install: install-am
+@@ -388,7 +389,7 @@
+
+ install-data-am:
+
+-install-exec-am: install-nodist_pkglibDATA
++install-exec-am: install-nodist_pkgdataDATA
+
+ install-info: install-info-am
+
+@@ -412,19 +413,19 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-info-am uninstall-nodist_pkglibDATA
++uninstall-am: uninstall-info-am uninstall-nodist_pkgdataDATA
+
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-noinstPROGRAMS ctags distclean distclean-compile \
+ distclean-generic distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-exec install-exec-am install-info \
+- install-info-am install-man install-nodist_pkglibDATA \
++ install-info-am install-man install-nodist_pkgdataDATA \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-info-am \
+- uninstall-nodist_pkglibDATA
++ uninstall-nodist_pkgdataDATA
+
+ .exec:
+ $(OBJCOPY) -O binary $< $@
+--- grub-0.97/util/grub-install.in.datadir 2005-12-14 11:00:21.000000000 -0500
++++ grub-0.97/util/grub-install.in 2005-12-14 11:00:21.000000000 -0500
+@@ -21,13 +21,13 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ sbindir=@sbindir@
+-libdir=@libdir@
++datadir=@datadir@
+ PACKAGE=@PACKAGE@
+ VERSION=@VERSION@
+ host_cpu=@host_cpu@
+ host_os=@host_os@
+ host_vendor=@host_vendor@
+-pkglibdir=${libdir}/${PACKAGE}/${host_cpu}-${host_vendor}
++pkgdatadir=${datadir}/${PACKAGE}/${host_cpu}-${host_vendor}
+
+ grub_shell=${sbindir}/grub
+ mdadm=${sbindir}/mdadm
+@@ -388,17 +388,17 @@
+ exit 1
+ fi
+
+-if test -f "$pkglibdir/stage1"; then
++if test -f "$pkgdatadir/stage1"; then
+ :
+ else
+- echo "${pkglibdir}/stage1: Not found." 1>&2
++ echo "${pkgdatadir}/stage1: Not found." 1>&2
+ exit 1
+ fi
+
+-if test -f "$pkglibdir/stage2"; then
++if test -f "$pkgdatadir/stage2"; then
+ :
+ else
+- echo "${pkglibdir}/stage2: Not found." 1>&2
++ echo "${pkgdatadir}/stage2: Not found." 1>&2
+ exit 1
+ fi
+
+--- grub-0.97/stage2/Makefile.am.datadir 2005-12-14 11:03:54.000000000 -0500
++++ grub-0.97/stage2/Makefile.am 2005-12-14 11:05:04.000000000 -0500
+@@ -27,12 +27,12 @@
+ -DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1
+
+ # Stage 2 and Stage 1.5's.
+-pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
++pkgdatadir = $(datadir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
+
+ EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec
+
+ if DISKLESS_SUPPORT
+-pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
++pkgdata_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
+ ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
+ reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5 \
+ nbgrub pxegrub
+@@ -43,7 +43,7 @@
+ reiserfs_stage1_5.exec ufs2_stage1_5.exec vstafs_stage1_5.exec \
+ xfs_stage1_5.exec nbloader.exec pxeloader.exec diskless.exec
+ else
+-pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
++pkgdata_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
+ ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \
+ reiserfs_stage1_5 ufs2_stage1_5 vstafs_stage1_5 xfs_stage1_5
+ noinst_DATA = pre_stage2 start start_eltorito
+@@ -112,7 +112,7 @@
+ BUILT_SOURCES = stage2_size.h
+ endif
+
+-CLEANFILES = $(pkglib_DATA) $(noinst_DATA) $(BUILT_SOURCES)
++CLEANFILES = $(pkgdata_DATA) $(noinst_DATA) $(BUILT_SOURCES)
+
+ stage2_size.h: pre_stage2
+ -rm -f stage2_size.h
diff --git a/src/patches/grub-0.97-dmraid-partition-names.patch b/src/patches/grub-0.97-dmraid-partition-names.patch
new file mode 100644
index 0000000..9390b29
--- /dev/null
+++ b/src/patches/grub-0.97-dmraid-partition-names.patch
@@ -0,0 +1,10 @@
+--- grub-0.97/lib/device.c.dmraid-partition-names 2006-02-13 18:53:59.000000000 -0500
++++ grub-0.97/lib/device.c 2006-02-13 18:56:04.000000000 -0500
+@@ -1106,6 +1106,7 @@
+ /* Compaq smart and others */
+ (strncmp(dev, "/dev/ida/", 9) == 0 ||
+ strncmp(dev, "/dev/ataraid/", 13) == 0 ||
++ strncmp(dev, "/dev/mapper/", 12) == 0 ||
+ strncmp(dev, "/dev/cciss/", 11) == 0 ||
+ strncmp(dev, "/dev/rd/", 8) == 0) ? "p" : "",
+ ((partition >> 16) & 0xFF) + 1);
diff --git a/src/patches/grub-0.97-dmraid-recheck-bad.patch b/src/patches/grub-0.97-dmraid-recheck-bad.patch
new file mode 100644
index 0000000..49b33ae
--- /dev/null
+++ b/src/patches/grub-0.97-dmraid-recheck-bad.patch
@@ -0,0 +1,17 @@
+--- grub-0.97/util/grub-install.in.dmraid-recheck-bad 2006-01-13 17:04:26.000000000 -0500
++++ grub-0.97/util/grub-install.in 2006-01-13 17:05:00.000000000 -0500
+@@ -415,6 +415,14 @@
+ grubdir=${bootdir}/grub
+ device_map=${grubdir}/device.map
+
++if [ "$recheck" == "yes" ]; then
++ if grep 'mapper' ${device_map} >/dev/null; then
++ echo 'grub-install does not support reprobing of device.map when' 1>&2
++ echo 'using a device-mapper based boot device.' 1>&2
++ exit 1
++ fi
++fi
++
+ # if they just want the images copied, copy the images and then exit
+ if test $justcopy = yes; then
+ copy_images
diff --git a/src/patches/grub-0.97-dmraid.patch b/src/patches/grub-0.97-dmraid.patch
new file mode 100644
index 0000000..5aad8c4
--- /dev/null
+++ b/src/patches/grub-0.97-dmraid.patch
@@ -0,0 +1,92 @@
+--- grub-0.97/util/grub-install.in.dmraid 2006-01-13 16:40:24.000000000 -0500
++++ grub-0.97/util/grub-install.in 2006-01-13 16:40:37.000000000 -0500
+@@ -101,17 +101,24 @@
+ # Break the device name into the disk part and the partition part.
+ case "$host_os" in
+ linux*)
+- tmp_disk=`echo "$1" | sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%' \
++ tmp_disk=`echo "$1" | grep -v '/mapper/control$' |
++ grep -v '/mapper/[[:alnum:]]\+-[[:alnum:]]\+$' | uniq |
++ sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%' \
+ -e 's%\(d[0-9]*\)p[0-9]*$%\1%' \
+ -e 's%\(fd[0-9]*\)$%\1%' \
+ -e 's%/part[0-9]*$%/disc%' \
+- -e 's%\(c[0-7]d[0-9]*\).*$%\1%'`
+- tmp_part=`echo "$1" | sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \
++ -e 's%\(c[0-7]d[0-9]*\).*$%\1%' \
++ -e 's%\(/mapper/[[:alpha:]]\+_[[:alpha:]]\+\)[[:digit:]]\+$%\1%'`
++ tmp_part=`echo "$1" | grep -v '/mapper/control$' |
++ grep -v '/mapper/[[:alnum:]]\+-[[:alnum:]]\+$' | uniq |
++ sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \
+ -e 's%.*d[0-9]*p%%' \
+ -e 's%.*/fd[0-9]*$%%' \
+ -e 's%.*/floppy/[0-9]*$%%' \
+ -e 's%.*/\(disc\|part\([0-9]*\)\)$%\2%' \
+- -e 's%.*c[0-7]d[0-9]*p%%'`
++ -e 's%.*c[0-7]d[0-9]*p%%' \
++ -e 's%.*/mapper/[[:alpha:]]\+_[[:alpha:]]\+\([[:digit:]]\+\)$%\1%' |
++ grep -v '.*/mapper/.*'`
+ ;;
+ gnu*)
+ tmp_disk=`echo "$1" | sed 's%\([sh]d[0-9]*\).*%\1%'`
+@@ -253,6 +260,43 @@
+ return 0
+ }
+
++# Usage: stat_device file
++# Find major:minor of a device node.
++stat_device() {
++ majmin=`stat -c "%t:%T" "$1" 2>/dev/null`
++ if test -z "$majmin"; then
++ echo "Could not find device for $1" 2>&1
++ exit 1
++ fi
++
++ echo "$majmin"
++}
++
++# Usage: find_mapper_device file
++# Find a file in /dev/mapper with the same major:minor as the specified node.
++find_mapper_device() {
++ if [ -b "$1" ]; then
++ dev="$1"
++ else
++ mntpnt=`echo "$1" | sed 's,/,\\\\/,g'`
++ dev=`awk '($2 ~ /'$mntpnt'/) { print $1 }' /etc/mtab`
++ fi
++ if test -z "$dev"; then
++ echo "Could not find device for $1" 2>&1
++ exit 1
++ fi
++
++ majmin=`stat_device $dev`
++ for x in /dev/mapper/* ; do
++ devmajmin=`stat_device "$x"`
++ if [ "$majmin" == "$devmajmin" ]; then
++ echo "$x"
++ return 0
++ fi
++ done
++ return 1
++}
++
+ # Usage: find_device file
+ # Find block device on which the file resides.
+ find_device () {
+@@ -265,9 +309,14 @@
+ exit 1
+ fi
+
+- tmp_fname=`resolve_symlink $tmp_fname`
++ ret_fname=`resolve_symlink $tmp_fname`
++ tmp_fname=`find_mapper_device $ret_fname`
++ if test -n "$tmp_fname"; then
++ ret_fname="$tmp_fname"
++ fi
+
+- echo "$tmp_fname"
++ echo "$ret_fname"
++ return 0
+ }
+
+ copy_images() {
diff --git a/src/patches/grub-0.97-install.in.patch b/src/patches/grub-0.97-install.in.patch
new file mode 100644
index 0000000..a9f2aef
--- /dev/null
+++ b/src/patches/grub-0.97-install.in.patch
@@ -0,0 +1,34 @@
+--- grub-0.97/util/grub-install.in.install 2005-12-12 18:15:45.000000000 -0500
++++ grub-0.97/util/grub-install.in 2005-12-12 18:18:11.000000000 -0500
+@@ -324,6 +324,15 @@
+ test -d "$bootdir" || mkdir "$bootdir" || exit 1
+ test -d "$grubdir" || mkdir "$grubdir" || exit 1
+
++# Copy the GRUB images to the GRUB directory.
++for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do
++ rm -f $file || exit 1
++done
++for file in \
++ ${pkgdatadir}/stage1 ${pkgdatadir}/stage2 ${pkgdatadir}/*stage1_5; do
++ cp -f $file ${grubdir} || exit 1
++done
++
+ # If --recheck is specified, remove the device map, if present.
+ if test $recheck = yes; then
+ rm -f $device_map
+@@ -406,15 +415,6 @@
+ exit 1
+ fi
+
+-# Copy the GRUB images to the GRUB directory.
+-for file in ${grubdir}/stage1 ${grubdir}/stage2 ${grubdir}/*stage1_5; do
+- rm -f $file || exit 1
+-done
+-for file in \
+- ${pkglibdir}/stage1 ${pkglibdir}/stage2 ${pkglibdir}/*stage1_5; do
+- cp -f $file ${grubdir} || exit 1
+-done
+-
+ # Make a default file.
+ ${grub_set_default} --root-directory=${rootdir} default
+
diff --git a/src/patches/grub-0.97-mactel-kbd.patch b/src/patches/grub-0.97-mactel-kbd.patch
new file mode 100644
index 0000000..f1de19f
--- /dev/null
+++ b/src/patches/grub-0.97-mactel-kbd.patch
@@ -0,0 +1,100 @@
+--- grub-0.97/stage2/asm.S.mactel-kbd 2006-06-12 17:00:10.000000000 -0400
++++ grub-0.97/stage2/asm.S 2006-06-12 17:03:38.000000000 -0400
+@@ -1651,7 +1651,30 @@
+ jnz 3f
+ ret
+
+-3: /* use keyboard controller */
++3: /*
++ * try to switch gateA20 using PORT92, the "Fast A20 and Init"
++ * register
++ */
++ mov $0x92, %dx
++ inb %dx, %al
++ /* skip the port92 code if it's unimplemented (read returns 0xff) */
++ cmpb $0xff, %al
++ jz 6f
++
++ /* set or clear bit1, the ALT_A20_GATE bit */
++ movb 4(%esp), %ah
++ testb %ah, %ah
++ jz 4f
++ orb $2, %al
++ jmp 5f
++4: and $0xfd, %al
++
++ /* clear the INIT_NOW bit; don't accidently reset the machine */
++5: and $0xfe, %al
++ outb %al, %dx
++
++
++6: /* use keyboard controller */
+ pushl %eax
+
+ call gloop1
+@@ -1661,9 +1684,12 @@
+
+ gloopint1:
+ inb $K_STATUS
++ cmpb $0xff, %al
++ jz gloopint1_done
+ andb $K_IBUF_FUL, %al
+ jnz gloopint1
+
++gloopint1_done:
+ movb $KB_OUTPUT_MASK, %al
+ cmpb $0, 0x8(%esp)
+ jz gdoit
+@@ -1684,6 +1710,8 @@
+
+ gloop1:
+ inb $K_STATUS
++ cmpb $0xff, %al
++ jz gloop2ret
+ andb $K_IBUF_FUL, %al
+ jnz gloop1
+
+@@ -1994,8 +2022,25 @@
+ call EXT_C(prot_to_real)
+ .code16
+
++.again:
++ mov $0x11, %ah /* poll kbd */
+ int $0x16
+
++ jz .again
++#if 0
++/* XXX handle serial here? -- pj */
++ jnz .kbd
++#endif
++.kbd:
++ mov $0x10, %ah
++ int $0x16
++ cmp $0xe0, %al
++ jnz .not_ext
++ xor %al, %al
++.not_ext:
++ and %al, %al
++ jz .func_key
++.func_key:
+ movw %ax, %dx /* real_to_prot uses %eax */
+ call translate_keycode
+ call remap_ascii_char
+@@ -2003,7 +2048,7 @@
+ DATA32 call EXT_C(real_to_prot)
+ .code32
+
+- movw %dx, %ax
++ mov %dx, %ax
+
+ pop %ebp
+ ret
+@@ -2029,7 +2074,7 @@
+ call EXT_C(prot_to_real) /* enter real mode */
+ .code16
+
+- movb $0x1, %ah
++ movb $0x11, %ah
+ int $0x16
+
+ DATA32 jz notpending
diff --git a/src/patches/grub-0.97-mdadm-path.patch b/src/patches/grub-0.97-mdadm-path.patch
new file mode 100644
index 0000000..fff301c
--- /dev/null
+++ b/src/patches/grub-0.97-mdadm-path.patch
@@ -0,0 +1,27 @@
+--- grub-0.97/util/grub-install.in.mdadm-path 2005-12-12 18:42:23.000000000 -0500
++++ grub-0.97/util/grub-install.in 2005-12-12 18:44:15.000000000 -0500
+@@ -30,5 +30,6 @@
+ pkglibdir=${libdir}/${PACKAGE}/${host_cpu}-${host_vendor}
+
+ grub_shell=${sbindir}/grub
++mdadm=${sbindir}/mdadm
+ log_file=/tmp/grub-install.log.$$
+ img_file=/tmp/grub-install.img.$$
+@@ -217,7 +218,7 @@
+ is_raid1_device () {
+ case "$host_os" in
+ linux*)
+- level=`mdadm --query --detail $1 2>/dev/null | \
++ level=`$mdadm --query --detail $1 2>/dev/null | \
+ awk '/Raid Level :/ {print $4}'`
+ if [ "$level" = "raid1" ]; then
+ return 0
+@@ -236,7 +237,7 @@
+ linux*)
+ if is_raid1_device $source_device ; then
+ list=""
+- for device in `mdadm --query --detail "${source_device}" | \
++ for device in `$mdadm --query --detail "${source_device}" | \
+ awk '/\/dev\/[^(md)]/ {print $7}'` ; do
+ list="$list $device"
+ done
diff --git a/src/patches/grub-0.97-mpath.patch b/src/patches/grub-0.97-mpath.patch
new file mode 100644
index 0000000..4b7edf3
--- /dev/null
+++ b/src/patches/grub-0.97-mpath.patch
@@ -0,0 +1,18 @@
+--- grub-0.97/util/grub-install.in.mpath 2006-08-02 17:21:53.000000000 -0400
++++ grub-0.97/util/grub-install.in 2006-08-02 17:23:23.000000000 -0400
+@@ -107,6 +107,7 @@
+ -e 's%\(fd[0-9]*\)$%\1%' \
+ -e 's%/part[0-9]*$%/disc%' \
+ -e 's%\(c[0-7]d[0-9]*\).*$%\1%' \
++ -e 's%\(/mapper/[[:alpha:]]\+[[:digit:]]\+\)p[[:digit:]]\+$%\1%' \
+ -e 's%\(/mapper/[[:alpha:]]\+_[[:alpha:]]\+\)[[:digit:]]\+$%\1%'`
+ tmp_part=`echo "$1" | grep -v '/mapper/control$' |
+ grep -v '/mapper/[[:alnum:]]\+-[[:alnum:]]\+$' | uniq |
+@@ -116,6 +117,7 @@
+ -e 's%.*/floppy/[0-9]*$%%' \
+ -e 's%.*/\(disc\|part\([0-9]*\)\)$%\2%' \
+ -e 's%.*c[0-7]d[0-9]*p%%' \
++ -e 's%.*/mapper/[[:alpha:]]\+[[:digit:]]\+p\([[:digit:]]\+\)$%\1%' \
+ -e 's%.*/mapper/[[:alpha:]]\+_[[:alpha:]]\+\([[:digit:]]\+\)$%\1%' |
+ grep -v '.*/mapper/.*'`
+ ;;
diff --git a/src/patches/grub-0.97-nx-multiinstall.patch b/src/patches/grub-0.97-nx-multiinstall.patch
new file mode 100644
index 0000000..f0e4ec0
--- /dev/null
+++ b/src/patches/grub-0.97-nx-multiinstall.patch
@@ -0,0 +1,60 @@
+2006-03-09 Alexandre Oliva <oliva(a)gnu.org>
+
+ * lib/builtins.c (install_blocklist_helper): Move static
+ last_lenght...
+ (install_func_context): ... here.
+ (install_func): Reset it.
+
+Index: grub-0.97/stage2/builtins.c
+===================================================================
+--- grub-0.97.orig/stage2/builtins.c 2006-03-09 10:26:41.000000000 -0300
++++ grub-0.97/stage2/builtins.c 2006-03-09 11:36:18.000000000 -0300
+@@ -1926,11 +1926,13 @@ static struct {
+ int saved_sector;
+ int installaddr;
+ int installlist;
++ int last_length;
+ char *stage2_first_buffer;
+ } install_func_context = {
+ .saved_sector = 0,
+ .installaddr = 0,
+ .installlist = 0,
++ .last_length = SECTOR_SIZE,
+ .stage2_first_buffer = NULL,
+ };
+
+@@ -1960,19 +1962,19 @@ install_blocklist_helper (int sector, in
+ int *installlist = &install_func_context.installlist;
+ char **stage2_first_buffer = &install_func_context.stage2_first_buffer;
+ /* Was the last sector full? */
+- static int last_length = SECTOR_SIZE;
++ int *last_length = &install_func_context.last_length;
+
+ if (debug)
+ printf("[%d]", sector);
+
+- if (offset != 0 || last_length != SECTOR_SIZE)
++ if (offset != 0 || *last_length != SECTOR_SIZE)
+ {
+ /* We found a non-sector-aligned data block. */
+ errnum = ERR_UNALIGNED;
+ return;
+ }
+
+- last_length = length;
++ *last_length = length;
+
+ if (*((unsigned long *) (*installlist - 4))
+ + *((unsigned short *) *installlist) != sector
+@@ -2027,7 +2029,11 @@ install_func (char *arg, int flags)
+ int is_open = 0;
+ /* If LBA is forced? */
+ int is_force_lba = 0;
++ int *last_length = &install_func_context.last_length;
+
++ /* Reset state. */
++ *last_length = SECTOR_SIZE;
++
+ *stage2_first_buffer = old_sect + SECTOR_SIZE;
+ #ifdef GRUB_UTIL
+ /* If the Stage 2 is in a partition mounted by an OS, this will store
diff --git a/src/patches/grub-0.97-nxstack.patch b/src/patches/grub-0.97-nxstack.patch
new file mode 100644
index 0000000..92742cd
--- /dev/null
+++ b/src/patches/grub-0.97-nxstack.patch
@@ -0,0 +1,615 @@
+--- grub-0.97/stage2/shared.h.nxstack 2005-12-12 18:31:41.000000000 -0500
++++ grub-0.97/stage2/shared.h 2005-12-12 18:31:42.000000000 -0500
+@@ -36,8 +36,8 @@
+
+ /* Maybe redirect memory requests through grub_scratch_mem. */
+ #ifdef GRUB_UTIL
+-extern char *grub_scratch_mem;
+-# define RAW_ADDR(x) ((x) + (int) grub_scratch_mem)
++extern void *grub_scratch_mem;
++# define RAW_ADDR(x) ((x) + (unsigned long) grub_scratch_mem)
+ # define RAW_SEG(x) (RAW_ADDR ((x) << 4) >> 4)
+ #else
+ # define RAW_ADDR(x) (x)
+--- grub-0.97/stage2/builtins.c.nxstack 2005-12-12 18:31:41.000000000 -0500
++++ grub-0.97/stage2/builtins.c 2005-12-12 18:41:47.000000000 -0500
+@@ -131,62 +131,97 @@
+ }
+
+
++/* blocklist_read_helper nee disk_read_blocklist_func was a nested
++ * function, to which pointers were taken and exposed globally. Even
++ * in the GNU-C nested functions extension, they have local linkage,
++ * and aren't guaranteed to be accessable *at all* outside of their
++ * containing scope.
++ *
++ * Above and beyond all of that, the variables within blocklist_func_context
++ * are originally local variables, with local (not even static) linkage,
++ * from within blocklist_func. These were each referenced by
++ * disk_read_blocklist_func, which is only called from other functions
++ * through a globally scoped pointer.
++ *
++ * The documentation in GCC actually uses the words "all hell will break
++ * loose" to describe this scenario.
++ *
++ * Also, "start_sector" was also used uninitialized, but gcc doesn't warn
++ * about it (possibly because of the scoping madness?)
++ */
++
++static struct {
++ int start_sector;
++ int num_sectors;
++ int num_entries;
++ int last_length;
++} blocklist_func_context = {
++ .start_sector = 0,
++ .num_sectors = 0,
++ .num_entries = 0,
++ .last_length = 0
++};
++
++/* Collect contiguous blocks into one entry as many as possible,
++ and print the blocklist notation on the screen. */
++static void
++blocklist_read_helper (int sector, int offset, int length)
++{
++ int *start_sector = &blocklist_func_context.start_sector;
++ int *num_sectors = &blocklist_func_context.num_sectors;
++ int *num_entries = &blocklist_func_context.num_entries;
++ int *last_length = &blocklist_func_context.last_length;
++
++ if (*num_sectors > 0)
++ {
++ if (*start_sector + *num_sectors == sector
++ && offset == 0 && *last_length == SECTOR_SIZE)
++ {
++ *num_sectors++;
++ *last_length = length;
++ return;
++ }
++ else
++ {
++ if (*last_length == SECTOR_SIZE)
++ grub_printf ("%s%d+%d", *num_entries ? "," : "",
++ *start_sector - part_start, *num_sectors);
++ else if (*num_sectors > 1)
++ grub_printf ("%s%d+%d,%d[0-%d]", *num_entries ? "," : "",
++ *start_sector - part_start, *num_sectors-1,
++ *start_sector + *num_sectors-1 - part_start,
++ *last_length);
++ else
++ grub_printf ("%s%d[0-%d]", *num_entries ? "," : "",
++ *start_sector - part_start, *last_length);
++ *num_entries++;
++ *num_sectors = 0;
++ }
++ }
++
++ if (offset > 0)
++ {
++ grub_printf("%s%d[%d-%d]", *num_entries ? "," : "",
++ sector-part_start, offset, offset+length);
++ *num_entries++;
++ }
++ else
++ {
++ *start_sector = sector;
++ *num_sectors = 1;
++ *last_length = length;
++ }
++}
++
+ /* blocklist */
+ static int
+ blocklist_func (char *arg, int flags)
+ {
+ char *dummy = (char *) RAW_ADDR (0x100000);
+- int start_sector;
+- int num_sectors = 0;
+- int num_entries = 0;
+- int last_length = 0;
+
+- auto void disk_read_blocklist_func (int sector, int offset, int length);
+-
+- /* Collect contiguous blocks into one entry as many as possible,
+- and print the blocklist notation on the screen. */
+- auto void disk_read_blocklist_func (int sector, int offset, int length)
+- {
+- if (num_sectors > 0)
+- {
+- if (start_sector + num_sectors == sector
+- && offset == 0 && last_length == SECTOR_SIZE)
+- {
+- num_sectors++;
+- last_length = length;
+- return;
+- }
+- else
+- {
+- if (last_length == SECTOR_SIZE)
+- grub_printf ("%s%d+%d", num_entries ? "," : "",
+- start_sector - part_start, num_sectors);
+- else if (num_sectors > 1)
+- grub_printf ("%s%d+%d,%d[0-%d]", num_entries ? "," : "",
+- start_sector - part_start, num_sectors-1,
+- start_sector + num_sectors-1 - part_start,
+- last_length);
+- else
+- grub_printf ("%s%d[0-%d]", num_entries ? "," : "",
+- start_sector - part_start, last_length);
+- num_entries++;
+- num_sectors = 0;
+- }
+- }
+-
+- if (offset > 0)
+- {
+- grub_printf("%s%d[%d-%d]", num_entries ? "," : "",
+- sector-part_start, offset, offset+length);
+- num_entries++;
+- }
+- else
+- {
+- start_sector = sector;
+- num_sectors = 1;
+- last_length = length;
+- }
+- }
++ int *start_sector = &blocklist_func_context.start_sector;
++ int *num_sectors = &blocklist_func_context.num_sectors;
++ int *num_entries = &blocklist_func_context.num_entries;
+
+ /* Open the file. */
+ if (! grub_open (arg))
+@@ -206,15 +241,15 @@
+ grub_printf (")");
+
+ /* Read in the whole file to DUMMY. */
+- disk_read_hook = disk_read_blocklist_func;
++ disk_read_hook = blocklist_read_helper;
+ if (! grub_read (dummy, -1))
+ goto fail;
+
+ /* The last entry may not be printed yet. Don't check if it is a
+ * full sector, since it doesn't matter if we read too much. */
+- if (num_sectors > 0)
+- grub_printf ("%s%d+%d", num_entries ? "," : "",
+- start_sector - part_start, num_sectors);
++ if (*num_sectors > 0)
++ grub_printf ("%s%d+%d", *num_entries ? "," : "",
++ *start_sector - part_start, *num_sectors);
+
+ grub_printf ("\n");
+
+@@ -1889,6 +1924,77 @@
+
+
+ /* install */
++static struct {
++ int saved_sector;
++ int installaddr;
++ int installlist;
++ char *stage2_first_buffer;
++} install_func_context = {
++ .saved_sector = 0,
++ .installaddr = 0,
++ .installlist = 0,
++ .stage2_first_buffer = NULL,
++};
++
++/* Save the first sector of Stage2 in STAGE2_SECT. */
++/* Formerly disk_read_savesect_func with local scope inside install_func */
++static void
++install_savesect_helper(int sector, int offset, int length)
++{
++ if (debug)
++ printf ("[%d]", sector);
++
++ /* ReiserFS has files which sometimes contain data not aligned
++ on sector boundaries. Returning an error is better than
++ silently failing. */
++ if (offset != 0 || length != SECTOR_SIZE)
++ errnum = ERR_UNALIGNED;
++
++ install_func_context.saved_sector = sector;
++}
++
++/* Write SECTOR to INSTALLLIST, and update INSTALLADDR and INSTALLSECT. */
++/* Formerly disk_read_blocklist_func with local scope inside install_func */
++static void
++install_blocklist_helper (int sector, int offset, int length)
++{
++ int *installaddr = &install_func_context.installaddr;
++ int *installlist = &install_func_context.installlist;
++ char **stage2_first_buffer = &install_func_context.stage2_first_buffer;
++ /* Was the last sector full? */
++ static int last_length = SECTOR_SIZE;
++
++ if (debug)
++ printf("[%d]", sector);
++
++ if (offset != 0 || last_length != SECTOR_SIZE)
++ {
++ /* We found a non-sector-aligned data block. */
++ errnum = ERR_UNALIGNED;
++ return;
++ }
++
++ last_length = length;
++
++ if (*((unsigned long *) (*installlist - 4))
++ + *((unsigned short *) *installlist) != sector
++ || *installlist == (int) *stage2_first_buffer + SECTOR_SIZE + 4)
++ {
++ *installlist -= 8;
++
++ if (*((unsigned long *) (*installlist - 8)))
++ errnum = ERR_WONT_FIT;
++ else
++ {
++ *((unsigned short *) (*installlist + 2)) = (*installaddr >> 4);
++ *((unsigned long *) (*installlist - 4)) = sector;
++ }
++ }
++
++ *((unsigned short *) *installlist) += 1;
++ *installaddr += 512;
++}
++
+ static int
+ install_func (char *arg, int flags)
+ {
+@@ -1896,8 +2002,12 @@
+ char *stage1_buffer = (char *) RAW_ADDR (0x100000);
+ char *stage2_buffer = stage1_buffer + SECTOR_SIZE;
+ char *old_sect = stage2_buffer + SECTOR_SIZE;
+- char *stage2_first_buffer = old_sect + SECTOR_SIZE;
+- char *stage2_second_buffer = stage2_first_buffer + SECTOR_SIZE;
++ /* stage2_first_buffer used to be defined as:
++ * char *stage2_first_buffer = old_sect + SECTOR_SIZE; */
++ char **stage2_first_buffer = &install_func_context.stage2_first_buffer;
++ /* and stage2_second_buffer was:
++ * char *stage2_second_buffer = stage2_first_buffer + SECTOR_SIZE; */
++ char *stage2_second_buffer = old_sect + SECTOR_SIZE + SECTOR_SIZE;
+ /* XXX: Probably SECTOR_SIZE is reasonable. */
+ char *config_filename = stage2_second_buffer + SECTOR_SIZE;
+ char *dummy = config_filename + SECTOR_SIZE;
+@@ -1906,10 +2016,11 @@
+ int src_drive, src_partition, src_part_start;
+ int i;
+ struct geometry dest_geom, src_geom;
+- int saved_sector;
++ int *saved_sector = &install_func_context.saved_sector;
+ int stage2_first_sector, stage2_second_sector;
+ char *ptr;
+- int installaddr, installlist;
++ int *installaddr = &install_func_context.installaddr;
++ int *installlist = &install_func_context.installlist;
+ /* Point to the location of the name of a configuration file in Stage 2. */
+ char *config_file_location;
+ /* If FILE is a Stage 1.5? */
+@@ -1918,68 +2029,14 @@
+ int is_open = 0;
+ /* If LBA is forced? */
+ int is_force_lba = 0;
+- /* Was the last sector full? */
+- int last_length = SECTOR_SIZE;
+
++ *stage2_first_buffer = old_sect + SECTOR_SIZE;
+ #ifdef GRUB_UTIL
+ /* If the Stage 2 is in a partition mounted by an OS, this will store
+ the filename under the OS. */
+ char *stage2_os_file = 0;
+ #endif /* GRUB_UTIL */
+
+- auto void disk_read_savesect_func (int sector, int offset, int length);
+- auto void disk_read_blocklist_func (int sector, int offset, int length);
+-
+- /* Save the first sector of Stage2 in STAGE2_SECT. */
+- auto void disk_read_savesect_func (int sector, int offset, int length)
+- {
+- if (debug)
+- printf ("[%d]", sector);
+-
+- /* ReiserFS has files which sometimes contain data not aligned
+- on sector boundaries. Returning an error is better than
+- silently failing. */
+- if (offset != 0 || length != SECTOR_SIZE)
+- errnum = ERR_UNALIGNED;
+-
+- saved_sector = sector;
+- }
+-
+- /* Write SECTOR to INSTALLLIST, and update INSTALLADDR and
+- INSTALLSECT. */
+- auto void disk_read_blocklist_func (int sector, int offset, int length)
+- {
+- if (debug)
+- printf("[%d]", sector);
+-
+- if (offset != 0 || last_length != SECTOR_SIZE)
+- {
+- /* We found a non-sector-aligned data block. */
+- errnum = ERR_UNALIGNED;
+- return;
+- }
+-
+- last_length = length;
+-
+- if (*((unsigned long *) (installlist - 4))
+- + *((unsigned short *) installlist) != sector
+- || installlist == (int) stage2_first_buffer + SECTOR_SIZE + 4)
+- {
+- installlist -= 8;
+-
+- if (*((unsigned long *) (installlist - 8)))
+- errnum = ERR_WONT_FIT;
+- else
+- {
+- *((unsigned short *) (installlist + 2)) = (installaddr >> 4);
+- *((unsigned long *) (installlist - 4)) = sector;
+- }
+- }
+-
+- *((unsigned short *) installlist) += 1;
+- installaddr += 512;
+- }
+-
+ /* First, check the GNU-style long option. */
+ while (1)
+ {
+@@ -2011,10 +2068,10 @@
+ addr = skip_to (0, file);
+
+ /* Get the installation address. */
+- if (! safe_parse_maxint (&addr, &installaddr))
++ if (! safe_parse_maxint (&addr, installaddr))
+ {
+ /* ADDR is not specified. */
+- installaddr = 0;
++ *installaddr = 0;
+ ptr = addr;
+ errnum = 0;
+ }
+@@ -2110,17 +2167,17 @@
+ = 0x9090;
+
+ /* Read the first sector of Stage 2. */
+- disk_read_hook = disk_read_savesect_func;
+- if (grub_read (stage2_first_buffer, SECTOR_SIZE) != SECTOR_SIZE)
++ disk_read_hook = install_savesect_helper;
++ if (grub_read (*stage2_first_buffer, SECTOR_SIZE) != SECTOR_SIZE)
+ goto fail;
+
+- stage2_first_sector = saved_sector;
++ stage2_first_sector = *saved_sector;
+
+ /* Read the second sector of Stage 2. */
+ if (grub_read (stage2_second_buffer, SECTOR_SIZE) != SECTOR_SIZE)
+ goto fail;
+
+- stage2_second_sector = saved_sector;
++ stage2_second_sector = *saved_sector;
+
+ /* Check for the version of Stage 2. */
+ if (*((short *) (stage2_second_buffer + STAGE2_VER_MAJ_OFFS))
+@@ -2136,27 +2193,27 @@
+
+ /* If INSTALLADDR is not specified explicitly in the command-line,
+ determine it by the Stage 2 id. */
+- if (! installaddr)
++ if (! *installaddr)
+ {
+ if (! is_stage1_5)
+ /* Stage 2. */
+- installaddr = 0x8000;
++ *installaddr = 0x8000;
+ else
+ /* Stage 1.5. */
+- installaddr = 0x2000;
++ *installaddr = 0x2000;
+ }
+
+ *((unsigned long *) (stage1_buffer + STAGE1_STAGE2_SECTOR))
+ = stage2_first_sector;
+ *((unsigned short *) (stage1_buffer + STAGE1_STAGE2_ADDRESS))
+- = installaddr;
++ = *installaddr;
+ *((unsigned short *) (stage1_buffer + STAGE1_STAGE2_SEGMENT))
+- = installaddr >> 4;
++ = *installaddr >> 4;
+
+- i = (int) stage2_first_buffer + SECTOR_SIZE - 4;
++ i = (int) *stage2_first_buffer + SECTOR_SIZE - 4;
+ while (*((unsigned long *) i))
+ {
+- if (i < (int) stage2_first_buffer
++ if (i < (int) *stage2_first_buffer
+ || (*((int *) (i - 4)) & 0x80000000)
+ || *((unsigned short *) i) >= 0xA00
+ || *((short *) (i + 2)) == 0)
+@@ -2170,13 +2227,13 @@
+ i -= 8;
+ }
+
+- installlist = (int) stage2_first_buffer + SECTOR_SIZE + 4;
+- installaddr += SECTOR_SIZE;
++ *installlist = (int) *stage2_first_buffer + SECTOR_SIZE + 4;
++ *installaddr += SECTOR_SIZE;
+
+ /* Read the whole of Stage2 except for the first sector. */
+ grub_seek (SECTOR_SIZE);
+
+- disk_read_hook = disk_read_blocklist_func;
++ disk_read_hook = install_blocklist_helper;
+ if (! grub_read (dummy, -1))
+ goto fail;
+
+@@ -2259,7 +2316,7 @@
+ /* Skip the first sector. */
+ grub_seek (SECTOR_SIZE);
+
+- disk_read_hook = disk_read_savesect_func;
++ disk_read_hook = install_savesect_helper;
+ if (grub_read (stage2_buffer, SECTOR_SIZE) != SECTOR_SIZE)
+ goto fail;
+
+@@ -2329,7 +2386,7 @@
+ else
+ #endif /* GRUB_UTIL */
+ {
+- if (! devwrite (saved_sector - part_start, 1, stage2_buffer))
++ if (! devwrite (*saved_sector - part_start, 1, stage2_buffer))
+ goto fail;
+ }
+ }
+@@ -2351,7 +2408,7 @@
+ goto fail;
+ }
+
+- if (fwrite (stage2_first_buffer, 1, SECTOR_SIZE, fp) != SECTOR_SIZE)
++ if (fwrite (*stage2_first_buffer, 1, SECTOR_SIZE, fp) != SECTOR_SIZE)
+ {
+ fclose (fp);
+ errnum = ERR_WRITE;
+@@ -2378,7 +2435,7 @@
+ goto fail;
+
+ if (! devwrite (stage2_first_sector - src_part_start, 1,
+- stage2_first_buffer))
++ *stage2_first_buffer))
+ goto fail;
+
+ if (! devwrite (stage2_second_sector - src_part_start, 1,
+--- grub-0.97/grub/asmstub.c.nxstack 2005-12-12 18:31:41.000000000 -0500
++++ grub-0.97/grub/asmstub.c 2005-12-12 18:31:42.000000000 -0500
+@@ -42,6 +42,7 @@
+ #include <sys/time.h>
+ #include <termios.h>
+ #include <signal.h>
++#include <sys/mman.h>
+
+ #ifdef __linux__
+ # include <sys/ioctl.h> /* ioctl */
+@@ -82,7 +83,7 @@
+ struct apm_info apm_bios_info;
+
+ /* Emulation requirements. */
+-char *grub_scratch_mem = 0;
++void *grub_scratch_mem = 0;
+
+ struct geometry *disks = 0;
+
+@@ -106,14 +107,62 @@
+ static unsigned int serial_speed;
+ #endif /* SIMULATE_SLOWNESS_OF_SERIAL */
+
++/* This allocates page-aligned storage of the specified size, which must be
++ * a multiple of the page size as determined by calling sysconf(_SC_PAGESIZE)
++ */
++#ifdef __linux__
++static void *
++grub_mmap_alloc(size_t len)
++{
++ int mmap_flags = MAP_ANONYMOUS|MAP_PRIVATE|MAP_EXECUTABLE;
++
++#ifdef MAP_32BIT
++ mmap_flags |= MAP_32BIT;
++#endif
++ /* Mark the simulated stack executable, as GCC uses stack trampolines
++ * to implement nested functions. */
++ return mmap(NULL, len, PROT_READ|PROT_WRITE|PROT_EXEC, mmap_flags, -1, 0);
++}
++#else /* !defined(__linux__) */
++static void *
++grub_mmap_alloc(size_t len)
++{
++ int fd = 0, offset = 0, ret = 0;
++ void *pa = MAP_FAILED;
++ char template[] = "/tmp/grub_mmap_alloc_XXXXXX";
++ errno_t e;
++
++ fd = mkstemp(template);
++ if (fd < 0)
++ return pa;
++
++ unlink(template);
++
++ ret = ftruncate(fd, len);
++ if (ret < 0)
++ return pa;
++
++ /* Mark the simulated stack executable, as GCC uses stack trampolines
++ * to implement nested functions. */
++ pa = mmap(NULL, len, PROT_READ|PROT_WRITE|PROT_EXEC,
++ MAP_PRIVATE|MAP_EXECUTABLE, fd, offset);
++
++ e = errno;
++ close(fd);
++ errno = e;
++ return pa;
++}
++#endif /* defined(__linux__) */
++
+ /* The main entry point into this mess. */
+ int
+ grub_stage2 (void)
+ {
+ /* These need to be static, because they survive our stack transitions. */
+ static int status = 0;
+- static char *realstack;
+- char *scratch, *simstack;
++ static void *realstack;
++ void *simstack_alloc_base, *simstack;
++ size_t simstack_size, page_size;
+ int i;
+
+ auto void doit (void);
+@@ -145,9 +194,35 @@
+ }
+
+ assert (grub_scratch_mem == 0);
+- scratch = malloc (0x100000 + EXTENDED_MEMSIZE + 15);
+- assert (scratch);
+- grub_scratch_mem = (char *) ((((int) scratch) >> 4) << 4);
++
++ /* Allocate enough pages for 0x100000 + EXTENDED_SIZE + 15, and
++ * make sure the memory is aligned to a multiple of the system's
++ * page size */
++ page_size = sysconf (_SC_PAGESIZE);
++ simstack_size = ( 0x100000 + EXTENDED_MEMSIZE + 15);
++ if (simstack_size % page_size)
++ {
++ /* If we're not on a page_size boundary, round up to the next one */
++ simstack_size &= ~(page_size-1);
++ simstack_size += page_size;
++ }
++
++ /* Add one for a PROT_NONE boundary page at each end. */
++ simstack_size += 2 * page_size;
++
++ simstack_alloc_base = grub_mmap_alloc(simstack_size);
++ assert (simstack_alloc_base != MAP_FAILED);
++
++ /* mark pages above and below our simstack area as innaccessable.
++ * If the implementation we're using doesn't support that, then the
++ * new protection modes are undefined. It's safe to just ignore
++ * them, though. It'd be nice if we knew that we'd get a SEGV for
++ * touching the area, but that's all. it'd be nice to have. */
++ mprotect (simstack_alloc_base, page_size, PROT_NONE);
++ mprotect ((void *)((unsigned long)simstack_alloc_base +
++ simstack_size - page_size), page_size, PROT_NONE);
++
++ grub_scratch_mem = (void *)((unsigned long)simstack_alloc_base + page_size);
+
+ /* FIXME: simulate the memory holes using mprot, if available. */
+
+@@ -220,7 +295,7 @@
+ device_map = 0;
+ free (disks);
+ disks = 0;
+- free (scratch);
++ munmap(simstack_alloc_base, simstack_size);
+ grub_scratch_mem = 0;
+
+ if (serial_device)
diff --git a/src/patches/grub-0.97-once.patch b/src/patches/grub-0.97-once.patch
new file mode 100644
index 0000000..6fb9a8d
--- /dev/null
+++ b/src/patches/grub-0.97-once.patch
@@ -0,0 +1,513 @@
+--- grub-0.97/stage2/builtins.c.bootonce 2005-12-12 18:23:12.000000000 -0500
++++ grub-0.97/stage2/builtins.c 2005-12-12 18:29:20.000000000 -0500
+@@ -3217,146 +3217,175 @@
+ };
+
+
+-/* savedefault */
++
++#if !defined(SUPPORT_DISKLESS) && !defined(GRUB_UTIL)
++/* Write specified default entry number into stage2 file. */
+ static int
+-savedefault_func (char *arg, int flags)
++savedefault_helper(int new_default)
+ {
+-#if !defined(SUPPORT_DISKLESS) && !defined(GRUB_UTIL)
+- unsigned long tmp_drive = saved_drive;
+- unsigned long tmp_partition = saved_partition;
+- char *default_file = (char *) DEFAULT_FILE_BUF;
+- char buf[10];
+- char sect[SECTOR_SIZE];
+- int entryno;
+- int sector_count = 0;
+- int saved_sectors[2];
+- int saved_offsets[2];
+- int saved_lengths[2];
+-
+- /* Save sector information about at most two sectors. */
+- auto void disk_read_savesect_func (int sector, int offset, int length);
+- void disk_read_savesect_func (int sector, int offset, int length)
+- {
+- if (sector_count < 2)
+- {
+- saved_sectors[sector_count] = sector;
+- saved_offsets[sector_count] = offset;
+- saved_lengths[sector_count] = length;
+- }
+- sector_count++;
+- }
+-
+- /* This command is only useful when you boot an entry from the menu
+- interface. */
+- if (! (flags & BUILTIN_SCRIPT))
++ char buffer[512];
++ int *entryno_ptr;
++
++ /* Get the geometry of the boot drive (i.e. the disk which contains
++ this stage2). */
++ if (get_diskinfo (boot_drive, &buf_geom))
+ {
+- errnum = ERR_UNRECOGNIZED;
++ errnum = ERR_NO_DISK;
+ return 1;
+ }
+
+- /* Determine a saved entry number. */
+- if (*arg)
++ /* Load the second sector of this stage2. */
++ if (! rawread (boot_drive, install_second_sector, 0, SECTOR_SIZE, buffer))
+ {
+- if (grub_memcmp (arg, "fallback", sizeof ("fallback") - 1) == 0)
+- {
+- int i;
+- int index = 0;
+-
+- for (i = 0; i < MAX_FALLBACK_ENTRIES; i++)
+- {
+- if (fallback_entries[i] < 0)
+- break;
+- if (fallback_entries[i] == current_entryno)
+- {
+- index = i + 1;
+- break;
+- }
+- }
+-
+- if (index >= MAX_FALLBACK_ENTRIES || fallback_entries[index] < 0)
+- {
+- /* This is the last. */
+- errnum = ERR_BAD_ARGUMENT;
+- return 1;
+- }
++ return 1;
++ }
+
+- entryno = fallback_entries[index];
+- }
+- else if (! safe_parse_maxint (&arg, &entryno))
+- return 1;
++ /* Sanity check. */
++ if (buffer[STAGE2_STAGE2_ID] != STAGE2_ID_STAGE2
++ || *((short *) (buffer + STAGE2_VER_MAJ_OFFS)) != COMPAT_VERSION)
++ {
++ errnum = ERR_BAD_VERSION;
++ return 1;
+ }
+- else
+- entryno = current_entryno;
++
++ entryno_ptr = (int *) (buffer + STAGE2_SAVED_ENTRYNO);
+
+- /* Open the default file. */
+- saved_drive = boot_drive;
+- saved_partition = install_partition;
+- if (grub_open (default_file))
++ /* Check if the saved entry number differs from current entry number. */
++ if (*entryno_ptr != new_default)
+ {
+- int len;
++ /* Overwrite the saved entry number. */
++ *entryno_ptr = new_default;
+
+- disk_read_hook = disk_read_savesect_func;
+- len = grub_read (buf, sizeof (buf));
+- disk_read_hook = 0;
+- grub_close ();
++ /* Save the image in the disk. */
++ if (! rawwrite (boot_drive, install_second_sector, buffer))
++ return 1;
+
+- if (len != sizeof (buf))
+- {
+- /* This is too small. Do not modify the file manually, please! */
+- errnum = ERR_READ;
+- goto fail;
+- }
++ /* Clear the cache. */
++ buf_track = -1;
++ }
+
+- if (sector_count > 2)
+- {
+- /* Is this possible?! Too fragmented! */
+- errnum = ERR_FSYS_CORRUPT;
+- goto fail;
+- }
+-
+- /* Set up a string to be written. */
+- grub_memset (buf, '\n', sizeof (buf));
+- grub_sprintf (buf, "%d", entryno);
+-
+- if (saved_lengths[0] < sizeof (buf))
+- {
+- /* The file is anchored to another file and the first few bytes
+- are spanned in two sectors. Uggh... */
+- if (! rawread (current_drive, saved_sectors[0], 0, SECTOR_SIZE,
+- sect))
+- goto fail;
+- grub_memmove (sect + saved_offsets[0], buf, saved_lengths[0]);
+- if (! rawwrite (current_drive, saved_sectors[0], sect))
+- goto fail;
++ return 0;
++}
++#endif
+
+- if (! rawread (current_drive, saved_sectors[1], 0, SECTOR_SIZE,
+- sect))
+- goto fail;
+- grub_memmove (sect + saved_offsets[1],
+- buf + saved_lengths[0],
+- sizeof (buf) - saved_lengths[0]);
+- if (! rawwrite (current_drive, saved_sectors[1], sect))
+- goto fail;
+- }
++#if !defined(SUPPORT_DISKLESS) && defined(GRUB_UTIL)
++/*
++ * Full implementation of new `savedefault' for GRUB shell.
++ * XXX This needs fixing for stage2 files which aren't accessible
++ * through a mounted filesystem.
++ */
++static int
++savedefault_shell(char *arg, int flags)
++{
++ char *stage2_os_file = "/boot/grub/stage2"; /* Default filename */
++ FILE *fp;
++ char buffer[512];
++ int *entryno_ptr;
++ int new_default = 0;
++ int old_default = 0;
++
++ while (1)
++ {
++ if (grub_memcmp ("--stage2=", arg, sizeof ("--stage2=") - 1) == 0)
++ {
++ stage2_os_file = arg + sizeof ("--stage2=") - 1;
++ arg = skip_to (0, arg);
++ nul_terminate (stage2_os_file);
++ }
++ else if (grub_memcmp ("--default=", arg, sizeof ("--default=") - 1) == 0)
++ {
++ char *p = arg + sizeof ("--default=") - 1;
++ if (! safe_parse_maxint (&p, &new_default))
++ return 1;
++ arg = skip_to (0, arg);
++ }
++ else if (grub_memcmp ("--once", arg, sizeof ("--once") - 1) == 0)
++ {
++ new_default <<= 8;
++ new_default |= STAGE2_ONCEONLY_ENTRY;
++ arg = skip_to (0, arg);
++ }
+ else
+- {
+- /* This is a simple case. It fits into a single sector. */
+- if (! rawread (current_drive, saved_sectors[0], 0, SECTOR_SIZE,
+- sect))
+- goto fail;
+- grub_memmove (sect + saved_offsets[0], buf, sizeof (buf));
+- if (! rawwrite (current_drive, saved_sectors[0], sect))
+- goto fail;
+- }
++ break;
++ }
+
+- /* Clear the cache. */
+- buf_track = -1;
++ if (! (fp = fopen(stage2_os_file, "r+")))
++ {
++ errnum = ERR_FILE_NOT_FOUND;
++ return 1;
++ }
++
++ if (fseek (fp, SECTOR_SIZE, SEEK_SET) != 0)
++ {
++ fclose (fp);
++ errnum = ERR_BAD_VERSION;
++ return 1;
++ }
++
++ if (fread (buffer, 1, SECTOR_SIZE, fp) != SECTOR_SIZE)
++ {
++ fclose (fp);
++ errnum = ERR_READ;
++ return 1;
+ }
+
+- fail:
+- saved_drive = tmp_drive;
+- saved_partition = tmp_partition;
+- return errnum;
++ /* Sanity check. */
++ if (buffer[STAGE2_STAGE2_ID] != STAGE2_ID_STAGE2
++ || *((short *) (buffer + STAGE2_VER_MAJ_OFFS)) != COMPAT_VERSION)
++ {
++ errnum = ERR_BAD_VERSION;
++ return 1;
++ }
++
++ entryno_ptr = (int *) (buffer + STAGE2_SAVED_ENTRYNO);
++ if (new_default & STAGE2_ONCEONLY_ENTRY)
++ {
++ old_default=*entryno_ptr;
++ *entryno_ptr = new_default + (old_default & 0xFF);
++ }
++ else
++ {
++ *entryno_ptr = new_default;
++ }
++
++ if (fseek (fp, SECTOR_SIZE, SEEK_SET) != 0)
++ {
++ fclose (fp);
++ errnum = ERR_BAD_VERSION;
++ return 1;
++ }
++
++ if (fwrite (buffer, 1, SECTOR_SIZE, fp) != SECTOR_SIZE)
++ {
++ fclose (fp);
++ errnum = ERR_WRITE;
++ return 1;
++ }
++
++ (void)fflush (fp);
++ fclose (fp);
++ return 0;
++}
++#endif
++
++/* savedefault */
++static int
++savedefault_func (char *arg, int flags)
++{
++#if !defined(SUPPORT_DISKLESS)
++#if !defined(GRUB_UTIL)
++ /* This command is only useful when you boot an entry from the menu
++ interface. */
++ if (! (flags & BUILTIN_SCRIPT))
++ {
++ errnum = ERR_UNRECOGNIZED;
++ return 1;
++ }
++
++ return savedefault_helper(current_entryno);
++#else /* defined(GRUB_UTIL) */
++ return savedefault_shell(arg, flags);
++#endif
+ #else /* ! SUPPORT_DISKLESS && ! GRUB_UTIL */
+ errnum = ERR_UNRECOGNIZED;
+ return 1;
+@@ -3368,10 +3397,14 @@
+ "savedefault",
+ savedefault_func,
+ BUILTIN_CMDLINE,
+- "savedefault [NUM | `fallback']",
+- "Save the current entry as the default boot entry if no argument is"
+- " specified. If a number is specified, this number is saved. If"
+- " `fallback' is used, next fallback entry is saved."
++#ifdef GRUB_UTIL
++ "savedefault [--stage2=STAGE2_FILE] [--default=DEFAULT] [--once]",
++ "Save DEFAULT as the default boot entry in STAGE2_FILE. If '--once'"
++ " is specified, the default is reset after the next reboot."
++#else
++ "savedefault",
++ "Save the current entry as the default boot entry."
++#endif
+ };
+
+
+@@ -4598,6 +4631,15 @@
+ static int
+ timeout_func (char *arg, int flags)
+ {
++ /* One-shot default shenanigans -- don't piss around with the menu! */
++ if (grub_timeout != -1)
++ return 0;
++ if ((saved_entryno & STAGE2_ONCEONLY_ENTRY) != 0)
++ {
++ grub_timeout = 0;
++ return 0;
++ }
++
+ if (! safe_parse_maxint (&arg, &grub_timeout))
+ return 1;
+
+--- grub-0.97/stage2/shared.h.bootonce 2005-12-12 18:23:13.000000000 -0500
++++ grub-0.97/stage2/shared.h 2005-12-12 18:23:13.000000000 -0500
+@@ -200,6 +200,8 @@
+ #define STAGE2_FORCE_LBA 0x11
+ #define STAGE2_VER_STR_OFFS 0x12
+
++#define STAGE2_ONCEONLY_ENTRY 0x10000
++
+ /* Stage 2 identifiers */
+ #define STAGE2_ID_STAGE2 0
+ #define STAGE2_ID_FFS_STAGE1_5 1
+--- grub-0.97/stage2/builtins.c.bootonce 2006-03-13 16:55:11.000000000 -0500
++++ grub-0.97/stage2/builtins.c 2006-03-13 16:56:01.000000000 -0500
+@@ -761,11 +761,25 @@
+ };
+
+
++#if !defined(SUPPORT_DISKLESS) && !defined(GRUB_UTIL)
++static int savedefault_helper(int);
++#endif
+ /* default */
+ static int
+ default_func (char *arg, int flags)
+ {
+ #ifndef SUPPORT_DISKLESS
++#ifndef GRUB_UTIL
++ /* Has a forced once-only default been specified? */
++ if ((saved_entryno & STAGE2_ONCEONLY_ENTRY) != 0)
++ {
++ int old_defaults=saved_entryno & ~STAGE2_ONCEONLY_ENTRY;
++ grub_timeout = 0;
++ default_entry = old_defaults >> 8;
++ savedefault_helper(old_defaults & 0xff);
++ return 0;
++ }
++#endif
+ if (grub_strcmp (arg, "saved") == 0)
+ {
+ default_entry = saved_entryno;
+--- grub-0.97/stage2/stage2.c.bootonce 2006-03-13 17:27:40.000000000 -0500
++++ grub-0.97/stage2/stage2.c 2006-03-13 17:29:11.000000000 -0500
+@@ -960,38 +960,8 @@
+ if (use_config_file)
+ #endif /* GRUB_UTIL */
+ {
+- char *default_file = (char *) DEFAULT_FILE_BUF;
+ int i;
+-
+- /* Get a saved default entry if possible. */
+- saved_entryno = 0;
+- *default_file = 0;
+- grub_strncat (default_file, config_file, DEFAULT_FILE_BUFLEN);
+- for (i = grub_strlen(default_file); i >= 0; i--)
+- if (default_file[i] == '/')
+- {
+- i++;
+- break;
+- }
+- default_file[i] = 0;
+- grub_strncat (default_file + i, "default", DEFAULT_FILE_BUFLEN - i);
+- if (grub_open (default_file))
+- {
+- char buf[10]; /* This is good enough. */
+- char *p = buf;
+- int len;
+-
+- len = grub_read (buf, sizeof (buf));
+- if (len > 0)
+- {
+- buf[sizeof (buf) - 1] = 0;
+- safe_parse_maxint (&p, &saved_entryno);
+- }
+
+- grub_close ();
+- }
+- errnum = ERR_NONE;
+-
+ do
+ {
+ /* STATE 0: Before any title command.
+--- grub-0.97/util/grub-install.in.bootonce 2006-03-13 17:39:35.000000000 -0500
++++ grub-0.97/util/grub-install.in 2006-03-13 17:39:50.000000000 -0500
+@@ -30,7 +30,6 @@
+ pkglibdir=${libdir}/${PACKAGE}/${host_cpu}-${host_vendor}
+
+ grub_shell=${sbindir}/grub
+-grub_set_default=${sbindir}/grub-set-default
+ log_file=/tmp/grub-install.log.$$
+ img_file=/tmp/grub-install.img.$$
+ rootdir=
+@@ -432,9 +431,6 @@
+ exit 1
+ fi
+
+-# Make a default file.
+-${grub_set_default} --root-directory=${rootdir} default
+-
+ # Make sure that GRUB reads the same images as the host OS.
+ test -n "$mkimg" && img_file=`$mkimg`
+ test -n "$mklog" && log_file=`$mklog`
+--- grub-0.97/configure.bootonce 2006-03-13 17:49:05.000000000 -0500
++++ grub-0.97/configure 2006-03-13 17:49:16.000000000 -0500
+@@ -6135,7 +6135,7 @@
+
+
+
+- ac_config_files="$ac_config_files Makefile stage1/Makefile stage2/Makefile docs/Makefile lib/Makefile util/Makefile grub/Makefile netboot/Makefile util/grub-image util/grub-install util/grub-md5-crypt util/grub-terminfo util/grub-set-default"
++ ac_config_files="$ac_config_files Makefile stage1/Makefile stage2/Makefile docs/Makefile lib/Makefile util/Makefile grub/Makefile netboot/Makefile util/grub-image util/grub-install util/grub-md5-crypt util/grub-terminfo"
+
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -6754,7 +6754,6 @@
+ "util/grub-install" ) CONFIG_FILES="$CONFIG_FILES util/grub-install" ;;
+ "util/grub-md5-crypt" ) CONFIG_FILES="$CONFIG_FILES util/grub-md5-crypt" ;;
+ "util/grub-terminfo" ) CONFIG_FILES="$CONFIG_FILES util/grub-terminfo" ;;
+- "util/grub-set-default" ) CONFIG_FILES="$CONFIG_FILES util/grub-set-default" ;;
+ "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+ "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+--- grub-0.97/configure.ac.bootonce 2006-03-13 17:47:24.000000000 -0500
++++ grub-0.97/configure.ac 2006-03-13 17:47:37.000000000 -0500
+@@ -666,5 +666,5 @@
+ docs/Makefile lib/Makefile util/Makefile \
+ grub/Makefile netboot/Makefile util/grub-image \
+ util/grub-install util/grub-md5-crypt \
+- util/grub-terminfo util/grub-set-default])
++ util/grub-terminfo])
+ AC_OUTPUT
+--- grub-0.97/util/Makefile.am.bootonce 2006-03-13 17:48:39.000000000 -0500
++++ grub-0.97/util/Makefile.am 2006-03-13 17:48:45.000000000 -0500
+@@ -1,6 +1,5 @@
+ bin_PROGRAMS = mbchk
+-sbin_SCRIPTS = grub-install grub-md5-crypt grub-terminfo \
+- grub-set-default
++sbin_SCRIPTS = grub-install grub-md5-crypt grub-terminfo
+ noinst_SCRIPTS = grub-image mkbimage
+
+ EXTRA_DIST = mkbimage
+--- grub-0.97/util/Makefile.in.bootonce 2006-03-13 17:47:56.000000000 -0500
++++ grub-0.97/util/Makefile.in 2006-03-13 17:48:34.000000000 -0500
+@@ -43,8 +43,7 @@
+ subdir = util
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(srcdir)/grub-image.in $(srcdir)/grub-install.in \
+- $(srcdir)/grub-md5-crypt.in $(srcdir)/grub-set-default.in \
+- $(srcdir)/grub-terminfo.in
++ $(srcdir)/grub-md5-crypt.in $(srcdir)/grub-terminfo.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
+@@ -52,8 +51,7 @@
+ $(ACLOCAL_M4)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES = grub-image grub-install grub-md5-crypt \
+- grub-terminfo grub-set-default
++CONFIG_CLEAN_FILES = grub-image grub-install grub-md5-crypt grub-terminfo
+ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)"
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(bin_PROGRAMS)
+@@ -183,8 +181,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-sbin_SCRIPTS = grub-install grub-md5-crypt grub-terminfo \
+- grub-set-default
++sbin_SCRIPTS = grub-install grub-md5-crypt grub-terminfo
+
+ noinst_SCRIPTS = grub-image mkbimage
+ EXTRA_DIST = mkbimage
+@@ -234,8 +231,6 @@
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ grub-terminfo: $(top_builddir)/config.status $(srcdir)/grub-terminfo.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+-grub-set-default: $(top_builddir)/config.status $(srcdir)/grub-set-default.in
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
diff --git a/src/patches/grub-0.97-prototypes.patch b/src/patches/grub-0.97-prototypes.patch
new file mode 100644
index 0000000..21d65d5
--- /dev/null
+++ b/src/patches/grub-0.97-prototypes.patch
@@ -0,0 +1,11 @@
+--- grub-0.97/acinclude.m4.prototypes 2005-12-12 19:07:24.000000000 -0500
++++ grub-0.97/acinclude.m4 2005-12-12 19:07:56.000000000 -0500
+@@ -44,6 +44,8 @@
+ [AC_MSG_CHECKING([whether ${OBJCOPY} works for absolute addresses])
+ AC_CACHE_VAL(grub_cv_prog_objcopy_absolute,
+ [cat > conftest.c <<\EOF
++void cmain(void);
++
+ void
+ cmain (void)
+ {
diff --git a/src/patches/grub-0.97-stderr.patch b/src/patches/grub-0.97-stderr.patch
new file mode 100644
index 0000000..71d20ad
--- /dev/null
+++ b/src/patches/grub-0.97-stderr.patch
@@ -0,0 +1,102 @@
+--- grub-0.97/util/grub-install.in.stderr 2006-07-07 10:56:37.000000000 -0400
++++ grub-0.97/util/grub-install.in 2006-07-07 11:01:35.000000000 -0400
+@@ -207,7 +207,7 @@
+ while test -L $tmp_fname; do
+ tmp_new_fname=`ls -al $tmp_fname | sed -n 's%.*-> \(.*\)%\1%p'`
+ if test -z "$tmp_new_fname"; then
+- echo "Unrecognized ls output" 2>&1
++ echo "Unrecognized ls output" 1>&2
+ exit 1
+ fi
+
+@@ -264,7 +264,7 @@
+ stat_device() {
+ majmin=`stat -c "%t:%T" "$1" 2>/dev/null`
+ if test -z "$majmin"; then
+- echo "Could not find device for $1" 2>&1
++ echo "Could not find device for $1" 1>&2
+ exit 1
+ fi
+
+@@ -281,7 +281,7 @@
+ dev=`awk '($2 ~ /'$mntpnt'/) { print $1 }' /etc/mtab`
+ fi
+ if test -z "$dev"; then
+- echo "Could not find device for $1" 2>&1
++ echo "Could not find device for $1" 1>&2
+ exit 1
+ fi
+
+@@ -304,11 +304,11 @@
+ tmp_fname=`df $1/ | sed -n 's%.*\(/dev/[^ ]*\).*%\1%p'`
+
+ if test -z "$tmp_fname"; then
+- echo "Could not find device for $1" 2>&1
++ echo "Could not find device for $1" 1>&2
+ exit 1
+ fi
+
+- ret_fname=`resolve_symlink $tmp_fname`
++ ret_fname=`resolve_symlink $tmp_fname` || exit 1
+ tmp_fname=`find_mapper_device $ret_fname`
+ if test -n "$tmp_fname"; then
+ ret_fname="$tmp_fname"
+@@ -325,7 +325,7 @@
+ done
+ for file in \
+ ${pkgdatadir}/stage1 ${pkgdatadir}/stage2 ${pkgdatadir}/*stage1_5; do
+- cp -f $file ${grubdir} || exit 1
++ cp -f $file ${grubdir} 1>&2 || exit 1
+ done
+ }
+
+@@ -520,9 +520,9 @@
+ # Check for INSTALL_DEVICE.
+ case "$install_device" in
+ /dev/*)
+- install_device=`resolve_symlink "$install_device"`
++ install_device=`resolve_symlink "$install_device"` || exit 1
+ for install_drive in `find_real_devs $install_device` ; do
+- install_drive=`convert $install_drive`
++ install_drive=`convert $install_drive` || exit 1
+ if is_raid1_device $install_device; then
+ install_drive=`echo $install_drive | sed 's/,[0-9]*)/)/'`
+ fi
+@@ -550,8 +550,8 @@
+ unset install_device
+
+ # Get the root drive.
+-root_device=`find_device ${rootdir}`
+-bootdir_device=`find_device ${bootdir}`
++root_device=`find_device ${rootdir}` || exit 1
++bootdir_device=`find_device ${bootdir}` || exit 1
+
+ # Check if the boot directory is in the same device as the root directory.
+ if test "x$root_device" != "x$bootdir_device"; then
+@@ -561,7 +561,7 @@
+ fi
+
+ # Check if the root directory exists in the same device as the grub directory.
+-grubdir_device=`find_device ${grubdir}`
++grubdir_device=`find_device ${grubdir}` || exit 1
+
+ if test "x$grubdir_device" != "x$root_device"; then
+ # For now, cannot deal with this situation.
+@@ -582,7 +582,7 @@
+ fi
+
+ # Convert the root deviceto a GRUB drive.
+-root_drive=`convert "$root_device"`
++root_drive=`convert "$root_device"` || exit 1
+ if [ "x$root_drive" = x ]; then
+ exit 1
+ fi
+@@ -618,7 +618,7 @@
+
+ for install_drive in $install_drives; do
+ # Convert the root deviceto a GRUB drive.
+- root_drive=`convert "$root_device"`
++ root_drive=`convert "$root_device"` || exit 1
+ if [ "x$root_drive" = x ]; then
+ exit 1
+ fi
hooks/post-receive
--
IPFire 2.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. e317c06e0398b7782d88f3b47bcaa26f0be1639b
by git＠ipfire.org 07 Mar '10
by git＠ipfire.org 07 Mar '10
07 Mar '10
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via e317c06e0398b7782d88f3b47bcaa26f0be1639b (commit)
from 91bc781441cafde27a9b9794eb3ecf6f0776e92f (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 e317c06e0398b7782d88f3b47bcaa26f0be1639b
Author: Christian Schmidt <maniacikarus(a)ipfire.org>
Date: Sun Mar 7 20:28:23 2010 +0100
Fixed typo in core37 rootfile.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/37/filelists/files | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/37/filelists/files b/config/rootfiles/core/37/filelists/files
index c6ee131..0946902 100644
--- a/config/rootfiles/core/37/filelists/files
+++ b/config/rootfiles/core/37/filelists/files
@@ -20,4 +20,4 @@ usr/local/bin/sshctrl
var/ipfire/langs/de.pl
var/ipfire/langs/en.pl
var/ipfire/langs/fr.pl
-opt/pakfire/lib/pakfire.pl
+opt/pakfire/lib/functions.pl
hooks/post-receive
--
IPFire 2.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 91bc781441cafde27a9b9794eb3ecf6f0776e92f
by git＠ipfire.org 03 Mar '10
by git＠ipfire.org 03 Mar '10
03 Mar '10
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via 91bc781441cafde27a9b9794eb3ecf6f0776e92f (commit)
from d8c62d6a782fc6be97f47a82c8e2874eb788577a (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 91bc781441cafde27a9b9794eb3ecf6f0776e92f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Mar 3 10:45:47 2010 +0100
pakfire: Change pingtest to use icmp again.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/37/filelists/files | 1 +
src/pakfire/lib/functions.pl | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/37/filelists/files b/config/rootfiles/core/37/filelists/files
index 3b1e88b..c6ee131 100644
--- a/config/rootfiles/core/37/filelists/files
+++ b/config/rootfiles/core/37/filelists/files
@@ -20,3 +20,4 @@ usr/local/bin/sshctrl
var/ipfire/langs/de.pl
var/ipfire/langs/en.pl
var/ipfire/langs/fr.pl
+opt/pakfire/lib/pakfire.pl
diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index 8d4a7da..5aaa5f4 100644
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -116,7 +116,7 @@ sub usage {
sub pinghost {
my $host = shift;
- $p = Net::Ping->new();
+ $p = Net::Ping->new("icmp");
if ($p->ping($host)) {
logger("PING INFO: $host is alive");
return 1;
hooks/post-receive
--
IPFire 2.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] This git reposit keeps all the patches of the project. branch, master, updated. 0fc7eccec98d1579ba52c1530e7a3daaa3260812
by git＠ipfire.org 02 Mar '10
by git＠ipfire.org 02 Mar '10
02 Mar '10
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 "This git reposit keeps all the patches of the project.".
The branch, master has been updated
via 0fc7eccec98d1579ba52c1530e7a3daaa3260812 (commit)
from 6e2aac951d121133a482b12688d2a6260c3ba2aa (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 0fc7eccec98d1579ba52c1530e7a3daaa3260812
Author: Schantl Stefan <Stevee(a)ipfire.org>
Date: Tue Mar 2 09:38:14 2010 +0100
Delete a bunch of patches.
* libxslt: Won´t be portetd.
* logrotate: Ported to naoki.
* nmap: Ported to naoki.
-----------------------------------------------------------------------
Summary of changes:
libxslt/libxslt-1.1.24-CVE-2008-2935.patch | 173 ----------------------------
logrotate/logrotate-3.7.7-curdir.patch | 15 ---
logrotate/logrotate-3.7.7-toolarge.patch | 17 ---
nmap/nmap-5.00-mktemp.patch | 23 ----
4 files changed, 0 insertions(+), 228 deletions(-)
delete mode 100644 libxslt/libxslt-1.1.24-CVE-2008-2935.patch
delete mode 100644 logrotate/logrotate-3.7.7-curdir.patch
delete mode 100644 logrotate/logrotate-3.7.7-toolarge.patch
delete mode 100644 nmap/nmap-5.00-mktemp.patch
Difference in files:
diff --git a/libxslt/libxslt-1.1.24-CVE-2008-2935.patch b/libxslt/libxslt-1.1.24-CVE-2008-2935.patch
deleted file mode 100644
index 0fbf8f6..0000000
--- a/libxslt/libxslt-1.1.24-CVE-2008-2935.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-Index: libexslt/crypto.c
-===================================================================
---- libexslt/crypto.c (revision 1485)
-+++ libexslt/crypto.c (working copy)
-@@ -317,13 +317,13 @@ exsltCryptoCryptoApiRc4Decrypt (xmlXPath
- #define PLATFORM_MD5 GCRY_MD_MD5
- #define PLATFORM_SHA1 GCRY_MD_SHA1
-
--#ifdef HAVE_SYS_TYPES_H
--# include <sys/types.h>
--#endif
--#ifdef HAVE_STDINT_H
--# include <stdint.h>
--#endif
--
-+#ifdef HAVE_SYS_TYPES_H
-+# include <sys/types.h>
-+#endif
-+#ifdef HAVE_STDINT_H
-+# include <stdint.h>
-+#endif
-+
- #ifdef HAVE_SYS_SELECT_H
- #include <sys/select.h> /* needed by gcrypt.h 4 Jul 04 */
- #endif
-@@ -595,11 +595,13 @@ exsltCryptoRc4EncryptFunction (xmlXPathP
- int str_len = 0, bin_len = 0, hex_len = 0;
- xmlChar *key = NULL, *str = NULL, *padkey = NULL;
- xmlChar *bin = NULL, *hex = NULL;
-+ xsltTransformContextPtr tctxt = NULL;
-
-- if ((nargs < 1) || (nargs > 3)) {
-+ if (nargs != 2) {
- xmlXPathSetArityError (ctxt);
- return;
- }
-+ tctxt = xsltXPathGetTransformContext(ctxt);
-
- str = xmlXPathPopString (ctxt);
- str_len = xmlUTF8Strlen (str);
-@@ -611,7 +613,7 @@ exsltCryptoRc4EncryptFunction (xmlXPathP
- }
-
- key = xmlXPathPopString (ctxt);
-- key_len = xmlUTF8Strlen (str);
-+ key_len = xmlUTF8Strlen (key);
-
- if (key_len == 0) {
- xmlXPathReturnEmptyString (ctxt);
-@@ -620,15 +622,33 @@ exsltCryptoRc4EncryptFunction (xmlXPathP
- return;
- }
-
-- padkey = xmlMallocAtomic (RC4_KEY_LENGTH);
-+ padkey = xmlMallocAtomic (RC4_KEY_LENGTH + 1);
-+ if (padkey == NULL) {
-+ xsltTransformError(tctxt, NULL, tctxt->inst,
-+ "exsltCryptoRc4EncryptFunction: Failed to allocate padkey\n");
-+ tctxt->state = XSLT_STATE_STOPPED;
-+ xmlXPathReturnEmptyString (ctxt);
-+ goto done;
-+ }
-+ memset(padkey, 0, RC4_KEY_LENGTH + 1);
-+
- key_size = xmlUTF8Strsize (key, key_len);
-+ if ((key_size > RC4_KEY_LENGTH) || (key_size < 0)) {
-+ xsltTransformError(tctxt, NULL, tctxt->inst,
-+ "exsltCryptoRc4EncryptFunction: key size too long or key broken\n");
-+ tctxt->state = XSLT_STATE_STOPPED;
-+ xmlXPathReturnEmptyString (ctxt);
-+ goto done;
-+ }
- memcpy (padkey, key, key_size);
-- memset (padkey + key_size, '\0', sizeof (padkey));
-
- /* encrypt it */
- bin_len = str_len;
- bin = xmlStrdup (str);
- if (bin == NULL) {
-+ xsltTransformError(tctxt, NULL, tctxt->inst,
-+ "exsltCryptoRc4EncryptFunction: Failed to allocate string\n");
-+ tctxt->state = XSLT_STATE_STOPPED;
- xmlXPathReturnEmptyString (ctxt);
- goto done;
- }
-@@ -638,6 +658,9 @@ exsltCryptoRc4EncryptFunction (xmlXPathP
- hex_len = str_len * 2 + 1;
- hex = xmlMallocAtomic (hex_len);
- if (hex == NULL) {
-+ xsltTransformError(tctxt, NULL, tctxt->inst,
-+ "exsltCryptoRc4EncryptFunction: Failed to allocate result\n");
-+ tctxt->state = XSLT_STATE_STOPPED;
- xmlXPathReturnEmptyString (ctxt);
- goto done;
- }
-@@ -670,11 +693,13 @@ exsltCryptoRc4DecryptFunction (xmlXPathP
- int str_len = 0, bin_len = 0, ret_len = 0;
- xmlChar *key = NULL, *str = NULL, *padkey = NULL, *bin =
- NULL, *ret = NULL;
-+ xsltTransformContextPtr tctxt = NULL;
-
-- if ((nargs < 1) || (nargs > 3)) {
-+ if (nargs != 2) {
- xmlXPathSetArityError (ctxt);
- return;
- }
-+ tctxt = xsltXPathGetTransformContext(ctxt);
-
- str = xmlXPathPopString (ctxt);
- str_len = xmlUTF8Strlen (str);
-@@ -686,7 +711,7 @@ exsltCryptoRc4DecryptFunction (xmlXPathP
- }
-
- key = xmlXPathPopString (ctxt);
-- key_len = xmlUTF8Strlen (str);
-+ key_len = xmlUTF8Strlen (key);
-
- if (key_len == 0) {
- xmlXPathReturnEmptyString (ctxt);
-@@ -695,22 +720,51 @@ exsltCryptoRc4DecryptFunction (xmlXPathP
- return;
- }
-
-- padkey = xmlMallocAtomic (RC4_KEY_LENGTH);
-+ padkey = xmlMallocAtomic (RC4_KEY_LENGTH + 1);
-+ if (padkey == NULL) {
-+ xsltTransformError(tctxt, NULL, tctxt->inst,
-+ "exsltCryptoRc4EncryptFunction: Failed to allocate padkey\n");
-+ tctxt->state = XSLT_STATE_STOPPED;
-+ xmlXPathReturnEmptyString (ctxt);
-+ goto done;
-+ }
-+ memset(padkey, 0, RC4_KEY_LENGTH + 1);
- key_size = xmlUTF8Strsize (key, key_len);
-+ if ((key_size > RC4_KEY_LENGTH) || (key_size < 0)) {
-+ xsltTransformError(tctxt, NULL, tctxt->inst,
-+ "exsltCryptoRc4EncryptFunction: key size too long or key broken\n");
-+ tctxt->state = XSLT_STATE_STOPPED;
-+ xmlXPathReturnEmptyString (ctxt);
-+ goto done;
-+ }
- memcpy (padkey, key, key_size);
-- memset (padkey + key_size, '\0', sizeof (padkey));
-
- /* decode hex to binary */
- bin_len = str_len;
- bin = xmlMallocAtomic (bin_len);
-+ if (bin == NULL) {
-+ xsltTransformError(tctxt, NULL, tctxt->inst,
-+ "exsltCryptoRc4EncryptFunction: Failed to allocate string\n");
-+ tctxt->state = XSLT_STATE_STOPPED;
-+ xmlXPathReturnEmptyString (ctxt);
-+ goto done;
-+ }
- ret_len = exsltCryptoHex2Bin (str, str_len, bin, bin_len);
-
- /* decrypt the binary blob */
- ret = xmlMallocAtomic (ret_len);
-+ if (ret == NULL) {
-+ xsltTransformError(tctxt, NULL, tctxt->inst,
-+ "exsltCryptoRc4EncryptFunction: Failed to allocate result\n");
-+ tctxt->state = XSLT_STATE_STOPPED;
-+ xmlXPathReturnEmptyString (ctxt);
-+ goto done;
-+ }
- PLATFORM_RC4_DECRYPT (ctxt, padkey, bin, ret_len, ret, ret_len);
-
- xmlXPathReturnString (ctxt, ret);
-
-+done:
- if (key != NULL)
- xmlFree (key);
- if (str != NULL)
diff --git a/logrotate/logrotate-3.7.7-curdir.patch b/logrotate/logrotate-3.7.7-curdir.patch
deleted file mode 100644
index 8ae8f06..0000000
--- a/logrotate/logrotate-3.7.7-curdir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up logrotate-3.7.7/config.c.curdir logrotate-3.7.7/config.c
---- logrotate-3.7.7/config.c.curdir 2008-05-09 09:28:59.000000000 +0200
-+++ logrotate-3.7.7/config.c 2008-11-20 15:35:05.000000000 +0100
-@@ -316,11 +316,6 @@ static int readConfigPath(const char *pa
- DIR *dirp;
-
- here = open(".", O_RDONLY);
-- if (here < 0) {
-- message(MESS_ERROR, "cannot open current directory: %s\n",
-- strerror(errno));
-- return 1;
-- }
-
- if ((dirp = opendir(path)) == NULL) {
- message(MESS_ERROR, "cannot open directory %s: %s\n", path,
diff --git a/logrotate/logrotate-3.7.7-toolarge.patch b/logrotate/logrotate-3.7.7-toolarge.patch
deleted file mode 100644
index 68027c8..0000000
--- a/logrotate/logrotate-3.7.7-toolarge.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up logrotate-3.7.7/config.c.toolarge logrotate-3.7.7/config.c
---- logrotate-3.7.7/config.c.toolarge 2008-11-21 12:57:25.000000000 +0100
-+++ logrotate-3.7.7/config.c 2008-11-21 12:57:41.000000000 +0100
-@@ -530,6 +530,13 @@ static int readConfigFile(const char *co
-
- length = sb.st_size;
-
-+ if (length > 0xffffff) {
-+ message(MESS_ERROR, "file %s too large, probably not a config file.\n",
-+ configFile);
-+ close(fd);
-+ return 1;
-+ }
-+
- buf = alloca(length + 2);
- if (!buf) {
- message(MESS_ERROR, "alloca() of %d bytes failed\n", (int) length);
diff --git a/nmap/nmap-5.00-mktemp.patch b/nmap/nmap-5.00-mktemp.patch
deleted file mode 100644
index 68baffe..0000000
--- a/nmap/nmap-5.00-mktemp.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- nmap-4.03/shtool.mktemp 2006-05-10 13:09:34.000000000 +0200
-+++ nmap-4.03/shtool 2006-05-10 13:13:58.000000000 +0200
-@@ -579,15 +579,11 @@
- else
- tmpdir="/tmp"
- fi
-- tmpdir="$tmpdir/.shtool.$$"
-- ( umask 077
-- rm -rf "$tmpdir" >/dev/null 2>&1 || true
-- mkdir "$tmpdir" >/dev/null 2>&1
-- if [ $? -ne 0 ]; then
-- echo "$msgprefix:Error: failed to create temporary directory \`$tmpdir'" 1>&2
-- exit 1
-- fi
-- )
-+ tmpdir=`mktemp -p $tmpdir -d`
-+ if [ $? -ne 0 ]; then
-+ echo "$msgprefix:Error: failed to create temporary directory \`$tmpdir'" 1>&2
-+ exit 1
-+ fi
-
- # create (implicitly) secure temporary file
- tmpfile="$tmpdir/shtool.tmp"
hooks/post-receive
--
This git reposit keeps all the patches of the project.
1
0
[IPFire-SCM] [git.ipfire.org] This git reposit keeps all the patches of the project. branch, master, updated. 6e2aac951d121133a482b12688d2a6260c3ba2aa
by git＠ipfire.org 02 Mar '10
by git＠ipfire.org 02 Mar '10
02 Mar '10
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 "This git reposit keeps all the patches of the project.".
The branch, master has been updated
via 6e2aac951d121133a482b12688d2a6260c3ba2aa (commit)
from 4734e676d1ab135f189f83354401d9cf5dab24cc (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 6e2aac951d121133a482b12688d2a6260c3ba2aa
Author: Schantl Stefan <Stevee(a)ipfire.org>
Date: Tue Mar 2 09:34:54 2010 +0100
Remove patches from already ported packages.
-----------------------------------------------------------------------
Summary of changes:
ez-ipupdate/ez-ipupdate-3.0.11b8-10.patch | 8024 ------------------------
ez-ipupdate/ez-ipupdate-3.0.11b8-pidfile.patch | 11 -
libart/libart_lgpl-2.3.19-upstream_fix-1.patch | 28 -
libdnet/libdnet-1.12-shrext.patch | 327 -
libtiff/libtiff-3.8.2-CVE-2006-2193.patch | 11 -
libtiff/libtiff-3.8.2-lzw-bugs.patch | 58 -
libtiff/libtiff-3.8.2-mantypo.patch | 11 -
libtiff/libtiff-3.8.2-ormandy.patch | 669 --
libtiff/libtiff-3.8.2-tiffsplit-overflow.patch | 22 -
reiser4progs/reiser4progs-1.0.7-bad_elif.patch | 12 -
10 files changed, 0 insertions(+), 9173 deletions(-)
delete mode 100644 ez-ipupdate/ez-ipupdate-3.0.11b8-10.patch
delete mode 100644 ez-ipupdate/ez-ipupdate-3.0.11b8-pidfile.patch
delete mode 100644 libart/libart_lgpl-2.3.19-upstream_fix-1.patch
delete mode 100644 libdnet/libdnet-1.12-shrext.patch
delete mode 100644 libtiff/libtiff-3.8.2-CVE-2006-2193.patch
delete mode 100644 libtiff/libtiff-3.8.2-lzw-bugs.patch
delete mode 100644 libtiff/libtiff-3.8.2-mantypo.patch
delete mode 100644 libtiff/libtiff-3.8.2-ormandy.patch
delete mode 100644 libtiff/libtiff-3.8.2-tiffsplit-overflow.patch
delete mode 100644 reiser4progs/reiser4progs-1.0.7-bad_elif.patch
Difference in files:
diff --git a/ez-ipupdate/ez-ipupdate-3.0.11b8-10.patch b/ez-ipupdate/ez-ipupdate-3.0.11b8-10.patch
deleted file mode 100644
index fd19e11..0000000
--- a/ez-ipupdate/ez-ipupdate-3.0.11b8-10.patch
+++ /dev/null
@@ -1,8024 +0,0 @@
---- ez-ipupdate-3.0.11b8.orig/Makefile.in
-+++ ez-ipupdate-3.0.11b8/Makefile.in
-@@ -1,6 +1,6 @@
--# Makefile.in generated automatically by automake 1.3 from Makefile.am
-+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-
--# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -11,7 +11,7 @@
- # PARTICULAR PURPOSE.
-
-
--SHELL = /bin/sh
-+SHELL = @SHELL@
-
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
-@@ -32,7 +32,7 @@
- includedir = @includedir@
- oldincludedir = /usr/include
-
--DISTDIR =
-+DESTDIR =
-
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
-@@ -46,7 +46,7 @@
- AUTOHEADER = @AUTOHEADER@
-
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- transform = @program_transform_name@
-@@ -73,7 +73,7 @@
-
- EXTRA_DIST = getpass.c ez-ipupdate.lsm example.conf example-pgpow.conf example-dhs.conf example-dyndns.conf example-ods.conf example-tzo.conf example-gnudip.conf example-easydns.conf example-justlinux.conf example-dyns.conf CHANGELOG mkbinary example-heipv6tb.conf
-
--AUTOMAKE_OPTIONS=foreign
-+AUTOMAKE_OPTIONS = foreign
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
-@@ -90,50 +90,59 @@
- ez_ipupdate_DEPENDENCIES =
- ez_ipupdate_LDFLAGS =
- CFLAGS = @CFLAGS@
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
--LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
--DIST_COMMON = README COPYING INSTALL Makefile.am Makefile.in acconfig.h \
--aclocal.m4 config.guess config.h.in config.sub configure configure.in \
--install-sh missing mkinstalldirs stamp-h.in
-+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-+DIST_COMMON = README ./stamp-h.in COPYING INSTALL Makefile.am \
-+Makefile.in acconfig.h aclocal.m4 config.guess config.h.in config.sub \
-+configure configure.in install-sh missing mkinstalldirs
-
-
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
- TAR = tar
--GZIP = --best
-+GZIP_ENV = --best
-+DEP_FILES = .deps/cache_file.P .deps/conf_file.P .deps/ez-ipupdate.P \
-+.deps/md5.P .deps/pid_file.P
- SOURCES = $(ez_ipupdate_SOURCES)
- OBJECTS = $(ez_ipupdate_OBJECTS)
-
--all: Makefile $(PROGRAMS) config.h
--
-+all: all-redirect
- .SUFFIXES:
- .SUFFIXES: .S .c .o .s
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-- cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile
-+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+ cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
-
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
- cd $(top_builddir) \
- && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
- $(ACLOCAL_M4): configure.in
- cd $(srcdir) && $(ACLOCAL)
-
--config.status: $(srcdir)/configure
-+config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
- $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
- cd $(srcdir) && $(AUTOCONF)
-
- config.h: stamp-h
-- @:
-+ @if test ! -f $@; then \
-+ rm -f stamp-h; \
-+ $(MAKE) stamp-h; \
-+ else :; fi
- stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES= CONFIG_HEADERS=config.h \
- $(SHELL) ./config.status
-- @echo timestamp > stamp-h
-+ @echo timestamp > stamp-h 2> /dev/null
- $(srcdir)/config.h.in: $(srcdir)/stamp-h.in
-+ @if test ! -f $@; then \
-+ rm -f $(srcdir)/stamp-h.in; \
-+ $(MAKE) $(srcdir)/stamp-h.in; \
-+ else :; fi
- $(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
- cd $(top_srcdir) && $(AUTOHEADER)
-- @echo timestamp > $(srcdir)/stamp-h.in
-+ @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
-
- mostlyclean-hdr:
-
-@@ -158,20 +167,17 @@
- $(mkinstalldirs) $(DESTDIR)$(bindir)
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- if test -f $$p; then \
-- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
-- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
-+ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-+ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
- else :; fi; \
- done
-
- uninstall-binPROGRAMS:
- @$(NORMAL_UNINSTALL)
- list='$(bin_PROGRAMS)'; for p in $$list; do \
-- rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
-+ rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
- done
-
--.c.o:
-- $(COMPILE) -c $<
--
- .s.o:
- $(COMPILE) -c $<
-
-@@ -195,8 +201,12 @@
- tags: TAGS
-
- ID: $(HEADERS) $(SOURCES) $(LISP)
-+ list='$(SOURCES) $(HEADERS)'; \
-+ unique=`for i in $$list; do echo $$i; done | \
-+ awk ' { files[$$0] = 1; } \
-+ END { for (i in files) print i; }'`; \
- here=`pwd` && cd $(srcdir) \
-- && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
-+ && mkid -f$$here/ID $$unique $(LISP)
-
- TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
- tags=; \
-@@ -206,7 +216,7 @@
- awk ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
-- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
-+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP))
-
- mostlyclean-tags:
-
-@@ -225,99 +235,148 @@
- # tarfile.
- distcheck: dist
- -rm -rf $(distdir)
-- GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz
-+ GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
- mkdir $(distdir)/=build
- mkdir $(distdir)/=inst
- dc_install_base=`cd $(distdir)/=inst && pwd`; \
- cd $(distdir)/=build \
- && ../configure --srcdir=.. --prefix=$$dc_install_base \
-- && $(MAKE) \
-- && $(MAKE) dvi \
-- && $(MAKE) check \
-- && $(MAKE) install \
-- && $(MAKE) installcheck \
-- && $(MAKE) dist
-+ && $(MAKE) $(AM_MAKEFLAGS) \
-+ && $(MAKE) $(AM_MAKEFLAGS) dvi \
-+ && $(MAKE) $(AM_MAKEFLAGS) check \
-+ && $(MAKE) $(AM_MAKEFLAGS) install \
-+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-+ && $(MAKE) $(AM_MAKEFLAGS) dist
- -rm -rf $(distdir)
-- @echo "========================"; \
-- echo "$(distdir).tar.gz is ready for distribution"; \
-- echo "========================"
-+ @banner="$(distdir).tar.gz is ready for distribution"; \
-+ dashes=`echo "$$banner" | sed s/./=/g`; \
-+ echo "$$dashes"; \
-+ echo "$$banner"; \
-+ echo "$$dashes"
- dist: distdir
- -chmod -R a+r $(distdir)
-- GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
-+ GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
- -rm -rf $(distdir)
- dist-all: distdir
- -chmod -R a+r $(distdir)
-- GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
-+ GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
- -rm -rf $(distdir)
- distdir: $(DISTFILES)
- -rm -rf $(distdir)
- mkdir $(distdir)
- -chmod 777 $(distdir)
-+ here=`cd $(top_builddir) && pwd`; \
-+ top_distdir=`cd $(distdir) && pwd`; \
-+ distdir=`cd $(distdir) && pwd`; \
-+ cd $(top_srcdir) \
-+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile
- @for file in $(DISTFILES); do \
- d=$(srcdir); \
-- test -f $(distdir)/$$file \
-- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-- || cp -p $$d/$$file $(distdir)/$$file; \
-+ if test -d $$d/$$file; then \
-+ cp -pr $$d/$$file $(distdir)/$$file; \
-+ else \
-+ test -f $(distdir)/$$file \
-+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-+ || cp -p $$d/$$file $(distdir)/$$file || :; \
-+ fi; \
- done
--cache_file.o: cache_file.c config.h cache_file.h
--conf_file.o: conf_file.c config.h conf_file.h
--ez-ipupdate.o: ez-ipupdate.c config.h error.h md5.h dprintf.h \
-- conf_file.h cache_file.h pid_file.h
--md5.o: md5.c config.h md5.h
--pid_file.o: pid_file.c config.h error.h dprintf.h
--
--info:
--dvi:
--check: all
-- $(MAKE)
--installcheck:
--install-exec: install-binPROGRAMS
-- @$(NORMAL_INSTALL)
-
--install-data:
-- @$(NORMAL_INSTALL)
-+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
--install: install-exec install-data all
-- @:
-+-include $(DEP_FILES)
-
--uninstall: uninstall-binPROGRAMS
-+mostlyclean-depend:
-
-+clean-depend:
-+
-+distclean-depend:
-+ -rm -rf .deps
-+
-+maintainer-clean-depend:
-+
-+%.o: %.c
-+ @echo '$(COMPILE) -c $<'; \
-+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+ @-cp .deps/$(*F).pp .deps/$(*F).P; \
-+ tr ' ' '\012' < .deps/$(*F).pp \
-+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+ >> .deps/$(*F).P; \
-+ rm .deps/$(*F).pp
-+
-+%.lo: %.c
-+ @echo '$(LTCOMPILE) -c $<'; \
-+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
-+ < .deps/$(*F).pp > .deps/$(*F).P; \
-+ tr ' ' '\012' < .deps/$(*F).pp \
-+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-+ >> .deps/$(*F).P; \
-+ rm -f .deps/$(*F).pp
-+info-am:
-+info: info-am
-+dvi-am:
-+dvi: dvi-am
-+check-am: all-am
-+check: check-am
-+installcheck-am:
-+installcheck: installcheck-am
-+all-recursive-am: config.h
-+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
-+
-+install-exec-am: install-binPROGRAMS
-+install-exec: install-exec-am
-+
-+install-data-am:
-+install-data: install-data-am
-+
-+install-am: all-am
-+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+install: install-am
-+uninstall-am: uninstall-binPROGRAMS
-+uninstall: uninstall-am
-+all-am: Makefile $(PROGRAMS) config.h
-+all-redirect: all-am
- install-strip:
-- $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
-+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs:
-- $(mkinstalldirs) $(DATADIR)$(bindir)
-+ $(mkinstalldirs) $(DESTDIR)$(bindir)
-
-
- mostlyclean-generic:
-- -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
- clean-generic:
-- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
- distclean-generic:
-- -rm -f Makefile $(DISTCLEANFILES)
-+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
- maintainer-clean-generic:
-- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
--mostlyclean: mostlyclean-hdr mostlyclean-binPROGRAMS \
-- mostlyclean-compile mostlyclean-tags \
-+mostlyclean-am: mostlyclean-hdr mostlyclean-binPROGRAMS \
-+ mostlyclean-compile mostlyclean-tags mostlyclean-depend \
- mostlyclean-generic
-
--clean: clean-hdr clean-binPROGRAMS clean-compile clean-tags \
-- clean-generic mostlyclean
-+mostlyclean: mostlyclean-am
-+
-+clean-am: clean-hdr clean-binPROGRAMS clean-compile clean-tags \
-+ clean-depend clean-generic mostlyclean-am
-
--distclean: distclean-hdr distclean-binPROGRAMS distclean-compile \
-- distclean-tags distclean-generic clean
-+clean: clean-am
-+
-+distclean-am: distclean-hdr distclean-binPROGRAMS distclean-compile \
-+ distclean-tags distclean-depend distclean-generic \
-+ clean-am
-+
-+distclean: distclean-am
- -rm -f config.status
-
--maintainer-clean: maintainer-clean-hdr maintainer-clean-binPROGRAMS \
-+maintainer-clean-am: maintainer-clean-hdr maintainer-clean-binPROGRAMS \
- maintainer-clean-compile maintainer-clean-tags \
-- maintainer-clean-generic distclean
-+ maintainer-clean-depend maintainer-clean-generic \
-+ distclean-am
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
-+
-+maintainer-clean: maintainer-clean-am
- -rm -f config.status
-
- .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-@@ -325,8 +384,11 @@
- maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
- mostlyclean-compile distclean-compile clean-compile \
- maintainer-clean-compile tags mostlyclean-tags distclean-tags \
--clean-tags maintainer-clean-tags distdir info dvi installcheck \
--install-exec install-data install uninstall all installdirs \
-+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
-+distclean-depend clean-depend maintainer-clean-depend info-am info \
-+dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
-+install-exec-am install-exec install-data-am install-data install-am \
-+install uninstall-am uninstall all-redirect all-am all installdirs \
- mostlyclean-generic distclean-generic clean-generic \
- maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
---- ez-ipupdate-3.0.11b8.orig/aclocal.m4
-+++ ez-ipupdate-3.0.11b8/aclocal.m4
-@@ -1,7 +1,7 @@
--dnl aclocal.m4 generated automatically by aclocal 1.3
-+dnl aclocal.m4 generated automatically by aclocal 1.4-p6
-
--dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
--dnl This Makefile.in is free software; the Free Software Foundation
-+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
- dnl with or without modifications, as long as this notice is preserved.
-
-@@ -12,7 +12,7 @@
-
- # Like AC_CONFIG_HEADER, but automatically create stamp file.
-
--AC_DEFUN(AM_CONFIG_HEADER,
-+AC_DEFUN([AM_CONFIG_HEADER],
- [AC_PREREQ([2.12])
- AC_CONFIG_HEADER([$1])
- dnl When config.status generates a header, we must update the stamp-h file.
-@@ -42,8 +42,9 @@
- dnl Usage:
- dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
--AC_DEFUN(AM_INIT_AUTOMAKE,
--[AC_REQUIRE([AM_PROG_INSTALL])
-+AC_DEFUN([AM_INIT_AUTOMAKE],
-+[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-+AC_REQUIRE([AC_PROG_INSTALL])
- PACKAGE=[$1]
- AC_SUBST(PACKAGE)
- VERSION=[$2]
-@@ -53,33 +54,53 @@
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
- fi
- ifelse([$3],,
--AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
--AC_DEFINE_UNQUOTED(VERSION, "$VERSION"))
-+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
- AC_REQUIRE([AM_SANITY_CHECK])
- AC_REQUIRE([AC_ARG_PROGRAM])
- dnl FIXME This is truly gross.
- missing_dir=`cd $ac_aux_dir && pwd`
--AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
- AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
--AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
- AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
- AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
- AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-+# Copyright 2002 Free Software Foundation, Inc.
-
--# serial 1
--
--AC_DEFUN(AM_PROG_INSTALL,
--[AC_REQUIRE([AC_PROG_INSTALL])
--test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
--AC_SUBST(INSTALL_SCRIPT)dnl
--])
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+
-+# AM_AUTOMAKE_VERSION(VERSION)
-+# ----------------------------
-+# Automake X.Y traces this macro to ensure aclocal.m4 has been
-+# generated from the m4 files accompanying Automake X.Y.
-+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
-+
-+# AM_SET_CURRENT_AUTOMAKE_VERSION
-+# -------------------------------
-+# Call AM_AUTOMAKE_VERSION so it can be traced.
-+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+ [AM_AUTOMAKE_VERSION([1.4-p6])])
-
- #
- # Check to make sure that the build environment is sane.
- #
-
--AC_DEFUN(AM_SANITY_CHECK,
-+AC_DEFUN([AM_SANITY_CHECK],
- [AC_MSG_CHECKING([whether build environment is sane])
- # Just in case
- sleep 1
-@@ -120,7 +141,7 @@
-
- dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
- dnl The program must properly implement --version.
--AC_DEFUN(AM_MISSING_PROG,
-+AC_DEFUN([AM_MISSING_PROG],
- [AC_MSG_CHECKING(for working $2)
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
---- ez-ipupdate-3.0.11b8.orig/config.guess
-+++ ez-ipupdate-3.0.11b8/config.guess
-@@ -1,7 +1,10 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
--# Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
--#
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-+
-+timestamp='2003-01-10'
-+
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
- # the Free Software Foundation; either version 2 of the License, or
-@@ -21,36 +24,220 @@
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
-
--# Written by Per Bothner <bothner(a)cygnus.com>.
--# The master version of this file is at the FSF in /home/gd/gnu/lib.
-+# Originally written by Per Bothner <per(a)bothner.com>.
-+# Please send patches to <config-patches(a)gnu.org>. Submit a context
-+# diff and a properly formatted ChangeLog entry.
- #
- # This script attempts to guess a canonical system name similar to
- # config.sub. If it succeeds, it prints the system name on stdout, and
- # exits with 0. Otherwise, it exits with 1.
- #
- # The plan is that this can be called by configure scripts if you
--# don't specify an explicit system type (host/target name).
--#
--# Only a few systems have been added to this list; please add others
--# (but try to keep the structure clean).
--#
-+# don't specify an explicit build system type.
-+
-+me=`echo "$0" | sed -e 's,.*/,,'`
-+
-+usage="\
-+Usage: $0 [OPTION]
-+
-+Output the configuration name of the system \`$me' is run on.
-+
-+Operation modes:
-+ -h, --help print this help, then exit
-+ -t, --time-stamp print date of last modification, then exit
-+ -v, --version print version number, then exit
-+
-+Report bugs and patches to <config-patches(a)gnu.org>."
-+
-+version="\
-+GNU config.guess ($timestamp)
-+
-+Originally written by Per Bothner.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-+Free Software Foundation, Inc.
-+
-+This is free software; see the source for copying conditions. There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+
-+help="
-+Try \`$me --help' for more information."
-+
-+# Parse command line
-+while test $# -gt 0 ; do
-+ case $1 in
-+ --time-stamp | --time* | -t )
-+ echo "$timestamp" ; exit 0 ;;
-+ --version | -v )
-+ echo "$version" ; exit 0 ;;
-+ --help | --h* | -h )
-+ echo "$usage"; exit 0 ;;
-+ -- ) # Stop option processing
-+ shift; break ;;
-+ - ) # Use stdin as input.
-+ break ;;
-+ -* )
-+ echo "$me: invalid option $1$help" >&2
-+ exit 1 ;;
-+ * )
-+ break ;;
-+ esac
-+done
-+
-+if test $# != 0; then
-+ echo "$me: too many arguments$help" >&2
-+ exit 1
-+fi
-+
-+trap 'exit 1' 1 2 15
-+
-+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-+# compiler to aid in system detection is discouraged as it requires
-+# temporary files to be created and, as you can see below, it is a
-+# headache to deal with in a portable fashion.
-+
-+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-+# use `HOST_CC' if defined, but it is deprecated.
-+
-+# Portable tmp directory creation inspired by the Autoconf team.
-+
-+set_cc_for_build='
-+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-+: ${TMPDIR=/tmp} ;
-+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
-+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-+dummy=$tmp/dummy ;
-+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-+case $CC_FOR_BUILD,$HOST_CC,$CC in
-+ ,,) echo "int x;" > $dummy.c ;
-+ for c in cc gcc c89 c99 ; do
-+ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-+ CC_FOR_BUILD="$c"; break ;
-+ fi ;
-+ done ;
-+ if test x"$CC_FOR_BUILD" = x ; then
-+ CC_FOR_BUILD=no_compiler_found ;
-+ fi
-+ ;;
-+ ,,*) CC_FOR_BUILD=$CC ;;
-+ ,*,*) CC_FOR_BUILD=$HOST_CC ;;
-+esac ;'
-
- # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
--# (ghazi(a)noc.rutgers.edu 8/24/94.)
-+# (ghazi(a)noc.rutgers.edu 1994-08-24)
- if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
- PATH=$PATH:/.attbin ; export PATH
- fi
-
- UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
- UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
--UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
-+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
- UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
--trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
--
- # Note: order is significant - the case branches are not exclusive.
-
- case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-+ *:NetBSD:*:*)
-+ # NetBSD (nbsd) targets should (where applicable) match one or
-+ # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-+ # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
-+ # switched to ELF, *-*-netbsd* would select the old
-+ # object file format. This provides both forward
-+ # compatibility and a consistent mechanism for selecting the
-+ # object file format.
-+ #
-+ # Note: NetBSD doesn't particularly care about the vendor
-+ # portion of the name. We always set it to "unknown".
-+ sysctl="sysctl -n hw.machine_arch"
-+ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-+ /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-+ case "${UNAME_MACHINE_ARCH}" in
-+ armeb) machine=armeb-unknown ;;
-+ arm*) machine=arm-unknown ;;
-+ sh3el) machine=shl-unknown ;;
-+ sh3eb) machine=sh-unknown ;;
-+ *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-+ esac
-+ # The Operating System including object format, if it has switched
-+ # to ELF recently, or will in the future.
-+ case "${UNAME_MACHINE_ARCH}" in
-+ arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-+ eval $set_cc_for_build
-+ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-+ | grep __ELF__ >/dev/null
-+ then
-+ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-+ # Return netbsd for either. FIX?
-+ os=netbsd
-+ else
-+ os=netbsdelf
-+ fi
-+ ;;
-+ *)
-+ os=netbsd
-+ ;;
-+ esac
-+ # The OS release
-+ # Debian GNU/NetBSD machines have a different userland, and
-+ # thus, need a distinct triplet. However, they do not need
-+ # kernel version information, so it can be replaced with a
-+ # suitable tag, in the style of linux-gnu.
-+ case "${UNAME_VERSION}" in
-+ Debian*)
-+ release='-gnu'
-+ ;;
-+ *)
-+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+ ;;
-+ esac
-+ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-+ # contains redundant information, the shorter form:
-+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-+ echo "${machine}-${os}${release}"
-+ exit 0 ;;
-+ amiga:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ arc:OpenBSD:*:*)
-+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ hp300:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ mac68k:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ macppc:OpenBSD:*:*)
-+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ mvme68k:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ mvme88k:OpenBSD:*:*)
-+ echo m88k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ mvmeppc:OpenBSD:*:*)
-+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ pmax:OpenBSD:*:*)
-+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ sgi:OpenBSD:*:*)
-+ echo mipseb-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ sun3:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ wgrisc:OpenBSD:*:*)
-+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:OpenBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:MicroBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE}
-+ exit 0 ;;
- alpha:OSF1:*:*)
- if test $UNAME_RELEASE = "V4.0"; then
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-@@ -59,87 +246,91 @@
- # A Tn.n version is a released field test version.
- # A Xn.n version is an unreleased experimental baselevel.
- # 1.2 uses "1.2" for uname -r.
-- cat <<EOF >dummy.s
-+ eval $set_cc_for_build
-+ cat <<EOF >$dummy.s
-+ .data
-+\$Lformat:
-+ .byte 37,100,45,37,120,10,0 # "%d-%x\n"
-+
-+ .text
- .globl main
-+ .align 4
- .ent main
- main:
-- .frame \$30,0,\$26,0
-- .prologue 0
-- .long 0x47e03d80 # implver $0
-- lda \$2,259
-- .long 0x47e20c21 # amask $2,$1
-- srl \$1,8,\$2
-- sll \$2,2,\$2
-- sll \$0,3,\$0
-- addl \$1,\$0,\$0
-- addl \$2,\$0,\$0
-- ret \$31,(\$26),1
-+ .frame \$30,16,\$26,0
-+ ldgp \$29,0(\$27)
-+ .prologue 1
-+ .long 0x47e03d80 # implver \$0
-+ lda \$2,-1
-+ .long 0x47e20c21 # amask \$2,\$1
-+ lda \$16,\$Lformat
-+ mov \$0,\$17
-+ not \$1,\$18
-+ jsr \$26,printf
-+ ldgp \$29,0(\$26)
-+ mov 0,\$16
-+ jsr \$26,exit
- .end main
- EOF
-- ${CC-cc} dummy.s -o dummy 2>/dev/null
-+ $CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
- if test "$?" = 0 ; then
-- ./dummy
-- case "$?" in
-- 7)
-+ case `$dummy` in
-+ 0-0)
- UNAME_MACHINE="alpha"
- ;;
-- 15)
-+ 1-0)
- UNAME_MACHINE="alphaev5"
- ;;
-- 14)
-+ 1-1)
- UNAME_MACHINE="alphaev56"
- ;;
-- 10)
-+ 1-101)
- UNAME_MACHINE="alphapca56"
- ;;
-- 16)
-+ 2-303)
- UNAME_MACHINE="alphaev6"
- ;;
-+ 2-307)
-+ UNAME_MACHINE="alphaev67"
-+ ;;
-+ 2-1307)
-+ UNAME_MACHINE="alphaev68"
-+ ;;
-+ 3-1307)
-+ UNAME_MACHINE="alphaev7"
-+ ;;
- esac
- fi
-- rm -f dummy.s dummy
-- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
-+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+ exit 0 ;;
-+ Alpha\ *:Windows_NT*:*)
-+ # How do we know it's Interix rather than the generic POSIX subsystem?
-+ # Should we change UNAME_MACHINE based on the output of uname instead
-+ # of the specific Alpha model?
-+ echo alpha-pc-interix
- exit 0 ;;
- 21064:Windows_NT:50:3)
- echo alpha-dec-winnt3.5
- exit 0 ;;
- Amiga*:UNIX_System_V:4.0:*)
-- echo m68k-cbm-sysv4
-+ echo m68k-unknown-sysv4
- exit 0;;
-- amiga:NetBSD:*:*)
-- echo m68k-cbm-netbsd${UNAME_RELEASE}
-- exit 0 ;;
-- amiga:OpenBSD:*:*)
-- echo m68k-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
-- arc64:OpenBSD:*:*)
-- echo mips64el-unknown-openbsd${UNAME_RELEASE}
-+ *:[Aa]miga[Oo][Ss]:*:*)
-+ echo ${UNAME_MACHINE}-unknown-amigaos
- exit 0 ;;
-- arc:OpenBSD:*:*)
-- echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+ *:[Mm]orph[Oo][Ss]:*:*)
-+ echo ${UNAME_MACHINE}-unknown-morphos
- exit 0 ;;
-- hkmips:OpenBSD:*:*)
-- echo mips-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
-- pmax:OpenBSD:*:*)
-- echo mipsel-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
-- sgi:OpenBSD:*:*)
-- echo mips-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
-- wgrisc:OpenBSD:*:*)
-- echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+ *:OS/390:*:*)
-+ echo i370-ibm-openedition
- exit 0 ;;
- arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- echo arm-acorn-riscix${UNAME_RELEASE}
- exit 0;;
-- arm32:NetBSD:*:*)
-- echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-- exit 0 ;;
-- SR2?01:HI-UX/MPP:*:*)
-+ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
- echo hppa1.1-hitachi-hiuxmpp
- exit 0;;
-- Pyramid*:OSx*:*:*|MIS*:OSx*:*:*)
-+ Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
- # akee(a)wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
- if test "`(/bin/universe) 2>/dev/null`" = att ; then
- echo pyramid-pyramid-sysv3
-@@ -147,9 +338,16 @@
- echo pyramid-pyramid-bsd
- fi
- exit 0 ;;
-- NILE:*:*:dcosx)
-+ NILE*:*:*:dcosx)
- echo pyramid-pyramid-svr4
- exit 0 ;;
-+ DRS?6000:UNIX_SV:4.2*:7*)
-+ case `/usr/bin/uname -p` in
-+ sparc) echo sparc-icl-nx7 && exit 0 ;;
-+ esac ;;
-+ sun4H:SunOS:5.*:*)
-+ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ exit 0 ;;
- sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
-@@ -175,7 +373,7 @@
- echo m68k-sun-sunos${UNAME_RELEASE}
- exit 0 ;;
- sun*:*:4.2BSD:*)
-- UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-+ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
- test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
- case "`/bin/arch`" in
- sun3)
-@@ -189,30 +387,32 @@
- aushp:SunOS:*:*)
- echo sparc-auspex-sunos${UNAME_RELEASE}
- exit 0 ;;
-- atari*:NetBSD:*:*)
-- echo m68k-atari-netbsd${UNAME_RELEASE}
-- exit 0 ;;
-- atari*:OpenBSD:*:*)
-- echo m68k-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
-- sun3*:NetBSD:*:*)
-- echo m68k-sun-netbsd${UNAME_RELEASE}
-- exit 0 ;;
-- sun3*:OpenBSD:*:*)
-- echo m68k-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
-- mac68k:NetBSD:*:*)
-- echo m68k-apple-netbsd${UNAME_RELEASE}
-+ # The situation for MiNT is a little confusing. The machine name
-+ # can be virtually everything (everything which is not
-+ # "atarist" or "atariste" at least should have a processor
-+ # > m68000). The system name ranges from "MiNT" over "FreeMiNT"
-+ # to the lowercase version "mint" (or "freemint"). Finally
-+ # the system name "TOS" denotes a system which is actually not
-+ # MiNT. But MiNT is downward compatible to TOS, so this should
-+ # be no problem.
-+ atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-+ echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
-- mac68k:OpenBSD:*:*)
-- echo m68k-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
-- mvme68k:OpenBSD:*:*)
-- echo m68k-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
-- mvme88k:OpenBSD:*:*)
-- echo m88k-unknown-openbsd${UNAME_RELEASE}
-+ atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-+ echo m68k-atari-mint${UNAME_RELEASE}
-+ exit 0 ;;
-+ *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-+ echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
-+ milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-+ echo m68k-milan-mint${UNAME_RELEASE}
-+ exit 0 ;;
-+ hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-+ echo m68k-hades-mint${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-+ echo m68k-unknown-mint${UNAME_RELEASE}
-+ exit 0 ;;
- powerpc:machten:*:*)
- echo powerpc-apple-machten${UNAME_RELEASE}
- exit 0 ;;
-@@ -225,12 +425,18 @@
- VAX*:ULTRIX*:*:*)
- echo vax-dec-ultrix${UNAME_RELEASE}
- exit 0 ;;
-- 2020:CLIX:*:*)
-+ 2020:CLIX:*:* | 2430:CLIX:*:*)
- echo clipper-intergraph-clix${UNAME_RELEASE}
- exit 0 ;;
- mips:*:*:UMIPS | mips:*:*:RISCos)
-- sed 's/^ //' << EOF >dummy.c
-- int main (argc, argv) int argc; char **argv; {
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+#ifdef __cplusplus
-+#include <stdio.h> /* for printf() prototype */
-+ int main (int argc, char *argv[]) {
-+#else
-+ int main (argc, argv) int argc; char *argv[]; {
-+#endif
- #if defined (host_mips) && defined (MIPSEB)
- #if defined (SYSTYPE_SYSV)
- printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-@@ -245,12 +451,20 @@
- exit (-1);
- }
- EOF
-- ${CC-cc} dummy.c -o dummy \
-- && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-- && rm dummy.c dummy && exit 0
-- rm -f dummy.c dummy
-+ $CC_FOR_BUILD -o $dummy $dummy.c \
-+ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-+ && exit 0
- echo mips-mips-riscos${UNAME_RELEASE}
- exit 0 ;;
-+ Motorola:PowerMAX_OS:*:*)
-+ echo powerpc-motorola-powermax
-+ exit 0 ;;
-+ Motorola:*:4.3:PL8-*)
-+ echo powerpc-harris-powermax
-+ exit 0 ;;
-+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-+ echo powerpc-harris-powermax
-+ exit 0 ;;
- Night_Hawk:Power_UNIX:*:*)
- echo powerpc-harris-powerunix
- exit 0 ;;
-@@ -266,15 +480,18 @@
- AViiON:dgux:*:*)
- # DG/UX returns AViiON for all architectures
- UNAME_PROCESSOR=`/usr/bin/uname -p`
-- if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
-- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
-- -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
-+ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-+ then
-+ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-+ [ ${TARGET_BINARY_INTERFACE}x = x ]
-+ then
- echo m88k-dg-dgux${UNAME_RELEASE}
-- else
-+ else
- echo m88k-dg-dguxbcs${UNAME_RELEASE}
-+ fi
-+ else
-+ echo i586-dg-dgux${UNAME_RELEASE}
- fi
-- else echo i586-dg-dgux${UNAME_RELEASE}
-- fi
- exit 0 ;;
- M88*:DolphinOS:*:*) # DolphinOS (SVR3)
- echo m88k-dolphin-sysv3
-@@ -295,12 +512,21 @@
- ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
-- i?86:AIX:*:*)
-+ i*86:AIX:*:*)
- echo i386-ibm-aix
- exit 0 ;;
-+ ia64:AIX:*:*)
-+ if [ -x /usr/bin/oslevel ] ; then
-+ IBM_REV=`/usr/bin/oslevel`
-+ else
-+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+ fi
-+ echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-+ exit 0 ;;
- *:AIX:2:3)
- if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-- sed 's/^ //' << EOF >dummy.c
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
- #include <sys/systemcfg.h>
-
- main()
-@@ -311,8 +537,7 @@
- exit(0);
- }
- EOF
-- ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-- rm -f dummy.c dummy
-+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
- echo rs6000-ibm-aix3.2.5
- elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
- echo rs6000-ibm-aix3.2.4
-@@ -320,8 +545,9 @@
- echo rs6000-ibm-aix3.2
- fi
- exit 0 ;;
-- *:AIX:*:4)
-- if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
-+ *:AIX:*:[45])
-+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- IBM_ARCH=rs6000
- else
- IBM_ARCH=powerpc
-@@ -329,7 +555,7 @@
- if [ -x /usr/bin/oslevel ] ; then
- IBM_REV=`/usr/bin/oslevel`
- else
-- IBM_REV=4.${UNAME_RELEASE}
-+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- fi
- echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- exit 0 ;;
-@@ -339,7 +565,7 @@
- ibmrt:4.4BSD:*|romp-ibm:BSD:*)
- echo romp-ibm-bsd4.4
- exit 0 ;;
-- ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and
-+ ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
- echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
- exit 0 ;; # report: romp-ibm BSD 4.3
- *:BOSX:*:*)
-@@ -354,18 +580,85 @@
- hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
- echo m68k-hp-bsd4.4
- exit 0 ;;
-- 9000/[3478]??:HP-UX:*:*)
-+ 9000/[34678]??:HP-UX:*:*)
-+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- case "${UNAME_MACHINE}" in
- 9000/31? ) HP_ARCH=m68000 ;;
- 9000/[34]?? ) HP_ARCH=m68k ;;
-- 9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;;
-- 9000/8?? ) HP_ARCH=hppa1.0 ;;
-+ 9000/[678][0-9][0-9])
-+ if [ -x /usr/bin/getconf ]; then
-+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-+ case "${sc_cpu_version}" in
-+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-+ 532) # CPU_PA_RISC2_0
-+ case "${sc_kernel_bits}" in
-+ 32) HP_ARCH="hppa2.0n" ;;
-+ 64) HP_ARCH="hppa2.0w" ;;
-+ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
-+ esac ;;
-+ esac
-+ fi
-+ if [ "${HP_ARCH}" = "" ]; then
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+
-+ #define _HPUX_SOURCE
-+ #include <stdlib.h>
-+ #include <unistd.h>
-+
-+ int main ()
-+ {
-+ #if defined(_SC_KERNEL_BITS)
-+ long bits = sysconf(_SC_KERNEL_BITS);
-+ #endif
-+ long cpu = sysconf (_SC_CPU_VERSION);
-+
-+ switch (cpu)
-+ {
-+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-+ case CPU_PA_RISC2_0:
-+ #if defined(_SC_KERNEL_BITS)
-+ switch (bits)
-+ {
-+ case 64: puts ("hppa2.0w"); break;
-+ case 32: puts ("hppa2.0n"); break;
-+ default: puts ("hppa2.0"); break;
-+ } break;
-+ #else /* !defined(_SC_KERNEL_BITS) */
-+ puts ("hppa2.0"); break;
-+ #endif
-+ default: puts ("hppa1.0"); break;
-+ }
-+ exit (0);
-+ }
-+EOF
-+ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-+ test -z "$HP_ARCH" && HP_ARCH=hppa
-+ fi ;;
- esac
-- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-+ if [ ${HP_ARCH} = "hppa2.0w" ]
-+ then
-+ # avoid double evaluation of $set_cc_for_build
-+ test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
-+ then
-+ HP_ARCH="hppa2.0w"
-+ else
-+ HP_ARCH="hppa64"
-+ fi
-+ fi
- echo ${HP_ARCH}-hp-hpux${HPUX_REV}
- exit 0 ;;
-+ ia64:HP-UX:*:*)
-+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-+ echo ia64-hp-hpux${HPUX_REV}
-+ exit 0 ;;
- 3050*:HI-UX:*:*)
-- sed 's/^ //' << EOF >dummy.c
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
- #include <unistd.h>
- int
- main ()
-@@ -390,8 +683,7 @@
- exit (0);
- }
- EOF
-- ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-- rm -f dummy.c dummy
-+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
- echo unknown-hitachi-hiuxwe2
- exit 0 ;;
- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-@@ -400,13 +692,16 @@
- 9000/8??:4.3bsd:*:*)
- echo hppa1.0-hp-bsd
- exit 0 ;;
-+ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-+ echo hppa1.0-hp-mpeix
-+ exit 0 ;;
- hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
- echo hppa1.1-hp-osf
- exit 0 ;;
- hp8??:OSF1:*:*)
- echo hppa1.0-hp-osf
- exit 0 ;;
-- i?86:OSF1:*:*)
-+ i*86:OSF1:*:*)
- if [ -x /usr/sbin/sysversion ] ; then
- echo ${UNAME_MACHINE}-unknown-osf1mk
- else
-@@ -434,57 +729,82 @@
- C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- echo c4-convex-bsd
- exit 0 ;;
-- CRAY*X-MP:*:*:*)
-- echo xmp-cray-unicos
-- exit 0 ;;
- CRAY*Y-MP:*:*:*)
-- echo ymp-cray-unicos${UNAME_RELEASE}
-+ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
- CRAY*[A-Z]90:*:*:*)
- echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
- | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-- -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
-+ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-+ -e 's/\.[^.]*$/.X/'
- exit 0 ;;
- CRAY*TS:*:*:*)
-- echo t90-cray-unicos${UNAME_RELEASE}
-+ echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
-- CRAY-2:*:*:*)
-- echo cray2-cray-unicos
-- exit 0 ;;
-- F300:UNIX_System_V:*:*)
-- FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
-- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-- echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-- exit 0 ;;
-- F301:UNIX_System_V:*:*)
-- echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
-- exit 0 ;;
-- hp3[0-9][05]:NetBSD:*:*)
-- echo m68k-hp-netbsd${UNAME_RELEASE}
-+ CRAY*T3E:*:*:*)
-+ echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
-- hp300:OpenBSD:*:*)
-- echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ CRAY*SV1:*:*:*)
-+ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
-- i?86:BSD/386:*:* | *:BSD/OS:*:*)
-+ *:UNICOS/mp:*:*)
-+ echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ exit 0 ;;
-+ F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-+ FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+ exit 0 ;;
-+ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
- exit 0 ;;
-- *:FreeBSD:*:*)
-- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+ sparc*:BSD/OS:*:*)
-+ echo sparc-unknown-bsdi${UNAME_RELEASE}
- exit 0 ;;
-- *:NetBSD:*:*)
-- echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+ *:BSD/OS:*:*)
-+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- exit 0 ;;
-- *:OpenBSD:*:*)
-- echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+ *:FreeBSD:*:*)
-+ # Determine whether the default compiler uses glibc.
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #include <features.h>
-+ #if __GLIBC__ >= 2
-+ LIBC=gnu
-+ #else
-+ LIBC=
-+ #endif
-+EOF
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
- exit 0 ;;
- i*:CYGWIN*:*)
-- echo ${UNAME_MACHINE}-pc-cygwin32
-+ echo ${UNAME_MACHINE}-pc-cygwin
- exit 0 ;;
- i*:MINGW*:*)
- echo ${UNAME_MACHINE}-pc-mingw32
- exit 0 ;;
-+ i*:PW*:*)
-+ echo ${UNAME_MACHINE}-pc-pw32
-+ exit 0 ;;
-+ x86:Interix*:3*)
-+ echo i586-pc-interix3
-+ exit 0 ;;
-+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-+ echo i${UNAME_MACHINE}-pc-mks
-+ exit 0 ;;
-+ i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-+ # How do we know it's Interix rather than the generic POSIX subsystem?
-+ # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-+ # UNAME_MACHINE based on the output of uname instead of i386?
-+ echo i586-pc-interix
-+ exit 0 ;;
-+ i*:UWIN*:*)
-+ echo ${UNAME_MACHINE}-pc-uwin
-+ exit 0 ;;
- p*:CYGWIN*:*)
-- echo powerpcle-unknown-cygwin32
-+ echo powerpcle-unknown-cygwin
- exit 0 ;;
- prep*:SunOS:5.*:*)
- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-@@ -492,145 +812,159 @@
- *:GNU:*:*)
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
- exit 0 ;;
-- *:Linux:*:*)
-- # uname on the ARM produces all sorts of strangeness, and we need to
-- # filter it out.
-- case "$UNAME_MACHINE" in
-- arm* | sa110*) UNAME_MACHINE="arm" ;;
-+ i*86:Minix:*:*)
-+ echo ${UNAME_MACHINE}-pc-minix
-+ exit 0 ;;
-+ arm*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ ia64:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ m68*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ mips:Linux:*:*)
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #undef CPU
-+ #undef mips
-+ #undef mipsel
-+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-+ CPU=mipsel
-+ #else
-+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-+ CPU=mips
-+ #else
-+ CPU=
-+ #endif
-+ #endif
-+EOF
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-+ ;;
-+ mips64:Linux:*:*)
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #undef CPU
-+ #undef mips64
-+ #undef mips64el
-+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-+ CPU=mips64el
-+ #else
-+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-+ CPU=mips64
-+ #else
-+ CPU=
-+ #endif
-+ #endif
-+EOF
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-+ ;;
-+ ppc:Linux:*:*)
-+ echo powerpc-unknown-linux-gnu
-+ exit 0 ;;
-+ ppc64:Linux:*:*)
-+ echo powerpc64-unknown-linux-gnu
-+ exit 0 ;;
-+ alpha:Linux:*:*)
-+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-+ EV5) UNAME_MACHINE=alphaev5 ;;
-+ EV56) UNAME_MACHINE=alphaev56 ;;
-+ PCA56) UNAME_MACHINE=alphapca56 ;;
-+ PCA57) UNAME_MACHINE=alphapca56 ;;
-+ EV6) UNAME_MACHINE=alphaev6 ;;
-+ EV67) UNAME_MACHINE=alphaev67 ;;
-+ EV68*) UNAME_MACHINE=alphaev68 ;;
-+ esac
-+ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+ exit 0 ;;
-+ parisc:Linux:*:* | hppa:Linux:*:*)
-+ # Look for CPU level
-+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-+ PA7*) echo hppa1.1-unknown-linux-gnu ;;
-+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
-+ *) echo hppa-unknown-linux-gnu ;;
- esac
--
-+ exit 0 ;;
-+ parisc64:Linux:*:* | hppa64:Linux:*:*)
-+ echo hppa64-unknown-linux-gnu
-+ exit 0 ;;
-+ s390:Linux:*:* | s390x:Linux:*:*)
-+ echo ${UNAME_MACHINE}-ibm-linux
-+ exit 0 ;;
-+ sh*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ sparc:Linux:*:* | sparc64:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ x86_64:Linux:*:*)
-+ echo x86_64-unknown-linux-gnu
-+ exit 0 ;;
-+ i*86:Linux:*:*)
- # The BFD linker knows what the default object file format is, so
-- # first see if it will tell us.
-- ld_help_string=`ld --help 2>&1`
-- ld_supported_emulations=`echo $ld_help_string \
-- | sed -ne '/supported emulations:/!d
-+ # first see if it will tell us. cd to the root directory to prevent
-+ # problems with other programs or directories called `ld' in the path.
-+ # Set LC_ALL=C to ensure ld outputs messages in English.
-+ ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-+ | sed -ne '/supported targets:/!d
- s/[ ][ ]*/ /g
-- s/.*supported emulations: *//
-+ s/.*supported targets: *//
- s/ .*//
- p'`
-- case "$ld_supported_emulations" in
-- i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;;
-- i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;;
-- sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-- armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-- m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-- elf32ppc) echo "powerpc-unknown-linux-gnu" ; exit 0 ;;
-+ case "$ld_supported_targets" in
-+ elf32-i386)
-+ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-+ ;;
-+ a.out-i386-linux)
-+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-+ exit 0 ;;
-+ coff-i386)
-+ echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-+ exit 0 ;;
-+ "")
-+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
-+ # one that does not give us useful --help.
-+ echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-+ exit 0 ;;
- esac
--
-- if test "${UNAME_MACHINE}" = "alpha" ; then
-- sed 's/^ //' <<EOF >dummy.s
-- .globl main
-- .ent main
-- main:
-- .frame \$30,0,\$26,0
-- .prologue 0
-- .long 0x47e03d80 # implver $0
-- lda \$2,259
-- .long 0x47e20c21 # amask $2,$1
-- srl \$1,8,\$2
-- sll \$2,2,\$2
-- sll \$0,3,\$0
-- addl \$1,\$0,\$0
-- addl \$2,\$0,\$0
-- ret \$31,(\$26),1
-- .end main
--EOF
-- LIBC=""
-- ${CC-cc} dummy.s -o dummy 2>/dev/null
-- if test "$?" = 0 ; then
-- ./dummy
-- case "$?" in
-- 7)
-- UNAME_MACHINE="alpha"
-- ;;
-- 15)
-- UNAME_MACHINE="alphaev5"
-- ;;
-- 14)
-- UNAME_MACHINE="alphaev56"
-- ;;
-- 10)
-- UNAME_MACHINE="alphapca56"
-- ;;
-- 16)
-- UNAME_MACHINE="alphaev6"
-- ;;
-- esac
--
-- objdump --private-headers dummy | \
-- grep ld.so.1 > /dev/null
-- if test "$?" = 0 ; then
-- LIBC="libc1"
-- fi
-- fi
-- rm -f dummy.s dummy
-- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
-- elif test "${UNAME_MACHINE}" = "mips" ; then
-- cat >dummy.c <<EOF
--main(argc, argv)
-- int argc;
-- char *argv[];
--{
--#ifdef __MIPSEB__
-- printf ("%s-unknown-linux-gnu\n", argv[1]);
--#endif
--#ifdef __MIPSEL__
-- printf ("%sel-unknown-linux-gnu\n", argv[1]);
--#endif
-- return 0;
--}
--EOF
-- ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
-- rm -f dummy.c dummy
-- else
-- # Either a pre-BFD a.out linker (linux-gnuoldld)
-- # or one that does not give us useful --help.
-- # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
-- # If ld does not provide *any* "supported emulations:"
-- # that means it is gnuoldld.
-- echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
-- test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
--
-- case "${UNAME_MACHINE}" in
-- i?86)
-- VENDOR=pc;
-- ;;
-- *)
-- VENDOR=unknown;
-- ;;
-- esac
-- # Determine whether the default compiler is a.out or elf
-- cat >dummy.c <<EOF
--#include <features.h>
--main(argc, argv)
-- int argc;
-- char *argv[];
--{
--#ifdef __ELF__
--# ifdef __GLIBC__
--# if __GLIBC__ >= 2
-- printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
--# else
-- printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
--# endif
--# else
-- printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
--# endif
--#else
-- printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
--#endif
-- return 0;
--}
-+ # Determine whether the default compiler is a.out or elf
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #include <features.h>
-+ #ifdef __ELF__
-+ # ifdef __GLIBC__
-+ # if __GLIBC__ >= 2
-+ LIBC=gnu
-+ # else
-+ LIBC=gnulibc1
-+ # endif
-+ # else
-+ LIBC=gnulibc1
-+ # endif
-+ #else
-+ #ifdef __INTEL_COMPILER
-+ LIBC=gnu
-+ #else
-+ LIBC=gnuaout
-+ #endif
-+ #endif
- EOF
-- ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
-- rm -f dummy.c dummy
-- fi ;;
--# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions
--# are messed up and put the nodename in both sysname and nodename.
-- i?86:DYNIX/ptx:4*:*)
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-+ test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-+ test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-+ ;;
-+ i*86:DYNIX/ptx:4*:*)
-+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-+ # earlier versions are messed up and put the nodename in both
-+ # sysname and nodename.
- echo i386-sequent-sysv4
- exit 0 ;;
-- i?86:UNIX_SV:4.2MP:2.*)
-+ i*86:UNIX_SV:4.2MP:2.*)
- # Unixware is an offshoot of SVR4, but it has its own version
- # number series starting with 2...
- # I am not positive that other SVR4 systems won't match this,
-@@ -638,28 +972,59 @@
- # Use sysv4.2uw... so that sysv4* matches it.
- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
- exit 0 ;;
-- i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
-+ i*86:OS/2:*:*)
-+ # If we were able to find `uname', then EMX Unix compatibility
-+ # is probably installed.
-+ echo ${UNAME_MACHINE}-pc-os2-emx
-+ exit 0 ;;
-+ i*86:XTS-300:*:STOP)
-+ echo ${UNAME_MACHINE}-unknown-stop
-+ exit 0 ;;
-+ i*86:atheos:*:*)
-+ echo ${UNAME_MACHINE}-unknown-atheos
-+ exit 0 ;;
-+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+ echo i386-unknown-lynxos${UNAME_RELEASE}
-+ exit 0 ;;
-+ i*86:*DOS:*:*)
-+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
-+ exit 0 ;;
-+ i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-+ UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
- if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-- echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
-+ echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
- else
-- echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
-+ echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
- fi
- exit 0 ;;
-- i?86:*:3.2:*)
-+ i*86:*:5:[78]*)
-+ case `/bin/uname -X | grep "^Machine"` in
-+ *486*) UNAME_MACHINE=i486 ;;
-+ *Pentium) UNAME_MACHINE=i586 ;;
-+ *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-+ esac
-+ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-+ exit 0 ;;
-+ i*86:*:3.2:*)
- if test -f /usr/options/cb.name; then
- UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
- echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
- elif /bin/uname -X 2>/dev/null >/dev/null ; then
-- UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-- (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-- (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-+ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-+ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-+ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
- && UNAME_MACHINE=i586
-+ (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-+ && UNAME_MACHINE=i686
-+ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-+ && UNAME_MACHINE=i686
- echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
- else
- echo ${UNAME_MACHINE}-pc-sysv32
- fi
- exit 0 ;;
- pc:*:*:*)
-+ # Left here for compatibility:
- # uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i386.
- echo i386-pc-msdosdjgpp
-@@ -681,9 +1046,15 @@
- # "miniframe"
- echo m68010-convergent-sysv
- exit 0 ;;
-+ mc68k:UNIX:SYSTEM5:3.51m)
-+ echo m68k-convergent-sysv
-+ exit 0 ;;
-+ M680?0:D-NIX:5.3:*)
-+ echo m68k-diab-dnix
-+ exit 0 ;;
- M68*:*:R3V[567]*:*)
- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-- 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
-+ 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0)
- OS_REL=''
- test -r /etc/.relid \
- && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-@@ -694,24 +1065,27 @@
- 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && echo i486-ncr-sysv4 && exit 0 ;;
-- m68*:LynxOS:2.*:*)
-+ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- echo m68k-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
- mc68030:UNIX_System_V:4.*:*)
- echo m68k-atari-sysv4
- exit 0 ;;
-- i?86:LynxOS:2.*:*)
-- echo i386-unknown-lynxos${UNAME_RELEASE}
-- exit 0 ;;
- TSUNAMI:LynxOS:2.*:*)
- echo sparc-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
-- rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
-+ rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
-+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-+ echo powerpc-unknown-lynxos${UNAME_RELEASE}
-+ exit 0 ;;
- SM[BE]S:UNIX_SV:*:*)
- echo mips-dde-sysv${UNAME_RELEASE}
- exit 0 ;;
-+ RM*:ReliantUNIX-*:*:*)
-+ echo mips-sni-sysv4
-+ exit 0 ;;
- RM*:SINIX-*:*:*)
- echo mips-sni-sysv4
- exit 0 ;;
-@@ -723,8 +1097,8 @@
- echo ns32k-sni-sysv
- fi
- exit 0 ;;
-- PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-- # says <Richard.M.Bartel(a)ccMail.Census.GOV>
-+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-+ # says <Richard.M.Bartel(a)ccMail.Census.GOV>
- echo i586-unisys-sysv4
- exit 0 ;;
- *:UNIX_System_V:4*:FTX*)
-@@ -736,25 +1110,113 @@
- # From seanf(a)swdc.stratus.com.
- echo i860-stratus-sysv4
- exit 0 ;;
-+ *:VOS:*:*)
-+ # From Paul.Green(a)stratus.com.
-+ echo hppa1.1-stratus-vos
-+ exit 0 ;;
- mc68*:A/UX:*:*)
- echo m68k-apple-aux${UNAME_RELEASE}
- exit 0 ;;
-- news*:NEWS-OS:*:6*)
-+ news*:NEWS-OS:6*:*)
- echo mips-sony-newsos6
- exit 0 ;;
-- R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*)
-+ R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
- if [ -d /usr/nec ]; then
- echo mips-nec-sysv${UNAME_RELEASE}
- else
- echo mips-unknown-sysv${UNAME_RELEASE}
- fi
- exit 0 ;;
-+ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
-+ echo powerpc-be-beos
-+ exit 0 ;;
-+ BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
-+ echo powerpc-apple-beos
-+ exit 0 ;;
-+ BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
-+ echo i586-pc-beos
-+ exit 0 ;;
-+ SX-4:SUPER-UX:*:*)
-+ echo sx4-nec-superux${UNAME_RELEASE}
-+ exit 0 ;;
-+ SX-5:SUPER-UX:*:*)
-+ echo sx5-nec-superux${UNAME_RELEASE}
-+ exit 0 ;;
-+ SX-6:SUPER-UX:*:*)
-+ echo sx6-nec-superux${UNAME_RELEASE}
-+ exit 0 ;;
-+ Power*:Rhapsody:*:*)
-+ echo powerpc-apple-rhapsody${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:Rhapsody:*:*)
-+ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:Darwin:*:*)
-+ case `uname -p` in
-+ *86) UNAME_PROCESSOR=i686 ;;
-+ powerpc) UNAME_PROCESSOR=powerpc ;;
-+ esac
-+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:procnto*:*:* | *:QNX:[0123456789]*:*)
-+ UNAME_PROCESSOR=`uname -p`
-+ if test "$UNAME_PROCESSOR" = "x86"; then
-+ UNAME_PROCESSOR=i386
-+ UNAME_MACHINE=pc
-+ fi
-+ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:QNX:*:4*)
-+ echo i386-pc-qnx
-+ exit 0 ;;
-+ NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
-+ echo nsr-tandem-nsk${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:NonStop-UX:*:*)
-+ echo mips-compaq-nonstopux
-+ exit 0 ;;
-+ BS2000:POSIX*:*:*)
-+ echo bs2000-siemens-sysv
-+ exit 0 ;;
-+ DS/*:UNIX_System_V:*:*)
-+ echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:Plan9:*:*)
-+ # "uname -m" is not consistent, so use $cputype instead. 386
-+ # is converted to i386 for consistency with other x86
-+ # operating systems.
-+ if test "$cputype" = "386"; then
-+ UNAME_MACHINE=i386
-+ else
-+ UNAME_MACHINE="$cputype"
-+ fi
-+ echo ${UNAME_MACHINE}-unknown-plan9
-+ exit 0 ;;
-+ *:TOPS-10:*:*)
-+ echo pdp10-unknown-tops10
-+ exit 0 ;;
-+ *:TENEX:*:*)
-+ echo pdp10-unknown-tenex
-+ exit 0 ;;
-+ KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-+ echo pdp10-dec-tops20
-+ exit 0 ;;
-+ XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-+ echo pdp10-xkl-tops20
-+ exit 0 ;;
-+ *:TOPS-20:*:*)
-+ echo pdp10-unknown-tops20
-+ exit 0 ;;
-+ *:ITS:*:*)
-+ echo pdp10-unknown-its
-+ exit 0 ;;
- esac
-
- #echo '(No uname command or uname output not recognized.)' 1>&2
- #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
--cat >dummy.c <<EOF
-+eval $set_cc_for_build
-+cat >$dummy.c <<EOF
- #ifdef _SEQUENT_
- # include <sys/types.h>
- # include <sys/utsname.h>
-@@ -792,7 +1254,10 @@
- #endif
- int version;
- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-+ if (version < 4)
-+ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-+ else
-+ printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
- exit (0);
- #endif
-
-@@ -837,11 +1302,24 @@
- #endif
-
- #if defined (vax)
--#if !defined (ultrix)
-- printf ("vax-dec-bsd\n"); exit (0);
--#else
-- printf ("vax-dec-ultrix\n"); exit (0);
--#endif
-+# if !defined (ultrix)
-+# include <sys/param.h>
-+# if defined (BSD)
-+# if BSD == 43
-+ printf ("vax-dec-bsd4.3\n"); exit (0);
-+# else
-+# if BSD == 199006
-+ printf ("vax-dec-bsd4.3reno\n"); exit (0);
-+# else
-+ printf ("vax-dec-bsd\n"); exit (0);
-+# endif
-+# endif
-+# else
-+ printf ("vax-dec-bsd\n"); exit (0);
-+# endif
-+# else
-+ printf ("vax-dec-ultrix\n"); exit (0);
-+# endif
- #endif
-
- #if defined (alliant) && defined (i860)
-@@ -852,8 +1330,7 @@
- }
- EOF
-
--${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
--rm -f dummy.c dummy
-+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
-
- # Apollos put the system type in the environment.
-
-@@ -885,6 +1362,48 @@
- esac
- fi
-
--#echo '(Unable to guess system type)' 1>&2
-+cat >&2 <<EOF
-+$0: unable to guess system type
-+
-+This script, last modified $timestamp, has failed to recognize
-+the operating system you are using. It is advised that you
-+download the most up to date version of the config scripts from
-+
-+ ftp://ftp.gnu.org/pub/gnu/config/
-+
-+If the version you run ($0) is already up to date, please
-+send the following data and any information you think might be
-+pertinent to <config-patches(a)gnu.org> in order to provide the needed
-+information to handle your system.
-+
-+config.guess timestamp = $timestamp
-+
-+uname -m = `(uname -m) 2>/dev/null || echo unknown`
-+uname -r = `(uname -r) 2>/dev/null || echo unknown`
-+uname -s = `(uname -s) 2>/dev/null || echo unknown`
-+uname -v = `(uname -v) 2>/dev/null || echo unknown`
-+
-+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-+/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
-+
-+hostinfo = `(hostinfo) 2>/dev/null`
-+/bin/universe = `(/bin/universe) 2>/dev/null`
-+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
-+/bin/arch = `(/bin/arch) 2>/dev/null`
-+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
-+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-+
-+UNAME_MACHINE = ${UNAME_MACHINE}
-+UNAME_RELEASE = ${UNAME_RELEASE}
-+UNAME_SYSTEM = ${UNAME_SYSTEM}
-+UNAME_VERSION = ${UNAME_VERSION}
-+EOF
-
- exit 1
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "timestamp='"
-+# time-stamp-format: "%:y-%02m-%02d"
-+# time-stamp-end: "'"
-+# End:
---- ez-ipupdate-3.0.11b8.orig/config.h.in
-+++ ez-ipupdate-3.0.11b8/config.h.in
-@@ -1,4 +1,4 @@
--/* config.h.in. Generated automatically from configure.in by autoheader. */
-+/* config.h.in. Generated automatically from configure.in by autoheader 2.13. */
-
- /* Define as the return type of signal handlers (int or void). */
- #undef RETSIGTYPE
-@@ -132,6 +132,9 @@
- /* Define if you have the <stdarg.h> header file. */
- #undef HAVE_STDARG_H
-
-+/* Define if you have the <string.h> header file. */
-+#undef HAVE_STRING_H
-+
- /* Define if you have the <sys/socket.h> header file. */
- #undef HAVE_SYS_SOCKET_H
-
-@@ -153,6 +156,9 @@
- /* Define if you have the <syslog.h> header file. */
- #undef HAVE_SYSLOG_H
-
-+/* Define if you have the <time.h> header file. */
-+#undef HAVE_TIME_H
-+
- /* Define if you have the <unistd.h> header file. */
- #undef HAVE_UNISTD_H
-
-@@ -161,3 +167,10 @@
-
- /* Define if you have the socket library (-lsocket). */
- #undef HAVE_LIBSOCKET
-+
-+/* Name of package */
-+#undef PACKAGE
-+
-+/* Version number of package */
-+#undef VERSION
-+
---- ez-ipupdate-3.0.11b8.orig/config.sub
-+++ ez-ipupdate-3.0.11b8/config.sub
-@@ -1,6 +1,10 @@
- #! /bin/sh
--# Configuration validation subroutine script, version 1.1.
--# Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
-+# Configuration validation subroutine script.
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-+
-+timestamp='2003-01-03'
-+
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
- # can handle that machine. It does not imply ALL GNU software can.
-@@ -25,6 +29,9 @@
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
-
-+# Please send patches to <config-patches(a)gnu.org>. Submit a context
-+# diff and a properly formatted ChangeLog entry.
-+#
- # Configuration subroutine to validate and canonicalize a configuration type.
- # Supply the specified configuration type as an argument.
- # If it is invalid, we print an error message on stderr and exit with code 1.
-@@ -45,30 +52,73 @@
- # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
- # It is wrong to echo any other type of specification.
-
--if [ x$1 = x ]
--then
-- echo Configuration name missing. 1>&2
-- echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
-- echo "or $0 ALIAS" 1>&2
-- echo where ALIAS is a recognized configuration type. 1>&2
-- exit 1
--fi
-+me=`echo "$0" | sed -e 's,.*/,,'`
-
--# First pass through any local machine types.
--case $1 in
-- *local*)
-- echo $1
-- exit 0
-- ;;
-- *)
-- ;;
-+usage="\
-+Usage: $0 [OPTION] CPU-MFR-OPSYS
-+ $0 [OPTION] ALIAS
-+
-+Canonicalize a configuration name.
-+
-+Operation modes:
-+ -h, --help print this help, then exit
-+ -t, --time-stamp print date of last modification, then exit
-+ -v, --version print version number, then exit
-+
-+Report bugs and patches to <config-patches(a)gnu.org>."
-+
-+version="\
-+GNU config.sub ($timestamp)
-+
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-+Free Software Foundation, Inc.
-+
-+This is free software; see the source for copying conditions. There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+
-+help="
-+Try \`$me --help' for more information."
-+
-+# Parse command line
-+while test $# -gt 0 ; do
-+ case $1 in
-+ --time-stamp | --time* | -t )
-+ echo "$timestamp" ; exit 0 ;;
-+ --version | -v )
-+ echo "$version" ; exit 0 ;;
-+ --help | --h* | -h )
-+ echo "$usage"; exit 0 ;;
-+ -- ) # Stop option processing
-+ shift; break ;;
-+ - ) # Use stdin as input.
-+ break ;;
-+ -* )
-+ echo "$me: invalid option $1$help"
-+ exit 1 ;;
-+
-+ *local*)
-+ # First pass through any local machine types.
-+ echo $1
-+ exit 0;;
-+
-+ * )
-+ break ;;
-+ esac
-+done
-+
-+case $# in
-+ 0) echo "$me: missing argument$help" >&2
-+ exit 1;;
-+ 1) ;;
-+ *) echo "$me: too many arguments$help" >&2
-+ exit 1;;
- esac
-
- # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
-- linux-gnu*)
-+ nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
- ;;
-@@ -94,15 +144,33 @@
- -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
- -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
- -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-- -apple)
-+ -apple | -axis)
- os=
- basic_machine=$1
- ;;
-+ -sim | -cisco | -oki | -wec | -winbond)
-+ os=
-+ basic_machine=$1
-+ ;;
-+ -scout)
-+ ;;
-+ -wrs)
-+ os=-vxworks
-+ basic_machine=$1
-+ ;;
-+ -chorusos*)
-+ os=-chorusos
-+ basic_machine=$1
-+ ;;
-+ -chorusrdb)
-+ os=-chorusrdb
-+ basic_machine=$1
-+ ;;
- -hiux*)
- os=-hiuxwe2
- ;;
- -sco5)
-- os=sco3.2v5
-+ os=-sco3.2v5
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
- -sco4)
-@@ -121,6 +189,9 @@
- os=-sco3.2v2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
-+ -udk*)
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
- -isc)
- os=-isc2.2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -143,26 +214,72 @@
- -psos*)
- os=-psos
- ;;
-+ -mint | -mint[0-9]*)
-+ basic_machine=m68k-atari
-+ os=-mint
-+ ;;
- esac
-
- # Decode aliases for certain CPU-COMPANY combinations.
- case $basic_machine in
- # Recognize the basic CPU types without company name.
- # Some are omitted here because they have special meanings below.
-- tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
-- | arme[lb] | pyramid | mn10200 | mn10300 \
-- | tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
-- | alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
-- | i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
-- | mips64 | mipsel | mips64el | mips64orion | mips64orionel \
-- | mipstx39 | mipstx39el \
-- | sparc | sparclet | sparclite | sparc64 | v850)
-+ 1750a | 580 \
-+ | a29k \
-+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-+ | clipper \
-+ | d10v | d30v | dlx | dsp16xx \
-+ | fr30 | frv \
-+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-+ | i370 | i860 | i960 | ia64 \
-+ | ip2k \
-+ | m32r | m68000 | m68k | m88k | mcore \
-+ | mips | mipsbe | mipseb | mipsel | mipsle \
-+ | mips16 \
-+ | mips64 | mips64el \
-+ | mips64vr | mips64vrel \
-+ | mips64orion | mips64orionel \
-+ | mips64vr4100 | mips64vr4100el \
-+ | mips64vr4300 | mips64vr4300el \
-+ | mips64vr5000 | mips64vr5000el \
-+ | mipsisa32 | mipsisa32el \
-+ | mipsisa32r2 | mipsisa32r2el \
-+ | mipsisa64 | mipsisa64el \
-+ | mipsisa64sb1 | mipsisa64sb1el \
-+ | mipsisa64sr71k | mipsisa64sr71kel \
-+ | mipstx39 | mipstx39el \
-+ | mn10200 | mn10300 \
-+ | msp430 \
-+ | ns16k | ns32k \
-+ | openrisc | or32 \
-+ | pdp10 | pdp11 | pj | pjl \
-+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-+ | pyramid \
-+ | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+ | sh64 | sh64le \
-+ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-+ | strongarm \
-+ | tahoe | thumb | tic80 | tron \
-+ | v850 | v850e \
-+ | we32k \
-+ | x86 | xscale | xstormy16 | xtensa \
-+ | z8k)
-+ basic_machine=$basic_machine-unknown
-+ ;;
-+ m6811 | m68hc11 | m6812 | m68hc12)
-+ # Motorola 68HC11/12.
- basic_machine=$basic_machine-unknown
-+ os=-none
-+ ;;
-+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
- ;;
-+
- # We use `pc' rather than `unknown'
- # because (1) that's what they normally are, and
- # (2) the word "unknown" tends to confuse beginning users.
-- i[34567]86)
-+ i*86 | x86_64)
- basic_machine=$basic_machine-pc
- ;;
- # Object if more than one company name word.
-@@ -171,27 +288,79 @@
- exit 1
- ;;
- # Recognize the basic CPU types with company name.
-- vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
-- | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
-- | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
-- | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
-- | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* \
-- | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
-- | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
-- | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-- | sparc64-* | mips64-* | mipsel-* \
-- | mips64el-* | mips64orion-* | mips64orionel-* \
-- | mipstx39-* | mipstx39el-* \
-- | f301-*)
-+ 580-* \
-+ | a29k-* \
-+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
-+ | avr-* \
-+ | bs2000-* \
-+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
-+ | clipper-* | cydra-* \
-+ | d10v-* | d30v-* | dlx-* \
-+ | elxsi-* \
-+ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-+ | h8300-* | h8500-* \
-+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-+ | i*86-* | i860-* | i960-* | ia64-* \
-+ | ip2k-* \
-+ | m32r-* \
-+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-+ | m88110-* | m88k-* | mcore-* \
-+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-+ | mips16-* \
-+ | mips64-* | mips64el-* \
-+ | mips64vr-* | mips64vrel-* \
-+ | mips64orion-* | mips64orionel-* \
-+ | mips64vr4100-* | mips64vr4100el-* \
-+ | mips64vr4300-* | mips64vr4300el-* \
-+ | mips64vr5000-* | mips64vr5000el-* \
-+ | mipsisa32-* | mipsisa32el-* \
-+ | mipsisa32r2-* | mipsisa32r2el-* \
-+ | mipsisa64-* | mipsisa64el-* \
-+ | mipsisa64sb1-* | mipsisa64sb1el-* \
-+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \
-+ | mipstx39-* | mipstx39el-* \
-+ | msp430-* \
-+ | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
-+ | orion-* \
-+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-+ | pyramid-* \
-+ | romp-* | rs6000-* \
-+ | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
-+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-+ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-+ | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-+ | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
-+ | v850-* | v850e-* | vax-* \
-+ | we32k-* \
-+ | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-+ | xtensa-* \
-+ | ymp-* \
-+ | z8k-*)
- ;;
- # Recognize the various machine names and aliases which stand
- # for a CPU type and a company and sometimes even an OS.
-+ 386bsd)
-+ basic_machine=i386-unknown
-+ os=-bsd
-+ ;;
- 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
- basic_machine=m68000-att
- ;;
- 3b*)
- basic_machine=we32k-att
- ;;
-+ a29khif)
-+ basic_machine=a29k-amd
-+ os=-udi
-+ ;;
-+ adobe68k)
-+ basic_machine=m68010-adobe
-+ os=-scout
-+ ;;
- alliant | fx80)
- basic_machine=fx80-alliant
- ;;
-@@ -207,20 +376,24 @@
- os=-sysv
- ;;
- amiga | amiga-*)
-- basic_machine=m68k-cbm
-+ basic_machine=m68k-unknown
- ;;
- amigaos | amigados)
-- basic_machine=m68k-cbm
-+ basic_machine=m68k-unknown
- os=-amigaos
- ;;
- amigaunix | amix)
-- basic_machine=m68k-cbm
-+ basic_machine=m68k-unknown
- os=-sysv4
- ;;
- apollo68)
- basic_machine=m68k-apollo
- os=-sysv
- ;;
-+ apollo68bsd)
-+ basic_machine=m68k-apollo
-+ os=-bsd
-+ ;;
- aux)
- basic_machine=m68k-apple
- os=-aux
-@@ -229,6 +402,10 @@
- basic_machine=ns32k-sequent
- os=-dynix
- ;;
-+ c90)
-+ basic_machine=c90-cray
-+ os=-unicos
-+ ;;
- convex-c1)
- basic_machine=c1-convex
- os=-bsd
-@@ -249,27 +426,30 @@
- basic_machine=c38-convex
- os=-bsd
- ;;
-- cray | ymp)
-- basic_machine=ymp-cray
-- os=-unicos
-- ;;
-- cray2)
-- basic_machine=cray2-cray
-- os=-unicos
-- ;;
-- [ctj]90-cray)
-- basic_machine=c90-cray
-+ cray | j90)
-+ basic_machine=j90-cray
- os=-unicos
- ;;
- crds | unos)
- basic_machine=m68k-crds
- ;;
-+ cris | cris-* | etrax*)
-+ basic_machine=cris-axis
-+ ;;
- da30 | da30-*)
- basic_machine=m68k-da30
- ;;
- decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
- basic_machine=mips-dec
- ;;
-+ decsystem10* | dec10*)
-+ basic_machine=pdp10-dec
-+ os=-tops10
-+ ;;
-+ decsystem20* | dec20*)
-+ basic_machine=pdp10-dec
-+ os=-tops20
-+ ;;
- delta | 3300 | motorola-3300 | motorola-delta \
- | 3300-motorola | delta-motorola)
- basic_machine=m68k-motorola
-@@ -297,6 +477,10 @@
- encore | umax | mmax)
- basic_machine=ns32k-encore
- ;;
-+ es1800 | OSE68k | ose68k | ose | OSE)
-+ basic_machine=m68k-ericsson
-+ os=-ose
-+ ;;
- fx2800)
- basic_machine=i860-alliant
- ;;
-@@ -307,6 +491,10 @@
- basic_machine=tron-gmicro
- os=-sysv
- ;;
-+ go32)
-+ basic_machine=i386-pc
-+ os=-go32
-+ ;;
- h3050r* | hiux*)
- basic_machine=hppa1.1-hitachi
- os=-hiuxwe2
-@@ -315,6 +503,14 @@
- basic_machine=h8300-hitachi
- os=-hms
- ;;
-+ h8300xray)
-+ basic_machine=h8300-hitachi
-+ os=-xray
-+ ;;
-+ h8500hms)
-+ basic_machine=h8500-hitachi
-+ os=-hms
-+ ;;
- harris)
- basic_machine=m88k-harris
- os=-sysv3
-@@ -330,13 +526,30 @@
- basic_machine=m68k-hp
- os=-hpux
- ;;
-+ hp3k9[0-9][0-9] | hp9[0-9][0-9])
-+ basic_machine=hppa1.0-hp
-+ ;;
- hp9k2[0-9][0-9] | hp9k31[0-9])
- basic_machine=m68000-hp
- ;;
- hp9k3[2-9][0-9])
- basic_machine=m68k-hp
- ;;
-- hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
-+ hp9k6[0-9][0-9] | hp6[0-9][0-9])
-+ basic_machine=hppa1.0-hp
-+ ;;
-+ hp9k7[0-79][0-9] | hp7[0-79][0-9])
-+ basic_machine=hppa1.1-hp
-+ ;;
-+ hp9k78[0-9] | hp78[0-9])
-+ # FIXME: really hppa2.0-hp
-+ basic_machine=hppa1.1-hp
-+ ;;
-+ hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-+ # FIXME: really hppa2.0-hp
-+ basic_machine=hppa1.1-hp
-+ ;;
-+ hp9k8[0-9][13679] | hp8[0-9][13679])
- basic_machine=hppa1.1-hp
- ;;
- hp9k8[0-9][0-9] | hp8[0-9][0-9])
-@@ -345,27 +558,42 @@
- hppa-next)
- os=-nextstep3
- ;;
-+ hppaosf)
-+ basic_machine=hppa1.1-hp
-+ os=-osf
-+ ;;
-+ hppro)
-+ basic_machine=hppa1.1-hp
-+ os=-proelf
-+ ;;
- i370-ibm* | ibm*)
- basic_machine=i370-ibm
-- os=-mvs
- ;;
- # I'm not sure what "Sysv32" means. Should this be sysv3.2?
-- i[34567]86v32)
-+ i*86v32)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv32
- ;;
-- i[34567]86v4*)
-+ i*86v4*)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv4
- ;;
-- i[34567]86v)
-+ i*86v)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-sysv
- ;;
-- i[34567]86sol2)
-+ i*86sol2)
- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- os=-solaris2
- ;;
-+ i386mach)
-+ basic_machine=i386-mach
-+ os=-mach
-+ ;;
-+ i386-vsta | vsta)
-+ basic_machine=i386-unknown
-+ os=-vsta
-+ ;;
- iris | iris4d)
- basic_machine=mips-sgi
- case $os in
-@@ -391,16 +619,16 @@
- basic_machine=ns32k-utek
- os=-sysv
- ;;
-+ mingw32)
-+ basic_machine=i386-pc
-+ os=-mingw32
-+ ;;
- miniframe)
- basic_machine=m68000-convergent
- ;;
-- mipsel*-linux*)
-- basic_machine=mipsel-unknown
-- os=-linux-gnu
-- ;;
-- mips*-linux*)
-- basic_machine=mips-unknown
-- os=-linux-gnu
-+ *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-+ basic_machine=m68k-atari
-+ os=-mint
- ;;
- mips3*-*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-@@ -408,10 +636,38 @@
- mips3*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
- ;;
-+ mmix*)
-+ basic_machine=mmix-knuth
-+ os=-mmixware
-+ ;;
-+ monitor)
-+ basic_machine=m68k-rom68k
-+ os=-coff
-+ ;;
-+ morphos)
-+ basic_machine=powerpc-unknown
-+ os=-morphos
-+ ;;
-+ msdos)
-+ basic_machine=i386-pc
-+ os=-msdos
-+ ;;
-+ mvs)
-+ basic_machine=i370-ibm
-+ os=-mvs
-+ ;;
- ncr3000)
- basic_machine=i486-ncr
- os=-sysv4
- ;;
-+ netbsd386)
-+ basic_machine=i386-unknown
-+ os=-netbsd
-+ ;;
-+ netwinder)
-+ basic_machine=armv4l-rebel
-+ os=-linux
-+ ;;
- news | news700 | news800 | news900)
- basic_machine=m68k-sony
- os=-newsos
-@@ -424,6 +680,10 @@
- basic_machine=mips-sony
- os=-newsos
- ;;
-+ necv70)
-+ basic_machine=v70-nec
-+ os=-sysv
-+ ;;
- next | m*-next )
- basic_machine=m68k-next
- case $os in
-@@ -449,9 +709,40 @@
- basic_machine=i960-intel
- os=-nindy
- ;;
-+ mon960)
-+ basic_machine=i960-intel
-+ os=-mon960
-+ ;;
-+ nonstopux)
-+ basic_machine=mips-compaq
-+ os=-nonstopux
-+ ;;
- np1)
- basic_machine=np1-gould
- ;;
-+ nv1)
-+ basic_machine=nv1-cray
-+ os=-unicosmp
-+ ;;
-+ nsr-tandem)
-+ basic_machine=nsr-tandem
-+ ;;
-+ op50n-* | op60c-*)
-+ basic_machine=hppa1.1-oki
-+ os=-proelf
-+ ;;
-+ or32 | or32-*)
-+ basic_machine=or32-unknown
-+ os=-coff
-+ ;;
-+ OSE68000 | ose68000)
-+ basic_machine=m68000-ericsson
-+ os=-ose
-+ ;;
-+ os68k)
-+ basic_machine=m68k-none
-+ os=-os68k
-+ ;;
- pa-hitachi)
- basic_machine=hppa1.1-hitachi
- os=-hiuxwe2
-@@ -466,51 +757,85 @@
- pbb)
- basic_machine=m68k-tti
- ;;
-- pc532 | pc532-*)
-+ pc532 | pc532-*)
- basic_machine=ns32k-pc532
- ;;
-- pentium | p5 | k5 | nexen)
-+ pentium | p5 | k5 | k6 | nexgen | viac3)
- basic_machine=i586-pc
- ;;
-- pentiumpro | p6 | k6 | 6x86)
-+ pentiumpro | p6 | 6x86 | athlon | athlon_*)
- basic_machine=i686-pc
- ;;
- pentiumii | pentium2)
-- basic_machine=i786-pc
-+ basic_machine=i686-pc
- ;;
-- pentium-* | p5-* | k5-* | nexen-*)
-+ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
- basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
-- pentiumpro-* | p6-* | k6-* | 6x86-*)
-+ pentiumpro-* | p6-* | 6x86-* | athlon-*)
- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pentiumii-* | pentium2-*)
-- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pn)
- basic_machine=pn-gould
- ;;
-- power) basic_machine=rs6000-ibm
-+ power) basic_machine=power-ibm
- ;;
- ppc) basic_machine=powerpc-unknown
-- ;;
-+ ;;
- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ppcle | powerpclittle | ppc-le | powerpc-little)
- basic_machine=powerpcle-unknown
-- ;;
-+ ;;
- ppcle-* | powerpclittle-*)
- basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
-+ ppc64) basic_machine=powerpc64-unknown
-+ ;;
-+ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
-+ ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-+ basic_machine=powerpc64le-unknown
-+ ;;
-+ ppc64le-* | powerpc64little-*)
-+ basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
- ps2)
- basic_machine=i386-ibm
- ;;
-+ pw32)
-+ basic_machine=i586-unknown
-+ os=-pw32
-+ ;;
-+ rom68k)
-+ basic_machine=m68k-rom68k
-+ os=-coff
-+ ;;
- rm[46]00)
- basic_machine=mips-siemens
- ;;
- rtpc | rtpc-*)
- basic_machine=romp-ibm
- ;;
-+ s390 | s390-*)
-+ basic_machine=s390-ibm
-+ ;;
-+ s390x | s390x-*)
-+ basic_machine=s390x-ibm
-+ ;;
-+ sa29200)
-+ basic_machine=a29k-amd
-+ os=-udi
-+ ;;
-+ sb1)
-+ basic_machine=mipsisa64sb1-unknown
-+ ;;
-+ sb1el)
-+ basic_machine=mipsisa64sb1el-unknown
-+ ;;
- sequent)
- basic_machine=i386-sequent
- ;;
-@@ -518,6 +843,10 @@
- basic_machine=sh-hitachi
- os=-hms
- ;;
-+ sparclite-wrs | simso-wrs)
-+ basic_machine=sparclite-wrs
-+ os=-vxworks
-+ ;;
- sps7)
- basic_machine=m68k-bull
- os=-sysv2
-@@ -525,6 +854,13 @@
- spur)
- basic_machine=spur-unknown
- ;;
-+ st2000)
-+ basic_machine=m68k-tandem
-+ ;;
-+ stratus)
-+ basic_machine=i860-stratus
-+ os=-sysv4
-+ ;;
- sun2)
- basic_machine=m68000-sun
- ;;
-@@ -565,16 +901,40 @@
- sun386 | sun386i | roadrunner)
- basic_machine=i386-sun
- ;;
-+ sv1)
-+ basic_machine=sv1-cray
-+ os=-unicos
-+ ;;
- symmetry)
- basic_machine=i386-sequent
- os=-dynix
- ;;
-+ t3e)
-+ basic_machine=alphaev5-cray
-+ os=-unicos
-+ ;;
-+ t90)
-+ basic_machine=t90-cray
-+ os=-unicos
-+ ;;
-+ tic4x | c4x*)
-+ basic_machine=tic4x-unknown
-+ os=-coff
-+ ;;
-+ tic54x | c54x*)
-+ basic_machine=tic54x-unknown
-+ os=-coff
-+ ;;
- tx39)
- basic_machine=mipstx39-unknown
- ;;
- tx39el)
- basic_machine=mipstx39el-unknown
- ;;
-+ toad1)
-+ basic_machine=pdp10-xkl
-+ os=-tops20
-+ ;;
- tower | tower-32)
- basic_machine=m68k-ncr
- ;;
-@@ -586,6 +946,10 @@
- basic_machine=a29k-nyu
- os=-sym1
- ;;
-+ v810 | necv810)
-+ basic_machine=v810-nec
-+ os=-none
-+ ;;
- vaxv)
- basic_machine=vax-dec
- os=-sysv
-@@ -595,8 +959,8 @@
- os=-vms
- ;;
- vpp*|vx|vx-*)
-- basic_machine=f301-fujitsu
-- ;;
-+ basic_machine=f301-fujitsu
-+ ;;
- vxworks960)
- basic_machine=i960-wrs
- os=-vxworks
-@@ -609,13 +973,25 @@
- basic_machine=a29k-wrs
- os=-vxworks
- ;;
-- xmp)
-- basic_machine=xmp-cray
-- os=-unicos
-+ w65*)
-+ basic_machine=w65-wdc
-+ os=-none
-+ ;;
-+ w89k-*)
-+ basic_machine=hppa1.1-winbond
-+ os=-proelf
- ;;
-- xps | xps100)
-+ xps | xps100)
- basic_machine=xps100-honeywell
- ;;
-+ ymp)
-+ basic_machine=ymp-cray
-+ os=-unicos
-+ ;;
-+ z8k-*-coff)
-+ basic_machine=z8k-unknown
-+ os=-sim
-+ ;;
- none)
- basic_machine=none-none
- os=-none
-@@ -623,12 +999,14 @@
-
- # Here we handle the default manufacturer of certain CPU types. It is in
- # some cases the only manufacturer, in others, it is the most popular.
-- mips)
-- if [ x$os = x-linux-gnu ]; then
-- basic_machine=mips-unknown
-- else
-- basic_machine=mips-mips
-- fi
-+ w89k)
-+ basic_machine=hppa1.1-winbond
-+ ;;
-+ op50n)
-+ basic_machine=hppa1.1-oki
-+ ;;
-+ op60c)
-+ basic_machine=hppa1.1-oki
- ;;
- romp)
- basic_machine=romp-ibm
-@@ -639,16 +1017,26 @@
- vax)
- basic_machine=vax-dec
- ;;
-+ pdp10)
-+ # there are many clones, so DEC is not a safe bet
-+ basic_machine=pdp10-unknown
-+ ;;
- pdp11)
- basic_machine=pdp11-dec
- ;;
- we32k)
- basic_machine=we32k-att
- ;;
-- sparc)
-+ sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
-+ basic_machine=sh-unknown
-+ ;;
-+ sh64)
-+ basic_machine=sh64-unknown
-+ ;;
-+ sparc | sparcv9 | sparcv9b)
- basic_machine=sparc-sun
- ;;
-- cydra)
-+ cydra)
- basic_machine=cydra-cydrome
- ;;
- orion)
-@@ -657,6 +1045,15 @@
- orion105)
- basic_machine=clipper-highlevel
- ;;
-+ mac | mpw | mac-mpw)
-+ basic_machine=m68k-apple
-+ ;;
-+ pmac | pmac-mpw)
-+ basic_machine=powerpc-apple
-+ ;;
-+ *-unknown)
-+ # Make sure to match an already-canonicalized machine name.
-+ ;;
- *)
- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
- exit 1
-@@ -710,13 +1107,41 @@
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
-+ | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-- | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-- | -mingw32* | -linux-gnu* | -uxpv*)
-+ | -chorusos* | -chorusrdb* \
-+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-+ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-+ | -powermax* | -dnix* | -microbsd*)
- # Remember, each alternative MUST END IN *, to match a version number.
- ;;
-+ -qnx*)
-+ case $basic_machine in
-+ x86-* | i*86-*)
-+ ;;
-+ *)
-+ os=-nto$os
-+ ;;
-+ esac
-+ ;;
-+ -nto-qnx*)
-+ ;;
-+ -nto*)
-+ os=`echo $os | sed -e 's|nto|nto-qnx|'`
-+ ;;
-+ -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-+ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-+ ;;
-+ -mac*)
-+ os=`echo $os | sed -e 's|mac|macos|'`
-+ ;;
- -linux*)
- os=`echo $os | sed -e 's|linux|linux-gnu|'`
- ;;
-@@ -726,6 +1151,12 @@
- -sunos6*)
- os=`echo $os | sed -e 's|sunos6|solaris3|'`
- ;;
-+ -opened*)
-+ os=-openedition
-+ ;;
-+ -wince*)
-+ os=-wince
-+ ;;
- -osfrose*)
- os=-osfrose
- ;;
-@@ -741,11 +1172,23 @@
- -acis*)
- os=-aos
- ;;
-+ -atheos*)
-+ os=-atheos
-+ ;;
-+ -386bsd)
-+ os=-bsd
-+ ;;
- -ctix* | -uts*)
- os=-sysv
- ;;
-+ -nova*)
-+ os=-rtmk-nova
-+ ;;
- -ns2 )
-- os=-nextstep2
-+ os=-nextstep2
-+ ;;
-+ -nsk*)
-+ os=-nsk
- ;;
- # Preserve the version number of sinix5.
- -sinix5.*)
-@@ -772,9 +1215,18 @@
- # This must come after -sysvr4.
- -sysv*)
- ;;
-+ -ose*)
-+ os=-ose
-+ ;;
-+ -es1800*)
-+ os=-ose
-+ ;;
- -xenix)
- os=-xenix
- ;;
-+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-+ os=-mint
-+ ;;
- -none)
- ;;
- *)
-@@ -800,10 +1252,17 @@
- *-acorn)
- os=-riscix1.2
- ;;
-+ arm*-rebel)
-+ os=-linux
-+ ;;
- arm*-semi)
- os=-aout
- ;;
-- pdp11-*)
-+ # This must come before the *-dec entry.
-+ pdp10-*)
-+ os=-tops20
-+ ;;
-+ pdp11-*)
- os=-none
- ;;
- *-dec | vax-*)
-@@ -821,15 +1280,39 @@
- # default.
- # os=-sunos4
- ;;
-+ m68*-cisco)
-+ os=-aout
-+ ;;
-+ mips*-cisco)
-+ os=-elf
-+ ;;
-+ mips*-*)
-+ os=-elf
-+ ;;
-+ or32-*)
-+ os=-coff
-+ ;;
- *-tti) # must be before sparc entry or we get the wrong os.
- os=-sysv3
- ;;
- sparc-* | *-sun)
- os=-sunos4.1.1
- ;;
-+ *-be)
-+ os=-beos
-+ ;;
- *-ibm)
- os=-aix
- ;;
-+ *-wec)
-+ os=-proelf
-+ ;;
-+ *-winbond)
-+ os=-proelf
-+ ;;
-+ *-oki)
-+ os=-proelf
-+ ;;
- *-hp)
- os=-hpux
- ;;
-@@ -872,27 +1355,39 @@
- *-next)
- os=-nextstep3
- ;;
-- *-gould)
-+ *-gould)
- os=-sysv
- ;;
-- *-highlevel)
-+ *-highlevel)
- os=-bsd
- ;;
- *-encore)
- os=-bsd
- ;;
-- *-sgi)
-+ *-sgi)
- os=-irix
- ;;
-- *-siemens)
-+ *-siemens)
- os=-sysv4
- ;;
- *-masscomp)
- os=-rtu
- ;;
-- f301-fujitsu)
-+ f30[01]-fujitsu | f700-fujitsu)
- os=-uxpv
- ;;
-+ *-rom68k)
-+ os=-coff
-+ ;;
-+ *-*bug)
-+ os=-coff
-+ ;;
-+ *-apple)
-+ os=-macos
-+ ;;
-+ *-atari*)
-+ os=-mint
-+ ;;
- *)
- os=-none
- ;;
-@@ -914,9 +1409,15 @@
- -aix*)
- vendor=ibm
- ;;
-+ -beos*)
-+ vendor=be
-+ ;;
- -hpux*)
- vendor=hp
- ;;
-+ -mpeix*)
-+ vendor=hp
-+ ;;
- -hiux*)
- vendor=hitachi
- ;;
-@@ -932,21 +1433,41 @@
- -genix*)
- vendor=ns
- ;;
-- -mvs*)
-+ -mvs* | -opened*)
- vendor=ibm
- ;;
- -ptx*)
- vendor=sequent
- ;;
-- -vxsim* | -vxworks*)
-+ -vxsim* | -vxworks* | -windiss*)
- vendor=wrs
- ;;
- -aux*)
- vendor=apple
- ;;
-+ -hms*)
-+ vendor=hitachi
-+ ;;
-+ -mpw* | -macos*)
-+ vendor=apple
-+ ;;
-+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-+ vendor=atari
-+ ;;
-+ -vos*)
-+ vendor=stratus
-+ ;;
- esac
- basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
- ;;
- esac
-
- echo $basic_machine$os
-+exit 0
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "timestamp='"
-+# time-stamp-format: "%:y-%02m-%02d"
-+# time-stamp-end: "'"
-+# End:
---- ez-ipupdate-3.0.11b8.orig/configure
-+++ ez-ipupdate-3.0.11b8/configure
-@@ -1,7 +1,7 @@
- #! /bin/sh
-
- # Guess values for system-dependent variables and create Makefiles.
--# Generated automatically using autoconf version 2.12
-+# Generated automatically using autoconf version 2.13
- # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
- #
- # This configure script is free software; the Free Software Foundation
-@@ -58,6 +58,7 @@
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-+SHELL=${CONFIG_SHELL-/bin/sh}
- # Maximum number of lines to put in a shell here document.
- ac_max_here_lines=12
-
-@@ -341,7 +342,7 @@
- verbose=yes ;;
-
- -version | --version | --versio | --versi | --vers)
-- echo "configure generated by autoconf version 2.12"
-+ echo "configure generated by autoconf version 2.13"
- exit 0 ;;
-
- -with-* | --with-*)
-@@ -511,9 +512,11 @@
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cc_cross
-
-+ac_exeext=
-+ac_objext=o
- if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
- # Stardent Vistra SVR4 grep lacks -e, says ghazi(a)caip.rutgers.edu.
- if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-@@ -549,6 +552,7 @@
- ac_config_sub=$ac_aux_dir/config.sub
- ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-+am__api_version="1.4"
- # Find a good install program. We prefer a C program (faster),
- # so one script is as good as another. But avoid the broken or
- # incompatible versions:
-@@ -556,28 +560,30 @@
- # SunOS /usr/etc/install
- # IRIX /sbin/install
- # AIX /bin/install
-+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
- # AFS /usr/afsws/bin/install, which mishandles nonexistent args
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
--echo "configure:564: checking for a BSD compatible install" >&5
-+echo "configure:569: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-- IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:"
-+ IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
- for ac_dir in $PATH; do
- # Account for people who put trailing slashes in PATH elements.
- case "$ac_dir/" in
- /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
-- for ac_prog in ginstall installbsd scoinst install; do
-+ # Don't use installbsd from OSF since it installs stuff as root
-+ # by default.
-+ for ac_prog in ginstall scoinst install; do
- if test -f $ac_dir/$ac_prog; then
- if test $ac_prog = install &&
- grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
-- # OSF/1 installbsd also uses dspmsg, but is usable.
- :
- else
- ac_cv_path_install="$ac_dir/$ac_prog -c"
-@@ -607,13 +613,12 @@
- # It thinks the first close brace ends the variable substitution.
- test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
--test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
--
--
- test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-+
- echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
--echo "configure:617: checking whether build environment is sane" >&5
-+echo "configure:622: checking whether build environment is sane" >&5
- # Just in case
- sleep 1
- echo timestamp > conftestfile
-@@ -670,7 +675,7 @@
- test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
- echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
--echo "configure:674: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo "configure:679: checking whether ${MAKE-make} sets \${MAKE}" >&5
- set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -715,21 +720,21 @@
-
-
- missing_dir=`cd $ac_aux_dir && pwd`
--echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
--echo "configure:720: checking for working aclocal" >&5
-+echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
-+echo "configure:725: checking for working aclocal-${am__api_version}" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf. Sigh.
--if (aclocal --version) < /dev/null > /dev/null 2>&1; then
-- ACLOCAL=aclocal
-+if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-+ ACLOCAL=aclocal-${am__api_version}
- echo "$ac_t""found" 1>&6
- else
-- ACLOCAL="$missing_dir/missing aclocal"
-+ ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
- echo "$ac_t""missing" 1>&6
- fi
-
- echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
--echo "configure:733: checking for working autoconf" >&5
-+echo "configure:738: checking for working autoconf" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf. Sigh.
-@@ -741,21 +746,21 @@
- echo "$ac_t""missing" 1>&6
- fi
-
--echo $ac_n "checking for working automake""... $ac_c" 1>&6
--echo "configure:746: checking for working automake" >&5
-+echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6
-+echo "configure:751: checking for working automake-${am__api_version}" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf. Sigh.
--if (automake --version) < /dev/null > /dev/null 2>&1; then
-- AUTOMAKE=automake
-+if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
-+ AUTOMAKE=automake-${am__api_version}
- echo "$ac_t""found" 1>&6
- else
-- AUTOMAKE="$missing_dir/missing automake"
-+ AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
- echo "$ac_t""missing" 1>&6
- fi
-
- echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
--echo "configure:759: checking for working autoheader" >&5
-+echo "configure:764: checking for working autoheader" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf. Sigh.
-@@ -768,7 +773,7 @@
- fi
-
- echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
--echo "configure:772: checking for working makeinfo" >&5
-+echo "configure:777: checking for working makeinfo" >&5
- # Run test in a subshell; some versions of sh will print an error if
- # an executable is not found, even if stderr is redirected.
- # Redirect stdin to placate older versions of autoconf. Sigh.
-@@ -806,15 +811,16 @@
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:810: checking for $ac_word" >&5
-+echo "configure:815: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-- for ac_dir in $PATH; do
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-+ ac_dummy="$PATH"
-+ for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_CC="gcc"
-@@ -835,16 +841,17 @@
- # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:839: checking for $ac_word" >&5
-+echo "configure:845: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
- else
-- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_prog_rejected=no
-- for ac_dir in $PATH; do
-+ ac_dummy="$PATH"
-+ for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-@@ -879,25 +886,61 @@
- echo "$ac_t""no" 1>&6
- fi
-
-+ if test -z "$CC"; then
-+ case "`uname -s`" in
-+ *win32* | *WIN32*)
-+ # Extract the first word of "cl", so it can be a program name with args.
-+set dummy cl; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:896: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ if test -n "$CC"; then
-+ ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-+ ac_dummy="$PATH"
-+ for ac_dir in $ac_dummy; do
-+ test -z "$ac_dir" && ac_dir=.
-+ if test -f $ac_dir/$ac_word; then
-+ ac_cv_prog_CC="cl"
-+ break
-+ fi
-+ done
-+ IFS="$ac_save_ifs"
-+fi
-+fi
-+CC="$ac_cv_prog_CC"
-+if test -n "$CC"; then
-+ echo "$ac_t""$CC" 1>&6
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+ ;;
-+ esac
-+ fi
- test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
- fi
-
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:887: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+echo "configure:928: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-
- ac_ext=c
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cc_cross
-
--cat > conftest.$ac_ext <<EOF
--#line 897 "configure"
-+cat > conftest.$ac_ext << EOF
-+
-+#line 939 "configure"
- #include "confdefs.h"
-+
- main(){return(0);}
- EOF
--if { (eval echo configure:901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- ac_cv_prog_cc_works=yes
- # If we can't run a trivial program, we are probably using a cross compiler.
- if (./conftest; exit) 2>/dev/null; then
-@@ -911,18 +954,24 @@
- ac_cv_prog_cc_works=no
- fi
- rm -fr conftest*
-+ac_ext=c
-+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
-
- echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
- if test $ac_cv_prog_cc_works = no; then
- { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
- fi
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:921: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "configure:970: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
- echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
- cross_compiling=$ac_cv_prog_cc_cross
-
- echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
--echo "configure:926: checking whether we are using GNU C" >&5
-+echo "configure:975: checking whether we are using GNU C" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -931,7 +980,7 @@
- yes;
- #endif
- EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:935: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:984: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
- ac_cv_prog_gcc=yes
- else
- ac_cv_prog_gcc=no
-@@ -942,11 +991,15 @@
-
- if test $ac_cv_prog_gcc = yes; then
- GCC=yes
-- ac_test_CFLAGS="${CFLAGS+set}"
-- ac_save_CFLAGS="$CFLAGS"
-- CFLAGS=
-- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--echo "configure:950: checking whether ${CC-cc} accepts -g" >&5
-+else
-+ GCC=
-+fi
-+
-+ac_test_CFLAGS="${CFLAGS+set}"
-+ac_save_CFLAGS="$CFLAGS"
-+CFLAGS=
-+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-+echo "configure:1003: checking whether ${CC-cc} accepts -g" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -961,20 +1014,24 @@
- fi
-
- echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-- if test "$ac_test_CFLAGS" = set; then
-- CFLAGS="$ac_save_CFLAGS"
-- elif test $ac_cv_prog_cc_g = yes; then
-+if test "$ac_test_CFLAGS" = set; then
-+ CFLAGS="$ac_save_CFLAGS"
-+elif test $ac_cv_prog_cc_g = yes; then
-+ if test "$GCC" = yes; then
- CFLAGS="-g -O2"
- else
-- CFLAGS="-O2"
-+ CFLAGS="-g"
- fi
- else
-- GCC=
-- test "${CFLAGS+set}" = set || CFLAGS="-g"
-+ if test "$GCC" = yes; then
-+ CFLAGS="-O2"
-+ else
-+ CFLAGS=
-+ fi
- fi
-
- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
--echo "configure:978: checking how to run the C preprocessor" >&5
-+echo "configure:1035: checking how to run the C preprocessor" >&5
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-@@ -989,14 +1046,14 @@
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp.
- cat > conftest.$ac_ext <<EOF
--#line 993 "configure"
-+#line 1050 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:999: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1056: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- :
- else
-@@ -1006,14 +1063,31 @@
- rm -rf conftest*
- CPP="${CC-cc} -E -traditional-cpp"
- cat > conftest.$ac_ext <<EOF
--#line 1010 "configure"
-+#line 1067 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1016: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1073: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+ :
-+else
-+ echo "$ac_err" >&5
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ CPP="${CC-cc} -nologo -E"
-+ cat > conftest.$ac_ext <<EOF
-+#line 1084 "configure"
-+#include "confdefs.h"
-+#include <assert.h>
-+Syntax Error
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:1090: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- :
- else
-@@ -1026,6 +1100,8 @@
- rm -f conftest*
- fi
- rm -f conftest*
-+fi
-+rm -f conftest*
- ac_cv_prog_CPP="$CPP"
- fi
- CPP="$ac_cv_prog_CPP"
-@@ -1041,28 +1117,30 @@
- # SunOS /usr/etc/install
- # IRIX /sbin/install
- # AIX /bin/install
-+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
- # AFS /usr/afsws/bin/install, which mishandles nonexistent args
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
--echo "configure:1049: checking for a BSD compatible install" >&5
-+echo "configure:1126: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-- IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:"
-+ IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
- for ac_dir in $PATH; do
- # Account for people who put trailing slashes in PATH elements.
- case "$ac_dir/" in
- /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
-- for ac_prog in ginstall installbsd scoinst install; do
-+ # Don't use installbsd from OSF since it installs stuff as root
-+ # by default.
-+ for ac_prog in ginstall scoinst install; do
- if test -f $ac_dir/$ac_prog; then
- if test $ac_prog = install &&
- grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
-- # OSF/1 installbsd also uses dspmsg, but is usable.
- :
- else
- ac_cv_path_install="$ac_dir/$ac_prog -c"
-@@ -1092,16 +1170,18 @@
- # It thinks the first close brace ends the variable substitution.
- test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
- echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
--echo "configure:1100: checking return type of signal handlers" >&5
-+echo "configure:1180: checking return type of signal handlers" >&5
- if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1105 "configure"
-+#line 1185 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <signal.h>
-@@ -1118,7 +1198,7 @@
- int i;
- ; return 0; }
- EOF
--if { (eval echo configure:1122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_type_signal=void
- else
-@@ -1139,12 +1219,12 @@
-
-
- echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
--echo "configure:1143: checking for gethostbyname" >&5
-+echo "configure:1223: checking for gethostbyname" >&5
- if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1148 "configure"
-+#line 1228 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char gethostbyname(); below. */
-@@ -1167,7 +1247,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:1171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_gethostbyname=yes"
- else
-@@ -1188,7 +1268,7 @@
-
- if test $ac_cv_func_gethostbyname = no; then
- echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
--echo "configure:1192: checking for gethostbyname in -lnsl" >&5
-+echo "configure:1272: checking for gethostbyname in -lnsl" >&5
- ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1196,7 +1276,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lnsl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1200 "configure"
-+#line 1280 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -1207,7 +1287,7 @@
- gethostbyname()
- ; return 0; }
- EOF
--if { (eval echo configure:1211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1236,12 +1316,12 @@
-
- fi
- echo $ac_n "checking for connect""... $ac_c" 1>&6
--echo "configure:1240: checking for connect" >&5
-+echo "configure:1320: checking for connect" >&5
- if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1245 "configure"
-+#line 1325 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char connect(); below. */
-@@ -1264,7 +1344,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:1268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_connect=yes"
- else
-@@ -1285,7 +1365,7 @@
-
- if test $ac_cv_func_connect = no; then
- echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
--echo "configure:1289: checking for connect in -lsocket" >&5
-+echo "configure:1369: checking for connect in -lsocket" >&5
- ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1293,7 +1373,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lsocket $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1297 "configure"
-+#line 1377 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -1304,7 +1384,7 @@
- connect()
- ; return 0; }
- EOF
--if { (eval echo configure:1308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1364,12 +1444,12 @@
- herror
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:1368: checking for $ac_func" >&5
-+echo "configure:1448: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1373 "configure"
-+#line 1453 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -1392,7 +1472,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:1396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
- else
-@@ -1419,10 +1499,12 @@
-
- for ac_hdr in arpa/inet.h \
- sys/types.h \
-+ time.h \
- sys/time.h \
- sys/stat.h \
- fcntl.h \
- signal.h \
-+ string.h \
- syslog.h \
- pwd.h \
- stdarg.h \
-@@ -1434,18 +1516,18 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1438: checking for $ac_hdr" >&5
-+echo "configure:1520: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1443 "configure"
-+#line 1525 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1448: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1530: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-@@ -1478,18 +1560,18 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1482: checking for $ac_hdr" >&5
-+echo "configure:1564: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1487 "configure"
-+#line 1569 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1492: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:1574: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-@@ -1517,7 +1599,7 @@
-
-
- echo $ac_n "checking for sys_errlist in -lc""... $ac_c" 1>&6
--echo "configure:1521: checking for sys_errlist in -lc" >&5
-+echo "configure:1603: checking for sys_errlist in -lc" >&5
- ac_lib_var=`echo c'_'sys_errlist | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1525,7 +1607,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lc $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1529 "configure"
-+#line 1611 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -1536,7 +1618,7 @@
- sys_errlist()
- ; return 0; }
- EOF
--if { (eval echo configure:1540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1563,12 +1645,12 @@
- for ac_func in getopt
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:1567: checking for $ac_func" >&5
-+echo "configure:1649: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1572 "configure"
-+#line 1654 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -1591,7 +1673,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:1595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
- else
-@@ -1620,12 +1702,12 @@
- fi
-
- echo $ac_n "checking for getpass""... $ac_c" 1>&6
--echo "configure:1624: checking for getpass" >&5
-+echo "configure:1706: checking for getpass" >&5
- if eval "test \"`echo '$''{'ac_cv_func_getpass'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1629 "configure"
-+#line 1711 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char getpass(); below. */
-@@ -1648,7 +1730,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:1652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_getpass=yes"
- else
-@@ -1675,26 +1757,26 @@
-
-
- # Make sure we can run config.sub.
--if $ac_config_sub sun4 >/dev/null 2>&1; then :
-+if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
- else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
- fi
-
- echo $ac_n "checking host system type""... $ac_c" 1>&6
--echo "configure:1684: checking host system type" >&5
-+echo "configure:1766: checking host system type" >&5
-
- host_alias=$host
- case "$host_alias" in
- NONE)
- case $nonopt in
- NONE)
-- if host_alias=`$ac_config_guess`; then :
-+ if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
- else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
- fi ;;
- *) host_alias=$nonopt ;;
- esac ;;
- esac
-
--host=`$ac_config_sub $host_alias`
-+host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
- host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
- host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
- host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-@@ -1706,7 +1788,7 @@
-
-
- echo $ac_n "checking for user supplied default service""... $ac_c" 1>&6
--echo "configure:1710: checking for user supplied default service" >&5
-+echo "configure:1792: checking for user supplied default service" >&5
- # Check whether --enable-default-service or --disable-default-service was given.
- if test "${enable_default_service+set}" = set; then
- enableval="$enable_default_service"
-@@ -1800,7 +1882,7 @@
- esac
-
- echo $ac_n "checking whether user wants debugging support""... $ac_c" 1>&6
--echo "configure:1804: checking whether user wants debugging support" >&5
-+echo "configure:1886: checking whether user wants debugging support" >&5
- # Check whether --enable-debug or --disable-debug was given.
- if test "${enable_debug+set}" = set; then
- enableval="$enable_debug"
-@@ -1815,7 +1897,7 @@
-
-
- echo $ac_n "checking whether user wants to dissable MD5 support""... $ac_c" 1>&6
--echo "configure:1819: checking whether user wants to dissable MD5 support" >&5
-+echo "configure:1901: checking whether user wants to dissable MD5 support" >&5
- # Check whether --enable-md5 or --disable-md5 was given.
- if test "${enable_md5+set}" = set; then
- enableval="$enable_md5"
-@@ -1855,7 +1937,7 @@
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
- (set) 2>&1 |
-- case `(ac_space=' '; set) 2>&1` in
-+ case `(ac_space=' '; set | grep ac_space) 2>&1` in
- *ac_space=\ *)
- # `set' does not quote correctly, so add quotes (double-quote substitution
- # turns \\\\ into \\, and sed turns \\ into \).
-@@ -1922,7 +2004,7 @@
- echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
- exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
- -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-- echo "$CONFIG_STATUS generated by autoconf version 2.12"
-+ echo "$CONFIG_STATUS generated by autoconf version 2.13"
- exit 0 ;;
- -help | --help | --hel | --he | --h)
- echo "\$ac_cs_usage"; exit 0 ;;
-@@ -1942,9 +2024,11 @@
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
- $ac_vpsub
- $extrasub
-+s%@SHELL@%$SHELL%g
- s%@CFLAGS@%$CFLAGS%g
- s%@CPPFLAGS@%$CPPFLAGS%g
- s%@CXXFLAGS@%$CXXFLAGS%g
-+s%@FFLAGS@%$FFLAGS%g
- s%@DEFS@%$DEFS%g
- s%@LDFLAGS@%$LDFLAGS%g
- s%@LIBS@%$LIBS%g
-@@ -1964,8 +2048,8 @@
- s%@infodir@%$infodir%g
- s%@mandir@%$mandir%g
- s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
--s%@INSTALL_DATA@%$INSTALL_DATA%g
- s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-+s%@INSTALL_DATA@%$INSTALL_DATA%g
- s%@PACKAGE@%$PACKAGE%g
- s%@VERSION@%$VERSION%g
- s%@ACLOCAL@%$ACLOCAL%g
---- ez-ipupdate-3.0.11b8.orig/configure.in
-+++ ez-ipupdate-3.0.11b8/configure.in
-@@ -58,10 +58,12 @@
- dnl Checks for header files.
- AC_CHECK_HEADERS( arpa/inet.h \
- sys/types.h \
-+ time.h \
- sys/time.h \
- sys/stat.h \
- fcntl.h \
- signal.h \
-+ string.h \
- syslog.h \
- pwd.h \
- stdarg.h \
---- ez-ipupdate-3.0.11b8.orig/install-sh
-+++ ez-ipupdate-3.0.11b8/install-sh
-@@ -118,6 +118,7 @@
-
- if [ -d $dst ]; then
- instcmd=:
-+ chmodcmd=""
- else
- instcmd=mkdir
- fi
-@@ -162,7 +163,7 @@
-
- # Skip lots of stat calls in the usual case.
- if [ ! -d "$dstdir" ]; then
--defaultIFS='
-+defaultIFS='
- '
- IFS="${IFS-${defaultIFS}}"
-
---- ez-ipupdate-3.0.11b8.orig/missing
-+++ ez-ipupdate-3.0.11b8/missing
-@@ -1 +1,198 @@
--#autoconf complains if this is not here
-+#! /bin/sh
-+# Common stub for a few missing GNU programs while installing.
-+# Copyright (C) 1996, 1997, 2001, 2002 Free Software Foundation, Inc.
-+# Franc,ois Pinard <pinard(a)iro.umontreal.ca>, 1996.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+if test $# -eq 0; then
-+ echo 1>&2 "Try \`$0 --help' for more information"
-+ exit 1
-+fi
-+
-+# In the cases where this matters, `missing' is being run in the
-+# srcdir already.
-+if test -f configure.in; then
-+ configure_ac=configure.ac
-+else
-+ configure_ac=configure.in
-+fi
-+
-+case "$1" in
-+
-+ -h|--h|--he|--hel|--help)
-+ echo "\
-+$0 [OPTION]... PROGRAM [ARGUMENT]...
-+
-+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-+error status if there is no known handling for PROGRAM.
-+
-+Options:
-+ -h, --help display this help and exit
-+ -v, --version output version information and exit
-+
-+Supported PROGRAM values:
-+ aclocal touch file \`aclocal.m4'
-+ autoconf touch file \`configure'
-+ autoheader touch file \`config.h.in'
-+ automake touch all \`Makefile.in' files
-+ bison create \`y.tab.[ch]', if possible, from existing .[ch]
-+ flex create \`lex.yy.c', if possible, from existing .c
-+ lex create \`lex.yy.c', if possible, from existing .c
-+ makeinfo touch the output file
-+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
-+ ;;
-+
-+ -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-+ echo "missing - GNU libit 0.0"
-+ ;;
-+
-+ -*)
-+ echo 1>&2 "$0: Unknown \`$1' option"
-+ echo 1>&2 "Try \`$0 --help' for more information"
-+ exit 1
-+ ;;
-+
-+ aclocal*)
-+ echo 1>&2 "\
-+WARNING: \`$1' is missing on your system. You should only need it if
-+ you modified \`acinclude.m4' or \`$configure_ac'. You might want
-+ to install the \`Automake' and \`Perl' packages. Grab them from
-+ any GNU archive site."
-+ touch aclocal.m4
-+ ;;
-+
-+ autoconf)
-+ echo 1>&2 "\
-+WARNING: \`$1' is missing on your system. You should only need it if
-+ you modified \`$configure_ac'. You might want to install the
-+ \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
-+ archive site."
-+ touch configure
-+ ;;
-+
-+ autoheader)
-+ echo 1>&2 "\
-+WARNING: \`$1' is missing on your system. You should only need it if
-+ you modified \`acconfig.h' or \`$configure_ac'. You might want
-+ to install the \`Autoconf' and \`GNU m4' packages. Grab them
-+ from any GNU archive site."
-+ files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' $configure_ac`
-+ test -z "$files" && files="config.h"
-+ touch_files=
-+ for f in $files; do
-+ case "$f" in
-+ *:*) touch_files="$touch_files "`echo "$f" |
-+ sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-+ *) touch_files="$touch_files $f.in";;
-+ esac
-+ done
-+ touch $touch_files
-+ ;;
-+
-+ automake*)
-+ echo 1>&2 "\
-+WARNING: \`$1' is missing on your system. You should only need it if
-+ you modified \`Makefile.am', \`acinclude.m4' or \`$configure_ac'.
-+ You might want to install the \`Automake' and \`Perl' packages.
-+ Grab them from any GNU archive site."
-+ find . -type f -name Makefile.am -print |
-+ sed 's/\.am$/.in/' |
-+ while read f; do touch "$f"; done
-+ ;;
-+
-+ bison|yacc)
-+ echo 1>&2 "\
-+WARNING: \`$1' is missing on your system. You should only need it if
-+ you modified a \`.y' file. You may need the \`Bison' package
-+ in order for those modifications to take effect. You can get
-+ \`Bison' from any GNU archive site."
-+ rm -f y.tab.c y.tab.h
-+ if [ $# -ne 1 ]; then
-+ eval LASTARG="\${$#}"
-+ case "$LASTARG" in
-+ *.y)
-+ SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-+ if [ -f "$SRCFILE" ]; then
-+ cp "$SRCFILE" y.tab.c
-+ fi
-+ SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-+ if [ -f "$SRCFILE" ]; then
-+ cp "$SRCFILE" y.tab.h
-+ fi
-+ ;;
-+ esac
-+ fi
-+ if [ ! -f y.tab.h ]; then
-+ echo >y.tab.h
-+ fi
-+ if [ ! -f y.tab.c ]; then
-+ echo 'main() { return 0; }' >y.tab.c
-+ fi
-+ ;;
-+
-+ lex|flex)
-+ echo 1>&2 "\
-+WARNING: \`$1' is missing on your system. You should only need it if
-+ you modified a \`.l' file. You may need the \`Flex' package
-+ in order for those modifications to take effect. You can get
-+ \`Flex' from any GNU archive site."
-+ rm -f lex.yy.c
-+ if [ $# -ne 1 ]; then
-+ eval LASTARG="\${$#}"
-+ case "$LASTARG" in
-+ *.l)
-+ SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-+ if [ -f "$SRCFILE" ]; then
-+ cp "$SRCFILE" lex.yy.c
-+ fi
-+ ;;
-+ esac
-+ fi
-+ if [ ! -f lex.yy.c ]; then
-+ echo 'main() { return 0; }' >lex.yy.c
-+ fi
-+ ;;
-+
-+ makeinfo)
-+ echo 1>&2 "\
-+WARNING: \`$1' is missing on your system. You should only need it if
-+ you modified a \`.texi' or \`.texinfo' file, or any other file
-+ indirectly affecting the aspect of the manual. The spurious
-+ call might also be the consequence of using a buggy \`make' (AIX,
-+ DU, IRIX). You might want to install the \`Texinfo' package or
-+ the \`GNU make' package. Grab either from any GNU archive site."
-+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-+ if test -z "$file"; then
-+ file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-+ fi
-+ touch $file
-+ ;;
-+
-+ *)
-+ echo 1>&2 "\
-+WARNING: \`$1' is needed, and you do not seem to have it handy on your
-+ system. You might have modified some files without having the
-+ proper tools for further handling them. Check the \`README' file,
-+ it often tells you about the needed prerequirements for installing
-+ this package. You may also peek at any GNU archive site, in case
-+ some other package would contain this missing \`$1' program."
-+ exit 1
-+ ;;
-+esac
-+
-+exit 0
---- ez-ipupdate-3.0.11b8.orig/mkinstalldirs
-+++ ez-ipupdate-3.0.11b8/mkinstalldirs
-@@ -4,7 +4,7 @@
- # Created: 1993-05-16
- # Public domain
-
--# $Id: mkinstalldirs,v 1.1.1.1 1999/04/19 00:34:59 amackay Exp $
-+# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $
-
- errstatus=0
-
-@@ -22,7 +22,7 @@
- esac
-
- if test ! -d "$pathcomp"; then
-- echo "mkdir $pathcomp" 1>&2
-+ echo "mkdir $pathcomp"
-
- mkdir "$pathcomp" || lasterr=$?
-
---- ez-ipupdate-3.0.11b8.orig/ez-ipupdate.c
-+++ ez-ipupdate-3.0.11b8/ez-ipupdate.c
-@@ -139,6 +139,9 @@
- #if HAVE_SIGNAL_H
- # include <signal.h>
- #endif
-+#if HAVE_TIME_H
-+# include <time.h>
-+#endif
- #if HAVE_SYS_TIME_H
- # include <sys/time.h>
- #endif
-@@ -165,7 +168,7 @@
- #endif
-
-
--#if __linux__ || __SVR4 || __OpenBSD__ || __FreeBSD__ || __NetBSD__
-+#if __GLIBC__ || __SVR4 || __OpenBSD__ || __FreeBSD__ || __NetBSD__
- # define IF_LOOKUP 1
- # include <sys/ioctl.h>
- # include <net/if.h>
-@@ -640,7 +643,7 @@
- fprintf(stdout, " -q, --quiet \t\t\tbe quiet\n");
- fprintf(stdout, " -r, --retrys <num>\t\tnumber of trys (default: 1)\n");
- fprintf(stdout, " -R, --run-as-user <user>\tchange to <user> for running, be ware\n\t\t\t\tthat this can cause problems with handeling\n\t\t\t\tSIGHUP properly if that user can't read the\n\t\t\t\tconfig file. also it can't write it's pid file \n\t\t\t\tto a root directory\n");
-- fprintf(stdout, " -Q, --run-as-euser <user>\tchange to effective <user> for running, \n\t\t\t\tthis is NOT secure but it does solve the \n\t\t\t\tproblems with run-as-user and config files and \n\t\t\t\tpid files.\n");
-+ fprintf(stdout, " -Q, --run-as-euser <user>\tchange to effective <user> for running, \n\t\t\t\tthis is NOT secure but it does solve the \n\t\t\t\tproblems with run-as-user and config files and \n\t\t\t\tpid files\n");
- fprintf(stdout, " -s, --server <server[:port]>\tthe server to connect to\n");
- fprintf(stdout, " -S, --service-type <server>\tthe type of service that you are using\n");
- width = fprintf(stdout, "\t\t\t\ttry one of: ") + 4*7;
-@@ -682,7 +685,7 @@
-
- void print_signalhelp( void )
- {
-- fprintf(stdout, "\nsignals are only really used when in daemon mode.\n\n");
-+ fprintf(stdout, "\nsignals are only really used when in daemon mode\n\n");
- fprintf(stdout, "signals: \n");
- fprintf(stdout, " HUP\t\tcauses it to re-read its config file\n");
- fprintf(stdout, " TERM\t\twake up and possibly perform an update\n");
-@@ -693,7 +696,7 @@
- #if HAVE_SIGNAL_H
- RETSIGTYPE sigint_handler(int sig)
- {
-- char message[] = "interupted.\n";
-+ char message[] = "interrupted\n";
- close(client_sockfd);
- write(2, message, sizeof(message)-1);
-
-@@ -704,6 +707,10 @@
- }
- #endif
-
-+#if HAVE_SYSLOG_H
-+ closelog();
-+#endif
-+
- exit(1);
- }
- RETSIGTYPE generic_sig_handler(int sig)
-@@ -798,7 +805,7 @@
- sprintf(buf, "message incomplete because your OS sucks: %s\n", fmt);
- #endif
-
-- syslog(LOG_NOTICE, buf);
-+ syslog(LOG_NOTICE, "%s", buf);
- }
- else
- {
-@@ -1439,7 +1446,7 @@
- if(!(options & OPT_QUIET))
- {
- fprintf(stderr,
-- "connected to %s (%s) on port %d.\n",
-+ "connected to %s (%s) on port %d\n",
- host,
- inet_ntoa(address.sin_addr),
- ntohs(address.sin_port));
-@@ -1683,7 +1690,7 @@
- close(client_sockfd);
- return(-1);
- }
-- if(strstr(buf, "\r\n") > 0)
-+ if(strstr(buf, "\n") != NULL)
- {
- break;
- }
-@@ -1702,8 +1709,8 @@
-
- if(options & OPT_DAEMON)
- {
-- fprintf(stderr, "no compile time default service was set therefor you must "
-- "specify a service type.\n");
-+ fprintf(stderr, "no compile time default service was set, you must "
-+ "specify a service type\n");
-
- return(-1);
- }
-@@ -2039,7 +2046,7 @@
- }
- else if(strstr(buf, "\nnumhost") != NULL)
- {
-- show_message("Too many or too few hosts found\n");
-+ show_message("too many or too few hosts found\n");
- retval = UPDATERES_SHUTDOWN;
- }
- else if(strstr(buf, "\ndnserr") != NULL)
-@@ -2051,17 +2058,17 @@
- }
- else if(strstr(buf, "\n911") != NULL)
- {
-- show_message("Ahhhh! call 911!\n");
-+ show_message("ahhhh! call 911!\n");
- retval = UPDATERES_SHUTDOWN;
- }
- else if(strstr(buf, "\n999") != NULL)
- {
-- show_message("Ahhhh! call 999!\n");
-+ show_message("ahhhh! call 999!\n");
- retval = UPDATERES_SHUTDOWN;
- }
- else if(strstr(buf, "\n!donator") != NULL)
- {
-- show_message("a feature requested is only available to donators, please donate.\n", host);
-+ show_message("a feature requested is only available to donators, please donate\n", host);
- retval = UPDATERES_OK;
- }
- // this one should be last as it is a stupid string to signify waits
-@@ -2095,9 +2102,9 @@
- sprintf(reason, "problem parsing reason for wait response");
- }
-
-- show_message("Wait response received, waiting for %s before next update.\n",
-+ show_message("wait response received, waiting for %s before next update\n",
- format_time(howlong));
-- show_message("Wait response reason: %d\n", N_STR(reason));
-+ show_message("wait response reason: %d\n", N_STR(reason));
- sleep(howlong);
- retval = UPDATERES_ERROR;
- }
-@@ -3370,7 +3377,7 @@
- {
- if(!(options & OPT_QUIET))
- {
-- fprintf(stderr, "warning: for GNUDIP the \"address\" parpameter is only used if set to \"0.0.0.0\" thus making an offline request.\n");
-+ fprintf(stderr, "warning: for GNUDIP the \"address\" parameter is only used if set to \"0.0.0.0\" thus making an offline request\n");
- }
- }
-
-@@ -3392,7 +3399,7 @@
-
- // send an offline request if address 0.0.0.0 is used
- // otherwise, we ignore the address and send an update request
-- gnudip_request[0] = strcmp(address, "0.0.0.0") == 0 ? '1' : '0';
-+ gnudip_request[0] = address && strcmp(address, "0.0.0.0") == 0 ? '1' : '0';
- gnudip_request[1] = '\0';
-
- // find domainname
-@@ -3943,22 +3950,22 @@
- break;
-
- case 201:
-- show_message("Last update was less than %d seconds ago.\n", 300);
-+ show_message("last update was less than %d seconds ago\n", 300);
- return(UPDATERES_ERROR);
- break;
-
- case 202:
-- show_message("Server error.\n");
-+ show_message("server error\n");
- return(UPDATERES_ERROR);
- break;
-
- case 203:
-- show_message("Failure because account is frozen (by admin).\n");
-+ show_message("failure because account is frozen (by admin)\n");
- return(UPDATERES_SHUTDOWN);
- break;
-
- case 204:
-- show_message("Failure because account is locked (by user).\n");
-+ show_message("failure because account is locked (by user)\n");
- return(UPDATERES_SHUTDOWN);
- break;
-
-@@ -4215,8 +4222,6 @@
-
- switch(ret)
- {
-- char *p;
--
- case -1:
- if(!(options & OPT_QUIET))
- {
-@@ -4349,7 +4354,7 @@
- case SIGHUP:
- if(config_file)
- {
-- show_message("SIGHUP recieved, re-reading config file\n");
-+ show_message("SIGHUP received, re-reading config file\n");
- if(parse_conf_file(config_file, conf_commands) != 0)
- {
- show_message("error parsing config file \"%s\"\n", config_file);
-@@ -4384,6 +4389,7 @@
-
- int main(int argc, char **argv)
- {
-+ char *tmp;
- int ifresolve_warned = 0;
- int i;
- int retval = 1;
-@@ -4395,9 +4401,10 @@
- mcheck(NULL);
- #endif
-
-- dprintf((stderr, "staring...\n"));
-+ dprintf((stderr, "starting...\n"));
-
-- program_name = argv[0];
-+ tmp = strrchr(argv[0], '/');
-+ program_name = tmp ? tmp + 1 : argv[0];
- options = 0;
- *user = '\0';
- timeout.tv_sec = DEFAULT_TIMEOUT;
-@@ -4417,7 +4424,7 @@
-
- if(!(options & OPT_QUIET) && !(options & OPT_DAEMON))
- {
-- fprintf(stderr, "ez-ipupdate Version %s\nCopyright (C) 1998-2001 Angus Mackay.\n", VERSION);
-+ fprintf(stderr, "%s Version %s\nCopyright (C) 1998-2001 Angus Mackay\n", program_name, VERSION);
- }
-
- dprintf((stderr, "options: 0x%04X\n", options));
-@@ -4434,7 +4441,7 @@
- {
- if(service->check_info() != 0)
- {
-- fprintf(stderr, "invalid data to perform requested action.\n");
-+ fprintf(stderr, "invalid data to perform requested action\n");
- exit(1);
- }
- }
-@@ -4456,13 +4463,13 @@
- dprintf((stderr, "user_name: %s\n", user_name));
- dprintf((stderr, "password: %s\n", password));
- }
-- if(*user_name == '\0')
-+ if(*user_name == '\0' && !(options & OPT_DAEMON))
- {
- printf("user name: ");
- fgets(user_name, sizeof(user_name), stdin);
- chomp(user_name);
- }
-- if(*password == '\0')
-+ if(*password == '\0' && !(options & OPT_DAEMON))
- {
- strncpy(password, getpass("password: "), sizeof(password));
- }
-@@ -4480,7 +4487,7 @@
-
- if(service->check_info() != 0)
- {
-- fprintf(stderr, "invalid data to perform requested action.\n");
-+ fprintf(stderr, "invalid data to perform requested action\n");
- exit(1);
- }
-
-@@ -4503,7 +4510,7 @@
-
- if(interface == NULL)
- {
-- fprintf(stderr, "invalid data to perform requested action.\n");
-+ fprintf(stderr, "invalid data to perform requested action\n");
- fprintf(stderr, "you must provide an interface for daemon mode");
- exit(1);
- }
-@@ -4519,23 +4526,25 @@
- if(fork() > 0) { exit(0); } /* parent */
- }
-
-+# if HAVE_SYSLOG_H
-+ openlog(program_name, LOG_PID, LOG_DAEMON );
-+ //options |= OPT_QUIET;
-+# endif
-+ show_message("version %s, interface %s, host %s, server %s, service %s\n",
-+ VERSION, N_STR(interface), N_STR(host), server, service->title);
-+
- #if HAVE_GETPID
- if(pid_file && pid_file_create(pid_file) != 0)
- {
-- fprintf(stderr, "exiting...\n");
-+ show_message("could not create pid file %s (%s), exiting\n",
-+ pid_file, strerror(errno));
-+#if HAVE_SYSLOG_H
-+ closelog();
-+#endif
- exit(1);
- }
- #endif
-
--# if HAVE_SYSLOG_H
-- openlog(program_name, LOG_PID, LOG_USER );
-- options |= OPT_QUIET;
--# endif
-- show_message("ez-ipupdate Version %s, Copyright (C) 1998-2001 Angus Mackay.\n",
-- VERSION);
-- show_message("%s started for interface %s host %s using server %s and service %s\n",
-- program_name, N_STR(interface), N_STR(host), server, service->title);
--
- memset(&sin, 0, sizeof(sin));
-
- if(cache_file)
-@@ -4560,7 +4569,7 @@
- strftime(timebuf, sizeof(timebuf), "%Y/%m/%d %H:%M", ts);
- show_message("got last update %s on %s from cache file\n", ipstr, timebuf);
- }
-- else
-+ else if(ipstr||ipdate)
- {
- show_message("malformed cache file: %s\n", cache_file);
- }
-@@ -4647,7 +4656,7 @@
- }
- else
- {
-- show_message("failure to update %s->%s (%s)\n",
-+ show_message("failed to update %s->%s (%s)\n",
- interface, inet_ntoa(sin.sin_addr), N_STR(host));
- memset(&sin, 0, sizeof(sin));
-
-@@ -4671,7 +4680,7 @@
- dprintf((stderr, "updateres: %d\n", updateres));
- if(updateres == UPDATERES_SHUTDOWN)
- {
-- show_message("shuting down updater for %s due to fatal error\n",
-+ show_message("shutting down updater for %s due to fatal error\n",
- N_STR(host));
-
- if(notify_email && *notify_email != '\0')
-@@ -4711,7 +4720,7 @@
- #endif
-
- #else
-- fprintf(stderr, "sorry, this mode is only available on platforms that the ");
-+ fprintf(stderr, "sorry, this mode is only available on platforms where the ");
- fprintf(stderr, "IP address \ncan be determined. feel free to hack the code");
- fprintf(stderr, " though.\n");
- exit(1);
-@@ -4799,7 +4808,7 @@
- }
- else
- {
-- show_message("could not resolve ip address for %s.\n", interface);
-+ show_message("could not resolve ip address for %s\n", interface);
- exit(1);
- }
- close(sock);
-@@ -4840,7 +4849,7 @@
- {
- char ipbuf[64];
-
-- if(address == NULL || *address == '\0')
-+ if((address == NULL || *address == '\0') && interface != NULL)
- {
- #ifdef IF_LOOKUP
- struct sockaddr_in sin;
---- ez-ipupdate-3.0.11b8.orig/example.conf
-+++ ez-ipupdate-3.0.11b8/example.conf
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ez-ipupdate -c
-+#!/usr/sbin/ez-ipupdate -c
- #
- # example config file for ez-ipupdate
- #
---- ez-ipupdate-3.0.11b8.orig/example-pgpow.conf
-+++ ez-ipupdate-3.0.11b8/example-pgpow.conf
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ez-ipupdate -c
-+#!/usr/sbin/ez-ipupdate -c
- #
- # example config file for ez-ipupdate
- #
-@@ -10,8 +10,8 @@
- host=mydomain.penguinpowered.com
- interface=eth1
-
--# if you use run-as ensure the user has permission to write this file
--cache-file=/tmp/ez-ipupdate.cache
-+run-as-user=ez-ipupd
-+cache-file=/var/cache/ez-ipupdate/default-cache
-
- # uncomment this once you have everything working how you want and you are
- # ready to have ez-ipupdate running in the background all the time. to stop it
---- ez-ipupdate-3.0.11b8.orig/example-dhs.conf
-+++ ez-ipupdate-3.0.11b8/example-dhs.conf
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ez-ipupdate -c
-+#!/usr/sbin/ez-ipupdate -c
- #
- # example config file for ez-ipupdate
- #
-@@ -10,8 +10,8 @@
- host=mydomain.whatever.com
- interface=eth1
-
--# if you use run-as ensure the user has permission to write this file
--cache-file=/tmp/ez-ipupdate.cache
-+run-as-user=ez-ipupd
-+cache-file=/var/cache/ez-ipupdate/default-cache
-
- # uncomment this once you have everything working how you want and you are
- # ready to have ez-ipupdate running in the background all the time. to stop it
---- ez-ipupdate-3.0.11b8.orig/example-dyndns.conf
-+++ ez-ipupdate-3.0.11b8/example-dyndns.conf
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ez-ipupdate -c
-+#!/usr/sbin/ez-ipupdate -c
- #
- # example config file for ez-ipupdate
- #
-@@ -12,14 +12,9 @@
- interface=eth1
- max-interval=2073600
-
--# please create this file and ensure that the user that ez-ipupdate is running
--# as has write permissions to it then uncomment this line, if you don't your
--# dyndns account will probably get banned. if you run ez-ipupdate as root (bad
--# idea, use "run-as-user") then you can just uncomment this line.
--#cache-file=/etc/ez-ipupdate.cache.eth1
--
--# for the mean time we'll just use a cache file in the temp directory
--cache-file=/tmp/ez-ipupdate.cache
-+# if you don't use a cache file your dyndns account will probably get banned.
-+run-as-user=ez-ipupd
-+cache-file=/var/cache/ez-ipupdate/default-cache
-
- # uncomment this once you have everything working how you want and you are
- # ready to have ez-ipupdate running in the background all the time. to stop it
---- ez-ipupdate-3.0.11b8.orig/example-ods.conf
-+++ ez-ipupdate-3.0.11b8/example-ods.conf
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ez-ipupdate -c
-+#!/usr/sbin/ez-ipupdate -c
- #
- # example config file for ez-ipupdate
- #
-@@ -10,8 +10,8 @@
- host=mydomain.ods.org
- interface=eth1
-
--# if you use run-as ensure the user has permission to write this file
--cache-file=/tmp/ez-ipupdate.cache
-+run-as-user=ez-ipupd
-+cache-file=/var/cache/ez-ipupdate/default-cache
-
- # uncomment this once you have everything working how you want and you are
- # ready to have ez-ipupdate running in the background all the time. to stop it
---- ez-ipupdate-3.0.11b8.orig/example-tzo.conf
-+++ ez-ipupdate-3.0.11b8/example-tzo.conf
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ez-ipupdate -c
-+#!/usr/sbin/ez-ipupdate -c
- #
- # example config file for ez-ipupdate
- #
-@@ -14,8 +14,8 @@
- max-interval=2073600
- interface=eth1
-
--# if you use run-as ensure the user has permission to write this file
--cache-file=/tmp/ez-ipupdate.cache
-+run-as-user=ez-ipupd
-+cache-file=/var/cache/ez-ipupdate/default-cache
-
- # uncomment this once you have everything working how you want and you are
- # ready to have ez-ipupdate running in the background all the time. to stop it
---- ez-ipupdate-3.0.11b8.orig/example-gnudip.conf
-+++ ez-ipupdate-3.0.11b8/example-gnudip.conf
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ez-ipupdate -c
-+#!/usr/sbin/ez-ipupdate -c
- #
- # example config file for ez-ipupdate
- #
-@@ -14,8 +14,8 @@
- # any other value is ignored
- #address=0.0.0.0
-
--# if you use run-as ensure the user has permission to write this file
--cache-file=/tmp/ez-ipupdate.cache
-+run-as-user=ez-ipupd
-+cache-file=/var/cache/ez-ipupdate/default-cache
-
- # uncomment this once you have everything working how you want and you are
- # ready to have ez-ipupdate running in the background all the time. to stop it
---- ez-ipupdate-3.0.11b8.orig/example-easydns.conf
-+++ ez-ipupdate-3.0.11b8/example-easydns.conf
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ez-ipupdate -c
-+#!/usr/sbin/ez-ipupdate -c
- #
- # example config file for ez-ipupdate
- #
-@@ -10,8 +10,8 @@
- host=mydomain.whatever.com
- interface=eth1
-
--# if you use run-as ensure the user has permission to write this file
--cache-file=/tmp/ez-ipupdate.cache
-+run-as-user=ez-ipupd
-+cache-file=/var/cache/ez-ipupdate/default-cache
-
- # uncomment this once you have everything working how you want and you are
- # ready to have ez-ipupdate running in the background all the time. to stop it
---- ez-ipupdate-3.0.11b8.orig/example-justlinux.conf
-+++ ez-ipupdate-3.0.11b8/example-justlinux.conf
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ez-ipupdate -c
-+#!/usr/sbin/ez-ipupdate -c
- #
- # example config file for ez-ipupdate
- #
-@@ -10,8 +10,8 @@
- host=mydomain.penguinpowered.com
- interface=eth1
-
--# if you use run-as ensure the user has permission to write this file
--cache-file=/tmp/ez-ipupdate.cache
-+run-as-user=ez-ipupd
-+cache-file=/var/cache/ez-ipupdate/default-cache
-
- # uncomment this once you have everything working how you want and you are
- # ready to have ez-ipupdate running in the background all the time. to stop it
---- ez-ipupdate-3.0.11b8.orig/example-dyns.conf
-+++ ez-ipupdate-3.0.11b8/example-dyns.conf
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ez-ipupdate -c
-+#!/usr/sbin/ez-ipupdate -c
- #
- # example config file for ez-ipupdate
- #
-@@ -10,8 +10,8 @@
- host=myhost
- #interface=eth1
-
--# if you use run-as ensure the user has permission to write this file
--#cache-file=/tmp/ez-ipupdate.cache
-+run-as-user=ez-ipupd
-+cache-file=/var/cache/ez-ipupdate/default-cache
-
- # uncomment this once you have everything working how you want and you are
- # ready to have ez-ipupdate running in the background all the time. to stop it
---- ez-ipupdate-3.0.11b8.orig/CHANGELOG
-+++ ez-ipupdate-3.0.11b8/CHANGELOG
-@@ -1,3 +1,86 @@
-+Changelog for ez-ipupdate:
-+
-+version 3.0.11b7 is a bug fix for the new ODS server update (it was
-+ez-ipupdate's bug).
-+
-+version 3.0.11b6 has a small fix for dyns.cx changing their protocol by
-+accident (lower case Host now).
-+
-+version 3.0.7 -> 3.0.11x I can't remember, check the changelog.
-+
-+version 3.0.7 gives us a default max-interval for dyndns and allows specifying
-+intervals in days/weeks/months as well as support for another service
-+zoneedit.
-+
-+version 3.0.3 brings a fix for hn.org that was causing it to ignore the
-+supplied IP address and always use the one that you were connecting from.
-+
-+version 3.0.1 brings supoprt for hn.org and the option of using a pid file.
-+
-+version 3.0.0 brings new symantics, now you MUST specify an interface and
-+service-type for daemon mode. it also brings many fixes, it seems that there
-+have been some serious bugs introduced some time after version 2.9.1 and this
-+should fix those and bring some new features like self throttling. All users
-+are strongly encoraged to upgrade to version 3.x.x.
-+
-+version 2.9.3 brings long awaited support for a cache file. this was needed in
-+a big way for use with the dyndns.org service.
-+
-+version 2.9.2 brings support for justlinux.com's new version 2.0 service, now
-+"justlinux" is for the justlinux v2.0 service and "pgpow" is for the justlinux
-+v1.0 service. now that penguinpowered has switched to their v2.0 update method
-+I don't know which one I like the best, probably dyndns.org.
-+
-+version 2.9.0 adds support for EasyDNS. Their service is nice, very good web .
-+site design, it is commercial though thanks to Mark Jeftovic for the code to .
-+support EasyDNS .
-+
-+version 2.8.0 adds support for GNUDip and TZO as well as a new feature to run.
-+a command after every successful update. There are probably some bug fixes in.
-+there too thanks to Jeremy Bopp for the code to support GNUDip and TZO .
-+
-+version 2.6.0 adds support for ODS and a couple minor fixups.
-+
-+version 2.4.2 adds support for dyndns and some other cleanups. the service
-+that dyndns offers looks good, I still think I like justlinux better though.
-+
-+version 2.2.2 gives us support for updating the MX record for dhs.org. I
-+have to say that the implementation of dhs.org's service is laughable. I
-+strongly advise people not to use it, it is just that bad. If you are updating
-+a dhs.org acount with an MX record then there is 60 second sleep() call (or
-+the length of the timeout, whichever is shorter) to get around problems with
-+dhs' service.
-+
-+version 2.2.1 brings support for our friends at dhs.org and fixes a socket
-+leak in the dhs code and the penguinpowered code. I have to say though that I
-+am not impressed with the dhs.org service, penguinpowered.com gets my vote for
-+best implementation. (although they wont even acknowledge my client or put a
-+link to it on thier site)
-+
-+If you are getting errors connecting to the server for a justlinux.com service
-+please ensure that you either specify "-S pgpow" or "--service penguinpowered"
-+on either the command line or in the config file(in the config file the syntax
-+is "service=penguinpowered"). The default for this tool is to think it is
-+connecting to an ez-ip.net service.
-+
-+Version 2.0.0 brings support for other services than just ez-ip.net and
-+contains some bug fixes.
-+
-+Version 1.0.1 brings some new features such the useage of config files,
-+timeouts on I/O, set user id and many more.
-+
-+Version 0.9.0 fixes a problem with a leaky file descriptor and some other
-+litte things wrong. It also moves the version number up quite a bit as I have
-+been running it in daemon mode for over 60 days without any problems.
-+
-+Version 0.0.3 fixes a bug in the user/password code and a bunch of issues with
-+the packaging (I copied another project to start this one and forgot to update
-+some stuff). I Also added the system type to the User-Agent string.
-+
-+Version 0.0.2 adds some nice features for those of use who use Linux. It
-+now can run in daemon mode periodicly check the IP address of the specified
-+interface and only update it if it has changed. It also adds the feature to
-+turn your password in to '***' for the proccess listing.
-
- RCS file: /home/amackay/src/cvsroot/ez-ipupdate/ez-ipupdate.c,v
- Working file: ez-ipupdate.c
---- ez-ipupdate-3.0.11b8.orig/example-heipv6tb.conf
-+++ ez-ipupdate-3.0.11b8/example-heipv6tb.conf
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ez-ipupdate -c
-+#!/usr/sbin/ez-ipupdate -c
- #
- # example config file for ez-ipupdate
- #
-@@ -11,14 +11,9 @@
- interface=eth1
- max-interval=2073600
-
--# please create this file and ensure that the user that ez-ipupdate is running
--# as has write permissions to it then uncomment this line, if you don't your
--# dyndns account will probably get banned. if you run ez-ipupdate as root (bad
--# idea, use "run-as-user") then you can just uncomment this line.
--#cache-file=/etc/ez-ipupdate.cache.eth1
--
--# for the mean time we'll just use a cache file in the temp directory
--cache-file=/tmp/ez-ipupdate.cache
-+# if you don't use a cache file your account will probably get banned.
-+run-as-user=ez-ipupd
-+cache-file=/var/cache/ez-ipupdate/default-cache
-
- # uncomment this once you have everything working how you want and you are
- # ready to have ez-ipupdate running in the background all the time. to stop it
---- ez-ipupdate-3.0.11b8.orig/debian/control
-+++ ez-ipupdate-3.0.11b8/debian/control
-@@ -0,0 +1,25 @@
-+Source: ez-ipupdate
-+Section: net
-+Priority: optional
-+Maintainer: Sam Hocevar (Debian packages) <sam+deb(a)zoy.org>
-+Build-Depends: debhelper (>= 4.1.68)
-+Standards-Version: 3.6.2.1
-+
-+Package: ez-ipupdate
-+Section: net
-+Architecture: any
-+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, debconf (>= 1.2.0)
-+Provides: dyndns-client
-+Description: client for most dynamic DNS services
-+ ez-ipupdate is a quite complete client for the dynamic DNS service offered
-+ by http://www.ez-ip.net/ and many more.
-+ .
-+ Currently supported are: ez-ip (http://www.EZ-IP.Net/), Penguinpowered
-+ (http://www.penguinpowered.com/), DHS (http://members.dhs.org/),
-+ dynDNS (http://members.dyndns.org/), ODS (http://www.ods.org/),
-+ TZO (http://www.tzo.com/), EasyDNS (http://members.easydns.com/),
-+ Justlinux (http://www.justlinux.com), Dyns (http://www.dyns.cx),
-+ HN (http://dup.hn.org/), ZoneEdit (http://www.zoneedit.com/) and
-+ Hurricane Electric's IPv6 Tunnel Broker (http://ipv6tb.he.net/).
-+ .
-+ All services using GNUDip are also supported.
---- ez-ipupdate-3.0.11b8.orig/debian/po/POTFILES.in
-+++ ez-ipupdate-3.0.11b8/debian/po/POTFILES.in
-@@ -0,0 +1 @@
-+[type: gettext/rfc822deb] templates
---- ez-ipupdate-3.0.11b8.orig/debian/po/templates.pot
-+++ ez-ipupdate-3.0.11b8/debian/po/templates.pot
-@@ -0,0 +1,252 @@
-+# SOME DESCRIPTIVE TITLE.
-+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-+# This file is distributed under the same license as the PACKAGE package.
-+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-+#
-+#, fuzzy
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: PACKAGE VERSION\n"
-+"Report-Msgid-Bugs-To: sam+deb(a)zoy.org\n"
-+"POT-Creation-Date: 2005-11-14 20:17+0100\n"
-+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-+"Language-Team: LANGUAGE <LL(a)li.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=CHARSET\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "configure manually"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "zoneedit"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "ez-ip"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "pgpow"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dhs"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns-static"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns-custom"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "ods"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "tzo"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "easydns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "easydns-partner"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "gnudip"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "justlinux"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "hn"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "heipv6tb"
-+msgstr ""
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+msgid "Dynamic DNS provider to use:"
-+msgstr ""
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+msgid ""
-+"There are many Dynamic DNS providers supported by ez-ipupdate. If you want "
-+"your default configuration to be created automatically, you must select the "
-+"provider that you wish to use here. You must configure an account on your "
-+"chosen provider's service yourself."
-+msgstr ""
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+msgid ""
-+"If you prefer your default ez-ipupdate configuration not to be managed for "
-+"you, you may choose \"configure manually\"."
-+msgstr ""
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+msgid ""
-+"Whatever your decision, you can later put as many additional configuration "
-+"files in /etc/ez-ipupdate/ as you need."
-+msgstr ""
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:19
-+msgid "Does this system use dialup PPP to connect to the internet?"
-+msgstr ""
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:19
-+msgid ""
-+"If you use dialup PPP to connect to the internet, then ez-ipupdate can be "
-+"run to notify providers of your new address when ppp connects to the "
-+"network. Otherwise it will run in the background, and scan for changes to "
-+"your address while you are online."
-+msgstr ""
-+
-+#. Type: string
-+#. Description
-+#: ../templates:27
-+msgid "Address for your Dynamic DNS server:"
-+msgstr ""
-+
-+#. Type: string
-+#. Description
-+#: ../templates:27
-+msgid ""
-+"The service type you selected requires a server address to connect to. You "
-+"may specify either a full hostname or an IP address."
-+msgstr ""
-+
-+#. Type: string
-+#. Description
-+#: ../templates:33
-+msgid "Username for your Dynamic DNS account:"
-+msgstr ""
-+
-+#. Type: password
-+#. Description
-+#: ../templates:37
-+msgid "Password for your Dynamic DNS account:"
-+msgstr ""
-+
-+#. Type: string
-+#. Description
-+#: ../templates:42
-+msgid "Network interface to monitor:"
-+msgstr ""
-+
-+#. Type: string
-+#. Description
-+#: ../templates:42
-+msgid ""
-+"ez-ipupdate will monitor the chosen network interface for changes of IP "
-+"address. It is not possible to automatically detect which interface should "
-+"be monitored, so you must name the interface here."
-+msgstr ""
-+
-+#. Type: string
-+#. Description
-+#: ../templates:49
-+msgid "Dynamic DNS hostname to keep updated:"
-+msgstr ""
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:54
-+msgid "Enable DNS wildcards for your Dynamic DNS hostname?"
-+msgstr ""
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:54
-+msgid ""
-+"Many Dynamic DNS providers are capable of supporting \"wildcard\" DNS "
-+"lookups. This means that for yourdomain, a lookup for anything.yourdomain "
-+"will return an answer that points to yourdomain."
-+msgstr ""
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid "MX record to add:"
-+msgstr ""
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid ""
-+"Many Dynamic DNS providers are capable of supporting MX records. If you want "
-+"an MX record enabled for your domain, specify the content of that MX record "
-+"here. If you do not want an MX record, leave it blank."
-+msgstr ""
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid ""
-+"For further information on MX records, what they do, and how they are used, "
-+"see your Dynamic DNS provider."
-+msgstr ""
---- ez-ipupdate-3.0.11b8.orig/debian/po/cs.po
-+++ ez-ipupdate-3.0.11b8/debian/po/cs.po
-@@ -0,0 +1,315 @@
-+#
-+# Translators, if you are not familiar with the PO format, gettext
-+# documentation is worth reading, especially sections dedicated to
-+# this format, e.g. by running:
-+# info -n '(gettext)PO Files'
-+# info -n '(gettext)Header Entry'
-+#
-+# Some information specific to po-debconf are available at
-+# /usr/share/doc/po-debconf/README-trans
-+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-+#
-+# Developers do not need to manually edit POT or PO files.
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: ez-ipupdate\n"
-+"Report-Msgid-Bugs-To: sam+deb(a)zoy.org\n"
-+"POT-Creation-Date: 2005-11-14 20:17+0100\n"
-+"PO-Revision-Date: 2005-03-17 08:23+0100\n"
-+"Last-Translator: Miroslav Kure <kurem(a)debian.cz>\n"
-+"Language-Team: Czech <debian-l10n-czech(a)debian.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=ISO-8859-2\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "configure manually"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "zoneedit"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "ez-ip"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "pgpow"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dhs"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns-static"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns-custom"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "ods"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "tzo"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "easydns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "easydns-partner"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "gnudip"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "justlinux"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "hn"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "heipv6tb"
-+msgstr ""
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+msgid "Dynamic DNS provider to use:"
-+msgstr "Poskytovatel dynamického DNS:"
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+#, fuzzy
-+msgid ""
-+"There are many Dynamic DNS providers supported by ez-ipupdate. If you want "
-+"your default configuration to be created automatically, you must select the "
-+"provider that you wish to use here. You must configure an account on your "
-+"chosen provider's service yourself."
-+msgstr ""
-+"ez-ipupdate podporuje mnoho poskytovatelù dynamického DNS. Vyberte zde, "
-+"kterého poskytovatele pouŸíváte. Konkrétní úèet u daného poskytovatele si "
-+"v¹ak musíte nastavit sami."
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+msgid ""
-+"If you prefer your default ez-ipupdate configuration not to be managed for "
-+"you, you may choose \"configure manually\"."
-+msgstr ""
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+#, fuzzy
-+msgid ""
-+"Whatever your decision, you can later put as many additional configuration "
-+"files in /etc/ez-ipupdate/ as you need."
-+msgstr ""
-+"Poznamenejme, Ÿe do adresáøe /etc/ez-ipupdate/ mùŸete pøidat libovolný poèet "
-+"dal¹ích konfigurací. Tyto dodateèné konfigurace nebude ez-ipupdate nijak "
-+"mìnit."
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:19
-+msgid "Does this system use dialup PPP to connect to the internet?"
-+msgstr ""
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:19
-+msgid ""
-+"If you use dialup PPP to connect to the internet, then ez-ipupdate can be "
-+"run to notify providers of your new address when ppp connects to the "
-+"network. Otherwise it will run in the background, and scan for changes to "
-+"your address while you are online."
-+msgstr ""
-+
-+#. Type: string
-+#. Description
-+#: ../templates:27
-+msgid "Address for your Dynamic DNS server:"
-+msgstr "Adresa serveru dynamického DNS:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:27
-+msgid ""
-+"The service type you selected requires a server address to connect to. You "
-+"may specify either a full hostname or an IP address."
-+msgstr ""
-+"SluŸba, kterou jste vybrali, vyŸaduje adresu serveru, ke kterému se má "
-+"pøipojit. MùŸete zadat buï celé jméno serveru nebo jeho IP adresu."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:33
-+msgid "Username for your Dynamic DNS account:"
-+msgstr "UŸivatelské jméno pro úèet dynamického DNS:"
-+
-+#. Type: password
-+#. Description
-+#: ../templates:37
-+msgid "Password for your Dynamic DNS account:"
-+msgstr "Heslo pro úèet dynamického DNS:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:42
-+msgid "Network interface to monitor:"
-+msgstr "Sledovat sí»ové rozhraní:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:42
-+msgid ""
-+"ez-ipupdate will monitor the chosen network interface for changes of IP "
-+"address. It is not possible to automatically detect which interface should "
-+"be monitored, so you must name the interface here."
-+msgstr ""
-+"ez-ipupdate bude na daném sí»ovém rozhraní sledovat zmìny IP adresy. Program "
-+"neumí odhadnout, které rozhraní má sledovat a proto zde musíte uvést pøesný "
-+"název rozhraní."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:49
-+msgid "Dynamic DNS hostname to keep updated:"
-+msgstr "Dynamické DNS jméno poèítaèe, jeŸ se má udrŸovat aktuální:"
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:54
-+msgid "Enable DNS wildcards for your Dynamic DNS hostname?"
-+msgstr "Povolit zástupné znaky DNS pro dynamické DNS jméno poèítaèe?"
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:54
-+#, fuzzy
-+msgid ""
-+"Many Dynamic DNS providers are capable of supporting \"wildcard\" DNS "
-+"lookups. This means that for yourdomain, a lookup for anything.yourdomain "
-+"will return an answer that points to yourdomain."
-+msgstr ""
-+"Mnoho poskytovatelù dynamického DNS podporuje DNS dotazy se zástupnými "
-+"znaky. To znamená, Ÿe pro vasedomena vrátí dotaz na cokoliv.vasedomena "
-+"odpovìï ukazující na vasedomena. Chcete-li tuto moŸnost povolit, odpovìzte "
-+"zde kladnì."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid "MX record to add:"
-+msgstr "MX záznam:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid ""
-+"Many Dynamic DNS providers are capable of supporting MX records. If you want "
-+"an MX record enabled for your domain, specify the content of that MX record "
-+"here. If you do not want an MX record, leave it blank."
-+msgstr ""
-+"Mnoho poskytovatelù dynamického DNS podporuje MX záznamy. Chcete-li pro svou "
-+"doménu povolit MX záznam, zadejte zde jeho obsah. V opaèném pøípadì ponechte "
-+"pole prázdné."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid ""
-+"For further information on MX records, what they do, and how they are used, "
-+"see your Dynamic DNS provider."
-+msgstr ""
-+"Dal¹í informace o MX záznamech (co dìlají, jak se pouŸívají) naleznete u "
-+"svého poskytovatele dynamického DNS."
-+
-+#~ msgid "Manage your default configuration with debconf?"
-+#~ msgstr "Spravovat nastavení pomocí debconfu?"
-+
-+#~ msgid ""
-+#~ "ez-ipupdate can manage your default configuration automatically using "
-+#~ "debconf. If you do not want your default configuration managed "
-+#~ "automatically, decline this option."
-+#~ msgstr ""
-+#~ "Buï mùŸete spravovat výchozí konfiguraci ez-ipupdate automaticky pomocí "
-+#~ "debconfu, nebo ruènì úpravou konfiguraèního souboru."
-+
-+#~ msgid "Run as a daemon?"
-+#~ msgstr "Spou¹tìt jako daemon?"
-+
-+#~ msgid ""
-+#~ "By default ez-ipupdate will run as a daemon to manage the configuration. "
-+#~ "Refuse here if you do not want this. Instead, ez-ipupdate will install a "
-+#~ "script in /etc/ppp/ip-up.d that will run all non-daemon configurations "
-+#~ "when the ppp interface is brought up. See the /usr/share/doc/ez-ipupdate/"
-+#~ "README.Debian file for more information."
-+#~ msgstr ""
-+#~ "Implicitnì se ez-ipupdate spou¹tí jako daemon. Pokud tomu tak nechcete, "
-+#~ "zamítnìte zde a ez-ipupdate místo toho nainstaluje do adresáøe /etc/ppp/"
-+#~ "ip-up.d skript, který se bude spou¹tìt pøi kaŸdém nahození ppp rozhraní. "
-+#~ "Podrobnosti naleznete v /usr/share/doc/ez-ipupdate/README.Debian."
-+
-+#~ msgid ""
-+#~ "If none of these automated behaviors suit you, you should probably not "
-+#~ "manage your default configuration using debconf."
-+#~ msgstr ""
-+#~ "Pokud vám Ÿádné z automatických chování nevyhovuje, pravdìpodobnì "
-+#~ "nechcete, aby se výchozí konfigurace spravovala pomocí debconfu."
---- ez-ipupdate-3.0.11b8.orig/debian/po/fr.po
-+++ ez-ipupdate-3.0.11b8/debian/po/fr.po
-@@ -0,0 +1,318 @@
-+# translation of fr.po to French
-+#
-+# Translators, if you are not familiar with the PO format, gettext
-+# documentation is worth reading, especially sections dedicated to
-+# this format, e.g. by running:
-+# info -n '(gettext)PO Files'
-+# info -n '(gettext)Header Entry'
-+# Some information specific to po-debconf are available at
-+# /usr/share/doc/po-debconf/README-trans
-+# or http://www.debian.org/intl/l10n/po-debconf/README-trans#
-+# Developers do not need to manually edit POT or PO files.
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: ez-ipupdate\n"
-+"Report-Msgid-Bugs-To: sam+deb(a)zoy.org\n"
-+"POT-Creation-Date: 2005-11-14 20:17+0100\n"
-+"PO-Revision-Date: 2005-03-17 08:39+0100\n"
-+"Last-Translator: Christian perrier <bubulle(a)debian.org>\n"
-+"Language-Team: French <debian-l10n-french(a)lists.debian.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=ISO-8859-15\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"X-Generator: KBabel 1.9.1\n"
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "configure manually"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "zoneedit"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "ez-ip"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "pgpow"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dhs"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns-static"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns-custom"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "ods"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "tzo"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "easydns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "easydns-partner"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "gnudip"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "justlinux"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "hn"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "heipv6tb"
-+msgstr ""
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+msgid "Dynamic DNS provider to use:"
-+msgstr "Fournisseur de service de nom dynamique à utiliser :"
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+#, fuzzy
-+msgid ""
-+"There are many Dynamic DNS providers supported by ez-ipupdate. If you want "
-+"your default configuration to be created automatically, you must select the "
-+"provider that you wish to use here. You must configure an account on your "
-+"chosen provider's service yourself."
-+msgstr ""
-+"De nombreux fournisseurs de service de nom dynamique sont gérés par ez-"
-+"ipupdate. Veuillez choisir le vôtre. La configuration de votre compte chez "
-+"ce fournisseur doit être effectuée à part."
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+msgid ""
-+"If you prefer your default ez-ipupdate configuration not to be managed for "
-+"you, you may choose \"configure manually\"."
-+msgstr ""
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+#, fuzzy
-+msgid ""
-+"Whatever your decision, you can later put as many additional configuration "
-+"files in /etc/ez-ipupdate/ as you need."
-+msgstr ""
-+"Veuillez noter que si vous ajoutez des configurations supplémentaires dans /"
-+"etc/ez-ipupdate/, elles ne seront ultérieurement pas modifiées."
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:19
-+msgid "Does this system use dialup PPP to connect to the internet?"
-+msgstr ""
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:19
-+msgid ""
-+"If you use dialup PPP to connect to the internet, then ez-ipupdate can be "
-+"run to notify providers of your new address when ppp connects to the "
-+"network. Otherwise it will run in the background, and scan for changes to "
-+"your address while you are online."
-+msgstr ""
-+
-+#. Type: string
-+#. Description
-+#: ../templates:27
-+msgid "Address for your Dynamic DNS server:"
-+msgstr "Adresse de votre serveur de nom dynamique :"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:27
-+msgid ""
-+"The service type you selected requires a server address to connect to. You "
-+"may specify either a full hostname or an IP address."
-+msgstr ""
-+"Le type de service que vous avez choisi a besoin de l'adresse d'un serveur. "
-+"Vous pouvez indiquer un nom d'hôte complètement qualifié ou une adresse IP."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:33
-+msgid "Username for your Dynamic DNS account:"
-+msgstr "Identifiant de votre compte de service de nom dynamique :"
-+
-+#. Type: password
-+#. Description
-+#: ../templates:37
-+msgid "Password for your Dynamic DNS account:"
-+msgstr "Mot de passe de votre compte de service de nom dynamique :"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:42
-+msgid "Network interface to monitor:"
-+msgstr "Interface réseau à surveiller :"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:42
-+msgid ""
-+"ez-ipupdate will monitor the chosen network interface for changes of IP "
-+"address. It is not possible to automatically detect which interface should "
-+"be monitored, so you must name the interface here."
-+msgstr ""
-+"Ez-ipupdate surveille les changements d'adresse IP sur une interface réseau. "
-+"Cette interface ne peut pas être détectée automatiquement et vous devez donc "
-+"l'indiquer ici."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:49
-+msgid "Dynamic DNS hostname to keep updated:"
-+msgstr "Nom d'hôte dynamique à tenir à jour :"
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:54
-+msgid "Enable DNS wildcards for your Dynamic DNS hostname?"
-+msgstr ""
-+"Faut-il activer les requêtes DNS génériques pour votre nom d'hôte dynamique ?"
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:54
-+#, fuzzy
-+msgid ""
-+"Many Dynamic DNS providers are capable of supporting \"wildcard\" DNS "
-+"lookups. This means that for yourdomain, a lookup for anything.yourdomain "
-+"will return an answer that points to yourdomain."
-+msgstr ""
-+"De nombreux fournisseurs de services de nom dynamique gèrent les requêtes "
-+"DNS génériques (« wildcard DNS »). Cela signifie qu'une requête pour "
-+"« adresse.votre.domaine » sera résolue vers « votre.domaine »."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid "MX record to add:"
-+msgstr "Enregistrement MX à ajouter :"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid ""
-+"Many Dynamic DNS providers are capable of supporting MX records. If you want "
-+"an MX record enabled for your domain, specify the content of that MX record "
-+"here. If you do not want an MX record, leave it blank."
-+msgstr ""
-+"De nombreux fournisseurs de services de nom dynamique gèrent les "
-+"enregistrements MX. Si vous souhaitez en activer un pour votre domaine, "
-+"veuillez en indiquer le contenu ici. Si vous laissez ce champ vide, aucun "
-+"enregistrement MX ne sera ajouté."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid ""
-+"For further information on MX records, what they do, and how they are used, "
-+"see your Dynamic DNS provider."
-+msgstr ""
-+"Pour plus d'informations sur les enregistrements MX et leur utilisation, "
-+"veuillez consulter votre fournisseur de service de nom dynamique."
-+
-+#~ msgid "Manage your default configuration with debconf?"
-+#~ msgstr "Voulez-vous gérer la configuration par défaut avec debconf ?"
-+
-+#~ msgid ""
-+#~ "ez-ipupdate can manage your default configuration automatically using "
-+#~ "debconf. If you do not want your default configuration managed "
-+#~ "automatically, decline this option."
-+#~ msgstr ""
-+#~ "Ez-ipupdate peut gérer votre configuration par défaut automatiquement "
-+#~ "avec l'outil de configuration debconf. Vous pouvez choisir de ne pas "
-+#~ "utiliser cette option."
-+
-+#~ msgid "Run as a daemon?"
-+#~ msgstr "Faut-il utiliser ez-ipudate comme un démon ?"
-+
-+#~ msgid ""
-+#~ "By default ez-ipupdate will run as a daemon to manage the configuration. "
-+#~ "Refuse here if you do not want this. Instead, ez-ipupdate will install a "
-+#~ "script in /etc/ppp/ip-up.d that will run all non-daemon configurations "
-+#~ "when the ppp interface is brought up. See the /usr/share/doc/ez-ipupdate/"
-+#~ "README.Debian file for more information."
-+#~ msgstr ""
-+#~ "Par défaut, ez-ipupdate fonctionne comme un démon pour gérer la "
-+#~ "configuration. Vous pouvez choisir de ne pas utiliser cette option. Dans "
-+#~ "ce cas, ez-ipupdate installera un script dans /etc/ppp/ip-up.d qui "
-+#~ "exécutera toutes les configurations qui ne sont pas gérées par un démon, "
-+#~ "lorsque l'interface PPP sera activée. Veuillez consulter le fichier /usr/"
-+#~ "share/doc/ez-ipupdate/README.Debian pour plus d'informations."
-+
-+#~ msgid ""
-+#~ "If none of these automated behaviors suit you, you should probably not "
-+#~ "manage your default configuration using debconf."
-+#~ msgstr ""
-+#~ "Si aucun de ces fonctionnements automatisés ne vous convient, vous "
-+#~ "devriez éviter de gérer la configuration par défaut avec debconf."
---- ez-ipupdate-3.0.11b8.orig/debian/po/de.po
-+++ ez-ipupdate-3.0.11b8/debian/po/de.po
-@@ -0,0 +1,324 @@
-+# translation of de-new.po to German
-+# translation of de.po to German
-+#
-+# Translators, if you are not familiar with the PO format, gettext
-+# documentation is worth reading, especially sections dedicated to
-+# this format, e.g. by running:
-+# info -n '(gettext)PO Files'
-+# info -n '(gettext)Header Entry'
-+# Some information specific to po-debconf are available at
-+# /usr/share/doc/po-debconf/README-trans
-+# or http://www.debian.org/intl/l10n/po-debconf/README-trans#
-+# Developers do not need to manually edit POT or PO files.
-+# Jens Nachtigall <nachtigall(a)web.de>, 2005.
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: de-new\n"
-+"Report-Msgid-Bugs-To: sam+deb(a)zoy.org\n"
-+"POT-Creation-Date: 2005-11-14 20:17+0100\n"
-+"PO-Revision-Date: 2005-03-21 21:43+0100\n"
-+"Last-Translator: Jens Nachtigall <nachtigall(a)web.de>\n"
-+"Language-Team: German <debian-l10n-german(a)lists.debian.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"X-Generator: KBabel 1.9.1\n"
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "configure manually"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "zoneedit"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "ez-ip"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "pgpow"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dhs"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns-static"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns-custom"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "ods"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "tzo"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "easydns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "easydns-partner"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "gnudip"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "justlinux"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "hn"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "heipv6tb"
-+msgstr ""
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+msgid "Dynamic DNS provider to use:"
-+msgstr "Zu benutzender Dynamischer DNS-Provider:"
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+#, fuzzy
-+msgid ""
-+"There are many Dynamic DNS providers supported by ez-ipupdate. If you want "
-+"your default configuration to be created automatically, you must select the "
-+"provider that you wish to use here. You must configure an account on your "
-+"chosen provider's service yourself."
-+msgstr ""
-+"ez-ipupdate unterstÌtzt viele Dynamische DNS-Provider. WÀhlen Sie hier den "
-+"Provider aus, den Sie benutzen möchten. Das Benutzerkonto mÌssen Sie beim "
-+"Provider Ihrer Wahl selbst einrichten."
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+msgid ""
-+"If you prefer your default ez-ipupdate configuration not to be managed for "
-+"you, you may choose \"configure manually\"."
-+msgstr ""
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+#, fuzzy
-+msgid ""
-+"Whatever your decision, you can later put as many additional configuration "
-+"files in /etc/ez-ipupdate/ as you need."
-+msgstr ""
-+"Beachten Sie, dass Sie unter /etc/ez-ipupdate/ so viele zusÀtzliche "
-+"Konfigurationen haben können, wie Sie wollen. ez-ipupdate wird diese nicht "
-+"verÀndern."
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:19
-+msgid "Does this system use dialup PPP to connect to the internet?"
-+msgstr ""
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:19
-+msgid ""
-+"If you use dialup PPP to connect to the internet, then ez-ipupdate can be "
-+"run to notify providers of your new address when ppp connects to the "
-+"network. Otherwise it will run in the background, and scan for changes to "
-+"your address while you are online."
-+msgstr ""
-+
-+#. Type: string
-+#. Description
-+#: ../templates:27
-+msgid "Address for your Dynamic DNS server:"
-+msgstr "Adresse fÃŒr Ihren Dynamischen DNS-Server:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:27
-+msgid ""
-+"The service type you selected requires a server address to connect to. You "
-+"may specify either a full hostname or an IP address."
-+msgstr ""
-+"FÌr den ausgewÀhlten Service wird eine Server-Adresse benötigt, zu der eine "
-+"Verbindung aufgebaut wird. Sie können entweder einen vollstÀndigen Host-"
-+"Namen oder eine IP-Adresse angeben."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:33
-+msgid "Username for your Dynamic DNS account:"
-+msgstr "Benutzername fÃŒr Ihr Dynamisches DNS-Konto:"
-+
-+#. Type: password
-+#. Description
-+#: ../templates:37
-+msgid "Password for your Dynamic DNS account:"
-+msgstr "Passwort fÃŒr Ihr Dynamisches DNS-Konto:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:42
-+msgid "Network interface to monitor:"
-+msgstr "Zu verwaltende Netzwerk-Schnittstelle:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:42
-+msgid ""
-+"ez-ipupdate will monitor the chosen network interface for changes of IP "
-+"address. It is not possible to automatically detect which interface should "
-+"be monitored, so you must name the interface here."
-+msgstr ""
-+"ez-ipupdate wird die ausgewÀhlte Netzwerk-Schnittstelle auf VerÀnderungen "
-+"der IP-Adresse beobachten. Es ist nicht möglich automatisch festzustellen, "
-+"welche Schnittstelle beobachtet werden soll. Deshalb mÃŒssen Sie hier den "
-+"Namen der Schnittstelle selbst angeben."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:49
-+msgid "Dynamic DNS hostname to keep updated:"
-+msgstr "Zu aktualisierender Dynamischer DNS-Hostname:"
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:54
-+msgid "Enable DNS wildcards for your Dynamic DNS hostname?"
-+msgstr "DNS-Wildcards fÃŒr Ihren Dynamischen DNS-Hostnamen aktivieren?"
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:54
-+#, fuzzy
-+msgid ""
-+"Many Dynamic DNS providers are capable of supporting \"wildcard\" DNS "
-+"lookups. This means that for yourdomain, a lookup for anything.yourdomain "
-+"will return an answer that points to yourdomain."
-+msgstr ""
-+"Viele Dynamische DNS-Provider unterstÃŒtzen DNS-Lookups mit Platzhaltern "
-+"(»wildcards«). Das bedeutet: Haben Sie eine Domain namens »ihredomain«, dann "
-+"werden Anfragen nach »irgendetwas.ihredomain« mit einer Antwort erwidert, "
-+"die auf »ihredomain« verweist. Soll diese FÀhigkeit aktiviert sein, dann "
-+"stimmen Sie hier zu."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid "MX record to add:"
-+msgstr "HinzuzufÃŒgender MX-Record:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid ""
-+"Many Dynamic DNS providers are capable of supporting MX records. If you want "
-+"an MX record enabled for your domain, specify the content of that MX record "
-+"here. If you do not want an MX record, leave it blank."
-+msgstr ""
-+"Viele Dynamische DNS-Provider unterstÃŒtzen MX-Records. Wollen Sie fÃŒr Ihre "
-+"Domain einen MX-Record hinzufÃŒgen, dann geben Sie hier bitte den Inhalt des "
-+"MX-Records an. Wollen Sie keinen MX-Record, dann lassen Sie das Feld frei."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid ""
-+"For further information on MX records, what they do, and how they are used, "
-+"see your Dynamic DNS provider."
-+msgstr ""
-+"Weitere Informationen ÃŒber MX-Records, wofÃŒr sie gut sind, und wie sie "
-+"verwendet werden, erfahren Sie von Ihrem Dynamischen DNS-Provider."
-+
-+#~ msgid "Manage your default configuration with debconf?"
-+#~ msgstr "Standard-Konfiguration mit debconf verwalten?"
-+
-+#~ msgid ""
-+#~ "ez-ipupdate can manage your default configuration automatically using "
-+#~ "debconf. If you do not want your default configuration managed "
-+#~ "automatically, decline this option."
-+#~ msgstr ""
-+#~ "ez-ipupdate kann Ihre Standard-Konfiguration automatisch mittels debconf "
-+#~ "verwalten. Wenn Sie nicht wollen, dass Ihre Standard-Konfiguration "
-+#~ "automatisch verwaltet wird, dann lehnen Sie diese Option ab."
-+
-+#~ msgid "Run as a daemon?"
-+#~ msgstr "Als Daemon laufen?"
-+
-+#~ msgid ""
-+#~ "By default ez-ipupdate will run as a daemon to manage the configuration. "
-+#~ "Refuse here if you do not want this. Instead, ez-ipupdate will install a "
-+#~ "script in /etc/ppp/ip-up.d that will run all non-daemon configurations "
-+#~ "when the ppp interface is brought up. See the /usr/share/doc/ez-ipupdate/"
-+#~ "README.Debian file for more information."
-+#~ msgstr ""
-+#~ "StandardmÀÃig wird ez-ipupdate Ihre Konfiguration als Daemon verwalten. "
-+#~ "Lehnen Sie hier ab, wenn Sie das nicht wÃŒnschen. Stattdessen wÃŒrde ez-"
-+#~ "ipupdate dann unter /etc/ppp/ip-up.d/ ein Skript installieren, welches "
-+#~ "sÀmtliche Nicht-Daemon-Konfigurationen ausfÌhrt, sobald die PPP-"
-+#~ "Schnittstelle hochgefahren wird. Lesen Sie die Datei /usr/share/doc/ez-"
-+#~ "ipupdate/README.Debian fÃŒr weitere Informationen."
-+
-+#~ msgid ""
-+#~ "If none of these automated behaviors suit you, you should probably not "
-+#~ "manage your default configuration using debconf."
-+#~ msgstr ""
-+#~ "Sollte Ihnen keine dieser Automatismen zusagen, dann ist es "
-+#~ "wahrscheinlich besser, wenn Sie Ihre Standard-Konfiguration nicht mittels "
-+#~ "debconf verwalten."
---- ez-ipupdate-3.0.11b8.orig/debian/po/pt_BR.po
-+++ ez-ipupdate-3.0.11b8/debian/po/pt_BR.po
-@@ -0,0 +1,319 @@
-+# Translators, if you are not familiar with the PO format, gettext
-+# documentation is worth reading, especially sections dedicated to
-+# this format, e.g. by running:
-+# info -n '(gettext)PO Files'
-+# info -n '(gettext)Header Entry'
-+# Some information specific to po-debconf are available at
-+# /usr/share/doc/po-debconf/README-trans
-+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-+# Developers do not need to manually edit POT or PO files.
-+#
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: ez-ipupdate 3.0.11\n"
-+"Report-Msgid-Bugs-To: sam+deb(a)zoy.org\n"
-+"POT-Creation-Date: 2005-11-14 20:17+0100\n"
-+"PO-Revision-Date: 2005-03-21 23:11-0300\n"
-+"Last-Translator: Felipe Augusto van de Wiel (faw) <felipe@cathedrallabs>\n"
-+"Language-Team: Portuguese/Brazil <debian-l10n-portuguese(a)lists.debian.org>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"pt_BR\n"
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "configure manually"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "zoneedit"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "ez-ip"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "pgpow"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dhs"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns-static"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns-custom"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "ods"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "tzo"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "easydns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "easydns-partner"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "gnudip"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "justlinux"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "hn"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "heipv6tb"
-+msgstr ""
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+msgid "Dynamic DNS provider to use:"
-+msgstr "Provedor de DNS Dinâmico a ser usado:"
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+#, fuzzy
-+msgid ""
-+"There are many Dynamic DNS providers supported by ez-ipupdate. If you want "
-+"your default configuration to be created automatically, you must select the "
-+"provider that you wish to use here. You must configure an account on your "
-+"chosen provider's service yourself."
-+msgstr ""
-+"Há vários provedores de DNS Dinâmico suportados pelo ez-ipupdate. Você deve "
-+"selecionar o provedor que você gostaria de usar aqui. Você mesmo deve "
-+"configurar uma conta no serviço do provedor que você escolheu."
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+msgid ""
-+"If you prefer your default ez-ipupdate configuration not to be managed for "
-+"you, you may choose \"configure manually\"."
-+msgstr ""
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+#, fuzzy
-+msgid ""
-+"Whatever your decision, you can later put as many additional configuration "
-+"files in /etc/ez-ipupdate/ as you need."
-+msgstr ""
-+"Note que você pode colocar quantas configurações adicionais no /etc/ez-"
-+"ipupdate/ você quiser. ez-ipupdate não vai modificá-las."
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:19
-+msgid "Does this system use dialup PPP to connect to the internet?"
-+msgstr ""
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:19
-+msgid ""
-+"If you use dialup PPP to connect to the internet, then ez-ipupdate can be "
-+"run to notify providers of your new address when ppp connects to the "
-+"network. Otherwise it will run in the background, and scan for changes to "
-+"your address while you are online."
-+msgstr ""
-+
-+#. Type: string
-+#. Description
-+#: ../templates:27
-+msgid "Address for your Dynamic DNS server:"
-+msgstr "Endereço do seu servidor de DNS Dinâmico:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:27
-+msgid ""
-+"The service type you selected requires a server address to connect to. You "
-+"may specify either a full hostname or an IP address."
-+msgstr ""
-+"O tipo do serviço que você selecionou requer um endereço de servidor para se "
-+"conectar. Você pode especificar um nome de máquina ou um endereço IP."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:33
-+msgid "Username for your Dynamic DNS account:"
-+msgstr "Nome do usuário para a sua conta de DNS Dinâmico:"
-+
-+#. Type: password
-+#. Description
-+#: ../templates:37
-+msgid "Password for your Dynamic DNS account:"
-+msgstr "Senha para a sua conta de DNS Dinâmico:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:42
-+msgid "Network interface to monitor:"
-+msgstr "Interface de rede para monitorar:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:42
-+msgid ""
-+"ez-ipupdate will monitor the chosen network interface for changes of IP "
-+"address. It is not possible to automatically detect which interface should "
-+"be monitored, so you must name the interface here."
-+msgstr ""
-+"ez-ipupdate irá monitorar mudanças do endereço IP na interface de rede "
-+"escolhida. Não é possÃvel detectar automaticamente qual interface deve ser "
-+"monitorada, portanto você deve nomear a interface aqui."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:49
-+msgid "Dynamic DNS hostname to keep updated:"
-+msgstr "Nome de máquina do DNS Dinâmico para manter atualizado:"
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:54
-+msgid "Enable DNS wildcards for your Dynamic DNS hostname?"
-+msgstr ""
-+"Habilitar máscaras (\"wildcards\") de DNS para o seu nome de máquina do DNS "
-+"Dinâmico?"
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:54
-+#, fuzzy
-+msgid ""
-+"Many Dynamic DNS providers are capable of supporting \"wildcard\" DNS "
-+"lookups. This means that for yourdomain, a lookup for anything.yourdomain "
-+"will return an answer that points to yourdomain."
-+msgstr ""
-+"Vários provedores de DNS Dinâmico são capazes de suportar consultas para "
-+"\"máscaras\" (\"wildcards\") de DNS. Isso significa que para o seu domÃnio, "
-+"uma consulta para qualquercoisa.seudominio vai retornar uma resposta que "
-+"aponta para o seu domÃnio. Se você deseja que esse recurso seja ativado, "
-+"aceite aqui."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid "MX record to add:"
-+msgstr "Entrada MX a ser adicionada:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid ""
-+"Many Dynamic DNS providers are capable of supporting MX records. If you want "
-+"an MX record enabled for your domain, specify the content of that MX record "
-+"here. If you do not want an MX record, leave it blank."
-+msgstr ""
-+"Vários provedores de DNS Dinâmico são capazes de suportar entradas MX. Se "
-+"você deseja que uma entrada MX seja habilitada para o seu domÃnio, "
-+"especifique aqui o conteúdo da sua entrada MX. Se você não quer uma entrada "
-+"MX, deixe em branco."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid ""
-+"For further information on MX records, what they do, and how they are used, "
-+"see your Dynamic DNS provider."
-+msgstr ""
-+"Para maiores informações sobre entradas MX, o que elas fazem, e como são "
-+"usadas, veja o seu provedor de DNS Dinâmico."
-+
-+#~ msgid "Manage your default configuration with debconf?"
-+#~ msgstr "Gerenciar suas configurações \"default\" com o debconf?"
-+
-+#~ msgid ""
-+#~ "ez-ipupdate can manage your default configuration automatically using "
-+#~ "debconf. If you do not want your default configuration managed "
-+#~ "automatically, decline this option."
-+#~ msgstr ""
-+#~ "ez-ipupdate pode gerenciar suas configurações \"default\" automaticamente "
-+#~ "usando o deconf. Se você não quer que suas configurações \"default\" "
-+#~ "sejam gerenciadas automaticamente, negue esta opção."
-+
-+#~ msgid "Run as a daemon?"
-+#~ msgstr "Executar como serviço?"
-+
-+#~ msgid ""
-+#~ "By default ez-ipupdate will run as a daemon to manage the configuration. "
-+#~ "Refuse here if you do not want this. Instead, ez-ipupdate will install a "
-+#~ "script in /etc/ppp/ip-up.d that will run all non-daemon configurations "
-+#~ "when the ppp interface is brought up. See the /usr/share/doc/ez-ipupdate/"
-+#~ "README.Debian file for more information."
-+#~ msgstr ""
-+#~ "Por \"default\" ez-ipupdate é executado como serviço para gerenciar a "
-+#~ "configuração. Recuse aqui se você não quiser isso. Ao invés disso, ez-"
-+#~ "ipupdate instalará um script em /etc/ppp/ip-up.d que executará todas as "
-+#~ "configurações quando a interface ppp for ativada. Veja o arquivo /usr/"
-+#~ "share/doc/ez-ipupdate/README.Debian para mais informações."
-+
-+#~ msgid ""
-+#~ "If none of these automated behaviors suit you, you should probably not "
-+#~ "manage your default configuration using debconf."
-+#~ msgstr ""
-+#~ "Se nenhum dos comportamentos automáticos atender você, você não deveria "
-+#~ "gerenciar suas configurações \"default\" usando o debconf."
---- ez-ipupdate-3.0.11b8.orig/debian/po/vi.po
-+++ ez-ipupdate-3.0.11b8/debian/po/vi.po
-@@ -0,0 +1,308 @@
-+# Vietnamese Translation for ez-ipupdate.
-+# Copyright © 2005 Free Software Foundation, Inc.
-+# Clytie Siddall <clytie(a)riverland.net.au>, 2005.
-+#
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: ez-ipupdate 3.0.11b8-8.1\n"
-+"Report-Msgid-Bugs-To: sam+deb(a)zoy.org\n"
-+"POT-Creation-Date: 2005-11-14 20:17+0100\n"
-+"PO-Revision-Date: 2005-06-02 21:37+0930\n"
-+"Last-Translator: Clytie Siddall <clytie(a)riverland.net.au>\n"
-+"Language-Team: Vietnamese <gnomevi-list(a)lists.sourceforge.net>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=utf-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"Plural-Forms: nplurals=1; plural=0\n"
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "configure manually"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "zoneedit"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "ez-ip"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "pgpow"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dhs"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns-static"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyndns-custom"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "ods"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "tzo"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "easydns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "easydns-partner"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "gnudip"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "justlinux"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "dyns"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "hn"
-+msgstr ""
-+
-+#. Type: select
-+#. Choices
-+#: ../templates:3
-+msgid "heipv6tb"
-+msgstr ""
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+msgid "Dynamic DNS provider to use:"
-+msgstr "Nhà cung cấp DNS Äá»ng cần dùng:"
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+#, fuzzy
-+msgid ""
-+"There are many Dynamic DNS providers supported by ez-ipupdate. If you want "
-+"your default configuration to be created automatically, you must select the "
-+"provider that you wish to use here. You must configure an account on your "
-+"chosen provider's service yourself."
-+msgstr ""
-+"Trình ez-ipupdate có há» trợ nhiá»u nhà cung cấp DNS Äá»ng. á» Äây thì bạn hãy "
-+"chá»n nhà cung cấp nà o bạn muá»n dùng. Cần phải tá»± cấu hình má»t tà i khoản trên "
-+"dá»ch vụ Äã chá»n."
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+msgid ""
-+"If you prefer your default ez-ipupdate configuration not to be managed for "
-+"you, you may choose \"configure manually\"."
-+msgstr ""
-+
-+#. Type: select
-+#. Description
-+#: ../templates:4
-+#, fuzzy
-+msgid ""
-+"Whatever your decision, you can later put as many additional configuration "
-+"files in /etc/ez-ipupdate/ as you need."
-+msgstr ""
-+"Hãy ghi chú rằng bạn có thá» chÚn cà ng nhiá»u cấu hình thêm và o /etc/ez-"
-+"ipupdate/ cà ng muá»n, và trình ez-ipupdate sẜ khÃŽng sá»a Äá»i chúng."
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:19
-+msgid "Does this system use dialup PPP to connect to the internet?"
-+msgstr ""
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:19
-+msgid ""
-+"If you use dialup PPP to connect to the internet, then ez-ipupdate can be "
-+"run to notify providers of your new address when ppp connects to the "
-+"network. Otherwise it will run in the background, and scan for changes to "
-+"your address while you are online."
-+msgstr ""
-+
-+#. Type: string
-+#. Description
-+#: ../templates:27
-+msgid "Address for your Dynamic DNS server:"
-+msgstr "Äá»a chá» cho máy phục vụ DNS Äá»ng của bạn:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:27
-+msgid ""
-+"The service type you selected requires a server address to connect to. You "
-+"may specify either a full hostname or an IP address."
-+msgstr ""
-+"Bạn Äã chá»n loại dá»ch vụ cần thiết má»t Äá»a chá» máy phục vụ Äá» kết ná»i Äến "
-+"nó. Bạn có thá» ghi rõ hoặc má»t tên máy Äầy Äủ hoặc má»t Äá»a chá» IP."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:33
-+msgid "Username for your Dynamic DNS account:"
-+msgstr "Tên ngÆ°á»i dùng cho tà i khoản DNS Äá»ng của bạn:"
-+
-+#. Type: password
-+#. Description
-+#: ../templates:37
-+msgid "Password for your Dynamic DNS account:"
-+msgstr "Máºt khẩu cho tà i khoản DNS Äá»ng của bạn:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:42
-+msgid "Network interface to monitor:"
-+msgstr "Giao diá»n mạng cần theo dõi:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:42
-+msgid ""
-+"ez-ipupdate will monitor the chosen network interface for changes of IP "
-+"address. It is not possible to automatically detect which interface should "
-+"be monitored, so you must name the interface here."
-+msgstr ""
-+"Trình ez-ipupdate sẜ theo dõi giao diá»n mạng Äã chá»n, Äá» tìm lần thay Äá»i "
-+"Äá»a chá» IP nà o. KhÃŽng thá» tá»± Äá»ng phát hiá»n giao diá»n nà o cần theo dõi, thì "
-+"bạn hãy gõ tên của giao diá»n ấy và o Äây."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:49
-+msgid "Dynamic DNS hostname to keep updated:"
-+msgstr "Tên máy DNS Äá»ng cần cáºp nháºt suá»t:"
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:54
-+msgid "Enable DNS wildcards for your Dynamic DNS hostname?"
-+msgstr "Báºt kÃœ tá»± Äại diá»n DNS cho tên máy DNS Äá»ng khÃŽng?"
-+
-+#. Type: boolean
-+#. Description
-+#: ../templates:54
-+#, fuzzy
-+msgid ""
-+"Many Dynamic DNS providers are capable of supporting \"wildcard\" DNS "
-+"lookups. This means that for yourdomain, a lookup for anything.yourdomain "
-+"will return an answer that points to yourdomain."
-+msgstr ""
-+"Nhiá»u nhà cung cấp dá»ch vụ DNS Äá»ng có khả nÄng há» trợ viá»c tra cứu DNS loại "
-+"«Äại diá»n». Có nghÄ©a là cho miá»n_tÃŽi, khi tra cứu cáigì.miá»n_tÃŽi sẜ gá»i trả "
-+"má»t trả lá»i ngụ Ãœ miá»n_tÃŽi. Nếu bạn muá»n báºt tÃnh nÄng nà y thì hãy Äá»ng Ãœ á» "
-+"Äây."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid "MX record to add:"
-+msgstr "Mục ghi MX cần thêm:"
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid ""
-+"Many Dynamic DNS providers are capable of supporting MX records. If you want "
-+"an MX record enabled for your domain, specify the content of that MX record "
-+"here. If you do not want an MX record, leave it blank."
-+msgstr ""
-+"Nhiá»u nhà cung cấp dá»ch vụ DNS Äá»ng có khả nÄng há» trợ mục ghi MX. Nếu bạn "
-+"muá»n báºt má»t mục ghi MX cho miá»n bạn, thì hãy ghi rõ ná»i dung của mục ghi MX "
-+"ấy và o Äây. Nếu bạn khÃŽng muá»n Äiá»u ấy thì hãy bá» rá»ng."
-+
-+#. Type: string
-+#. Description
-+#: ../templates:61
-+msgid ""
-+"For further information on MX records, what they do, and how they are used, "
-+"see your Dynamic DNS provider."
-+msgstr ""
-+"Äá» tìm thÃŽng tin thêm vá» mục ghi MX, chức nÄng chúng và cách sá» dụng chúng, "
-+"hãy xem nhà cung cấp dá»ch vụ DNS Äá»ng của bạn."
-+
-+#~ msgid "Manage your default configuration with debconf?"
-+#~ msgstr "Quản lÃœ cấu hình mặc Äá»nh bạn dùng debconf khÃŽng?"
-+
-+#~ msgid ""
-+#~ "ez-ipupdate can manage your default configuration automatically using "
-+#~ "debconf. If you do not want your default configuration managed "
-+#~ "automatically, decline this option."
-+#~ msgstr ""
-+#~ "Trình ez-ipupdate có thá» tá»± Äá»ng quản lÃœ cấu hình bạn dùng debconf. Nếu "
-+#~ "bạn khÃŽng muá»n Äiá»u nà y thì hãy từ khá»i tùy chá»n nà y."
-+
-+#~ msgid "Run as a daemon?"
-+#~ msgstr "Chạy trong ná»n khÃŽng?"
-+
-+#~ msgid ""
-+#~ "By default ez-ipupdate will run as a daemon to manage the configuration. "
-+#~ "Refuse here if you do not want this. Instead, ez-ipupdate will install a "
-+#~ "script in /etc/ppp/ip-up.d that will run all non-daemon configurations "
-+#~ "when the ppp interface is brought up. See the /usr/share/doc/ez-ipupdate/"
-+#~ "README.Debian file for more information."
-+#~ msgstr ""
-+#~ "Mặc Äá»nh là trình ez-ipupdate sẜ chạy trong ná»n (là dÊmon) Äá» quản lÃœ "
-+#~ "tiến trình cấu hình. Hãy từ chá»i á» Äây nếu bạn khÃŽng muá»n Äiá»u nà y. Thay "
-+#~ "và o Äó, trình ez-ipupdate sẜ cà i Äặt má»t táºp lá»nh và o /etc/ppp/ip-up.d mà "
-+#~ "sẜ chạy má»i cấu hình khÃŽng phải là trình ná»n khi giao diá»n ppp má»i hoạt "
-+#~ "Äá»ng. Hãy xem táºp tin /usr/share/doc/ez-ipupdate/README.Debian Äá» tìm "
-+#~ "thÎng tin thêm."
-+
-+#~ msgid ""
-+#~ "If none of these automated behaviors suit you, you should probably not "
-+#~ "manage your default configuration using debconf."
-+#~ msgstr ""
-+#~ "Nếu bạn khÃŽng muá»n dùng cách tá»± Äá»ng nà o thì rất có thá» là bạn khÃŽng nên "
-+#~ "quản lÃœ cấu hình mặc Äá»nh dùng debconf."
---- ez-ipupdate-3.0.11b8.orig/debian/changelog
-+++ ez-ipupdate-3.0.11b8/debian/changelog
-@@ -0,0 +1,208 @@
-+ez-ipupdate (3.0.11b8-10) unstable; urgency=low
-+
-+ * debian/templates:
-+ + Allow translation of the "configure manually" option (Closes: #339047).
-+ * debian/rules:
-+ + Use dh_install instead of cp.
-+ + Use dh_installexamples instead of cp.
-+
-+ -- Sam Hocevar (Debian packages) <sam+deb(a)zoy.org> Mon, 14 Nov 2005 20:11:20 +0100
-+
-+ez-ipupdate (3.0.11b8-9) unstable; urgency=low
-+
-+ * Acknowledge NMU. Thanks to Lucas Wall (Closes: #237444, #300821).
-+ * debian/control:
-+ + Set policy to 3.6.2.1.
-+ * debian/rules:
-+ + Use dh_installman instead of dh_installmanpages.
-+ * debian/po/vi.po:
-+ + Vietnamese debconf template translation, thanks to Clytie Siddall
-+ (Closes: #311643).
-+ * debian/config debian/templates:
-+ + Merge the "manage the config file automatically?" and the "choose
-+ service type" questions and set the priority to high (Closes: #275600).
-+ + Put zoneedit higher in the list of services in debconf because it is
-+ easy to set up.
-+ + Do not ask for the interface in PPP mode.
-+ + Tuned the questions so that they do not refer to a particular debconf
-+ backend, and many other fixes suggested by Joey Hess (Closes: #275602).
-+ + Replaced ez-ipupdate/daemon with ez-ipupdate/ppp.
-+ * CHANGELOG:
-+ + Changelog information more recent than 2001/07/04 is not available; I
-+ added the NEWS information to this file instead (Closes: #306751).
-+ * ez-ipupdate.c:
-+ + Fixed a segfault thanks to Robert Jacobs (Closes: #323718).
-+
-+ -- Sam Hocevar (Debian packages) <sam+deb(a)zoy.org> Sat, 12 Nov 2005 10:32:58 +0100
-+
-+ez-ipupdate (3.0.11b8-8.1) unstable; urgency=low
-+
-+ * Non-maintainer upload
-+ * Switched to po-debconf. (closes: #237444)
-+ * Added Czech debconf template translation.
-+ * Added French debconf template translation.
-+ * Added German debconf template translation.
-+ * Added Brazilian Portuguese debconf template translation. (closes: #300821)
-+
-+ -- Lucas Wall <lwall(a)debian.org> Fri, 25 Mar 2005 17:34:15 -0300
-+
-+ez-ipupdate (3.0.11b8-8) unstable; urgency=critical
-+
-+ * ez-ipupdate.c:
-+ + Fixed the format string vulnerability in CAN-2004-0980 (Closes: #280822).
-+ * debian/control:
-+ + Set policy to 3.6.1.1.
-+
-+ -- Sam Hocevar (Debian packages) <sam+deb(a)zoy.org> Sat, 13 Nov 2004 15:45:58 +0100
-+
-+ez-ipupdate (3.0.11b8-7) unstable; urgency=low
-+
-+ * debian/control:
-+ + Set policy to 3.6.1.0.
-+ + Set debhelper build-dependency to (>= 4.1.68) because of dh_installppp.
-+ * debian/rules:
-+ + Use dh_installppp instead of doing the work by hand (Closes: #212896).
-+
-+ -- Sam Hocevar (Debian packages) <sam+deb(a)zoy.org> Mon, 27 Oct 2003 13:39:09 +0100
-+
-+ez-ipupdate (3.0.11b8-6) unstable; urgency=low
-+
-+ * debian/control:
-+ + Set policy to 3.6.0. No changes required.
-+ + Updated debhelper build-dependency to (>= 3.4.4) because we now
-+ use debian/compat.
-+ + Use ${misc:Depends}.
-+ * debian/config:
-+ + Fixed the wildcard/MX prompting, thanks to Sam Couter (Closes: #201720).
-+
-+ -- Sam Hocevar (Debian packages) <sam+deb(a)zoy.org> Thu, 17 Jul 2003 14:44:06 +0200
-+
-+ez-ipupdate (3.0.11b8-5) unstable; urgency=low
-+
-+ * Do not prompt for a username or password in daemon mode (Closes: #198141).
-+ * debian/postinst:
-+ + Removed useless verbosity when installing the package for the first time.
-+
-+ -- Sam Hocevar (Debian packages) <sam+deb(a)zoy.org> Fri, 20 Jun 2003 10:17:37 +0200
-+
-+ez-ipupdate (3.0.11b8-4) unstable; urgency=low
-+
-+ * Do not output the "invalid cache file" message if the reason is that the
-+ cache file is empty.
-+ * debian/postinst:
-+ + Removed a temporary file that was left behind.
-+ * Log to LOG_DAEMON instead of LOG_USER so that messages go to daemon.log.
-+ * Only show the executable name in syslog, not its full path.
-+ * Do not switch to OPT_QUIET in daemon mode, so that daemon.log shows
-+ useful information such as login failures (Closes: #179717).
-+ * Fixed a few spelling errors in the log messages.
-+ * Open syslog before creating the pid file so that errors regarding the
-+ pid file creation are logged as well.
-+
-+ -- Sam Hocevar (Debian packages) <sam+deb(a)zoy.org> Thu, 19 Jun 2003 02:51:13 +0200
-+
-+ez-ipupdate (3.0.11b8-3) unstable; urgency=low
-+
-+ * Fixed a crash in the GNUDip code when no address is specified.
-+ * debian/control:
-+ + Set policy to 3.5.10.
-+ + Removed the leading "a" in the package description.
-+ + Added URLs for the various services in the long description.
-+ * debian/postinst:
-+ + Fixed default cache filename, thanks to Daniel Bonniot (Closes: #194004).
-+ + Added an invariant section to the default configuration file to preserve
-+ user changes (Closes: #191642).
-+ + No longer clear the password in debconf.
-+ * debian/config:
-+ + The GNUDip service needs a server address when run as a daemon; added a
-+ debconf prompt for this.
-+ + Added a debconf prompt to run ez-ipupdate as a daemon or through the
-+ PPP ip-up.d script (Closes: #85942).
-+ * debian/ppp:
-+ + Added this script for /etc/ppp/ip-up.d/.
-+
-+ -- Sam Hocevar (Debian packages) <sam+deb(a)zoy.org> Wed, 18 Jun 2003 15:08:00 +0200
-+
-+ez-ipupdate (3.0.11b8-2) unstable; urgency=low
-+
-+ * Re-ran "rm -f config.sub config.guess configure install-sh missing \
-+ mkinstalldirs && aclocal && automake --copy --add-missing && autoconf"
-+ * Updated policy to 3.5.9.0.
-+
-+ -- Samuel Hocevar <sam(a)zoy.org> Wed, 23 Apr 2003 05:29:22 +0200
-+
-+ez-ipupdate (3.0.11b8-1) unstable; urgency=low
-+
-+ * New upstream release.
-+ * The debconf-created file is now mode 700 to avoid password exposure
-+ (Closes: #190237).
-+
-+ -- Samuel Hocevar <sam(a)zoy.org> Wed, 23 Apr 2003 05:03:37 +0200
-+
-+ez-ipupdate (3.0.11b7-3) unstable; urgency=low
-+
-+ * The "faster than light" release.
-+ * Really fixed the timestamp skew in debian/rules (Closes: #180901).
-+
-+ -- Samuel Hocevar <sam(a)zoy.org> Fri, 14 Feb 2003 02:12:38 +0100
-+
-+ez-ipupdate (3.0.11b7-2) unstable; urgency=low
-+
-+ * The "bloody valentine" release.
-+ * Fixed another timestamp skew in debian/rules (Closes: #180901, #180904).
-+
-+ -- Samuel Hocevar <sam(a)zoy.org> Fri, 14 Feb 2003 01:06:02 +0100
-+
-+ez-ipupdate (3.0.11b7-1) unstable; urgency=low
-+
-+ * The "eternal hellfire for lazy maintainers" release.
-+ * New upstream package (Closes: #167038).
-+ * Removed dependency on debconf-tiny (Closes: #137029).
-+ * We now Provide: dyndns-client (Closes: #139082).
-+ * Updated authors list in debian/copyright (Closes: #177772).
-+ * Fixed -Wall warnings.
-+ * This release fixes a hang in ODS_read_response() (Closes: #169043).
-+ * Added various safety checks in the init.d script.
-+ * Fixed the reload rule in the init.d script (Closes: #144798).
-+ * The init.d script only looks for files ending with .conf (Closes: #139518).
-+ * Applied a patch to handle running ez-ipupdate as a user, courtesy of Sam
-+ Couter (Closes: #127913).
-+ * Applied a patch for debconf management of the default configuration,
-+ courtesy of Sam Couter again (Closes: #100327).
-+ * Prevented timestamp skews in debian/rules.
-+ * Wrote a short manpage (Closes: #168361).
-+
-+ -- Samuel Hocevar <sam(a)zoy.org> Thu, 13 Feb 2003 15:56:57 +0100
-+
-+ez-ipupdate (3.0.11b5-1) unstable; urgency=low
-+
-+ * New upstream package.
-+
-+ -- Samuel Hocevar <sam(a)zoy.org> Thu, 8 Nov 2001 19:43:21 +0100
-+
-+ez-ipupdate (3.0.10-2) unstable; urgency=low
-+
-+ * Now builds and runs properly on Hurd (Closes: #108058).
-+
-+ -- Samuel Hocevar <sam(a)zoy.org> Thu, 9 Aug 2001 15:31:23 +0200
-+
-+ez-ipupdate (3.0.10-1) unstable; urgency=low
-+
-+ * New upstream release.
-+ * Fixed typo in init.d (Closes: #97175).
-+
-+ -- Samuel Hocevar <sam(a)zoy.org> Fri, 11 May 2001 18:51:35 +0200
-+
-+ez-ipupdate (3.0.6-1) unstable; urgency=low
-+
-+ * New upstream release.
-+ * Fixed moronic errors in the init.d file (Closes: #85057, #85955, #85956).
-+ * Removed generic installation instructions from /usr/share/doc.
-+
-+ -- Samuel Hocevar <sam(a)zoy.org> Thu, 1 Mar 2001 11:44:35 +0100
-+
-+ez-ipupdate (3.0.4-1) unstable; urgency=low
-+
-+ * Initial Release (Closes: #78202).
-+
-+ -- Samuel Hocevar <sam(a)zoy.org> Mon, 25 Dec 2000 05:48:01 +0100
---- ez-ipupdate-3.0.11b8.orig/debian/templates
-+++ ez-ipupdate-3.0.11b8/debian/templates
-@@ -0,0 +1,67 @@
-+Template: ez-ipupdate/service_type
-+Type: select
-+__Choices: configure manually, zoneedit, ez-ip, pgpow, dhs, dyndns, dyndns-static, dyndns-custom, ods, tzo, easydns, easydns-partner, gnudip, justlinux, dyns, hn, heipv6tb
-+_Description: Dynamic DNS provider to use:
-+ There are many Dynamic DNS providers supported by ez-ipupdate. If you want
-+ your default configuration to be created automatically, you must select the
-+ provider that you wish to use here. You must configure an account on your
-+ chosen provider's service yourself.
-+ .
-+ If you prefer your default ez-ipupdate configuration not to be managed for
-+ you, you may choose "configure manually".
-+ .
-+ Whatever your decision, you can later put as many additional configuration
-+ files in /etc/ez-ipupdate/ as you need.
-+
-+Template: ez-ipupdate/ppp
-+Type: boolean
-+Default: false
-+_Description: Does this system use dialup PPP to connect to the internet?
-+ If you use dialup PPP to connect to the internet, then ez-ipupdate can
-+ be run to notify providers of your new address when ppp connects to the
-+ network. Otherwise it will run in the background, and scan for changes
-+ to your address while you are online.
-+
-+Template: ez-ipupdate/server
-+Type: string
-+_Description: Address for your Dynamic DNS server:
-+ The service type you selected requires a server address to connect to. You
-+ may specify either a full hostname or an IP address.
-+
-+Template: ez-ipupdate/username
-+Type: string
-+_Description: Username for your Dynamic DNS account:
-+
-+Template: ez-ipupdate/password
-+Type: password
-+_Description: Password for your Dynamic DNS account:
-+
-+Template: ez-ipupdate/interface
-+Type: string
-+Default: eth0
-+_Description: Network interface to monitor:
-+ ez-ipupdate will monitor the chosen network interface for changes of IP
-+ address. It is not possible to automatically detect which interface should
-+ be monitored, so you must name the interface here.
-+
-+Template: ez-ipupdate/hostname
-+Type: string
-+_Description: Dynamic DNS hostname to keep updated:
-+
-+Template: ez-ipupdate/dns_wildcard
-+Type: boolean
-+Default: false
-+_Description: Enable DNS wildcards for your Dynamic DNS hostname?
-+ Many Dynamic DNS providers are capable of supporting "wildcard" DNS
-+ lookups. This means that for yourdomain, a lookup for anything.yourdomain
-+ will return an answer that points to yourdomain.
-+
-+Template: ez-ipupdate/dns_mx
-+Type: string
-+_Description: MX record to add:
-+ Many Dynamic DNS providers are capable of supporting MX records. If you
-+ want an MX record enabled for your domain, specify the content of that MX
-+ record here. If you do not want an MX record, leave it blank.
-+ .
-+ For further information on MX records, what they do, and how they are
-+ used, see your Dynamic DNS provider.
---- ez-ipupdate-3.0.11b8.orig/debian/copyright
-+++ ez-ipupdate-3.0.11b8/debian/copyright
-@@ -0,0 +1,16 @@
-+This package was debianized by Sam Hocevar <sam(a)zoy.org> on
-+Mon, 25 Dec 2000 05:48:01 +0100.
-+
-+It was downloaded from http://ez-ipupdate.com/
-+
-+Upstream Authors: Angus Mackay <amackay(a)gusnet.cx>
-+ Jeremy Bopp <jbopp(a)mail.utexas.edu>
-+ Mark Jeftovic <markjr(a)easydns.com>
-+ Stefaan Ponnet <webmaster(a)dyns.cx>
-+ Colin Viebrock <colin(a)easydns.com>
-+ Tim Brown <timb(a)machine.org.uk>
-+
-+License: GNU General Public License.
-+
-+On Debian GNU/Linux systems, a copy of the GNU GPL can be found in
-+/usr/share/common-licenses/GPL.
---- ez-ipupdate-3.0.11b8.orig/debian/dirs
-+++ ez-ipupdate-3.0.11b8/debian/dirs
-@@ -0,0 +1,4 @@
-+etc/ez-ipupdate
-+etc/ppp/ip-up.d/
-+usr/sbin
-+usr/share/doc/ez-ipupdate/examples
---- ez-ipupdate-3.0.11b8.orig/debian/init
-+++ ez-ipupdate-3.0.11b8/debian/init
-@@ -0,0 +1,96 @@
-+#! /bin/sh
-+
-+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-+DAEMON=/usr/sbin/ez-ipupdate
-+NAME=ez-ipupdate
-+DESC="Dynamic DNS client"
-+
-+test -f "$DAEMON" || exit 0
-+
-+set -e
-+
-+case "$1" in
-+ start)
-+ echo -n "Starting $DESC:"
-+ configs=`find "/etc/$NAME/" -name '*.conf' | \
-+ sed -e 's,.*/\(.*\).conf,\1,'`
-+ if [ x"$configs" = x ]
-+ then
-+ echo " no .conf file in /etc/$NAME."
-+ exit 0
-+ fi
-+
-+ echo -n " $NAME"
-+ for config in `echo "$configs"`
-+ do
-+ # Don't run configurations that are not daemons
-+ if ! grep -q '^ *daemon' "/etc/$NAME/$config.conf"; then continue; fi
-+ # Don't run configurations that run in the foreground
-+ if grep -q '^ *foreground' "/etc/$NAME/$config.conf"; then continue; fi
-+ # Ok, launch an ez-ipupdate instance
-+ if start-stop-daemon --start --quiet \
-+ --pidfile "/var/run/$NAME/$config.pid" \
-+ --exec "$DAEMON" \
-+ -- -d -c "/etc/$NAME/$config.conf" \
-+ -F "/var/run/$NAME/$config.pid"
-+ then
-+ echo -n " $config"
-+ fi
-+ done
-+ echo "."
-+ ;;
-+ stop)
-+ echo -n "Stopping $DESC:"
-+ pidfiles=`find "/var/run/$NAME/" -name "*.pid" | \
-+ sed -e 's,.*/\(.*\).pid,\1,'`
-+ if [ x"$pidfiles" = x ]
-+ then
-+ echo " no $NAME running."
-+ exit 0
-+ fi
-+
-+ echo -n " $NAME"
-+ for pidfile in `echo "$pidfiles"`
-+ do
-+ if start-stop-daemon --stop --signal 3 --quiet \
-+ --pidfile "/var/run/$NAME/$pidfile.pid"
-+ then
-+ echo -n " $pidfile"
-+ fi
-+ done
-+ echo "."
-+ ;;
-+ reload)
-+ echo -n "Reloading $DESC configuration files:"
-+ pidfiles=`find "/var/run/$NAME" -name "*.pid" | \
-+ sed -e 's,.*/\(.*\).pid,\1,'`
-+ if [ x"$pidfiles" = x ]
-+ then
-+ echo " no $NAME running."
-+ exit 0
-+ fi
-+
-+ echo -n " $NAME"
-+ for pidfile in `echo "$pidfiles"`
-+ do
-+ if start-stop-daemon --stop --signal 1 --quiet \
-+ --pidfile "/var/run/$NAME/$pidfile.pid"
-+ then
-+ echo -n " $pidfile"
-+ fi
-+ done
-+ echo "."
-+ ;;
-+ restart|force-reload)
-+ $0 stop
-+ sleep 1
-+ $0 start
-+ ;;
-+ *)
-+ N="/etc/init.d/$NAME"
-+ echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
-+ exit 1
-+ ;;
-+esac
-+
-+exit 0
---- ez-ipupdate-3.0.11b8.orig/debian/README.Debian
-+++ ez-ipupdate-3.0.11b8/debian/README.Debian
-@@ -0,0 +1,37 @@
-+Notes for ez-ipupdate on Debian
-+===============================
-+
-+Configuration files
-+-------------------
-+ To configure this package, put your configuration files the /etc/ez-ipupdate/
-+directory.
-+
-+ To avoid password exposure, it is recommended you set the permission for all
-+configuration files in this directory to 700 (-rwx------). You will still be
-+able to use the run-as-user option because the file is opened before root
-+permissions are dropped.
-+
-+Automated behavior
-+------------------
-+ The init.d script will launch an ez-ipupdate daemon for each configuration
-+file in that directory that has the "daemon" option set and the "foreground"
-+option disabled.
-+
-+ The ppp script will launch ez-ipupdate once for each configuration file in
-+the /etc/ez-ipupdate/ directory that has the "daemon" and the "foreground"
-+options disabled.
-+
-+ If you do not want your configuration files to be automatically used, please
-+set the "foreground" option in them, or put them in an alternate directory.
-+
-+Cache files
-+-----------
-+ You may store cache files in /var/cache/ez-ipupdate/, as the daemon has write
-+permission to this directory.
-+
-+
-+ -- Sam Hocevar <sam(a)zoy.org> Mon, 25 Dec 2000 05:48:01 +0100
-+ updated on Thu, 13 Feb 2003 15:56:36 +0100 (cache files)
-+ updated on Wed, 23 Apr 2003 04:59:52 +0200 (file permissions)
-+ updated on Wed, 18 Jun 2003 20:08:44 +0200 (ppp ip-up.d)
-+
---- ez-ipupdate-3.0.11b8.orig/debian/rules
-+++ ez-ipupdate-3.0.11b8/debian/rules
-@@ -0,0 +1,87 @@
-+#!/usr/bin/make -f
-+# Sample debian/rules that uses debhelper.
-+# GNU copyright 1997 to 1999 by Joey Hess.
-+
-+# Uncomment this to turn on verbose mode.
-+#export DH_VERBOSE=1
-+
-+export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-+
-+confflags = --prefix=/usr
-+confflags += --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-+ confflags += --build $(DEB_HOST_GNU_TYPE)
-+else
-+ confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-+endif
-+
-+configure: configure-stamp
-+configure-stamp:
-+ dh_testdir
-+ touch configure.in \
-+ && touch aclocal.m4 \
-+ && touch configure \
-+ && touch stamp-h.in \
-+ && touch config.h.in \
-+ && touch `find -name Makefile.in`
-+ CFLAGS=-Wall ./configure $(confflags)
-+ touch configure-stamp
-+
-+build: configure-stamp build-stamp
-+build-stamp:
-+ dh_testdir
-+ $(MAKE)
-+ touch build-stamp
-+
-+clean:
-+ dh_testdir
-+ dh_testroot
-+ rm -f build-stamp configure-stamp
-+ -$(MAKE) distclean
-+ chmod a-x ex*conf
-+ dh_clean
-+ debconf-updatepo
-+
-+install: build
-+ dh_testdir
-+ dh_testroot
-+ dh_clean -k
-+ dh_installdirs
-+ dh_install ez-ipupdate /usr/sbin/
-+ dh_installppp
-+
-+# Build architecture-independent files here.
-+binary-indep: build install
-+# We have nothing to do by default.
-+
-+# Build architecture-dependent files here.
-+binary-arch: build install
-+# dh_testversion
-+ dh_testdir
-+ dh_testroot
-+ dh_installdebconf
-+ dh_installdocs
-+ dh_installexamples ex*conf
-+ dh_installmenu
-+# dh_installemacsen
-+# dh_installpam
-+ dh_installinit
-+ dh_installcron
-+ dh_installman ez-ipupdate.8
-+ dh_installinfo
-+ dh_installchangelogs CHANGELOG
-+ dh_link
-+ dh_strip
-+ dh_compress
-+ dh_fixperms
-+# dh_makeshlibs
-+ dh_installdeb
-+# dh_perl
-+ dh_shlibdeps
-+ dh_gencontrol
-+ dh_md5sums
-+ dh_builddeb
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary install configure
---- ez-ipupdate-3.0.11b8.orig/debian/docs
-+++ ez-ipupdate-3.0.11b8/debian/docs
-@@ -0,0 +1 @@
-+README
---- ez-ipupdate-3.0.11b8.orig/debian/postinst
-+++ ez-ipupdate-3.0.11b8/debian/postinst
-@@ -0,0 +1,139 @@
-+#! /bin/sh
-+# postinst script for ez-ipupdate
-+#
-+# see: dh_installdeb(1)
-+
-+set -e
-+
-+# Load the debconf library
-+. /usr/share/debconf/confmodule
-+
-+# summary of how this script can be called:
-+# * <postinst> `configure' <most-recently-configured-version>
-+# * <old-postinst> `abort-upgrade' <new version>
-+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-+# <new-version>
-+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-+# <failed-install-package> <version> `removing'
-+# <conflicting-package> <version>
-+# for details, see http://www.debian.org/doc/debian-policy/ or
-+# the debian-policy package
-+#
-+# quoting from the policy:
-+# Any necessary prompting should almost always be confined to the
-+# post-installation script, and should be protected with a conditional
-+# so that unnecessary prompting doesn't happen if a package's
-+# installation fails and the `postinst' is called with `abort-upgrade',
-+# `abort-remove' or `abort-deconfigure'.
-+
-+case "$1" in
-+ configure)
-+ # Create the user if it doesn't exist
-+ if ! id ez-ipupd 2>/dev/null 1>&2 ; then
-+ adduser --system --home /var/cache/ez-ipupdate \
-+ --shell /bin/false --gecos "Dynamic DNS client" \
-+ --disabled-password --disabled-login ez-ipupd
-+ fi
-+ # Create the default cache file
-+ touch /var/cache/ez-ipupdate/default-cache
-+ chown ez-ipupd /var/cache/ez-ipupdate/default-cache
-+ # Remove spurious cache file from the 3.0.11b8-2 broken package
-+ rm -f /var/cache/ez-ipupdate/cache-default
-+ # Create the directory where the PID file will be stored
-+ mkdir -p /var/run/ez-ipupdate
-+ chown -R ez-ipupd /var/run/ez-ipupdate
-+ # Create the default config file (maybe)
-+ db_get ez-ipupdate/service_type
-+ if [ "$RET" != "configure manually" ] ; then
-+ service="$RET"
-+ conf="/etc/ez-ipupdate/default.conf"
-+ newconf="$conf.dpkg-new"
-+ # Grab answers from debconf
-+ db_get ez-ipupdate/ppp
-+ ppp="$RET"
-+ db_get ez-ipupdate/username
-+ username="$RET"
-+ db_get ez-ipupdate/password
-+ password="$RET"
-+ db_get ez-ipupdate/hostname
-+ hostname="$RET"
-+ db_get ez-ipupdate/interface
-+ interface="$RET"
-+ echo "#!/usr/sbin/ez-ipupdate -c" > "$newconf"
-+ cat >> "$newconf" << EOF
-+###
-+### Default ez-ipupdate configuration file - EDIT WITH CARE
-+### Use \`dpkg-reconfigure ez-ipupdate' to update the debconf-generated lines.
-+###
-+
-+### The following lines were generated by debconf
-+
-+service-type=$service
-+EOF
-+ db_get ez-ipupdate/server || RET=""
-+ if [ -n "$RET" ]; then
-+ echo "server=$RET" >> "$newconf"
-+ else
-+ echo "#server=(default)" >> "$newconf"
-+ fi
-+ cat >> "$newconf" << EOF
-+user=$username:$password
-+host=$hostname
-+interface=$interface
-+EOF
-+ db_get ez-ipupdate/dns_wildcard || RET="false"
-+ if [ "$RET" = "true" ]; then
-+ echo "wildcard" >> "$newconf"
-+ else
-+ echo "#wildcard" >> "$newconf"
-+ fi
-+ db_get ez-ipupdate/dns_mx || RET=""
-+ if [ -n "$RET" ]; then
-+ echo "mx=$RET" >> "$newconf"
-+ else
-+ echo "#mx=(none)" >> "$newconf"
-+ fi
-+ cat >> "$newconf" << EOF
-+run-as-user=ez-ipupd
-+cache-file=/var/cache/ez-ipupdate/default-cache
-+EOF
-+ if [ "$ppp" = "true" ]; then
-+ echo "#daemon" >> "$newconf"
-+ else
-+ echo "daemon" >> "$newconf"
-+ fi
-+ echo >> "$newconf"
-+ if grep -q '^### Changes below this' "$conf" >/dev/null 2>&1; then
-+ sed -ne '/^### Changes below this/,$p' < "$conf" >> "$newconf"
-+ else
-+ cat >> "$newconf" << EOF
-+### Changes below this line will be preserved on upgrades.
-+
-+EOF
-+ fi
-+ # Fix the file permissions
-+ chmod 700 "$newconf"
-+ rm -f "$conf" && mv "$newconf" "$conf"
-+ # Remove that old file, from broken 3.0.11b8-3 package
-+ rm -f "$conf.new"
-+ fi
-+ ;;
-+
-+ abort-upgrade|abort-remove|abort-deconfigure)
-+ ;;
-+
-+ *)
-+ echo "postinst called with unknown argument \`$1'" >&2
-+ exit 1
-+ ;;
-+esac
-+
-+# dh_installdeb will replace this with shell code automatically
-+# generated by other debhelper scripts.
-+
-+#DEBHELPER#
-+
-+# ez-ipupdate is a bit misbehaved.
-+db_stop
-+
-+exit 0
---- ez-ipupdate-3.0.11b8.orig/debian/config
-+++ ez-ipupdate-3.0.11b8/debian/config
-@@ -0,0 +1,165 @@
-+#!/bin/sh
-+
-+set -e
-+
-+# Source debconf library
-+. /usr/share/debconf/confmodule
-+
-+service_supports_wildcards()
-+{
-+ service=$1
-+ ret=1
-+
-+ case "$service" in
-+ ez-ip|dhs|dyndns|dyndns-static|easydns|easydns-partner)
-+ ret=0
-+ ;;
-+ esac
-+
-+ return $ret
-+}
-+
-+service_supports_mx()
-+{
-+ service=$1
-+ ret=1
-+
-+ case "$service" in
-+ ez-ip|dhs|dyndns|dyndns-static|easydns|zoneedit)
-+ ret=0
-+ ;;
-+ esac
-+
-+ return $ret
-+}
-+
-+service_needs_server()
-+{
-+ service=$1
-+ ret=1
-+
-+ case "$service" in
-+ gnudip)
-+ ret=0
-+ ;;
-+ esac
-+
-+ return $ret
-+}
-+
-+# I no longer claim this question, migrate it.
-+if db_get ez-ipupdate/daemon; then
-+ case "$RET" in
-+ true) db_set ez-ipupdate/ppp "false" ;;
-+ false) db_set ez-ipupdate/ppp "true" ;;
-+ esac
-+ db_unregister ez-ipupdate/daemon
-+fi
-+
-+# I no longer claim this question either.
-+if db_get ez-ipupdate/manage_default_config_automatically; then
-+ case "$RET" in
-+ false) db_set ez-ipupdate/service_type "configure manually" ;;
-+ esac
-+ db_unregister ez-ipupdate/manage_default_config_automatically
-+fi
-+
-+# Name the configuration file
-+conf=/etc/ez-ipupdate/default.conf
-+
-+# Do you want debconf to manage the default configuration?
-+if [ -f "$conf" ]; then
-+ service="`sed -ne 's/^service-type *= *//p' < $conf`"
-+fi
-+if [ -n "$service" ]; then
-+ db_set ez-ipupdate/service_type "$service"
-+fi
-+db_input high ez-ipupdate/service_type || true
-+db_go
-+
-+db_get ez-ipupdate/service_type
-+if [ "$RET" != "configure manually" ]; then
-+ if [ -f "$conf" ]; then
-+ # Grab existing values from config file
-+ if grep "^daemon" $conf > /dev/null 2>&1; then
-+ ppp="false"
-+ fi
-+ service="`sed -ne 's/^service-type *= *//p' < $conf`"
-+ server="`sed -ne 's/^server *= *//p' < $conf`"
-+ username="`sed -ne 's/^user *= *\([^:]*\):.*/\1/p' < $conf`"
-+ password="`sed -ne 's/^user *= *[^:]*://p' < $conf`"
-+ hostname="`sed -ne 's/^host *= *//p' < $conf`"
-+ interface="`sed -ne 's/^interface *= *//p' < $conf`"
-+ if grep "^wildcard" $conf > /dev/null 2>&1; then
-+ wildcard="true"
-+ fi
-+ dns_mx="`sed -ne 's/^mx *= *//p' < $conf`"
-+ # Poke the values into debconf
-+ if [ -n "$ppp" ]; then
-+ db_set ez-ipupdate/ppp "$ppp"
-+ fi
-+ if [ -n "$service" ]; then
-+ db_set ez-ipupdate/service_type "$service"
-+ fi
-+ if [ -n "$server" ]; then
-+ db_set ez-ipupdate/server "$server"
-+ fi
-+ if [ -n "$username" ]; then
-+ db_set ez-ipupdate/username "$username"
-+ fi
-+ if [ -n "$password" ]; then
-+ db_set ez-ipupdate/password "$password"
-+ fi
-+ if [ -n "$hostname" ]; then
-+ db_set ez-ipupdate/hostname "$hostname"
-+ fi
-+ if [ -n "$interface" ]; then
-+ db_set ez-ipupdate/interface "$interface"
-+ fi
-+ if [ "$wildcard" = true ]; then
-+ db_set ez-ipupdate/dns_wildcard true
-+ fi
-+ if [ -n "$dns_mx" ]; then
-+ db_set ez-ipupdate/dns_mx "$dns_mx"
-+ fi
-+ fi
-+ # Ask for new answers
-+ db_beginblock
-+ db_input high ez-ipupdate/ppp || true
-+ db_input high ez-ipupdate/username || true
-+ db_input high ez-ipupdate/password || true
-+ db_input high ez-ipupdate/hostname || true
-+ db_endblock
-+ db_go
-+ # Need to determine whether wildcards and MX records are supported
-+ # by the chosen service
-+ db_beginblock
-+ db_get ez-ipupdate/service_type
-+ service_type="$RET"
-+ if service_needs_server "$service_type"; then
-+ db_input high ez-ipupdate/server || true
-+ else
-+ db_set ez-ipupdate/server ""
-+ fi
-+ if service_supports_wildcards "$service_type"; then
-+ db_input medium ez-ipupdate/dns_wildcard || true
-+ else
-+ db_set ez-ipupdate/dns_wildcard false
-+ fi
-+ if service_supports_mx "$service_type"; then
-+ db_input medium ez-ipupdate/dns_mx || true
-+ else
-+ db_set ez-ipupdate/dns_mx ""
-+ fi
-+ db_endblock
-+ db_go
-+ # Check whether we really need to know the listening interface
-+ db_beginblock
-+ db_get ez-ipupdate/ppp
-+ ppp="$RET"
-+ if [ "$ppp" = "false" ]; then
-+ db_input high ez-ipupdate/interface || true
-+ fi
-+ db_endblock
-+ db_go
-+fi
---- ez-ipupdate-3.0.11b8.orig/debian/postrm
-+++ ez-ipupdate-3.0.11b8/debian/postrm
-@@ -0,0 +1,54 @@
-+#! /bin/sh
-+# postrm script for ez-ipupdate
-+#
-+# see: dh_installdeb(1)
-+
-+set -e
-+
-+# summary of how this script can be called:
-+# * <postrm> `remove'
-+# * <postrm> `purge'
-+# * <old-postrm> `upgrade' <new-version>
-+# * <new-postrm> `failed-upgrade' <old-version>
-+# * <new-postrm> `abort-install'
-+# * <new-postrm> `abort-install' <old-version>
-+# * <new-postrm> `abort-upgrade' <old-version>
-+# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
-+# for details, see http://www.debian.org/doc/debian-policy/ or
-+# the debian-policy package
-+
-+#DEBHELPER#
-+
-+remove_var_run() {
-+ # Delete the user account, if it exists
-+ if id ez-ipupd 2>/dev/null 1>&2 ; then
-+ deluser ez-ipupd
-+ # The --remove-home option to deluser requires
-+ # perl-modules? WTF?
-+ rm -Rf /var/cache/ez-ipupdate
-+ fi
-+ # And remove the directory where the PID files were stored
-+ rm -rf /var/run/ez-ipupdate
-+}
-+
-+case "$1" in
-+ purge)
-+ rm -f /etc/ez-ipupdate/default.conf
-+ remove_var_run
-+ ;;
-+
-+ remove)
-+ remove_var_run
-+ ;;
-+
-+ upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-+ ;;
-+
-+ *)
-+ echo "postrm called with unknown argument \`$1'" >&2
-+ exit 1
-+ ;;
-+
-+esac
-+
-+exit 0
---- ez-ipupdate-3.0.11b8.orig/debian/preinst
-+++ ez-ipupdate-3.0.11b8/debian/preinst
-@@ -0,0 +1,35 @@
-+#! /bin/sh
-+# preinst script for ez-ipupdate
-+#
-+# see: dh_installdeb(1)
-+
-+set -e
-+
-+# summary of how this script can be called:
-+# * <new-preinst> `install'
-+# * <new-preinst> `install' <old-version>
-+# * <new-preinst> `upgrade' <old-version>
-+# * <old-preinst> `abort-upgrade' <new-version>
-+#
-+# for details, see http://www.debian.org/doc/debian-policy/ or
-+# the debian-policy package
-+
-+case "$1" in
-+ install|upgrade)
-+ ;;
-+
-+ abort-upgrade)
-+ ;;
-+
-+ *)
-+ echo "preinst called with unknown argument \`$1'" >&2
-+ exit 1
-+ ;;
-+esac
-+
-+# dh_installdeb will replace this with shell code automatically
-+# generated by other debhelper scripts.
-+
-+#DEBHELPER#
-+
-+exit 0
---- ez-ipupdate-3.0.11b8.orig/debian/prerm
-+++ ez-ipupdate-3.0.11b8/debian/prerm
-@@ -0,0 +1,37 @@
-+#! /bin/sh
-+# prerm script for ez-ipupdate
-+#
-+# see: dh_installdeb(1)
-+
-+set -e
-+
-+# summary of how this script can be called:
-+# * <prerm> `remove'
-+# * <old-prerm> `upgrade' <new-version>
-+# * <new-prerm> `failed-upgrade' <old-version>
-+# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-+# * <deconfigured's-prerm> `deconfigure' `in-favour'
-+# <package-being-installed> <version> `removing'
-+# <conflicting-package> <version>
-+# for details, see http://www.debian.org/doc/debian-policy/ or
-+# the debian-policy package
-+
-+case "$1" in
-+ remove|upgrade|deconfigure)
-+ ;;
-+
-+ failed-upgrade)
-+ ;;
-+
-+ *)
-+ echo "prerm called with unknown argument \`$1'" >&2
-+ exit 1
-+ ;;
-+esac
-+
-+# dh_installdeb will replace this with shell code automatically
-+# generated by other debhelper scripts.
-+
-+#DEBHELPER#
-+
-+exit 0
---- ez-ipupdate-3.0.11b8.orig/debian/compat
-+++ ez-ipupdate-3.0.11b8/debian/compat
-@@ -0,0 +1 @@
-+4
---- ez-ipupdate-3.0.11b8.orig/debian/ez-ipupdate.ppp.ip-up
-+++ ez-ipupdate-3.0.11b8/debian/ez-ipupdate.ppp.ip-up
-@@ -0,0 +1,25 @@
-+#!/bin/sh
-+#
-+# Default ez-ipupdate ip-up script
-+# /etc/ppp/ip-up.d/ez-ipupdate
-+#
-+
-+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-+DAEMON=/usr/sbin/ez-ipupdate
-+NAME=ez-ipupdate
-+
-+[ -x $DAEMON ] || exit 0
-+
-+configs=`find "/etc/$NAME/" -name '*.conf' | sed -e 's,.*/\(.*\).conf,\1,'`
-+[ x"$configs" = x ] && exit 0
-+
-+for config in `echo "$configs"`
-+do
-+ # Don't run daemon configurations
-+ if grep -q '^ *daemon' "/etc/$NAME/$config.conf"; then continue; fi
-+ # Don't run configurations that run in the foreground
-+ if grep -q '^ *foreground' "/etc/$NAME/$config.conf"; then continue; fi
-+ # Ok, launch an ez-ipupdate instance
-+ "$DAEMON" -c "/etc/$NAME/$config.conf"
-+done
-+
---- ez-ipupdate-3.0.11b8.orig/ez-ipupdate.8
-+++ ez-ipupdate-3.0.11b8/ez-ipupdate.8
-@@ -0,0 +1,140 @@
-+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.29.
-+.\" I DO WHATEVER I WANT YOU DUMBASS SCRIPT! -- Sam
-+.TH EZ-IPUPDATE "8" "February 2003" "ez-ipupdate - 3.0.11b7" "Dynamic DNS client"
-+.SH NAME
-+ez-ipupdate \- dynamic DNS client
-+.SH SYNOPSIS
-+.B ez-ipupdate
-+.RI [ options ]
-+.SH DESCRIPTION
-+This manual page documents briefly the
-+.B ez-ipupdate
-+dynamic DNS client.
-+
-+.SH OPTIONS
-+.B ez-ipupdate
-+follows the usual GNU command line syntax, with long
-+options starting with two dashes (`-').
-+.TP
-+\fB\-a\fR, \fB\-\-address\fR <ip address>
-+string to send as your ip address
-+.TP
-+\fB\-b\fR, \fB\-\-cache\-file\fR <file>
-+file to use for caching the ipaddress
-+.TP
-+\fB\-c\fR, \fB\-\-config\-file\fR <file>
-+configuration file, almost all arguments can be
-+given with: <name>[=<value>]
-+to see a list of possible config commands
-+try "echo help | ez-ipupdate \fB\-c\fR -"
-+.TP
-+\fB\-d\fR, \fB\-\-daemon\fR
-+run as a daemon periodicly updating if
-+necessary
-+.TP
-+\fB\-e\fR, \fB\-\-execute\fR <command>
-+shell command to execute after a successful
-+update
-+.TP
-+\fB\-f\fR, \fB\-\-foreground\fR
-+when running as a daemon run in the foreground
-+.TP
-+\fB\-F\fR, \fB\-\-pidfile\fR <file>
-+use <file> as a pid file
-+.TP
-+\fB\-g\fR, \fB\-\-request\-uri\fR <uri>
-+URI to send updates to
-+.TP
-+\fB\-h\fR, \fB\-\-host\fR <host>
-+string to send as host parameter
-+.TP
-+\fB\-i\fR, \fB\-\-interface\fR <iface>
-+which interface to use
-+.TP
-+\fB\-L\fR, \fB\-\-cloak_title\fR <host>
-+some stupid thing for DHS only
-+.TP
-+\fB\-m\fR, \fB\-\-mx\fR <mail exchange>
-+string to send as your mail exchange
-+.HP
-+\fB\-M\fR, \fB\-\-max\-interval\fR <# of sec> max time in between updates
-+.TP
-+\fB\-N\fR, \fB\-\-notify\-email\fR <email>
-+address to send mail to if bad things happen
-+.TP
-+\fB\-o\fR, \fB\-\-offline\fR
-+set to off line mode
-+.TP
-+\fB\-p\fR, \fB\-\-resolv\-period\fR <sec>
-+period to check IP if it can't be resolved
-+.TP
-+\fB\-P\fR, \fB\-\-period\fR <# of sec>
-+period to check IP in daemon
-+mode (default: 1800 seconds)
-+.TP
-+\fB\-q\fR, \fB\-\-quiet\fR
-+be quiet
-+.TP
-+\fB\-r\fR, \fB\-\-retrys\fR <num>
-+number of trys (default: 1)
-+.TP
-+\fB\-R\fR, \fB\-\-run\-as\-user\fR <user>
-+change to <user> for running, be ware
-+that this can cause problems with handeling
-+SIGHUP properly if that user can't read the
-+config file. also it can't write it's pid file
-+to a root directory
-+.TP
-+\fB\-Q\fR, \fB\-\-run\-as\-euser\fR <user>
-+change to effective <user> for running,
-+this is NOT secure but it does solve the
-+problems with run-as-user and config files and
-+pid files.
-+.TP
-+\fB\-s\fR, \fB\-\-server\fR <server[:port]>
-+the server to connect to
-+.TP
-+\fB\-S\fR, \fB\-\-service\-type\fR <server>
-+the type of service that you are using
-+try one of: null ezip pgpow dhs
-+dyndns dyndns-static dyndns-custom
-+ods tzo easydns easydns-partner
-+gnudip justlinux dyns hn zoneedit
-+heipv6tb
-+.TP
-+\fB\-t\fR, \fB\-\-timeout\fR <sec.millisec>
-+the amount of time to wait on I/O
-+.TP
-+\fB\-T\fR, \fB\-\-connection\-type\fR <num>
-+number sent to TZO as your connection
-+type (default: 1)
-+.TP
-+\fB\-U\fR, \fB\-\-url\fR <url>
-+string to send as the url parameter
-+.TP
-+\fB\-u\fR, \fB\-\-user\fR <user[:passwd]>
-+user ID and password, if either is left blank
-+they will be prompted for
-+.TP
-+\fB\-w\fR, \fB\-\-wildcard\fR
-+set your domain to have a wildcard alias
-+.TP
-+\fB\-z\fR, \fB\-\-partner\fR <partner>
-+specify easyDNS partner (for easydns-partner
-+services)
-+.TP
-+\fB\-\-help\fR
-+display this help and exit
-+.TP
-+\fB\-\-version\fR
-+output version information and exit
-+.TP
-+\fB\-\-credits\fR
-+print the credits and exit
-+.TP
-+\fB\-\-signalhelp\fR
-+print help about signals
-+.br
-+.SH AUTHOR
-+This manual page was written by Sam Hocevar <sam(a)zoy.org> for the Debian
-+GNU/Linux system (but may be used by others).
diff --git a/ez-ipupdate/ez-ipupdate-3.0.11b8-pidfile.patch b/ez-ipupdate/ez-ipupdate-3.0.11b8-pidfile.patch
deleted file mode 100644
index 4860d47..0000000
--- a/ez-ipupdate/ez-ipupdate-3.0.11b8-pidfile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ez-ipupdate.c~ 2003-05-27 17:48:26.000000000 +0300
-+++ ez-ipupdate.c 2003-05-27 19:28:38.000000000 +0300
-@@ -629,7 +629,7 @@
- #endif
- fprintf(stdout, " -e, --execute <command>\tshell command to execute after a successful\n\t\t\t\tupdate\n");
- fprintf(stdout, " -f, --foreground\t\twhen running as a daemon run in the foreground\n");
-- fprintf(stdout, " -F, --pidfile <file>\t\tuse <file> as a pid file\n");
-+ fprintf(stdout, " -F, --pid-file <file>\t\tuse <file> as a pid file\n");
- fprintf(stdout, " -g, --request-uri <uri>\tURI to send updates to\n");
- fprintf(stdout, " -h, --host <host>\t\tstring to send as host parameter\n");
- fprintf(stdout, " -i, --interface <iface>\twhich interface to use\n");
diff --git a/libart/libart_lgpl-2.3.19-upstream_fix-1.patch b/libart/libart_lgpl-2.3.19-upstream_fix-1.patch
deleted file mode 100644
index 68d60ed..0000000
--- a/libart/libart_lgpl-2.3.19-upstream_fix-1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Submitted By: Randy McMurchy <randy_at_linuxfromscratch_dot_org>
-Date: 2007-04-09
-Initial Package Version: 2.3.19
-Upstream Status: In upstream CVS
-Origin: Upstream
-Description: Fixes an error during the installation of KDE-Libs
-
-
-diff -Naur libart_lgpl-2.3.19.orig/art_misc.h libart_lgpl-2.3.19/art_misc.h
---- libart_lgpl-2.3.19.orig/art_misc.h 2007-01-01 18:59:22.000000000 -0500
-+++ libart_lgpl-2.3.19/art_misc.h 2007-03-20 23:04:52.000000000 -0400
-@@ -34,9 +34,15 @@
- #include <libart_lgpl/art_config.h>
- #endif
-
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- void *art_alloc(size_t size);
- void art_free(void *ptr);
- void *art_realloc(void *ptr, size_t size);
-+#ifdef __cplusplus
-+}
-+#endif /* __cplusplus */
-
- /* These aren't, strictly speaking, configuration macros, but they're
- damn handy to have around, and may be worth playing with for
-
diff --git a/libdnet/libdnet-1.12-shrext.patch b/libdnet/libdnet-1.12-shrext.patch
deleted file mode 100644
index 6d8df23..0000000
--- a/libdnet/libdnet-1.12-shrext.patch
+++ /dev/null
@@ -1,327 +0,0 @@
-diff -urN libdnet-1.12/configure libdnet-1.12-patched/configure
---- libdnet-1.12/configure 2007-01-20 05:39:54.000000000 -0600
-+++ libdnet-1.12-patched/configure 2007-02-15 09:06:27.000000000 -0600
-@@ -7053,7 +7053,7 @@
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
-- shrext=".dll"
-+ shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
- archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll${_S_}linknames='
- # The linker will automatically build a .lib file if we build a DLL.
-@@ -7580,7 +7580,7 @@
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
--shrext=".so"
-+shrext_cmds=".so"
- postinstall_cmds=
- postuninstall_cmds=
- finish_cmds=
-@@ -7693,7 +7693,7 @@
-
- cygwin* | mingw* | pw32*)
- version_type=windows
-- shrext=".dll"
-+ shrext_cmds=".dll"
- need_version=no
- need_lib_prefix=no
-
-@@ -7761,7 +7761,7 @@
- soname_spec='${libname}${release}${major}$shared_ext'
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
-- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -7830,7 +7830,7 @@
- need_version=no
- case "$host_cpu" in
- ia64*)
-- shrext='.so'
-+ shrext_cmds='.so'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.so"
- shlibpath_var=LD_LIBRARY_PATH
-@@ -7845,7 +7845,7 @@
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- hppa*64*)
-- shrext='.sl'
-+ shrext_cmds='.sl'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7856,7 +7856,7 @@
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- *)
-- shrext='.sl'
-+ shrext_cmds='.sl'
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=SHLIB_PATH
- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7992,7 +7992,7 @@
-
- os2*)
- libname_spec='$name'
-- shrext=".dll"
-+ shrext_cmds=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
-@@ -9201,7 +9201,7 @@
- libext="$libext"
-
- # Shared library suffix (normally ".so").
--shrext='$shrext'
-+shrext_cmds='$shrext_cmds'
-
- # Executable file suffix (normally "").
- exeext="$exeext"
-@@ -11257,7 +11257,7 @@
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
--shrext=".so"
-+shrext_cmds=".so"
- postinstall_cmds=
- postuninstall_cmds=
- finish_cmds=
-@@ -11370,7 +11370,7 @@
-
- cygwin* | mingw* | pw32*)
- version_type=windows
-- shrext=".dll"
-+ shrext_cmds=".dll"
- need_version=no
- need_lib_prefix=no
-
-@@ -11438,7 +11438,7 @@
- soname_spec='${libname}${release}${major}$shared_ext'
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
-- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -11507,7 +11507,7 @@
- need_version=no
- case "$host_cpu" in
- ia64*)
-- shrext='.so'
-+ shrext_cmds='.so'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.so"
- shlibpath_var=LD_LIBRARY_PATH
-@@ -11522,7 +11522,7 @@
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- hppa*64*)
-- shrext='.sl'
-+ shrext_cmds='.sl'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -11533,7 +11533,7 @@
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- *)
-- shrext='.sl'
-+ shrext_cmds='.sl'
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=SHLIB_PATH
- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -11669,7 +11669,7 @@
-
- os2*)
- libname_spec='$name'
-- shrext=".dll"
-+ shrext_cmds=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
-@@ -12751,7 +12751,7 @@
- libext="$libext"
-
- # Shared library suffix (normally ".so").
--shrext='$shrext'
-+shrext_cmds='$shrext_cmds'
-
- # Executable file suffix (normally "").
- exeext="$exeext"
-@@ -13832,7 +13832,7 @@
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
-- shrext=".dll"
-+ shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
- archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll${_S_}linknames='
- # The linker will automatically build a .lib file if we build a DLL.
-@@ -14359,7 +14359,7 @@
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
--shrext=".so"
-+shrext_cmds=".so"
- postinstall_cmds=
- postuninstall_cmds=
- finish_cmds=
-@@ -14472,7 +14472,7 @@
-
- cygwin* | mingw* | pw32*)
- version_type=windows
-- shrext=".dll"
-+ shrext_cmds=".dll"
- need_version=no
- need_lib_prefix=no
-
-@@ -14540,7 +14540,7 @@
- soname_spec='${libname}${release}${major}$shared_ext'
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
-- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -14609,7 +14609,7 @@
- need_version=no
- case "$host_cpu" in
- ia64*)
-- shrext='.so'
-+ shrext_cmds='.so'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.so"
- shlibpath_var=LD_LIBRARY_PATH
-@@ -14624,7 +14624,7 @@
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- hppa*64*)
-- shrext='.sl'
-+ shrext_cmds='.sl'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14635,7 +14635,7 @@
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- *)
-- shrext='.sl'
-+ shrext_cmds='.sl'
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=SHLIB_PATH
- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14771,7 +14771,7 @@
-
- os2*)
- libname_spec='$name'
-- shrext=".dll"
-+ shrext_cmds=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
-@@ -15047,7 +15047,7 @@
- libext="$libext"
-
- # Shared library suffix (normally ".so").
--shrext='$shrext'
-+shrext_cmds='$shrext_cmds'
-
- # Executable file suffix (normally "").
- exeext="$exeext"
-@@ -16130,7 +16130,7 @@
- # Tell ltmain to make .lib files, not .a files.
- libext=lib
- # Tell ltmain to make .dll files, not .so files.
-- shrext=".dll"
-+ shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
- archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll${_S_}linknames='
- # The linker will automatically build a .lib file if we build a DLL.
-@@ -16657,7 +16657,7 @@
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
--shrext=".so"
-+shrext_cmds=".so"
- postinstall_cmds=
- postuninstall_cmds=
- finish_cmds=
-@@ -16770,7 +16770,7 @@
-
- cygwin* | mingw* | pw32*)
- version_type=windows
-- shrext=".dll"
-+ shrext_cmds=".dll"
- need_version=no
- need_lib_prefix=no
-
-@@ -16838,7 +16838,7 @@
- soname_spec='${libname}${release}${major}$shared_ext'
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
-- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -16907,7 +16907,7 @@
- need_version=no
- case "$host_cpu" in
- ia64*)
-- shrext='.so'
-+ shrext_cmds='.so'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.so"
- shlibpath_var=LD_LIBRARY_PATH
-@@ -16922,7 +16922,7 @@
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- hppa*64*)
-- shrext='.sl'
-+ shrext_cmds='.sl'
- hardcode_into_libs=yes
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -16933,7 +16933,7 @@
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
- ;;
- *)
-- shrext='.sl'
-+ shrext_cmds='.sl'
- dynamic_linker="$host_os dld.sl"
- shlibpath_var=SHLIB_PATH
- shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17069,7 +17069,7 @@
-
- os2*)
- libname_spec='$name'
-- shrext=".dll"
-+ shrext_cmds=".dll"
- need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
- dynamic_linker='OS/2 ld.exe'
-@@ -18151,7 +18151,7 @@
- libext="$libext"
-
- # Shared library suffix (normally ".so").
--shrext='$shrext'
-+shrext_cmds='$shrext_cmds'
-
- # Executable file suffix (normally "").
- exeext="$exeext"
-@@ -18595,7 +18595,7 @@
- libext="$libext"
-
- # Shared library suffix (normally ".so").
--shrext='$shrext'
-+shrext_cmds='$shrext_cmds'
-
- # Executable file suffix (normally "").
- exeext="$exeext"
diff --git a/libtiff/libtiff-3.8.2-CVE-2006-2193.patch b/libtiff/libtiff-3.8.2-CVE-2006-2193.patch
deleted file mode 100644
index ffd81bf..0000000
--- a/libtiff/libtiff-3.8.2-CVE-2006-2193.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tiff-3.8.2/tools/tiff2pdf.c.CVE-2006-2193 2006-03-21 17:42:51.000000000 +0100
-+++ tiff-3.8.2/tools/tiff2pdf.c 2006-09-05 10:47:51.000000000 +0200
-@@ -3668,7 +3668,7 @@
- written += TIFFWriteFile(output, (tdata_t) "(", 1);
- for (i=0;i<len;i++){
- if((pdfstr[i]&0x80) || (pdfstr[i]==127) || (pdfstr[i]<32)){
-- sprintf(buffer, "\\%.3o", pdfstr[i]);
-+ snprintf(buffer, sizeof(buffer), "\\%.3o", (unsigned char) pdfstr[i]);
- written += TIFFWriteFile(output, (tdata_t) buffer, 4);
- } else {
- switch (pdfstr[i]){
diff --git a/libtiff/libtiff-3.8.2-lzw-bugs.patch b/libtiff/libtiff-3.8.2-lzw-bugs.patch
deleted file mode 100644
index 874e5e3..0000000
--- a/libtiff/libtiff-3.8.2-lzw-bugs.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Fixes for CVE-2008-2327
-
-
-diff -Naur tiff-3.8.2.orig/libtiff/tif_lzw.c tiff-3.8.2/libtiff/tif_lzw.c
---- tiff-3.8.2.orig/libtiff/tif_lzw.c 2006-03-21 11:42:50.000000000 -0500
-+++ tiff-3.8.2/libtiff/tif_lzw.c 2008-08-22 16:26:01.000000000 -0400
-@@ -237,6 +237,11 @@
- sp->dec_codetab[code].length = 1;
- sp->dec_codetab[code].next = NULL;
- } while (code--);
-+ /*
-+ * Zero-out the unused entries
-+ */
-+ _TIFFmemset(&sp->dec_codetab[CODE_CLEAR], 0,
-+ (CODE_FIRST-CODE_CLEAR)*sizeof (code_t));
- }
- return (1);
- }
-@@ -408,12 +413,19 @@
- break;
- if (code == CODE_CLEAR) {
- free_entp = sp->dec_codetab + CODE_FIRST;
-+ _TIFFmemset(free_entp, 0, (CSIZE-CODE_FIRST)*sizeof (code_t));
- nbits = BITS_MIN;
- nbitsmask = MAXCODE(BITS_MIN);
- maxcodep = sp->dec_codetab + nbitsmask-1;
- NextCode(tif, sp, bp, code, GetNextCode);
- if (code == CODE_EOI)
- break;
-+ if (code == CODE_CLEAR) {
-+ TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
-+ "LZWDecode: Corrupted LZW table at scanline %d",
-+ tif->tif_row);
-+ return (0);
-+ }
- *op++ = (char)code, occ--;
- oldcodep = sp->dec_codetab + code;
- continue;
-@@ -604,12 +616,19 @@
- break;
- if (code == CODE_CLEAR) {
- free_entp = sp->dec_codetab + CODE_FIRST;
-+ _TIFFmemset(free_entp, 0, (CSIZE-CODE_FIRST)*sizeof (code_t));
- nbits = BITS_MIN;
- nbitsmask = MAXCODE(BITS_MIN);
- maxcodep = sp->dec_codetab + nbitsmask;
- NextCode(tif, sp, bp, code, GetNextCodeCompat);
- if (code == CODE_EOI)
- break;
-+ if (code == CODE_CLEAR) {
-+ TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
-+ "LZWDecodeCompat: Corrupted LZW table at scanline %d",
-+ tif->tif_row);
-+ return (0);
-+ }
- *op++ = code, occ--;
- oldcodep = sp->dec_codetab + code;
- continue;
diff --git a/libtiff/libtiff-3.8.2-mantypo.patch b/libtiff/libtiff-3.8.2-mantypo.patch
deleted file mode 100644
index dd2811e..0000000
--- a/libtiff/libtiff-3.8.2-mantypo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tiff-3.8.2/man/tiffset.1.mantypo 2005-12-02 17:01:33.000000000 +0100
-+++ tiff-3.8.2/man/tiffset.1 2006-09-05 10:10:02.000000000 +0200
-@@ -60,7 +60,7 @@
- "Anonymous":
- .RS
- .nf
--tiffset -s 305 Anonymous a.tif
-+tiffset -s 315 Anonymous a.tif
- .fi
- .RE
- .PP
diff --git a/libtiff/libtiff-3.8.2-ormandy.patch b/libtiff/libtiff-3.8.2-ormandy.patch
deleted file mode 100644
index cb55b03..0000000
--- a/libtiff/libtiff-3.8.2-ormandy.patch
+++ /dev/null
@@ -1,669 +0,0 @@
-diff -ru tiff-3.8.2/libtiff/tif_dir.c tiff-3.8.2-goo/libtiff/tif_dir.c
---- tiff-3.8.2/libtiff/tif_dir.c 2006-03-21 16:42:50.000000000 +0000
-+++ tiff-3.8.2-goo/libtiff/tif_dir.c 2006-07-14 13:52:01.027562000 +0100
-@@ -122,6 +122,7 @@
- {
- static const char module[] = "_TIFFVSetField";
-
-+ const TIFFFieldInfo* fip = _TIFFFindFieldInfo(tif, tag, TIFF_ANY);
- TIFFDirectory* td = &tif->tif_dir;
- int status = 1;
- uint32 v32, i, v;
-@@ -195,10 +196,12 @@
- break;
- case TIFFTAG_ORIENTATION:
- v = va_arg(ap, uint32);
-+ const TIFFFieldInfo* fip;
- if (v < ORIENTATION_TOPLEFT || ORIENTATION_LEFTBOT < v) {
-+ fip = _TIFFFieldWithTag(tif, tag);
- TIFFWarningExt(tif->tif_clientdata, tif->tif_name,
- "Bad value %lu for \"%s\" tag ignored",
-- v, _TIFFFieldWithTag(tif, tag)->field_name);
-+ v, fip ? fip->field_name : "Unknown");
- } else
- td->td_orientation = (uint16) v;
- break;
-@@ -387,11 +390,15 @@
- * happens, for example, when tiffcp is used to convert between
- * compression schemes and codec-specific tags are blindly copied.
- */
-+ /*
-+ * better not dereference fip if it is NULL.
-+ * -- taviso(a)google.com 15 Jun 2006
-+ */
- if(fip == NULL || fip->field_bit != FIELD_CUSTOM) {
- TIFFErrorExt(tif->tif_clientdata, module,
- "%s: Invalid %stag \"%s\" (not supported by codec)",
- tif->tif_name, isPseudoTag(tag) ? "pseudo-" : "",
-- _TIFFFieldWithTag(tif, tag)->field_name);
-+ fip ? fip->field_name : "Unknown");
- status = 0;
- break;
- }
-@@ -468,7 +475,7 @@
- if (fip->field_type == TIFF_ASCII)
- _TIFFsetString((char **)&tv->value, va_arg(ap, char *));
- else {
-- tv->value = _TIFFmalloc(tv_size * tv->count);
-+ tv->value = _TIFFCheckMalloc(tif, tv_size, tv->count, "Tag Value");
- if (!tv->value) {
- status = 0;
- goto end;
-@@ -563,7 +570,7 @@
- }
- }
- if (status) {
-- TIFFSetFieldBit(tif, _TIFFFieldWithTag(tif, tag)->field_bit);
-+ TIFFSetFieldBit(tif, fip->field_bit);
- tif->tif_flags |= TIFF_DIRTYDIRECT;
- }
-
-@@ -572,12 +579,12 @@
- return (status);
- badvalue:
- TIFFErrorExt(tif->tif_clientdata, module, "%s: Bad value %d for \"%s\"",
-- tif->tif_name, v, _TIFFFieldWithTag(tif, tag)->field_name);
-+ tif->tif_name, v, fip ? fip->field_name : "Unknown");
- va_end(ap);
- return (0);
- badvalue32:
- TIFFErrorExt(tif->tif_clientdata, module, "%s: Bad value %ld for \"%s\"",
-- tif->tif_name, v32, _TIFFFieldWithTag(tif, tag)->field_name);
-+ tif->tif_name, v32, fip ? fip->field_name : "Unknown");
- va_end(ap);
- return (0);
- }
-@@ -813,12 +820,16 @@
- * If the client tries to get a tag that is not valid
- * for the image's codec then we'll arrive here.
- */
-+ /*
-+ * dont dereference fip if it's NULL.
-+ * -- taviso(a)google.com 15 Jun 2006
-+ */
- if( fip == NULL || fip->field_bit != FIELD_CUSTOM )
- {
- TIFFErrorExt(tif->tif_clientdata, "_TIFFVGetField",
- "%s: Invalid %stag \"%s\" (not supported by codec)",
- tif->tif_name, isPseudoTag(tag) ? "pseudo-" : "",
-- _TIFFFieldWithTag(tif, tag)->field_name);
-+ fip ? fip->field_name : "Unknown");
- ret_val = 0;
- break;
- }
-diff -ru tiff-3.8.2/libtiff/tif_dirinfo.c tiff-3.8.2-goo/libtiff/tif_dirinfo.c
---- tiff-3.8.2/libtiff/tif_dirinfo.c 2006-02-07 13:51:03.000000000 +0000
-+++ tiff-3.8.2-goo/libtiff/tif_dirinfo.c 2006-07-14 13:52:00.953558000 +0100
-@@ -775,7 +775,8 @@
- TIFFErrorExt(tif->tif_clientdata, "TIFFFieldWithTag",
- "Internal error, unknown tag 0x%x",
- (unsigned int) tag);
-- assert(fip != NULL);
-+ /* assert(fip != NULL); */
-+
- /*NOTREACHED*/
- }
- return (fip);
-@@ -789,7 +790,8 @@
- if (!fip) {
- TIFFErrorExt(tif->tif_clientdata, "TIFFFieldWithName",
- "Internal error, unknown tag %s", field_name);
-- assert(fip != NULL);
-+ /* assert(fip != NULL); */
-+
- /*NOTREACHED*/
- }
- return (fip);
-diff -ru tiff-3.8.2/libtiff/tif_dirread.c tiff-3.8.2-goo/libtiff/tif_dirread.c
---- tiff-3.8.2/libtiff/tif_dirread.c 2006-03-21 16:42:50.000000000 +0000
-+++ tiff-3.8.2-goo/libtiff/tif_dirread.c 2006-07-14 13:52:00.842557000 +0100
-@@ -29,6 +29,9 @@
- *
- * Directory Read Support Routines.
- */
-+
-+#include <limits.h>
-+
- #include "tiffiop.h"
-
- #define IGNORE 0 /* tag placeholder used below */
-@@ -81,6 +84,7 @@
- uint16 dircount;
- toff_t nextdiroff;
- int diroutoforderwarning = 0;
-+ int compressionknown = 0;
- toff_t* new_dirlist;
-
- tif->tif_diroff = tif->tif_nextdiroff;
-@@ -147,13 +151,20 @@
- } else {
- toff_t off = tif->tif_diroff;
-
-- if (off + sizeof (uint16) > tif->tif_size) {
-- TIFFErrorExt(tif->tif_clientdata, module,
-- "%s: Can not read TIFF directory count",
-- tif->tif_name);
-- return (0);
-+ /*
-+ * Check for integer overflow when validating the dir_off, otherwise
-+ * a very high offset may cause an OOB read and crash the client.
-+ * -- taviso(a)google.com, 14 Jun 2006.
-+ */
-+ if (off + sizeof (uint16) > tif->tif_size ||
-+ off > (UINT_MAX - sizeof(uint16))) {
-+ TIFFErrorExt(tif->tif_clientdata, module,
-+ "%s: Can not read TIFF directory count",
-+ tif->tif_name);
-+ return (0);
- } else
-- _TIFFmemcpy(&dircount, tif->tif_base + off, sizeof (uint16));
-+ _TIFFmemcpy(&dircount, tif->tif_base + off,
-+ sizeof (uint16));
- off += sizeof (uint16);
- if (tif->tif_flags & TIFF_SWAB)
- TIFFSwabShort(&dircount);
-@@ -254,6 +265,7 @@
- while (fix < tif->tif_nfields &&
- tif->tif_fieldinfo[fix]->field_tag < dp->tdir_tag)
- fix++;
-+
- if (fix >= tif->tif_nfields ||
- tif->tif_fieldinfo[fix]->field_tag != dp->tdir_tag) {
-
-@@ -264,17 +276,23 @@
- dp->tdir_tag,
- dp->tdir_tag,
- dp->tdir_type);
--
-- TIFFMergeFieldInfo(tif,
-- _TIFFCreateAnonFieldInfo(tif,
-- dp->tdir_tag,
-- (TIFFDataType) dp->tdir_type),
-- 1 );
-+ /*
-+ * creating anonymous fields prior to knowing the compression
-+ * algorithm (ie, when the field info has been merged) could cause
-+ * crashes with pathological directories.
-+ * -- taviso(a)google.com 15 Jun 2006
-+ */
-+ if (compressionknown)
-+ TIFFMergeFieldInfo(tif, _TIFFCreateAnonFieldInfo(tif, dp->tdir_tag,
-+ (TIFFDataType) dp->tdir_type), 1 );
-+ else goto ignore;
-+
- fix = 0;
- while (fix < tif->tif_nfields &&
- tif->tif_fieldinfo[fix]->field_tag < dp->tdir_tag)
- fix++;
- }
-+
- /*
- * Null out old tags that we ignore.
- */
-@@ -326,6 +344,7 @@
- dp->tdir_type, dp->tdir_offset);
- if (!TIFFSetField(tif, dp->tdir_tag, (uint16)v))
- goto bad;
-+ else compressionknown++;
- break;
- /* XXX: workaround for broken TIFFs */
- } else if (dp->tdir_type == TIFF_LONG) {
-@@ -540,6 +559,7 @@
- * Attempt to deal with a missing StripByteCounts tag.
- */
- if (!TIFFFieldSet(tif, FIELD_STRIPBYTECOUNTS)) {
-+ const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, TIFFTAG_STRIPBYTECOUNTS);
- /*
- * Some manufacturers violate the spec by not giving
- * the size of the strips. In this case, assume there
-@@ -556,7 +576,7 @@
- "%s: TIFF directory is missing required "
- "\"%s\" field, calculating from imagelength",
- tif->tif_name,
-- _TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name);
-+ fip ? fip->field_name : "Unknown");
- if (EstimateStripByteCounts(tif, dir, dircount) < 0)
- goto bad;
- /*
-@@ -580,6 +600,7 @@
- } else if (td->td_nstrips == 1
- && td->td_stripoffset[0] != 0
- && BYTECOUNTLOOKSBAD) {
-+ const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, TIFFTAG_STRIPBYTECOUNTS);
- /*
- * XXX: Plexus (and others) sometimes give a value of zero for
- * a tag when they don't know what the correct value is! Try
-@@ -589,13 +610,14 @@
- TIFFWarningExt(tif->tif_clientdata, module,
- "%s: Bogus \"%s\" field, ignoring and calculating from imagelength",
- tif->tif_name,
-- _TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name);
-+ fip ? fip->field_name : "Unknown");
- if(EstimateStripByteCounts(tif, dir, dircount) < 0)
- goto bad;
- } else if (td->td_planarconfig == PLANARCONFIG_CONTIG
- && td->td_nstrips > 2
- && td->td_compression == COMPRESSION_NONE
- && td->td_stripbytecount[0] != td->td_stripbytecount[1]) {
-+ const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, TIFFTAG_STRIPBYTECOUNTS);
- /*
- * XXX: Some vendors fill StripByteCount array with absolutely
- * wrong values (it can be equal to StripOffset array, for
-@@ -604,7 +626,7 @@
- TIFFWarningExt(tif->tif_clientdata, module,
- "%s: Wrong \"%s\" field, ignoring and calculating from imagelength",
- tif->tif_name,
-- _TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name);
-+ fip ? fip->field_name : "Unknown");
- if (EstimateStripByteCounts(tif, dir, dircount) < 0)
- goto bad;
- }
-@@ -870,7 +892,13 @@
-
- register TIFFDirEntry *dp;
- register TIFFDirectory *td = &tif->tif_dir;
-- uint16 i;
-+
-+ /* i is used to iterate over td->td_nstrips, so must be
-+ * at least the same width.
-+ * -- taviso(a)google.com 15 Jun 2006
-+ */
-+
-+ uint32 i;
-
- if (td->td_stripbytecount)
- _TIFFfree(td->td_stripbytecount);
-@@ -947,16 +975,18 @@
- static int
- CheckDirCount(TIFF* tif, TIFFDirEntry* dir, uint32 count)
- {
-+ const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
-+
- if (count > dir->tdir_count) {
- TIFFWarningExt(tif->tif_clientdata, tif->tif_name,
- "incorrect count for field \"%s\" (%lu, expecting %lu); tag ignored",
-- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name,
-+ fip ? fip->field_name : "Unknown",
- dir->tdir_count, count);
- return (0);
- } else if (count < dir->tdir_count) {
- TIFFWarningExt(tif->tif_clientdata, tif->tif_name,
- "incorrect count for field \"%s\" (%lu, expecting %lu); tag trimmed",
-- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name,
-+ fip ? fip->field_name : "Unknown",
- dir->tdir_count, count);
- return (1);
- }
-@@ -970,6 +1000,7 @@
- TIFFFetchData(TIFF* tif, TIFFDirEntry* dir, char* cp)
- {
- int w = TIFFDataWidth((TIFFDataType) dir->tdir_type);
-+ const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
- tsize_t cc = dir->tdir_count * w;
-
- /* Check for overflow. */
-@@ -1013,7 +1044,7 @@
- bad:
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Error fetching data for field \"%s\"",
-- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
-+ fip ? fip->field_name : "Unknown");
- return (tsize_t) 0;
- }
-
-@@ -1039,10 +1070,12 @@
- static int
- cvtRational(TIFF* tif, TIFFDirEntry* dir, uint32 num, uint32 denom, float* rv)
- {
-+ const TIFFFieldInfo* fip;
- if (denom == 0) {
-+ fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "%s: Rational with zero denominator (num = %lu)",
-- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name, num);
-+ fip ? fip->field_name : "Unknown", num);
- return (0);
- } else {
- if (dir->tdir_type == TIFF_RATIONAL)
-@@ -1159,6 +1192,20 @@
- static int
- TIFFFetchShortPair(TIFF* tif, TIFFDirEntry* dir)
- {
-+ /*
-+ * Prevent overflowing the v stack arrays below by performing a sanity
-+ * check on tdir_count, this should never be greater than two.
-+ * -- taviso(a)google.com 14 Jun 2006.
-+ */
-+ if (dir->tdir_count > 2) {
-+ const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
-+ TIFFWarningExt(tif->tif_clientdata, tif->tif_name,
-+ "unexpected count for field \"%s\", %lu, expected 2; ignored.",
-+ fip ? fip->field_name : "Unknown",
-+ dir->tdir_count);
-+ return 0;
-+ }
-+
- switch (dir->tdir_type) {
- case TIFF_BYTE:
- case TIFF_SBYTE:
-@@ -1329,14 +1376,15 @@
- case TIFF_DOUBLE:
- return (TIFFFetchDoubleArray(tif, dir, (double*) v));
- default:
-+ { const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
- /* TIFF_NOTYPE */
- /* TIFF_ASCII */
- /* TIFF_UNDEFINED */
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "cannot read TIFF_ANY type %d for field \"%s\"",
- dir->tdir_type,
-- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
-- return (0);
-+ fip ? fip->field_name : "Unknown");
-+ return (0); }
- }
- return (1);
- }
-@@ -1351,6 +1399,9 @@
- int ok = 0;
- const TIFFFieldInfo* fip = _TIFFFieldWithTag(tif, dp->tdir_tag);
-
-+ if (fip == NULL) {
-+ return (0);
-+ }
- if (dp->tdir_count > 1) { /* array of values */
- char* cp = NULL;
-
-@@ -1493,6 +1544,7 @@
- TIFFFetchPerSampleShorts(TIFF* tif, TIFFDirEntry* dir, uint16* pl)
- {
- uint16 samples = tif->tif_dir.td_samplesperpixel;
-+ const TIFFFieldInfo* fip;
- int status = 0;
-
- if (CheckDirCount(tif, dir, (uint32) samples)) {
-@@ -1510,9 +1562,10 @@
-
- for (i = 1; i < check_count; i++)
- if (v[i] != v[0]) {
-+ fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Cannot handle different per-sample values for field \"%s\"",
-- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
-+ fip ? fip->field_name : "Unknown");
- goto bad;
- }
- *pl = v[0];
-@@ -1534,6 +1587,7 @@
- TIFFFetchPerSampleLongs(TIFF* tif, TIFFDirEntry* dir, uint32* pl)
- {
- uint16 samples = tif->tif_dir.td_samplesperpixel;
-+ const TIFFFieldInfo* fip;
- int status = 0;
-
- if (CheckDirCount(tif, dir, (uint32) samples)) {
-@@ -1551,9 +1605,10 @@
- check_count = samples;
- for (i = 1; i < check_count; i++)
- if (v[i] != v[0]) {
-+ fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Cannot handle different per-sample values for field \"%s\"",
-- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
-+ fip ? fip->field_name : "Unknown");
- goto bad;
- }
- *pl = v[0];
-@@ -1574,6 +1629,7 @@
- TIFFFetchPerSampleAnys(TIFF* tif, TIFFDirEntry* dir, double* pl)
- {
- uint16 samples = tif->tif_dir.td_samplesperpixel;
-+ const TIFFFieldInfo* fip;
- int status = 0;
-
- if (CheckDirCount(tif, dir, (uint32) samples)) {
-@@ -1591,9 +1647,10 @@
-
- for (i = 1; i < check_count; i++)
- if (v[i] != v[0]) {
-+ fip = _TIFFFieldWithTag(tif, dir->tdir_tag);
- TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- "Cannot handle different per-sample values for field \"%s\"",
-- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
-+ fip ? fip->field_name : "Unknown");
- goto bad;
- }
- *pl = v[0];
-diff -ru tiff-3.8.2/libtiff/tif_fax3.c tiff-3.8.2-goo/libtiff/tif_fax3.c
---- tiff-3.8.2/libtiff/tif_fax3.c 2006-03-21 16:42:50.000000000 +0000
-+++ tiff-3.8.2-goo/libtiff/tif_fax3.c 2006-07-14 13:52:00.669557000 +0100
-@@ -1136,6 +1136,7 @@
- Fax3VSetField(TIFF* tif, ttag_t tag, va_list ap)
- {
- Fax3BaseState* sp = Fax3State(tif);
-+ const TIFFFieldInfo* fip;
-
- assert(sp != 0);
- assert(sp->vsetparent != 0);
-@@ -1181,7 +1182,13 @@
- default:
- return (*sp->vsetparent)(tif, tag, ap);
- }
-- TIFFSetFieldBit(tif, _TIFFFieldWithTag(tif, tag)->field_bit);
-+
-+ if ((fip = _TIFFFieldWithTag(tif, tag))) {
-+ TIFFSetFieldBit(tif, fip->field_bit);
-+ } else {
-+ return (0);
-+ }
-+
- tif->tif_flags |= TIFF_DIRTYDIRECT;
- return (1);
- }
-diff -ru tiff-3.8.2/libtiff/tif_jpeg.c tiff-3.8.2-goo/libtiff/tif_jpeg.c
---- tiff-3.8.2/libtiff/tif_jpeg.c 2006-03-21 16:42:50.000000000 +0000
-+++ tiff-3.8.2-goo/libtiff/tif_jpeg.c 2006-07-14 13:52:00.655560000 +0100
-@@ -722,15 +722,31 @@
- segment_width = TIFFhowmany(segment_width, sp->h_sampling);
- segment_height = TIFFhowmany(segment_height, sp->v_sampling);
- }
-- if (sp->cinfo.d.image_width != segment_width ||
-- sp->cinfo.d.image_height != segment_height) {
-+ if (sp->cinfo.d.image_width < segment_width ||
-+ sp->cinfo.d.image_height < segment_height) {
- TIFFWarningExt(tif->tif_clientdata, module,
- "Improper JPEG strip/tile size, expected %dx%d, got %dx%d",
- segment_width,
- segment_height,
- sp->cinfo.d.image_width,
- sp->cinfo.d.image_height);
-+ }
-+
-+ if (sp->cinfo.d.image_width > segment_width ||
-+ sp->cinfo.d.image_height > segment_height) {
-+ /*
-+ * This case could be dangerous, if the strip or tile size has been
-+ * reported as less than the amount of data jpeg will return, some
-+ * potential security issues arise. Catch this case and error out.
-+ * -- taviso(a)google.com 14 Jun 2006
-+ */
-+ TIFFErrorExt(tif->tif_clientdata, module,
-+ "JPEG strip/tile size exceeds expected dimensions,"
-+ "expected %dx%d, got %dx%d", segment_width, segment_height,
-+ sp->cinfo.d.image_width, sp->cinfo.d.image_height);
-+ return (0);
- }
-+
- if (sp->cinfo.d.num_components !=
- (td->td_planarconfig == PLANARCONFIG_CONTIG ?
- td->td_samplesperpixel : 1)) {
-@@ -761,6 +777,22 @@
- sp->cinfo.d.comp_info[0].v_samp_factor,
- sp->h_sampling, sp->v_sampling);
-
-+ /*
-+ * There are potential security issues here for decoders that
-+ * have already allocated buffers based on the expected sampling
-+ * factors. Lets check the sampling factors dont exceed what
-+ * we were expecting.
-+ * -- taviso(a)google.com 14 June 2006
-+ */
-+ if (sp->cinfo.d.comp_info[0].h_samp_factor > sp->h_sampling ||
-+ sp->cinfo.d.comp_info[0].v_samp_factor > sp->v_sampling) {
-+ TIFFErrorExt(tif->tif_clientdata, module,
-+ "Cannot honour JPEG sampling factors that"
-+ " exceed those specified.");
-+ return (0);
-+ }
-+
-+
- /*
- * XXX: Files written by the Intergraph software
- * has different sampling factors stored in the
-@@ -1521,15 +1553,18 @@
- {
- JPEGState *sp = JState(tif);
-
-- assert(sp != 0);
-+ /* assert(sp != 0); */
-
- tif->tif_tagmethods.vgetfield = sp->vgetparent;
- tif->tif_tagmethods.vsetfield = sp->vsetparent;
-
-- if( sp->cinfo_initialized )
-- TIFFjpeg_destroy(sp); /* release libjpeg resources */
-- if (sp->jpegtables) /* tag value */
-- _TIFFfree(sp->jpegtables);
-+ if (sp != NULL) {
-+ if( sp->cinfo_initialized )
-+ TIFFjpeg_destroy(sp); /* release libjpeg resources */
-+ if (sp->jpegtables) /* tag value */
-+ _TIFFfree(sp->jpegtables);
-+ }
-+
- _TIFFfree(tif->tif_data); /* release local state */
- tif->tif_data = NULL;
-
-@@ -1541,6 +1576,7 @@
- {
- JPEGState* sp = JState(tif);
- TIFFDirectory* td = &tif->tif_dir;
-+ const TIFFFieldInfo* fip;
- uint32 v32;
-
- assert(sp != NULL);
-@@ -1606,7 +1642,13 @@
- default:
- return (*sp->vsetparent)(tif, tag, ap);
- }
-- TIFFSetFieldBit(tif, _TIFFFieldWithTag(tif, tag)->field_bit);
-+
-+ if ((fip = _TIFFFieldWithTag(tif, tag))) {
-+ TIFFSetFieldBit(tif, fip->field_bit);
-+ } else {
-+ return (0);
-+ }
-+
- tif->tif_flags |= TIFF_DIRTYDIRECT;
- return (1);
- }
-@@ -1726,7 +1768,11 @@
- {
- JPEGState* sp = JState(tif);
-
-- assert(sp != NULL);
-+ /* assert(sp != NULL); */
-+ if (sp == NULL) {
-+ TIFFWarningExt(tif->tif_clientdata, "JPEGPrintDir", "Unknown JPEGState");
-+ return;
-+ }
-
- (void) flags;
- if (TIFFFieldSet(tif,FIELD_JPEGTABLES))
-diff -ru tiff-3.8.2/libtiff/tif_next.c tiff-3.8.2-goo/libtiff/tif_next.c
---- tiff-3.8.2/libtiff/tif_next.c 2005-12-21 12:33:56.000000000 +0000
-+++ tiff-3.8.2-goo/libtiff/tif_next.c 2006-07-14 13:52:00.556567000 +0100
-@@ -105,11 +105,16 @@
- * as codes of the form <color><npixels>
- * until we've filled the scanline.
- */
-+ /*
-+ * Ensure the run does not exceed the scanline
-+ * bounds, potentially resulting in a security issue.
-+ * -- taviso(a)google.com 14 Jun 2006.
-+ */
- op = row;
- for (;;) {
- grey = (n>>6) & 0x3;
- n &= 0x3f;
-- while (n-- > 0)
-+ while (n-- > 0 && npixels < imagewidth)
- SETPIXEL(op, grey);
- if (npixels >= (int) imagewidth)
- break;
-diff -ru tiff-3.8.2/libtiff/tif_pixarlog.c tiff-3.8.2-goo/libtiff/tif_pixarlog.c
---- tiff-3.8.2/libtiff/tif_pixarlog.c 2006-03-21 16:42:50.000000000 +0000
-+++ tiff-3.8.2-goo/libtiff/tif_pixarlog.c 2006-07-14 13:52:00.483557000 +0100
-@@ -768,7 +768,19 @@
- if (tif->tif_flags & TIFF_SWAB)
- TIFFSwabArrayOfShort(up, nsamples);
-
-- for (i = 0; i < nsamples; i += llen, up += llen) {
-+ /*
-+ * if llen is not an exact multiple of nsamples, the decode operation
-+ * may overflow the output buffer, so truncate it enough to prevent that
-+ * but still salvage as much data as possible.
-+ * -- taviso(a)google.com 14th June 2006
-+ */
-+ if (nsamples % llen)
-+ TIFFWarningExt(tif->tif_clientdata, module,
-+ "%s: stride %lu is not a multiple of sample count, "
-+ "%lu, data truncated.", tif->tif_name, llen, nsamples);
-+
-+
-+ for (i = 0; i < nsamples - (nsamples % llen); i += llen, up += llen) {
- switch (sp->user_datafmt) {
- case PIXARLOGDATAFMT_FLOAT:
- horizontalAccumulateF(up, llen, sp->stride,
-diff -ru tiff-3.8.2/libtiff/tif_read.c tiff-3.8.2-goo/libtiff/tif_read.c
---- tiff-3.8.2/libtiff/tif_read.c 2005-12-21 12:33:56.000000000 +0000
-+++ tiff-3.8.2-goo/libtiff/tif_read.c 2006-07-14 13:52:00.467568000 +0100
-@@ -31,6 +31,8 @@
- #include "tiffiop.h"
- #include <stdio.h>
-
-+#include <limits.h>
-+
- int TIFFFillStrip(TIFF*, tstrip_t);
- int TIFFFillTile(TIFF*, ttile_t);
- static int TIFFStartStrip(TIFF*, tstrip_t);
-@@ -272,7 +274,13 @@
- if ((tif->tif_flags & TIFF_MYBUFFER) && tif->tif_rawdata)
- _TIFFfree(tif->tif_rawdata);
- tif->tif_flags &= ~TIFF_MYBUFFER;
-- if ( td->td_stripoffset[strip] + bytecount > tif->tif_size) {
-+ /*
-+ * This sanity check could potentially overflow, causing an OOB read.
-+ * verify that offset + bytecount is > offset.
-+ * -- taviso(a)google.com 14 Jun 2006
-+ */
-+ if ( td->td_stripoffset[strip] + bytecount > tif->tif_size ||
-+ bytecount > (UINT_MAX - td->td_stripoffset[strip])) {
- /*
- * This error message might seem strange, but it's
- * what would happen if a read were done instead.
-@@ -470,7 +478,13 @@
- if ((tif->tif_flags & TIFF_MYBUFFER) && tif->tif_rawdata)
- _TIFFfree(tif->tif_rawdata);
- tif->tif_flags &= ~TIFF_MYBUFFER;
-- if ( td->td_stripoffset[tile] + bytecount > tif->tif_size) {
-+ /*
-+ * We must check this calculation doesnt overflow, potentially
-+ * causing an OOB read.
-+ * -- taviso(a)google.com 15 Jun 2006
-+ */
-+ if (td->td_stripoffset[tile] + bytecount > tif->tif_size ||
-+ bytecount > (UINT_MAX - td->td_stripoffset[tile])) {
- tif->tif_curtile = NOTILE;
- return (0);
- }
diff --git a/libtiff/libtiff-3.8.2-tiffsplit-overflow.patch b/libtiff/libtiff-3.8.2-tiffsplit-overflow.patch
deleted file mode 100644
index 36a613f..0000000
--- a/libtiff/libtiff-3.8.2-tiffsplit-overflow.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- tiff-3.8.2/tools/tiffsplit.c.overflow 2006-05-25 22:37:11.000000000 -0400
-+++ tiff-3.8.2/tools/tiffsplit.c 2006-05-25 22:42:42.000000000 -0400
-@@ -60,14 +60,16 @@
- fprintf(stderr, "usage: tiffsplit input.tif [prefix]\n");
- return (-3);
- }
-- if (argc > 2)
-- strcpy(fname, argv[2]);
-+ if (argc > 2) {
-+ strncpy(fname, argv[2], 1024);
-+ fname[1024] = '\0';
-+ }
- in = TIFFOpen(argv[1], "r");
- if (in != NULL) {
- do {
- char path[1024+1];
- newfilename();
-- strcpy(path, fname);
-+ strncpy(path, fname, 1020);
- strcat(path, ".tif");
- out = TIFFOpen(path, TIFFIsBigEndian(in)?"wb":"wl");
- if (out == NULL)
diff --git a/reiser4progs/reiser4progs-1.0.7-bad_elif.patch b/reiser4progs/reiser4progs-1.0.7-bad_elif.patch
deleted file mode 100644
index dd7cb20..0000000
--- a/reiser4progs/reiser4progs-1.0.7-bad_elif.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur reiser4progs-1.0.7.org/plugin/node/node40/node40.c reiser4progs-1.0.7/plugin/node/node40/node40.c
---- reiser4progs-1.0.7.org/plugin/node/node40/node40.c 2009-01-08 22:34:27.000000000 +0100
-+++ reiser4progs-1.0.7/plugin/node/node40/node40.c 2009-04-28 14:15:04.000000000 +0200
-@@ -996,7 +996,7 @@
- func = cb_comp_key3;
- #elif defined(ENABLE_LARGE_KEYS)
- func = cb_comp_key4;
--#elif
-+#else
- func = NULL;
- #endif
-
hooks/post-receive
--
This git reposit keeps all the patches of the project.
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5ab7c89392bd2758e42484ee9528540f04d7d3f9
by git＠ipfire.org 27 Feb '10
by git＠ipfire.org 27 Feb '10
27 Feb '10
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 5ab7c89392bd2758e42484ee9528540f04d7d3f9 (commit)
from f44dda3ca48086b66d56ce3f0e3c8357249180c3 (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 5ab7c89392bd2758e42484ee9528540f04d7d3f9
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Feb 27 23:48:50 2010 +0100
Updated kernel config and rootfiles.
-----------------------------------------------------------------------
Summary of changes:
config/kernel/kernel.config.i586-ipfire | 111 ++++++++++++---
config/kernel/kernel.config.i586-ipfire-xen | 142 ++++++++++++++-----
config/rootfiles/common/linux | 195 +++-----------------------
config/rootfiles/common/uClibc | 55 ++++----
config/rootfiles/packages/linux-xen | 204 ++++++++++++++++++++++++++-
5 files changed, 449 insertions(+), 258 deletions(-)
Difference in files:
diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index c3a51a0..28dd0c6 100644
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.32.8
-# Sun Feb 14 22:42:41 2010
+# Linux kernel version: 2.6.32.9-ipfire
+# Sat Feb 27 16:19:37 2010
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -92,7 +92,7 @@ CONFIG_RCU_FANOUT=32
# CONFIG_RCU_FANOUT_EXACT is not set
# CONFIG_TREE_RCU_TRACE is not set
# CONFIG_IKCONFIG is not set
-CONFIG_LOG_BUF_SHIFT=15
+CONFIG_LOG_BUF_SHIFT=17
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
# CONFIG_GROUP_SCHED is not set
# CONFIG_CGROUPS is not set
@@ -182,19 +182,20 @@ CONFIG_IOSCHED_NOOP=y
CONFIG_IOSCHED_AS=y
CONFIG_IOSCHED_DEADLINE=y
CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_AS is not set
# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
+CONFIG_DEFAULT_CFQ=y
# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_DEFAULT_IOSCHED="cfq"
CONFIG_PREEMPT_NOTIFIERS=y
CONFIG_FREEZER=y
#
# Processor type and features
#
+CONFIG_TICK_ONESHOT=y
# CONFIG_NO_HZ is not set
-# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_HIGH_RES_TIMERS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
CONFIG_SMP=y
CONFIG_SPARSE_IRQ=y
@@ -340,7 +341,7 @@ CONFIG_HZ_100=y
# CONFIG_HZ_300 is not set
# CONFIG_HZ_1000 is not set
CONFIG_HZ=100
-# CONFIG_SCHED_HRTICK is not set
+CONFIG_SCHED_HRTICK=y
# CONFIG_KEXEC is not set
# CONFIG_CRASH_DUMP is not set
CONFIG_PHYSICAL_START=0x1000000
@@ -1058,7 +1059,7 @@ CONFIG_PARPORT_AX88796=m
CONFIG_PARPORT_1284=y
CONFIG_PARPORT_NOT_PC=y
CONFIG_PNP=y
-CONFIG_PNP_DEBUG_MESSAGES=y
+# CONFIG_PNP_DEBUG_MESSAGES is not set
#
# Protocols
@@ -1719,7 +1720,7 @@ CONFIG_RTL8180=m
CONFIG_RTL8187=m
CONFIG_RTL8187_LEDS=y
CONFIG_ADM8211=m
-CONFIG_MAC80211_HWSIM=m
+# CONFIG_MAC80211_HWSIM is not set
CONFIG_MWL8K=m
CONFIG_P54_COMMON=m
CONFIG_P54_USB=m
@@ -2933,6 +2934,7 @@ CONFIG_SND_MIXER_OSS=m
CONFIG_SND_PCM_OSS=m
CONFIG_SND_PCM_OSS_PLUGINS=y
CONFIG_SND_SEQUENCER_OSS=y
+# CONFIG_SND_HRTIMER is not set
# CONFIG_SND_DYNAMIC_MINORS is not set
# CONFIG_SND_SUPPORT_OLD_API is not set
CONFIG_SND_VERBOSE_PROCFS=y
@@ -2945,6 +2947,7 @@ CONFIG_SND_DMA_SGBUF=y
# CONFIG_SND_SBAWE_SEQ is not set
# CONFIG_SND_EMU10K1_SEQ is not set
CONFIG_SND_DRIVERS=y
+# CONFIG_SND_PCSP is not set
CONFIG_SND_DUMMY=m
# CONFIG_SND_VIRMIDI is not set
# CONFIG_SND_MTPAV is not set
@@ -3453,7 +3456,67 @@ CONFIG_UIO_PCI_GENERIC=m
#
# TI VLYNQ
#
-# CONFIG_STAGING is not set
+CONFIG_STAGING=y
+# CONFIG_STAGING_EXCLUDE_BUILD is not set
+CONFIG_ET131X=m
+# CONFIG_ET131X_DEBUG is not set
+CONFIG_SLICOSS=m
+# CONFIG_VIDEO_GO7007 is not set
+# CONFIG_VIDEO_CX25821 is not set
+# CONFIG_USB_IP_COMMON is not set
+# CONFIG_W35UND is not set
+# CONFIG_PRISM2_USB is not set
+# CONFIG_ECHO is not set
+# CONFIG_POCH is not set
+# CONFIG_OTUS is not set
+# CONFIG_RT2860 is not set
+# CONFIG_RT2870 is not set
+# CONFIG_RT3090 is not set
+# CONFIG_COMEDI is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_PANEL is not set
+# CONFIG_ALTERA_PCIE_CHDMA is not set
+# CONFIG_RTL8187SE is not set
+# CONFIG_RTL8192SU is not set
+# CONFIG_RTL8192E is not set
+# CONFIG_INPUT_MIMIO is not set
+# CONFIG_TRANZPORT is not set
+
+#
+# Android
+#
+
+#
+# Qualcomm MSM Camera And Video
+#
+
+#
+# Camera Sensor Selection
+#
+# CONFIG_INPUT_GPIO is not set
+# CONFIG_DST is not set
+# CONFIG_POHMELFS is not set
+# CONFIG_B3DFG is not set
+CONFIG_IDE_PHISON=m
+# CONFIG_PLAN9AUTH is not set
+# CONFIG_LINE6_USB is not set
+# CONFIG_DRM_RADEON_KMS is not set
+# CONFIG_USB_SERIAL_QUATECH2 is not set
+# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
+# CONFIG_VT6655 is not set
+# CONFIG_VT6656 is not set
+# CONFIG_FB_UDL is not set
+CONFIG_HYPERV=m
+CONFIG_HYPERV_STORAGE=m
+CONFIG_HYPERV_BLOCK=m
+CONFIG_HYPERV_NET=m
+# CONFIG_VME_BUS is not set
+
+#
+# RAR Register Driver
+#
+# CONFIG_RAR_REGISTER is not set
+# CONFIG_IIO is not set
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ASUS_LAPTOP=m
@@ -3539,7 +3602,12 @@ CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
-# CONFIG_QUOTA is not set
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+CONFIG_PRINT_QUOTA_WARNING=y
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
CONFIG_QUOTACTL=y
CONFIG_AUTOFS_FS=m
CONFIG_AUTOFS4_FS=m
@@ -3554,14 +3622,16 @@ CONFIG_FSCACHE=m
# CONFIG_FSCACHE_HISTOGRAM is not set
# CONFIG_FSCACHE_DEBUG is not set
# CONFIG_FSCACHE_OBJECT_LIST is not set
-# CONFIG_CACHEFILES is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
#
# CD-ROM/DVD Filesystems
#
CONFIG_ISO9660_FS=m
CONFIG_JOLIET=y
-# CONFIG_ZISOFS is not set
+CONFIG_ZISOFS=y
CONFIG_UDF_FS=m
CONFIG_UDF_NLS=y
@@ -3630,17 +3700,19 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
CONFIG_NETWORK_FILESYSTEMS=y
CONFIG_NFS_FS=m
CONFIG_NFS_V3=y
-# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=y
# CONFIG_NFS_V4_1 is not set
# CONFIG_NFS_FSCACHE is not set
CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V3_ACL is not set
-# CONFIG_NFSD_V4 is not set
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
CONFIG_EXPORTFS=m
+CONFIG_NFS_ACL_SUPPORT=m
CONFIG_NFS_COMMON=y
CONFIG_SUNRPC=m
CONFIG_SUNRPC_GSS=m
@@ -3654,7 +3726,7 @@ CONFIG_CIFS_STATS2=y
# CONFIG_CIFS_WEAK_PW_HASH is not set
# CONFIG_CIFS_UPCALL is not set
CONFIG_CIFS_XATTR=y
-# CONFIG_CIFS_POSIX is not set
+CONFIG_CIFS_POSIX=y
# CONFIG_CIFS_DEBUG2 is not set
# CONFIG_CIFS_DFS_UPCALL is not set
# CONFIG_CIFS_EXPERIMENTAL is not set
@@ -3676,7 +3748,8 @@ CONFIG_MSDOS_PARTITION=y
# CONFIG_MINIX_SUBPARTITION is not set
# CONFIG_SOLARIS_X86_PARTITION is not set
# CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_LDM_PARTITION is not set
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
# CONFIG_SGI_PARTITION is not set
# CONFIG_ULTRIX_PARTITION is not set
# CONFIG_SUN_PARTITION is not set
diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kernel.config.i586-ipfire-xen
index 9dda22b..c3981d3 100644
--- a/config/kernel/kernel.config.i586-ipfire-xen
+++ b/config/kernel/kernel.config.i586-ipfire-xen
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.32.8
-# Wed Feb 17 20:31:37 2010
+# Linux kernel version: 2.6.32.9-ipfire-xen
+# Sat Feb 27 17:42:54 2010
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -87,7 +87,7 @@ CONFIG_RCU_FANOUT=32
# CONFIG_RCU_FANOUT_EXACT is not set
# CONFIG_TREE_RCU_TRACE is not set
# CONFIG_IKCONFIG is not set
-CONFIG_LOG_BUF_SHIFT=15
+CONFIG_LOG_BUF_SHIFT=17
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
# CONFIG_GROUP_SCHED is not set
# CONFIG_CGROUPS is not set
@@ -176,18 +176,18 @@ CONFIG_IOSCHED_NOOP=y
CONFIG_IOSCHED_AS=y
CONFIG_IOSCHED_DEADLINE=y
CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_AS is not set
# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
+CONFIG_DEFAULT_CFQ=y
# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_DEFAULT_IOSCHED="cfq"
CONFIG_FREEZER=y
#
# Processor type and features
#
CONFIG_SMP=y
-# CONFIG_SPARSE_IRQ is not set
+CONFIG_SPARSE_IRQ=y
CONFIG_X86_MPPARSE=y
CONFIG_X86_XEN=y
CONFIG_SCHED_OMIT_FRAME_POINTER=y
@@ -242,7 +242,7 @@ CONFIG_DMI=y
CONFIG_SWIOTLB=y
CONFIG_IOMMU_HELPER=y
# CONFIG_IOMMU_API is not set
-CONFIG_NR_CPUS=4
+CONFIG_NR_CPUS=8
CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PREEMPT is not set
@@ -314,7 +314,7 @@ CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
# CONFIG_ACPI_PROCFS is not set
CONFIG_ACPI_PROCFS_POWER=y
-# CONFIG_ACPI_POWER_METER is not set
+CONFIG_ACPI_POWER_METER=m
CONFIG_ACPI_SYSFS_POWER=y
CONFIG_ACPI_PROC_EVENT=y
CONFIG_ACPI_AC=m
@@ -325,7 +325,7 @@ CONFIG_ACPI_FAN=m
CONFIG_ACPI_DOCK=y
CONFIG_ACPI_PROCESSOR=m
CONFIG_ACPI_HOTPLUG_CPU=y
-# CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
CONFIG_ACPI_THERMAL=m
CONFIG_ACPI_CUSTOM_DSDT_FILE=""
# CONFIG_ACPI_CUSTOM_DSDT is not set
@@ -369,7 +369,7 @@ CONFIG_PCI_GUESTDEV=y
CONFIG_PCI_IOMULTI=y
CONFIG_PCI_RESERVE=y
CONFIG_PCI_STUB=m
-# CONFIG_PCI_IOV is not set
+CONFIG_PCI_IOV=y
CONFIG_ISA_DMA_API=y
CONFIG_SCx200=m
CONFIG_SCx200HR_TIMER=m
@@ -546,7 +546,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m
CONFIG_NETFILTER_XT_MATCH_RATEEST=m
CONFIG_NETFILTER_XT_MATCH_REALM=m
CONFIG_NETFILTER_XT_MATCH_RECENT=m
-# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
+CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT=y
CONFIG_NETFILTER_XT_MATCH_SCTP=m
CONFIG_NETFILTER_XT_MATCH_SOCKET=m
CONFIG_NETFILTER_XT_MATCH_STATE=m
@@ -626,7 +626,9 @@ CONFIG_BRIDGE_EBT_ULOG=m
CONFIG_BRIDGE_EBT_NFLOG=m
# CONFIG_IP_DCCP is not set
# CONFIG_IP_SCTP is not set
-# CONFIG_RDS is not set
+CONFIG_RDS=m
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
# CONFIG_TIPC is not set
CONFIG_ATM=m
CONFIG_ATM_CLIP=m
@@ -637,7 +639,15 @@ CONFIG_ATM_BR2684=m
CONFIG_STP=m
CONFIG_GARP=m
CONFIG_BRIDGE=m
-# CONFIG_NET_DSA is not set
+CONFIG_NET_DSA=y
+CONFIG_NET_DSA_TAG_DSA=y
+CONFIG_NET_DSA_TAG_EDSA=y
+CONFIG_NET_DSA_TAG_TRAILER=y
+CONFIG_NET_DSA_MV88E6XXX=y
+CONFIG_NET_DSA_MV88E6060=y
+CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
+CONFIG_NET_DSA_MV88E6131=y
+CONFIG_NET_DSA_MV88E6123_61_65=y
CONFIG_VLAN_8021Q=m
CONFIG_VLAN_8021Q_GVRP=y
# CONFIG_DECNET is not set
@@ -703,7 +713,7 @@ CONFIG_NET_ACT_IPT=m
CONFIG_NET_ACT_NAT=m
CONFIG_NET_ACT_PEDIT=m
# CONFIG_NET_ACT_SIMP is not set
-# CONFIG_NET_ACT_SKBEDIT is not set
+CONFIG_NET_ACT_SKBEDIT=m
CONFIG_NET_CLS_IND=y
CONFIG_NET_SCH_FIFO=y
# CONFIG_DCB is not set
@@ -844,7 +854,7 @@ CONFIG_SYS_HYPERVISOR=y
CONFIG_CONNECTOR=m
CONFIG_MTD=m
# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_TESTS is not set
+CONFIG_MTD_TESTS=m
CONFIG_MTD_CONCAT=m
CONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_REDBOOT_PARTS is not set
@@ -1103,7 +1113,7 @@ CONFIG_SCSI_SAS_LIBSAS_DEBUG=y
CONFIG_SCSI_SRP_ATTRS=m
CONFIG_SCSI_LOWLEVEL=y
CONFIG_ISCSI_TCP=m
-# CONFIG_SCSI_CXGB3_ISCSI is not set
+CONFIG_SCSI_CXGB3_ISCSI=m
CONFIG_SCSI_BNX2_ISCSI=m
CONFIG_BE2ISCSI=m
CONFIG_BLK_DEV_3W_XXXX_RAID=m
@@ -1147,7 +1157,7 @@ CONFIG_SCSI_BUSLOGIC=m
CONFIG_SCSI_FLASHPOINT=y
CONFIG_LIBFC=m
CONFIG_LIBFCOE=m
-# CONFIG_FCOE is not set
+CONFIG_FCOE=m
CONFIG_FCOE_FNIC=m
CONFIG_SCSI_DMX3191D=m
CONFIG_SCSI_EATA=m
@@ -1346,7 +1356,7 @@ CONFIG_TUN=m
CONFIG_VETH=m
CONFIG_NET_SB1000=m
# CONFIG_ARCNET is not set
-CONFIG_PHYLIB=m
+CONFIG_PHYLIB=y
#
# MII PHY device drivers
@@ -1364,6 +1374,7 @@ CONFIG_REALTEK_PHY=m
CONFIG_NATIONAL_PHY=m
CONFIG_STE10XP=m
CONFIG_LSI_ET1011C_PHY=m
+# CONFIG_FIXED_PHY is not set
CONFIG_MDIO_BITBANG=m
CONFIG_NET_ETHERNET=y
CONFIG_MII=m
@@ -1556,8 +1567,7 @@ CONFIG_B43_PIO=y
CONFIG_B43_PHY_LP=y
CONFIG_B43_LEDS=y
CONFIG_B43_HWRNG=y
-CONFIG_B43_DEBUG=y
-# CONFIG_B43_FORCE_PIO is not set
+# CONFIG_B43_DEBUG is not set
CONFIG_B43LEGACY=m
CONFIG_B43LEGACY_PCI_AUTOSELECT=y
CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
@@ -1755,9 +1765,9 @@ CONFIG_ISDN_DRV_HISAX=m
#
CONFIG_HISAX_EURO=y
CONFIG_DE_AOC=y
-CONFIG_HISAX_NO_SENDCOMPLETE=y
-CONFIG_HISAX_NO_LLC=y
-CONFIG_HISAX_NO_KEYPAD=y
+# CONFIG_HISAX_NO_SENDCOMPLETE is not set
+# CONFIG_HISAX_NO_LLC is not set
+# CONFIG_HISAX_NO_KEYPAD is not set
CONFIG_HISAX_1TR6=y
CONFIG_HISAX_NI1=y
CONFIG_HISAX_MAX_CARDS=8
@@ -1827,8 +1837,8 @@ CONFIG_ISDN_DRV_AVMB1_T1PCI=m
CONFIG_ISDN_DRV_AVMB1_C4=m
CONFIG_CAPI_EICON=y
CONFIG_ISDN_DIVAS=m
-# CONFIG_ISDN_DIVAS_BRIPCI is not set
-# CONFIG_ISDN_DIVAS_PRIPCI is not set
+CONFIG_ISDN_DIVAS_BRIPCI=y
+CONFIG_ISDN_DIVAS_PRIPCI=y
CONFIG_ISDN_DIVAS_DIVACAPI=m
CONFIG_ISDN_DIVAS_USERIDI=m
CONFIG_ISDN_DIVAS_MAINT=m
@@ -1843,7 +1853,7 @@ CONFIG_GIGASET_M101=m
# Input device support
#
CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
+CONFIG_INPUT_FF_MEMLESS=m
CONFIG_INPUT_POLLDEV=m
#
@@ -2263,7 +2273,7 @@ CONFIG_MEDIA_SUPPORT=m
CONFIG_VIDEO_DEV=m
CONFIG_VIDEO_V4L2_COMMON=m
# CONFIG_VIDEO_ALLOW_V4L1 is not set
-# CONFIG_VIDEO_V4L1_COMPAT is not set
+CONFIG_VIDEO_V4L1_COMPAT=y
CONFIG_DVB_CORE=m
CONFIG_VIDEO_MEDIA=m
@@ -3221,7 +3231,6 @@ CONFIG_XEN_BLKBACK_PAGEMAP=y
CONFIG_XEN_NETDEV_BACKEND=y
CONFIG_XEN_NETDEV_TX_SHIFT=8
# CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set
-CONFIG_XEN_NETDEV_ACCEL_SFC_BACKEND=m
CONFIG_XEN_NETDEV_LOOPBACK=y
CONFIG_XEN_PCIDEV_BACKEND=y
CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
@@ -3229,7 +3238,7 @@ CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
# CONFIG_XEN_PCIDEV_BACKEND_SLOT is not set
# CONFIG_XEN_PCIDEV_BACKEND_CONTROLLER is not set
CONFIG_XEN_PCIDEV_BE_DEBUG=y
-CONFIG_XEN_TPMDEV_BACKEND=y
+# CONFIG_XEN_TPMDEV_BACKEND is not set
CONFIG_XEN_SCSI_BACKEND=m
CONFIG_XEN_USB_BACKEND=m
CONFIG_XEN_BLKDEV_FRONTEND=y
@@ -3261,7 +3270,63 @@ CONFIG_XEN_SMPBOOT=y
CONFIG_XEN_DEVMEM=y
CONFIG_XEN_BALLOON=y
CONFIG_XEN_SCRUB_PAGES=y
-# CONFIG_STAGING is not set
+CONFIG_STAGING=y
+# CONFIG_STAGING_EXCLUDE_BUILD is not set
+CONFIG_ET131X=m
+# CONFIG_ET131X_DEBUG is not set
+CONFIG_SLICOSS=m
+# CONFIG_VIDEO_GO7007 is not set
+# CONFIG_VIDEO_CX25821 is not set
+# CONFIG_USB_IP_COMMON is not set
+# CONFIG_W35UND is not set
+# CONFIG_PRISM2_USB is not set
+# CONFIG_ECHO is not set
+# CONFIG_POCH is not set
+# CONFIG_OTUS is not set
+# CONFIG_RT2860 is not set
+# CONFIG_RT2870 is not set
+# CONFIG_RT3090 is not set
+# CONFIG_COMEDI is not set
+# CONFIG_ASUS_OLED is not set
+# CONFIG_PANEL is not set
+# CONFIG_ALTERA_PCIE_CHDMA is not set
+# CONFIG_RTL8187SE is not set
+# CONFIG_RTL8192SU is not set
+# CONFIG_RTL8192E is not set
+# CONFIG_INPUT_MIMIO is not set
+# CONFIG_TRANZPORT is not set
+
+#
+# Android
+#
+
+#
+# Qualcomm MSM Camera And Video
+#
+
+#
+# Camera Sensor Selection
+#
+# CONFIG_INPUT_GPIO is not set
+# CONFIG_DST is not set
+# CONFIG_POHMELFS is not set
+# CONFIG_B3DFG is not set
+# CONFIG_IDE_PHISON is not set
+# CONFIG_PLAN9AUTH is not set
+# CONFIG_LINE6_USB is not set
+# CONFIG_DRM_RADEON_KMS is not set
+# CONFIG_USB_SERIAL_QUATECH2 is not set
+# CONFIG_USB_SERIAL_QUATECH_USB2 is not set
+# CONFIG_VT6655 is not set
+# CONFIG_VT6656 is not set
+# CONFIG_FB_UDL is not set
+# CONFIG_VME_BUS is not set
+
+#
+# RAR Register Driver
+#
+# CONFIG_RAR_REGISTER is not set
+# CONFIG_IIO is not set
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ASUS_LAPTOP=m
@@ -3374,7 +3439,7 @@ CONFIG_CUSE=m
#
CONFIG_ISO9660_FS=m
CONFIG_JOLIET=y
-# CONFIG_ZISOFS is not set
+CONFIG_ZISOFS=y
CONFIG_UDF_FS=m
CONFIG_UDF_NLS=y
@@ -3442,17 +3507,19 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
CONFIG_NETWORK_FILESYSTEMS=y
CONFIG_NFS_FS=m
CONFIG_NFS_V3=y
-# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=y
# CONFIG_NFS_SWAP is not set
# CONFIG_NFS_V4_1 is not set
CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V3_ACL is not set
+CONFIG_NFSD_V3_ACL=y
# CONFIG_NFSD_V4 is not set
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
CONFIG_EXPORTFS=m
+CONFIG_NFS_ACL_SUPPORT=m
CONFIG_NFS_COMMON=y
CONFIG_SUNRPC=m
CONFIG_SUNRPC_GSS=m
@@ -3467,7 +3534,7 @@ CONFIG_CIFS_STATS2=y
# CONFIG_CIFS_WEAK_PW_HASH is not set
# CONFIG_CIFS_UPCALL is not set
CONFIG_CIFS_XATTR=y
-# CONFIG_CIFS_POSIX is not set
+CONFIG_CIFS_POSIX=y
# CONFIG_CIFS_DEBUG2 is not set
# CONFIG_CIFS_DFS_UPCALL is not set
# CONFIG_CIFS_EXPERIMENTAL is not set
@@ -3489,7 +3556,8 @@ CONFIG_MSDOS_PARTITION=y
# CONFIG_MINIX_SUBPARTITION is not set
# CONFIG_SOLARIS_X86_PARTITION is not set
# CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_LDM_PARTITION is not set
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
# CONFIG_SGI_PARTITION is not set
# CONFIG_ULTRIX_PARTITION is not set
# CONFIG_SUN_PARTITION is not set
@@ -3556,7 +3624,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
CONFIG_DEBUG_MEMORY_INIT=y
CONFIG_ARCH_WANT_FRAME_POINTERS=y
CONFIG_FRAME_POINTER=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+CONFIG_RCU_CPU_STALL_DETECTOR=y
# CONFIG_LATENCYTOP is not set
# CONFIG_SYSCTL_SYSCALL_CHECK is not set
CONFIG_USER_STACKTRACE_SUPPORT=y
diff --git a/config/rootfiles/common/linux b/config/rootfiles/common/linux
index f1d72b9..d2f40a8 100644
--- a/config/rootfiles/common/linux
+++ b/config/rootfiles/common/linux
@@ -3,184 +3,10 @@ boot/System.map-ipfire
boot/config-KVER-ipfire
boot/vmlinuz-KVER-ipfire
boot/vmlinuz-ipfire
-#lib/firmware/3com
-#lib/firmware/3com/3C359.bin
-#lib/firmware/3com/typhoon.bin
-#lib/firmware/acenic
#lib/firmware/acenic/tg1.bin
-#lib/firmware/acenic/tg2.bin
-#lib/firmware/adaptec
-#lib/firmware/adaptec/starfire_rx.bin
-#lib/firmware/adaptec/starfire_tx.bin
-#lib/firmware/advansys
-#lib/firmware/advansys/3550.bin
-#lib/firmware/advansys/38C0800.bin
-#lib/firmware/advansys/38C1600.bin
-#lib/firmware/advansys/mcode.bin
-#lib/firmware/atmsar11.fw
-#lib/firmware/av7110
-#lib/firmware/av7110/bootcode.bin
-#lib/firmware/bnx2
-#lib/firmware/bnx2/bnx2-mips-06-5.0.0.j3.fw
#lib/firmware/bnx2/bnx2-mips-09-5.0.0.j3.fw
-#lib/firmware/bnx2/bnx2-rv2p-06-5.0.0.j3.fw
-#lib/firmware/bnx2/bnx2-rv2p-09-5.0.0.j3.fw
-#lib/firmware/bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw
#lib/firmware/bnx2x-e1-5.0.21.0.fw
#lib/firmware/bnx2x-e1h-5.0.21.0.fw
-#lib/firmware/cis
-#lib/firmware/cis/3CCFEM556.cis
-#lib/firmware/cis/3CXEM556.cis
-#lib/firmware/cis/COMpad2.cis
-#lib/firmware/cis/COMpad4.cis
-#lib/firmware/cis/DP83903.cis
-#lib/firmware/cis/LA-PCM.cis
-#lib/firmware/cis/MT5634ZLX.cis
-#lib/firmware/cis/NE2K.cis
-#lib/firmware/cis/PCMLM28.cis
-#lib/firmware/cis/PE-200.cis
-#lib/firmware/cis/RS-COM-2P.cis
-#lib/firmware/cis/SW_555_SER.cis
-#lib/firmware/cis/SW_7xx_SER.cis
-#lib/firmware/cis/SW_8xx_SER.cis
-#lib/firmware/cis/tamarack.cis
-#lib/firmware/cpia2
-#lib/firmware/cpia2/stv0672_vp4.bin
-#lib/firmware/cxgb3
-#lib/firmware/cxgb3/ael2005_opt_edc.bin
-#lib/firmware/cxgb3/ael2005_twx_edc.bin
-#lib/firmware/cxgb3/ael2020_twx_edc.bin
-#lib/firmware/cxgb3/t3b_psram-1.1.0.bin
-#lib/firmware/cxgb3/t3c_psram-1.1.0.bin
-#lib/firmware/cxgb3/t3fw-7.4.0.bin
-#lib/firmware/dabusb
-#lib/firmware/dabusb/bitstream.bin
-#lib/firmware/dabusb/firmware.fw
-#lib/firmware/dsp56k
-#lib/firmware/dsp56k/bootstrap.bin
-#lib/firmware/e100
-#lib/firmware/e100/d101m_ucode.bin
-#lib/firmware/e100/d101s_ucode.bin
-#lib/firmware/e100/d102e_ucode.bin
-#lib/firmware/edgeport
-#lib/firmware/edgeport/boot.fw
-#lib/firmware/edgeport/boot2.fw
-#lib/firmware/edgeport/down.fw
-#lib/firmware/edgeport/down2.fw
-#lib/firmware/edgeport/down3.bin
-#lib/firmware/emi26
-#lib/firmware/emi26/bitstream.fw
-#lib/firmware/emi26/firmware.fw
-#lib/firmware/emi26/loader.fw
-#lib/firmware/emi62
-#lib/firmware/emi62/bitstream.fw
-#lib/firmware/emi62/loader.fw
-#lib/firmware/emi62/midi.fw
-#lib/firmware/emi62/spdif.fw
-#lib/firmware/ess
-#lib/firmware/ess/maestro3_assp_kernel.fw
-#lib/firmware/ess/maestro3_assp_minisrc.fw
-#lib/firmware/intelliport2.bin
-#lib/firmware/kaweth
-#lib/firmware/kaweth/new_code.bin
-#lib/firmware/kaweth/new_code_fix.bin
-#lib/firmware/kaweth/trigger_code.bin
-#lib/firmware/kaweth/trigger_code_fix.bin
-#lib/firmware/keyspan
-#lib/firmware/keyspan/mpr.fw
-#lib/firmware/keyspan/usa18x.fw
-#lib/firmware/keyspan/usa19.fw
-#lib/firmware/keyspan/usa19qi.fw
-#lib/firmware/keyspan/usa19qw.fw
-#lib/firmware/keyspan/usa19w.fw
-#lib/firmware/keyspan/usa28.fw
-#lib/firmware/keyspan/usa28x.fw
-#lib/firmware/keyspan/usa28xa.fw
-#lib/firmware/keyspan/usa28xb.fw
-#lib/firmware/keyspan/usa49w.fw
-#lib/firmware/keyspan/usa49wlc.fw
-#lib/firmware/keyspan_pda
-#lib/firmware/keyspan_pda/keyspan_pda.fw
-#lib/firmware/keyspan_pda/xircom_pgs.fw
-#lib/firmware/korg
-#lib/firmware/korg/k1212.dsp
-#lib/firmware/matrox
-#lib/firmware/matrox/g200_warp.fw
-#lib/firmware/matrox/g400_warp.fw
-#lib/firmware/mts_cdma.fw
-#lib/firmware/mts_edge.fw
-#lib/firmware/mts_gsm.fw
-#lib/firmware/myricom
-#lib/firmware/myricom/lanai.bin
-#lib/firmware/ositech
-#lib/firmware/ositech/Xilinx7OD.bin
-#lib/firmware/qlogic
-#lib/firmware/qlogic/1040.bin
-#lib/firmware/qlogic/12160.bin
-#lib/firmware/qlogic/1280.bin
-#lib/firmware/qlogic/isp1000.bin
-#lib/firmware/r128
-#lib/firmware/r128/r128_cce.bin
-#lib/firmware/radeon
-#lib/firmware/radeon/R100_cp.bin
-#lib/firmware/radeon/R200_cp.bin
-#lib/firmware/radeon/R300_cp.bin
-#lib/firmware/radeon/R420_cp.bin
-#lib/firmware/radeon/R520_cp.bin
-#lib/firmware/radeon/R600_me.bin
-#lib/firmware/radeon/R600_pfp.bin
-#lib/firmware/radeon/RS600_cp.bin
-#lib/firmware/radeon/RS690_cp.bin
-#lib/firmware/radeon/RS780_me.bin
-#lib/firmware/radeon/RS780_pfp.bin
-#lib/firmware/radeon/RV610_me.bin
-#lib/firmware/radeon/RV610_pfp.bin
-#lib/firmware/radeon/RV620_me.bin
-#lib/firmware/radeon/RV620_pfp.bin
-#lib/firmware/radeon/RV630_me.bin
-#lib/firmware/radeon/RV630_pfp.bin
-#lib/firmware/radeon/RV635_me.bin
-#lib/firmware/radeon/RV635_pfp.bin
-#lib/firmware/radeon/RV670_me.bin
-#lib/firmware/radeon/RV670_pfp.bin
-#lib/firmware/radeon/RV710_me.bin
-#lib/firmware/radeon/RV710_pfp.bin
-#lib/firmware/radeon/RV730_me.bin
-#lib/firmware/radeon/RV730_pfp.bin
-#lib/firmware/radeon/RV770_me.bin
-#lib/firmware/radeon/RV770_pfp.bin
-#lib/firmware/sb16
-#lib/firmware/sb16/alaw_main.csp
-#lib/firmware/sb16/ima_adpcm_capture.csp
-#lib/firmware/sb16/ima_adpcm_init.csp
-#lib/firmware/sb16/ima_adpcm_playback.csp
-#lib/firmware/sb16/mulaw_main.csp
-#lib/firmware/sun
-#lib/firmware/sun/cassini.bin
-#lib/firmware/tehuti
-#lib/firmware/tehuti/bdx.bin
-#lib/firmware/ti_3410.fw
-#lib/firmware/ti_5052.fw
-#lib/firmware/tigon
-#lib/firmware/tigon/tg3.bin
-#lib/firmware/tigon/tg3_tso.bin
-#lib/firmware/tigon/tg3_tso5.bin
-#lib/firmware/tr_smctr.bin
-#lib/firmware/ttusb-budget
-#lib/firmware/ttusb-budget/dspbootcode.bin
-#lib/firmware/vicam
-#lib/firmware/vicam/firmware.fw
-#lib/firmware/whiteheat.fw
-#lib/firmware/whiteheat_loader.fw
-#lib/firmware/yam
-#lib/firmware/yam/1200.bin
-#lib/firmware/yam/9600.bin
-#lib/firmware/yamaha
-#lib/firmware/yamaha/ds1_ctrl.fw
-#lib/firmware/yamaha/ds1_dsp.fw
-#lib/firmware/yamaha/ds1e_ctrl.fw
-#lib/firmware/yamaha/yss225_registers.bin
-#lib/modules
lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/build
#lib/modules/KVER-ipfire/kernel
@@ -1236,7 +1062,6 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas_tf
#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko
-#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/mac80211_hwsim.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/mwl8k.ko
#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco
#lib/modules/KVER-ipfire/kernel/drivers/net/wireless/orinoco/orinoco.ko
@@ -1481,6 +1306,18 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/drivers/serial/serial_cs.ko
#lib/modules/KVER-ipfire/kernel/drivers/ssb
#lib/modules/KVER-ipfire/kernel/drivers/ssb/ssb.ko
+#lib/modules/KVER-ipfire/kernel/drivers/staging
+#lib/modules/KVER-ipfire/kernel/drivers/staging/et131x
+#lib/modules/KVER-ipfire/kernel/drivers/staging/et131x/et131x.ko
+#lib/modules/KVER-ipfire/kernel/drivers/staging/hv
+#lib/modules/KVER-ipfire/kernel/drivers/staging/hv/hv_blkvsc.ko
+#lib/modules/KVER-ipfire/kernel/drivers/staging/hv/hv_netvsc.ko
+#lib/modules/KVER-ipfire/kernel/drivers/staging/hv/hv_storvsc.ko
+#lib/modules/KVER-ipfire/kernel/drivers/staging/hv/hv_vmbus.ko
+#lib/modules/KVER-ipfire/kernel/drivers/staging/phison
+#lib/modules/KVER-ipfire/kernel/drivers/staging/phison/phison.ko
+#lib/modules/KVER-ipfire/kernel/drivers/staging/slicoss
+#lib/modules/KVER-ipfire/kernel/drivers/staging/slicoss/slicoss.ko
#lib/modules/KVER-ipfire/kernel/drivers/uio
#lib/modules/KVER-ipfire/kernel/drivers/uio/uio.ko
#lib/modules/KVER-ipfire/kernel/drivers/uio/uio_aec.ko
@@ -1730,6 +1567,8 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/fs/autofs/autofs.ko
#lib/modules/KVER-ipfire/kernel/fs/autofs4
#lib/modules/KVER-ipfire/kernel/fs/autofs4/autofs4.ko
+#lib/modules/KVER-ipfire/kernel/fs/cachefiles
+#lib/modules/KVER-ipfire/kernel/fs/cachefiles/cachefiles.ko
#lib/modules/KVER-ipfire/kernel/fs/cifs
#lib/modules/KVER-ipfire/kernel/fs/cifs/cifs.ko
#lib/modules/KVER-ipfire/kernel/fs/ecryptfs
@@ -1765,8 +1604,14 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/fs/mbcache.ko
#lib/modules/KVER-ipfire/kernel/fs/nfs
#lib/modules/KVER-ipfire/kernel/fs/nfs/nfs.ko
+#lib/modules/KVER-ipfire/kernel/fs/nfs_common
+#lib/modules/KVER-ipfire/kernel/fs/nfs_common/nfs_acl.ko
#lib/modules/KVER-ipfire/kernel/fs/nfsd
#lib/modules/KVER-ipfire/kernel/fs/nfsd/nfsd.ko
+#lib/modules/KVER-ipfire/kernel/fs/quota
+#lib/modules/KVER-ipfire/kernel/fs/quota/quota_tree.ko
+#lib/modules/KVER-ipfire/kernel/fs/quota/quota_v1.ko
+#lib/modules/KVER-ipfire/kernel/fs/quota/quota_v2.ko
#lib/modules/KVER-ipfire/kernel/fs/reiser4
#lib/modules/KVER-ipfire/kernel/fs/reiser4/reiser4.ko
#lib/modules/KVER-ipfire/kernel/fs/reiserfs
diff --git a/config/rootfiles/common/uClibc b/config/rootfiles/common/uClibc
index b87e2cb..178d8fc 100644
--- a/config/rootfiles/common/uClibc
+++ b/config/rootfiles/common/uClibc
@@ -15,6 +15,9 @@
#opt/i586-uClibc/include/arpa/telnet.h
#opt/i586-uClibc/include/arpa/tftp.h
#opt/i586-uClibc/include/asm
+#opt/i586-uClibc/include/asm-generic
+#opt/i586-uClibc/include/asm-generic/errno-base.h
+#opt/i586-uClibc/include/asm-generic/errno.h
#opt/i586-uClibc/include/asm/8253pit.h
#opt/i586-uClibc/include/asm/a.out.h
#opt/i586-uClibc/include/asm/agp.h
@@ -54,10 +57,6 @@
#opt/i586-uClibc/include/asm/irq.h
#opt/i586-uClibc/include/asm/kdebug.h
#opt/i586-uClibc/include/asm/kprobes.h
-#opt/i586-uClibc/include/asm/kvm.h
-#opt/i586-uClibc/include/asm/kvm_host.h
-#opt/i586-uClibc/include/asm/kvm_para.h
-#opt/i586-uClibc/include/asm/kvm_x86_emulate.h
#opt/i586-uClibc/include/asm/ldt.h
#opt/i586-uClibc/include/asm/linkage.h
#opt/i586-uClibc/include/asm/mach-bigsmp
@@ -171,7 +170,6 @@
#opt/i586-uClibc/include/asm/srat.h
#opt/i586-uClibc/include/asm/stat.h
#opt/i586-uClibc/include/asm/suspend.h
-#opt/i586-uClibc/include/asm/svm.h
#opt/i586-uClibc/include/asm/system.h
#opt/i586-uClibc/include/asm/termbits.h
#opt/i586-uClibc/include/asm/termios.h
@@ -185,9 +183,7 @@
#opt/i586-uClibc/include/asm/user.h
#opt/i586-uClibc/include/asm/vga.h
#opt/i586-uClibc/include/asm/vic.h
-#opt/i586-uClibc/include/asm/virtext.h
#opt/i586-uClibc/include/asm/vm86.h
-#opt/i586-uClibc/include/asm/vmx.h
#opt/i586-uClibc/include/asm/voyager.h
#opt/i586-uClibc/include/assert.h
#opt/i586-uClibc/include/atomic.h
@@ -597,10 +593,6 @@
#opt/i586-uClibc/include/linux/kmalloc_sizes.h
#opt/i586-uClibc/include/linux/kmod.h
#opt/i586-uClibc/include/linux/kprobes.h
-#opt/i586-uClibc/include/linux/kvm.h
-#opt/i586-uClibc/include/linux/kvm_host.h
-#opt/i586-uClibc/include/linux/kvm_para.h
-#opt/i586-uClibc/include/linux/kvm_types.h
#opt/i586-uClibc/include/linux/lapb.h
#opt/i586-uClibc/include/linux/lcd.h
#opt/i586-uClibc/include/linux/libata.h
@@ -672,17 +664,35 @@
#opt/i586-uClibc/include/linux/netdevice.h
#opt/i586-uClibc/include/linux/netfilter
#opt/i586-uClibc/include/linux/netfilter.h
+#opt/i586-uClibc/include/linux/netfilter/Kbuild
+#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_amanda.h
#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_common.h
-#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_tuple.h
+#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_dccp.h
+#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_ftp.h
+#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_h323.h
+#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_h323_asn1.h
+#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_h323_types.h
+#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_irc.h
+#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_pptp.h
+#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_proto_gre.h
+#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_sane.h
+#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_sctp.h
+#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_sip.h
+#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_tcp.h
+#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_tftp.h
#opt/i586-uClibc/include/linux/netfilter/nf_conntrack_tuple_common.h
-#opt/i586-uClibc/include/linux/netfilter/nf_nat.h
#opt/i586-uClibc/include/linux/netfilter/nfnetlink.h
#opt/i586-uClibc/include/linux/netfilter/nfnetlink_compat.h
+#opt/i586-uClibc/include/linux/netfilter/nfnetlink_conntrack.h
+#opt/i586-uClibc/include/linux/netfilter/nfnetlink_log.h
+#opt/i586-uClibc/include/linux/netfilter/nfnetlink_queue.h
#opt/i586-uClibc/include/linux/netfilter/x_tables.h
#opt/i586-uClibc/include/linux/netfilter/xt_CLASSIFY.h
#opt/i586-uClibc/include/linux/netfilter/xt_CONNMARK.h
#opt/i586-uClibc/include/linux/netfilter/xt_CONNSECMARK.h
#opt/i586-uClibc/include/linux/netfilter/xt_DSCP.h
+#opt/i586-uClibc/include/linux/netfilter/xt_IMQ.h
+#opt/i586-uClibc/include/linux/netfilter/xt_LED.h
#opt/i586-uClibc/include/linux/netfilter/xt_MARK.h
#opt/i586-uClibc/include/linux/netfilter/xt_NFLOG.h
#opt/i586-uClibc/include/linux/netfilter/xt_NFQUEUE.h
@@ -690,6 +700,8 @@
#opt/i586-uClibc/include/linux/netfilter/xt_SECMARK.h
#opt/i586-uClibc/include/linux/netfilter/xt_TCPMSS.h
#opt/i586-uClibc/include/linux/netfilter/xt_TCPOPTSTRIP.h
+#opt/i586-uClibc/include/linux/netfilter/xt_TPROXY.h
+#opt/i586-uClibc/include/linux/netfilter/xt_cluster.h
#opt/i586-uClibc/include/linux/netfilter/xt_comment.h
#opt/i586-uClibc/include/linux/netfilter/xt_connbytes.h
#opt/i586-uClibc/include/linux/netfilter/xt_connlimit.h
@@ -701,11 +713,13 @@
#opt/i586-uClibc/include/linux/netfilter/xt_hashlimit.h
#opt/i586-uClibc/include/linux/netfilter/xt_helper.h
#opt/i586-uClibc/include/linux/netfilter/xt_iprange.h
+#opt/i586-uClibc/include/linux/netfilter/xt_layer7.h
#opt/i586-uClibc/include/linux/netfilter/xt_length.h
#opt/i586-uClibc/include/linux/netfilter/xt_limit.h
#opt/i586-uClibc/include/linux/netfilter/xt_mac.h
#opt/i586-uClibc/include/linux/netfilter/xt_mark.h
#opt/i586-uClibc/include/linux/netfilter/xt_multiport.h
+#opt/i586-uClibc/include/linux/netfilter/xt_osf.h
#opt/i586-uClibc/include/linux/netfilter/xt_owner.h
#opt/i586-uClibc/include/linux/netfilter/xt_physdev.h
#opt/i586-uClibc/include/linux/netfilter/xt_pkttype.h
@@ -713,7 +727,9 @@
#opt/i586-uClibc/include/linux/netfilter/xt_quota.h
#opt/i586-uClibc/include/linux/netfilter/xt_rateest.h
#opt/i586-uClibc/include/linux/netfilter/xt_realm.h
+#opt/i586-uClibc/include/linux/netfilter/xt_recent.h
#opt/i586-uClibc/include/linux/netfilter/xt_sctp.h
+#opt/i586-uClibc/include/linux/netfilter/xt_socket.h
#opt/i586-uClibc/include/linux/netfilter/xt_state.h
#opt/i586-uClibc/include/linux/netfilter/xt_statistic.h
#opt/i586-uClibc/include/linux/netfilter/xt_string.h
@@ -764,30 +780,25 @@
#opt/i586-uClibc/include/linux/netfilter_ipv4/ip_nat_protocol.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ip_nat_rule.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ip_queue.h
-#opt/i586-uClibc/include/linux/netfilter_ipv4/ip_set.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ip_tables.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_CLASSIFY.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_CONNMARK.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_DSCP.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_ECN.h
-#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_FTOS.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_LOG.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_MARK.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_REJECT.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_SAME.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_TCPMSS.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_TOS.h
-#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_TTL.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_ULOG.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_addrtype.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_ah.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_comment.h
-#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_connlimit.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_connmark.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_conntrack.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_dscp.h
-#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_dstlimit.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_ecn.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_esp.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_hashlimit.h
@@ -801,12 +812,9 @@
#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_owner.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_physdev.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_pkttype.h
-#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_policy.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_realm.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_recent.h
-#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_rpc.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_sctp.h
-#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_set.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_state.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_tcpmss.h
#opt/i586-uClibc/include/linux/netfilter_ipv4/ipt_tos.h
@@ -816,11 +824,8 @@
#opt/i586-uClibc/include/linux/netfilter_ipv6
#opt/i586-uClibc/include/linux/netfilter_ipv6.h
#opt/i586-uClibc/include/linux/netfilter_ipv6/ip6_tables.h
-#opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_HL.h
#opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_LOG.h
#opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_MARK.h
-#opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_REJECT.h
-#opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_TCPMSS.h
#opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_ah.h
#opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_esp.h
#opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_frag.h
@@ -830,12 +835,10 @@
#opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_limit.h
#opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_mac.h
#opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_mark.h
-#opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_mh.h
#opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_multiport.h
#opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_opts.h
#opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_owner.h
#opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_physdev.h
-#opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_policy.h
#opt/i586-uClibc/include/linux/netfilter_ipv6/ip6t_rt.h
#opt/i586-uClibc/include/linux/netlink.h
#opt/i586-uClibc/include/linux/netrom.h
diff --git a/config/rootfiles/packages/linux-xen b/config/rootfiles/packages/linux-xen
index e5f76dd..5c23601 100644
--- a/config/rootfiles/packages/linux-xen
+++ b/config/rootfiles/packages/linux-xen
@@ -3,7 +3,184 @@ boot/System.map-ipfire-xen
boot/config-KVER-ipfire-xen
boot/vmlinuz-KVER-ipfire-xen
boot/vmlinuz-ipfire-xen
+#lib/firmware/3com
+#lib/firmware/3com/3C359.bin
+#lib/firmware/3com/typhoon.bin
+#lib/firmware/acenic
#lib/firmware/acenic/tg1.bin
+#lib/firmware/acenic/tg2.bin
+#lib/firmware/adaptec
+#lib/firmware/adaptec/starfire_rx.bin
+#lib/firmware/adaptec/starfire_tx.bin
+#lib/firmware/advansys
+#lib/firmware/advansys/3550.bin
+#lib/firmware/advansys/38C0800.bin
+#lib/firmware/advansys/38C1600.bin
+#lib/firmware/advansys/mcode.bin
+#lib/firmware/atmsar11.fw
+#lib/firmware/av7110
+#lib/firmware/av7110/bootcode.bin
+#lib/firmware/bnx2
+#lib/firmware/bnx2/bnx2-mips-06-5.0.0.j3.fw
+#lib/firmware/bnx2/bnx2-mips-09-5.0.0.j3.fw
+#lib/firmware/bnx2/bnx2-rv2p-06-5.0.0.j3.fw
+#lib/firmware/bnx2/bnx2-rv2p-09-5.0.0.j3.fw
+#lib/firmware/bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw
+#lib/firmware/bnx2x-e1-5.2.7.0.fw
+#lib/firmware/bnx2x-e1h-5.2.7.0.fw
+#lib/firmware/cis
+#lib/firmware/cis/3CCFEM556.cis
+#lib/firmware/cis/3CXEM556.cis
+#lib/firmware/cis/COMpad2.cis
+#lib/firmware/cis/COMpad4.cis
+#lib/firmware/cis/DP83903.cis
+#lib/firmware/cis/LA-PCM.cis
+#lib/firmware/cis/MT5634ZLX.cis
+#lib/firmware/cis/NE2K.cis
+#lib/firmware/cis/PCMLM28.cis
+#lib/firmware/cis/PE-200.cis
+#lib/firmware/cis/RS-COM-2P.cis
+#lib/firmware/cis/SW_555_SER.cis
+#lib/firmware/cis/SW_7xx_SER.cis
+#lib/firmware/cis/SW_8xx_SER.cis
+#lib/firmware/cis/tamarack.cis
+#lib/firmware/cpia2
+#lib/firmware/cpia2/stv0672_vp4.bin
+#lib/firmware/cxgb3
+#lib/firmware/cxgb3/ael2005_opt_edc.bin
+#lib/firmware/cxgb3/ael2005_twx_edc.bin
+#lib/firmware/cxgb3/ael2020_twx_edc.bin
+#lib/firmware/cxgb3/t3b_psram-1.1.0.bin
+#lib/firmware/cxgb3/t3c_psram-1.1.0.bin
+#lib/firmware/cxgb3/t3fw-7.4.0.bin
+#lib/firmware/dabusb
+#lib/firmware/dabusb/bitstream.bin
+#lib/firmware/dabusb/firmware.fw
+#lib/firmware/dsp56k
+#lib/firmware/dsp56k/bootstrap.bin
+#lib/firmware/e100
+#lib/firmware/e100/d101m_ucode.bin
+#lib/firmware/e100/d101s_ucode.bin
+#lib/firmware/e100/d102e_ucode.bin
+#lib/firmware/edgeport
+#lib/firmware/edgeport/boot.fw
+#lib/firmware/edgeport/boot2.fw
+#lib/firmware/edgeport/down.fw
+#lib/firmware/edgeport/down2.fw
+#lib/firmware/edgeport/down3.bin
+#lib/firmware/emi26
+#lib/firmware/emi26/bitstream.fw
+#lib/firmware/emi26/firmware.fw
+#lib/firmware/emi26/loader.fw
+#lib/firmware/emi62
+#lib/firmware/emi62/bitstream.fw
+#lib/firmware/emi62/loader.fw
+#lib/firmware/emi62/midi.fw
+#lib/firmware/emi62/spdif.fw
+#lib/firmware/ess
+#lib/firmware/ess/maestro3_assp_kernel.fw
+#lib/firmware/ess/maestro3_assp_minisrc.fw
+#lib/firmware/intelliport2.bin
+#lib/firmware/kaweth
+#lib/firmware/kaweth/new_code.bin
+#lib/firmware/kaweth/new_code_fix.bin
+#lib/firmware/kaweth/trigger_code.bin
+#lib/firmware/kaweth/trigger_code_fix.bin
+#lib/firmware/keyspan
+#lib/firmware/keyspan/mpr.fw
+#lib/firmware/keyspan/usa18x.fw
+#lib/firmware/keyspan/usa19.fw
+#lib/firmware/keyspan/usa19qi.fw
+#lib/firmware/keyspan/usa19qw.fw
+#lib/firmware/keyspan/usa19w.fw
+#lib/firmware/keyspan/usa28.fw
+#lib/firmware/keyspan/usa28x.fw
+#lib/firmware/keyspan/usa28xa.fw
+#lib/firmware/keyspan/usa28xb.fw
+#lib/firmware/keyspan/usa49w.fw
+#lib/firmware/keyspan/usa49wlc.fw
+#lib/firmware/keyspan_pda
+#lib/firmware/keyspan_pda/keyspan_pda.fw
+#lib/firmware/keyspan_pda/xircom_pgs.fw
+#lib/firmware/korg
+#lib/firmware/korg/k1212.dsp
+#lib/firmware/matrox
+#lib/firmware/matrox/g200_warp.fw
+#lib/firmware/matrox/g400_warp.fw
+#lib/firmware/mts_cdma.fw
+#lib/firmware/mts_edge.fw
+#lib/firmware/mts_gsm.fw
+#lib/firmware/myricom
+#lib/firmware/myricom/lanai.bin
+#lib/firmware/ositech
+#lib/firmware/ositech/Xilinx7OD.bin
+#lib/firmware/qlogic
+#lib/firmware/qlogic/1040.bin
+#lib/firmware/qlogic/12160.bin
+#lib/firmware/qlogic/1280.bin
+#lib/firmware/qlogic/isp1000.bin
+#lib/firmware/r128
+#lib/firmware/r128/r128_cce.bin
+#lib/firmware/radeon
+#lib/firmware/radeon/R100_cp.bin
+#lib/firmware/radeon/R200_cp.bin
+#lib/firmware/radeon/R300_cp.bin
+#lib/firmware/radeon/R420_cp.bin
+#lib/firmware/radeon/R520_cp.bin
+#lib/firmware/radeon/R600_me.bin
+#lib/firmware/radeon/R600_pfp.bin
+#lib/firmware/radeon/RS600_cp.bin
+#lib/firmware/radeon/RS690_cp.bin
+#lib/firmware/radeon/RS780_me.bin
+#lib/firmware/radeon/RS780_pfp.bin
+#lib/firmware/radeon/RV610_me.bin
+#lib/firmware/radeon/RV610_pfp.bin
+#lib/firmware/radeon/RV620_me.bin
+#lib/firmware/radeon/RV620_pfp.bin
+#lib/firmware/radeon/RV630_me.bin
+#lib/firmware/radeon/RV630_pfp.bin
+#lib/firmware/radeon/RV635_me.bin
+#lib/firmware/radeon/RV635_pfp.bin
+#lib/firmware/radeon/RV670_me.bin
+#lib/firmware/radeon/RV670_pfp.bin
+#lib/firmware/radeon/RV710_me.bin
+#lib/firmware/radeon/RV710_pfp.bin
+#lib/firmware/radeon/RV730_me.bin
+#lib/firmware/radeon/RV730_pfp.bin
+#lib/firmware/radeon/RV770_me.bin
+#lib/firmware/radeon/RV770_pfp.bin
+#lib/firmware/sb16
+#lib/firmware/sb16/alaw_main.csp
+#lib/firmware/sb16/ima_adpcm_capture.csp
+#lib/firmware/sb16/ima_adpcm_init.csp
+#lib/firmware/sb16/ima_adpcm_playback.csp
+#lib/firmware/sb16/mulaw_main.csp
+#lib/firmware/sun
+#lib/firmware/sun/cassini.bin
+#lib/firmware/tehuti
+#lib/firmware/tehuti/bdx.bin
+#lib/firmware/ti_3410.fw
+#lib/firmware/ti_5052.fw
+#lib/firmware/tigon
+#lib/firmware/tigon/tg3.bin
+#lib/firmware/tigon/tg3_tso.bin
+#lib/firmware/tigon/tg3_tso5.bin
+#lib/firmware/tr_smctr.bin
+#lib/firmware/ttusb-budget
+#lib/firmware/ttusb-budget/dspbootcode.bin
+#lib/firmware/vicam
+#lib/firmware/vicam/firmware.fw
+#lib/firmware/whiteheat.fw
+#lib/firmware/whiteheat_loader.fw
+#lib/firmware/yam
+#lib/firmware/yam/1200.bin
+#lib/firmware/yam/9600.bin
+#lib/firmware/yamaha
+#lib/firmware/yamaha/ds1_ctrl.fw
+#lib/firmware/yamaha/ds1_dsp.fw
+#lib/firmware/yamaha/ds1e_ctrl.fw
+#lib/firmware/yamaha/yss225_registers.bin
+#lib/modules
lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/build
#lib/modules/KVER-ipfire-xen/kernel
@@ -76,11 +253,13 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers
#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi
#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/ac.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/acpi_pad.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/battery.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/button.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/container.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/fan.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/pci_slot.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/power_meter.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/processor.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/sbs.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/sbshc.ko
@@ -475,6 +654,7 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee802154
#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee802154/fakehard.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/input
+#lib/modules/KVER-ipfire-xen/kernel/drivers/input/ff-memless.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/input/input-polldev.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/input/keyboard
#lib/modules/KVER-ipfire-xen/kernel/drivers/input/keyboard/adp5588-keys.ko
@@ -615,6 +795,7 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/media/dvb/dvb-core
#lib/modules/KVER-ipfire-xen/kernel/drivers/media/dvb/dvb-core/dvb-core.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/media/video
+#lib/modules/KVER-ipfire-xen/kernel/drivers/media/video/v4l1-compat.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/media/video/v4l2-common.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/media/video/v4l2-int-device.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/media/video/videodev.ko
@@ -694,6 +875,14 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/mtdblock.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/mtdchar.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/mtdconcat.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/tests
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/tests/mtd_oobtest.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/tests/mtd_pagetest.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/tests/mtd_readtest.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/tests/mtd_speedtest.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/tests/mtd_stresstest.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/tests/mtd_subpagetest.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/tests/mtd_torturetest.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/ubi
#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/ubi/ubi.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net
@@ -804,7 +993,6 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/davicom.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/et1011c.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/icplus.ko
-#lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/libphy.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/lxt.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/marvell.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/mdio-bitbang.ko
@@ -1064,6 +1252,8 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/bnx2i
#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/bnx2i/bnx2i.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/ch.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/cxgb3i
+#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/cxgb3i/cxgb3i.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/dc395x.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/device_handler
#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/device_handler/scsi_dh.ko
@@ -1075,6 +1265,7 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/dpt_i2o.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/eata.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/fcoe
+#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/fcoe/fcoe.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/fcoe/libfcoe.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/fdomain.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/fnic
@@ -1143,6 +1334,11 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/serial/serial_core.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/ssb
#lib/modules/KVER-ipfire-xen/kernel/drivers/ssb/ssb.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/staging
+#lib/modules/KVER-ipfire-xen/kernel/drivers/staging/et131x
+#lib/modules/KVER-ipfire-xen/kernel/drivers/staging/et131x/et131x.ko
+#lib/modules/KVER-ipfire-xen/kernel/drivers/staging/slicoss
+#lib/modules/KVER-ipfire-xen/kernel/drivers/staging/slicoss/slicoss.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/uio
#lib/modules/KVER-ipfire-xen/kernel/drivers/uio/uio.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/uio/uio_aec.ko
@@ -1435,6 +1631,8 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/fs/mbcache.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/nfs
#lib/modules/KVER-ipfire-xen/kernel/fs/nfs/nfs.ko
+#lib/modules/KVER-ipfire-xen/kernel/fs/nfs_common
+#lib/modules/KVER-ipfire-xen/kernel/fs/nfs_common/nfs_acl.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/nfsd
#lib/modules/KVER-ipfire-xen/kernel/fs/nfsd/nfsd.ko
#lib/modules/KVER-ipfire-xen/kernel/fs/quota
@@ -1669,6 +1867,9 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/net/phonet
#lib/modules/KVER-ipfire-xen/kernel/net/phonet/phonet.ko
#lib/modules/KVER-ipfire-xen/kernel/net/phonet/pn_pep.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/rds
+#lib/modules/KVER-ipfire-xen/kernel/net/rds/rds.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/rds/rds_tcp.ko
#lib/modules/KVER-ipfire-xen/kernel/net/rfkill
#lib/modules/KVER-ipfire-xen/kernel/net/rfkill/rfkill.ko
#lib/modules/KVER-ipfire-xen/kernel/net/rxrpc
@@ -1681,6 +1882,7 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/net/sched/act_nat.ko
#lib/modules/KVER-ipfire-xen/kernel/net/sched/act_pedit.ko
#lib/modules/KVER-ipfire-xen/kernel/net/sched/act_police.ko
+#lib/modules/KVER-ipfire-xen/kernel/net/sched/act_skbedit.ko
#lib/modules/KVER-ipfire-xen/kernel/net/sched/cls_basic.ko
#lib/modules/KVER-ipfire-xen/kernel/net/sched/cls_flow.ko
#lib/modules/KVER-ipfire-xen/kernel/net/sched/cls_fw.ko
hooks/post-receive
--
IPFire 2.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. f44dda3ca48086b66d56ce3f0e3c8357249180c3
by git＠ipfire.org 27 Feb '10
by git＠ipfire.org 27 Feb '10
27 Feb '10
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 f44dda3ca48086b66d56ce3f0e3c8357249180c3 (commit)
from 8c50adedff4c38e6ac78227440e44551c2057cd5 (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 f44dda3ca48086b66d56ce3f0e3c8357249180c3
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Feb 27 16:49:57 2010 +0100
Updated Kernel (2.6.32.9).
-----------------------------------------------------------------------
Summary of changes:
doc/packages-list.txt | 26 ++++----
lfs/linux | 13 ++--
src/paks/linux-xen/install.sh | 2 +-
src/patches/suse_xen_series.conf | 119 +++++++++++++++++++++++++-------------
4 files changed, 98 insertions(+), 62 deletions(-)
mode change 100755 => 100644 src/patches/suse_xen_series.conf
Difference in files:
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index f3844ed..d2130b6 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -36,7 +36,7 @@
* Unix-Syslog-0.100
* XML-Parser-2.34
* alsa-lib-1.0.22
-* alsa-lib-1.0.22-kmod-2.6.32.8-ipfire
+* alsa-lib-1.0.22-kmod-2.6.32.9-ipfire
* amavisd-new-2.5.2
* apcupsd-3.14.4
* applejuice-0.31
@@ -75,8 +75,8 @@
* cyrus-imapd-2.2.12
* cyrus-sasl-2.1.21
* dahdi-2.2.1
-* dahdi-2.2.1-kmod-2.6.32.8-ipfire
-* dahdi-2.2.1-kmod-2.6.32.8-ipfire-xen
+* dahdi-2.2.1-kmod-2.6.32.9-ipfire
+* dahdi-2.2.1-kmod-2.6.32.9-ipfire-xen
* db-4.4.20
* dbus-1.0.3
* dhcp-3.1.0
@@ -154,8 +154,8 @@
* jpegsrc.v6b
* kbd-1.12
* klibc-1.5.14
-* kqemu-1.4.0pre1-kmod-2.6.32.8-ipfire
-* kqemu-1.4.0pre1-kmod-2.6.32.8-ipfire-xen
+* kqemu-1.4.0pre1-kmod-2.6.32.9-ipfire
+* kqemu-1.4.0pre1-kmod-2.6.32.9-ipfire-xen
* kudzu-1.2.64
* l7-protocols-2009-05-10
* lame-3.97
@@ -188,8 +188,8 @@
* libwww-perl-5.803
* libxml2-2.6.26
* libxslt-1.1.17
-* linux-2.6.32.8-ipfire
-* linux-2.6.32.8-ipfire-xen
+* linux-2.6.32.9-ipfire
+* linux-2.6.32.9-ipfire-xen
* linux-atm-2.4.1
* linux-libc-headers-2.6.12.0
* lm_sensors-3.1.2
@@ -200,8 +200,8 @@
* lzo-2.02
* m4-1.4.4
* mISDNuser_20090906
-* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.8-ipfire
-* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.8-ipfire-xen
+* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.9-ipfire
+* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.9-ipfire-xen
* make-3.81
* man-db-2.4.3
* man-pages-2.34
@@ -250,8 +250,8 @@
* openssh-5.3p1
* openssl-0.9.8l
* openswan-2.6.24
-* openswan-2.6.24-kmod-2.6.32.8-ipfire
-* openswan-2.6.24-kmod-2.6.32.8-ipfire-xen
+* openswan-2.6.24-kmod-2.6.32.9-ipfire
+* openswan-2.6.24-kmod-2.6.32.9-ipfire-xen
* openvpn-2.1_rc20
* p7zip_4.65
* pam_mysql-0.7RC1
@@ -327,8 +327,8 @@
* usb_modeswitch-1.0.6
* usbutils-0.72
* util-linux-2.12r
-* v4l-dvb-690055993011-kmod-2.6.32.8-ipfire
-* v4l-dvb-690055993011-kmod-2.6.32.8-ipfire-xen
+* v4l-dvb-690055993011-kmod-2.6.32.9-ipfire
+* v4l-dvb-690055993011-kmod-2.6.32.9-ipfire-xen
* vdr-1.6.0
* vdradmin-am-3.6.5
* vim-7.0
diff --git a/lfs/linux b/lfs/linux
index db2ca20..6299c4e 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
include Config
-PATCHLEVEL = .8
-VER = 2.6.32.8
+PATCHLEVEL = .9
+VER = 2.6.32.9
THISAPP = linux-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -66,12 +66,14 @@ reiser4-for-2.6.32.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2
squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 = $(URL_IPFIRE)/squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2
linux-$(VER)-suse_xen_patches-1.tar.bz2 = $(URL_IPFIRE)/linux-$(VER)-suse_xen_patches-1.tar.bz2
-$(DL_FILE)_MD5 = 82023ede52f067fcc55c5e70b02e48ae
+
+$(DL_FILE)_MD5 = 0771a9c70503c92f40d815ef76eb62fe
netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f
patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138
reiser4-for-2.6.32.patch.bz2_MD5 = 3246397973d9271eb8e6d7c97c5d2d91
squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2_MD5 = d2a84311081023c7ffd28cdca67c45d4
-linux-$(VER)-suse_xen_patches-1.tar.bz2_MD5 = 0bf813cbfef22f37e5060daa7dad0496
+linux-$(VER)-suse_xen_patches-1.tar.bz2_MD5 = c79c4dfd069fdedbc39df478de678575
+
install : $(TARGET)
@@ -127,9 +129,6 @@ else
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32-imq-test2.patch
endif
-# # Add Vodafone K3565-Z USB ID's to option driver
-# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.27.25-option_add_vf-k3565-z_usbids.patch
-
# Add patch to fix ath5k "no txbuf available"
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32-ath5k_fix_setup_for_CAB_queue.patch
diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh
index 870625c..dacf80c 100644
--- a/src/paks/linux-xen/install.sh
+++ b/src/paks/linux-xen/install.sh
@@ -24,7 +24,7 @@
. /opt/pakfire/lib/functions.sh
extract_files
#
-KVER=2.6.32.8
+KVER=2.6.32.9
ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1`
MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
# Nur den letzten Parameter verwenden
diff --git a/src/patches/suse_xen_series.conf b/src/patches/suse_xen_series.conf
old mode 100755
new mode 100644
index 5a82c62..c0d4034
--- a/src/patches/suse_xen_series.conf
+++ b/src/patches/suse_xen_series.conf
@@ -35,6 +35,7 @@
# patches.kernel.org/patch-2.6.32.5-6
# patches.kernel.org/patch-2.6.32.6-7
# patches.kernel.org/patch-2.6.32.7-8
+# patches.kernel.org/patch-2.6.32.8-9
########################################################
# Build fixes that apply to the vanilla kernel too.
@@ -115,10 +116,10 @@
patches.fixes/sched-fix-vmark-regression
patches.fixes/sched-inline__percpu_counter_add.patch
patches.fixes/sched-cpuacct-percpu-counter-batch.patch
+ patches.fixes/sched-fix-sched_mc_power_savings-for-non-SMT
# writable limits
patches.suse/rlim-0002-resource-move-kernel-function-inside-__KERNEL__.patch
- patches.suse/rlim-0003-resource-add-helpers-for-fetching-rlimits.patch
patches.suse/rlim-0004-IA64-use-helpers-for-rlimits.patch
patches.suse/rlim-0005-core-posix-cpu-timers-cleanup-rlimits-usage.patch
patches.suse/rlim-0006-PPC-use-helpers-for-rlimits.patch
@@ -146,9 +147,10 @@
patches.fixes/reuse-ktime-from-tip.diff
patches.fixes/sched-Limit-the-number-of-scheduler-debug-messages.patch
- patches.fixes/futex_lock_pi-key-refcnt-fix
- patches.fixes/futex-handle-user-space-corruption-gracefully
+ patches.fixes/cpuset-slab-memspread-fix.patch
+ patches.fixes/fix_clock_gettime_vsyscall_time_warp.diff
+ patches.suse/cfq-turn-lowlatency-off-by-default.patch
########################################################
# Architecture-specific patches. These used to be all
# at the end of series.conf, but since we don't do
@@ -222,6 +224,9 @@
patches.fixes/x86_64_memory_hotplug_dev_mem.patch
patches.arch/x86-Avoid-race-condition-in-pci_enable_msix.patch
+ patches.arch/x86-calgary-increase-max-phb-bus-num.patch
+
+ patches.arch/x86_64_apic_consider_hotplug_for_mode_logical_flat.patch
########################################################
# x86 MCE/MCA (Machine Check Error/Architecture) extensions
@@ -425,7 +430,6 @@
patches.arch/s390-05-12-tape-remove-fn.patch
patches.arch/s390-05-13-qeth-blkt-defaults.patch
patches.arch/s390-05-14-dasd-dasd-enable-prefix.patch
- patches.arch/s390-05-15-dasd-s390dbf-strings.patch
patches.arch/s390-05-16-dasd-wait-lcu-setup.patch
patches.arch/s390-06-01-zfcp-introduce-bsg-timeout-callback.patch
@@ -434,6 +438,12 @@
patches.arch/s390-07-03-cio-fix-vary-handling.patch
patches.arch/s390-07-04-dasd_online_offline_race.patch
+ patches.arch/s390-08-01-zfcp_port_dequeue_race.patch
+ patches.arch/s390-08-02-zfcp_fc_bsg_report_error.patch
+ patches.arch/s390-08-03-qdio-input-error.patch
+ patches.arch/s390-08-04-qdio-int_handler_warn.patch
+ patches.arch/s390-08-05-hvc-iucv-alloc-dma.patch
+
########################################################
# VM/FS patches
########################################################
@@ -457,7 +467,8 @@
patches.fixes/aggressive-zone-reclaim.patch
patches.suse/readahead-request-tunables.patch
- patches.fixes/fix-potential-crash-with-sys_move_pages
+ patches.fixes/mm-memcg-coalesce-uncharge.patch
+ patches.fixes/mm-memcg-coalesce-charging.patch
########################################################
# IPC patches
@@ -512,7 +523,6 @@
patches.arch/acpi_srat-pxm-rev-store.patch
patches.arch/acpi_srat-pxm-rev-ia64.patch
patches.arch/acpi_srat-pxm-rev-x86-64.patch
- patches.fixes/acpi_NULL_check_scan_bus.patch
patches.arch/x86_cpu_hotplug_map_numa_node_correctly.patch
patches.arch/acpi_enable_C3_on_huge_latencies.patch
@@ -568,7 +578,6 @@
patches.fixes/nfs-fix-NFS4ERR_FILE_OPEN-handling
- patches.fixes/nfs-fix-nfs_fscache_release_page.patch
########################################################
# lockd + statd
########################################################
@@ -598,6 +607,7 @@
# dlm
########################################################
patches.fixes/dlm-enable-debug.patch
+ patches.fixes/dlm-always-use-GFP_NOFS.patch
########################################################
# ocfs2
@@ -633,6 +643,21 @@
patches.suse/ocfs2-allocation-resrvations.patch
+ # ocfs2 fixes from 2.6.33-rc8
+ patches.fixes/ocfs2-Fix-memory-overflow-in-cow_by_page.patch
+ patches.fixes/ocfs2-Only-bug-out-when-page-size-is-larger-than-clu.patch
+ patches.fixes/ocfs2-dlm-Handle-EAGAIN-for-compatibility-v2.patch
+ patches.fixes/ocfs2-Use-compat_ptr-in-reflink_arguments.patch
+ patches.fixes/ocfs2-Fix-setting-of-OCFS2_LOCK_BLOCKED-during-bast.patch
+ patches.fixes/ocfs2-Prevent-a-livelock-in-dlmglue.patch
+ patches.fixes/ocfs2-Do-not-downconvert-if-the-lock-level-is-alread.patch
+ patches.fixes/ocfs2-Remove-overzealous-BUG_ON-during-blocked-lock-.patch
+ patches.fixes/ocfs2-Plugs-race-between-the-dc-thread-and-an-unlock.patch
+ patches.fixes/ocfs2-dlm-Remove-BUG_ON-in-dlm-recovery-when-freeing.patch
+ patches.fixes/ocfs2-Fix-contiguousness-check-in-ocfs2_try_to_merge.patch
+ patches.fixes/ocfs2-dlm-Fix-printing-of-lockname.patch
+ patches.fixes/ocfs2-cluster-Make-o2net-connect-messages-KERN_NOTIC.patch
+
########################################################
# gfs2 read-only support for migration
########################################################
@@ -655,6 +680,9 @@
# patches.suse/novfs-client-module
# patches.suse/novfs-fix-debug-message.patch
# patches.fixes/novfs-err_ptr-fix.diff
+# patches.fixes/novfs-fix-inode-uid
+# patches.fixes/novfs-incorrect-filesize-fix
+# patches.fixes/novfs-truncate-fix
########################################################
# other filesystem stuff
@@ -702,6 +730,12 @@
patches.suse/SoN-29-fix-swap_sync_page-race
patches.suse/SoN-30-fix-uninitialized-var.patch
+ # dont want to rediff SoN until these get more testing
+ patches.suse/slab-memless-node-01-introduce-numa_mem_id.patch
+ patches.suse/slab-memless-node-02-slab-use-numa_mem_id.patch
+ patches.suse/slab-memless-node-03-ia64-memoryless-nodes.patch
+ patches.suse/slab-memless-node-04-kernel-profile-memoryless-nodes.patch
+
########################################################
# Netfilter
########################################################
@@ -768,24 +802,31 @@
patches.suse/fc-transport-allow-dev_loss_tmo-disable
patches.suse/blk-queue-unprep-fn
patches.suse/blk-add-atomic-abort-flag
+ patches.fixes/fc_bsg_request_packed
+ patches.fixes/bsg-SG_IO-compat_ioctl
patches.fixes/scsi-check-host-lookup-failure
patches.drivers/aacraid-24701-update
patches.drivers/megaraid-04.12-update
patches.drivers/qla2xxx-8.03.01.01.11.1-k8-update
patches.drivers/qla2xxx-8.03.01.02.11.1-k8-update
+ patches.drivers/qla2xxx-8.03.01.03.11.1-k8-update
patches.drivers/megaraid-mbox-fix-SG_IO
patches.drivers/mpt2sas-03.100.03.00-update
patches.drivers/bfa-2.1.2.1-update
patches.drivers/qla4xxx-5.01.00-k9-5.01.00.00.11.01-k10.patch
+ patches.drivers/qla4xxx-5.01.00.00.11.01-k10_5.01.00.00.11.01-k11.patch
+ patches.drivers/qla4xxx-5.01.00.00.11.01-k11_5.01.00.00.11.01-k12.patch
patches.fixes/aic79xx-null-scb-in-nonpkt-busfree
patches.drivers/lpfc-8.3.5-update
patches.drivers/lpfc-8.3.5.3-update
patches.drivers/lpfc-8.3.5.4-update
+ patches.drivers/lpfc-8.3.5.5-update
patches.drivers/vmw_pvscsi-scsi-driver-for-vmware-s-virtual-hba.patch
patches.fixes/scsi-fc-class-allow-LLD-bsg-timeout
- patches.fixes/qla2xxx-restore-pci-state-after-eeh-recovery
patches.drivers/pmcraid-2.6.33-rc6-update
+ patches.drivers/qla1280-request-firmware-lock
+ patches.drivers/qla1280-fallback-to-loaded-fw
# Remaining SCSI patches (garloff)
patches.suse/scsi-error-test-unit-ready-timeout
@@ -803,14 +844,12 @@
########################################################
# DRM/Video
########################################################
- patches.drivers/drm-i915-add-i915_lp_ring_sync-helper.patch
patches.drivers/drm-i915-implement-drmmode-overlay-support-v4.patch
patches.drivers/drm-i915-fully-switch-off-overlay-when-not-in-use.patch
patches.drivers/drm-i915-implement-fastpath-for-overlay-flip-waiting.patch
patches.drivers/drm-i915-fix-get_core_clock_speed-for-g33-class-desktop-chips.patch
patches.drivers/drm-i915-add-acpi-opregion-support-for-ironlake.patch
patches.drivers/drm-i915-fix-crt-hotplug-hang
- patches.drivers/drm-i915-fix-ironlake-crt-hotplug
patches.drivers/drm-i915-adhoc-disable-lid-detection
########################################################
@@ -824,17 +863,19 @@
patches.fixes/tehuti-firmware-name
patches.drivers/dmfe-tulip-Let-dmfe-handle-DM910x-except-for-SPARC-o.patch
- # entropy FATE##307517
- patches.drivers/bnx2-entropy-source.patch
- patches.drivers/e1000-entropy-source.patch
- patches.drivers/e1000e-entropy-source.patch
- patches.drivers/igb-entropy-source.patch
- patches.drivers/ixgbe-entropy-source.patch
- patches.drivers/tg3-entropy-source.patch
+ # barton hills support bnc#557479
+ patches.drivers/igb-add-new-data-structure-for-handling-interrupts-a.patch
+ patches.drivers/igb-cleanup-interrupt-enablement-in-regards-to-msix_.patch
+ patches.drivers/igb-cleanup-some-of-the-code-related-to-hw-timestamp.patch
+ patches.drivers/igb-use-packet-buffer-sizes-from-RXPBS-register.patch
+ patches.drivers/igb-0001-add-support-for-the-82580-phy.patch
+ patches.drivers/igb-0002-Add-full-support-for-82580-devices.patch
+ patches.drivers/igb-0003-add-support-for-82580-MAC.patch
patches.drivers/phy-broadcom-bug-fixes-for-sp1.patch
patches.drivers/tg3-update-version-to-3.104.patch
patches.drivers/tg3-updates-from-f4188d-to-ba5b0bf.patch
+ patches.suse/tg3-5785-and-57780-asic-revs-not-working.patch
patches.drivers/bnx2-v2.6.32-to-b746656.patch
@@ -1021,6 +1062,10 @@
patches.drivers/ixgbe-use-eiam-to-automask-msi
patches.drivers/ixgbe-only-process-one-ixgbe_watchdog_task-at-a-time.patch
+ patches.drivers/ixgbe-prevent-speculative-processing-of-descriptors.patch
+
++philips patches.drivers/ixgbe-Add-support-for-the-new-ethtool-n-tuple-progra.patch
++philips patches.drivers/ethtool-Introduce-n-tuple-filter-programming-support.patch
patches.drivers/bnx2x-backports-v2.6.32-to-af901ca.patch
@@ -1043,6 +1088,16 @@
patches.drivers/cxgb3-fixing-eeh-handlers.patch
patches.drivers/e1000e-call-pci_save_state-after-pci_restore_state.patch
+ # entropy FATE##307517 suse patches, put below rest of netdev patches
+ patches.drivers/bnx2-entropy-source.patch
+ patches.drivers/e1000-entropy-source.patch
+ patches.drivers/e1000e-entropy-source.patch
+ patches.drivers/igb-entropy-source.patch
+ patches.drivers/ixgbe-entropy-source.patch
+ patches.drivers/tg3-entropy-source.patch
+
+ patches.drivers/ehca-process-mad-null.patch
+
########################################################
# Wireless Networking
########################################################
@@ -1059,6 +1114,8 @@
patches.fixes/iser-set-tgt-and-lu-reset-timeout
patches.drivers/cnic-backport-from-v2.6.32-4e9c4f.patch
patches.drivers/be2iscsi-beta4-update
+ patches.fixes/libiscsi-add-recover-target
+ patches.drivers/be2iscsi-BE3-support
########################################################
# PCI and PCI hotplug
@@ -1158,8 +1215,6 @@
patches.drivers/alsa-sp1-hda-65-idt-hp-mute-led-cleanup2
patches.drivers/alsa-sp1-hda-66-idt-hp-mute-led-fix-polarity
- patches.drivers/alsa-sp1-usb-01-avoid-oops-at-disconnect
-
########################################################
# Other driver fixes
########################################################
@@ -1202,7 +1257,6 @@
patches.suse/dm-mpath-no-activate-for-offlined-paths
patches.suse/dm-mpath-no-partitions-feature
patches.suse/dm-mpath-skip-disabled-devices-when-iterating
- patches.fixes/dm-stripe-zero-stripes
########################################################
# md
@@ -1295,11 +1349,6 @@
patches.suse/kdump-dump_after_notifier.patch
########################################################
- # cgroups
- ########################################################
- patches.suse/cgroup-disable-memory.patch
-
- ########################################################
# audit subsystem
########################################################
patches.suse/audit-export-logging.patch
@@ -1316,22 +1365,6 @@
patches.fixes/oprofile_bios_ctr.patch
- patches.trace/lttng-instrumentation-irq.patch
- patches.trace/lttng-instrumentation-softirq.patch
- patches.trace/lttng-instrumentation-kernel.patch
- patches.trace/lttng-instrumentation-filemap.patch
- patches.trace/lttng-instrumentation-swap.patch
- # fault.h: TP_PROTO(void) expansion failing on ia64, will fix next week
-+tonyj patches.trace/lttng-instrumentation-memory.patch
- patches.trace/lttng-instrumentation-page_alloc.patch
- patches.trace/lttng-instrumentation-hugetlb.patch
- patches.trace/lttng-instrumentation-net.patch
- patches.trace/lttng-instrumentation-ipv4.patch
- patches.trace/lttng-instrumentation-ipv6.patch
- patches.trace/lttng-instrumentation-socket.patch
- patches.trace/lttng-instrumentation-fs.patch
- patches.trace/lttng-instrumentation-ipc.patch
-
patches.trace/utrace-core
+needs_update-32 patches.fixes/nfs-write.c-bug-removal.patch
@@ -1499,7 +1532,11 @@
patches.xen/xen-x86-machphys-prediction
patches.xen/xen-x86-exit-mmap
patches.xen/xen-x86-per-cpu-vcpu-info
+ patches.xen/xen-x86-nohz-long-timeouts
+ patches.xen/xen-x86-xtime-lock
+ patches.xen/xen-x86-time-per-cpu
patches.xen/xen-x86_64-pgd-pin
patches.xen/xen-x86_64-pgd-alloc-order
patches.xen/xen-x86_64-dump-user-pgt
patches.xen/xen-x86_64-note-init-p2m
+ patches.xen/xen-fix_clock_gettime_vsyscall_time_warp.diff
hooks/post-receive
--
IPFire 2.x development tree
1
0