[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. f85ecfc4fe5b6b953c08009378f9783aef21b0bc
by gitï¼ ipfire.org 03 Oct '11
by gitï¼ ipfire.org 03 Oct '11
03 Oct '11
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via f85ecfc4fe5b6b953c08009378f9783aef21b0bc (commit)
via de9c681188cbd425f94cc4c3096b9923655053a2 (commit)
via 554a59042655d02f4e3600fbf0ba9ca3b0517ce6 (commit)
via ddf8b17034eeefaed9d57444914b9b332143c929 (commit)
via 2f855074b86442f0df7c1e51e1d5660b9751b0b9 (commit)
via 8b6ec1e2f24267369d1ba0d55d626eaefd91b815 (commit)
via b24b74e01a128564432e846e483e27b4b4672fb1 (commit)
from 0d37182ca57df3cd2c0e6c2b195295cc21549127 (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 f85ecfc4fe5b6b953c08009378f9783aef21b0bc
Merge: de9c681 554a590
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 3 17:12:10 2011 +0200
Merge remote-tracking branch 'arne_f/ghostscript-9.04'
commit de9c681188cbd425f94cc4c3096b9923655053a2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 3 17:11:32 2011 +0200
pakfire: Add build dependency to gettext.
commit 554a59042655d02f4e3600fbf0ba9ca3b0517ce6
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Oct 3 12:41:01 2011 +0200
ghostscript: Updated to 9.04
Fixes #243
commit ddf8b17034eeefaed9d57444914b9b332143c929
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 3 11:53:24 2011 +0200
lzo: Update to 2.06.
Fixes #246.
commit 2f855074b86442f0df7c1e51e1d5660b9751b0b9
Merge: 8b6ec1e 0d37182
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 3 02:13:09 2011 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit 8b6ec1e2f24267369d1ba0d55d626eaefd91b815
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 3 02:11:04 2011 +0200
xz: Fix packaging.
commit b24b74e01a128564432e846e483e27b4b4672fb1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 3 02:10:51 2011 +0200
libtool: Fix packaging.
-----------------------------------------------------------------------
Summary of changes:
ghostscript/ghostscript.nm | 2 +-
libtool/libtool.nm | 24 +++++++++---------------
lzo/lzo.nm | 7 +++----
pakfire/pakfire.nm | 3 ++-
xz/xz.nm | 10 +++++-----
5 files changed, 20 insertions(+), 26 deletions(-)
Difference in files:
diff --git a/ghostscript/ghostscript.nm b/ghostscript/ghostscript.nm
index 9922894..b310900 100644
--- a/ghostscript/ghostscript.nm
+++ b/ghostscript/ghostscript.nm
@@ -4,7 +4,7 @@
###############################################################################
name = ghostscript
-version = 9.02
+version = 9.04
release = 1
groups = Applications/Printing
diff --git a/libtool/libtool.nm b/libtool/libtool.nm
index 3012a96..57192cb 100644
--- a/libtool/libtool.nm
+++ b/libtool/libtool.nm
@@ -5,7 +5,7 @@
name = libtool
version = 2.4
-release = 1
+release = 2
groups = Build System/Libraries
url = http://www.gnu.org/software/libtool/
@@ -19,25 +19,19 @@ description
interface which simplifies the process of using shared libraries.
end
-source_dl =
+source_dl = http://ftp.gnu.org/gnu/libtool/
packages
package %{name}
-
- package %{name}-devel
- template DEVEL
-
- requires = libtool=%{thisver}
- # Overwrite filelist that /usr/share/aclocal will be in main package
- files
- /usr/include
- /usr/lib*/lib*.so
- /usr/share/libtool/libltdl
- end
- end
-
package %{name}-libs
template LIBS
end
+
+ package %{name}-devel
+ template DEVEL
+
+ # /usr/share/aclocal must be in main package.
+ files += !/usr/share/aclocal
+ end
end
diff --git a/lzo/lzo.nm b/lzo/lzo.nm
index 0aac748..917afd0 100644
--- a/lzo/lzo.nm
+++ b/lzo/lzo.nm
@@ -4,7 +4,7 @@
###############################################################################
name = lzo
-version = 2.05
+version = 2.06
release = 1
groups = Applications/Compression
@@ -20,7 +20,7 @@ description
while still decompressing at this very high speed.
end
-source_dl =
+source_dl = http://www.oberhumer.com/opensource/lzo/download/
build
requires
@@ -34,8 +34,7 @@ end
packages
package %{name}
- end
-
+
package %{name}-devel
template DEVEL
end
diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm
index a96e3e0..ed34cde 100644
--- a/pakfire/pakfire.nm
+++ b/pakfire/pakfire.nm
@@ -5,7 +5,7 @@
name = pakfire
version = 0.9.10
-release = 1
+release = 2
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
groups = System/Packaging
@@ -22,6 +22,7 @@ source_dl = http://source.ipfire.org/releases/pakfire/
build
requires
+ gettext
libsolv-devel
python-devel
end
diff --git a/xz/xz.nm b/xz/xz.nm
index 83af5ad..a44f472 100644
--- a/xz/xz.nm
+++ b/xz/xz.nm
@@ -5,7 +5,7 @@
name = xz
version = 5.0.3
-release = 1
+release = 2
groups = Build Applications/Compression
url = http://tukaani.org/xz/
@@ -26,11 +26,11 @@ sources = %{thisapp}.tar.xz
packages
package %{name}
- package %{name}-devel
- template DEVEL
- end
-
package %{name}-libs
template LIBS
end
+
+ package %{name}-devel
+ template DEVEL
+ end
end
hooks/post-receive
--
IPFire 3.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c9ccb5c917121726589eda090a5136c574747a72
by gitï¼ ipfire.org 03 Oct '11
by gitï¼ ipfire.org 03 Oct '11
03 Oct '11
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 c9ccb5c917121726589eda090a5136c574747a72 (commit)
from 43dbfa395c44b984eddbad801d164ecf39d73443 (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 c9ccb5c917121726589eda090a5136c574747a72
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Oct 3 14:28:57 2011 +0200
crda: rootfile update.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/crda | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
Difference in files:
diff --git a/config/rootfiles/common/crda b/config/rootfiles/common/crda
index 3c932a1..72b6fa6 100644
--- a/config/rootfiles/common/crda
+++ b/config/rootfiles/common/crda
@@ -1,8 +1,8 @@
lib/udev/rules.d/85-regulatory.rules
#root/.python-eggs
-#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-i686.egg-tmp
-#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-i686.egg-tmp/M2Crypto
-#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-i686.egg-tmp/M2Crypto/__m2crypto.so
+#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-MACHINE.egg-tmp
+#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-MACHINE.egg-tmp/M2Crypto
+#root/.python-eggs/M2Crypto-0.21.1-py2.7-linux-MACHINE.egg-tmp/M2Crypto/__m2crypto.so
sbin/crda
sbin/regdbdump
#usr/share/man/man8/crda.8.gz
hooks/post-receive
--
IPFire 2.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 43dbfa395c44b984eddbad801d164ecf39d73443
by gitï¼ ipfire.org 03 Oct '11
by gitï¼ ipfire.org 03 Oct '11
03 Oct '11
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 43dbfa395c44b984eddbad801d164ecf39d73443 (commit)
from 83131f6625db3266f2a2bf8dae79e85b2f2f8042 (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 43dbfa395c44b984eddbad801d164ecf39d73443
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Oct 3 11:56:42 2011 +0200
uboot: add rootfile.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/armv5tel/uboot | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 config/rootfiles/common/armv5tel/uboot
Difference in files:
diff --git a/config/rootfiles/common/armv5tel/uboot b/config/rootfiles/common/armv5tel/uboot
new file mode 100644
index 0000000..80864b7
--- /dev/null
+++ b/config/rootfiles/common/armv5tel/uboot
@@ -0,0 +1 @@
+usr/bin/mkimage
hooks/post-receive
--
IPFire 2.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 83131f6625db3266f2a2bf8dae79e85b2f2f8042
by gitï¼ ipfire.org 03 Oct '11
by gitï¼ ipfire.org 03 Oct '11
03 Oct '11
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 83131f6625db3266f2a2bf8dae79e85b2f2f8042 (commit)
from e137ec4ecf166320ce92d5068e864034e19b8f48 (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 83131f6625db3266f2a2bf8dae79e85b2f2f8042
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Oct 3 11:52:34 2011 +0200
moved some rootfile from common to i586.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/{ => i586}/binutils | 0
config/rootfiles/common/{ => i586}/initscripts | 0
config/rootfiles/common/{ => i586}/lm_sensors | 0
.../core/53/filelists/{ => i586}/kvm-kmod | 0
lfs/linux | 1 +
5 files changed, 1 insertions(+), 0 deletions(-)
rename config/rootfiles/common/{ => i586}/binutils (100%)
rename config/rootfiles/common/{ => i586}/initscripts (100%)
rename config/rootfiles/common/{ => i586}/lm_sensors (100%)
rename config/rootfiles/core/53/filelists/{ => i586}/kvm-kmod (100%)
Difference in files:
diff --git a/config/rootfiles/common/binutils b/config/rootfiles/common/binutils
deleted file mode 100644
index 0cd5af9..0000000
--- a/config/rootfiles/common/binutils
+++ /dev/null
@@ -1,75 +0,0 @@
-#usr/bin/addr2line
-#usr/bin/ar
-#usr/bin/as
-#usr/bin/c++filt
-#usr/bin/gprof
-#usr/bin/ld
-#usr/bin/nm
-#usr/bin/objcopy
-#usr/bin/objdump
-#usr/bin/ranlib
-#usr/bin/readelf
-#usr/bin/size
-#usr/bin/strings
-#usr/bin/strip
-#usr/include/ansidecl.h
-#usr/include/bfd.h
-#usr/include/bfdlink.h
-#usr/include/dis-asm.h
-#usr/include/libiberty.h
-#usr/include/symcat.h
-#usr/info/as.info
-#usr/info/bfd.info
-#usr/info/binutils.info
-#usr/info/configure.info
-#usr/info/gprof.info
-#usr/info/ld.info
-#usr/info/standards.info
-#usr/lib/ldscripts
-#usr/lib/ldscripts/elf_i386.x
-#usr/lib/ldscripts/elf_i386.xbn
-#usr/lib/ldscripts/elf_i386.xc
-#usr/lib/ldscripts/elf_i386.xd
-#usr/lib/ldscripts/elf_i386.xdc
-#usr/lib/ldscripts/elf_i386.xdw
-#usr/lib/ldscripts/elf_i386.xn
-#usr/lib/ldscripts/elf_i386.xr
-#usr/lib/ldscripts/elf_i386.xs
-#usr/lib/ldscripts/elf_i386.xsc
-#usr/lib/ldscripts/elf_i386.xsw
-#usr/lib/ldscripts/elf_i386.xu
-#usr/lib/ldscripts/elf_i386.xw
-#usr/lib/ldscripts/i386linux.x
-#usr/lib/ldscripts/i386linux.xbn
-#usr/lib/ldscripts/i386linux.xn
-#usr/lib/ldscripts/i386linux.xr
-#usr/lib/ldscripts/i386linux.xu
-#usr/lib/libbfd-2.18.so
-#usr/lib/libbfd.a
-#usr/lib/libbfd.la
-#usr/lib/libbfd.so
-#usr/lib/libiberty.a
-#usr/lib/libopcodes-2.18.so
-#usr/lib/libopcodes.a
-#usr/lib/libopcodes.la
-#usr/lib/libopcodes.so
-#usr/man
-#usr/man/man1
-#usr/man/man1/addr2line.1
-#usr/man/man1/ar.1
-#usr/man/man1/as.1
-#usr/man/man1/c++filt.1
-#usr/man/man1/dlltool.1
-#usr/man/man1/gprof.1
-#usr/man/man1/ld.1
-#usr/man/man1/nlmconv.1
-#usr/man/man1/nm.1
-#usr/man/man1/objcopy.1
-#usr/man/man1/objdump.1
-#usr/man/man1/ranlib.1
-#usr/man/man1/readelf.1
-#usr/man/man1/size.1
-#usr/man/man1/strings.1
-#usr/man/man1/strip.1
-#usr/man/man1/windmc.1
-#usr/man/man1/windres.1
diff --git a/config/rootfiles/common/i586/binutils b/config/rootfiles/common/i586/binutils
new file mode 100644
index 0000000..0cd5af9
--- /dev/null
+++ b/config/rootfiles/common/i586/binutils
@@ -0,0 +1,75 @@
+#usr/bin/addr2line
+#usr/bin/ar
+#usr/bin/as
+#usr/bin/c++filt
+#usr/bin/gprof
+#usr/bin/ld
+#usr/bin/nm
+#usr/bin/objcopy
+#usr/bin/objdump
+#usr/bin/ranlib
+#usr/bin/readelf
+#usr/bin/size
+#usr/bin/strings
+#usr/bin/strip
+#usr/include/ansidecl.h
+#usr/include/bfd.h
+#usr/include/bfdlink.h
+#usr/include/dis-asm.h
+#usr/include/libiberty.h
+#usr/include/symcat.h
+#usr/info/as.info
+#usr/info/bfd.info
+#usr/info/binutils.info
+#usr/info/configure.info
+#usr/info/gprof.info
+#usr/info/ld.info
+#usr/info/standards.info
+#usr/lib/ldscripts
+#usr/lib/ldscripts/elf_i386.x
+#usr/lib/ldscripts/elf_i386.xbn
+#usr/lib/ldscripts/elf_i386.xc
+#usr/lib/ldscripts/elf_i386.xd
+#usr/lib/ldscripts/elf_i386.xdc
+#usr/lib/ldscripts/elf_i386.xdw
+#usr/lib/ldscripts/elf_i386.xn
+#usr/lib/ldscripts/elf_i386.xr
+#usr/lib/ldscripts/elf_i386.xs
+#usr/lib/ldscripts/elf_i386.xsc
+#usr/lib/ldscripts/elf_i386.xsw
+#usr/lib/ldscripts/elf_i386.xu
+#usr/lib/ldscripts/elf_i386.xw
+#usr/lib/ldscripts/i386linux.x
+#usr/lib/ldscripts/i386linux.xbn
+#usr/lib/ldscripts/i386linux.xn
+#usr/lib/ldscripts/i386linux.xr
+#usr/lib/ldscripts/i386linux.xu
+#usr/lib/libbfd-2.18.so
+#usr/lib/libbfd.a
+#usr/lib/libbfd.la
+#usr/lib/libbfd.so
+#usr/lib/libiberty.a
+#usr/lib/libopcodes-2.18.so
+#usr/lib/libopcodes.a
+#usr/lib/libopcodes.la
+#usr/lib/libopcodes.so
+#usr/man
+#usr/man/man1
+#usr/man/man1/addr2line.1
+#usr/man/man1/ar.1
+#usr/man/man1/as.1
+#usr/man/man1/c++filt.1
+#usr/man/man1/dlltool.1
+#usr/man/man1/gprof.1
+#usr/man/man1/ld.1
+#usr/man/man1/nlmconv.1
+#usr/man/man1/nm.1
+#usr/man/man1/objcopy.1
+#usr/man/man1/objdump.1
+#usr/man/man1/ranlib.1
+#usr/man/man1/readelf.1
+#usr/man/man1/size.1
+#usr/man/man1/strings.1
+#usr/man/man1/strip.1
+#usr/man/man1/windmc.1
+#usr/man/man1/windres.1
diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts
new file mode 100644
index 0000000..65fa0cd
--- /dev/null
+++ b/config/rootfiles/common/i586/initscripts
@@ -0,0 +1,223 @@
+#etc/rc.d
+#etc/rc.d/helper
+etc/rc.d/helper/getdnsfromdhcpc.pl
+etc/rc.d/helper/writeipac.pl
+#etc/rc.d/init.d
+#etc/rc.d/init.d/alsa
+#etc/rc.d/init.d/amavisd
+etc/rc.d/init.d/apache
+#etc/rc.d/init.d/apcupsd
+#etc/rc.d/init.d/applejuice
+#etc/rc.d/init.d/asterisk
+etc/rc.d/init.d/beep
+#etc/rc.d/init.d/bluetooth
+etc/rc.d/init.d/checkfs
+etc/rc.d/init.d/checkfstab
+etc/rc.d/init.d/waitdrives
+#etc/rc.d/init.d/clamav
+etc/rc.d/init.d/cleanfs
+#etc/rc.d/init.d/client175
+etc/rc.d/init.d/collectd
+etc/rc.d/init.d/connectd
+etc/rc.d/init.d/console
+#etc/rc.d/init.d/cpufreq
+#etc/rc.d/init.d/cups
+#etc/rc.d/init.d/cyrus-imapd
+#etc/rc.d/init.d/cyrus-sasl
+etc/rc.d/init.d/dhcp
+etc/rc.d/init.d/dnsmasq
+etc/rc.d/init.d/fcron
+#etc/rc.d/init.d/fetchmail
+etc/rc.d/init.d/fireinfo
+etc/rc.d/init.d/firewall
+etc/rc.d/init.d/firstsetup
+etc/rc.d/init.d/functions
+#etc/rc.d/init.d/gnump3d
+etc/rc.d/init.d/halt
+#etc/rc.d/init.d/hostapd
+#etc/rc.d/init.d/icecream
+#etc/rc.d/init.d/imspector
+#etc/rc.d/init.d/ipfireseeder
+etc/rc.d/init.d/ipsec
+#etc/rc.d/init.d/lcd4linux
+#etc/rc.d/init.d/lcr
+etc/rc.d/init.d/leds
+etc/rc.d/init.d/localnet
+etc/rc.d/init.d/mISDN
+#etc/rc.d/init.d/mdadm
+#etc/rc.d/init.d/mediatomb
+#etc/rc.d/init.d/messagebus
+#etc/rc.d/init.d/miau
+#etc/rc.d/init.d/miniupnpd
+#etc/rc.d/init.d/mldonkey
+etc/rc.d/init.d/modules
+#etc/rc.d/init.d/motion
+etc/rc.d/init.d/mountfs
+etc/rc.d/init.d/mountkernfs
+#etc/rc.d/init.d/mpd
+#etc/rc.d/init.d/mysql
+#etc/rc.d/init.d/netsnmpd
+etc/rc.d/init.d/network
+#etc/rc.d/init.d/networking
+etc/rc.d/init.d/networking/any
+etc/rc.d/init.d/networking/blue
+etc/rc.d/init.d/networking/dhcpcd.exe
+etc/rc.d/init.d/networking/green
+etc/rc.d/init.d/networking/orange
+etc/rc.d/init.d/networking/red
+#etc/rc.d/init.d/networking/red.down
+etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq
+etc/rc.d/init.d/networking/red.down/10-ipsec
+etc/rc.d/init.d/networking/red.down/10-miniupnpd
+etc/rc.d/init.d/networking/red.down/10-ovpn
+etc/rc.d/init.d/networking/red.down/20-RL-firewall
+etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl
+#etc/rc.d/init.d/networking/red.up
+etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq
+etc/rc.d/init.d/networking/red.up/10-miniupnpd
+etc/rc.d/init.d/networking/red.up/10-multicast
+etc/rc.d/init.d/networking/red.up/20-RL-firewall
+etc/rc.d/init.d/networking/red.up/22-outgoingfwctrl
+etc/rc.d/init.d/networking/red.up/23-RS-snort
+etc/rc.d/init.d/networking/red.up/24-RS-qos
+etc/rc.d/init.d/networking/red.up/25-portfw
+etc/rc.d/init.d/networking/red.up/26-xtaccess
+etc/rc.d/init.d/networking/red.up/27-RS-squid
+etc/rc.d/init.d/networking/red.up/30-ddns
+etc/rc.d/init.d/networking/red.up/40-ipac
+etc/rc.d/init.d/networking/red.up/50-ipsec
+etc/rc.d/init.d/networking/red.up/50-ovpn
+etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl
+etc/rc.d/init.d/networking/red.up/99-fireinfo
+etc/rc.d/init.d/networking/red.up/99-pakfire-update
+#etc/rc.d/init.d/nfs-server
+etc/rc.d/init.d/ntp
+#etc/rc.d/init.d/nut
+#etc/rc.d/init.d/openvmtools
+#etc/rc.d/init.d/portmap
+#etc/rc.d/init.d/postfix
+#etc/rc.d/init.d/pound
+etc/rc.d/init.d/random
+etc/rc.d/init.d/rc
+etc/rc.d/init.d/reboot
+#etc/rc.d/init.d/samba
+#etc/rc.d/init.d/sane
+etc/rc.d/init.d/sendsignals
+etc/rc.d/init.d/setclock
+etc/rc.d/init.d/smartenabler
+etc/rc.d/init.d/snort
+#etc/rc.d/init.d/spamassassin
+etc/rc.d/init.d/squid
+etc/rc.d/init.d/sshd
+#etc/rc.d/init.d/sslh
+etc/rc.d/init.d/static-routes
+etc/rc.d/init.d/swap
+etc/rc.d/init.d/sysctl
+etc/rc.d/init.d/sysklogd
+etc/rc.d/init.d/teamspeak
+etc/rc.d/init.d/template
+#etc/rc.d/init.d/tftpd
+etc/rc.d/init.d/tmpfs
+#etc/rc.d/init.d/transmission
+etc/rc.d/init.d/udev
+etc/rc.d/init.d/udev_retry
+etc/rc.d/init.d/upnpd
+#etc/rc.d/init.d/vdr
+#etc/rc.d/init.d/vdradmin
+#etc/rc.d/init.d/vsftpd
+#etc/rc.d/init.d/watchdog
+#etc/rc.d/init.d/winbind
+#etc/rc.d/init.d/xinetd
+#etc/rc.d/rc0.d
+#etc/rc.d/rc0.d/K01imspetor
+#etc/rc.d/rc0.d/K01motion
+#etc/rc.d/rc0.d/K01vdradmin
+#etc/rc.d/rc0.d/K02mediatomb
+#etc/rc.d/rc0.d/K02sslh
+etc/rc.d/rc0.d/K08fcron
+etc/rc.d/rc0.d/K28apache
+etc/rc.d/rc0.d/K30sshd
+#etc/rc.d/rc0.d/K34client175
+etc/rc.d/rc0.d/K45random
+etc/rc.d/rc0.d/K49cyrus-sasl
+etc/rc.d/rc0.d/K78snort
+etc/rc.d/rc0.d/K79leds
+etc/rc.d/rc0.d/K80network
+#etc/rc.d/rc0.d/K84bluetooth
+#etc/rc.d/rc0.d/K85messagebus
+etc/rc.d/rc0.d/K85tmpfs
+etc/rc.d/rc0.d/K90sysklogd
+etc/rc.d/rc0.d/S60sendsignals
+etc/rc.d/rc0.d/S70localnet
+etc/rc.d/rc0.d/S80mountfs
+etc/rc.d/rc0.d/S90swap
+etc/rc.d/rc0.d/S99halt
+#etc/rc.d/rc3.d
+etc/rc.d/rc3.d/S01tmpfs
+etc/rc.d/rc3.d/S10sysklogd
+#etc/rc.d/rc3.d/S15messagebus
+#etc/rc.d/rc3.d/S16bluetooth
+#etc/rc.d/rc3.d/S18cpufreq
+etc/rc.d/rc3.d/S19smartenabler
+etc/rc.d/rc3.d/S20network
+etc/rc.d/rc3.d/S21leds
+etc/rc.d/rc3.d/S24cyrus-sasl
+etc/rc.d/rc3.d/S25random
+etc/rc.d/rc3.d/S30sshd
+etc/rc.d/rc3.d/S32apache
+etc/rc.d/rc3.d/S40fcron
+#etc/rc.d/rc3.d/S66client175
+#etc/rc.d/rc3.d/S98mediatomb
+etc/rc.d/rc3.d/S98rc.local
+#etc/rc.d/rc3.d/S98sslh
+#etc/rc.d/rc3.d/S99imspetor
+#etc/rc.d/rc3.d/S99motion
+#etc/rc.d/rc3.d/S99vdradmin
+#etc/rc.d/rc6.d
+#etc/rc.d/rc6.d/K01imspetor
+#etc/rc.d/rc6.d/K01motion
+#etc/rc.d/rc6.d/K01vdradmin
+#etc/rc.d/rc6.d/K02mediatomb
+#etc/rc.d/rc6.d/K02sslh
+etc/rc.d/rc6.d/K08fcron
+etc/rc.d/rc6.d/K28apache
+etc/rc.d/rc6.d/K30sshd
+#etc/rc.d/rc6.d/K34client175
+etc/rc.d/rc6.d/K45random
+etc/rc.d/rc6.d/K49cyrus-sasl
+etc/rc.d/rc6.d/K78snort
+etc/rc.d/rc6.d/K79leds
+etc/rc.d/rc6.d/K80network
+#etc/rc.d/rc6.d/K84bluetooth
+#etc/rc.d/rc6.d/K85messagebus
+etc/rc.d/rc6.d/K85tmpfs
+etc/rc.d/rc6.d/K90sysklogd
+etc/rc.d/rc6.d/S60sendsignals
+etc/rc.d/rc6.d/S70mountfs
+etc/rc.d/rc6.d/S80swap
+etc/rc.d/rc6.d/S90localnet
+etc/rc.d/rc6.d/S99reboot
+#etc/rc.d/rcsysinit.d
+etc/rc.d/rcsysinit.d/S00mountkernfs
+etc/rc.d/rcsysinit.d/S05modules
+etc/rc.d/rcsysinit.d/S10udev
+etc/rc.d/rcsysinit.d/S19checkfstab
+etc/rc.d/rcsysinit.d/S19waitdrives
+etc/rc.d/rcsysinit.d/S20swap
+etc/rc.d/rcsysinit.d/S30checkfs
+etc/rc.d/rcsysinit.d/S40mountfs
+etc/rc.d/rcsysinit.d/S45udev_retry
+etc/rc.d/rcsysinit.d/S50cleanfs
+etc/rc.d/rcsysinit.d/S60setclock
+etc/rc.d/rcsysinit.d/S70console
+etc/rc.d/rcsysinit.d/S75firstsetup
+etc/rc.d/rcsysinit.d/S80localnet
+etc/rc.d/rcsysinit.d/S90sysctl
+etc/rc.d/rc3.d/S15fireinfo
+#etc/sysconfig
+etc/sysconfig/createfiles
+etc/sysconfig/firewall.local
+etc/sysconfig/modules
+etc/sysconfig/rc
+etc/sysconfig/rc.local
+etc/init.d
diff --git a/config/rootfiles/common/i586/lm_sensors b/config/rootfiles/common/i586/lm_sensors
new file mode 100644
index 0000000..217ac54
--- /dev/null
+++ b/config/rootfiles/common/i586/lm_sensors
@@ -0,0 +1,25 @@
+etc/sensors.d
+etc/sensors3.conf
+usr/bin/sensors
+usr/bin/sensors-conf-convert
+#usr/include/sensors
+#usr/include/sensors/error.h
+#usr/include/sensors/sensors.h
+#usr/lib/libsensors.a
+usr/lib/libsensors.so
+usr/lib/libsensors.so.4
+usr/lib/libsensors.so.4.3.1
+#usr/man/man1/sensors.1
+#usr/man/man3/libsensors.3
+#usr/man/man5/sensors.conf.5
+#usr/man/man5/sensors3.conf.5
+#usr/man/man8/fancontrol.8
+#usr/man/man8/isadump.8
+#usr/man/man8/isaset.8
+#usr/man/man8/pwmconfig.8
+#usr/man/man8/sensors-detect.8
+usr/sbin/fancontrol
+usr/sbin/isadump
+usr/sbin/isaset
+usr/sbin/pwmconfig
+usr/sbin/sensors-detect
diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts
deleted file mode 100644
index 65fa0cd..0000000
--- a/config/rootfiles/common/initscripts
+++ /dev/null
@@ -1,223 +0,0 @@
-#etc/rc.d
-#etc/rc.d/helper
-etc/rc.d/helper/getdnsfromdhcpc.pl
-etc/rc.d/helper/writeipac.pl
-#etc/rc.d/init.d
-#etc/rc.d/init.d/alsa
-#etc/rc.d/init.d/amavisd
-etc/rc.d/init.d/apache
-#etc/rc.d/init.d/apcupsd
-#etc/rc.d/init.d/applejuice
-#etc/rc.d/init.d/asterisk
-etc/rc.d/init.d/beep
-#etc/rc.d/init.d/bluetooth
-etc/rc.d/init.d/checkfs
-etc/rc.d/init.d/checkfstab
-etc/rc.d/init.d/waitdrives
-#etc/rc.d/init.d/clamav
-etc/rc.d/init.d/cleanfs
-#etc/rc.d/init.d/client175
-etc/rc.d/init.d/collectd
-etc/rc.d/init.d/connectd
-etc/rc.d/init.d/console
-#etc/rc.d/init.d/cpufreq
-#etc/rc.d/init.d/cups
-#etc/rc.d/init.d/cyrus-imapd
-#etc/rc.d/init.d/cyrus-sasl
-etc/rc.d/init.d/dhcp
-etc/rc.d/init.d/dnsmasq
-etc/rc.d/init.d/fcron
-#etc/rc.d/init.d/fetchmail
-etc/rc.d/init.d/fireinfo
-etc/rc.d/init.d/firewall
-etc/rc.d/init.d/firstsetup
-etc/rc.d/init.d/functions
-#etc/rc.d/init.d/gnump3d
-etc/rc.d/init.d/halt
-#etc/rc.d/init.d/hostapd
-#etc/rc.d/init.d/icecream
-#etc/rc.d/init.d/imspector
-#etc/rc.d/init.d/ipfireseeder
-etc/rc.d/init.d/ipsec
-#etc/rc.d/init.d/lcd4linux
-#etc/rc.d/init.d/lcr
-etc/rc.d/init.d/leds
-etc/rc.d/init.d/localnet
-etc/rc.d/init.d/mISDN
-#etc/rc.d/init.d/mdadm
-#etc/rc.d/init.d/mediatomb
-#etc/rc.d/init.d/messagebus
-#etc/rc.d/init.d/miau
-#etc/rc.d/init.d/miniupnpd
-#etc/rc.d/init.d/mldonkey
-etc/rc.d/init.d/modules
-#etc/rc.d/init.d/motion
-etc/rc.d/init.d/mountfs
-etc/rc.d/init.d/mountkernfs
-#etc/rc.d/init.d/mpd
-#etc/rc.d/init.d/mysql
-#etc/rc.d/init.d/netsnmpd
-etc/rc.d/init.d/network
-#etc/rc.d/init.d/networking
-etc/rc.d/init.d/networking/any
-etc/rc.d/init.d/networking/blue
-etc/rc.d/init.d/networking/dhcpcd.exe
-etc/rc.d/init.d/networking/green
-etc/rc.d/init.d/networking/orange
-etc/rc.d/init.d/networking/red
-#etc/rc.d/init.d/networking/red.down
-etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq
-etc/rc.d/init.d/networking/red.down/10-ipsec
-etc/rc.d/init.d/networking/red.down/10-miniupnpd
-etc/rc.d/init.d/networking/red.down/10-ovpn
-etc/rc.d/init.d/networking/red.down/20-RL-firewall
-etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl
-#etc/rc.d/init.d/networking/red.up
-etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq
-etc/rc.d/init.d/networking/red.up/10-miniupnpd
-etc/rc.d/init.d/networking/red.up/10-multicast
-etc/rc.d/init.d/networking/red.up/20-RL-firewall
-etc/rc.d/init.d/networking/red.up/22-outgoingfwctrl
-etc/rc.d/init.d/networking/red.up/23-RS-snort
-etc/rc.d/init.d/networking/red.up/24-RS-qos
-etc/rc.d/init.d/networking/red.up/25-portfw
-etc/rc.d/init.d/networking/red.up/26-xtaccess
-etc/rc.d/init.d/networking/red.up/27-RS-squid
-etc/rc.d/init.d/networking/red.up/30-ddns
-etc/rc.d/init.d/networking/red.up/40-ipac
-etc/rc.d/init.d/networking/red.up/50-ipsec
-etc/rc.d/init.d/networking/red.up/50-ovpn
-etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl
-etc/rc.d/init.d/networking/red.up/99-fireinfo
-etc/rc.d/init.d/networking/red.up/99-pakfire-update
-#etc/rc.d/init.d/nfs-server
-etc/rc.d/init.d/ntp
-#etc/rc.d/init.d/nut
-#etc/rc.d/init.d/openvmtools
-#etc/rc.d/init.d/portmap
-#etc/rc.d/init.d/postfix
-#etc/rc.d/init.d/pound
-etc/rc.d/init.d/random
-etc/rc.d/init.d/rc
-etc/rc.d/init.d/reboot
-#etc/rc.d/init.d/samba
-#etc/rc.d/init.d/sane
-etc/rc.d/init.d/sendsignals
-etc/rc.d/init.d/setclock
-etc/rc.d/init.d/smartenabler
-etc/rc.d/init.d/snort
-#etc/rc.d/init.d/spamassassin
-etc/rc.d/init.d/squid
-etc/rc.d/init.d/sshd
-#etc/rc.d/init.d/sslh
-etc/rc.d/init.d/static-routes
-etc/rc.d/init.d/swap
-etc/rc.d/init.d/sysctl
-etc/rc.d/init.d/sysklogd
-etc/rc.d/init.d/teamspeak
-etc/rc.d/init.d/template
-#etc/rc.d/init.d/tftpd
-etc/rc.d/init.d/tmpfs
-#etc/rc.d/init.d/transmission
-etc/rc.d/init.d/udev
-etc/rc.d/init.d/udev_retry
-etc/rc.d/init.d/upnpd
-#etc/rc.d/init.d/vdr
-#etc/rc.d/init.d/vdradmin
-#etc/rc.d/init.d/vsftpd
-#etc/rc.d/init.d/watchdog
-#etc/rc.d/init.d/winbind
-#etc/rc.d/init.d/xinetd
-#etc/rc.d/rc0.d
-#etc/rc.d/rc0.d/K01imspetor
-#etc/rc.d/rc0.d/K01motion
-#etc/rc.d/rc0.d/K01vdradmin
-#etc/rc.d/rc0.d/K02mediatomb
-#etc/rc.d/rc0.d/K02sslh
-etc/rc.d/rc0.d/K08fcron
-etc/rc.d/rc0.d/K28apache
-etc/rc.d/rc0.d/K30sshd
-#etc/rc.d/rc0.d/K34client175
-etc/rc.d/rc0.d/K45random
-etc/rc.d/rc0.d/K49cyrus-sasl
-etc/rc.d/rc0.d/K78snort
-etc/rc.d/rc0.d/K79leds
-etc/rc.d/rc0.d/K80network
-#etc/rc.d/rc0.d/K84bluetooth
-#etc/rc.d/rc0.d/K85messagebus
-etc/rc.d/rc0.d/K85tmpfs
-etc/rc.d/rc0.d/K90sysklogd
-etc/rc.d/rc0.d/S60sendsignals
-etc/rc.d/rc0.d/S70localnet
-etc/rc.d/rc0.d/S80mountfs
-etc/rc.d/rc0.d/S90swap
-etc/rc.d/rc0.d/S99halt
-#etc/rc.d/rc3.d
-etc/rc.d/rc3.d/S01tmpfs
-etc/rc.d/rc3.d/S10sysklogd
-#etc/rc.d/rc3.d/S15messagebus
-#etc/rc.d/rc3.d/S16bluetooth
-#etc/rc.d/rc3.d/S18cpufreq
-etc/rc.d/rc3.d/S19smartenabler
-etc/rc.d/rc3.d/S20network
-etc/rc.d/rc3.d/S21leds
-etc/rc.d/rc3.d/S24cyrus-sasl
-etc/rc.d/rc3.d/S25random
-etc/rc.d/rc3.d/S30sshd
-etc/rc.d/rc3.d/S32apache
-etc/rc.d/rc3.d/S40fcron
-#etc/rc.d/rc3.d/S66client175
-#etc/rc.d/rc3.d/S98mediatomb
-etc/rc.d/rc3.d/S98rc.local
-#etc/rc.d/rc3.d/S98sslh
-#etc/rc.d/rc3.d/S99imspetor
-#etc/rc.d/rc3.d/S99motion
-#etc/rc.d/rc3.d/S99vdradmin
-#etc/rc.d/rc6.d
-#etc/rc.d/rc6.d/K01imspetor
-#etc/rc.d/rc6.d/K01motion
-#etc/rc.d/rc6.d/K01vdradmin
-#etc/rc.d/rc6.d/K02mediatomb
-#etc/rc.d/rc6.d/K02sslh
-etc/rc.d/rc6.d/K08fcron
-etc/rc.d/rc6.d/K28apache
-etc/rc.d/rc6.d/K30sshd
-#etc/rc.d/rc6.d/K34client175
-etc/rc.d/rc6.d/K45random
-etc/rc.d/rc6.d/K49cyrus-sasl
-etc/rc.d/rc6.d/K78snort
-etc/rc.d/rc6.d/K79leds
-etc/rc.d/rc6.d/K80network
-#etc/rc.d/rc6.d/K84bluetooth
-#etc/rc.d/rc6.d/K85messagebus
-etc/rc.d/rc6.d/K85tmpfs
-etc/rc.d/rc6.d/K90sysklogd
-etc/rc.d/rc6.d/S60sendsignals
-etc/rc.d/rc6.d/S70mountfs
-etc/rc.d/rc6.d/S80swap
-etc/rc.d/rc6.d/S90localnet
-etc/rc.d/rc6.d/S99reboot
-#etc/rc.d/rcsysinit.d
-etc/rc.d/rcsysinit.d/S00mountkernfs
-etc/rc.d/rcsysinit.d/S05modules
-etc/rc.d/rcsysinit.d/S10udev
-etc/rc.d/rcsysinit.d/S19checkfstab
-etc/rc.d/rcsysinit.d/S19waitdrives
-etc/rc.d/rcsysinit.d/S20swap
-etc/rc.d/rcsysinit.d/S30checkfs
-etc/rc.d/rcsysinit.d/S40mountfs
-etc/rc.d/rcsysinit.d/S45udev_retry
-etc/rc.d/rcsysinit.d/S50cleanfs
-etc/rc.d/rcsysinit.d/S60setclock
-etc/rc.d/rcsysinit.d/S70console
-etc/rc.d/rcsysinit.d/S75firstsetup
-etc/rc.d/rcsysinit.d/S80localnet
-etc/rc.d/rcsysinit.d/S90sysctl
-etc/rc.d/rc3.d/S15fireinfo
-#etc/sysconfig
-etc/sysconfig/createfiles
-etc/sysconfig/firewall.local
-etc/sysconfig/modules
-etc/sysconfig/rc
-etc/sysconfig/rc.local
-etc/init.d
diff --git a/config/rootfiles/common/lm_sensors b/config/rootfiles/common/lm_sensors
deleted file mode 100644
index 217ac54..0000000
--- a/config/rootfiles/common/lm_sensors
+++ /dev/null
@@ -1,25 +0,0 @@
-etc/sensors.d
-etc/sensors3.conf
-usr/bin/sensors
-usr/bin/sensors-conf-convert
-#usr/include/sensors
-#usr/include/sensors/error.h
-#usr/include/sensors/sensors.h
-#usr/lib/libsensors.a
-usr/lib/libsensors.so
-usr/lib/libsensors.so.4
-usr/lib/libsensors.so.4.3.1
-#usr/man/man1/sensors.1
-#usr/man/man3/libsensors.3
-#usr/man/man5/sensors.conf.5
-#usr/man/man5/sensors3.conf.5
-#usr/man/man8/fancontrol.8
-#usr/man/man8/isadump.8
-#usr/man/man8/isaset.8
-#usr/man/man8/pwmconfig.8
-#usr/man/man8/sensors-detect.8
-usr/sbin/fancontrol
-usr/sbin/isadump
-usr/sbin/isaset
-usr/sbin/pwmconfig
-usr/sbin/sensors-detect
diff --git a/config/rootfiles/core/53/filelists/i586/kvm-kmod b/config/rootfiles/core/53/filelists/i586/kvm-kmod
new file mode 100644
index 0000000..ec75215
--- /dev/null
+++ b/config/rootfiles/core/53/filelists/i586/kvm-kmod
@@ -0,0 +1,6 @@
+lib/modules/2.6.32.45-ipfire/kernel/arch/x86/kvm/kvm.ko
+lib/modules/2.6.32.45-ipfire/kernel/arch/x86/kvm/kvm-amd.ko
+lib/modules/2.6.32.45-ipfire/kernel/arch/x86/kvm/kvm-intel.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/arch/x86/kvm/kvm.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/arch/x86/kvm/kvm-amd.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/arch/x86/kvm/kvm-intel.ko
diff --git a/config/rootfiles/core/53/filelists/kvm-kmod b/config/rootfiles/core/53/filelists/kvm-kmod
deleted file mode 100644
index ec75215..0000000
--- a/config/rootfiles/core/53/filelists/kvm-kmod
+++ /dev/null
@@ -1,6 +0,0 @@
-lib/modules/2.6.32.45-ipfire/kernel/arch/x86/kvm/kvm.ko
-lib/modules/2.6.32.45-ipfire/kernel/arch/x86/kvm/kvm-amd.ko
-lib/modules/2.6.32.45-ipfire/kernel/arch/x86/kvm/kvm-intel.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/arch/x86/kvm/kvm.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/arch/x86/kvm/kvm-amd.ko
-lib/modules/2.6.32.45-ipfire-pae/kernel/arch/x86/kvm/kvm-intel.ko
diff --git a/lfs/linux b/lfs/linux
index 15347d4..2c2cfb9 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -196,6 +196,7 @@ else
ifeq "$(MACHINE_TYPE)" "arm"
cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" uImage
cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
+ cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/uImage
else
cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage
cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-$(VERSUFIX)
hooks/post-receive
--
IPFire 2.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 0d37182ca57df3cd2c0e6c2b195295cc21549127
by gitï¼ ipfire.org 03 Oct '11
by gitï¼ ipfire.org 03 Oct '11
03 Oct '11
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via 0d37182ca57df3cd2c0e6c2b195295cc21549127 (commit)
from c5869e53df76631393c603c1aafe03f6127f8059 (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 0d37182ca57df3cd2c0e6c2b195295cc21549127
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 3 02:12:20 2011 +0200
pakfire: Update to 0.9.10.
-----------------------------------------------------------------------
Summary of changes:
pakfire/pakfire.nm | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 deletions(-)
Difference in files:
diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm
index 883cba1..a96e3e0 100644
--- a/pakfire/pakfire.nm
+++ b/pakfire/pakfire.nm
@@ -4,7 +4,7 @@
###############################################################################
name = pakfire
-version = 0.9.6
+version = 0.9.10
release = 1
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
@@ -18,21 +18,19 @@ description
packages.
end
-source_dl =
+source_dl = http://source.ipfire.org/releases/pakfire/
build
requires
- intltool
libsolv-devel
python-devel
- python-distutils-extra
end
CFLAGS += -fno-strict-aliasing
test
# Check, if the binary module is loadable.
- cd %{DIR_APP}/build/lib*/pakfire/ && python -c "import _pakfire"
+ cd %{DIR_APP}/python/src/ && python -c "import _pakfire"
end
end
@@ -40,6 +38,10 @@ packages
package %{name}
groups += Base
+ requires = pakfire-common=%{thisver}
+ end
+
+ package %{name}-common
requires
pyliblzma
python-progressbar
@@ -47,6 +49,12 @@ packages
pyxattr
system-release
end
+
+ files
+ /usr/lib/pakfire/pakfire-multicall.py
+ /usr/lib*/python*/site-packages/pakfire*
+ /usr/share/locale
+ end
end
package %{name}-build
@@ -55,13 +63,36 @@ packages
The tools that are needed to build new pakfire packages.
end
groups += Build
-
+
requires
%{name}=%{thisver}
+ quality-agent=%{thisver}
+ end
+ conflicts = build-essentials
+
+ files
+ /usr/bin/pakfire-builder
+ /usr/bin/pakfire-server
+ /usr/lib/pakfire/*
+ !/usr/lib/pakfire/pakfire-multicall.py
+ end
+ end
+
+ package quality-agent
+ arch = noarch
+
+ summary = The pakfire quality agent.
+ description
+ The quality agent tests resulting packages that come out
+ of the build service.
+ It is a collection of scripts that check if everything is
+ working right.
end
files
- /usr/bin/pakfire-build
+ /usr/lib/pakfire/quality-agent*
end
+
+ requires = binutils file grep
end
end
hooks/post-receive
--
IPFire 3.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. c5869e53df76631393c603c1aafe03f6127f8059
by gitï¼ ipfire.org 02 Oct '11
by gitï¼ ipfire.org 02 Oct '11
02 Oct '11
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via c5869e53df76631393c603c1aafe03f6127f8059 (commit)
via f0a33aeb46d05ae275c1d048b5d6c24a05a6d3d6 (commit)
via 7f558df3c657d56e3f8b5e995464ac381c4f3200 (commit)
via 8925195fe9b650a307a44aaa565c491176ccdb1e (commit)
from d1c9beb33d3010ac90354a94b153797ee48d45a7 (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 c5869e53df76631393c603c1aafe03f6127f8059
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 3 01:22:31 2011 +0200
coreutils: Do not provide hostname.
The hostname binary is provided by net-tools.
commit f0a33aeb46d05ae275c1d048b5d6c24a05a6d3d6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 3 01:22:10 2011 +0200
bind: Fix typo in scriptlet.
commit 7f558df3c657d56e3f8b5e995464ac381c4f3200
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 22:38:49 2011 +0200
procps: Do not install kill in this package.
commit 8925195fe9b650a307a44aaa565c491176ccdb1e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 22:37:45 2011 +0200
pam: Remove login.defs which is provided by shadow-utils.
-----------------------------------------------------------------------
Summary of changes:
bind/bind.nm | 4 ++--
coreutils/coreutils.nm | 9 ++++-----
pam/pam.nm | 3 +--
procps/procps.nm | 5 ++++-
4 files changed, 11 insertions(+), 10 deletions(-)
Difference in files:
diff --git a/bind/bind.nm b/bind/bind.nm
index cb40481..92290af 100644
--- a/bind/bind.nm
+++ b/bind/bind.nm
@@ -5,7 +5,7 @@
name = bind
version = 9.8.1
-release = 1
+release = 2
groups = Networking/Tools
url = http://www.isc.org/products/BIND/
@@ -168,7 +168,7 @@ packages
getent passwd named > /dev/null || \
useradd -r -g named -d /var/named -s /sbin/nologin \
-c "User for bind DNS server" named
- exit0
+ exit 0
end
# XXX Add systemd scriptlet if a service file becomes available
diff --git a/coreutils/coreutils.nm b/coreutils/coreutils.nm
index 7686216..bb3c5a2 100644
--- a/coreutils/coreutils.nm
+++ b/coreutils/coreutils.nm
@@ -5,7 +5,7 @@
name = coreutils
version = 8.13
-release = 1
+release = 2
groups = Base Build System/Base
url = http://www.gnu.org/software/coreutils/
@@ -44,8 +44,8 @@ build
--enable-selinux \
--enable-largefile \
--disable-rpath \
- --enable-install-program=arch,hostname,su \
- --enable-no-install-program=kill,uptime
+ --enable-install-program=arch,su \
+ --enable-no-install-program=hostname,kill,uptime
prepare_cmds
aclocal -I m4
@@ -59,7 +59,7 @@ build
install_cmds
mkdir -pv %{BUILDROOT}/{bin,etc/profile.d,usr/sbin}
mv -v %{BUILDROOT}/usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} %{BUILDROOT}/bin
- mv -v %{BUILDROOT}/usr/bin/{false,hostname,ln,ls,mkdir,mknod,mv,pwd,readlink,rm} %{BUILDROOT}/bin
+ mv -v %{BUILDROOT}/usr/bin/{false,ln,ls,mkdir,mknod,mv,pwd,readlink,rm} %{BUILDROOT}/bin
mv -v %{BUILDROOT}/usr/bin/{rmdir,stty,sync,touch,true,uname} %{BUILDROOT}/bin
mv -v %{BUILDROOT}/usr/bin/chroot %{BUILDROOT}/usr/sbin
mv -v %{BUILDROOT}/usr/bin/{head,sleep,nice} %{BUILDROOT}/bin
@@ -80,5 +80,4 @@ end
packages
package %{name}
- end
end
diff --git a/pam/pam.nm b/pam/pam.nm
index 3772519..277c33e 100644
--- a/pam/pam.nm
+++ b/pam/pam.nm
@@ -5,7 +5,7 @@
name = pam
version = 1.1.0
-release = 3
+release = 4
thisapp = Linux-PAM-%{version}
groups = System/Base
@@ -54,7 +54,6 @@ build
#sed -i 's/yes/no/' %{BUILDROOT}/etc/default/useradd
mkdir -pv %{BUILDROOT}/etc/security
install -v -m644 %{DIR_SOURCE}/pam_env.conf %{BUILDROOT}/etc/security/pam_env.conf
- cp -vf %{DIR_SOURCE}/login.defs %{BUILDROOT}/etc
# Included in setup package
rm -f %{BUILDROOT}/etc/environment
diff --git a/procps/procps.nm b/procps/procps.nm
index 45f4845..5c50a59 100644
--- a/procps/procps.nm
+++ b/procps/procps.nm
@@ -5,7 +5,7 @@
name = procps
version = 3.2.8
-release = 1
+release = 2
groups = Base Applications/System
url = http://procps.sourceforge.net/
@@ -31,6 +31,9 @@ build
CFLAGS="%{CFLAGS}" \
W_SHOWFROM=-DW_SHOWFROM
+ make_install_targets += \
+ SKIP="/bin/kill /usr/share/man/man1/kill.1"
+
install_cmds
chmod -R 755 %{BUILDROOT}/{bin,lib,sbin}
end
hooks/post-receive
--
IPFire 3.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. d1c9beb33d3010ac90354a94b153797ee48d45a7
by gitï¼ ipfire.org 02 Oct '11
by gitï¼ ipfire.org 02 Oct '11
02 Oct '11
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via d1c9beb33d3010ac90354a94b153797ee48d45a7 (commit)
via 0336abd7a04b5effc0d5aa324737110d34bf4f9e (commit)
via 6df985df0c95b4ca6307086cf6aef6c94cb6064e (commit)
from 5fcdfe3b42dc8302e619d3af37428164a2ac8059 (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 d1c9beb33d3010ac90354a94b153797ee48d45a7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 22:30:45 2011 +0200
shadow-utils: Fix not building some binaries.
commit 0336abd7a04b5effc0d5aa324737110d34bf4f9e
Merge: 5fcdfe3 6df985d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 22:29:18 2011 +0200
Merge remote-tracking branch 'stevee/dhcpd'
commit 6df985df0c95b4ca6307086cf6aef6c94cb6064e
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Oct 2 22:06:37 2011 +0200
dhcp: Rework package.
* Fix compile error.
* Splitt into several packages.
* Add systemd files.
Fixes #229
Fixes #238
Fixes #226
-----------------------------------------------------------------------
Summary of changes:
dhcp/dhcp.nm | 170 ++++-
dhcp/patches/dhcp-4.2.0-CLOEXEC.patch | 422 ++++++++++
dhcp/patches/dhcp-4.2.0-PPP.patch | 150 ++++
dhcp/patches/dhcp-4.2.0-UseMulticast.patch | 229 ++++++
.../patches/dhcp-4.2.0-add_timeout_when_NULL.patch | 14 +
.../dhcp-4.2.0-default-requested-options.patch | 44 ++
.../dhcp-4.2.0-dhclient-decline-backoff.patch | 63 ++
dhcp/patches/dhcp-4.2.0-errwarn-message.patch | 30 +
dhcp/patches/dhcp-4.2.0-garbage-chars.patch | 12 +
dhcp/patches/dhcp-4.2.0-honor-expired.patch | 49 ++
dhcp/patches/dhcp-4.2.0-inherit-leases.patch | 34 +
dhcp/patches/dhcp-4.2.0-logpid.patch | 12 +
.../dhcp-4.2.0-missing-ipv6-not-fatal.patch | 40 +
dhcp/patches/dhcp-4.2.0-noprefixavail.patch | 140 ++++
dhcp/patches/dhcp-4.2.0-paths.patch | 45 ++
dhcp/patches/dhcp-4.2.0-release-by-ifup.patch | 85 ++
dhcp/patches/dhcp-4.2.0-unicast-bootp.patch | 99 +++
dhcp/patches/dhcp-4.2.1-64_bit_lease_parse.patch | 94 +++
dhcp/patches/dhcp-4.2.1-P1-CVE-2011-0997.patch | 16 +
.../patches/dhcp-4.2.1-invalid-dhclient-conf.patch | 12 +
dhcp/patches/dhcp-4.2.1-manpages.patch | 264 +++++++
dhcp/patches/dhcp-4.2.1-retransmission.patch | 48 ++
dhcp/patches/dhcp-4.2.1-sendDecline.patch | 231 ++++++
dhcp/patches/dhcp-4.2.2-CLOEXEC.patch | 423 ++++++++++
dhcp/patches/dhcp-4.2.2-capability.patch | 323 ++++++++
dhcp/patches/dhcp-4.2.2-dhclient-usage.patch | 14 +
dhcp/patches/dhcp-4.2.2-gpxe-cid.patch | 132 ++++
dhcp/patches/dhcp-4.2.2-improved-xid.patch | 138 ++++
dhcp/patches/dhcp-4.2.2-lpf-ib.patch | 538 +++++++++++++
dhcp/patches/dhcp-4.2.2-options.patch | 401 ++++++++++
dhcp/patches/dhcp-4.2.2-remove-bind.patch | 149 ++++
...hcp-4.2.2-rfc3442-classless-static-routes.patch | 405 ++++++++++
dhcp/patches/dhcp-4.2.2-sharedlib.patch | 119 +++
dhcp/patches/dhcp-4.2.2-systemtap.patch | 810 ++++++++++++++++++++
dhcp/patches/dhcp-4.2.2-xen-checksum.patch | 249 ++++++
dhcp/systemd/dhcpd.service | 9 +
dhcp/systemd/dhcpd6.service | 9 +
dhcp/systemd/dhcrelay.service | 9 +
shadow-utils/shadow-utils.nm | 16 +-
39 files changed, 6029 insertions(+), 18 deletions(-)
create mode 100644 dhcp/patches/dhcp-4.2.0-CLOEXEC.patch
create mode 100644 dhcp/patches/dhcp-4.2.0-PPP.patch
create mode 100644 dhcp/patches/dhcp-4.2.0-UseMulticast.patch
create mode 100644 dhcp/patches/dhcp-4.2.0-add_timeout_when_NULL.patch
create mode 100644 dhcp/patches/dhcp-4.2.0-default-requested-options.patch
create mode 100644 dhcp/patches/dhcp-4.2.0-dhclient-decline-backoff.patch
create mode 100644 dhcp/patches/dhcp-4.2.0-errwarn-message.patch
create mode 100644 dhcp/patches/dhcp-4.2.0-garbage-chars.patch
create mode 100644 dhcp/patches/dhcp-4.2.0-honor-expired.patch
create mode 100644 dhcp/patches/dhcp-4.2.0-inherit-leases.patch
create mode 100644 dhcp/patches/dhcp-4.2.0-logpid.patch
create mode 100644 dhcp/patches/dhcp-4.2.0-missing-ipv6-not-fatal.patch
create mode 100644 dhcp/patches/dhcp-4.2.0-noprefixavail.patch
create mode 100644 dhcp/patches/dhcp-4.2.0-paths.patch
create mode 100644 dhcp/patches/dhcp-4.2.0-release-by-ifup.patch
create mode 100644 dhcp/patches/dhcp-4.2.0-unicast-bootp.patch
create mode 100644 dhcp/patches/dhcp-4.2.1-64_bit_lease_parse.patch
create mode 100644 dhcp/patches/dhcp-4.2.1-P1-CVE-2011-0997.patch
create mode 100644 dhcp/patches/dhcp-4.2.1-invalid-dhclient-conf.patch
create mode 100644 dhcp/patches/dhcp-4.2.1-manpages.patch
create mode 100644 dhcp/patches/dhcp-4.2.1-retransmission.patch
create mode 100644 dhcp/patches/dhcp-4.2.1-sendDecline.patch
create mode 100644 dhcp/patches/dhcp-4.2.2-CLOEXEC.patch
create mode 100644 dhcp/patches/dhcp-4.2.2-capability.patch
create mode 100644 dhcp/patches/dhcp-4.2.2-dhclient-usage.patch
create mode 100644 dhcp/patches/dhcp-4.2.2-gpxe-cid.patch
create mode 100644 dhcp/patches/dhcp-4.2.2-improved-xid.patch
create mode 100644 dhcp/patches/dhcp-4.2.2-lpf-ib.patch
create mode 100644 dhcp/patches/dhcp-4.2.2-options.patch
create mode 100644 dhcp/patches/dhcp-4.2.2-remove-bind.patch
create mode 100644 dhcp/patches/dhcp-4.2.2-rfc3442-classless-static-routes.patch
create mode 100644 dhcp/patches/dhcp-4.2.2-sharedlib.patch
create mode 100644 dhcp/patches/dhcp-4.2.2-systemtap.patch
create mode 100644 dhcp/patches/dhcp-4.2.2-xen-checksum.patch
create mode 100644 dhcp/systemd/dhcpd.service
create mode 100644 dhcp/systemd/dhcpd6.service
create mode 100644 dhcp/systemd/dhcrelay.service
Difference in files:
diff --git a/dhcp/dhcp.nm b/dhcp/dhcp.nm
index a60868d..05dfd2f 100644
--- a/dhcp/dhcp.nm
+++ b/dhcp/dhcp.nm
@@ -4,8 +4,8 @@
###############################################################################
name = dhcp
-version = 4.2.1-P1
-release = 2
+version = 4.2.2
+release = 1
groups = Networking/Daemons
url = http://isc.org/products/DHCP/
@@ -13,23 +13,93 @@ license = ISC
summary = Dynamic host configuration protocol software.
description
- DHCP (Dynamic Host Configuration Protocol) is a protocol which allows \
- individual devices on an IP network to get their own network \
- configuration information (IP address, subnetmask, broadcast address, \
- etc.) from a DHCP server. The overall purpose of DHCP is to make it \
+ DHCP (Dynamic Host Configuration Protocol) is a protocol which allows
+ individual devices on an IP network to get their own network
+ configuration information (IP address, subnetmask, broadcast address,
+ etc.) from a DHCP server. The overall purpose of DHCP is to make it
easier to administer a large network.
end
-source_dl =
+source_dl = ftp://ftp.isc.org/isc/dhcp/
+
+# Apply patches in a special order.
+patches = \
+ dhcp-4.2.2-remove-bind.patch \
+ dhcp-4.2.0-errwarn-message.patch \
+ dhcp-4.2.2-options.patch \
+ dhcp-4.2.0-release-by-ifup.patch \
+ dhcp-4.2.0-dhclient-decline-backoff.patch \
+ dhcp-4.2.0-unicast-bootp.patch \
+ dhcp-4.2.2-dhclient-usage.patch \
+ dhcp-4.2.0-default-requested-options.patch \
+ dhcp-4.2.2-xen-checksum.patch \
+ dhcp-4.2.1-manpages.patch \
+ dhcp-4.2.0-paths.patch \
+ dhcp-4.2.2-CLOEXEC.patch \
+ dhcp-4.2.0-inherit-leases.patch \
+ dhcp-4.2.0-garbage-chars.patch \
+ dhcp-4.2.0-missing-ipv6-not-fatal.patch \
+ dhcp-4.2.0-add_timeout_when_NULL.patch \
+ dhcp-4.2.1-64_bit_lease_parse.patch \
+ dhcp-4.2.2-capability.patch \
+ dhcp-4.2.0-logpid.patch \
+ dhcp-4.2.0-UseMulticast.patch \
+ dhcp-4.2.1-sendDecline.patch \
+ dhcp-4.2.1-retransmission.patch \
+ dhcp-4.2.2-rfc3442-classless-static-routes.patch \
+ dhcp-4.2.0-honor-expired.patch \
+ dhcp-4.2.0-noprefixavail.patch \
+ dhcp-4.2.2-sharedlib.patch \
+ dhcp-4.2.0-PPP.patch \
+ dhcp-4.2.2-lpf-ib.patch \
+ dhcp-4.2.2-improved-xid.patch \
+ dhcp-4.2.2-gpxe-cid.patch \
+ dhcp-4.2.2-systemtap.patch
build
+ requires
+ autoconf
+ automake
+ bind-devel>=9
+ bind-devel<10
+ groff
+ libtool
+ openldap-devel
+ libcap-ng-devel
+ end
+
+ CFLAGS += \
+ -fno-strict-aliasing \
+ -D_GNU_SOURCE \
+ -Wl,--as-needed
+
configure_options += \
--sysconfdir=/etc \
--with-srv-lease-file=/var/lib/dhcpd/dhcpd.leases \
+ --with-srv6-lease-file=/var/lib/dhcpd/dhcp6.leases \
--with-cli-lease-file=/var/lib/dhclient/dhclient.leases \
+ --with-cli6-lease-file=/var/lib/dhclient/dhclient6.leases \
--with-srv-pid-file=/run/dhcpd.pid \
+ --with-srv6-pid-file=/run/dhcpd6.pid \
--with-cli-pid-file=/run/dhclient.pid \
- --with-relay-pid-file=/run/dhcrelay.pid
+ --with-cli6-pid-file=/run/dhclient6.pid \
+ --with-relay-pid-file=/run/dhcrelay.pid \
+ --with-ldap \
+ --with-ldapcrypto \
+ --with-libbind=/usr/include/ \
+ --with-libbind-libs=/usr/lib/ \
+ --disable-static \
+ --enable-paranoia \
+ --enable-early-chroot
+
+ prepare_cmds
+ # Remove bundled BIND source
+ rm -rvf %{DIR_APP}/bind/bind.tar.gz
+
+ # Regenerate build environment
+ libtoolize --copy --force
+ autoreconf --verbose --force --install
+ end
install_cmds
rm -vf %{BUILDROOT}/etc/dhclient.conf
@@ -48,15 +118,91 @@ build
# Create empty lease files.
touch %{BUILDROOT}/var/lib/dhclient/dhclient.leases
+ touch %{BUILDROOT}/var/lib/dhclient/dhclient6.leases
touch %{BUILDROOT}/var/lib/dhcpd/dhcpd.leases
-
- # Remove header files.
- # There is nothing that makes use out of them.
- rm -rfv %{BUILDROOT}/usr/include
+ touch %{BUILDROOT}/var/lib/dhcpd/dhcpd6.leases
end
end
packages
package %{name}
+
+ requires
+ dhcp-common
+ end
+
+ prerequires += shadow-utils
+
+ script prein
+ getent group dhcpd >/dev/null || groupadd -r dhcpd
+ getent passwd dhcpd >/dev/null || \
+ useradd -r -g dhcpd -d /var/lib/dhcpd -s /sbin/nologin \
+ -c "User for the DHCP server" dhcpd
+ exit 0
+ end
+
+ # Just search for new unit files that were just installed.
+ script postin
+ /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+ end
+
+ # Disable the service that is to be removed and stop it if it is still running.
+ script preun
+ /bin/systemctl --no-reload disable dhcpd.service >/dev/null 2>&1 || :
+ /bin/systemctl --no-reload disable dhcpd6.service >/dev/null 2>&1 || :
+ /bin/systemctl --no-reload disable dhcrelay.service >/dev/null 2>&1 || :
+ /bin/systemctl stop dhcpd.service >/dev/null 2>&1 || :
+ /bin/systemctl stop dhcpd6.service >/dev/null 2>&1 || :
+ /bin/systemctl stop dhcrelay.service >/dev/null 2>&1 || :
+ end
+
+ # Just tell systemd that unitfiles have been removed.
+ script postun
+ /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+ end
+
+ # Try to restart the service if it is running.
+ script postup
+ /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+ /bin/systemctl try-restart dhcpd.service >/dev/null 2>&1 || :
+ /bin/systemctl try-restart dhcpd6.service >/dev/null 2>&1 || :
+ /bin/systemctl try-restart dhcrelay.service >/dev/null 2>&1 || :
+ end
+ end
+
+ package dhclient
+ summary = DHCP client daemon and dhclient-script.
+ description = %{summary}
+
+ requires
+ dhcp-common
+ end
+
+ files
+ /sbin
+ /usr/share/man/man5/dhclient*
+ /usr/share/man/man8/dhclient*
+ /var/lib/dhclient
+ end
+ end
+
+ package %{name}-common
+ summary = Common files used by the dhcp client and server.
+ description = %{summary}
+
+ files
+ /usr/bin/
+ /usr/share/man/man1/omshell.1*
+ /usr/share/man/man5/dhcp-options.5*
+ /usr/share/man/man5/dhcp-eval.5*
+ end
+ end
+
+ package %{name}-libs
+ template LIBS
+ end
+
+ package %{name}-devel
+ template DEVEL
end
end
diff --git a/dhcp/patches/dhcp-4.2.0-CLOEXEC.patch b/dhcp/patches/dhcp-4.2.0-CLOEXEC.patch
new file mode 100644
index 0000000..2483f55
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.0-CLOEXEC.patch
@@ -0,0 +1,422 @@
+diff -up dhcp-4.2.0/client/clparse.c.cloexec dhcp-4.2.0/client/clparse.c
+--- dhcp-4.2.0/client/clparse.c.cloexec 2010-07-21 13:55:42.000000000 +0200
++++ dhcp-4.2.0/client/clparse.c 2010-07-21 14:31:13.000000000 +0200
+@@ -211,7 +211,7 @@ int read_client_conf_file (const char *n
+ int token;
+ isc_result_t status;
+
+- if ((file = open (name, O_RDONLY)) < 0)
++ if ((file = open (name, O_RDONLY | O_CLOEXEC)) < 0)
+ return uerr2isc (errno);
+
+ cfile = NULL;
+@@ -248,7 +248,7 @@ void read_client_leases ()
+
+ /* Open the lease file. If we can't open it, just return -
+ we can safely trust the server to remember our state. */
+- if ((file = open (path_dhclient_db, O_RDONLY)) < 0)
++ if ((file = open (path_dhclient_db, O_RDONLY | O_CLOEXEC)) < 0)
+ return;
+
+ cfile = NULL;
+diff -up dhcp-4.2.0/client/dhclient.c.cloexec dhcp-4.2.0/client/dhclient.c
+--- dhcp-4.2.0/client/dhclient.c.cloexec 2010-07-21 13:55:42.000000000 +0200
++++ dhcp-4.2.0/client/dhclient.c 2010-07-21 14:33:44.000000000 +0200
+@@ -137,11 +137,11 @@ main(int argc, char **argv) {
+ /* Make sure that file descriptors 0 (stdin), 1, (stdout), and
+ 2 (stderr) are open. To do this, we assume that when we
+ open a file the lowest available file descriptor is used. */
+- fd = open("/dev/null", O_RDWR);
++ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
+ if (fd == 0)
+- fd = open("/dev/null", O_RDWR);
++ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
+ if (fd == 1)
+- fd = open("/dev/null", O_RDWR);
++ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
+ if (fd == 2)
+ log_perror = 0; /* No sense logging to /dev/null. */
+ else if (fd != -1)
+@@ -488,7 +488,7 @@ main(int argc, char **argv) {
+ int e;
+
+ oldpid = 0;
+- if ((pidfd = fopen(path_dhclient_pid, "r")) != NULL) {
++ if ((pidfd = fopen(path_dhclient_pid, "re")) != NULL) {
+ e = fscanf(pidfd, "%ld\n", &temp);
+ oldpid = (pid_t)temp;
+
+@@ -530,7 +530,7 @@ main(int argc, char **argv) {
+ strncpy(new_path_dhclient_pid, path_dhclient_pid, pfx);
+ sprintf(new_path_dhclient_pid + pfx, "-%s.pid", ip->name);
+
+- if ((pidfd = fopen(new_path_dhclient_pid, "r")) != NULL) {
++ if ((pidfd = fopen(new_path_dhclient_pid, "re")) != NULL) {
+ e = fscanf(pidfd, "%ld\n", &temp);
+ oldpid = (pid_t)temp;
+
+@@ -555,7 +555,7 @@ main(int argc, char **argv) {
+ int dhc_running = 0;
+ char procfn[256] = "";
+
+- if ((pidfp = fopen(path_dhclient_pid, "r")) != NULL) {
++ if ((pidfp = fopen(path_dhclient_pid, "re")) != NULL) {
+ if ((fscanf(pidfp, "%ld", &temp)==1) && ((dhcpid=(pid_t)temp) > 0)) {
+ snprintf(procfn,256,"/proc/%u",dhcpid);
+ dhc_running = (access(procfn, F_OK) == 0);
+@@ -2931,7 +2931,7 @@ void rewrite_client_leases ()
+
+ if (leaseFile != NULL)
+ fclose (leaseFile);
+- leaseFile = fopen (path_dhclient_db, "w");
++ leaseFile = fopen (path_dhclient_db, "we");
+ if (leaseFile == NULL) {
+ log_error ("can't create %s: %m", path_dhclient_db);
+ return;
+@@ -3035,7 +3035,7 @@ write_duid(struct data_string *duid)
+ return DHCP_R_INVALIDARG;
+
+ if (leaseFile == NULL) { /* XXX? */
+- leaseFile = fopen(path_dhclient_db, "w");
++ leaseFile = fopen(path_dhclient_db, "we");
+ if (leaseFile == NULL) {
+ log_error("can't create %s: %m", path_dhclient_db);
+ return ISC_R_IOERROR;
+@@ -3215,7 +3215,7 @@ int write_client_lease (client, lease, r
+ return 1;
+
+ if (leaseFile == NULL) { /* XXX */
+- leaseFile = fopen (path_dhclient_db, "w");
++ leaseFile = fopen (path_dhclient_db, "we");
+ if (leaseFile == NULL) {
+ log_error ("can't create %s: %m", path_dhclient_db);
+ return 0;
+@@ -3668,9 +3668,9 @@ void go_daemon ()
+ close(2);
+
+ /* Reopen them on /dev/null. */
+- open("/dev/null", O_RDWR);
+- open("/dev/null", O_RDWR);
+- open("/dev/null", O_RDWR);
++ open("/dev/null", O_RDWR | O_CLOEXEC);
++ open("/dev/null", O_RDWR | O_CLOEXEC);
++ open("/dev/null", O_RDWR | O_CLOEXEC);
+
+ write_client_pid_file ();
+
+@@ -3682,14 +3682,14 @@ void write_client_pid_file ()
+ FILE *pf;
+ int pfdesc;
+
+- pfdesc = open (path_dhclient_pid, O_CREAT | O_TRUNC | O_WRONLY, 0644);
++ pfdesc = open (path_dhclient_pid, O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC, 0644);
+
+ if (pfdesc < 0) {
+ log_error ("Can't create %s: %m", path_dhclient_pid);
+ return;
+ }
+
+- pf = fdopen (pfdesc, "w");
++ pf = fdopen (pfdesc, "we");
+ if (!pf)
+ log_error ("Can't fdopen %s: %m", path_dhclient_pid);
+ else {
+diff -up dhcp-4.2.0/common/bpf.c.cloexec dhcp-4.2.0/common/bpf.c
+--- dhcp-4.2.0/common/bpf.c.cloexec 2009-11-20 02:48:59.000000000 +0100
++++ dhcp-4.2.0/common/bpf.c 2010-07-21 14:31:13.000000000 +0200
+@@ -94,7 +94,7 @@ int if_register_bpf (info)
+ for (b = 0; 1; b++) {
+ /* %Audit% 31 bytes max. %2004.06.17,Safe% */
+ sprintf(filename, BPF_FORMAT, b);
+- sock = open (filename, O_RDWR, 0);
++ sock = open (filename, O_RDWR | O_CLOEXEC, 0);
+ if (sock < 0) {
+ if (errno == EBUSY) {
+ continue;
+diff -up dhcp-4.2.0/common/discover.c.cloexec dhcp-4.2.0/common/discover.c
+--- dhcp-4.2.0/common/discover.c.cloexec 2009-10-28 05:12:29.000000000 +0100
++++ dhcp-4.2.0/common/discover.c 2010-07-21 14:31:13.000000000 +0200
+@@ -409,7 +409,7 @@ begin_iface_scan(struct iface_conf_list
+ int len;
+ int i;
+
+- ifaces->fp = fopen("/proc/net/dev", "r");
++ ifaces->fp = fopen("/proc/net/dev", "re");
+ if (ifaces->fp == NULL) {
+ log_error("Error opening '/proc/net/dev' to list interfaces");
+ return 0;
+@@ -444,7 +444,7 @@ begin_iface_scan(struct iface_conf_list
+
+ #ifdef DHCPv6
+ if (local_family == AF_INET6) {
+- ifaces->fp6 = fopen("/proc/net/if_inet6", "r");
++ ifaces->fp6 = fopen("/proc/net/if_inet6", "re");
+ if (ifaces->fp6 == NULL) {
+ log_error("Error opening '/proc/net/if_inet6' to "
+ "list IPv6 interfaces; %m");
+diff -up dhcp-4.2.0/common/dlpi.c.cloexec dhcp-4.2.0/common/dlpi.c
+--- dhcp-4.2.0/common/dlpi.c.cloexec 2009-11-20 02:49:00.000000000 +0100
++++ dhcp-4.2.0/common/dlpi.c 2010-07-21 14:31:13.000000000 +0200
+@@ -807,7 +807,7 @@ dlpiopen(const char *ifname) {
+ }
+ *dp = '\0';
+
+- return open (devname, O_RDWR, 0);
++ return open (devname, O_RDWR | O_CLOEXEC, 0);
+ }
+
+ /*
+diff -up dhcp-4.2.0/common/nit.c.cloexec dhcp-4.2.0/common/nit.c
+--- dhcp-4.2.0/common/nit.c.cloexec 2009-11-20 02:49:01.000000000 +0100
++++ dhcp-4.2.0/common/nit.c 2010-07-21 14:31:13.000000000 +0200
+@@ -81,7 +81,7 @@ int if_register_nit (info)
+ struct strioctl sio;
+
+ /* Open a NIT device */
+- sock = open ("/dev/nit", O_RDWR);
++ sock = open ("/dev/nit", O_RDWR | O_CLOEXEC);
+ if (sock < 0)
+ log_fatal ("Can't open NIT device for %s: %m", info -> name);
+
+diff -up dhcp-4.2.0/common/resolv.c.cloexec dhcp-4.2.0/common/resolv.c
+--- dhcp-4.2.0/common/resolv.c.cloexec 2009-11-20 02:49:01.000000000 +0100
++++ dhcp-4.2.0/common/resolv.c 2010-07-21 14:31:13.000000000 +0200
+@@ -49,7 +49,7 @@ void read_resolv_conf (parse_time)
+ struct domain_search_list *dp, *dl, *nd;
+ isc_result_t status;
+
+- if ((file = open (path_resolv_conf, O_RDONLY)) < 0) {
++ if ((file = open (path_resolv_conf, O_RDONLY | O_CLOEXEC)) < 0) {
+ log_error ("Can't open %s: %m", path_resolv_conf);
+ return;
+ }
+diff -up dhcp-4.2.0/common/upf.c.cloexec dhcp-4.2.0/common/upf.c
+--- dhcp-4.2.0/common/upf.c.cloexec 2009-11-20 02:49:01.000000000 +0100
++++ dhcp-4.2.0/common/upf.c 2010-07-21 14:31:13.000000000 +0200
+@@ -77,7 +77,7 @@ int if_register_upf (info)
+ /* %Audit% Cannot exceed 36 bytes. %2004.06.17,Safe% */
+ sprintf(filename, "/dev/pf/pfilt%d", b);
+
+- sock = open (filename, O_RDWR, 0);
++ sock = open (filename, O_RDWR | O_CLOEXEC, 0);
+ if (sock < 0) {
+ if (errno == EBUSY) {
+ continue;
+diff -up dhcp-4.2.0/dst/dst_api.c.cloexec dhcp-4.2.0/dst/dst_api.c
+--- dhcp-4.2.0/dst/dst_api.c.cloexec 2009-10-29 01:46:48.000000000 +0100
++++ dhcp-4.2.0/dst/dst_api.c 2010-07-21 14:31:13.000000000 +0200
+@@ -437,7 +437,7 @@ dst_s_write_private_key(const DST_KEY *k
+ PRIVATE_KEY, PATH_MAX);
+
+ /* Do not overwrite an existing file */
+- if ((fp = dst_s_fopen(file, "w", 0600)) != NULL) {
++ if ((fp = dst_s_fopen(file, "we", 0600)) != NULL) {
+ int nn;
+ if ((nn = fwrite(encoded_block, 1, len, fp)) != len) {
+ EREPORT(("dst_write_private_key(): Write failure on %s %d != %d errno=%d\n",
+@@ -494,7 +494,7 @@ dst_s_read_public_key(const char *in_nam
+ * flags, proto, alg stored as decimal (or hex numbers FIXME).
+ * (FIXME: handle parentheses for line continuation.)
+ */
+- if ((fp = dst_s_fopen(name, "r", 0)) == NULL) {
++ if ((fp = dst_s_fopen(name, "re", 0)) == NULL) {
+ EREPORT(("dst_read_public_key(): Public Key not found %s\n",
+ name));
+ return (NULL);
+@@ -620,7 +620,7 @@ dst_s_write_public_key(const DST_KEY *ke
+ return (0);
+ }
+ /* create public key file */
+- if ((fp = dst_s_fopen(filename, "w+", 0644)) == NULL) {
++ if ((fp = dst_s_fopen(filename, "w+e", 0644)) == NULL) {
+ EREPORT(("DST_write_public_key: open of file:%s failed (errno=%d)\n",
+ filename, errno));
+ return (0);
+@@ -854,7 +854,7 @@ dst_s_read_private_key_file(char *name,
+ return (0);
+ }
+ /* first check if we can find the key file */
+- if ((fp = dst_s_fopen(filename, "r", 0)) == NULL) {
++ if ((fp = dst_s_fopen(filename, "re", 0)) == NULL) {
+ EREPORT(("dst_s_read_private_key_file: Could not open file %s in directory %s\n",
+ filename, dst_path[0] ? dst_path :
+ (char *) getcwd(NULL, PATH_MAX - 1)));
+diff -up dhcp-4.2.0/dst/prandom.c.cloexec dhcp-4.2.0/dst/prandom.c
+--- dhcp-4.2.0/dst/prandom.c.cloexec 2009-11-20 02:49:01.000000000 +0100
++++ dhcp-4.2.0/dst/prandom.c 2010-07-21 14:31:13.000000000 +0200
+@@ -269,7 +269,7 @@ get_dev_random(u_char *output, unsigned
+
+ s = stat("/dev/random", &st);
+ if (s == 0 && S_ISCHR(st.st_mode)) {
+- if ((fd = open("/dev/random", O_RDONLY | O_NONBLOCK)) != -1) {
++ if ((fd = open("/dev/random", O_RDONLY | O_NONBLOCK | O_CLOEXEC)) != -1) {
+ if ((n = read(fd, output, size)) < 0)
+ n = 0;
+ close(fd);
+@@ -480,7 +480,7 @@ digest_file(dst_work *work)
+ work->file_digest = dst_free_key(work->file_digest);
+ return (0);
+ }
+- if ((fp = fopen(name, "r")) == NULL)
++ if ((fp = fopen(name, "re")) == NULL)
+ return (0);
+ for (no = 0; (i = fread(buf, sizeof(*buf), sizeof(buf), fp)) > 0;
+ no += i)
+diff -up dhcp-4.2.0/omapip/trace.c.cloexec dhcp-4.2.0/omapip/trace.c
+--- dhcp-4.2.0/omapip/trace.c.cloexec 2010-06-01 19:29:59.000000000 +0200
++++ dhcp-4.2.0/omapip/trace.c 2010-07-21 14:36:48.000000000 +0200
+@@ -141,10 +141,10 @@ isc_result_t trace_begin (const char *fi
+ return DHCP_R_INVALIDARG;
+ }
+
+- traceoutfile = open (filename, O_CREAT | O_WRONLY | O_EXCL, 0600);
++ traceoutfile = open (filename, O_CREAT | O_WRONLY | O_EXCL | O_CLOEXEC, 0600);
+ if (traceoutfile < 0 && errno == EEXIST) {
+ log_error ("WARNING: Overwriting trace file \"%s\"", filename);
+- traceoutfile = open (filename, O_WRONLY | O_EXCL | O_TRUNC,
++ traceoutfile = open (filename, O_WRONLY | O_EXCL | O_TRUNC | O_CLOEXEC,
+ 0600);
+ }
+
+@@ -431,7 +431,7 @@ void trace_file_replay (const char *file
+ isc_result_t result;
+ int len;
+
+- traceinfile = fopen (filename, "r");
++ traceinfile = fopen (filename, "re");
+ if (!traceinfile) {
+ log_error("Can't open tracefile %s: %m", filename);
+ return;
+diff -up dhcp-4.2.0/relay/dhcrelay.c.cloexec dhcp-4.2.0/relay/dhcrelay.c
+--- dhcp-4.2.0/relay/dhcrelay.c.cloexec 2010-02-17 21:33:55.000000000 +0100
++++ dhcp-4.2.0/relay/dhcrelay.c 2010-07-21 14:31:39.000000000 +0200
+@@ -177,11 +177,11 @@ main(int argc, char **argv) {
+ /* Make sure that file descriptors 0(stdin), 1,(stdout), and
+ 2(stderr) are open. To do this, we assume that when we
+ open a file the lowest available file descriptor is used. */
+- fd = open("/dev/null", O_RDWR);
++ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
+ if (fd == 0)
+- fd = open("/dev/null", O_RDWR);
++ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
+ if (fd == 1)
+- fd = open("/dev/null", O_RDWR);
++ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
+ if (fd == 2)
+ log_perror = 0; /* No sense logging to /dev/null. */
+ else if (fd != -1)
+@@ -520,12 +520,12 @@ main(int argc, char **argv) {
+ exit(0);
+
+ pfdesc = open(path_dhcrelay_pid,
+- O_CREAT | O_TRUNC | O_WRONLY, 0644);
++ O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC, 0644);
+
+ if (pfdesc < 0) {
+ log_error("Can't create %s: %m", path_dhcrelay_pid);
+ } else {
+- pf = fdopen(pfdesc, "w");
++ pf = fdopen(pfdesc, "we");
+ if (!pf)
+ log_error("Can't fdopen %s: %m",
+ path_dhcrelay_pid);
+diff -up dhcp-4.2.0/server/confpars.c.cloexec dhcp-4.2.0/server/confpars.c
+--- dhcp-4.2.0/server/confpars.c.cloexec 2010-03-24 22:49:47.000000000 +0100
++++ dhcp-4.2.0/server/confpars.c 2010-07-21 14:31:39.000000000 +0200
+@@ -116,7 +116,7 @@ isc_result_t read_conf_file (const char
+ }
+ #endif
+
+- if ((file = open (filename, O_RDONLY)) < 0) {
++ if ((file = open (filename, O_RDONLY | O_CLOEXEC)) < 0) {
+ if (leasep) {
+ log_error ("Can't open lease database %s: %m --",
+ path_dhcpd_db);
+diff -up dhcp-4.2.0/server/db.c.cloexec dhcp-4.2.0/server/db.c
+--- dhcp-4.2.0/server/db.c.cloexec 2010-02-17 21:33:55.000000000 +0100
++++ dhcp-4.2.0/server/db.c 2010-07-21 14:31:39.000000000 +0200
+@@ -1035,7 +1035,7 @@ void db_startup (testp)
+ }
+ #endif
+ if (!testp) {
+- db_file = fopen (path_dhcpd_db, "a");
++ db_file = fopen (path_dhcpd_db, "ae");
+ if (!db_file)
+ log_fatal ("Can't open %s for append.", path_dhcpd_db);
+ expire_all_pools ();
+@@ -1083,12 +1083,12 @@ int new_lease_file ()
+ path_dhcpd_db, (int)t) >= sizeof newfname)
+ log_fatal("new_lease_file: lease file path too long");
+
+- db_fd = open (newfname, O_WRONLY | O_TRUNC | O_CREAT, 0664);
++ db_fd = open (newfname, O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC, 0664);
+ if (db_fd < 0) {
+ log_error ("Can't create new lease file: %m");
+ return 0;
+ }
+- if ((new_db_file = fdopen(db_fd, "w")) == NULL) {
++ if ((new_db_file = fdopen(db_fd, "we")) == NULL) {
+ log_error("Can't fdopen new lease file: %m");
+ close(db_fd);
+ goto fdfail;
+diff -up dhcp-4.2.0/server/dhcpd.c.cloexec dhcp-4.2.0/server/dhcpd.c
+--- dhcp-4.2.0/server/dhcpd.c.cloexec 2010-06-01 19:29:59.000000000 +0200
++++ dhcp-4.2.0/server/dhcpd.c 2010-07-21 14:31:39.000000000 +0200
+@@ -268,11 +268,11 @@ main(int argc, char **argv) {
+ /* Make sure that file descriptors 0 (stdin), 1, (stdout), and
+ 2 (stderr) are open. To do this, we assume that when we
+ open a file the lowest available file descriptor is used. */
+- fd = open("/dev/null", O_RDWR);
++ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
+ if (fd == 0)
+- fd = open("/dev/null", O_RDWR);
++ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
+ if (fd == 1)
+- fd = open("/dev/null", O_RDWR);
++ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
+ if (fd == 2)
+ log_perror = 0; /* No sense logging to /dev/null. */
+ else if (fd != -1)
+@@ -780,7 +780,7 @@ main(int argc, char **argv) {
+ #endif /* PARANOIA */
+
+ /* Read previous pid file. */
+- if ((i = open (path_dhcpd_pid, O_RDONLY)) >= 0) {
++ if ((i = open (path_dhcpd_pid, O_RDONLY | O_CLOEXEC)) >= 0) {
+ status = read(i, pbuf, (sizeof pbuf) - 1);
+ close (i);
+ if (status > 0) {
+@@ -798,7 +798,7 @@ main(int argc, char **argv) {
+ }
+
+ /* Write new pid file. */
+- if ((i = open(path_dhcpd_pid, O_WRONLY|O_CREAT|O_TRUNC, 0644)) >= 0) {
++ if ((i = open(path_dhcpd_pid, O_WRONLY|O_CREAT|O_TRUNC|O_CLOEXEC, 0644)) >= 0) {
+ sprintf(pbuf, "%d\n", (int) getpid());
+ IGNORE_RET (write(i, pbuf, strlen(pbuf)));
+ close(i);
+@@ -824,9 +824,9 @@ main(int argc, char **argv) {
+ close(2);
+
+ /* Reopen them on /dev/null. */
+- open("/dev/null", O_RDWR);
+- open("/dev/null", O_RDWR);
+- open("/dev/null", O_RDWR);
++ open("/dev/null", O_RDWR | O_CLOEXEC);
++ open("/dev/null", O_RDWR | O_CLOEXEC);
++ open("/dev/null", O_RDWR | O_CLOEXEC);
+ log_perror = 0; /* No sense logging to /dev/null. */
+
+ IGNORE_RET (chdir("/"));
+diff -up dhcp-4.2.0/server/ldap.c.cloexec dhcp-4.2.0/server/ldap.c
+--- dhcp-4.2.0/server/ldap.c.cloexec 2010-03-25 16:26:58.000000000 +0100
++++ dhcp-4.2.0/server/ldap.c 2010-07-21 14:31:39.000000000 +0200
+@@ -685,7 +685,7 @@ ldap_start (void)
+
+ if (ldap_debug_file != NULL && ldap_debug_fd == -1)
+ {
+- if ((ldap_debug_fd = open (ldap_debug_file, O_CREAT | O_TRUNC | O_WRONLY,
++ if ((ldap_debug_fd = open (ldap_debug_file, O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC,
+ S_IRUSR | S_IWUSR)) < 0)
+ log_error ("Error opening debug LDAP log file %s: %s", ldap_debug_file,
+ strerror (errno));
diff --git a/dhcp/patches/dhcp-4.2.0-PPP.patch b/dhcp/patches/dhcp-4.2.0-PPP.patch
new file mode 100644
index 0000000..bef2be7
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.0-PPP.patch
@@ -0,0 +1,150 @@
+diff -up dhcp-4.2.0-P1/client/dhc6.c.PPP dhcp-4.2.0-P1/client/dhc6.c
+--- dhcp-4.2.0-P1/client/dhc6.c.PPP 2010-11-05 10:47:37.000000000 +0100
++++ dhcp-4.2.0-P1/client/dhc6.c 2010-11-09 15:54:12.000000000 +0100
+@@ -129,7 +129,7 @@ extern int stateless;
+ * is not how it is intended. Upcoming rearchitecting the client should
+ * address this "one daemon model."
+ */
+-void
++isc_result_t
+ form_duid(struct data_string *duid, const char *file, int line)
+ {
+ struct interface_info *ip;
+@@ -141,6 +141,15 @@ form_duid(struct data_string *duid, cons
+ if (ip == NULL)
+ log_fatal("Impossible condition at %s:%d.", MDL);
+
++ while (ip && ip->hw_address.hbuf[0] == HTYPE_RESERVED) {
++ /* Try the other interfaces */
++ log_debug("Cannot form default DUID from interface %s.", ip->name);
++ ip = ip->next;
++ }
++ if (ip == NULL) {
++ return ISC_R_UNEXPECTED;
++ }
++
+ if ((ip->hw_address.hlen == 0) ||
+ (ip->hw_address.hlen > sizeof(ip->hw_address.hbuf)))
+ log_fatal("Impossible hardware address length at %s:%d.", MDL);
+@@ -176,6 +185,8 @@ form_duid(struct data_string *duid, cons
+ memcpy(duid->buffer->data + 4, ip->hw_address.hbuf + 1,
+ ip->hw_address.hlen - 1);
+ }
++
++ return ISC_R_SUCCESS;
+ }
+
+ /*
+@@ -5289,7 +5300,8 @@ make_client6_options(struct client_state
+ */
+ if ((oc = lookup_option(&dhcpv6_universe, *op,
+ D6O_CLIENTID)) == NULL) {
+- if (!option_cache(&oc, &default_duid, NULL, clientid_option,
++ if (default_duid.len == 0 ||
++ !option_cache(&oc, &default_duid, NULL, clientid_option,
+ MDL))
+ log_fatal("Failure assembling a DUID.");
+
+diff -up dhcp-4.2.0-P1/client/dhclient.c.PPP dhcp-4.2.0-P1/client/dhclient.c
+--- dhcp-4.2.0-P1/client/dhclient.c.PPP 2010-11-05 10:47:37.000000000 +0100
++++ dhcp-4.2.0-P1/client/dhclient.c 2010-11-09 15:37:26.000000000 +0100
+@@ -911,8 +911,8 @@ main(int argc, char **argv) {
+ if (default_duid.buffer != NULL)
+ data_string_forget(&default_duid, MDL);
+
+- form_duid(&default_duid, MDL);
+- write_duid(&default_duid);
++ if (form_duid(&default_duid, MDL) == ISC_R_SUCCESS)
++ write_duid(&default_duid);
+ }
+
+ for (ip = interfaces ; ip != NULL ; ip = ip->next) {
+diff -up dhcp-4.2.0-P1/common/bpf.c.PPP dhcp-4.2.0-P1/common/bpf.c
+--- dhcp-4.2.0-P1/common/bpf.c.PPP 2010-11-05 10:47:37.000000000 +0100
++++ dhcp-4.2.0-P1/common/bpf.c 2010-11-09 15:42:42.000000000 +0100
+@@ -599,6 +599,22 @@ get_hw_addr(const char *name, struct har
+ memcpy(&hw->hbuf[1], LLADDR(sa), sa->sdl_alen);
+ break;
+ #endif /* IFT_FDDI */
++#if defined(IFT_PPP)
++ case IFT_PPP:
++ if (local_family != AF_INET6)
++ log_fatal("Unsupported device type %d for \"%s\"",
++ sa->sdl_type, name);
++ hw->hlen = 0;
++ hw->hbuf[0] = HTYPE_RESERVED;
++ /* 0xdeadbeef should never occur on the wire,
++ * and is a signature that something went wrong.
++ */
++ hw->hbuf[1] = 0xde;
++ hw->hbuf[2] = 0xad;
++ hw->hbuf[3] = 0xbe;
++ hw->hbuf[4] = 0xef;
++ break;
++#endif
+ default:
+ log_fatal("Unsupported device type %d for \"%s\"",
+ sa->sdl_type, name);
+diff -up dhcp-4.2.0-P1/common/lpf.c.PPP dhcp-4.2.0-P1/common/lpf.c
+--- dhcp-4.2.0-P1/common/lpf.c.PPP 2010-11-05 10:47:37.000000000 +0100
++++ dhcp-4.2.0-P1/common/lpf.c 2010-11-09 15:45:40.000000000 +0100
+@@ -502,6 +502,22 @@ get_hw_addr(const char *name, struct har
+ hw->hbuf[0] = HTYPE_FDDI;
+ memcpy(&hw->hbuf[1], sa->sa_data, 16);
+ break;
++#if defined(ARPHRD_PPP)
++ case ARPHRD_PPP:
++ if (local_family != AF_INET6)
++ log_fatal("Unsupported device type %d for \"%s\"",
++ sa->sa_family, name);
++ hw->hlen = 0;
++ hw->hbuf[0] = HTYPE_RESERVED;
++ /* 0xdeadbeef should never occur on the wire,
++ * and is a signature that something went wrong.
++ */
++ hw->hbuf[1] = 0xde;
++ hw->hbuf[2] = 0xad;
++ hw->hbuf[3] = 0xbe;
++ hw->hbuf[4] = 0xef;
++ break;
++#endif
+ default:
+ log_fatal("Unsupported device type %ld for \"%s\"",
+ (long int)sa->sa_family, name);
+diff -up dhcp-4.2.0-P1/includes/dhcpd.h.PPP dhcp-4.2.0-P1/includes/dhcpd.h
+--- dhcp-4.2.0-P1/includes/dhcpd.h.PPP 2010-11-05 10:47:37.000000000 +0100
++++ dhcp-4.2.0-P1/includes/dhcpd.h 2010-11-09 15:46:58.000000000 +0100
+@@ -2733,7 +2733,7 @@ void dhcpv4_client_assignments(void);
+ void dhcpv6_client_assignments(void);
+
+ /* dhc6.c */
+-void form_duid(struct data_string *duid, const char *file, int line);
++isc_result_t form_duid(struct data_string *duid, const char *file, int line);
+ void dhc6_lease_destroy(struct dhc6_lease **src, const char *file, int line);
+ void start_init6(struct client_state *client);
+ void start_info_request6(struct client_state *client);
+diff -up dhcp-4.2.0-P1/includes/dhcp.h.PPP dhcp-4.2.0-P1/includes/dhcp.h
+--- dhcp-4.2.0-P1/includes/dhcp.h.PPP 2010-11-05 10:47:37.000000000 +0100
++++ dhcp-4.2.0-P1/includes/dhcp.h 2010-11-09 15:48:53.000000000 +0100
+@@ -80,6 +80,8 @@ struct dhcp_packet {
+ #define HTYPE_IEEE802 6 /* IEEE 802.2 Token Ring... */
+ #define HTYPE_FDDI 8 /* FDDI... */
+
++#define HTYPE_RESERVED 0 /* RFC 5494 */
++
+ /* Magic cookie validating dhcp options field (and bootp vendor
+ extensions field). */
+ #define DHCP_OPTIONS_COOKIE "\143\202\123\143"
+diff -up dhcp-4.2.0-P1/server/dhcpv6.c.PPP dhcp-4.2.0-P1/server/dhcpv6.c
+--- dhcp-4.2.0-P1/server/dhcpv6.c.PPP 2010-11-05 10:47:37.000000000 +0100
++++ dhcp-4.2.0-P1/server/dhcpv6.c 2010-11-09 15:50:17.000000000 +0100
+@@ -300,6 +300,9 @@ generate_new_server_duid(void) {
+ if (p->hw_address.hlen > 0) {
+ break;
+ }
++ if (p->next == NULL && p->hw_address.hbuf[0] == HTYPE_RESERVED) {
++ log_error("Can not generate DUID from interfaces which do not have hardware addresses, please configure server-duid!");
++ }
+ }
+ if (p == NULL) {
+ return ISC_R_UNEXPECTED;
diff --git a/dhcp/patches/dhcp-4.2.0-UseMulticast.patch b/dhcp/patches/dhcp-4.2.0-UseMulticast.patch
new file mode 100644
index 0000000..319344a
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.0-UseMulticast.patch
@@ -0,0 +1,229 @@
+diff -up dhcp-4.2.0/server/dhcpv6.c.UseMulticast dhcp-4.2.0/server/dhcpv6.c
+--- dhcp-4.2.0/server/dhcpv6.c.UseMulticast 2010-06-01 19:30:00.000000000 +0200
++++ dhcp-4.2.0/server/dhcpv6.c 2010-07-21 16:17:30.000000000 +0200
+@@ -346,6 +346,48 @@ generate_new_server_duid(void) {
+ }
+
+ /*
++ * Is the D6O_UNICAST option defined in dhcpd.conf ?
++ */
++static isc_boolean_t unicast_option_defined;
++
++/*
++ * Did we already search dhcpd.conf for D6O_UNICAST option ?
++ * We need to store it here to not parse dhcpd.conf repeatedly.
++ */
++static isc_boolean_t unicast_option_parsed = ISC_FALSE;
++
++
++/*
++ * Is the D6O_UNICAST option defined in dhcpd.conf ?
++ */
++isc_boolean_t
++is_unicast_option_defined(void) {
++ struct option_state *opt_state;
++ struct option_cache *oc;
++
++ /*
++ * If we are looking for the unicast option for the first time
++ */
++ if (unicast_option_parsed == ISC_FALSE) {
++ unicast_option_parsed = ISC_TRUE;
++ opt_state = NULL;
++ if (!option_state_allocate(&opt_state, MDL)) {
++ log_fatal("No memory for option state.");
++ }
++
++ execute_statements_in_scope(NULL, NULL, NULL, NULL, NULL,
++ opt_state, &global_scope, root_group, NULL);
++
++ oc = lookup_option(&dhcpv6_universe, opt_state, D6O_UNICAST);
++ unicast_option_defined = (oc != NULL);
++
++ option_state_dereference(&opt_state, MDL);
++ }
++
++ return (unicast_option_defined);
++}
++
++/*
+ * Get the client identifier from the packet.
+ */
+ isc_result_t
+@@ -1405,6 +1447,56 @@ lease_to_client(struct data_string *repl
+ reply.shared->group);
+ }
+
++ /* reject unicast message, unless we set unicast option */
++ if ((packet->unicast == ISC_TRUE) && !is_unicast_option_defined())
++ /*
++ * RFC3315 section 18.2.1 (Request):
++ *
++ * When the server receives a Request message via unicast from a client
++ * to which the server has not sent a unicast option, the server
++ * discards the Request message and responds with a Reply message
++ * containing a Status Code option with the value UseMulticast, a Server
++ * Identifier option containing the server's DUID, the Client Identifier
++ * option from the client message, and no other options.
++ *
++ * Section 18.2.3 (Renew):
++ *
++ * When the server receives a Renew message via unicast from a client to
++ * which the server has not sent a unicast option, the server discards
++ * the Renew message and responds with a Reply message containing a
++ * Status Code option with the value UseMulticast, a Server Identifier
++ * option containing the server's DUID, the Client Identifier option
++ * from the client message, and no other options.
++ */
++ {
++ /* Set the UseMulticast status code. */
++ if (!set_status_code(STATUS_UseMulticast,
++ "Unicast not allowed by server.",
++ reply.opt_state)) {
++ log_error("lease_to_client: Unable to set "
++ "UseMulticast status code.");
++ goto exit;
++ }
++
++ /* Rewind the cursor to the start. */
++ reply.cursor = REPLY_OPTIONS_INDEX;
++
++ /*
++ * Produce an reply that includes only:
++ *
++ * Status code.
++ * Server DUID.
++ * Client DUID.
++ */
++ reply.cursor += store_options6((char *)reply.buf.data +
++ reply.cursor,
++ sizeof(reply.buf) -
++ reply.cursor,
++ reply.opt_state, reply.packet,
++ required_opts_NAA,
++ NULL);
++ } else if (no_resources_avail && (reply.ia_count != 0) &&
++ (reply.packet->dhcpv6_msg_type == DHCPV6_SOLICIT))
+ /*
+ * RFC3315 section 17.2.2 (Solicit):
+ *
+@@ -1429,8 +1521,6 @@ lease_to_client(struct data_string *repl
+ * the server.
+ * Sends a Renew/Rebind if the IA is not in the Reply message.
+ */
+- if (no_resources_avail && (reply.ia_count != 0) &&
+- (reply.packet->dhcpv6_msg_type == DHCPV6_SOLICIT))
+ {
+ /* Set the NoAddrsAvail status code. */
+ if (!set_status_code(STATUS_NoAddrsAvail,
+@@ -4128,7 +4218,6 @@ dhcpv6_solicit(struct data_string *reply
+ * Very similar to Solicit handling, except the server DUID is required.
+ */
+
+-/* TODO: reject unicast messages, unless we set unicast option */
+ static void
+ dhcpv6_request(struct data_string *reply_ret, struct packet *packet) {
+ struct data_string client_id;
+@@ -4443,7 +4532,6 @@ exit:
+ * except for the error code of when addresses don't match.
+ */
+
+-/* TODO: reject unicast messages, unless we set unicast option */
+ static void
+ dhcpv6_renew(struct data_string *reply, struct packet *packet) {
+ struct data_string client_id;
+@@ -4688,18 +4776,60 @@ iterate_over_ia_na(struct data_string *r
+ goto exit;
+ }
+
+- snprintf(status_msg, sizeof(status_msg), "%s received.", packet_type);
+- if (!set_status_code(STATUS_Success, status_msg, opt_state)) {
+- goto exit;
+- }
++ /* reject unicast message, unless we set unicast option */
++ if ((packet->unicast == ISC_TRUE) && !is_unicast_option_defined()) {
++ /*
++ * RFC3315 section 18.2.6 (Release):
++ *
++ * When the server receives a Release message via unicast from a client
++ * to which the server has not sent a unicast option, the server
++ * discards the Release message and responds with a Reply message
++ * containing a Status Code option with value UseMulticast, a Server
++ * Identifier option containing the server's DUID, the Client Identifier
++ * option from the client message, and no other options.
++ *
++ * Section 18.2.7 (Decline):
++ *
++ * When the server receives a Decline message via unicast from a client
++ * to which the server has not sent a unicast option, the server
++ * discards the Decline message and responds with a Reply message
++ * containing a Status Code option with the value UseMulticast, a Server
++ * Identifier option containing the server's DUID, the Client Identifier
++ * option from the client message, and no other options.
++ */
++ snprintf(status_msg, sizeof(status_msg),
++ "%s received unicast.", packet_type);
++ if (!set_status_code(STATUS_UseMulticast, status_msg, opt_state)) {
++ goto exit;
++ }
+
+- /*
+- * Add our options that are not associated with any IA_NA or IA_TA.
+- */
+- reply_ofs += store_options6(reply_data+reply_ofs,
+- sizeof(reply_data)-reply_ofs,
++ /*
++ * Produce an reply that includes only:
++ *
++ * Status code.
++ * Server DUID.
++ * Client DUID.
++ */
++ reply_ofs += store_options6(reply_data+reply_ofs,
++ sizeof(reply_data)-reply_ofs,
+ opt_state, packet,
+- required_opts, NULL);
++ required_opts_NAA, NULL);
++
++ goto return_reply;
++ } else {
++ snprintf(status_msg, sizeof(status_msg), "%s received.", packet_type);
++ if (!set_status_code(STATUS_Success, status_msg, opt_state)) {
++ goto exit;
++ }
++
++ /*
++ * Add our options that are not associated with any IA_NA or IA_TA.
++ */
++ reply_ofs += store_options6(reply_data+reply_ofs,
++ sizeof(reply_data)-reply_ofs,
++ opt_state, packet,
++ required_opts, NULL);
++ }
+
+ /*
+ * Loop through the IA_NA reported by the client, and deal with
+@@ -4838,6 +4968,7 @@ iterate_over_ia_na(struct data_string *r
+ /*
+ * Return our reply to the caller.
+ */
++return_reply:
+ reply_ret->len = reply_ofs;
+ reply_ret->buffer = NULL;
+ if (!buffer_allocate(&reply_ret->buffer, reply_ofs, MDL)) {
+@@ -4883,7 +5014,6 @@ exit:
+ * we still need to be aware of this possibility.
+ */
+
+-/* TODO: reject unicast messages, unless we set unicast option */
+ /* TODO: IA_TA */
+ static void
+ dhcpv6_decline(struct data_string *reply, struct packet *packet) {
+@@ -5355,7 +5485,6 @@ exit:
+ * Release means a client is done with the leases.
+ */
+
+-/* TODO: reject unicast messages, unless we set unicast option */
+ static void
+ dhcpv6_release(struct data_string *reply, struct packet *packet) {
+ struct data_string client_id;
diff --git a/dhcp/patches/dhcp-4.2.0-add_timeout_when_NULL.patch b/dhcp/patches/dhcp-4.2.0-add_timeout_when_NULL.patch
new file mode 100644
index 0000000..4784d5a
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.0-add_timeout_when_NULL.patch
@@ -0,0 +1,14 @@
+diff -up dhcp-4.2.0/common/dispatch.c.dracut dhcp-4.2.0/common/dispatch.c
+--- dhcp-4.2.0/common/dispatch.c.dracut 2010-06-01 19:29:59.000000000 +0200
++++ dhcp-4.2.0/common/dispatch.c 2010-07-21 16:10:09.000000000 +0200
+@@ -189,6 +189,10 @@ void add_timeout (when, where, what, ref
+ isc_interval_t interval;
+ isc_time_t expires;
+
++ if (when == NULL) {
++ return;
++ }
++
+ /* See if this timeout supersedes an existing timeout. */
+ t = (struct timeout *)0;
+ for (q = timeouts; q; q = q->next) {
diff --git a/dhcp/patches/dhcp-4.2.0-default-requested-options.patch b/dhcp/patches/dhcp-4.2.0-default-requested-options.patch
new file mode 100644
index 0000000..fea8a4b
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.0-default-requested-options.patch
@@ -0,0 +1,44 @@
+diff -up dhcp-4.2.0/client/clparse.c.requested dhcp-4.2.0/client/clparse.c
+--- dhcp-4.2.0/client/clparse.c.requested 2010-07-21 13:29:05.000000000 +0200
++++ dhcp-4.2.0/client/clparse.c 2010-07-21 13:50:29.000000000 +0200
+@@ -37,7 +37,7 @@
+
+ struct client_config top_level_config;
+
+-#define NUM_DEFAULT_REQUESTED_OPTS 9
++#define NUM_DEFAULT_REQUESTED_OPTS 14
+ struct option *default_requested_options[NUM_DEFAULT_REQUESTED_OPTS + 1];
+
+ static void parse_client_default_duid(struct parse *cfile);
+@@ -111,6 +111,31 @@ isc_result_t read_client_conf ()
+ option_code_hash_lookup(&default_requested_options[8],
+ dhcpv6_universe.code_hash, &code, 0, MDL);
+
++ /* 10 */
++ code = DHO_NIS_DOMAIN;
++ option_code_hash_lookup(&default_requested_options[9],
++ dhcp_universe.code_hash, &code, 0, MDL);
++
++ /* 11 */
++ code = DHO_NIS_SERVERS;
++ option_code_hash_lookup(&default_requested_options[10],
++ dhcp_universe.code_hash, &code, 0, MDL);
++
++ /* 12 */
++ code = DHO_NTP_SERVERS;
++ option_code_hash_lookup(&default_requested_options[11],
++ dhcp_universe.code_hash, &code, 0, MDL);
++
++ /* 13 */
++ code = DHO_INTERFACE_MTU;
++ option_code_hash_lookup(&default_requested_options[12],
++ dhcp_universe.code_hash, &code, 0, MDL);
++
++ /* 14 */
++ code = DHO_DOMAIN_SEARCH;
++ option_code_hash_lookup(&default_requested_options[13],
++ dhcp_universe.code_hash, &code, 0, MDL);
++
+ for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) {
+ if (default_requested_options[code] == NULL)
+ log_fatal("Unable to find option definition for "
diff --git a/dhcp/patches/dhcp-4.2.0-dhclient-decline-backoff.patch b/dhcp/patches/dhcp-4.2.0-dhclient-decline-backoff.patch
new file mode 100644
index 0000000..81bec7b
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.0-dhclient-decline-backoff.patch
@@ -0,0 +1,63 @@
+diff -up dhcp-4.2.0/client/dhclient.c.backoff dhcp-4.2.0/client/dhclient.c
+--- dhcp-4.2.0/client/dhclient.c.backoff 2010-07-21 13:37:03.000000000 +0200
++++ dhcp-4.2.0/client/dhclient.c 2010-07-21 13:38:31.000000000 +0200
+@@ -1208,6 +1208,8 @@ void state_init (cpp)
+ void *cpp;
+ {
+ struct client_state *client = cpp;
++ enum dhcp_state init_state = client->state;
++ struct timeval tv;
+
+ ASSERT_STATE(state, S_INIT);
+
+@@ -1220,9 +1222,18 @@ void state_init (cpp)
+ client -> first_sending = cur_time;
+ client -> interval = client -> config -> initial_interval;
+
+- /* Add an immediate timeout to cause the first DHCPDISCOVER packet
+- to go out. */
+- send_discover (client);
++ if (init_state != S_DECLINED) {
++ /* Add an immediate timeout to cause the first DHCPDISCOVER packet
++ to go out. */
++ send_discover(client);
++ } else {
++ /* We've received an OFFER and it has been DECLINEd by dhclient-script.
++ * wait for a random time between 1 and backoff_cutoff seconds before
++ * trying again. */
++ tv . tv_sec = cur_time + ((1 + (random() >> 2)) % client->config->backoff_cutoff);
++ tv . tv_usec = 0;
++ add_timeout(&tv, send_discover, client, 0, 0);
++ }
+ }
+
+ /*
+@@ -1501,6 +1512,7 @@ void bind_lease (client)
+ send_decline (client);
+ destroy_client_lease (client -> new);
+ client -> new = (struct client_lease *)0;
++ client -> state = S_DECLINED;
+ state_init (client);
+ return;
+ }
+@@ -3711,6 +3723,7 @@ void client_location_changed ()
+ case S_INIT:
+ case S_REBINDING:
+ case S_STOPPED:
++ case S_DECLINED:
+ break;
+ }
+ client -> state = S_INIT;
+diff -up dhcp-4.2.0/includes/dhcpd.h.backoff dhcp-4.2.0/includes/dhcpd.h
+--- dhcp-4.2.0/includes/dhcpd.h.backoff 2010-07-21 13:29:05.000000000 +0200
++++ dhcp-4.2.0/includes/dhcpd.h 2010-07-21 13:38:31.000000000 +0200
+@@ -1056,7 +1056,8 @@ enum dhcp_state {
+ S_BOUND = 5,
+ S_RENEWING = 6,
+ S_REBINDING = 7,
+- S_STOPPED = 8
++ S_STOPPED = 8,
++ S_DECLINED = 9
+ };
+
+ /* Authentication and BOOTP policy possibilities (not all values work
diff --git a/dhcp/patches/dhcp-4.2.0-errwarn-message.patch b/dhcp/patches/dhcp-4.2.0-errwarn-message.patch
new file mode 100644
index 0000000..a0f70cd
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.0-errwarn-message.patch
@@ -0,0 +1,30 @@
+diff -up dhcp-4.2.0/omapip/errwarn.c.errwarn dhcp-4.2.0/omapip/errwarn.c
+--- dhcp-4.2.0/omapip/errwarn.c.errwarn 2009-07-23 20:52:21.000000000 +0200
++++ dhcp-4.2.0/omapip/errwarn.c 2010-07-21 13:23:47.000000000 +0200
+@@ -76,20 +76,13 @@ void log_fatal (const char * fmt, ... )
+
+ #if !defined (NOMINUM)
+ log_error ("%s", "");
+- log_error ("If you did not get this software from ftp.isc.org, please");
+- log_error ("get the latest from ftp.isc.org and install that before");
+- log_error ("requesting help.");
++ log_error ("This version of ISC DHCP is based on the release available");
++ log_error ("on ftp.isc.org. Features have been added and other changes");
++ log_error ("have been made to the base software release in order to make");
++ log_error ("it work better with this distribution.");
+ log_error ("%s", "");
+- log_error ("If you did get this software from ftp.isc.org and have not");
+- log_error ("yet read the README, please read it before requesting help.");
+- log_error ("If you intend to request help from the dhcp-server(a)isc.org");
+- log_error ("mailing list, please read the section on the README about");
+- log_error ("submitting bug reports and requests for help.");
+- log_error ("%s", "");
+- log_error ("Please do not under any circumstances send requests for");
+- log_error ("help directly to the authors of this software - please");
+- log_error ("send them to the appropriate mailing list as described in");
+- log_error ("the README file.");
++ log_error ("Please report for this software via the Red Hat Bugzilla site:");
++ log_error (" http://bugzilla.redhat.com");
+ log_error ("%s", "");
+ log_error ("exiting.");
+ #endif
diff --git a/dhcp/patches/dhcp-4.2.0-garbage-chars.patch b/dhcp/patches/dhcp-4.2.0-garbage-chars.patch
new file mode 100644
index 0000000..118ff3f
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.0-garbage-chars.patch
@@ -0,0 +1,12 @@
+diff -up dhcp-4.2.0/common/tables.c.garbage dhcp-4.2.0/common/tables.c
+--- dhcp-4.2.0/common/tables.c.garbage 2009-11-20 02:49:01.000000000 +0100
++++ dhcp-4.2.0/common/tables.c 2010-07-21 14:40:56.000000000 +0200
+@@ -207,7 +207,7 @@ static struct option dhcp_options[] = {
+ { "netinfo-server-tag", "t", &dhcp_universe, 113, 1 },
+ { "default-url", "t", &dhcp_universe, 114, 1 },
+ { "subnet-selection", "I", &dhcp_universe, 118, 1 },
+- { "domain-search", "Dc", &dhcp_universe, 119, 1 },
++ { "domain-search", "D", &dhcp_universe, 119, 1 },
+ { "vivco", "Evendor-class.", &dhcp_universe, 124, 1 },
+ { "vivso", "Evendor.", &dhcp_universe, 125, 1 },
+ #if 0
diff --git a/dhcp/patches/dhcp-4.2.0-honor-expired.patch b/dhcp/patches/dhcp-4.2.0-honor-expired.patch
new file mode 100644
index 0000000..0ae9128
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.0-honor-expired.patch
@@ -0,0 +1,49 @@
+diff -up dhcp-4.2.0/client/dhc6.c.honor-expired dhcp-4.2.0/client/dhc6.c
+--- dhcp-4.2.0/client/dhc6.c.honor-expired 2010-10-07 12:55:37.000000000 +0200
++++ dhcp-4.2.0/client/dhc6.c 2010-10-07 12:56:43.000000000 +0200
+@@ -1405,6 +1405,32 @@ start_info_request6(struct client_state
+ go_daemon();
+ }
+
++/* Run through the addresses in lease and return true if there's any unexpired.
++ * Return false otherwise.
++ */
++isc_boolean_t
++unexpired_address_in_lease(struct dhc6_lease *lease)
++{
++ struct dhc6_ia *ia;
++ struct dhc6_addr *addr;
++
++ for (ia = lease->bindings ; ia != NULL ; ia = ia->next) {
++ for (addr = ia->addrs ; addr != NULL ; addr = addr->next) {
++ if (addr->flags & DHC6_ADDR_EXPIRED)
++ continue;
++
++ if (addr->starts + addr->max_life > cur_time) {
++ return ISC_TRUE;
++ }
++ }
++ }
++
++ log_info("PRC: Previous lease is devoid of active addresses."
++ " Re-initializing.");
++
++ return ISC_FALSE;
++}
++
+ /*
+ * start_confirm6() kicks off an "init-reboot" version of the process, at
+ * startup to find out if old bindings are 'fair' and at runtime whenever
+@@ -1417,8 +1446,10 @@ start_confirm6(struct client_state *clie
+
+ /* If there is no active lease, there is nothing to check. */
+ if ((client->active_lease == NULL) ||
+- !active_prefix(client) ||
+- client->active_lease->released) {
++ !active_prefix(client) ||
++ client->active_lease->released ||
++ !unexpired_address_in_lease(client->active_lease)) {
++ dhc6_lease_destroy(&client->active_lease, MDL);
+ start_init6(client);
+ return;
+ }
diff --git a/dhcp/patches/dhcp-4.2.0-inherit-leases.patch b/dhcp/patches/dhcp-4.2.0-inherit-leases.patch
new file mode 100644
index 0000000..052f642
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.0-inherit-leases.patch
@@ -0,0 +1,34 @@
+diff -up dhcp-4.2.0/client/dhclient.c.inherit dhcp-4.2.0/client/dhclient.c
+--- dhcp-4.2.0/client/dhclient.c.inherit 2010-07-21 14:33:44.000000000 +0200
++++ dhcp-4.2.0/client/dhclient.c 2010-07-21 14:40:05.000000000 +0200
+@@ -2322,6 +2322,7 @@ void send_request (cpp)
+ {
+ struct client_state *client = cpp;
+
++ int i;
+ int result;
+ int interval;
+ struct sockaddr_in destination;
+@@ -2381,6 +2382,22 @@ void send_request (cpp)
+ /* Now do a preinit on the interface so that we can
+ discover a new address. */
+ script_init (client, "PREINIT", (struct string_list *)0);
++
++ /* Has an active lease */
++ if (client -> interface -> addresses != NULL) {
++ for (i = 0; i < client -> interface -> address_count; i++) {
++ if (client -> active &&
++ client -> active -> is_bootp &&
++ client -> active -> expiry > cur_time &&
++ client -> interface -> addresses[i].s_addr != 0 &&
++ client -> active -> address.len == 4 &&
++ memcpy (client -> active -> address.iabuf, &(client -> interface -> addresses[i]), 4) == 0) {
++ client_envadd (client, "", "keep_old_ip", "%s", "yes");
++ break;
++ }
++ }
++ }
++
+ if (client -> alias)
+ script_write_params (client, "alias_",
+ client -> alias);
diff --git a/dhcp/patches/dhcp-4.2.0-logpid.patch b/dhcp/patches/dhcp-4.2.0-logpid.patch
new file mode 100644
index 0000000..c24adb1
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.0-logpid.patch
@@ -0,0 +1,12 @@
+diff -up dhcp-4.2.0/client/dhclient.c.logpid dhcp-4.2.0/client/dhclient.c
+--- dhcp-4.2.0/client/dhclient.c.logpid 2010-07-21 16:13:52.000000000 +0200
++++ dhcp-4.2.0/client/dhclient.c 2010-07-21 16:16:51.000000000 +0200
+@@ -154,7 +154,7 @@ main(int argc, char **argv) {
+ else if (fd != -1)
+ close(fd);
+
+- openlog("dhclient", LOG_NDELAY, LOG_DAEMON);
++ openlog("dhclient", LOG_NDELAY | LOG_PID, LOG_DAEMON);
+
+ #if !(defined(DEBUG) || defined(__CYGWIN32__))
+ setlogmask(LOG_UPTO(LOG_INFO));
diff --git a/dhcp/patches/dhcp-4.2.0-missing-ipv6-not-fatal.patch b/dhcp/patches/dhcp-4.2.0-missing-ipv6-not-fatal.patch
new file mode 100644
index 0000000..b604115
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.0-missing-ipv6-not-fatal.patch
@@ -0,0 +1,40 @@
+diff -up dhcp-4.2.0/common/discover.c.noipv6 dhcp-4.2.0/common/discover.c
+--- dhcp-4.2.0/common/discover.c.noipv6 2010-07-21 14:31:13.000000000 +0200
++++ dhcp-4.2.0/common/discover.c 2010-07-21 16:04:57.000000000 +0200
+@@ -443,7 +443,7 @@ begin_iface_scan(struct iface_conf_list
+ }
+
+ #ifdef DHCPv6
+- if (local_family == AF_INET6) {
++ if ((local_family == AF_INET6) && !access("/proc/net/if_inet6", R_OK)) {
+ ifaces->fp6 = fopen("/proc/net/if_inet6", "re");
+ if (ifaces->fp6 == NULL) {
+ log_error("Error opening '/proc/net/if_inet6' to "
+@@ -454,6 +454,8 @@ begin_iface_scan(struct iface_conf_list
+ ifaces->fp = NULL;
+ return 0;
+ }
++ } else {
++ ifaces->fp6 = NULL;
+ }
+ #endif
+
+@@ -721,7 +723,7 @@ next_iface(struct iface_info *info, int
+ return 1;
+ }
+ #ifdef DHCPv6
+- if (!(*err)) {
++ if (!(*err) && ifaces->fp6) {
+ if (local_family == AF_INET6)
+ return next_iface6(info, err, ifaces);
+ }
+@@ -740,7 +742,8 @@ end_iface_scan(struct iface_conf_list *i
+ ifaces->sock = -1;
+ #ifdef DHCPv6
+ if (local_family == AF_INET6) {
+- fclose(ifaces->fp6);
++ if (ifaces->fp6)
++ fclose(ifaces->fp6);
+ ifaces->fp6 = NULL;
+ }
+ #endif
diff --git a/dhcp/patches/dhcp-4.2.0-noprefixavail.patch b/dhcp/patches/dhcp-4.2.0-noprefixavail.patch
new file mode 100644
index 0000000..729a172
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.0-noprefixavail.patch
@@ -0,0 +1,140 @@
+diff -up dhcp-4.2.0/server/dhcpv6.c.noprefixavail dhcp-4.2.0/server/dhcpv6.c
+--- dhcp-4.2.0/server/dhcpv6.c.noprefixavail 2010-10-07 13:48:45.000000000 +0200
++++ dhcp-4.2.0/server/dhcpv6.c 2010-10-13 11:00:25.000000000 +0200
+@@ -1134,7 +1134,7 @@ try_client_v6_prefix(struct iasubopt **p
+ return DHCP_R_INVALIDARG;
+ }
+ tmp_plen = (int) requested_pref->data[0];
+- if ((tmp_plen < 3) || (tmp_plen > 128)) {
++ if ((tmp_plen < 3) || (tmp_plen > 128) ||((int)tmp_plen != pool->units)) {
+ return ISC_R_FAILURE;
+ }
+ memcpy(&tmp_pref, requested_pref->data + 1, sizeof(tmp_pref));
+@@ -1147,9 +1147,8 @@ try_client_v6_prefix(struct iasubopt **p
+ return ISC_R_FAILURE;
+ }
+
+- if (((int)tmp_plen != pool->units) ||
+- !ipv6_in_pool(&tmp_pref, pool)) {
+- return ISC_R_FAILURE;
++ if (!ipv6_in_pool(&tmp_pref, pool)) {
++ return ISC_R_ADDRNOTAVAIL;
+ }
+
+ if (prefix6_exists(pool, &tmp_pref, tmp_plen)) {
+@@ -1409,13 +1408,6 @@ lease_to_client(struct data_string *repl
+ if ((status != ISC_R_SUCCESS) &&
+ (status != ISC_R_NORESOURCES))
+ goto exit;
+-
+- /*
+- * If any prefix cannot be given to any IA_PD, then
+- * set the NoPrefixAvail status code.
+- */
+- if (reply.client_resources == 0)
+- no_resources_avail = ISC_TRUE;
+ }
+
+ /*
+@@ -1549,36 +1541,6 @@ lease_to_client(struct data_string *repl
+ reply.opt_state, reply.packet,
+ required_opts_NAA,
+ NULL);
+- } else if (no_resources_avail && (reply.ia_count == 0) &&
+- (reply.packet->dhcpv6_msg_type == DHCPV6_SOLICIT))
+- {
+- /* Set the NoPrefixAvail status code. */
+- if (!set_status_code(STATUS_NoPrefixAvail,
+- "No prefixes available for this "
+- "interface.", reply.opt_state)) {
+- log_error("lease_to_client: Unable to set "
+- "NoPrefixAvail status code.");
+- goto exit;
+- }
+-
+- /* Rewind the cursor to the start. */
+- reply.cursor = REPLY_OPTIONS_INDEX;
+-
+- /*
+- * Produce an advertise that includes only:
+- *
+- * Status code.
+- * Server DUID.
+- * Client DUID.
+- */
+- reply.buf.reply.msg_type = DHCPV6_ADVERTISE;
+- reply.cursor += store_options6((char *)reply.buf.data +
+- reply.cursor,
+- sizeof(reply.buf) -
+- reply.cursor,
+- reply.opt_state, reply.packet,
+- required_opts_NAA,
+- NULL);
+ } else {
+ /*
+ * Having stored the client's IA's, store any options that
+@@ -2793,16 +2755,18 @@ find_client_temporaries(struct reply_sta
+ */
+ static isc_result_t
+ reply_process_try_addr(struct reply_state *reply, struct iaddr *addr) {
+- isc_result_t status = ISC_R_NORESOURCES;
++ isc_result_t status = ISC_R_ADDRNOTAVAIL;
+ struct ipv6_pool *pool;
+ int i;
+ struct data_string data_addr;
+
+ if ((reply == NULL) || (reply->shared == NULL) ||
+- (reply->shared->ipv6_pools == NULL) || (addr == NULL) ||
+- (reply->lease != NULL))
++ (addr == NULL) || (reply->lease != NULL))
+ return DHCP_R_INVALIDARG;
+
++ if (reply->shared->ipv6_pools == NULL)
++ return ISC_R_ADDRNOTAVAIL;
++
+ memset(&data_addr, 0, sizeof(data_addr));
+ data_addr.len = addr->len;
+ data_addr.data = addr->iabuf;
+@@ -3314,7 +3278,9 @@ reply_process_ia_pd(struct reply_state *
+ if (status == ISC_R_CANCELED)
+ break;
+
+- if ((status != ISC_R_SUCCESS) && (status != ISC_R_ADDRINUSE))
++ if ((status != ISC_R_SUCCESS) &&
++ (status != ISC_R_ADDRINUSE) &&
++ (status != ISC_R_ADDRNOTAVAIL))
+ goto cleanup;
+ }
+
+@@ -3594,7 +3560,8 @@ reply_process_prefix(struct reply_state
+
+ /* Either error out or skip this prefix. */
+ if ((status != ISC_R_SUCCESS) &&
+- (status != ISC_R_ADDRINUSE))
++ (status != ISC_R_ADDRINUSE) &&
++ (status != ISC_R_ADDRNOTAVAIL))
+ goto cleanup;
+
+ if (reply->lease == NULL) {
+@@ -3773,16 +3740,18 @@ prefix_is_owned(struct reply_state *repl
+ static isc_result_t
+ reply_process_try_prefix(struct reply_state *reply,
+ struct iaddrcidrnet *pref) {
+- isc_result_t status = ISC_R_NORESOURCES;
++ isc_result_t status = ISC_R_ADDRNOTAVAIL;
+ struct ipv6_pool *pool;
+ int i;
+ struct data_string data_pref;
+
+ if ((reply == NULL) || (reply->shared == NULL) ||
+- (reply->shared->ipv6_pools == NULL) || (pref == NULL) ||
+- (reply->lease != NULL))
++ (pref == NULL) || (reply->lease != NULL))
+ return DHCP_R_INVALIDARG;
+
++ if (reply->shared->ipv6_pools == NULL)
++ return ISC_R_ADDRNOTAVAIL;
++
+ memset(&data_pref, 0, sizeof(data_pref));
+ data_pref.len = 17;
+ if (!buffer_allocate(&data_pref.buffer, data_pref.len, MDL)) {
diff --git a/dhcp/patches/dhcp-4.2.0-paths.patch b/dhcp/patches/dhcp-4.2.0-paths.patch
new file mode 100644
index 0000000..54c7aba
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.0-paths.patch
@@ -0,0 +1,45 @@
+diff -up dhcp-4.2.0/includes/dhcpd.h.paths dhcp-4.2.0/includes/dhcpd.h
+--- dhcp-4.2.0/includes/dhcpd.h.paths 2010-07-21 13:55:42.000000000 +0200
++++ dhcp-4.2.0/includes/dhcpd.h 2010-07-21 14:29:57.000000000 +0200
+@@ -1390,15 +1390,15 @@ typedef unsigned char option_mask [16];
+ #else /* !DEBUG */
+
+ #ifndef _PATH_DHCPD_CONF
+-#define _PATH_DHCPD_CONF "/etc/dhcpd.conf"
++#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf"
+ #endif /* DEBUG */
+
+ #ifndef _PATH_DHCPD_DB
+-#define _PATH_DHCPD_DB LOCALSTATEDIR"/db/dhcpd.leases"
++#define _PATH_DHCPD_DB LOCALSTATEDIR"/dhcpd/dhcpd.leases"
+ #endif
+
+ #ifndef _PATH_DHCPD6_DB
+-#define _PATH_DHCPD6_DB LOCALSTATEDIR"/db/dhcpd6.leases"
++#define _PATH_DHCPD6_DB LOCALSTATEDIR"/dhcpd/dhcpd6.leases"
+ #endif
+
+ #ifndef _PATH_DHCPD_PID
+@@ -1412,7 +1412,7 @@ typedef unsigned char option_mask [16];
+ #endif /* DEBUG */
+
+ #ifndef _PATH_DHCLIENT_CONF
+-#define _PATH_DHCLIENT_CONF "/etc/dhclient.conf"
++#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf"
+ #endif
+
+ #ifndef _PATH_DHCLIENT_SCRIPT
+@@ -1428,11 +1428,11 @@ typedef unsigned char option_mask [16];
+ #endif
+
+ #ifndef _PATH_DHCLIENT_DB
+-#define _PATH_DHCLIENT_DB LOCALSTATEDIR"/db/dhclient.leases"
++#define _PATH_DHCLIENT_DB LOCALSTATEDIR"/dhclient/dhclient.leases"
+ #endif
+
+ #ifndef _PATH_DHCLIENT6_DB
+-#define _PATH_DHCLIENT6_DB LOCALSTATEDIR"/db/dhclient6.leases"
++#define _PATH_DHCLIENT6_DB LOCALSTATEDIR"/dhclient/dhclient6.leases"
+ #endif
+
+ #ifndef _PATH_RESOLV_CONF
diff --git a/dhcp/patches/dhcp-4.2.0-release-by-ifup.patch b/dhcp/patches/dhcp-4.2.0-release-by-ifup.patch
new file mode 100644
index 0000000..300c5f3
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.0-release-by-ifup.patch
@@ -0,0 +1,85 @@
+diff -up dhcp-4.2.0/client/dhclient.c.ifup dhcp-4.2.0/client/dhclient.c
+--- dhcp-4.2.0/client/dhclient.c.ifup 2010-07-21 13:30:10.000000000 +0200
++++ dhcp-4.2.0/client/dhclient.c 2010-07-21 13:37:03.000000000 +0200
+@@ -497,9 +497,81 @@ main(int argc, char **argv) {
+ kill(oldpid, SIGTERM);
+ }
+ fclose(pidfd);
++ } else {
++ /* handle release for interfaces requested with Red Hat
++ * /sbin/ifup - pidfile will be /var/run/dhclient-$interface.pid
++ */
++
++ if ((path_dhclient_pid == NULL) || (*path_dhclient_pid == '\0'))
++ path_dhclient_pid = "/var/run/dhclient.pid";
++
++ char *new_path_dhclient_pid;
++ struct interface_info *ip;
++ int pdp_len = strlen(path_dhclient_pid), pfx, dpfx;
++
++ /* find append point: beginning of any trailing '.pid'
++ * or '-$IF.pid' */
++ for (pfx=pdp_len; (pfx >= 0) && (path_dhclient_pid[pfx] != '.') && (path_dhclient_pid[pfx] != '/'); pfx--);
++ if (pfx == -1)
++ pfx = pdp_len;
++
++ if (path_dhclient_pid[pfx] == '/')
++ pfx += 1;
++
++ for (dpfx=pfx; (dpfx >= 0) && (path_dhclient_pid[dpfx] != '-') && (path_dhclient_pid[dpfx] != '/'); dpfx--);
++ if ((dpfx > -1) && (path_dhclient_pid[dpfx] != '/'))
++ pfx = dpfx;
++
++ for (ip = interfaces; ip; ip = ip->next) {
++ if (interfaces_requested && (ip->flags & (INTERFACE_REQUESTED))) {
++ int n_len = strlen(ip->name);
++
++ new_path_dhclient_pid = (char*) malloc(pfx + n_len + 6);
++ strncpy(new_path_dhclient_pid, path_dhclient_pid, pfx);
++ sprintf(new_path_dhclient_pid + pfx, "-%s.pid", ip->name);
++
++ if ((pidfd = fopen(new_path_dhclient_pid, "r")) != NULL) {
++ e = fscanf(pidfd, "%ld\n", &temp);
++ oldpid = (pid_t)temp;
++
++ if (e != 0 && e != EOF) {
++ if (oldpid) {
++ if (kill(oldpid, SIGTERM) == 0)
++ unlink(path_dhclient_pid);
++ }
++ }
++
++ fclose(pidfd);
++ }
++
++ free(new_path_dhclient_pid);
++ }
++ }
++ }
++ } else {
++ FILE *pidfp = NULL;
++ long temp = 0;
++ pid_t dhcpid = 0;
++ int dhc_running = 0;
++ char procfn[256] = "";
++
++ if ((pidfp = fopen(path_dhclient_pid, "r")) != NULL) {
++ if ((fscanf(pidfp, "%ld", &temp)==1) && ((dhcpid=(pid_t)temp) > 0)) {
++ snprintf(procfn,256,"/proc/%u",dhcpid);
++ dhc_running = (access(procfn, F_OK) == 0);
++ }
++
++ fclose(pidfp);
++ }
++
++ if (dhc_running) {
++ log_fatal("dhclient(%u) is already running - exiting. ", dhcpid);
++ return(1);
+ }
+ }
+
++ write_client_pid_file();
++
+ if (!quiet) {
+ log_info("%s %s", message, PACKAGE_VERSION);
+ log_info(copyright);
diff --git a/dhcp/patches/dhcp-4.2.0-unicast-bootp.patch b/dhcp/patches/dhcp-4.2.0-unicast-bootp.patch
new file mode 100644
index 0000000..78bc078
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.0-unicast-bootp.patch
@@ -0,0 +1,99 @@
+diff -up dhcp-4.2.0/server/bootp.c.unicast dhcp-4.2.0/server/bootp.c
+--- dhcp-4.2.0/server/bootp.c.unicast 2009-11-20 02:49:03.000000000 +0100
++++ dhcp-4.2.0/server/bootp.c 2010-07-21 13:40:25.000000000 +0200
+@@ -58,6 +58,7 @@ void bootp (packet)
+ char msgbuf [1024];
+ int ignorep;
+ int peer_has_leases = 0;
++ int norelay = 0;
+
+ if (packet -> raw -> op != BOOTREQUEST)
+ return;
+@@ -73,7 +74,7 @@ void bootp (packet)
+ ? inet_ntoa (packet -> raw -> giaddr)
+ : packet -> interface -> name);
+
+- if (!locate_network (packet)) {
++ if ((norelay = locate_network (packet)) == 0) {
+ log_info ("%s: network unknown", msgbuf);
+ return;
+ }
+@@ -390,6 +391,13 @@ void bootp (packet)
+ from, &to, &hto);
+ goto out;
+ }
++ } else if (norelay == 2) {
++ to.sin_addr = raw.ciaddr;
++ to.sin_port = remote_port;
++ if (fallback_interface) {
++ result = send_packet (fallback_interface, (struct packet *)0, &raw, outgoing.packet_length, from, &to, &hto);
++ goto out;
++ }
+
+ /* If it comes from a client that already knows its address
+ and is not requesting a broadcast response, and we can
+diff -up dhcp-4.2.0/server/dhcp.c.unicast dhcp-4.2.0/server/dhcp.c
+--- dhcp-4.2.0/server/dhcp.c.unicast 2010-06-01 19:29:59.000000000 +0200
++++ dhcp-4.2.0/server/dhcp.c 2010-07-21 13:40:25.000000000 +0200
+@@ -4185,6 +4185,7 @@ int locate_network (packet)
+ struct data_string data;
+ struct subnet *subnet = (struct subnet *)0;
+ struct option_cache *oc;
++ int norelay = 0;
+
+ /* See if there's a Relay Agent Link Selection Option, or a
+ * Subnet Selection Option. The Link-Select and Subnet-Select
+@@ -4200,12 +4201,24 @@ int locate_network (packet)
+ from the interface, if there is one. If not, fail. */
+ if (!oc && !packet -> raw -> giaddr.s_addr) {
+ if (packet -> interface -> shared_network) {
+- shared_network_reference
+- (&packet -> shared_network,
+- packet -> interface -> shared_network, MDL);
+- return 1;
++ struct in_addr any_addr;
++ any_addr.s_addr = INADDR_ANY;
++
++ if (!packet -> packet_type && memcmp(&packet -> raw -> ciaddr, &any_addr, 4)) {
++ struct iaddr cip;
++ memcpy(cip.iabuf, &packet -> raw -> ciaddr, 4);
++ cip.len = 4;
++ if (!find_grouped_subnet(&subnet, packet->interface->shared_network, cip, MDL))
++ norelay = 2;
++ }
++
++ if (!norelay) {
++ shared_network_reference(&packet -> shared_network, packet -> interface -> shared_network, MDL);
++ return 1;
++ }
++ } else {
++ return 0;
+ }
+- return 0;
+ }
+
+ /* If there's an option indicating link connection, and it's valid,
+@@ -4228,7 +4241,10 @@ int locate_network (packet)
+ data_string_forget (&data, MDL);
+ } else {
+ ia.len = 4;
+- memcpy (ia.iabuf, &packet -> raw -> giaddr, 4);
++ if (norelay)
++ memcpy (ia.iabuf, &packet->raw->ciaddr, 4);
++ else
++ memcpy (ia.iabuf, &packet->raw->giaddr, 4);
+ }
+
+ /* If we know the subnet on which the IP address lives, use it. */
+@@ -4236,7 +4252,10 @@ int locate_network (packet)
+ shared_network_reference (&packet -> shared_network,
+ subnet -> shared_network, MDL);
+ subnet_dereference (&subnet, MDL);
+- return 1;
++ if (norelay)
++ return norelay;
++ else
++ return 1;
+ }
+
+ /* Otherwise, fail. */
diff --git a/dhcp/patches/dhcp-4.2.1-64_bit_lease_parse.patch b/dhcp/patches/dhcp-4.2.1-64_bit_lease_parse.patch
new file mode 100644
index 0000000..a540bc1
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.1-64_bit_lease_parse.patch
@@ -0,0 +1,94 @@
+diff -up dhcp-4.2.1b1/common/dispatch.c.64-bit_lease_parse dhcp-4.2.1b1/common/dispatch.c
+diff -up dhcp-4.2.1b1/common/parse.c.64-bit_lease_parse dhcp-4.2.1b1/common/parse.c
+--- dhcp-4.2.1b1/common/parse.c.64-bit_lease_parse 2010-12-30 00:01:42.000000000 +0100
++++ dhcp-4.2.1b1/common/parse.c 2011-01-28 08:01:10.000000000 +0100
+@@ -909,8 +909,8 @@ TIME
+ parse_date_core(cfile)
+ struct parse *cfile;
+ {
+- int guess;
+- int tzoff, wday, year, mon, mday, hour, min, sec;
++ TIME guess;
++ long int tzoff, wday, year, mon, mday, hour, min, sec;
+ const char *val;
+ enum dhcp_token token;
+ static int months[11] = { 31, 59, 90, 120, 151, 181,
+@@ -936,7 +936,7 @@ parse_date_core(cfile)
+ }
+
+ token = next_token(&val, NULL, cfile); /* consume number */
+- guess = atoi(val);
++ guess = atol(val);
+
+ return((TIME)guess);
+ }
+@@ -948,7 +948,7 @@ parse_date_core(cfile)
+ return((TIME)0);
+ }
+ token = next_token(&val, NULL, cfile); /* consume day of week */
+- wday = atoi(val);
++ wday = atol(val);
+
+ /* Year... */
+ token = peek_token(&val, NULL, cfile);
+@@ -964,7 +964,7 @@ parse_date_core(cfile)
+ somebody invents a time machine, I think we can safely disregard
+ it. This actually works around a stupid Y2K bug that was present
+ in a very early beta release of dhcpd. */
+- year = atoi(val);
++ year = atol(val);
+ if (year > 1900)
+ year -= 1900;
+
+@@ -988,7 +988,7 @@ parse_date_core(cfile)
+ return((TIME)0);
+ }
+ token = next_token(&val, NULL, cfile); /* consume month */
+- mon = atoi(val) - 1;
++ mon = atol(val) - 1;
+
+ /* Slash separating month from day... */
+ token = peek_token(&val, NULL, cfile);
+@@ -1010,7 +1010,7 @@ parse_date_core(cfile)
+ return((TIME)0);
+ }
+ token = next_token(&val, NULL, cfile); /* consume day of month */
+- mday = atoi(val);
++ mday = atol(val);
+
+ /* Hour... */
+ token = peek_token(&val, NULL, cfile);
+@@ -1021,7 +1021,7 @@ parse_date_core(cfile)
+ return((TIME)0);
+ }
+ token = next_token(&val, NULL, cfile); /* consume hour */
+- hour = atoi(val);
++ hour = atol(val);
+
+ /* Colon separating hour from minute... */
+ token = peek_token(&val, NULL, cfile);
+@@ -1043,7 +1043,7 @@ parse_date_core(cfile)
+ return((TIME)0);
+ }
+ token = next_token(&val, NULL, cfile); /* consume minute */
+- min = atoi(val);
++ min = atol(val);
+
+ /* Colon separating minute from second... */
+ token = peek_token(&val, NULL, cfile);
+@@ -1065,13 +1065,13 @@ parse_date_core(cfile)
+ return((TIME)0);
+ }
+ token = next_token(&val, NULL, cfile); /* consume second */
+- sec = atoi(val);
++ sec = atol(val);
+
+ tzoff = 0;
+ token = peek_token(&val, NULL, cfile);
+ if (token == NUMBER) {
+ token = next_token(&val, NULL, cfile); /* consume tzoff */
+- tzoff = atoi(val);
++ tzoff = atol(val);
+ } else if (token != SEMI) {
+ token = next_token(&val, NULL, cfile);
+ parse_warn(cfile,
diff --git a/dhcp/patches/dhcp-4.2.1-P1-CVE-2011-0997.patch b/dhcp/patches/dhcp-4.2.1-P1-CVE-2011-0997.patch
new file mode 100644
index 0000000..1a0243c
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.1-P1-CVE-2011-0997.patch
@@ -0,0 +1,16 @@
+diff -up dhcp-4.2.1-P1/client/dhclient.c.CVE-2011-0997 dhcp-4.2.1-P1/client/dhclient.c
+--- dhcp-4.2.1-P1/client/dhclient.c.CVE-2011-0997 2011-04-06 20:21:43.000000000 +0200
++++ dhcp-4.2.1-P1/client/dhclient.c 2011-04-06 20:22:31.000000000 +0200
+@@ -4545,11 +4545,11 @@ static int check_option_values(struct un
+ if ((universe == NULL) || (universe == &dhcp_universe)) {
+ switch(opt) {
+ case DHO_HOST_NAME:
+- case DHO_DOMAIN_NAME:
+ case DHO_NIS_DOMAIN:
+ case DHO_NETBIOS_SCOPE:
+ return check_domain_name(ptr, len, 0);
+ break;
++ case DHO_DOMAIN_NAME: /* accept a list for compatibiliy */
+ case DHO_DOMAIN_SEARCH:
+ return check_domain_name_list(ptr, len, 0);
+ break;
diff --git a/dhcp/patches/dhcp-4.2.1-invalid-dhclient-conf.patch b/dhcp/patches/dhcp-4.2.1-invalid-dhclient-conf.patch
new file mode 100644
index 0000000..eeeea84
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.1-invalid-dhclient-conf.patch
@@ -0,0 +1,12 @@
+diff -up dhcp-4.2.1b1/client/dhclient.conf.supersede dhcp-4.2.1b1/client/dhclient.conf
+--- dhcp-4.2.1b1/client/dhclient.conf.supersede 2010-09-15 01:03:56.000000000 +0200
++++ dhcp-4.2.1b1/client/dhclient.conf 2011-01-27 18:38:28.000000000 +0100
+@@ -4,7 +4,7 @@ send dhcp-lease-time 3600;
+ supersede domain-search "fugue.com", "home.vix.com";
+ prepend domain-name-servers 127.0.0.1;
+ request subnet-mask, broadcast-address, time-offset, routers,
+- domain-name, domain-name-servers, host-name;
++ domain-search, domain-name-servers, host-name;
+ require subnet-mask, domain-name-servers;
+ timeout 60;
+ retry 60;
diff --git a/dhcp/patches/dhcp-4.2.1-manpages.patch b/dhcp/patches/dhcp-4.2.1-manpages.patch
new file mode 100644
index 0000000..9a42b7f
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.1-manpages.patch
@@ -0,0 +1,264 @@
+diff -up dhcp-4.2.1b1/client/dhclient.8.man dhcp-4.2.1b1/client/dhclient.8
+--- dhcp-4.2.1b1/client/dhclient.8.man 2010-07-14 22:09:34.000000000 +0200
++++ dhcp-4.2.1b1/client/dhclient.8 2011-01-27 18:19:07.000000000 +0100
+@@ -115,6 +115,33 @@ dhclient - Dynamic Host Configuration Pr
+ .B -w
+ ]
+ [
++.B -B
++]
++[
++.B -I
++.I dhcp-client-identifier
++]
++[
++.B -H
++.I host-name
++]
++[
++.B -F
++.I fqdn.fqdn
++]
++[
++.B -V
++.I vendor-class-identifier
++]
++[
++.B -R
++.I request-option-list
++]
++[
++.B -timeout
++.I timeout
++]
++[
+ .B -v
+ ]
+ [
+@@ -264,6 +291,69 @@ not to exit when it doesn't find any suc
+ program can then be used to notify the client when a network interface
+ has been added or removed, so that the client can attempt to configure an IP
+ address on that interface.
++
++.TP
++.BI \-B
++Set the BOOTP broadcast flag in request packets so servers will always
++broadcast replies.
++
++.TP
++.BI \-I\ <dhcp-client-identifier>
++Specify the dhcp-client-identifier option to send to the DHCP server.
++
++.TP
++.BI \-H\ <host-name>
++Specify the host-name option to send to the DHCP server. The host-name
++string only contains the client's hostname prefix, to which the server will
++append the ddns-domainname or domain-name options, if any, to derive the
++fully qualified domain name of the client. The
++.B -H
++option cannot be used with the
++.B -F
++option.
++
++.TP
++.BI \-F\ <fqdn.fqdn>
++Specify the fqdn.fqdn option to send to the DHCP server. This option cannot
++be used with the
++.B -H
++option. The fqdn.fqdn option must specify the complete domain name of the
++client host, which the server may use for dynamic DNS updates.
++
++.TP
++.BI \-V\ <vendor-class-identifier>
++Specify the vendor-class-identifier option to send to the DHCP server.
++
++.TP
++.BI \-R\ <option>[,<option>...]
++Specify the list of options the client is to request from the server. The
++option list must be a single string consisting of option names separated
++by at least one command and optional space characters. The default option
++list is:
++
++.BR
++ subnet-mask, broadcast-address, time-offset, routers,
++.BR
++ domain-search, domain-name, domain-name-servers, host-name,
++.BR
++ nis-domain, nis-servers, ntp-servers, interface-mtu
++
++.TP
++.B -R
++option does not append options to the default request, it overrides the
++default request list. Keep this in mind if you want to request an
++additional option besides the default request list. You will have to
++specify all option names for the
++.B -R
++parameter.
++
++.TP
++.BI \-timeout\ <timeout>
++Specify the time after which
++.B dhclient
++will decide that no DHCP servers can be contacted when no responses have been
++received.
++
+ .TP
+ .BI \-n
+ Do not configure any interfaces. This is most likely to be useful in
+diff -up dhcp-4.2.1b1/client/dhclient.conf.5.man dhcp-4.2.1b1/client/dhclient.conf.5
+--- dhcp-4.2.1b1/client/dhclient.conf.5.man 2010-09-15 01:03:56.000000000 +0200
++++ dhcp-4.2.1b1/client/dhclient.conf.5 2011-01-27 18:22:56.000000000 +0100
+@@ -186,7 +186,8 @@ responding to the client send the client
+ options. Only the option names should be specified in the request
+ statement - not option parameters. By default, the DHCPv4 client
+ requests the subnet-mask, broadcast-address, time-offset, routers,
+-domain-name, domain-name-servers and host-name options while the DHCPv6
++domain-search, domain-name, domain-name-servers, host-name, nis-domain,
++nis-servers, ntp-servers and interface-mtu options while the DHCPv6
+ client requests the dhcp6 name-servers and domain-search options. Note
+ that if you enter a \'request\' statement, you over-ride these defaults
+ and these options will not be requested.
+@@ -672,6 +673,17 @@ know the DHCP service(s) anycast MAC add
+ client. The \fIlink-type\fR and \fImac-address\fR parameters are configured
+ in a similar manner to the \fBhardware\fR statement.
+ .PP
++ \fBbootp-broadcast-always;\fR
++.PP
++The
++.B bootp-broadcast-always
++statement instructs dhclient to always set the bootp broadcast flag in
++request packets, so that servers will always broadcast replies.
++This is equivalent to supplying the dhclient -B argument, and has
++the same effect as specifying 'always-broadcast' in the server's dhcpd.conf.
++This option is provided as an extension to enable dhclient to work
++on IBM s390 Linux guests.
++.PP
+ .SH SAMPLE
+ The following configuration file is used on a laptop running NetBSD
+ 1.3. The laptop has an IP alias of 192.5.5.213, and has one
+@@ -697,7 +709,7 @@ interface "ep0" {
+ supersede domain-search "fugue.com", "rc.vix.com", "home.vix.com";
+ prepend domain-name-servers 127.0.0.1;
+ request subnet-mask, broadcast-address, time-offset, routers,
+- domain-name, domain-name-servers, host-name;
++ domain-search, domain-name, domain-name-servers, host-name;
+ require subnet-mask, domain-name-servers;
+ script "CLIENTBINDIR/dhclient-script";
+ media "media 10baseT/UTP", "media 10base2/BNC";
+diff -up dhcp-4.2.1b1/client/dhclient-script.8.man dhcp-4.2.1b1/client/dhclient-script.8
+--- dhcp-4.2.1b1/client/dhclient-script.8.man 2010-07-06 21:03:11.000000000 +0200
++++ dhcp-4.2.1b1/client/dhclient-script.8 2011-01-27 18:24:44.000000000 +0100
+@@ -47,7 +47,7 @@ customizations are needed, they should b
+ exit hooks provided (see HOOKS for details). These hooks will allow the
+ user to override the default behaviour of the client in creating a
+ .B /etc/resolv.conf
+-file.
++file, and to handle DHCP options not handled by default.
+ .PP
+ No standard client script exists for some operating systems, even though
+ the actual client may work, so a pioneering user may well need to create
+@@ -91,6 +91,26 @@ present. The
+ .B ETCDIR/dhclient-exit-hooks
+ script can modify the valid of exit_status to change the exit status
+ of dhclient-script.
++.PP
++Immediately after dhclient brings an interface UP with a new IP address,
++subnet mask, and routes, in the REBOOT/BOUND states, it will check for the
++existence of an executable
++.B ETCDIR/dhclient-up-hooks
++script, and source it if found. This script can handle DHCP options in
++the environment that are not handled by default. A per-interface.
++.B ETCDIR/dhclient-${IF}-up-hooks
++script will override the generic script and be sourced when interface
++$IF has been brought up.
++.PP
++Immediately before dhclient brings an interface DOWN, removing its IP
++address, subnet mask, and routes, in the STOP/RELEASE states, it will
++check for the existence of an executable
++.B ETCDIR/dhclient-down-hooks
++script, and source it if found. This script can handle DHCP options in
++the environment that are not handled by default. A per-interface
++.B ETCDIR/dhclient-${IF}-down-hooks
++script will override the generic script and be sourced when interface
++$IF is about to be brought down.
+ .SH OPERATION
+ When dhclient needs to invoke the client configuration script, it
+ defines a set of variables in the environment, and then invokes
+diff -up dhcp-4.2.1b1/common/dhcp-options.5.man dhcp-4.2.1b1/common/dhcp-options.5
+--- dhcp-4.2.1b1/common/dhcp-options.5.man 2010-07-13 22:56:56.000000000 +0200
++++ dhcp-4.2.1b1/common/dhcp-options.5 2011-01-27 18:25:57.000000000 +0100
+@@ -913,6 +913,21 @@ classless IP routing - it does not inclu
+ classless IP routing is now the most widely deployed routing standard,
+ this option is virtually useless, and is not implemented by any of the
+ popular DHCP clients, for example the Microsoft DHCP client.
++.PP
++NOTE to Fedora dhclient users:
++.br
++dhclient-script interprets trailing 0 octets of the target as indicating
++the subnet class of the route, so for the following static-routes value:
++.br
++ option static-routes 172.0.0.0 172.16.2.254,
++.br
++ 192.168.0.0 192.168.2.254;
++.br
++dhclient-script will create routes:
++.br
++ 172/8 via 172.16.2.254 dev $interface
++.br
++ 192.168/16 via 192.168.2.254 dev $interface
+ .RE
+ .PP
+ .nf
+diff -up dhcp-4.2.1b1/server/dhcpd.conf.5.man dhcp-4.2.1b1/server/dhcpd.conf.5
+--- dhcp-4.2.1b1/server/dhcpd.conf.5.man 2010-07-06 21:03:12.000000000 +0200
++++ dhcp-4.2.1b1/server/dhcpd.conf.5 2011-01-27 18:29:12.000000000 +0100
+@@ -519,6 +519,9 @@ pool {
+ };
+ .fi
+ .PP
++Dynamic BOOTP leases are not compatible with failover, and, as such,
++you need to disallow BOOTP in pools that you are using failover for.
++.PP
+ The server currently does very little sanity checking, so if you
+ configure it wrong, it will just fail in odd ways. I would recommend
+ therefore that you either do failover or don't do failover, but don't
+@@ -533,9 +536,9 @@ primary server might look like this:
+ failover peer "foo" {
+ primary;
+ address anthrax.rc.vix.com;
+- port 519;
++ port 647;
+ peer address trantor.rc.vix.com;
+- peer port 520;
++ peer port 847;
+ max-response-delay 60;
+ max-unacked-updates 10;
+ mclt 3600;
+@@ -1305,7 +1308,7 @@ the zone containing PTR records - for IS
+ .PP
+ .nf
+ key DHCP_UPDATER {
+- algorithm HMAC-MD5.SIG-ALG.REG.INT;
++ algorithm hmac-md5;
+ secret pRP5FapFoJ95JEL06sv4PQ==;
+ };
+
+@@ -1328,7 +1331,7 @@ dhcpd.conf file:
+ .PP
+ .nf
+ key DHCP_UPDATER {
+- algorithm HMAC-MD5.SIG-ALG.REG.INT;
++ algorithm hmac-md5;
+ secret pRP5FapFoJ95JEL06sv4PQ==;
+ };
+
+@@ -2540,7 +2543,8 @@ statement
+ The \fInext-server\fR statement is used to specify the host address of
+ the server from which the initial boot file (specified in the
+ \fIfilename\fR statement) is to be loaded. \fIServer-name\fR should
+-be a numeric IP address or a domain name.
++be a numeric IP address or a domain name. If no \fInext-server\fR statement
++applies to a given client, the address 0.0.0.0 is used.
+ .RE
+ .PP
+ The
diff --git a/dhcp/patches/dhcp-4.2.1-retransmission.patch b/dhcp/patches/dhcp-4.2.1-retransmission.patch
new file mode 100644
index 0000000..18e447f
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.1-retransmission.patch
@@ -0,0 +1,48 @@
+diff -up dhcp-4.2.1b1/client/dhc6.c.retransmission dhcp-4.2.1b1/client/dhc6.c
+--- dhcp-4.2.1b1/client/dhc6.c.retransmission 2011-01-28 08:40:56.000000000 +0100
++++ dhcp-4.2.1b1/client/dhc6.c 2011-01-28 08:39:22.000000000 +0100
+@@ -361,7 +361,7 @@ dhc6_retrans_init(struct client_state *c
+ static void
+ dhc6_retrans_advance(struct client_state *client)
+ {
+- struct timeval elapsed;
++ struct timeval elapsed, elapsed_after_RT;
+
+ /* elapsed = cur - start */
+ elapsed.tv_sec = cur_tv.tv_sec - client->start_time.tv_sec;
+@@ -378,6 +378,8 @@ dhc6_retrans_advance(struct client_state
+ elapsed.tv_sec += 1;
+ elapsed.tv_usec -= 1000000;
+ }
++ elapsed_after_RT.tv_sec = elapsed.tv_sec;
++ elapsed_after_RT.tv_usec = elapsed.tv_usec;
+
+ /*
+ * RT for each subsequent message transmission is based on the previous
+@@ -415,13 +417,10 @@ dhc6_retrans_advance(struct client_state
+ elapsed.tv_usec -= 1000000;
+ }
+ if (elapsed.tv_sec >= client->MRD) {
+- /*
+- * wake at RT + cur = start + MRD
+- */
+- client->RT = client->MRD +
+- (client->start_time.tv_sec - cur_tv.tv_sec);
+- client->RT = client->RT * 100 +
+- (client->start_time.tv_usec - cur_tv.tv_usec) / 10000;
++ client->RT = client->MRD - elapsed_after_RT.tv_sec;
++ client->RT = client->RT * 100 - elapsed_after_RT.tv_usec / 10000;
++ if (client->RT < 0)
++ client->RT = 0;
+ }
+ client->txcount++;
+ }
+@@ -1497,7 +1496,7 @@ check_timing6 (struct client_state *clie
+ }
+
+ /* Check if finished (-1 argument). */
+- if ((client->MRD != 0) && (elapsed.tv_sec > client->MRD)) {
++ if ((client->MRD != 0) && (elapsed.tv_sec >= client->MRD)) {
+ log_info("Max retransmission duration exceeded.");
+ return(CHK_TIM_MRD_EXCEEDED);
+ }
diff --git a/dhcp/patches/dhcp-4.2.1-sendDecline.patch b/dhcp/patches/dhcp-4.2.1-sendDecline.patch
new file mode 100644
index 0000000..b2fa4af
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.1-sendDecline.patch
@@ -0,0 +1,231 @@
+diff -up dhcp-4.2.1-P1/client/dhc6.c.sendDecline dhcp-4.2.1-P1/client/dhc6.c
+--- dhcp-4.2.1-P1/client/dhc6.c.sendDecline 2010-09-10 22:27:11.000000000 +0200
++++ dhcp-4.2.1-P1/client/dhc6.c 2011-06-17 14:19:48.992099868 +0200
+@@ -95,6 +95,8 @@ void do_select6(void *input);
+ void do_refresh6(void *input);
+ static void do_release6(void *input);
+ static void start_bound(struct client_state *client);
++static void start_decline6(struct client_state *client);
++static void do_decline6(void *input);
+ static void start_informed(struct client_state *client);
+ void informed_handler(struct packet *packet, struct client_state *client);
+ void bound_handler(struct packet *packet, struct client_state *client);
+@@ -2075,6 +2077,7 @@ start_release6(struct client_state *clie
+ cancel_timeout(do_select6, client);
+ cancel_timeout(do_refresh6, client);
+ cancel_timeout(do_release6, client);
++ cancel_timeout(do_decline6, client);
+ client->state = S_STOPPED;
+
+ /*
+@@ -2708,6 +2711,7 @@ dhc6_check_reply(struct client_state *cl
+ break;
+
+ case S_STOPPED:
++ case S_DECLINED:
+ action = dhc6_stop_action;
+ break;
+
+@@ -2809,6 +2813,7 @@ dhc6_check_reply(struct client_state *cl
+ break;
+
+ case S_STOPPED:
++ case S_DECLINED:
+ /* Nothing critical to do at this stage. */
+ break;
+
+@@ -3799,17 +3804,23 @@ reply_handler(struct packet *packet, str
+ cancel_timeout(do_select6, client);
+ cancel_timeout(do_refresh6, client);
+ cancel_timeout(do_release6, client);
++ cancel_timeout(do_decline6, client);
+
+ /* If this is in response to a Release/Decline, clean up and return. */
+- if (client->state == S_STOPPED) {
+- if (client->active_lease == NULL)
+- return;
++ if ((client->state == S_STOPPED) ||
++ (client->state == S_DECLINED)) {
++
++ if (client->active_lease != NULL) {
++ dhc6_lease_destroy(&client->active_lease, MDL);
++ client->active_lease = NULL;
++ /* We should never wait for nothing!? */
++ if (stopping_finished())
++ exit(0);
++ }
++
++ if (client->state == S_DECLINED)
++ start_init6(client);
+
+- dhc6_lease_destroy(&client->active_lease, MDL);
+- client->active_lease = NULL;
+- /* We should never wait for nothing!? */
+- if (stopping_finished())
+- exit(0);
+ return;
+ }
+
+@@ -4336,7 +4347,11 @@ start_bound(struct client_state *client)
+ oldia, oldaddr);
+ dhc6_marshall_values("new_", client, lease, ia, addr);
+
+- script_go(client);
++ // when script returns 3, DAD failed
++ if (script_go(client) == 3) {
++ start_decline6(client);
++ return;
++ }
+ }
+
+ /* XXX: maybe we should loop on the old values instead? */
+@@ -4382,6 +4397,149 @@ start_bound(struct client_state *client)
+ dhc6_check_times(client);
+ }
+
++/*
++ * Decline addresses.
++ */
++void
++start_decline6(struct client_state *client)
++{
++ /* Cancel any pending transmissions */
++ cancel_timeout(do_confirm6, client);
++ cancel_timeout(do_select6, client);
++ cancel_timeout(do_refresh6, client);
++ cancel_timeout(do_release6, client);
++ cancel_timeout(do_decline6, client);
++ client->state = S_DECLINED;
++
++ if (client->active_lease == NULL)
++ return;
++
++ /* Set timers per RFC3315 section 18.1.7. */
++ client->IRT = DEC_TIMEOUT * 100;
++ client->MRT = 0;
++ client->MRC = DEC_MAX_RC;
++ client->MRD = 0;
++
++ dhc6_retrans_init(client);
++ client->v6_handler = reply_handler;
++
++ client->refresh_type = DHCPV6_DECLINE;
++ do_decline6(client);
++}
++
++/*
++ * do_decline6() creates a Decline packet and transmits it.
++ */
++static void
++do_decline6(void *input)
++{
++ struct client_state *client;
++ struct data_string ds;
++ int send_ret;
++ struct timeval elapsed, tv;
++
++ client = input;
++
++ if ((client->active_lease == NULL) || !active_prefix(client))
++ return;
++
++ if ((client->MRC != 0) && (client->txcount > client->MRC)) {
++ log_info("Max retransmission count exceeded.");
++ goto decline_done;
++ }
++
++ /*
++ * Start_time starts at the first transmission.
++ */
++ if (client->txcount == 0) {
++ client->start_time.tv_sec = cur_tv.tv_sec;
++ client->start_time.tv_usec = cur_tv.tv_usec;
++ }
++
++ /* elapsed = cur - start */
++ elapsed.tv_sec = cur_tv.tv_sec - client->start_time.tv_sec;
++ elapsed.tv_usec = cur_tv.tv_usec - client->start_time.tv_usec;
++ if (elapsed.tv_usec < 0) {
++ elapsed.tv_sec -= 1;
++ elapsed.tv_usec += 1000000;
++ }
++
++ memset(&ds, 0, sizeof(ds));
++ if (!buffer_allocate(&ds.buffer, 4, MDL)) {
++ log_error("Unable to allocate memory for Decline.");
++ goto decline_done;
++ }
++
++ ds.data = ds.buffer->data;
++ ds.len = 4;
++ ds.buffer->data[0] = DHCPV6_DECLINE;
++ memcpy(ds.buffer->data + 1, client->dhcpv6_transaction_id, 3);
++
++ /* Form an elapsed option. */
++ /* Maximum value is 65535 1/100s coded as 0xffff. */
++ if ((elapsed.tv_sec < 0) || (elapsed.tv_sec > 655) ||
++ ((elapsed.tv_sec == 655) && (elapsed.tv_usec > 350000))) {
++ client->elapsed = 0xffff;
++ } else {
++ client->elapsed = elapsed.tv_sec * 100;
++ client->elapsed += elapsed.tv_usec / 10000;
++ }
++
++ client->elapsed = htons(client->elapsed);
++
++ log_debug("XMT: Forming Decline.");
++ make_client6_options(client, &client->sent_options,
++ client->active_lease, DHCPV6_DECLINE);
++ dhcpv6_universe.encapsulate(&ds, NULL, NULL, client, NULL,
++ client->sent_options, &global_scope,
++ &dhcpv6_universe);
++
++ /* Append IA's (but don't release temporary addresses). */
++ if (wanted_ia_na &&
++ dhc6_add_ia_na(client, &ds, client->active_lease,
++ DHCPV6_DECLINE) != ISC_R_SUCCESS) {
++ data_string_forget(&ds, MDL);
++ goto decline_done;
++ }
++ if (wanted_ia_pd &&
++ dhc6_add_ia_pd(client, &ds, client->active_lease,
++ DHCPV6_DECLINE) != ISC_R_SUCCESS) {
++ data_string_forget(&ds, MDL);
++ goto decline_done;
++ }
++
++ /* Transmit and wait. */
++ log_info("XMT: Decline on %s, interval %ld0ms.",
++ client->name ? client->name : client->interface->name,
++ (long int)client->RT);
++
++ send_ret = send_packet6(client->interface, ds.data, ds.len,
++ &DHCPv6DestAddr);
++ if (send_ret != ds.len) {
++ log_error("dhc6: sendpacket6() sent %d of %d bytes",
++ send_ret, ds.len);
++ }
++
++ data_string_forget(&ds, MDL);
++
++ /* Wait RT */
++ tv.tv_sec = cur_tv.tv_sec + client->RT / 100;
++ tv.tv_usec = cur_tv.tv_usec + (client->RT % 100) * 10000;
++ if (tv.tv_usec >= 1000000) {
++ tv.tv_sec += 1;
++ tv.tv_usec -= 1000000;
++ }
++ add_timeout(&tv, do_decline6, client, NULL, NULL);
++ dhc6_retrans_advance(client);
++ return;
++
++decline_done:
++ dhc6_lease_destroy(&client->active_lease, MDL);
++ client->active_lease = NULL;
++ start_init6(client);
++ return;
++}
++
+ /* While bound, ignore packets. In the future we'll want to answer
+ * Reconfigure-Request messages and the like.
+ */
diff --git a/dhcp/patches/dhcp-4.2.2-CLOEXEC.patch b/dhcp/patches/dhcp-4.2.2-CLOEXEC.patch
new file mode 100644
index 0000000..b07e2ff
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.2-CLOEXEC.patch
@@ -0,0 +1,423 @@
+diff -up dhcp-4.2.2b1/client/clparse.c.cloexec dhcp-4.2.2b1/client/clparse.c
+--- dhcp-4.2.2b1/client/clparse.c.cloexec 2011-07-01 14:13:30.973887714 +0200
++++ dhcp-4.2.2b1/client/clparse.c 2011-07-01 14:15:15.021580693 +0200
+@@ -246,7 +246,7 @@ int read_client_conf_file (const char *n
+ int token;
+ isc_result_t status;
+
+- if ((file = open (name, O_RDONLY)) < 0)
++ if ((file = open (name, O_RDONLY | O_CLOEXEC)) < 0)
+ return uerr2isc (errno);
+
+ cfile = NULL;
+@@ -283,7 +283,7 @@ void read_client_leases ()
+
+ /* Open the lease file. If we can't open it, just return -
+ we can safely trust the server to remember our state. */
+- if ((file = open (path_dhclient_db, O_RDONLY)) < 0)
++ if ((file = open (path_dhclient_db, O_RDONLY | O_CLOEXEC)) < 0)
+ return;
+
+ cfile = NULL;
+diff -up dhcp-4.2.2b1/client/dhclient.c.cloexec dhcp-4.2.2b1/client/dhclient.c
+--- dhcp-4.2.2b1/client/dhclient.c.cloexec 2011-07-01 14:13:30.970887717 +0200
++++ dhcp-4.2.2b1/client/dhclient.c 2011-07-01 14:16:51.485930388 +0200
+@@ -148,11 +148,11 @@ main(int argc, char **argv) {
+ /* Make sure that file descriptors 0 (stdin), 1, (stdout), and
+ 2 (stderr) are open. To do this, we assume that when we
+ open a file the lowest available file descriptor is used. */
+- fd = open("/dev/null", O_RDWR);
++ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
+ if (fd == 0)
+- fd = open("/dev/null", O_RDWR);
++ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
+ if (fd == 1)
+- fd = open("/dev/null", O_RDWR);
++ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
+ if (fd == 2)
+ log_perror = 0; /* No sense logging to /dev/null. */
+ else if (fd != -1)
+@@ -506,7 +506,7 @@ main(int argc, char **argv) {
+ int e;
+
+ oldpid = 0;
+- if ((pidfd = fopen(path_dhclient_pid, "r")) != NULL) {
++ if ((pidfd = fopen(path_dhclient_pid, "re")) != NULL) {
+ e = fscanf(pidfd, "%ld\n", &temp);
+ oldpid = (pid_t)temp;
+
+@@ -548,7 +548,7 @@ main(int argc, char **argv) {
+ strncpy(new_path_dhclient_pid, path_dhclient_pid, pfx);
+ sprintf(new_path_dhclient_pid + pfx, "-%s.pid", ip->name);
+
+- if ((pidfd = fopen(new_path_dhclient_pid, "r")) != NULL) {
++ if ((pidfd = fopen(new_path_dhclient_pid, "re")) != NULL) {
+ e = fscanf(pidfd, "%ld\n", &temp);
+ oldpid = (pid_t)temp;
+
+@@ -573,7 +573,7 @@ main(int argc, char **argv) {
+ int dhc_running = 0;
+ char procfn[256] = "";
+
+- if ((pidfp = fopen(path_dhclient_pid, "r")) != NULL) {
++ if ((pidfp = fopen(path_dhclient_pid, "re")) != NULL) {
+ if ((fscanf(pidfp, "%ld", &temp)==1) && ((dhcpid=(pid_t)temp) > 0)) {
+ snprintf(procfn,256,"/proc/%u",dhcpid);
+ dhc_running = (access(procfn, F_OK) == 0);
+@@ -2995,7 +2995,7 @@ void rewrite_client_leases ()
+
+ if (leaseFile != NULL)
+ fclose (leaseFile);
+- leaseFile = fopen (path_dhclient_db, "w");
++ leaseFile = fopen (path_dhclient_db, "we");
+ if (leaseFile == NULL) {
+ log_error ("can't create %s: %m", path_dhclient_db);
+ return;
+@@ -3105,7 +3105,7 @@ write_duid(struct data_string *duid)
+ return DHCP_R_INVALIDARG;
+
+ if (leaseFile == NULL) { /* XXX? */
+- leaseFile = fopen(path_dhclient_db, "w");
++ leaseFile = fopen(path_dhclient_db, "we");
+ if (leaseFile == NULL) {
+ log_error("can't create %s: %m", path_dhclient_db);
+ return ISC_R_IOERROR;
+@@ -3285,7 +3285,7 @@ int write_client_lease (client, lease, r
+ return 1;
+
+ if (leaseFile == NULL) { /* XXX */
+- leaseFile = fopen (path_dhclient_db, "w");
++ leaseFile = fopen (path_dhclient_db, "we");
+ if (leaseFile == NULL) {
+ log_error ("can't create %s: %m", path_dhclient_db);
+ return 0;
+@@ -3772,9 +3772,9 @@ void go_daemon ()
+ close(2);
+
+ /* Reopen them on /dev/null. */
+- open("/dev/null", O_RDWR);
+- open("/dev/null", O_RDWR);
+- open("/dev/null", O_RDWR);
++ open("/dev/null", O_RDWR | O_CLOEXEC);
++ open("/dev/null", O_RDWR | O_CLOEXEC);
++ open("/dev/null", O_RDWR | O_CLOEXEC);
+
+ write_client_pid_file ();
+
+@@ -3791,14 +3791,14 @@ void write_client_pid_file ()
+ return;
+ }
+
+- pfdesc = open (path_dhclient_pid, O_CREAT | O_TRUNC | O_WRONLY, 0644);
++ pfdesc = open (path_dhclient_pid, O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC, 0644);
+
+ if (pfdesc < 0) {
+ log_error ("Can't create %s: %m", path_dhclient_pid);
+ return;
+ }
+
+- pf = fdopen (pfdesc, "w");
++ pf = fdopen (pfdesc, "we");
+ if (!pf) {
+ close(pfdesc);
+ log_error ("Can't fdopen %s: %m", path_dhclient_pid);
+diff -up dhcp-4.2.2b1/common/bpf.c.cloexec dhcp-4.2.2b1/common/bpf.c
+--- dhcp-4.2.2b1/common/bpf.c.cloexec 2011-07-01 14:13:30.976887712 +0200
++++ dhcp-4.2.2b1/common/bpf.c 2011-07-01 14:13:31.030887673 +0200
+@@ -94,7 +94,7 @@ int if_register_bpf (info)
+ for (b = 0; 1; b++) {
+ /* %Audit% 31 bytes max. %2004.06.17,Safe% */
+ sprintf(filename, BPF_FORMAT, b);
+- sock = open (filename, O_RDWR, 0);
++ sock = open (filename, O_RDWR | O_CLOEXEC, 0);
+ if (sock < 0) {
+ if (errno == EBUSY) {
+ continue;
+diff -up dhcp-4.2.2b1/common/discover.c.cloexec dhcp-4.2.2b1/common/discover.c
+--- dhcp-4.2.2b1/common/discover.c.cloexec 2011-06-27 18:18:20.000000000 +0200
++++ dhcp-4.2.2b1/common/discover.c 2011-07-01 14:13:31.031887673 +0200
+@@ -421,7 +421,7 @@ begin_iface_scan(struct iface_conf_list
+ int len;
+ int i;
+
+- ifaces->fp = fopen("/proc/net/dev", "r");
++ ifaces->fp = fopen("/proc/net/dev", "re");
+ if (ifaces->fp == NULL) {
+ log_error("Error opening '/proc/net/dev' to list interfaces");
+ return 0;
+@@ -456,7 +456,7 @@ begin_iface_scan(struct iface_conf_list
+
+ #ifdef DHCPv6
+ if (local_family == AF_INET6) {
+- ifaces->fp6 = fopen("/proc/net/if_inet6", "r");
++ ifaces->fp6 = fopen("/proc/net/if_inet6", "re");
+ if (ifaces->fp6 == NULL) {
+ log_error("Error opening '/proc/net/if_inet6' to "
+ "list IPv6 interfaces; %m");
+diff -up dhcp-4.2.2b1/common/dlpi.c.cloexec dhcp-4.2.2b1/common/dlpi.c
+--- dhcp-4.2.2b1/common/dlpi.c.cloexec 2011-07-01 14:13:30.977887712 +0200
++++ dhcp-4.2.2b1/common/dlpi.c 2011-07-01 14:13:31.032887673 +0200
+@@ -806,7 +806,7 @@ dlpiopen(const char *ifname) {
+ }
+ *dp = '\0';
+
+- return open (devname, O_RDWR, 0);
++ return open (devname, O_RDWR | O_CLOEXEC, 0);
+ }
+
+ /*
+diff -up dhcp-4.2.2b1/common/nit.c.cloexec dhcp-4.2.2b1/common/nit.c
+--- dhcp-4.2.2b1/common/nit.c.cloexec 2011-07-01 14:13:30.978887712 +0200
++++ dhcp-4.2.2b1/common/nit.c 2011-07-01 14:13:31.033887672 +0200
+@@ -81,7 +81,7 @@ int if_register_nit (info)
+ struct strioctl sio;
+
+ /* Open a NIT device */
+- sock = open ("/dev/nit", O_RDWR);
++ sock = open ("/dev/nit", O_RDWR | O_CLOEXEC);
+ if (sock < 0)
+ log_fatal ("Can't open NIT device for %s: %m", info -> name);
+
+diff -up dhcp-4.2.2b1/common/resolv.c.cloexec dhcp-4.2.2b1/common/resolv.c
+--- dhcp-4.2.2b1/common/resolv.c.cloexec 2009-11-20 02:49:01.000000000 +0100
++++ dhcp-4.2.2b1/common/resolv.c 2011-07-01 14:13:31.033887672 +0200
+@@ -49,7 +49,7 @@ void read_resolv_conf (parse_time)
+ struct domain_search_list *dp, *dl, *nd;
+ isc_result_t status;
+
+- if ((file = open (path_resolv_conf, O_RDONLY)) < 0) {
++ if ((file = open (path_resolv_conf, O_RDONLY | O_CLOEXEC)) < 0) {
+ log_error ("Can't open %s: %m", path_resolv_conf);
+ return;
+ }
+diff -up dhcp-4.2.2b1/common/upf.c.cloexec dhcp-4.2.2b1/common/upf.c
+--- dhcp-4.2.2b1/common/upf.c.cloexec 2011-07-01 14:13:30.979887712 +0200
++++ dhcp-4.2.2b1/common/upf.c 2011-07-01 14:13:31.034887671 +0200
+@@ -77,7 +77,7 @@ int if_register_upf (info)
+ /* %Audit% Cannot exceed 36 bytes. %2004.06.17,Safe% */
+ sprintf(filename, "/dev/pf/pfilt%d", b);
+
+- sock = open (filename, O_RDWR, 0);
++ sock = open (filename, O_RDWR | O_CLOEXEC, 0);
+ if (sock < 0) {
+ if (errno == EBUSY) {
+ continue;
+diff -up dhcp-4.2.2b1/dst/dst_api.c.cloexec dhcp-4.2.2b1/dst/dst_api.c
+--- dhcp-4.2.2b1/dst/dst_api.c.cloexec 2009-10-29 01:46:48.000000000 +0100
++++ dhcp-4.2.2b1/dst/dst_api.c 2011-07-01 14:13:31.035887670 +0200
+@@ -437,7 +437,7 @@ dst_s_write_private_key(const DST_KEY *k
+ PRIVATE_KEY, PATH_MAX);
+
+ /* Do not overwrite an existing file */
+- if ((fp = dst_s_fopen(file, "w", 0600)) != NULL) {
++ if ((fp = dst_s_fopen(file, "we", 0600)) != NULL) {
+ int nn;
+ if ((nn = fwrite(encoded_block, 1, len, fp)) != len) {
+ EREPORT(("dst_write_private_key(): Write failure on %s %d != %d errno=%d\n",
+@@ -494,7 +494,7 @@ dst_s_read_public_key(const char *in_nam
+ * flags, proto, alg stored as decimal (or hex numbers FIXME).
+ * (FIXME: handle parentheses for line continuation.)
+ */
+- if ((fp = dst_s_fopen(name, "r", 0)) == NULL) {
++ if ((fp = dst_s_fopen(name, "re", 0)) == NULL) {
+ EREPORT(("dst_read_public_key(): Public Key not found %s\n",
+ name));
+ return (NULL);
+@@ -620,7 +620,7 @@ dst_s_write_public_key(const DST_KEY *ke
+ return (0);
+ }
+ /* create public key file */
+- if ((fp = dst_s_fopen(filename, "w+", 0644)) == NULL) {
++ if ((fp = dst_s_fopen(filename, "w+e", 0644)) == NULL) {
+ EREPORT(("DST_write_public_key: open of file:%s failed (errno=%d)\n",
+ filename, errno));
+ return (0);
+@@ -854,7 +854,7 @@ dst_s_read_private_key_file(char *name,
+ return (0);
+ }
+ /* first check if we can find the key file */
+- if ((fp = dst_s_fopen(filename, "r", 0)) == NULL) {
++ if ((fp = dst_s_fopen(filename, "re", 0)) == NULL) {
+ EREPORT(("dst_s_read_private_key_file: Could not open file %s in directory %s\n",
+ filename, dst_path[0] ? dst_path :
+ (char *) getcwd(NULL, PATH_MAX - 1)));
+diff -up dhcp-4.2.2b1/dst/prandom.c.cloexec dhcp-4.2.2b1/dst/prandom.c
+--- dhcp-4.2.2b1/dst/prandom.c.cloexec 2009-11-20 02:49:01.000000000 +0100
++++ dhcp-4.2.2b1/dst/prandom.c 2011-07-01 14:13:31.035887670 +0200
+@@ -269,7 +269,7 @@ get_dev_random(u_char *output, unsigned
+
+ s = stat("/dev/random", &st);
+ if (s == 0 && S_ISCHR(st.st_mode)) {
+- if ((fd = open("/dev/random", O_RDONLY | O_NONBLOCK)) != -1) {
++ if ((fd = open("/dev/random", O_RDONLY | O_NONBLOCK | O_CLOEXEC)) != -1) {
+ if ((n = read(fd, output, size)) < 0)
+ n = 0;
+ close(fd);
+@@ -480,7 +480,7 @@ digest_file(dst_work *work)
+ work->file_digest = dst_free_key(work->file_digest);
+ return (0);
+ }
+- if ((fp = fopen(name, "r")) == NULL)
++ if ((fp = fopen(name, "re")) == NULL)
+ return (0);
+ for (no = 0; (i = fread(buf, sizeof(*buf), sizeof(buf), fp)) > 0;
+ no += i)
+diff -up dhcp-4.2.2b1/omapip/trace.c.cloexec dhcp-4.2.2b1/omapip/trace.c
+--- dhcp-4.2.2b1/omapip/trace.c.cloexec 2010-05-27 02:34:57.000000000 +0200
++++ dhcp-4.2.2b1/omapip/trace.c 2011-07-01 14:13:31.036887669 +0200
+@@ -141,10 +141,10 @@ isc_result_t trace_begin (const char *fi
+ return DHCP_R_INVALIDARG;
+ }
+
+- traceoutfile = open (filename, O_CREAT | O_WRONLY | O_EXCL, 0600);
++ traceoutfile = open (filename, O_CREAT | O_WRONLY | O_EXCL | O_CLOEXEC, 0600);
+ if (traceoutfile < 0 && errno == EEXIST) {
+ log_error ("WARNING: Overwriting trace file \"%s\"", filename);
+- traceoutfile = open (filename, O_WRONLY | O_EXCL | O_TRUNC,
++ traceoutfile = open (filename, O_WRONLY | O_EXCL | O_TRUNC | O_CLOEXEC,
+ 0600);
+ }
+
+@@ -431,7 +431,7 @@ void trace_file_replay (const char *file
+ isc_result_t result;
+ int len;
+
+- traceinfile = fopen (filename, "r");
++ traceinfile = fopen (filename, "re");
+ if (!traceinfile) {
+ log_error("Can't open tracefile %s: %m", filename);
+ return;
+diff -up dhcp-4.2.2b1/relay/dhcrelay.c.cloexec dhcp-4.2.2b1/relay/dhcrelay.c
+--- dhcp-4.2.2b1/relay/dhcrelay.c.cloexec 2011-05-10 15:07:37.000000000 +0200
++++ dhcp-4.2.2b1/relay/dhcrelay.c 2011-07-01 14:18:07.630209767 +0200
+@@ -183,11 +183,11 @@ main(int argc, char **argv) {
+ /* Make sure that file descriptors 0(stdin), 1,(stdout), and
+ 2(stderr) are open. To do this, we assume that when we
+ open a file the lowest available file descriptor is used. */
+- fd = open("/dev/null", O_RDWR);
++ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
+ if (fd == 0)
+- fd = open("/dev/null", O_RDWR);
++ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
+ if (fd == 1)
+- fd = open("/dev/null", O_RDWR);
++ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
+ if (fd == 2)
+ log_perror = 0; /* No sense logging to /dev/null. */
+ else if (fd != -1)
+@@ -540,13 +540,13 @@ main(int argc, char **argv) {
+
+ if (no_pid_file == ISC_FALSE) {
+ pfdesc = open(path_dhcrelay_pid,
+- O_CREAT | O_TRUNC | O_WRONLY, 0644);
++ O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC, 0644);
+
+ if (pfdesc < 0) {
+ log_error("Can't create %s: %m",
+ path_dhcrelay_pid);
+ } else {
+- pf = fdopen(pfdesc, "w");
++ pf = fdopen(pfdesc, "we");
+ if (!pf)
+ log_error("Can't fdopen %s: %m",
+ path_dhcrelay_pid);
+diff -up dhcp-4.2.2b1/server/confpars.c.cloexec dhcp-4.2.2b1/server/confpars.c
+--- dhcp-4.2.2b1/server/confpars.c.cloexec 2010-10-14 00:34:45.000000000 +0200
++++ dhcp-4.2.2b1/server/confpars.c 2011-07-01 14:13:31.039887666 +0200
+@@ -116,7 +116,7 @@ isc_result_t read_conf_file (const char
+ }
+ #endif
+
+- if ((file = open (filename, O_RDONLY)) < 0) {
++ if ((file = open (filename, O_RDONLY | O_CLOEXEC)) < 0) {
+ if (leasep) {
+ log_error ("Can't open lease database %s: %m --",
+ path_dhcpd_db);
+diff -up dhcp-4.2.2b1/server/db.c.cloexec dhcp-4.2.2b1/server/db.c
+--- dhcp-4.2.2b1/server/db.c.cloexec 2010-09-14 00:15:26.000000000 +0200
++++ dhcp-4.2.2b1/server/db.c 2011-07-01 14:13:31.040887665 +0200
+@@ -1035,7 +1035,7 @@ void db_startup (testp)
+ }
+ #endif
+ if (!testp) {
+- db_file = fopen (path_dhcpd_db, "a");
++ db_file = fopen (path_dhcpd_db, "ae");
+ if (!db_file)
+ log_fatal ("Can't open %s for append.", path_dhcpd_db);
+ expire_all_pools ();
+@@ -1083,12 +1083,12 @@ int new_lease_file ()
+ path_dhcpd_db, (int)t) >= sizeof newfname)
+ log_fatal("new_lease_file: lease file path too long");
+
+- db_fd = open (newfname, O_WRONLY | O_TRUNC | O_CREAT, 0664);
++ db_fd = open (newfname, O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC, 0664);
+ if (db_fd < 0) {
+ log_error ("Can't create new lease file: %m");
+ return 0;
+ }
+- if ((new_db_file = fdopen(db_fd, "w")) == NULL) {
++ if ((new_db_file = fdopen(db_fd, "we")) == NULL) {
+ log_error("Can't fdopen new lease file: %m");
+ close(db_fd);
+ goto fdfail;
+diff -up dhcp-4.2.2b1/server/dhcpd.c.cloexec dhcp-4.2.2b1/server/dhcpd.c
+--- dhcp-4.2.2b1/server/dhcpd.c.cloexec 2011-04-21 16:08:15.000000000 +0200
++++ dhcp-4.2.2b1/server/dhcpd.c 2011-07-01 14:19:40.354124505 +0200
+@@ -270,11 +270,11 @@ main(int argc, char **argv) {
+ /* Make sure that file descriptors 0 (stdin), 1, (stdout), and
+ 2 (stderr) are open. To do this, we assume that when we
+ open a file the lowest available file descriptor is used. */
+- fd = open("/dev/null", O_RDWR);
++ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
+ if (fd == 0)
+- fd = open("/dev/null", O_RDWR);
++ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
+ if (fd == 1)
+- fd = open("/dev/null", O_RDWR);
++ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
+ if (fd == 2)
+ log_perror = 0; /* No sense logging to /dev/null. */
+ else if (fd != -1)
+@@ -793,7 +793,7 @@ main(int argc, char **argv) {
+ */
+ if (no_pid_file == ISC_FALSE) {
+ /*Read previous pid file. */
+- if ((i = open (path_dhcpd_pid, O_RDONLY)) >= 0) {
++ if ((i = open (path_dhcpd_pid, O_RDONLY | O_CLOEXEC)) >= 0) {
+ status = read(i, pbuf, (sizeof pbuf) - 1);
+ close (i);
+ if (status > 0) {
+@@ -812,7 +812,7 @@ main(int argc, char **argv) {
+ }
+
+ /* Write new pid file. */
+- i = open(path_dhcpd_pid, O_WRONLY|O_CREAT|O_TRUNC, 0644);
++ i = open(path_dhcpd_pid, O_WRONLY|O_CREAT|O_TRUNC|O_CLOEXEC, 0644);
+ if (i >= 0) {
+ sprintf(pbuf, "%d\n", (int) getpid());
+ IGNORE_RET (write(i, pbuf, strlen(pbuf)));
+@@ -840,9 +840,9 @@ main(int argc, char **argv) {
+ close(2);
+
+ /* Reopen them on /dev/null. */
+- open("/dev/null", O_RDWR);
+- open("/dev/null", O_RDWR);
+- open("/dev/null", O_RDWR);
++ open("/dev/null", O_RDWR | O_CLOEXEC);
++ open("/dev/null", O_RDWR | O_CLOEXEC);
++ open("/dev/null", O_RDWR | O_CLOEXEC);
+ log_perror = 0; /* No sense logging to /dev/null. */
+
+ IGNORE_RET (chdir("/"));
+diff -up dhcp-4.2.2b1/server/ldap.c.cloexec dhcp-4.2.2b1/server/ldap.c
+--- dhcp-4.2.2b1/server/ldap.c.cloexec 2010-03-25 16:26:58.000000000 +0100
++++ dhcp-4.2.2b1/server/ldap.c 2011-07-01 14:13:31.043887665 +0200
+@@ -685,7 +685,7 @@ ldap_start (void)
+
+ if (ldap_debug_file != NULL && ldap_debug_fd == -1)
+ {
+- if ((ldap_debug_fd = open (ldap_debug_file, O_CREAT | O_TRUNC | O_WRONLY,
++ if ((ldap_debug_fd = open (ldap_debug_file, O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC,
+ S_IRUSR | S_IWUSR)) < 0)
+ log_error ("Error opening debug LDAP log file %s: %s", ldap_debug_file,
+ strerror (errno));
diff --git a/dhcp/patches/dhcp-4.2.2-capability.patch b/dhcp/patches/dhcp-4.2.2-capability.patch
new file mode 100644
index 0000000..79af036
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.2-capability.patch
@@ -0,0 +1,323 @@
+diff -up dhcp-4.2.2b1/client/dhclient.8.capability dhcp-4.2.2b1/client/dhclient.8
+--- dhcp-4.2.2b1/client/dhclient.8.capability 2011-07-01 15:09:06.603784531 +0200
++++ dhcp-4.2.2b1/client/dhclient.8 2011-07-01 15:09:06.663783913 +0200
+@@ -118,6 +118,9 @@ dhclient - Dynamic Host Configuration Pr
+ .B -w
+ ]
+ [
++.B -nc
++]
++[
+ .B -B
+ ]
+ [
+@@ -296,6 +299,32 @@ has been added or removed, so that the c
+ address on that interface.
+
+ .TP
++.BI \-nc
++Do not drop capabilities.
++
++Normally, if
++.B dhclient
++was compiled with libcap-ng support,
++.B dhclient
++drops most capabilities immediately upon startup. While more secure,
++this greatly restricts the additional actions that hooks in
++.B dhclient-script (8)
++can take. (For example, any daemons that
++.B dhclient-script (8)
++starts or restarts will inherit the restricted capabilities as well,
++which may interfere with their correct operation.) Thus, the
++.BI \-nc
++option can be used to prevent
++.B dhclient
++from dropping capabilities.
++
++The
++.BI \-nc
++option is ignored if
++.B dhclient
++was not compiled with libcap-ng support.
++
++.TP
+ .BI \-B
+ Set the BOOTP broadcast flag in request packets so servers will always
+ broadcast replies.
+diff -up dhcp-4.2.2b1/client/dhclient.c.capability dhcp-4.2.2b1/client/dhclient.c
+--- dhcp-4.2.2b1/client/dhclient.c.capability 2011-07-01 15:09:06.644784107 +0200
++++ dhcp-4.2.2b1/client/dhclient.c 2011-07-01 15:09:06.664783903 +0200
+@@ -39,6 +39,10 @@
+ #include <limits.h>
+ #include <dns/result.h>
+
++#ifdef HAVE_LIBCAP_NG
++#include <cap-ng.h>
++#endif
++
+ /*
+ * Defined in stdio.h when _GNU_SOURCE is set, but we don't want to define
+ * that when building ISC code.
+@@ -141,6 +145,9 @@ main(int argc, char **argv) {
+ int timeout_arg = 0;
+ char *arg_conf = NULL;
+ int arg_conf_len = 0;
++#ifdef HAVE_LIBCAP_NG
++ int keep_capabilities = 0;
++#endif
+
+ /* Initialize client globals. */
+ memset(&default_duid, 0, sizeof(default_duid));
+@@ -410,6 +417,10 @@ main(int argc, char **argv) {
+ }
+
+ dhclient_request_options = argv[i];
++ } else if (!strcmp(argv[i], "-nc")) {
++#ifdef HAVE_LIBCAP_NG
++ keep_capabilities = 1;
++#endif
+ } else if (argv[i][0] == '-') {
+ usage();
+ } else if (interfaces_requested < 0) {
+@@ -458,6 +469,19 @@ main(int argc, char **argv) {
+ path_dhclient_script = s;
+ }
+
++#ifdef HAVE_LIBCAP_NG
++ /* Drop capabilities */
++ if (!keep_capabilities) {
++ capng_clear(CAPNG_SELECT_CAPS);
++ capng_update(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED,
++ CAP_DAC_OVERRIDE); // Drop this someday
++ capng_updatev(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED,
++ CAP_NET_ADMIN, CAP_NET_RAW,
++ CAP_NET_BIND_SERVICE, CAP_SYS_ADMIN, -1);
++ capng_apply(CAPNG_SELECT_CAPS);
++ }
++#endif
++
+ /* Set up the initial dhcp option universe. */
+ initialize_common_option_spaces();
+
+diff -up dhcp-4.2.2b1/client/dhclient-script.8.capability dhcp-4.2.2b1/client/dhclient-script.8
+--- dhcp-4.2.2b1/client/dhclient-script.8.capability 2011-07-01 15:09:06.604784521 +0200
++++ dhcp-4.2.2b1/client/dhclient-script.8 2011-07-01 15:09:06.666783883 +0200
+@@ -239,6 +239,16 @@ repeatedly initialized to the values pro
+ the other. Assuming the information provided by both servers is
+ valid, this shouldn't cause any real problems, but it could be
+ confusing.
++.PP
++Normally, if dhclient was compiled with libcap-ng support,
++dhclient drops most capabilities immediately upon startup.
++While more secure, this greatly restricts the additional actions that
++hooks in dhclient-script can take. For example, any daemons that
++dhclient-script starts or restarts will inherit the restricted
++capabilities as well, which may interfere with their correct operation.
++Thus, the
++.BI \-nc
++option can be used to prevent dhclient from dropping capabilities.
+ .SH SEE ALSO
+ dhclient(8), dhcpd(8), dhcrelay(8), dhclient.conf(5) and
+ dhclient.leases(5).
+diff -up dhcp-4.2.2b1/client/Makefile.am.capability dhcp-4.2.2b1/client/Makefile.am
+--- dhcp-4.2.2b1/client/Makefile.am.capability 2011-07-01 15:09:06.526785327 +0200
++++ dhcp-4.2.2b1/client/Makefile.am 2011-07-01 15:09:06.667783873 +0200
+@@ -5,7 +5,7 @@ dhclient_SOURCES = clparse.c dhclient.c
+ scripts/netbsd scripts/nextstep scripts/openbsd \
+ scripts/solaris scripts/openwrt
+ dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
+- $(BIND9_LIBDIR) -ldns-export -lisc-export
++ $(BIND9_LIBDIR) -ldns-export -lisc-export $(CAPNG_LDADD)
+ man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
+ EXTRA_DIST = $(man_MANS)
+
+diff -up dhcp-4.2.2b1/configure.ac.capability dhcp-4.2.2b1/configure.ac
+--- dhcp-4.2.2b1/configure.ac.capability 2011-07-01 15:09:06.527785317 +0200
++++ dhcp-4.2.2b1/configure.ac 2011-07-01 15:09:06.667783873 +0200
+@@ -449,6 +449,41 @@ AC_TRY_LINK(
+ # Look for optional headers.
+ AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h)
+
++# look for capabilities library
++AC_ARG_WITH(libcap-ng,
++ [ --with-libcap-ng=[auto/yes/no] Add Libcap-ng support [default=auto]],,
++ with_libcap_ng=auto)
++
++# Check for Libcap-ng API
++#
++# libcap-ng detection
++if test x$with_libcap_ng = xno ; then
++ have_libcap_ng=no;
++else
++ # Start by checking for header file
++ AC_CHECK_HEADER(cap-ng.h, capng_headers=yes, capng_headers=no)
++
++ # See if we have libcap-ng library
++ AC_CHECK_LIB(cap-ng, capng_clear,
++ CAPNG_LDADD=-lcap-ng,)
++
++ # Check results are usable
++ if test x$with_libcap_ng = xyes -a x$CAPNG_LDADD = x ; then
++ AC_MSG_ERROR(libcap-ng support was requested and the library was not found)
++ fi
++ if test x$CAPNG_LDADD != x -a $capng_headers = no ; then
++ AC_MSG_ERROR(libcap-ng libraries found but headers are missing)
++ fi
++fi
++AC_SUBST(CAPNG_LDADD)
++AC_MSG_CHECKING(whether to use libcap-ng)
++if test x$CAPNG_LDADD != x ; then
++ AC_DEFINE(HAVE_LIBCAP_NG,1,[libcap-ng support])
++ AC_MSG_RESULT(yes)
++else
++ AC_MSG_RESULT(no)
++fi
++
+ # Solaris needs some libraries for functions
+ AC_SEARCH_LIBS(socket, [socket])
+ AC_SEARCH_LIBS(inet_ntoa, [nsl])
+diff -up dhcp-4.2.2b1/relay/dhcrelay.c.capability dhcp-4.2.2b1/relay/dhcrelay.c
+--- dhcp-4.2.2b1/relay/dhcrelay.c.capability 2011-07-01 15:09:06.626784295 +0200
++++ dhcp-4.2.2b1/relay/dhcrelay.c 2011-07-01 15:12:05.362223794 +0200
+@@ -36,6 +36,11 @@
+ #include <syslog.h>
+ #include <sys/time.h>
+
++#ifdef HAVE_LIBCAP_NG
++# include <cap-ng.h>
++ int keep_capabilities = 0;
++#endif
++
+ TIME default_lease_time = 43200; /* 12 hours... */
+ TIME max_lease_time = 86400; /* 24 hours... */
+ struct tree_cache *global_options[256];
+@@ -356,6 +361,10 @@ main(int argc, char **argv) {
+ sl->next = upstreams;
+ upstreams = sl;
+ #endif
++ } else if (!strcmp(argv[i], "-nc")) {
++#ifdef HAVE_LIBCAP_NG
++ keep_capabilities = 1;
++#endif
+ } else if (!strcmp(argv[i], "-pf")) {
+ if (++i == argc)
+ usage();
+@@ -426,6 +435,17 @@ main(int argc, char **argv) {
+ #endif
+ }
+
++#ifdef HAVE_LIBCAP_NG
++ /* Drop capabilities */
++ if (!keep_capabilities) {
++ capng_clear(CAPNG_SELECT_BOTH);
++ capng_updatev(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED,
++ CAP_NET_RAW, CAP_NET_BIND_SERVICE, -1);
++ capng_apply(CAPNG_SELECT_BOTH);
++ log_info ("Dropped all unnecessary capabilities.");
++ }
++#endif
++
+ if (!quiet) {
+ log_info("%s %s", message, PACKAGE_VERSION);
+ log_info(copyright);
+@@ -573,6 +593,15 @@ main(int argc, char **argv) {
+ dhcpv6_packet_handler = do_packet6;
+ #endif
+
++#ifdef HAVE_LIBCAP_NG
++ /* Drop all capabilities */
++ if (!keep_capabilities) {
++ capng_clear(CAPNG_SELECT_BOTH);
++ capng_apply(CAPNG_SELECT_BOTH);
++ log_info ("Dropped all capabilities.");
++ }
++#endif
++
+ /* Start dispatching packets and timeouts... */
+ dispatch();
+
+diff -up dhcp-4.2.2b1/relay/Makefile.am.capability dhcp-4.2.2b1/relay/Makefile.am
+--- dhcp-4.2.2b1/relay/Makefile.am.capability 2011-07-01 15:09:06.546785121 +0200
++++ dhcp-4.2.2b1/relay/Makefile.am 2011-07-01 15:09:06.670783841 +0200
+@@ -3,7 +3,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
+ sbin_PROGRAMS = dhcrelay
+ dhcrelay_SOURCES = dhcrelay.c
+ dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
+- $(BIND9_LIBDIR) -ldns-export -lisc-export
++ $(BIND9_LIBDIR) -ldns-export -lisc-export $(CAPNG_LDADD)
+ man_MANS = dhcrelay.8
+ EXTRA_DIST = $(man_MANS)
+
+diff -up dhcp-4.2.2b1/server/dhcpd.c.capability dhcp-4.2.2b1/server/dhcpd.c
+--- dhcp-4.2.2b1/server/dhcpd.c.capability 2011-07-01 15:09:06.636784192 +0200
++++ dhcp-4.2.2b1/server/dhcpd.c 2011-07-01 15:09:06.670783841 +0200
+@@ -58,6 +58,11 @@ static const char url [] =
+ # undef group
+ #endif /* PARANOIA */
+
++#ifdef HAVE_LIBCAP_NG
++# include <cap-ng.h>
++ int keep_capabilities = 0;
++#endif
++
+ static void usage(void);
+
+ struct iaddr server_identifier;
+@@ -403,6 +408,10 @@ main(int argc, char **argv) {
+ traceinfile = argv [i];
+ trace_replay_init ();
+ #endif /* TRACING */
++ } else if (!strcmp(argv[i], "-nc")) {
++#ifdef HAVE_LIBCAP_NG
++ keep_capabilities = 1;
++#endif
+ } else if (argv [i][0] == '-') {
+ usage ();
+ } else {
+@@ -459,6 +468,17 @@ main(int argc, char **argv) {
+ }
+ #endif /* DHCPv6 */
+
++#ifdef HAVE_LIBCAP_NG
++ /* Drop capabilities */
++ if (!keep_capabilities) {
++ capng_clear(CAPNG_SELECT_BOTH);
++ capng_updatev(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED,
++ CAP_NET_RAW, CAP_NET_BIND_SERVICE, CAP_SYS_CHROOT, CAP_SETUID, CAP_SETGID, -1);
++ capng_apply(CAPNG_SELECT_BOTH);
++ log_info ("Dropped all unnecessary capabilities.");
++ }
++#endif
++
+ /*
+ * convert relative path names to absolute, for files that need
+ * to be reopened after chdir() has been called
+@@ -859,6 +879,15 @@ main(int argc, char **argv) {
+ omapi_set_int_value ((omapi_object_t *)dhcp_control_object,
+ (omapi_object_t *)0, "state", server_running);
+
++#ifdef HAVE_LIBCAP_NG
++ /* Drop all capabilities */
++ if (!keep_capabilities) {
++ capng_clear(CAPNG_SELECT_BOTH);
++ capng_apply(CAPNG_SELECT_BOTH);
++ log_info ("Dropped all capabilities.");
++ }
++#endif
++
+ /* Receive packets and dispatch them... */
+ dispatch ();
+
+diff -up dhcp-4.2.2b1/server/Makefile.am.capability dhcp-4.2.2b1/server/Makefile.am
+--- dhcp-4.2.2b1/server/Makefile.am.capability 2011-07-01 15:09:06.546785121 +0200
++++ dhcp-4.2.2b1/server/Makefile.am 2011-07-01 15:09:06.671783830 +0200
+@@ -8,7 +8,8 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c
+
+ dhcpd_CFLAGS = $(LDAP_CFLAGS)
+ dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
+- ../dhcpctl/libdhcpctl.a $(BIND9_LIBDIR) -ldns-export -lisc-export
++ ../dhcpctl/libdhcpctl.a $(BIND9_LIBDIR) -ldns-export -lisc-export \
++ $(CAPNG_LDADD)
+
+ man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
+ EXTRA_DIST = $(man_MANS)
diff --git a/dhcp/patches/dhcp-4.2.2-dhclient-usage.patch b/dhcp/patches/dhcp-4.2.2-dhclient-usage.patch
new file mode 100644
index 0000000..0d41943
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.2-dhclient-usage.patch
@@ -0,0 +1,14 @@
+diff -up dhcp-4.2.2b1/client/dhclient.c.usage dhcp-4.2.2b1/client/dhclient.c
+--- dhcp-4.2.2b1/client/dhclient.c.usage 2011-07-01 13:55:16.000000000 +0200
++++ dhcp-4.2.2b1/client/dhclient.c 2011-07-01 13:58:55.243800602 +0200
+@@ -1047,6 +1047,10 @@ static void usage()
+ " [-s server-addr] [-cf config-file] "
+ "[-lf lease-file]\n"
+ " [-pf pid-file] [--no-pid] [-e VAR=val]\n"
++ " [-I <dhcp-client-identifier>] [-B]\n"
++ " [-H <host-name> | -F <fqdn.fqdn>] [-timeout <timeout>]\n"
++ " [-V <vendor-class-identifier>]\n"
++ " [-R <request option list>]\n"
+ " [-sf script-file] [interface]");
+ }
+
diff --git a/dhcp/patches/dhcp-4.2.2-gpxe-cid.patch b/dhcp/patches/dhcp-4.2.2-gpxe-cid.patch
new file mode 100644
index 0000000..c0be4c2
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.2-gpxe-cid.patch
@@ -0,0 +1,132 @@
+diff -up dhcp-4.2.2/client/dhclient.c.gpxe-cid dhcp-4.2.2/client/dhclient.c
+--- dhcp-4.2.2/client/dhclient.c.gpxe-cid 2011-09-16 18:23:20.190453902 +0200
++++ dhcp-4.2.2/client/dhclient.c 2011-09-16 18:27:15.568463599 +0200
+@@ -58,6 +58,13 @@ const char *path_dhclient_pid = NULL;
+ static char path_dhclient_script_array[] = _PATH_DHCLIENT_SCRIPT;
+ char *path_dhclient_script = path_dhclient_script_array;
+
++/* Default Prefix */
++static unsigned char default_prefix[12] = {
++ 0xff, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x02, 0x00,
++ 0x00, 0x02, 0xc9, 0x00
++};
++
+ /* False (default) => we write and use a pid file */
+ isc_boolean_t no_pid_file = ISC_FALSE;
+
+@@ -1250,6 +1257,12 @@ int find_subnet (struct subnet **sp,
+ static void setup_ib_interface(struct interface_info *ip)
+ {
+ struct group *g;
++ struct hardware *hw = &ip->hw_address;
++ char client_id[64];
++ char *arg_conf = NULL;
++ int arg_conf_len = 0;
++ isc_result_t status;
++ struct parse *cfile = (struct parse *)0;
+
+ /* Set the broadcast flag */
+ ip->client->config->bootp_broadcast_always = 1;
+@@ -1266,8 +1279,39 @@ static void setup_ib_interface(struct in
+ }
+ }
+
+- /* No client ID specified */
+- log_fatal("dhcp-client-identifier must be specified for InfiniBand");
++ /*
++ * No client ID specified, make up one based on a default
++ * "prefix" and the port GUID.
++ *
++ * NOTE: This is compatible with what gpxe does.
++ */
++ sprintf(client_id, "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x",
++ default_prefix[0], default_prefix[1], default_prefix[2],
++ default_prefix[3], default_prefix[4], default_prefix[5],
++ default_prefix[6], default_prefix[7], default_prefix[8],
++ default_prefix[9], default_prefix[10], default_prefix[11],
++ hw->hbuf[1], hw->hbuf[2], hw->hbuf[3], hw->hbuf[4],
++ hw->hbuf[5], hw->hbuf[6], hw->hbuf[7], hw->hbuf[8]);
++
++ arg_conf_len = asprintf(&arg_conf,
++ "send dhcp-client-identifier %s;",
++ client_id);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to send option dhcp-client-identifier");
++
++ status = new_parse(&cfile, -1, arg_conf, arg_conf_len,
++ "Automatic Infiniband client identifier", 0);
++
++ if ((status != ISC_R_SUCCESS) || (cfile->warnings_occurred))
++ log_fatal("Failed to parse Infiniband client identifier");
++
++ parse_client_statement(cfile, NULL, ip->client->config);
++
++ if (cfile->warnings_occurred)
++ log_fatal("Failed to parse Infiniband client identifier");
++
++ end_parse(&cfile);
+ }
+
+ /* Individual States:
+diff -up dhcp-4.2.2/common/lpf.c.gpxe-cid dhcp-4.2.2/common/lpf.c
+--- dhcp-4.2.2/common/lpf.c.gpxe-cid 2011-09-16 18:23:20.183453996 +0200
++++ dhcp-4.2.2/common/lpf.c 2011-09-16 18:25:28.235804421 +0200
+@@ -591,6 +591,37 @@ void maybe_setup_fallback ()
+ }
+ }
+
++static unsigned char * get_ib_hw_addr(char * name)
++{
++ struct ifaddrs *ifaddrs;
++ struct ifaddrs *ifa;
++ struct sockaddr_ll *sll = NULL;
++ static unsigned char hw_addr[8];
++
++ if (getifaddrs(&ifaddrs) == -1)
++ return NULL;
++
++ for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next) {
++ if (ifa->ifa_addr == NULL)
++ continue;
++ if (ifa->ifa_addr->sa_family != AF_PACKET)
++ continue;
++ if (ifa->ifa_flags & IFF_LOOPBACK)
++ continue;
++ if (strcmp(ifa->ifa_name, name) == 0) {
++ sll = (struct sockaddr_ll *)(void *)ifa->ifa_addr;
++ break;
++ }
++ }
++ if (sll == NULL) {
++ freeifaddrs(ifaddrs);
++ return NULL;
++ }
++ memcpy(hw_addr, &sll->sll_addr[sll->sll_halen - 8], 8);
++ freeifaddrs(ifaddrs);
++ return (unsigned char *)&hw_addr;
++}
++
+ void
+ get_hw_addr(struct interface_info *info)
+ {
+@@ -599,6 +630,7 @@ get_hw_addr(struct interface_info *info)
+ struct ifaddrs *ifaddrs;
+ struct ifaddrs *ifa;
+ struct sockaddr_ll *sll = NULL;
++ unsigned char *hw_addr;
+
+ if (getifaddrs(&ifaddrs) == -1)
+ log_fatal("Failed to get interfaces");
+@@ -660,6 +692,10 @@ get_hw_addr(struct interface_info *info)
+
+ hw->hlen = 1;
+ hw->hbuf[0] = HTYPE_INFINIBAND;
++ hw_addr = get_ib_hw_addr(name);
++ if (!hw_addr)
++ log_fatal("Failed getting %s hw addr", name);
++ memcpy (&hw->hbuf [1], hw_addr, 8);
+ break;
+ #if defined(ARPHRD_PPP)
+ case ARPHRD_PPP:
diff --git a/dhcp/patches/dhcp-4.2.2-improved-xid.patch b/dhcp/patches/dhcp-4.2.2-improved-xid.patch
new file mode 100644
index 0000000..f49fc78
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.2-improved-xid.patch
@@ -0,0 +1,138 @@
+diff -up dhcp-4.2.2/client/dhclient.c.improved-xid dhcp-4.2.2/client/dhclient.c
+--- dhcp-4.2.2/client/dhclient.c.improved-xid 2011-09-16 18:18:00.649730661 +0200
++++ dhcp-4.2.2/client/dhclient.c 2011-09-16 18:22:36.815035513 +0200
+@@ -898,6 +898,26 @@ main(int argc, char **argv) {
+ }
+ }
+
++ /* We create a backup seed before rediscovering interfaces in order to
++ have a seed built using all of the available interfaces
++ It's interesting if required interfaces doesn't let us defined
++ a really unique seed due to a lack of valid HW addr later
++ (this is the case with DHCP over IB)
++ We only use the last device as using a sum could broke the
++ uniqueness of the seed among multiple nodes
++ */
++ unsigned backup_seed = 0;
++ for (ip = interfaces; ip; ip = ip -> next) {
++ int junk;
++ if ( ip -> hw_address.hlen <= sizeof seed )
++ continue;
++ memcpy (&junk,
++ &ip -> hw_address.hbuf [ip -> hw_address.hlen -
++ sizeof seed], sizeof seed);
++ backup_seed = junk;
++ }
++
++
+ /* At this point, all the interfaces that the script thinks
+ are relevant should be running, so now we once again call
+ discover_interfaces(), and this time ask it to actually set
+@@ -912,14 +932,36 @@ main(int argc, char **argv) {
+ Not much entropy, but we're booting, so we're not likely to
+ find anything better. */
+ seed = 0;
++ int seed_flag = 0;
+ for (ip = interfaces; ip; ip = ip->next) {
+ int junk;
++ if ( ip -> hw_address.hlen <= sizeof seed )
++ continue;
+ memcpy(&junk,
+ &ip->hw_address.hbuf[ip->hw_address.hlen -
+ sizeof seed], sizeof seed);
+ seed += junk;
++ seed_flag = 1;
+ }
+- srandom(seed + cur_time + (unsigned)getpid());
++ if ( seed_flag == 0 ) {
++ if ( backup_seed != 0 ) {
++ seed = backup_seed;
++ log_info ("xid: rand init seed (0x%x) built using all"
++ " available interfaces",seed);
++ }
++ else {
++ seed = cur_time^((unsigned) gethostid()) ;
++ log_info ("xid: warning: no netdev with useable HWADDR found"
++ " for seed's uniqueness enforcement");
++ log_info ("xid: rand init seed (0x%x) built using gethostid",
++ seed);
++ }
++ /* we only use seed and no current time as a broadcast reply */
++ /* will certainly be used by the hwaddrless interface */
++ srandom(seed);
++ }
++ else
++ srandom(seed + cur_time + (unsigned)getpid());
+
+ /* Setup specific Infiniband options */
+ for (ip = interfaces; ip; ip = ip->next) {
+@@ -1457,7 +1499,7 @@ void dhcpack (packet)
+ return;
+ }
+
+- log_info ("DHCPACK from %s", piaddr (packet -> client_addr));
++ log_info ("DHCPACK from %s (xid=0x%x)", piaddr (packet -> client_addr), client -> xid);
+
+ lease = packet_to_lease (packet, client);
+ if (!lease) {
+@@ -2174,7 +2216,7 @@ void dhcpnak (packet)
+ return;
+ }
+
+- log_info ("DHCPNAK from %s", piaddr (packet -> client_addr));
++ log_info ("DHCPNAK from %s (xid=0x%x)", piaddr (packet -> client_addr), client -> xid);
+
+ if (!client -> active) {
+ #if defined (DEBUG)
+@@ -2300,10 +2342,10 @@ void send_discover (cpp)
+ client -> packet.secs = htons (65535);
+ client -> secs = client -> packet.secs;
+
+- log_info ("DHCPDISCOVER on %s to %s port %d interval %ld",
++ log_info ("DHCPDISCOVER on %s to %s port %d interval %ld (xid=0x%x)",
+ client -> name ? client -> name : client -> interface -> name,
+ inet_ntoa (sockaddr_broadcast.sin_addr),
+- ntohs (sockaddr_broadcast.sin_port), (long)(client -> interval));
++ ntohs (sockaddr_broadcast.sin_port), (long)(client -> interval), client -> xid);
+
+ /* Send out a packet. */
+ result = send_packet (client -> interface, (struct packet *)0,
+@@ -2584,10 +2626,10 @@ void send_request (cpp)
+ client -> packet.secs = htons (65535);
+ }
+
+- log_info ("DHCPREQUEST on %s to %s port %d",
++ log_info ("DHCPREQUEST on %s to %s port %d (xid=0x%x)",
+ client -> name ? client -> name : client -> interface -> name,
+ inet_ntoa (destination.sin_addr),
+- ntohs (destination.sin_port));
++ ntohs (destination.sin_port), client -> xid);
+
+ if (destination.sin_addr.s_addr != INADDR_BROADCAST &&
+ fallback_interface)
+@@ -2618,10 +2660,10 @@ void send_decline (cpp)
+
+ int result;
+
+- log_info ("DHCPDECLINE on %s to %s port %d",
++ log_info ("DHCPDECLINE on %s to %s port %d (xid=0x%x)",
+ client -> name ? client -> name : client -> interface -> name,
+ inet_ntoa (sockaddr_broadcast.sin_addr),
+- ntohs (sockaddr_broadcast.sin_port));
++ ntohs (sockaddr_broadcast.sin_port), client -> xid);
+
+ /* Send out a packet. */
+ result = send_packet (client -> interface, (struct packet *)0,
+@@ -2661,10 +2703,10 @@ void send_release (cpp)
+ return;
+ }
+
+- log_info ("DHCPRELEASE on %s to %s port %d",
++ log_info ("DHCPRELEASE on %s to %s port %d (xid=0x%x)",
+ client -> name ? client -> name : client -> interface -> name,
+ inet_ntoa (destination.sin_addr),
+- ntohs (destination.sin_port));
++ ntohs (destination.sin_port), client -> xid);
+
+ if (fallback_interface)
+ result = send_packet (fallback_interface,
diff --git a/dhcp/patches/dhcp-4.2.2-lpf-ib.patch b/dhcp/patches/dhcp-4.2.2-lpf-ib.patch
new file mode 100644
index 0000000..4034028
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.2-lpf-ib.patch
@@ -0,0 +1,538 @@
+diff -up dhcp-4.2.2/client/dhclient.c.lpf-ib dhcp-4.2.2/client/dhclient.c
+--- dhcp-4.2.2/client/dhclient.c.lpf-ib 2011-09-19 11:24:08.693775799 +0200
++++ dhcp-4.2.2/client/dhclient.c 2011-09-19 11:24:08.703775541 +0200
+@@ -113,6 +113,8 @@ static int check_domain_name_list(const
+ static int check_option_values(struct universe *universe, unsigned int opt,
+ const char *ptr, size_t len);
+
++static void setup_ib_interface(struct interface_info *ip);
++
+ int
+ main(int argc, char **argv) {
+ int fd;
+@@ -919,6 +921,14 @@ main(int argc, char **argv) {
+ }
+ srandom(seed + cur_time + (unsigned)getpid());
+
++ /* Setup specific Infiniband options */
++ for (ip = interfaces; ip; ip = ip->next) {
++ if (ip->client &&
++ (ip->hw_address.hbuf[0] == HTYPE_INFINIBAND)) {
++ setup_ib_interface(ip);
++ }
++ }
++
+ /* Start a configuration state machine for each interface. */
+ #ifdef DHCPv6
+ if (local_family == AF_INET6) {
+@@ -1195,6 +1205,29 @@ int find_subnet (struct subnet **sp,
+ return 0;
+ }
+
++static void setup_ib_interface(struct interface_info *ip)
++{
++ struct group *g;
++
++ /* Set the broadcast flag */
++ ip->client->config->bootp_broadcast_always = 1;
++
++ /*
++ * Find out if a dhcp-client-identifier option was specified either
++ * in the config file or on the command line
++ */
++ for (g = ip->client->config->on_transmission; g != NULL; g = g->next) {
++ if ((g->statements != NULL) &&
++ (strcmp(g->statements->data.option->option->name,
++ "dhcp-client-identifier") == 0)) {
++ return;
++ }
++ }
++
++ /* No client ID specified */
++ log_fatal("dhcp-client-identifier must be specified for InfiniBand");
++}
++
+ /* Individual States:
+ *
+ * Each routine is called from the dhclient_state_machine() in one of
+diff -up dhcp-4.2.2/common/bpf.c.lpf-ib dhcp-4.2.2/common/bpf.c
+--- dhcp-4.2.2/common/bpf.c.lpf-ib 2011-09-19 11:24:08.694775773 +0200
++++ dhcp-4.2.2/common/bpf.c 2011-09-19 11:24:08.704775516 +0200
+@@ -198,11 +198,44 @@ struct bpf_insn dhcp_bpf_filter [] = {
+ BPF_STMT(BPF_RET+BPF_K, 0),
+ };
+
++/* Packet filter program for DHCP over Infiniband.
++ *
++ * XXX
++ * Changes to the filter program may require changes to the constant offsets
++ * used in lpf_gen_filter_setup to patch the port in the BPF program!
++ * XXX
++ */
++struct bpf_insn dhcp_ib_bpf_filter [] = {
++ /* Packet filter for Infiniband */
++ /* Make sure it's a UDP packet... */
++ BPF_STMT(BPF_LD + BPF_B + BPF_ABS, 9),
++ BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, IPPROTO_UDP, 0, 6),
++
++ /* Make sure this isn't a fragment... */
++ BPF_STMT(BPF_LD + BPF_H + BPF_ABS, 6),
++ BPF_JUMP(BPF_JMP + BPF_JSET + BPF_K, 0x1fff, 4, 0),
++
++ /* Get the IP header length... */
++ BPF_STMT(BPF_LDX + BPF_B + BPF_MSH, 0),
++
++ /* Make sure it's to the right port... */
++ BPF_STMT(BPF_LD + BPF_H + BPF_IND, 2),
++ BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, 67, 0, 1),
++
++ /* If we passed all the tests, ask for the whole packet. */
++ BPF_STMT(BPF_RET + BPF_K, (u_int)-1),
++
++ /* Otherwise, drop it. */
++ BPF_STMT(BPF_RET + BPF_K, 0),
++};
++
+ #if defined (DEC_FDDI)
+ struct bpf_insn *bpf_fddi_filter;
+ #endif
+
+ int dhcp_bpf_filter_len = sizeof dhcp_bpf_filter / sizeof (struct bpf_insn);
++int dhcp_ib_bpf_filter_len = sizeof dhcp_ib_bpf_filter / sizeof (struct bpf_insn);
++
+ #if defined (HAVE_TR_SUPPORT)
+ struct bpf_insn dhcp_bpf_tr_filter [] = {
+ /* accept all token ring packets due to variable length header */
+diff -up dhcp-4.2.2/common/lpf.c.lpf-ib dhcp-4.2.2/common/lpf.c
+--- dhcp-4.2.2/common/lpf.c.lpf-ib 2011-09-19 11:24:08.694775773 +0200
++++ dhcp-4.2.2/common/lpf.c 2011-09-19 11:26:15.107109935 +0200
+@@ -42,6 +42,7 @@
+ #include "includes/netinet/udp.h"
+ #include "includes/netinet/if_ether.h"
+ #include <net/if.h>
++#include <ifaddrs.h>
+
+ #ifndef PACKET_AUXDATA
+ #define PACKET_AUXDATA 8
+@@ -59,6 +60,15 @@ struct tpacket_auxdata
+ /* Reinitializes the specified interface after an address change. This
+ is not required for packet-filter APIs. */
+
++/* Default broadcast address for IPoIB */
++static unsigned char default_ib_bcast_addr[20] = {
++ 0x00, 0xff, 0xff, 0xff,
++ 0xff, 0x12, 0x40, 0x1b,
++ 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00,
++ 0xff, 0xff, 0xff, 0xff
++};
++
+ #ifdef USE_LPF_SEND
+ void if_reinitialize_send (info)
+ struct interface_info *info;
+@@ -86,10 +96,21 @@ int if_register_lpf (info)
+ struct sockaddr common;
+ } sa;
+ struct ifreq ifr;
++ int type;
++ int protocol;
+
+ /* Make an LPF socket. */
+- if ((sock = socket(PF_PACKET, SOCK_RAW,
+- htons((short)ETH_P_ALL))) < 0) {
++ get_hw_addr(info);
++
++ if (info->hw_address.hbuf[0] == HTYPE_INFINIBAND) {
++ type = SOCK_DGRAM;
++ protocol = ETHERTYPE_IP;
++ } else {
++ type = SOCK_RAW;
++ protocol = ETH_P_ALL;
++ }
++
++ if ((sock = socket(PF_PACKET, type, htons((short)protocol))) < 0) {
+ if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
+ errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT ||
+ errno == EAFNOSUPPORT || errno == EINVAL) {
+@@ -112,6 +133,7 @@ int if_register_lpf (info)
+ /* Bind to the interface name */
+ memset (&sa, 0, sizeof sa);
+ sa.ll.sll_family = AF_PACKET;
++ sa.ll.sll_protocol = htons(protocol);
+ sa.ll.sll_ifindex = ifr.ifr_ifindex;
+ if (bind (sock, &sa.common, sizeof sa)) {
+ if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
+@@ -127,8 +149,6 @@ int if_register_lpf (info)
+ log_fatal ("Bind socket to interface: %m");
+ }
+
+- get_hw_addr(info->name, &info->hw_address);
+-
+ return sock;
+ }
+ #endif /* USE_LPF_SEND || USE_LPF_RECEIVE */
+@@ -183,6 +203,8 @@ void if_deregister_send (info)
+ in bpf includes... */
+ extern struct sock_filter dhcp_bpf_filter [];
+ extern int dhcp_bpf_filter_len;
++extern struct sock_filter dhcp_ib_bpf_filter [];
++extern int dhcp_ib_bpf_filter_len;
+
+ #if defined (HAVE_TR_SUPPORT)
+ extern struct sock_filter dhcp_bpf_tr_filter [];
+@@ -200,11 +222,13 @@ void if_register_receive (info)
+ /* Open a LPF device and hang it on this interface... */
+ info -> rfdesc = if_register_lpf (info);
+
+- val = 1;
+- if (setsockopt (info -> rfdesc, SOL_PACKET, PACKET_AUXDATA, &val,
+- sizeof val) < 0) {
+- if (errno != ENOPROTOOPT)
+- log_fatal ("Failed to set auxiliary packet data: %m");
++ if (info->hw_address.hbuf[0] != HTYPE_INFINIBAND) {
++ val = 1;
++ if (setsockopt (info -> rfdesc, SOL_PACKET, PACKET_AUXDATA,
++ &val, sizeof val) < 0) {
++ if (errno != ENOPROTOOPT)
++ log_fatal ("Failed to set auxiliary packet data: %m");
++ }
+ }
+
+ #if defined (HAVE_TR_SUPPORT)
+@@ -250,15 +274,28 @@ static void lpf_gen_filter_setup (info)
+
+ memset(&p, 0, sizeof(p));
+
+- /* Set up the bpf filter program structure. This is defined in
+- bpf.c */
+- p.len = dhcp_bpf_filter_len;
+- p.filter = dhcp_bpf_filter;
+-
+- /* Patch the server port into the LPF program...
+- XXX changes to filter program may require changes
+- to the insn number(s) used below! XXX */
+- dhcp_bpf_filter [8].k = ntohs ((short)local_port);
++ if (info->hw_address.hbuf[0] == HTYPE_INFINIBAND) {
++ /* Set up the bpf filter program structure. */
++ p.len = dhcp_ib_bpf_filter_len;
++ p.filter = dhcp_ib_bpf_filter;
++
++ /* Patch the server port into the LPF program...
++ XXX
++ changes to filter program may require changes
++ to the insn number(s) used below!
++ XXX */
++ dhcp_ib_bpf_filter[6].k = ntohs ((short)local_port);
++ } else {
++ /* Set up the bpf filter program structure.
++ This is defined in bpf.c */
++ p.len = dhcp_bpf_filter_len;
++ p.filter = dhcp_bpf_filter;
++
++ /* Patch the server port into the LPF program...
++ XXX changes to filter program may require changes
++ to the insn number(s) used below! XXX */
++ dhcp_bpf_filter [8].k = ntohs ((short)local_port);
++ }
+
+ if (setsockopt (info -> rfdesc, SOL_SOCKET, SO_ATTACH_FILTER, &p,
+ sizeof p) < 0) {
+@@ -315,6 +352,54 @@ static void lpf_tr_filter_setup (info)
+ #endif /* USE_LPF_RECEIVE */
+
+ #ifdef USE_LPF_SEND
++ssize_t send_packet_ib(interface, packet, raw, len, from, to, hto)
++ struct interface_info *interface;
++ struct packet *packet;
++ struct dhcp_packet *raw;
++ size_t len;
++ struct in_addr from;
++ struct sockaddr_in *to;
++ struct hardware *hto;
++{
++ unsigned ibufp = 0;
++ double ih [1536 / sizeof (double)];
++ unsigned char *buf = (unsigned char *)ih;
++ ssize_t result;
++
++ union sockunion {
++ struct sockaddr sa;
++ struct sockaddr_ll sll;
++ struct sockaddr_storage ss;
++ } su;
++
++ assemble_udp_ip_header (interface, buf, &ibufp, from.s_addr,
++ to->sin_addr.s_addr, to->sin_port,
++ (unsigned char *)raw, len);
++ memcpy (buf + ibufp, raw, len);
++
++ memset(&su, 0, sizeof(su));
++ su.sll.sll_family = AF_PACKET;
++ su.sll.sll_protocol = htons(ETHERTYPE_IP);
++
++ if (!(su.sll.sll_ifindex = if_nametoindex(interface->name))) {
++ errno = ENOENT;
++ log_error ("send_packet_ib: %m - failed to get if index");
++ return -1;
++ }
++
++ su.sll.sll_hatype = htons(HTYPE_INFINIBAND);
++ su.sll.sll_halen = sizeof(interface->bcast_addr);
++ memcpy(&su.sll.sll_addr, interface->bcast_addr, 20);
++
++ result = sendto(interface->wfdesc, buf, ibufp + len, 0,
++ &su.sa, sizeof(su));
++
++ if (result < 0)
++ log_error ("send_packet_ib: %m");
++
++ return result;
++}
++
+ ssize_t send_packet (interface, packet, raw, len, from, to, hto)
+ struct interface_info *interface;
+ struct packet *packet;
+@@ -335,6 +420,11 @@ ssize_t send_packet (interface, packet,
+ return send_fallback (interface, packet, raw,
+ len, from, to, hto);
+
++ if (interface->hw_address.hbuf[0] == HTYPE_INFINIBAND) {
++ return send_packet_ib(interface, packet, raw, len, from,
++ to, hto);
++ }
++
+ if (hto == NULL && interface->anycast_mac_addr.hlen)
+ hto = &interface->anycast_mac_addr;
+
+@@ -356,6 +446,42 @@ ssize_t send_packet (interface, packet,
+ #endif /* USE_LPF_SEND */
+
+ #ifdef USE_LPF_RECEIVE
++ssize_t receive_packet_ib (interface, buf, len, from, hfrom)
++ struct interface_info *interface;
++ unsigned char *buf;
++ size_t len;
++ struct sockaddr_in *from;
++ struct hardware *hfrom;
++{
++ int length = 0;
++ int offset = 0;
++ unsigned char ibuf [1536];
++ unsigned bufix = 0;
++ unsigned paylen;
++
++ length = read(interface->rfdesc, ibuf, sizeof(ibuf));
++
++ if (length <= 0)
++ return length;
++
++ offset = decode_udp_ip_header(interface, ibuf, bufix, from,
++ (unsigned)length, &paylen, 0);
++
++ if (offset < 0)
++ return 0;
++
++ bufix += offset;
++ length -= offset;
++
++ if (length < paylen)
++ log_fatal("Internal inconsistency at %s:%d.", MDL);
++
++ /* Copy out the data in the packet... */
++ memcpy(buf, &ibuf[bufix], paylen);
++
++ return (ssize_t)paylen;
++}
++
+ ssize_t receive_packet (interface, buf, len, from, hfrom)
+ struct interface_info *interface;
+ unsigned char *buf;
+@@ -382,6 +508,10 @@ ssize_t receive_packet (interface, buf,
+ };
+ struct cmsghdr *cmsg;
+
++ if (interface->hw_address.hbuf[0] == HTYPE_INFINIBAND) {
++ return receive_packet_ib(interface, buf, len, from, hfrom);
++ }
++
+ length = recvmsg (interface -> rfdesc, &msg, 0);
+ if (length <= 0)
+ return length;
+@@ -462,33 +592,44 @@ void maybe_setup_fallback ()
+ }
+
+ void
+-get_hw_addr(const char *name, struct hardware *hw) {
+- int sock;
+- struct ifreq tmp;
+- struct sockaddr *sa;
++get_hw_addr(struct interface_info *info)
++{
++ struct hardware *hw = &info->hw_address;
++ char *name = info->name;
++ struct ifaddrs *ifaddrs;
++ struct ifaddrs *ifa;
++ struct sockaddr_ll *sll = NULL;
+
+- if (strlen(name) >= sizeof(tmp.ifr_name)) {
+- log_fatal("Device name too long: \"%s\"", name);
+- }
++ if (getifaddrs(&ifaddrs) == -1)
++ log_fatal("Failed to get interfaces");
+
+- sock = socket(AF_INET, SOCK_DGRAM, 0);
+- if (sock < 0) {
+- log_fatal("Can't create socket for \"%s\": %m", name);
++ for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next) {
++
++ if (ifa->ifa_addr == NULL)
++ continue;
++
++ if (ifa->ifa_addr->sa_family != AF_PACKET)
++ continue;
++
++ if (ifa->ifa_flags & IFF_LOOPBACK)
++ continue;
++
++ if (strcmp(ifa->ifa_name, name) == 0) {
++ sll = (struct sockaddr_ll *)(void *)ifa->ifa_addr;
++ break;
++ }
+ }
+
+- memset(&tmp, 0, sizeof(tmp));
+- strcpy(tmp.ifr_name, name);
+- if (ioctl(sock, SIOCGIFHWADDR, &tmp) < 0) {
+- log_fatal("Error getting hardware address for \"%s\": %m",
+- name);
++ if (sll == NULL) {
++ freeifaddrs(ifaddrs);
++ log_fatal("Failed to get HW address for %s\n", name);
+ }
+
+- sa = &tmp.ifr_hwaddr;
+- switch (sa->sa_family) {
++ switch (sll->sll_hatype) {
+ case ARPHRD_ETHER:
+ hw->hlen = 7;
+ hw->hbuf[0] = HTYPE_ETHER;
+- memcpy(&hw->hbuf[1], sa->sa_data, 6);
++ memcpy(&hw->hbuf[1], sll->sll_addr, 6);
+ break;
+ case ARPHRD_IEEE802:
+ #ifdef ARPHRD_IEEE802_TR
+@@ -496,18 +637,35 @@ get_hw_addr(const char *name, struct har
+ #endif /* ARPHRD_IEEE802_TR */
+ hw->hlen = 7;
+ hw->hbuf[0] = HTYPE_IEEE802;
+- memcpy(&hw->hbuf[1], sa->sa_data, 6);
++ memcpy(&hw->hbuf[1], sll->sll_addr, 6);
+ break;
+ case ARPHRD_FDDI:
+ hw->hlen = 17;
+ hw->hbuf[0] = HTYPE_FDDI;
+- memcpy(&hw->hbuf[1], sa->sa_data, 16);
++ memcpy(&hw->hbuf[1], sll->sll_addr, 16);
++ break;
++ case ARPHRD_INFINIBAND:
++ /* For Infiniband, save the broadcast address and store
++ * the port GUID into the hardware address.
++ */
++ if (ifa->ifa_flags & IFF_BROADCAST) {
++ struct sockaddr_ll *bll;
++
++ bll = (struct sockaddr_ll *)ifa->ifa_broadaddr;
++ memcpy(&info->bcast_addr, bll->sll_addr, 20);
++ } else {
++ memcpy(&info->bcast_addr, default_ib_bcast_addr,
++ 20);
++ }
++
++ hw->hlen = 1;
++ hw->hbuf[0] = HTYPE_INFINIBAND;
+ break;
+ #if defined(ARPHRD_PPP)
+ case ARPHRD_PPP:
+ if (local_family != AF_INET6)
+- log_fatal("Unsupported device type %d for \"%s\"",
+- sa->sa_family, name);
++ log_fatal("Unsupported device type %ld for \"%s\"",
++ (long int)sll->sll_family, name);
+ hw->hlen = 0;
+ hw->hbuf[0] = HTYPE_RESERVED;
+ /* 0xdeadbeef should never occur on the wire,
+@@ -520,10 +678,11 @@ get_hw_addr(const char *name, struct har
+ break;
+ #endif
+ default:
++ freeifaddrs(ifaddrs);
+ log_fatal("Unsupported device type %ld for \"%s\"",
+- (long int)sa->sa_family, name);
++ (long int)sll->sll_family, name);
+ }
+
+- close(sock);
++ freeifaddrs(ifaddrs);
+ }
+ #endif
+diff -up dhcp-4.2.2/common/socket.c.lpf-ib dhcp-4.2.2/common/socket.c
+--- dhcp-4.2.2/common/socket.c.lpf-ib 2011-06-27 18:18:20.000000000 +0200
++++ dhcp-4.2.2/common/socket.c 2011-09-19 11:24:08.705775490 +0200
+@@ -324,7 +324,7 @@ void if_register_send (info)
+ info->wfdesc = if_register_socket(info, AF_INET, 0);
+ /* If this is a normal IPv4 address, get the hardware address. */
+ if (strcmp(info->name, "fallback") != 0)
+- get_hw_addr(info->name, &info->hw_address);
++ get_hw_addr(info);
+ #if defined (USE_SOCKET_FALLBACK)
+ /* Fallback only registers for send, but may need to receive as
+ well. */
+@@ -387,7 +387,7 @@ void if_register_receive (info)
+ #endif /* IP_PKTINFO... */
+ /* If this is a normal IPv4 address, get the hardware address. */
+ if (strcmp(info->name, "fallback") != 0)
+- get_hw_addr(info->name, &info->hw_address);
++ get_hw_addr(info);
+
+ if (!quiet_interface_discovery)
+ log_info ("Listening on Socket/%s%s%s",
+@@ -497,7 +497,7 @@ if_register6(struct interface_info *info
+ if (req_multi)
+ if_register_multicast(info);
+
+- get_hw_addr(info->name, &info->hw_address);
++ get_hw_addr(info);
+
+ if (!quiet_interface_discovery) {
+ if (info->shared_network != NULL) {
+diff -up dhcp-4.2.2/includes/dhcpd.h.lpf-ib dhcp-4.2.2/includes/dhcpd.h
+--- dhcp-4.2.2/includes/dhcpd.h.lpf-ib 2011-09-19 11:24:08.696775721 +0200
++++ dhcp-4.2.2/includes/dhcpd.h 2011-09-19 11:24:08.707775438 +0200
+@@ -1243,6 +1243,7 @@ struct interface_info {
+ struct shared_network *shared_network;
+ /* Networks connected to this interface. */
+ struct hardware hw_address; /* Its physical address. */
++ u_int8_t bcast_addr[20]; /* Infiniband broadcast address */
+ struct in_addr *addresses; /* Addresses associated with this
+ * interface.
+ */
+@@ -2356,7 +2357,7 @@ void print_dns_status (int, struct dhcp_
+ #endif
+ const char *print_time(TIME);
+
+-void get_hw_addr(const char *name, struct hardware *hw);
++void get_hw_addr(struct interface_info *info);
+
+ /* socket.c */
+ #if defined (USE_SOCKET_SEND) || defined (USE_SOCKET_RECEIVE) \
+diff -up dhcp-4.2.2/includes/dhcp.h.lpf-ib dhcp-4.2.2/includes/dhcp.h
+--- dhcp-4.2.2/includes/dhcp.h.lpf-ib 2011-09-19 11:24:08.696775721 +0200
++++ dhcp-4.2.2/includes/dhcp.h 2011-09-19 11:24:08.707775438 +0200
+@@ -79,6 +79,7 @@ struct dhcp_packet {
+ #define HTYPE_ETHER 1 /* Ethernet 10Mbps */
+ #define HTYPE_IEEE802 6 /* IEEE 802.2 Token Ring... */
+ #define HTYPE_FDDI 8 /* FDDI... */
++#define HTYPE_INFINIBAND 32 /* Infiniband IPoIB */
+
+ #define HTYPE_RESERVED 0 /* RFC 5494 */
+
diff --git a/dhcp/patches/dhcp-4.2.2-options.patch b/dhcp/patches/dhcp-4.2.2-options.patch
new file mode 100644
index 0000000..32e2add
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.2-options.patch
@@ -0,0 +1,401 @@
+diff -up dhcp-4.2.2b1/client/clparse.c.options dhcp-4.2.2b1/client/clparse.c
+--- dhcp-4.2.2b1/client/clparse.c.options 2011-04-21 16:08:14.000000000 +0200
++++ dhcp-4.2.2b1/client/clparse.c 2011-07-01 13:51:52.935755570 +0200
+@@ -146,6 +146,7 @@ isc_result_t read_client_conf ()
+ /* Requested lease time, used by DHCPv6 (DHCPv4 uses the option cache)
+ */
+ top_level_config.requested_lease = 7200;
++ top_level_config.bootp_broadcast_always = 0;
+
+ group_allocate (&top_level_config.on_receipt, MDL);
+ if (!top_level_config.on_receipt)
+@@ -313,7 +314,8 @@ void read_client_leases ()
+ interface-declaration |
+ LEASE client-lease-statement |
+ ALIAS client-lease-statement |
+- KEY key-definition */
++ KEY key-definition |
++ BOOTP_BROADCAST_ALWAYS */
+
+ void parse_client_statement (cfile, ip, config)
+ struct parse *cfile;
+@@ -732,6 +734,12 @@ void parse_client_statement (cfile, ip,
+ parse_reject_statement (cfile, config);
+ return;
+
++ case BOOTP_BROADCAST_ALWAYS:
++ token = next_token(&val, (unsigned*)0, cfile);
++ config -> bootp_broadcast_always = 1;
++ parse_semi (cfile);
++ return;
++
+ default:
+ lose = 0;
+ stmt = (struct executable_statement *)0;
+diff -up dhcp-4.2.2b1/client/dhclient.c.options dhcp-4.2.2b1/client/dhclient.c
+--- dhcp-4.2.2b1/client/dhclient.c.options 2011-05-11 16:20:59.000000000 +0200
++++ dhcp-4.2.2b1/client/dhclient.c 2011-07-01 13:51:52.936755545 +0200
+@@ -39,6 +39,12 @@
+ #include <limits.h>
+ #include <dns/result.h>
+
++/*
++ * Defined in stdio.h when _GNU_SOURCE is set, but we don't want to define
++ * that when building ISC code.
++ */
++extern int asprintf(char **strp, const char *fmt, ...);
++
+ TIME default_lease_time = 43200; /* 12 hours... */
+ TIME max_lease_time = 86400; /* 24 hours... */
+
+@@ -87,6 +93,9 @@ int wanted_ia_na = -1; /* the absolute
+ int wanted_ia_ta = 0;
+ int wanted_ia_pd = 0;
+ char *mockup_relay = NULL;
++int bootp_broadcast_always = 0;
++
++extern u_int32_t default_requested_options[];
+
+ void run_stateless(int exit_mode);
+
+@@ -123,6 +132,15 @@ main(int argc, char **argv) {
+ int local_family_set = 0;
+ #endif /* DHCPv6 */
+ char *s;
++ char *dhcp_client_identifier_arg = NULL;
++ char *dhcp_host_name_arg = NULL;
++ char *dhcp_fqdn_arg = NULL;
++ char *dhcp_vendor_class_identifier_arg = NULL;
++ char *dhclient_request_options = NULL;
++
++ int timeout_arg = 0;
++ char *arg_conf = NULL;
++ int arg_conf_len = 0;
+
+ /* Initialize client globals. */
+ memset(&default_duid, 0, sizeof(default_duid));
+@@ -310,6 +328,88 @@ main(int argc, char **argv) {
+ } else if (!strcmp(argv[i], "--version")) {
+ log_info("isc-dhclient-%s", PACKAGE_VERSION);
+ exit(0);
++ } else if (!strcmp(argv[i], "-I")) {
++ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
++ usage();
++ exit(1);
++ }
++
++ if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
++ log_error("-I option dhcp-client-identifier string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
++ exit(1);
++ }
++
++ dhcp_client_identifier_arg = argv[i];
++ } else if (!strcmp(argv[i], "-B")) {
++ bootp_broadcast_always = 1;
++ } else if (!strcmp(argv[i], "-H")) {
++ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
++ usage();
++ exit(1);
++ }
++
++ if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
++ log_error("-H option host-name string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
++ exit(1);
++ }
++
++ if (dhcp_host_name_arg != NULL) {
++ log_error("The -H <host-name> and -F <fqdn> arguments are mutually exclusive");
++ exit(1);
++ }
++
++ dhcp_host_name_arg = argv[i];
++ } else if (!strcmp(argv[i], "-F")) {
++ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
++ usage();
++ exit(1);
++ }
++
++ if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
++ log_error("-F option fqdn.fqdn string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
++ exit(1);
++ }
++
++ if (dhcp_fqdn_arg != NULL) {
++ log_error("Only one -F <fqdn> argument can be specified");
++ exit(1);
++ }
++
++ if (dhcp_host_name_arg != NULL) {
++ log_error("The -F <fqdn> and -H <host-name> arguments are mutually exclusive");
++ exit(1);
++ }
++
++ dhcp_fqdn_arg = argv[i];
++ } else if (!strcmp(argv[i], "-timeout")) {
++ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
++ usage();
++ exit(1);
++ }
++
++ if ((timeout_arg = atoi(argv[i])) <= 0) {
++ log_error("-T timeout option must be > 0 - bad value: %s",argv[i]);
++ exit(1);
++ }
++ } else if (!strcmp(argv[i], "-V")) {
++ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
++ usage();
++ exit(1);
++ }
++
++ if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
++ log_error("-V option vendor-class-identifier string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
++ exit(1);
++ }
++
++ dhcp_vendor_class_identifier_arg = argv[i];
++ } else if (!strcmp(argv[i], "-R")) {
++ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
++ usage();
++ exit(1);
++ }
++
++ dhclient_request_options = argv[i];
+ } else if (argv[i][0] == '-') {
+ usage();
+ } else if (interfaces_requested < 0) {
+@@ -484,6 +584,166 @@ main(int argc, char **argv) {
+ /* Parse the dhclient.conf file. */
+ read_client_conf();
+
++ /* Parse any extra command line configuration arguments: */
++ if ((dhcp_client_identifier_arg != NULL) && (*dhcp_client_identifier_arg != '\0')) {
++ arg_conf_len = asprintf(&arg_conf, "send dhcp-client-identifier \"%s\";", dhcp_client_identifier_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to send -I option dhcp-client-identifier");
++ }
++
++ if ((dhcp_host_name_arg != NULL) && (*dhcp_host_name_arg != '\0')) {
++ if (arg_conf == 0) {
++ arg_conf_len = asprintf(&arg_conf, "send host-name \"%s\";", dhcp_host_name_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to send -H option host-name");
++ } else {
++ char *last_arg_conf = arg_conf;
++ arg_conf = NULL;
++ arg_conf_len = asprintf(&arg_conf, "%s\nsend host-name \"%s\";", last_arg_conf, dhcp_host_name_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to send -H option host-name");
++
++ free(last_arg_conf);
++ }
++ }
++
++ if ((dhcp_fqdn_arg != NULL) && (*dhcp_fqdn_arg != '\0')) {
++ if (arg_conf == 0) {
++ arg_conf_len = asprintf(&arg_conf, "send fqdn.fqdn \"%s\";", dhcp_fqdn_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to send -F option fqdn.fqdn");
++ } else {
++ char *last_arg_conf = arg_conf;
++ arg_conf = NULL;
++ arg_conf_len = asprintf(&arg_conf, "%s\nsend fqdn.fqdn \"%s\";", last_arg_conf, dhcp_fqdn_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to send -F option fqdn.fqdn");
++
++ free(last_arg_conf);
++ }
++ }
++
++ if (timeout_arg) {
++ if (arg_conf == 0) {
++ arg_conf_len = asprintf(&arg_conf, "timeout %d;", timeout_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to process -timeout timeout argument");
++ } else {
++ char *last_arg_conf = arg_conf;
++ arg_conf = NULL;
++ arg_conf_len = asprintf(&arg_conf, "%s\ntimeout %d;", last_arg_conf, timeout_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len == 0))
++ log_fatal("Unable to process -timeout timeout argument");
++
++ free(last_arg_conf);
++ }
++ }
++
++ if ((dhcp_vendor_class_identifier_arg != NULL) && (*dhcp_vendor_class_identifier_arg != '\0')) {
++ if (arg_conf == 0) {
++ arg_conf_len = asprintf(&arg_conf, "send vendor-class-identifier \"%s\";", dhcp_vendor_class_identifier_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to send -V option vendor-class-identifier");
++ } else {
++ char *last_arg_conf = arg_conf;
++ arg_conf = NULL;
++ arg_conf_len = asprintf(&arg_conf, "%s\nsend vendor-class-identifier \"%s\";", last_arg_conf, dhcp_vendor_class_identifier_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to send -V option vendor-class-identifier");
++
++ free(last_arg_conf);
++ }
++ }
++
++ if (dhclient_request_options != NULL) {
++ if (arg_conf == 0) {
++ arg_conf_len = asprintf(&arg_conf, "request %s;", dhclient_request_options);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to parse -R <request options list> argument");
++ } else {
++ char *last_arg_conf = arg_conf;
++ arg_conf = NULL;
++ arg_conf_len = asprintf(&arg_conf, "%s\nrequest %s;", last_arg_conf, dhclient_request_options);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to parse -R <request options list> argument");
++
++ free(last_arg_conf);
++ }
++ }
++
++ if (arg_conf) {
++ if (arg_conf_len == 0)
++ if ((arg_conf_len = strlen(arg_conf)) == 0)
++ /* huh ? cannot happen ! */
++ log_fatal("Unable to process -I/-H/-F/-timeout/-V/-R configuration arguments");
++
++ /* parse the extra dhclient.conf configuration arguments
++ * into top level config: */
++ struct parse *cfile = (struct parse *)0;
++ const char *val = NULL;
++ int token;
++
++ status = new_parse(&cfile, -1, arg_conf, arg_conf_len, "extra dhclient -I/-H/-F/-timeout/-V/-R configuration arguments", 0);
++
++ if ((status != ISC_R_SUCCESS) || (cfile -> warnings_occurred))
++ log_fatal("Cannot parse -I/-H/-F/-timeout/-V/-R configuration arguments !");
++ /* more detailed parse failures will be logged */
++
++ do {
++ token = peek_token(&val, (unsigned *)0, cfile);
++ if (token == END_OF_FILE)
++ break;
++
++ parse_client_statement(cfile, (struct interface_info *)0, &top_level_config);
++ } while (1);
++
++ if (cfile -> warnings_occurred)
++ log_fatal("Cannot parse -I/-H/-F/-timeout/-V/-R configuration arguments !");
++ end_parse(&cfile);
++
++ if (timeout_arg) {
++ /* we just set the toplevel timeout, but per-client
++ * timeouts may still be at defaults. Also, it makes no
++ * sense having the reboot_timeout or backoff_cutoff
++ * greater than the timeout:
++ */
++ if ((top_level_config.backoff_cutoff == 15) && (top_level_config.backoff_cutoff > (timeout_arg / 2)))
++ top_level_config.backoff_cutoff = (((unsigned long)(timeout_arg / 2)) == 0) ? timeout_arg : (unsigned long)(timeout_arg / 2);
++
++ for (ip=interfaces; ip; ip = ip->next) {
++ if (ip->client->config->timeout == 60)
++ ip->client->config->timeout = timeout_arg;
++
++ if ((ip->client->config->reboot_timeout == 10) && (ip->client->config->reboot_timeout > ip->client->config->timeout))
++ ip->client->config->reboot_timeout = ip->client->config->timeout;
++ if ((ip->client->config->backoff_cutoff == 15) && (ip->client->config->backoff_cutoff > top_level_config.backoff_cutoff))
++ ip->client->config->backoff_cutoff = top_level_config.backoff_cutoff;
++ }
++ }
++
++ if ((dhclient_request_options != 0) && (top_level_config.requested_options != default_requested_options)) {
++ for (ip=interfaces; ip; ip = ip->next) {
++ if (ip->client->config->requested_options == default_requested_options)
++ ip->client->config->requested_options = top_level_config.requested_options;
++ }
++ }
++
++ free(arg_conf);
++ arg_conf = NULL;
++ arg_conf_len = 0;
++ }
++
+ /* Parse the lease database. */
+ read_client_leases();
+
+@@ -2397,7 +2657,8 @@ void make_discover (client, lease)
+ client -> packet.xid = random ();
+ client -> packet.secs = 0; /* filled in by send_discover. */
+
+- if (can_receive_unicast_unconfigured (client -> interface))
++ if ((!(bootp_broadcast_always || client->config->bootp_broadcast_always))
++ && can_receive_unicast_unconfigured(client->interface))
+ client -> packet.flags = 0;
+ else
+ client -> packet.flags = htons (BOOTP_BROADCAST);
+@@ -2481,7 +2742,9 @@ void make_request (client, lease)
+ } else {
+ memset (&client -> packet.ciaddr, 0,
+ sizeof client -> packet.ciaddr);
+- if (can_receive_unicast_unconfigured (client -> interface))
++ if ((!(bootp_broadcast_always ||
++ client ->config->bootp_broadcast_always)) &&
++ can_receive_unicast_unconfigured (client -> interface))
+ client -> packet.flags = 0;
+ else
+ client -> packet.flags = htons (BOOTP_BROADCAST);
+@@ -2543,7 +2806,8 @@ void make_decline (client, lease)
+ client -> packet.hops = 0;
+ client -> packet.xid = client -> xid;
+ client -> packet.secs = 0; /* Filled in by send_request. */
+- if (can_receive_unicast_unconfigured (client -> interface))
++ if ((!(bootp_broadcast_always || client->config-> bootp_broadcast_always))
++ && can_receive_unicast_unconfigured (client->interface))
+ client -> packet.flags = 0;
+ else
+ client -> packet.flags = htons (BOOTP_BROADCAST);
+diff -up dhcp-4.2.2b1/common/conflex.c.options dhcp-4.2.2b1/common/conflex.c
+--- dhcp-4.2.2b1/common/conflex.c.options 2011-05-11 16:20:59.000000000 +0200
++++ dhcp-4.2.2b1/common/conflex.c 2011-07-01 13:51:52.938755494 +0200
+@@ -808,6 +808,8 @@ intern(char *atom, enum dhcp_token dfv)
+ return BALANCE;
+ if (!strcasecmp (atom + 1, "ound"))
+ return BOUND;
++ if (!strcasecmp (atom + 1, "ootp-broadcast-always"))
++ return BOOTP_BROADCAST_ALWAYS;
+ break;
+ case 'c':
+ if (!strcasecmp(atom + 1, "ase"))
+diff -up dhcp-4.2.2b1/includes/dhcpd.h.options dhcp-4.2.2b1/includes/dhcpd.h
+--- dhcp-4.2.2b1/includes/dhcpd.h.options 2011-05-20 16:21:11.000000000 +0200
++++ dhcp-4.2.2b1/includes/dhcpd.h 2011-07-01 13:51:52.940755442 +0200
+@@ -1147,6 +1147,9 @@ struct client_config {
+ int do_forward_update; /* If nonzero, and if we have the
+ information we need, update the
+ A record for the address we get. */
++
++ int bootp_broadcast_always; /* If nonzero, always set the BOOTP_BROADCAST
++ flag in requests */
+ };
+
+ /* Per-interface state used in the dhcp client... */
+diff -up dhcp-4.2.2b1/includes/dhctoken.h.options dhcp-4.2.2b1/includes/dhctoken.h
+--- dhcp-4.2.2b1/includes/dhctoken.h.options 2011-05-12 14:02:47.000000000 +0200
++++ dhcp-4.2.2b1/includes/dhctoken.h 2011-07-01 13:53:43.316861637 +0200
+@@ -361,7 +361,8 @@ enum dhcp_token {
+ GETHOSTNAME = 662,
+ REWIND = 663,
+ INITIAL_DELAY = 664,
+- GETHOSTBYNAME = 665
++ GETHOSTBYNAME = 665,
++ BOOTP_BROADCAST_ALWAYS = 666
+ };
+
+ #define is_identifier(x) ((x) >= FIRST_TOKEN && \
diff --git a/dhcp/patches/dhcp-4.2.2-remove-bind.patch b/dhcp/patches/dhcp-4.2.2-remove-bind.patch
new file mode 100644
index 0000000..6297772
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.2-remove-bind.patch
@@ -0,0 +1,149 @@
+diff -up dhcp-4.2.2/client/Makefile.am.rh637017 dhcp-4.2.2/client/Makefile.am
+--- dhcp-4.2.2/client/Makefile.am.rh637017 2010-09-15 00:32:36.000000000 +0200
++++ dhcp-4.2.2/client/Makefile.am 2011-08-11 17:28:58.923897561 +0200
+@@ -5,7 +5,7 @@ dhclient_SOURCES = clparse.c dhclient.c
+ scripts/netbsd scripts/nextstep scripts/openbsd \
+ scripts/solaris scripts/openwrt
+ dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
+- ../bind/lib/libdns.a ../bind/lib/libisc.a
++ $(BIND9_LIBDIR) -ldns-export -lisc-export
+ man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
+ EXTRA_DIST = $(man_MANS)
+
+diff -up dhcp-4.2.2/common/tests/Makefile.am.rh637017 dhcp-4.2.2/common/tests/Makefile.am
+--- dhcp-4.2.2/common/tests/Makefile.am.rh637017 2009-10-28 05:12:30.000000000 +0100
++++ dhcp-4.2.2/common/tests/Makefile.am 2011-08-11 17:33:45.258637236 +0200
+@@ -6,6 +6,5 @@ TESTS = test_alloc
+
+ test_alloc_SOURCES = test_alloc.c
+ test_alloc_LDADD = ../libdhcp.a ../../tests/libt_api.a \
+- ../../omapip/libomapi.a ../../bind/lib/libdns.a \
+- ../../bind/lib/libisc.a
+-
++ ../../omapip/libomapi.a \
++ $(BIND9_LIBDIR) -ldns-export -lisc-export
+diff -up dhcp-4.2.2/configure.ac.rh637017 dhcp-4.2.2/configure.ac
+--- dhcp-4.2.2/configure.ac.rh637017 2011-07-20 02:32:18.000000000 +0200
++++ dhcp-4.2.2/configure.ac 2011-08-11 17:28:58.924897535 +0200
+@@ -512,20 +512,37 @@ AC_CHECK_MEMBER(struct msghdr.msg_contro
+ libbind=
+ AC_ARG_WITH(libbind,
+ AC_HELP_STRING([--with-libbind=PATH],
+- [bind includes and libraries are in PATH
+- (default is ./bind)]),
++ [bind includes are in PATH
++ (default is ./bind/includes)]),
+ use_libbind="$withval", use_libbind="no")
+ case "$use_libbind" in
++yes|no)
++ libbind="\${top_srcdir}/bind/include"
++ ;;
++*)
++ libbind="$use_libbind"
++ ;;
++esac
++
++BIND9_LIBDIR='-L$(top_builddir)/bind/lib'
++AC_ARG_WITH(libbind-libs,
++ AC_HELP_STRING([--with-libbind-libs=PATH],
++ [bind9 export libraries are in PATH]),
++ [libbind_libs="$withval"], [libbind_libs='no'])
++case "$libbind_libs" in
+ yes)
+- libbind="\${top_srcdir}/bind"
++ AC_MSG_ERROR([Specify path to bind9 libraries])
+ ;;
+ no)
+- libbind="\${top_srcdir}/bind"
++ BUNDLED_BIND=yes
+ ;;
+ *)
+- libbind="$use_libbind"
++ BIND9_LIBDIR="-L$libbind_libs"
++ BUNDLED_BIND=no
+ ;;
+ esac
++AM_CONDITIONAL([BUNDLED_BIND], [test "$BUNDLED_BIND" = yes])
++AC_SUBST([BIND9_LIBDIR])
+
+ # OpenLDAP support.
+ AC_ARG_WITH(ldap,
+@@ -562,7 +579,7 @@ fi
+ CFLAGS="$CFLAGS $STD_CWARNINGS"
+
+ # Try to add the bind include directory
+-CFLAGS="$CFLAGS -I$libbind/include"
++CFLAGS="$CFLAGS -I$libbind"
+
+ AC_C_FLEXIBLE_ARRAY_MEMBER
+
+diff -up dhcp-4.2.2/dhcpctl/Makefile.am.rh637017 dhcp-4.2.2/dhcpctl/Makefile.am
+--- dhcp-4.2.2/dhcpctl/Makefile.am.rh637017 2009-10-28 05:12:30.000000000 +0100
++++ dhcp-4.2.2/dhcpctl/Makefile.am 2011-08-11 17:28:58.924897535 +0200
+@@ -6,10 +6,10 @@ EXTRA_DIST = $(man_MANS)
+
+ omshell_SOURCES = omshell.c
+ omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
+- ../bind/lib/libdns.a ../bind/lib/libisc.a
++ $(BIND9_LIBDIR) -ldns-export -lisc-export
+
+ libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
+
+ cltest_SOURCES = cltest.c
+ cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
+- ../bind/lib/libdns.a ../bind/lib/libisc.a
+\ No newline at end of file
++ $(BIND9_LIBDIR) -ldns-export -lisc-export
+diff -up dhcp-4.2.2/Makefile.am.rh637017 dhcp-4.2.2/Makefile.am
+--- dhcp-4.2.2/Makefile.am.rh637017 2010-03-25 00:30:38.000000000 +0100
++++ dhcp-4.2.2/Makefile.am 2011-08-11 17:28:58.925897509 +0200
+@@ -21,7 +21,13 @@ EXTRA_DIST = RELNOTES LICENSE \
+ util/bindvar.sh \
+ bind/Makefile bind/bind.tar.gz bind/version.tmp
+
+-SUBDIRS = bind includes tests common dst omapip client dhcpctl relay server
++if BUNDLED_BIND
++SUBDIRS = bind
++else
++SUBDIRS =
++endif
++
++SUBDIRS += includes tests common dst omapip client dhcpctl relay server
+
+ nobase_include_HEADERS = dhcpctl/dhcpctl.h
+
+diff -up dhcp-4.2.2/omapip/Makefile.am.rh637017 dhcp-4.2.2/omapip/Makefile.am
+--- dhcp-4.2.2/omapip/Makefile.am.rh637017 2010-02-12 01:13:54.000000000 +0100
++++ dhcp-4.2.2/omapip/Makefile.am 2011-08-11 17:28:58.939897149 +0200
+@@ -10,5 +10,5 @@ man_MANS = omapi.3
+ EXTRA_DIST = $(man_MANS)
+
+ svtest_SOURCES = test.c
+-svtest_LDADD = libomapi.a ../bind/lib/libdns.a ../bind/lib/libisc.a
++svtest_LDADD = libomapi.a $(BIND9_LIBDIR) -ldns-export -lisc-export
+
+diff -up dhcp-4.2.2/relay/Makefile.am.rh637017 dhcp-4.2.2/relay/Makefile.am
+--- dhcp-4.2.2/relay/Makefile.am.rh637017 2009-10-28 05:12:30.000000000 +0100
++++ dhcp-4.2.2/relay/Makefile.am 2011-08-11 17:28:58.940897123 +0200
+@@ -3,7 +3,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
+ sbin_PROGRAMS = dhcrelay
+ dhcrelay_SOURCES = dhcrelay.c
+ dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
+- ../bind/lib/libdns.a ../bind/lib/libisc.a
++ $(BIND9_LIBDIR) -ldns-export -lisc-export
+ man_MANS = dhcrelay.8
+ EXTRA_DIST = $(man_MANS)
+
+diff -up dhcp-4.2.2/server/Makefile.am.rh637017 dhcp-4.2.2/server/Makefile.am
+--- dhcp-4.2.2/server/Makefile.am.rh637017 2010-03-24 22:49:47.000000000 +0100
++++ dhcp-4.2.2/server/Makefile.am 2011-08-11 17:28:58.944897021 +0200
+@@ -8,8 +8,7 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c
+
+ dhcpd_CFLAGS = $(LDAP_CFLAGS)
+ dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
+- ../dhcpctl/libdhcpctl.a ../bind/lib/libdns.a \
+- ../bind/lib/libisc.a
++ ../dhcpctl/libdhcpctl.a $(BIND9_LIBDIR) -ldns-export -lisc-export
+
+ man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
+ EXTRA_DIST = $(man_MANS)
diff --git a/dhcp/patches/dhcp-4.2.2-rfc3442-classless-static-routes.patch b/dhcp/patches/dhcp-4.2.2-rfc3442-classless-static-routes.patch
new file mode 100644
index 0000000..0a0bfcb
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.2-rfc3442-classless-static-routes.patch
@@ -0,0 +1,405 @@
+diff -up dhcp-4.2.2b1/client/clparse.c.rfc3442 dhcp-4.2.2b1/client/clparse.c
+--- dhcp-4.2.2b1/client/clparse.c.rfc3442 2011-07-01 14:22:38.031534508 +0200
++++ dhcp-4.2.2b1/client/clparse.c 2011-07-01 14:22:38.128532940 +0200
+@@ -37,7 +37,7 @@
+
+ struct client_config top_level_config;
+
+-#define NUM_DEFAULT_REQUESTED_OPTS 14
++#define NUM_DEFAULT_REQUESTED_OPTS 15
+ struct option *default_requested_options[NUM_DEFAULT_REQUESTED_OPTS + 1];
+
+ static void parse_client_default_duid(struct parse *cfile);
+@@ -82,7 +82,11 @@ isc_result_t read_client_conf ()
+ dhcp_universe.code_hash, &code, 0, MDL);
+
+ /* 4 */
+- code = DHO_ROUTERS;
++ /* The Classless Static Routes option code MUST appear in the parameter
++ * request list prior to both the Router option code and the Static
++ * Routes option code, if present. (RFC3442)
++ */
++ code = DHO_CLASSLESS_STATIC_ROUTES;
+ option_code_hash_lookup(&default_requested_options[3],
+ dhcp_universe.code_hash, &code, 0, MDL);
+
+@@ -136,6 +140,11 @@ isc_result_t read_client_conf ()
+ option_code_hash_lookup(&default_requested_options[13],
+ dhcp_universe.code_hash, &code, 0, MDL);
+
++ /* 15 */
++ code = DHO_ROUTERS;
++ option_code_hash_lookup(&default_requested_options[14],
++ dhcp_universe.code_hash, &code, 0, MDL);
++
+ for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) {
+ if (default_requested_options[code] == NULL)
+ log_fatal("Unable to find option definition for "
+diff -up dhcp-4.2.2b1/common/dhcp-options.5.rfc3442 dhcp-4.2.2b1/common/dhcp-options.5
+--- dhcp-4.2.2b1/common/dhcp-options.5.rfc3442 2011-07-01 14:22:38.020534686 +0200
++++ dhcp-4.2.2b1/common/dhcp-options.5 2011-07-01 14:22:38.129532924 +0200
+@@ -115,6 +115,26 @@ hexadecimal, separated by colons. For
+ or
+ option dhcp-client-identifier 43:4c:49:45:54:2d:46:4f:4f;
+ .fi
++.PP
++The
++.B destination-descriptor
++describe the IP subnet number and subnet mask
++of a particular destination using a compact encoding. This encoding
++consists of one octet describing the width of the subnet mask,
++followed by all the significant octets of the subnet number.
++The following table contains some examples of how various subnet
++number/mask combinations can be encoded:
++.nf
++.sp 1
++Subnet number Subnet mask Destination descriptor
++0 0 0
++10.0.0.0 255.0.0.0 8.10
++10.0.0.0 255.255.255.0 24.10.0.0
++10.17.0.0 255.255.0.0 16.10.17
++10.27.129.0 255.255.255.0 24.10.27.129
++10.229.0.128 255.255.255.128 25.10.229.0.128
++10.198.122.47 255.255.255.255 32.10.198.122.47
++.fi
+ .SH SETTING OPTION VALUES USING EXPRESSIONS
+ Sometimes it's helpful to be able to set the value of a DHCP option
+ based on some value that the client has sent. To do this, you can
+@@ -931,6 +951,29 @@ dhclient-script will create routes:
+ .RE
+ .PP
+ .nf
++.B option \fBclassless-static-routes\fR \fIdestination-descriptor ip-address\fR
++ [\fB,\fR \fIdestination-descriptor ip-address\fR...]\fB;\fR
++.fi
++.RS 0.25i
++.PP
++This option (see RFC3442) specifies a list of classless static routes
++that the client should install in its routing cache.
++.PP
++This option can contain one or more static routes, each of which
++consists of a destination descriptor and the IP address of the router
++that should be used to reach that destination.
++.PP
++Many clients may not implement the Classless Static Routes option.
++DHCP server administrators should therefore configure their DHCP
++servers to send both a Router option and a Classless Static Routes
++option, and should specify the default router(s) both in the Router
++option and in the Classless Static Routes option.
++.PP
++If the DHCP server returns both a Classless Static Routes option and
++a Router option, the DHCP client ignores the Router option.
++.RE
++.PP
++.nf
+ .B option \fBstreettalk-directory-assistance-server\fR \fIip-address\fR
+ [\fB,\fR \fIip-address\fR...]\fB;\fR
+ .fi
+diff -up dhcp-4.2.2b1/common/inet.c.rfc3442 dhcp-4.2.2b1/common/inet.c
+--- dhcp-4.2.2b1/common/inet.c.rfc3442 2011-05-11 02:47:22.000000000 +0200
++++ dhcp-4.2.2b1/common/inet.c 2011-07-01 14:22:38.130532908 +0200
+@@ -528,6 +528,60 @@ free_iaddrcidrnetlist(struct iaddrcidrne
+ return ISC_R_SUCCESS;
+ }
+
++static const char *
++inet_ntopdd(const unsigned char *src, unsigned srclen, char *dst, size_t size)
++{
++ char tmp[sizeof("32.255.255.255.255")];
++ int len;
++
++ switch (srclen) {
++ case 2:
++ len = sprintf (tmp, "%u.%u", src[0], src[1]);
++ break;
++ case 3:
++ len = sprintf (tmp, "%u.%u.%u", src[0], src[1], src[2]);
++ break;
++ case 4:
++ len = sprintf (tmp, "%u.%u.%u.%u", src[0], src[1], src[2], src[3]);
++ break;
++ case 5:
++ len = sprintf (tmp, "%u.%u.%u.%u.%u", src[0], src[1], src[2], src[3], src[4]);
++ break;
++ default:
++ return NULL;
++ }
++ if (len < 0)
++ return NULL;
++
++ if (len > size) {
++ errno = ENOSPC;
++ return NULL;
++ }
++
++ return strcpy (dst, tmp);
++}
++
++/* pdestdesc() turns an iaddr structure into a printable dest. descriptor */
++const char *
++pdestdesc(const struct iaddr addr) {
++ static char pbuf[sizeof("255.255.255.255.255")];
++
++ if (addr.len == 0) {
++ return "<null destination descriptor>";
++ }
++ if (addr.len == 1) {
++ return "0";
++ }
++ if ((addr.len >= 2) && (addr.len <= 5)) {
++ return inet_ntopdd(addr.iabuf, addr.len, pbuf, sizeof(pbuf));
++ }
++
++ log_fatal("pdestdesc():%s:%d: Invalid destination descriptor length %d.",
++ MDL, addr.len);
++ /* quell compiler warnings */
++ return NULL;
++}
++
+ /* piaddr() turns an iaddr structure into a printable address. */
+ /* XXX: should use a const pointer rather than passing the structure */
+ const char *
+diff -up dhcp-4.2.2b1/common/options.c.rfc3442 dhcp-4.2.2b1/common/options.c
+--- dhcp-4.2.2b1/common/options.c.rfc3442 2011-03-24 22:57:13.000000000 +0100
++++ dhcp-4.2.2b1/common/options.c 2011-07-01 14:22:38.132532876 +0200
+@@ -706,7 +706,11 @@ cons_options(struct packet *inpacket, st
+ * packet.
+ */
+ priority_list[priority_len++] = DHO_SUBNET_MASK;
+- priority_list[priority_len++] = DHO_ROUTERS;
++ if (lookup_option(&dhcp_universe, cfg_options,
++ DHO_CLASSLESS_STATIC_ROUTES))
++ priority_list[priority_len++] = DHO_CLASSLESS_STATIC_ROUTES;
++ else
++ priority_list[priority_len++] = DHO_ROUTERS;
+ priority_list[priority_len++] = DHO_DOMAIN_NAME_SERVERS;
+ priority_list[priority_len++] = DHO_HOST_NAME;
+ priority_list[priority_len++] = DHO_FQDN;
+@@ -1683,6 +1687,7 @@ const char *pretty_print_option (option,
+ const unsigned char *dp = data;
+ char comma;
+ unsigned long tval;
++ unsigned int octets = 0;
+
+ if (emit_commas)
+ comma = ',';
+@@ -1691,6 +1696,7 @@ const char *pretty_print_option (option,
+
+ memset (enumbuf, 0, sizeof enumbuf);
+
++ if (option->format[0] != 'R') { /* see explanation lower */
+ /* Figure out the size of the data. */
+ for (l = i = 0; option -> format [i]; i++, l++) {
+ if (l >= sizeof(fmtbuf) - 1)
+@@ -1840,6 +1846,33 @@ const char *pretty_print_option (option,
+ if (numhunk < 0)
+ numhunk = 1;
+
++ } else { /* option->format[i] == 'R') */
++ /* R (destination descriptor) has variable length.
++ * We can find it only in classless static route option,
++ * so we are for sure parsing classless static route option now.
++ * We go through whole the option to check whether there are no
++ * missing/extra bytes.
++ * I didn't find out how to improve the existing code and that's the
++ * reason for this separate 'else' where I do my own checkings.
++ * I know it's little bit unsystematic, but it works.
++ */
++ numhunk = 0;
++ numelem = 2; /* RI */
++ fmtbuf[0]='R'; fmtbuf[1]='I'; fmtbuf[2]=0;
++ for (i =0; i < len; i = i + octets + 5) {
++ if (data[i] > 32) { /* subnet mask width */
++ log_error ("wrong subnet mask width in destination descriptor");
++ break;
++ }
++ numhunk++;
++ octets = ((data[i]+7) / 8);
++ }
++ if (i != len) {
++ log_error ("classless static routes option has wrong size or "
++ "there's some garbage in format");
++ }
++ }
++
+ /* Cycle through the array (or hunk) printing the data. */
+ for (i = 0; i < numhunk; i++) {
+ for (j = 0; j < numelem; j++) {
+@@ -1978,6 +2011,20 @@ const char *pretty_print_option (option,
+ strcpy(op, piaddr(iaddr));
+ dp += 4;
+ break;
++
++ case 'R':
++ if (dp[0] <= 32)
++ iaddr.len = (((dp[0]+7)/8)+1);
++ else {
++ log_error ("wrong subnet mask width in destination descriptor");
++ return "<error>";
++ }
++
++ memcpy(iaddr.iabuf, dp, iaddr.len);
++ strcpy(op, pdestdesc(iaddr));
++ dp += iaddr.len;
++ break;
++
+ case '6':
+ iaddr.len = 16;
+ memcpy(iaddr.iabuf, dp, 16);
+diff -up dhcp-4.2.2b1/common/parse.c.rfc3442 dhcp-4.2.2b1/common/parse.c
+--- dhcp-4.2.2b1/common/parse.c.rfc3442 2011-07-01 14:22:38.097533441 +0200
++++ dhcp-4.2.2b1/common/parse.c 2011-07-01 14:22:38.135532828 +0200
+@@ -341,6 +341,39 @@ int parse_ip_addr (cfile, addr)
+ }
+
+ /*
++ * destination-descriptor :== NUMBER DOT NUMBER |
++ * NUMBER DOT NUMBER DOT NUMBER |
++ * NUMBER DOT NUMBER DOT NUMBER DOT NUMBER |
++ * NUMBER DOT NUMBER DOT NUMBER DOT NUMBER DOT NUMBER
++ */
++
++int parse_destination_descriptor (cfile, addr)
++ struct parse *cfile;
++ struct iaddr *addr;
++{
++ unsigned int mask_width, dest_dest_len;
++ addr -> len = 0;
++ if (parse_numeric_aggregate (cfile, addr -> iabuf,
++ &addr -> len, DOT, 10, 8)) {
++ mask_width = (unsigned int)addr->iabuf[0];
++ dest_dest_len = (((mask_width+7)/8)+1);
++ if (mask_width > 32) {
++ parse_warn (cfile,
++ "subnet mask width (%u) greater than 32.", mask_width);
++ }
++ else if (dest_dest_len != addr->len) {
++ parse_warn (cfile,
++ "destination descriptor with subnet mask width %u "
++ "should have %u octets, but has %u octets.",
++ mask_width, dest_dest_len, addr->len);
++ }
++
++ return 1;
++ }
++ return 0;
++}
++
++/*
+ * Return true if every character in the string is hexadecimal.
+ */
+ static int
+@@ -700,8 +733,10 @@ unsigned char *parse_numeric_aggregate (
+ if (count) {
+ token = peek_token (&val, (unsigned *)0, cfile);
+ if (token != separator) {
+- if (!*max)
++ if (!*max) {
++ *max = count;
+ break;
++ }
+ if (token != RBRACE && token != LBRACE)
+ token = next_token (&val,
+ (unsigned *)0,
+@@ -1624,6 +1659,9 @@ int parse_option_code_definition (cfile,
+ case IP_ADDRESS:
+ type = 'I';
+ break;
++ case DESTINATION_DESCRIPTOR:
++ type = 'R';
++ break;
+ case IP6_ADDRESS:
+ type = '6';
+ break;
+@@ -5288,6 +5326,15 @@ int parse_option_token (rv, cfile, fmt,
+ }
+ break;
+
++ case 'R': /* destination descriptor */
++ if (!parse_destination_descriptor (cfile, &addr)) {
++ return 0;
++ }
++ if (!make_const_data (&t, addr.iabuf, addr.len, 0, 1, MDL)) {
++ return 0;
++ }
++ break;
++
+ case '6': /* IPv6 address. */
+ if (!parse_ip6_addr(cfile, &addr)) {
+ return 0;
+@@ -5548,6 +5595,13 @@ int parse_option_decl (oc, cfile)
+ goto exit;
+ len = ip_addr.len;
+ dp = ip_addr.iabuf;
++ goto alloc;
++
++ case 'R': /* destination descriptor */
++ if (!parse_destination_descriptor (cfile, &ip_addr))
++ goto exit;
++ len = ip_addr.len;
++ dp = ip_addr.iabuf;
+
+ alloc:
+ if (hunkix + len > sizeof hunkbuf) {
+diff -up dhcp-4.2.2b1/common/tables.c.rfc3442 dhcp-4.2.2b1/common/tables.c
+--- dhcp-4.2.2b1/common/tables.c.rfc3442 2011-07-01 14:22:38.087533601 +0200
++++ dhcp-4.2.2b1/common/tables.c 2011-07-01 14:22:38.137532796 +0200
+@@ -51,6 +51,7 @@ HASH_FUNCTIONS (option_code, const unsig
+ Format codes:
+
+ I - IPv4 address
++ R - destination descriptor (RFC3442)
+ 6 - IPv6 address
+ l - 32-bit signed integer
+ L - 32-bit unsigned integer
+@@ -208,6 +209,7 @@ static struct option dhcp_options[] = {
+ { "default-url", "t", &dhcp_universe, 114, 1 },
+ { "subnet-selection", "I", &dhcp_universe, 118, 1 },
+ { "domain-search", "D", &dhcp_universe, 119, 1 },
++ { "classless-static-routes", "RIA", &dhcp_universe, 121, 1 },
+ { "vivco", "Evendor-class.", &dhcp_universe, 124, 1 },
+ { "vivso", "Evendor.", &dhcp_universe, 125, 1 },
+ #if 0
+diff -up dhcp-4.2.2b1/includes/dhcpd.h.rfc3442 dhcp-4.2.2b1/includes/dhcpd.h
+--- dhcp-4.2.2b1/includes/dhcpd.h.rfc3442 2011-07-01 14:22:38.000000000 +0200
++++ dhcp-4.2.2b1/includes/dhcpd.h 2011-07-01 14:24:19.999810333 +0200
+@@ -2662,6 +2662,7 @@ isc_result_t range2cidr(struct iaddrcidr
+ const struct iaddr *lo, const struct iaddr *hi);
+ isc_result_t free_iaddrcidrnetlist(struct iaddrcidrnetlist **result);
+ const char *piaddr (struct iaddr);
++const char *pdestdesc (struct iaddr);
+ char *piaddrmask(struct iaddr *, struct iaddr *);
+ char *piaddrcidr(const struct iaddr *, unsigned int);
+ u_int16_t validate_port(char *);
+@@ -2869,6 +2870,7 @@ void parse_client_lease_declaration (str
+ int parse_option_decl (struct option_cache **, struct parse *);
+ void parse_string_list (struct parse *, struct string_list **, int);
+ int parse_ip_addr (struct parse *, struct iaddr *);
++int parse_destination_descriptor (struct parse *, struct iaddr *);
+ int parse_ip_addr_with_subnet(struct parse *, struct iaddrmatch *);
+ void parse_reject_statement (struct parse *, struct client_config *);
+
+diff -up dhcp-4.2.2b1/includes/dhcp.h.rfc3442 dhcp-4.2.2b1/includes/dhcp.h
+--- dhcp-4.2.2b1/includes/dhcp.h.rfc3442 2009-11-20 02:49:01.000000000 +0100
++++ dhcp-4.2.2b1/includes/dhcp.h 2011-07-01 14:22:38.145532665 +0200
+@@ -158,6 +158,7 @@ struct dhcp_packet {
+ #define DHO_ASSOCIATED_IP 92
+ #define DHO_SUBNET_SELECTION 118 /* RFC3011! */
+ #define DHO_DOMAIN_SEARCH 119 /* RFC3397 */
++#define DHO_CLASSLESS_STATIC_ROUTES 121 /* RFC3442 */
+ #define DHO_VIVCO_SUBOPTIONS 124
+ #define DHO_VIVSO_SUBOPTIONS 125
+
+diff -up dhcp-4.2.2b1/includes/dhctoken.h.rfc3442 dhcp-4.2.2b1/includes/dhctoken.h
+--- dhcp-4.2.2b1/includes/dhctoken.h.rfc3442 2011-07-01 14:22:37.000000000 +0200
++++ dhcp-4.2.2b1/includes/dhctoken.h 2011-07-01 14:25:12.541867623 +0200
+@@ -362,7 +362,8 @@ enum dhcp_token {
+ REWIND = 663,
+ INITIAL_DELAY = 664,
+ GETHOSTBYNAME = 665,
+- BOOTP_BROADCAST_ALWAYS = 666
++ BOOTP_BROADCAST_ALWAYS = 666,
++ DESTINATION_DESCRIPTOR = 667
+ };
+
+ #define is_identifier(x) ((x) >= FIRST_TOKEN && \
diff --git a/dhcp/patches/dhcp-4.2.2-sharedlib.patch b/dhcp/patches/dhcp-4.2.2-sharedlib.patch
new file mode 100644
index 0000000..74fe9f1
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.2-sharedlib.patch
@@ -0,0 +1,119 @@
+diff -up dhcp-4.2.2/client/Makefile.am.sharedlib dhcp-4.2.2/client/Makefile.am
+--- dhcp-4.2.2/client/Makefile.am.sharedlib 2011-09-09 16:35:56.000000000 +0200
++++ dhcp-4.2.2/client/Makefile.am 2011-09-09 16:36:29.849007951 +0200
+@@ -4,7 +4,7 @@ dhclient_SOURCES = clparse.c dhclient.c
+ scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
+ scripts/netbsd scripts/nextstep scripts/openbsd \
+ scripts/solaris scripts/openwrt
+-dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
++dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
+ $(BIND9_LIBDIR) -ldns-export -lisc-export $(CAPNG_LDADD)
+ man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
+ EXTRA_DIST = $(man_MANS)
+diff -up dhcp-4.2.2/configure.ac.sharedlib dhcp-4.2.2/configure.ac
+--- dhcp-4.2.2/configure.ac.sharedlib 2011-09-09 16:35:56.097000001 +0200
++++ dhcp-4.2.2/configure.ac 2011-09-09 16:35:56.383000000 +0200
+@@ -30,7 +30,8 @@ fi
+ # Use this to define _GNU_SOURCE to pull in the IPv6 Advanced Socket API.
+ AC_USE_SYSTEM_EXTENSIONS
+
+-AC_PROG_RANLIB
++# Use libtool to simplify building of shared libraries
++AC_PROG_LIBTOOL
+ AC_CONFIG_HEADERS([includes/config.h])
+
+ # we sometimes need to know byte order for building packets
+diff -up dhcp-4.2.2/dhcpctl/Makefile.am.sharedlib dhcp-4.2.2/dhcpctl/Makefile.am
+--- dhcp-4.2.2/dhcpctl/Makefile.am.sharedlib 2011-09-09 16:35:55.459000001 +0200
++++ dhcp-4.2.2/dhcpctl/Makefile.am 2011-09-09 16:35:56.384000000 +0200
+@@ -1,15 +1,15 @@
+ bin_PROGRAMS = omshell
+-lib_LIBRARIES = libdhcpctl.a
++lib_LTLIBRARIES = libdhcpctl.la
+ noinst_PROGRAMS = cltest
+ man_MANS = omshell.1 dhcpctl.3
+ EXTRA_DIST = $(man_MANS)
+
+ omshell_SOURCES = omshell.c
+-omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
++omshell_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \
+ $(BIND9_LIBDIR) -ldns-export -lisc-export
+
+-libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
++libdhcpctl_la_SOURCES = dhcpctl.c callback.c remote.c
+
+ cltest_SOURCES = cltest.c
+-cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
++cltest_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \
+ $(BIND9_LIBDIR) -ldns-export -lisc-export
+diff -up dhcp-4.2.2/dst/base64.c.sharedlib dhcp-4.2.2/dst/base64.c
+--- dhcp-4.2.2/dst/base64.c.sharedlib 2009-11-20 02:49:01.000000000 +0100
++++ dhcp-4.2.2/dst/base64.c 2011-09-09 16:35:56.385000000 +0200
+@@ -64,6 +64,7 @@ static const char rcsid[] = "$Id: base64
+
+ #include <sys/socket.h>
+
++#include "dst_internal.h"
+ #include "cdefs.h"
+ #include "osdep.h"
+ #include "arpa/nameser.h"
+diff -up dhcp-4.2.2/dst/Makefile.am.sharedlib dhcp-4.2.2/dst/Makefile.am
+--- dhcp-4.2.2/dst/Makefile.am.sharedlib 2007-05-29 18:32:10.000000000 +0200
++++ dhcp-4.2.2/dst/Makefile.am 2011-09-09 16:35:56.386000000 +0200
+@@ -1,8 +1,8 @@
+ AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5
+
+-lib_LIBRARIES = libdst.a
++lib_LTLIBRARIES = libdst.la
+
+-libdst_a_SOURCES = dst_support.c dst_api.c hmac_link.c md5_dgst.c \
++libdst_la_SOURCES = dst_support.c dst_api.c hmac_link.c md5_dgst.c \
+ base64.c prandom.c
+
+ EXTRA_DIST = dst_internal.h md5.h md5_locl.h
+diff -up dhcp-4.2.2/omapip/Makefile.am.sharedlib dhcp-4.2.2/omapip/Makefile.am
+--- dhcp-4.2.2/omapip/Makefile.am.sharedlib 2011-09-09 16:35:55.000000000 +0200
++++ dhcp-4.2.2/omapip/Makefile.am 2011-09-09 16:37:36.734000324 +0200
+@@ -1,7 +1,7 @@
+-lib_LIBRARIES = libomapi.a
++lib_LTLIBRARIES = libomapi.la
+ noinst_PROGRAMS = svtest
+
+-libomapi_a_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \
++libomapi_la_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \
+ errwarn.c listener.c dispatch.c generic.c support.c \
+ handle.c message.c convert.c hash.c auth.c inet_addr.c \
+ array.c trace.c toisc.c iscprint.c isclib.c
+@@ -10,5 +10,5 @@ man_MANS = omapi.3
+ EXTRA_DIST = $(man_MANS)
+
+ svtest_SOURCES = test.c
+-svtest_LDADD = libomapi.a $(BIND9_LIBDIR) -ldns-export -lisc-export
++svtest_LDADD = libomapi.la $(BIND9_LIBDIR) -ldns-export -lisc-export
+
+diff -up dhcp-4.2.2/relay/Makefile.am.sharedlib dhcp-4.2.2/relay/Makefile.am
+--- dhcp-4.2.2/relay/Makefile.am.sharedlib 2011-09-09 16:35:56.000000000 +0200
++++ dhcp-4.2.2/relay/Makefile.am 2011-09-09 16:37:57.058019749 +0200
+@@ -2,7 +2,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
+
+ sbin_PROGRAMS = dhcrelay
+ dhcrelay_SOURCES = dhcrelay.c
+-dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
++dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
+ $(BIND9_LIBDIR) -ldns-export -lisc-export $(CAPNG_LDADD)
+ man_MANS = dhcrelay.8
+ EXTRA_DIST = $(man_MANS)
+diff -up dhcp-4.2.2/server/Makefile.am.sharedlib dhcp-4.2.2/server/Makefile.am
+--- dhcp-4.2.2/server/Makefile.am.sharedlib 2011-09-09 16:35:56.000000000 +0200
++++ dhcp-4.2.2/server/Makefile.am 2011-09-09 16:38:56.291004599 +0200
+@@ -7,8 +7,8 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c
+ dhcpv6.c mdb6.c ldap.c ldap_casa.c
+
+ dhcpd_CFLAGS = $(LDAP_CFLAGS)
+-dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
+- ../dhcpctl/libdhcpctl.a $(BIND9_LIBDIR) -ldns-export -lisc-export \
++dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
++ ../dhcpctl/libdhcpctl.la $(BIND9_LIBDIR) -ldns-export -lisc-export \
+ $(CAPNG_LDADD)
+
+ man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
diff --git a/dhcp/patches/dhcp-4.2.2-systemtap.patch b/dhcp/patches/dhcp-4.2.2-systemtap.patch
new file mode 100644
index 0000000..c067348
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.2-systemtap.patch
@@ -0,0 +1,810 @@
+diff -up dhcp-4.2.2/configure.ac.systemtap dhcp-4.2.2/configure.ac
+--- dhcp-4.2.2/configure.ac.systemtap 2011-09-21 15:13:35.515434854 +0200
++++ dhcp-4.2.2/configure.ac 2011-09-21 15:13:35.574434049 +0200
+@@ -485,6 +485,35 @@ else
+ AC_MSG_RESULT(no)
+ fi
+
++AC_MSG_CHECKING([whether to include systemtap tracing support])
++AC_ARG_ENABLE([systemtap],
++ [AS_HELP_STRING([--enable-systemtap],
++ [Enable inclusion of systemtap trace support])],
++ [ENABLE_SYSTEMTAP="${enableval}"], [ENABLE_SYSTEMTAP='no'])
++AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test x$ENABLE_SYSTEMTAP = xyes])
++AC_MSG_RESULT(${ENABLE_SYSTEMTAP})
++
++if test "x${ENABLE_SYSTEMTAP}" = xyes; then
++ # Additional configuration for --enable-systemtap is HERE
++ AC_CHECK_PROGS(DTRACE, dtrace)
++ if test -z "$DTRACE"; then
++ AC_MSG_ERROR([dtrace not found])
++ fi
++ AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUND='yes'],
++ [SDT_H_FOUND='no';
++ AC_MSG_ERROR([systemtap support needs sys/sdt.h header])])
++ AC_DEFINE([HAVE_SYSTEMTAP], [1], [Define to 1 if using SystemTap probes.])
++ AC_ARG_WITH([tapset-install-dir],
++ [AS_HELP_STRING([--with-tapset-install-dir],
++ [The absolute path where the tapset dir will be installed])],
++ [if test "x${withval}" = x; then
++ ABS_TAPSET_DIR="\$(datadir)/systemtap/tapset"
++ else
++ ABS_TAPSET_DIR="${withval}"
++ fi], [ABS_TAPSET_DIR="\$(datadir)/systemtap/tapset"])
++ AC_SUBST(ABS_TAPSET_DIR)
++fi
++
+ # Solaris needs some libraries for functions
+ AC_SEARCH_LIBS(socket, [socket])
+ AC_SEARCH_LIBS(inet_ntoa, [nsl])
+@@ -631,6 +660,7 @@ AC_OUTPUT([
+ relay/Makefile
+ server/Makefile
+ tests/Makefile
++ tapset/Makefile
+ ])
+
+ sh util/bindvar.sh
+diff -up dhcp-4.2.2/Makefile.am.systemtap dhcp-4.2.2/Makefile.am
+--- dhcp-4.2.2/Makefile.am.systemtap 2011-09-21 15:13:35.339437258 +0200
++++ dhcp-4.2.2/Makefile.am 2011-09-21 15:13:35.574434049 +0200
+@@ -29,5 +29,8 @@ endif
+
+ SUBDIRS += includes tests common dst omapip client dhcpctl relay server
+
++SUBDIRS += tapset
++#DIST_SUBDIRS = $(SUBDIRS)
++
+ nobase_include_HEADERS = dhcpctl/dhcpctl.h
+
+diff -up dhcp-4.2.2/server/dhcp.c.systemtap dhcp-4.2.2/server/dhcp.c
+--- dhcp-4.2.2/server/dhcp.c.systemtap 2011-09-21 15:13:35.362436945 +0200
++++ dhcp-4.2.2/server/dhcp.c 2011-09-21 15:13:35.576434021 +0200
+@@ -36,7 +36,7 @@
+ #include <errno.h>
+ #include <limits.h>
+ #include <sys/time.h>
+-
++#include "trace.h"
+ static void commit_leases_ackout(void *foo);
+ static void maybe_return_agent_options(struct packet *packet,
+ struct option_state *options);
+@@ -275,6 +275,8 @@ void dhcpdiscover (packet, ms_nulltp)
+ dhcp_failover_state_t *peer;
+ #endif
+
++ TRACE(DHCPD_DISCOVER_START());
++
+ find_lease (&lease, packet, packet -> shared_network,
+ 0, &peer_has_leases, (struct lease *)0, MDL);
+
+@@ -399,6 +401,8 @@ void dhcpdiscover (packet, ms_nulltp)
+ out:
+ if (lease)
+ lease_dereference (&lease, MDL);
++
++ TRACE(DHCPD_DISCOVER_DONE());
+ }
+
+ void dhcprequest (packet, ms_nulltp, ip_lease)
+@@ -422,6 +426,8 @@ void dhcprequest (packet, ms_nulltp, ip_
+ int have_server_identifier = 0;
+ int have_requested_addr = 0;
+
++ TRACE(DHCPD_REQUEST_START());
++
+ oc = lookup_option (&dhcp_universe, packet -> options,
+ DHO_DHCP_REQUESTED_ADDRESS);
+ memset (&data, 0, sizeof data);
+@@ -679,6 +685,9 @@ void dhcprequest (packet, ms_nulltp, ip_
+ log_info ("%s: unknown lease %s.", msgbuf, piaddr (cip));
+
+ out:
++
++ TRACE(DHCPD_REQUEST_DONE());
++
+ if (subnet)
+ subnet_dereference (&subnet, MDL);
+ if (lease)
+@@ -697,6 +706,7 @@ void dhcprelease (packet, ms_nulltp)
+ const char *s;
+ char msgbuf [1024], cstr[16]; /* XXX */
+
++ TRACE(DHCPD_RELEASE_START());
+
+ /* DHCPRELEASE must not specify address in requested-address
+ option, but old protocol specs weren't explicit about this,
+@@ -821,6 +831,8 @@ void dhcprelease (packet, ms_nulltp)
+ #endif
+ if (lease)
+ lease_dereference (&lease, MDL);
++
++ TRACE(DHCPD_RELEASE_DONE());
+ }
+
+ void dhcpdecline (packet, ms_nulltp)
+@@ -838,6 +850,8 @@ void dhcpdecline (packet, ms_nulltp)
+ struct option_cache *oc;
+ struct data_string data;
+
++ TRACE(DHCPD_DECLINE_START());
++
+ /* DHCPDECLINE must specify address. */
+ if (!(oc = lookup_option (&dhcp_universe, packet -> options,
+ DHO_DHCP_REQUESTED_ADDRESS)))
+@@ -949,6 +963,8 @@ void dhcpdecline (packet, ms_nulltp)
+ option_state_dereference (&options, MDL);
+ if (lease)
+ lease_dereference (&lease, MDL);
++
++ TRACE(DHCPD_DECLINE_DONE());
+ }
+
+ void dhcpinform (packet, ms_nulltp)
+@@ -970,6 +986,8 @@ void dhcpinform (packet, ms_nulltp)
+ struct in_addr from;
+ isc_boolean_t zeroed_ciaddr;
+
++ TRACE(DHCPD_INFORM_START());
++
+ /* The client should set ciaddr to its IP address, but apparently
+ it's common for clients not to do this, so we'll use their IP
+ source address if they didn't set ciaddr. */
+@@ -1320,6 +1338,8 @@ void dhcpinform (packet, ms_nulltp)
+ from, &to, (struct hardware *)0);
+ if (subnet)
+ subnet_dereference (&subnet, MDL);
++
++ TRACE(DHCPD_INFORM_DONE());
+ }
+
+ void nak_lease (packet, cip)
+@@ -1336,6 +1356,8 @@ void nak_lease (packet, cip)
+ struct option_state *options = (struct option_state *)0;
+ struct option_cache *oc = (struct option_cache *)0;
+
++ TRACE(DHCPD_NAK_LEASE_START());
++
+ option_state_allocate (&options, MDL);
+ memset (&outgoing, 0, sizeof outgoing);
+ memset (&raw, 0, sizeof raw);
+@@ -1474,6 +1496,8 @@ void nak_lease (packet, cip)
+ errno = 0;
+ result = send_packet(packet->interface, packet, &raw,
+ outgoing.packet_length, from, &to, NULL);
++
++ TRACE(DHCPD_NAK_LEASE_DONE());
+ }
+
+ void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp)
+@@ -1515,6 +1539,8 @@ void ack_lease (packet, lease, offer, wh
+ if (lease -> state)
+ return;
+
++ TRACE(DHCPD_ACK_LEASE_START());
++
+ /* Save original cltt for comparison later. */
+ lease_cltt = lease->cltt;
+
+@@ -2877,6 +2903,8 @@ void ack_lease (packet, lease, offer, wh
+ #endif
+ dhcp_reply(lease);
+ }
++
++ TRACE(DHCPD_ACK_LEASE_DONE());
+ }
+
+ /*
+@@ -3029,6 +3057,8 @@ void dhcp_reply (lease)
+ if (!state)
+ log_fatal ("dhcp_reply was supplied lease with no state!");
+
++ TRACE(DHCPD_REPLY_START());
++
+ /* Compose a response for the client... */
+ memset (&raw, 0, sizeof raw);
+ memset (&d1, 0, sizeof d1);
+@@ -3236,6 +3266,8 @@ void dhcp_reply (lease)
+
+ free_lease_state (state, MDL);
+ lease -> state = (struct lease_state *)0;
++
++ TRACE(DHCPD_REPLY_DONE());
+ }
+
+ int find_lease (struct lease **lp,
+@@ -3258,6 +3290,8 @@ int find_lease (struct lease **lp,
+ struct data_string client_identifier;
+ struct hardware h;
+
++ TRACE(DHCPD_FIND_LEASE_START());
++
+ #if defined(FAILOVER_PROTOCOL)
+ /* Quick check to see if the peer has leases. */
+ if (peer_has_leases) {
+@@ -3985,6 +4019,9 @@ int find_lease (struct lease **lp,
+ #if defined (DEBUG_FIND_LEASE)
+ log_info ("Not returning a lease.");
+ #endif
++
++ TRACE(DHCPD_FIND_LEASE_DONE());
++
+ return 0;
+ }
+
+diff -up dhcp-4.2.2/server/dhcpd.c.systemtap dhcp-4.2.2/server/dhcpd.c
+--- dhcp-4.2.2/server/dhcpd.c.systemtap 2011-09-21 15:13:35.471435455 +0200
++++ dhcp-4.2.2/server/dhcpd.c 2011-09-21 15:14:47.686449112 +0200
+@@ -63,6 +63,8 @@ static const char url [] =
+ int keep_capabilities = 0;
+ #endif
+
++#include "trace.h"
++
+ static void usage(void);
+
+ struct iaddr server_identifier;
+@@ -887,7 +889,7 @@ main(int argc, char **argv) {
+ log_info ("Dropped all capabilities.");
+ }
+ #endif
+-
++ TRACE(DHCPD_MAIN());
+ /* Receive packets and dispatch them... */
+ dispatch ();
+
+diff -up dhcp-4.2.2/server/dhcpv6.c.systemtap dhcp-4.2.2/server/dhcpv6.c
+--- dhcp-4.2.2/server/dhcpv6.c.systemtap 2011-09-21 15:13:35.528434676 +0200
++++ dhcp-4.2.2/server/dhcpv6.c 2011-09-21 15:13:35.579433979 +0200
+@@ -15,6 +15,7 @@
+ */
+
+ #include "dhcpd.h"
++#include "trace.h"
+
+ #ifdef DHCPv6
+
+@@ -4171,6 +4172,8 @@ static void
+ dhcpv6_solicit(struct data_string *reply_ret, struct packet *packet) {
+ struct data_string client_id;
+
++ TRACE(DHCPD_6_SOLICIT_START());
++
+ /*
+ * Validate our input.
+ */
+@@ -4184,6 +4187,8 @@ dhcpv6_solicit(struct data_string *reply
+ * Clean up.
+ */
+ data_string_forget(&client_id, MDL);
++
++ TRACE(DHCPD_6_SOLICIT_DONE());
+ }
+
+ /*
+@@ -4197,6 +4202,8 @@ dhcpv6_request(struct data_string *reply
+ struct data_string client_id;
+ struct data_string server_id;
+
++ TRACE(DHCPD_6_REQUEST_START());
++
+ /*
+ * Validate our input.
+ */
+@@ -4214,6 +4221,8 @@ dhcpv6_request(struct data_string *reply
+ */
+ data_string_forget(&client_id, MDL);
+ data_string_forget(&server_id, MDL);
++
++ TRACE(DHCPD_6_REQUEST_DONE());
+ }
+
+ /* Find a DHCPv6 packet's shared network from hints in the packet.
+@@ -4326,6 +4335,8 @@ dhcpv6_confirm(struct data_string *reply
+ struct dhcpv6_packet *reply = (struct dhcpv6_packet *)reply_data;
+ int reply_ofs = (int)(offsetof(struct dhcpv6_packet, options));
+
++ TRACE(DHCPD_6_CONFIRM_START());
++
+ /*
+ * Basic client message validation.
+ */
+@@ -4512,6 +4523,8 @@ exit:
+ option_state_dereference(&cli_enc_opt_state, MDL);
+ if (opt_state != NULL)
+ option_state_dereference(&opt_state, MDL);
++
++ TRACE(DHCPD_6_CONFIRM_DONE());
+ }
+
+ /*
+@@ -4526,6 +4539,8 @@ dhcpv6_renew(struct data_string *reply,
+ struct data_string client_id;
+ struct data_string server_id;
+
++ TRACE(DHCPD_6_RENEW_START());
++
+ /*
+ * Validate the request.
+ */
+@@ -4543,6 +4558,8 @@ dhcpv6_renew(struct data_string *reply,
+ */
+ data_string_forget(&server_id, MDL);
+ data_string_forget(&client_id, MDL);
++
++ TRACE(DHCPD_6_RENEW_DONE());
+ }
+
+ /*
+@@ -4556,6 +4573,8 @@ static void
+ dhcpv6_rebind(struct data_string *reply, struct packet *packet) {
+ struct data_string client_id;
+
++ TRACE(DHCPD_6_REBIND_START());
++
+ if (!valid_client_msg(packet, &client_id)) {
+ return;
+ }
+@@ -4563,6 +4582,8 @@ dhcpv6_rebind(struct data_string *reply,
+ lease_to_client(reply, packet, &client_id, NULL);
+
+ data_string_forget(&client_id, MDL);
++
++ TRACE(DHCPD_6_REBIND_DONE());
+ }
+
+ static void
+@@ -5009,6 +5030,8 @@ dhcpv6_decline(struct data_string *reply
+ struct data_string client_id;
+ struct data_string server_id;
+
++ TRACE(DHCPD_6_DECLINE_START());
++
+ /*
+ * Validate our input.
+ */
+@@ -5029,6 +5052,8 @@ dhcpv6_decline(struct data_string *reply
+
+ data_string_forget(&server_id, MDL);
+ data_string_forget(&client_id, MDL);
++
++ TRACE(DHCPD_6_DECLINE_DONE());
+ }
+
+ static void
+@@ -5479,6 +5504,8 @@ dhcpv6_release(struct data_string *reply
+ struct data_string client_id;
+ struct data_string server_id;
+
++ TRACE(DHCPD_6_RELEASE_START());
++
+ /*
+ * Validate our input.
+ */
+@@ -5500,6 +5527,8 @@ dhcpv6_release(struct data_string *reply
+
+ data_string_forget(&server_id, MDL);
+ data_string_forget(&client_id, MDL);
++
++ TRACE(DHCPD_6_RELEASE_DONE());
+ }
+
+ /*
+@@ -5512,6 +5541,8 @@ dhcpv6_information_request(struct data_s
+ struct data_string client_id;
+ struct data_string server_id;
+
++ TRACE(DHCPD_6_INFORMATION_REQUEST_START());
++
+ /*
+ * Validate our input.
+ */
+@@ -5543,6 +5574,8 @@ dhcpv6_information_request(struct data_s
+ data_string_forget(&client_id, MDL);
+ }
+ data_string_forget(&server_id, MDL);
++
++ TRACE(DHCPD_6_INFORMATION_REQUEST_DONE());
+ }
+
+ /*
+@@ -5571,6 +5604,8 @@ dhcpv6_relay_forw(struct data_string *re
+ struct dhcpv6_relay_packet *reply;
+ int reply_ofs;
+
++ TRACE(DHCPD_6_RELAY_FORW_START());
++
+ /*
+ * Initialize variables for early exit.
+ */
+@@ -5828,6 +5863,8 @@ exit:
+ if (enc_packet != NULL) {
+ packet_dereference(&enc_packet, MDL);
+ }
++
++ TRACE(DHCPD_6_RELAY_FORW_DONE());
+ }
+
+ static void
+diff -up dhcp-4.2.2/server/failover.c.systemtap dhcp-4.2.2/server/failover.c
+--- dhcp-4.2.2/server/failover.c.systemtap 2011-05-11 16:21:00.000000000 +0200
++++ dhcp-4.2.2/server/failover.c 2011-09-21 15:13:35.584433913 +0200
+@@ -35,6 +35,8 @@
+ #include "dhcpd.h"
+ #include <omapip/omapip_p.h>
+
++#include "trace.h"
++
+ #if defined (FAILOVER_PROTOCOL)
+ dhcp_failover_state_t *failover_states;
+ static isc_result_t do_a_failover_option (omapi_object_t *,
+@@ -1711,6 +1713,8 @@ isc_result_t dhcp_failover_set_state (dh
+ struct lease *l;
+ struct timeval tv;
+
++ TRACE(DHCPD_FAILOVER_SET_STATE_START(state->me.state, new_state));
++
+ /* If we're in certain states where we're sending updates, and the peer
+ * state changes, we need to re-schedule any pending updates just to
+ * be on the safe side. This results in retransmission.
+@@ -1938,6 +1942,8 @@ isc_result_t dhcp_failover_set_state (dh
+ break;
+ }
+
++ TRACE(DHCPD_FAILOVER_SET_STATE_DONE());
++
+ return ISC_R_SUCCESS;
+ }
+
+@@ -2420,6 +2426,8 @@ dhcp_failover_pool_dobalance(dhcp_failov
+ if (state -> me.state != normal)
+ return 0;
+
++ TRACE(DHCPD_FAILOVER_POOL_DOBALANCE_START());
++
+ state->last_balance = cur_time;
+
+ for (s = shared_networks ; s ; s = s->next) {
+@@ -2580,6 +2588,8 @@ dhcp_failover_pool_dobalance(dhcp_failov
+ if (leases_queued)
+ commit_leases();
+
++ TRACE(DHCPD_FAILOVER_POOL_DOBALANCE_DONE());
++
+ return leases_queued;
+ }
+
+diff -up dhcp-4.2.2/server/Makefile.am.systemtap dhcp-4.2.2/server/Makefile.am
+--- dhcp-4.2.2/server/Makefile.am.systemtap 2011-09-21 15:13:35.517434828 +0200
++++ dhcp-4.2.2/server/Makefile.am 2011-09-21 15:13:35.585433900 +0200
+@@ -4,7 +4,7 @@ dist_sysconf_DATA = dhcpd.conf
+ sbin_PROGRAMS = dhcpd
+ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \
+ omapi.c mdb.c stables.c salloc.c ddns.c dhcpleasequery.c \
+- dhcpv6.c mdb6.c ldap.c ldap_casa.c
++ dhcpv6.c mdb6.c ldap.c ldap_casa.c probes.d trace.h
+
+ dhcpd_CFLAGS = $(LDAP_CFLAGS)
+ dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
+@@ -14,3 +14,13 @@ dhcpd_LDADD = ../common/libdhcp.a ../oma
+ man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
+ EXTRA_DIST = $(man_MANS)
+
++if ENABLE_SYSTEMTAP
++BUILT_SOURCES = probes.h
++probes.h: probes.d
++ $(DTRACE) -C -h -s $< -o $@
++
++probes.o: probes.d
++ $(DTRACE) -C -G -s $< -o $@
++
++dhcpd_LDADD += probes.o
++endif
+diff -up dhcp-4.2.2/server/probes.d.systemtap dhcp-4.2.2/server/probes.d
+--- dhcp-4.2.2/server/probes.d.systemtap 2011-09-21 15:13:35.585433900 +0200
++++ dhcp-4.2.2/server/probes.d 2011-09-21 15:13:35.585433900 +0200
+@@ -0,0 +1,43 @@
++provider dhcpd {
++ probe main();
++ probe discover_start()
++ probe discover_done()
++ probe request_start()
++ probe request_done()
++ probe release_start()
++ probe release_done()
++ probe decline_start()
++ probe decline_done()
++ probe inform_start()
++ probe inform_done()
++ probe nak_lease_start()
++ probe nak_lease_done()
++ probe ack_lease_start()
++ probe ack_lease_done()
++ probe reply_start()
++ probe reply_done()
++ probe find_lease_start()
++ probe find_lease_done()
++ probe 6_solicit_start()
++ probe 6_solicit_done()
++ probe 6_request_start()
++ probe 6_request_done()
++ probe 6_confirm_start()
++ probe 6_confirm_done()
++ probe 6_renew_start()
++ probe 6_renew_done()
++ probe 6_rebind_start()
++ probe 6_rebind_done()
++ probe 6_decline_start()
++ probe 6_decline_done()
++ probe 6_release_start()
++ probe 6_release_done()
++ probe 6_information_request_start()
++ probe 6_information_request_done()
++ probe 6_relay_forw_start()
++ probe 6_relay_forw_done()
++ probe failover_pool_dobalance_start()
++ probe failover_pool_dobalance_done()
++ probe failover_set_state_start(int, int) /* state, new_state */
++ probe failover_set_state_done()
++};
+diff -up dhcp-4.2.2/server/trace.h.systemtap dhcp-4.2.2/server/trace.h
+--- dhcp-4.2.2/server/trace.h.systemtap 2011-09-21 15:13:35.585433900 +0200
++++ dhcp-4.2.2/server/trace.h 2011-09-21 15:13:35.585433900 +0200
+@@ -0,0 +1,11 @@
++// trace.h
++
++#include "config.h"
++#ifdef HAVE_SYSTEMTAP
++// include the generated probes header and put markers in code
++#include "probes.h"
++#define TRACE(probe) probe
++#else
++// Wrap the probe to allow it to be removed when no systemtap available
++#define TRACE(probe)
++#endif
+diff -up dhcp-4.2.2/tapset/dhcpd.stp.systemtap dhcp-4.2.2/tapset/dhcpd.stp
+--- dhcp-4.2.2/tapset/dhcpd.stp.systemtap 2011-09-21 15:13:35.586433886 +0200
++++ dhcp-4.2.2/tapset/dhcpd.stp 2011-09-21 15:13:35.586433886 +0200
+@@ -0,0 +1,212 @@
++/* dhcpd tapset
++ Copyright (C) 2011, Red Hat Inc.
++ */
++
++probe dhcpd_main = process("dhcpd").mark("main")
++{
++ probestr = sprintf("%s(locals: %s)", $$name, $$locals);
++
++}
++
++probe dhcpd_discover_start = process("dhcpd").mark("discover_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_discover_done = process("dhcpd").mark("discover_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_request_start = process("dhcpd").mark("request_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_request_done = process("dhcpd").mark("request_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_release_start = process("dhcpd").mark("release_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_release_done = process("dhcpd").mark("release_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_decline_start = process("dhcpd").mark("decline_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_decline_done = process("dhcpd").mark("decline_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_inform_start = process("dhcpd").mark("inform_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_inform_done = process("dhcpd").mark("inform_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_nak_lease_start = process("dhcpd").mark("nak_lease_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_nak_lease_done = process("dhcpd").mark("nak_lease_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_ack_lease_start = process("dhcpd").mark("ack_lease_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_ack_lease_done = process("dhcpd").mark("ack_lease_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_reply_start = process("dhcpd").mark("reply_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_reply_done = process("dhcpd").mark("reply_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_find_lease_start = process("dhcpd").mark("find_lease_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_find_lease_done = process("dhcpd").mark("find_lease_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_solicit_start = process("dhcpd").mark("6_solicit_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_solicit_done = process("dhcpd").mark("6_solicit_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_request_start = process("dhcpd").mark("6_request_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_request_done = process("dhcpd").mark("6_request_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_confirm_start = process("dhcpd").mark("6_confirm_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_confirm_done = process("dhcpd").mark("6_confirm_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_renew_start = process("dhcpd").mark("6_renew_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_renew_done = process("dhcpd").mark("6_renew_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_rebind_start = process("dhcpd").mark("6_rebind_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_rebind_done = process("dhcpd").mark("6_rebind_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_decline_start = process("dhcpd").mark("6_decline_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_decline_done = process("dhcpd").mark("6_decline_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_release_start = process("dhcpd").mark("6_release_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_release_done = process("dhcpd").mark("6_release_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_information_request_start = process("dhcpd").mark("6_information_request_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_information_request_done = process("dhcpd").mark("6_information_request_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_relay_forw_start = process("dhcpd").mark("6_relay_forw_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_6_relay_forw_done = process("dhcpd").mark("6_relay_forw_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_failover_pool_dobalance_start = process("dhcpd").mark("failover_pool_dobalance_start")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++probe dhcpd_failover_pool_dobalance_done = process("dhcpd").mark("failover_pool_dobalance_done")
++{
++ probestr = sprintf("%s", $$name);
++}
++
++
++probe dhcpd_failover_set_state_start = process("dhcpd").mark("failover_set_state_start")
++{
++ state = $arg1;
++ new_state = $arg2;
++ probestr = sprintf("%s(state=%d, new_state=%d)", $$name, state, new_state);
++}
++
++probe dhcpd_failover_set_state_done = process("dhcpd").mark("failover_set_state_done")
++{
++ probestr = sprintf("%s", $$name);
++}
+diff -up dhcp-4.2.2/tapset/Makefile.am.systemtap dhcp-4.2.2/tapset/Makefile.am
+--- dhcp-4.2.2/tapset/Makefile.am.systemtap 2011-09-21 15:13:35.586433886 +0200
++++ dhcp-4.2.2/tapset/Makefile.am 2011-09-21 15:13:35.586433886 +0200
+@@ -0,0 +1,26 @@
++# Makefile.am for dhcp/tapset
++# Jiri Popelka
++
++.PHONY: clean-local install-data-hook uninstall-local
++
++#
++EXTRA_DIST = dhcpd.stp
++TAPSET_FILES = $(EXTRA_DIST)
++TAPSET_INSTALL_DIR = $(DESTDIR)@ABS_TAPSET_DIR@
++
++if ENABLE_SYSTEMTAP
++all-local: $(TAPSET_FILES)
++
++clean-local:
++
++install-data-hook:
++ $(MKDIR_P) $(TAPSET_INSTALL_DIR)
++ $(INSTALL_DATA) $(TAPSET_FILES) $(TAPSET_INSTALL_DIR)
++
++uninstall-local:
++ @list='$(TAPSET_FILES)'; for p in $$list; do \
++ echo " rm -f '$(TAPSET_INSTALL_DIR)/$$p'"; \
++ rm -f "$(TAPSET_INSTALL_DIR)/$$p"; \
++ done
++endif
++
diff --git a/dhcp/patches/dhcp-4.2.2-xen-checksum.patch b/dhcp/patches/dhcp-4.2.2-xen-checksum.patch
new file mode 100644
index 0000000..038d346
--- /dev/null
+++ b/dhcp/patches/dhcp-4.2.2-xen-checksum.patch
@@ -0,0 +1,249 @@
+diff -up dhcp-4.2.2b1/common/bpf.c.xen dhcp-4.2.2b1/common/bpf.c
+--- dhcp-4.2.2b1/common/bpf.c.xen 2009-11-20 02:48:59.000000000 +0100
++++ dhcp-4.2.2b1/common/bpf.c 2011-07-01 14:00:16.936959001 +0200
+@@ -485,7 +485,7 @@ ssize_t receive_packet (interface, buf,
+ offset = decode_udp_ip_header (interface,
+ interface -> rbuf,
+ interface -> rbuf_offset,
+- from, hdr.bh_caplen, &paylen);
++ from, hdr.bh_caplen, &paylen, 0);
+
+ /* If the IP or UDP checksum was bad, skip the packet... */
+ if (offset < 0) {
+diff -up dhcp-4.2.2b1/common/dlpi.c.xen dhcp-4.2.2b1/common/dlpi.c
+--- dhcp-4.2.2b1/common/dlpi.c.xen 2011-05-11 16:20:59.000000000 +0200
++++ dhcp-4.2.2b1/common/dlpi.c 2011-07-01 14:00:16.937958997 +0200
+@@ -693,7 +693,7 @@ ssize_t receive_packet (interface, buf,
+ length -= offset;
+ #endif
+ offset = decode_udp_ip_header (interface, dbuf, bufix,
+- from, length, &paylen);
++ from, length, &paylen, 0);
+
+ /*
+ * If the IP or UDP checksum was bad, skip the packet...
+diff -up dhcp-4.2.2b1/common/lpf.c.xen dhcp-4.2.2b1/common/lpf.c
+--- dhcp-4.2.2b1/common/lpf.c.xen 2011-05-10 16:38:58.000000000 +0200
++++ dhcp-4.2.2b1/common/lpf.c 2011-07-01 14:11:24.725748028 +0200
+@@ -29,19 +29,33 @@
+ #include "dhcpd.h"
+ #if defined (USE_LPF_SEND) || defined (USE_LPF_RECEIVE)
+ #include <sys/ioctl.h>
++#include <sys/socket.h>
+ #include <sys/uio.h>
+ #include <errno.h>
+
+ #include <asm/types.h>
+ #include <linux/filter.h>
+ #include <linux/if_ether.h>
++#include <linux/if_packet.h>
+ #include <netinet/in_systm.h>
+-#include <net/if_packet.h>
+ #include "includes/netinet/ip.h"
+ #include "includes/netinet/udp.h"
+ #include "includes/netinet/if_ether.h"
+ #include <net/if.h>
+
++#ifndef PACKET_AUXDATA
++#define PACKET_AUXDATA 8
++
++struct tpacket_auxdata
++{
++ __u32 tp_status;
++ __u32 tp_len;
++ __u32 tp_snaplen;
++ __u16 tp_mac;
++ __u16 tp_net;
++};
++#endif
++
+ /* Reinitializes the specified interface after an address change. This
+ is not required for packet-filter APIs. */
+
+@@ -67,10 +81,14 @@ int if_register_lpf (info)
+ struct interface_info *info;
+ {
+ int sock;
+- struct sockaddr sa;
++ union {
++ struct sockaddr_ll ll;
++ struct sockaddr common;
++ } sa;
++ struct ifreq ifr;
+
+ /* Make an LPF socket. */
+- if ((sock = socket(PF_PACKET, SOCK_PACKET,
++ if ((sock = socket(PF_PACKET, SOCK_RAW,
+ htons((short)ETH_P_ALL))) < 0) {
+ if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
+ errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT ||
+@@ -85,11 +103,17 @@ int if_register_lpf (info)
+ log_fatal ("Open a socket for LPF: %m");
+ }
+
++ memset (&ifr, 0, sizeof ifr);
++ strncpy (ifr.ifr_name, (const char *)info -> ifp, sizeof ifr.ifr_name);
++ ifr.ifr_name[IFNAMSIZ-1] = '\0';
++ if (ioctl (sock, SIOCGIFINDEX, &ifr))
++ log_fatal ("Failed to get interface index: %m");
++
+ /* Bind to the interface name */
+ memset (&sa, 0, sizeof sa);
+- sa.sa_family = AF_PACKET;
+- strncpy (sa.sa_data, (const char *)info -> ifp, sizeof sa.sa_data);
+- if (bind (sock, &sa, sizeof sa)) {
++ sa.ll.sll_family = AF_PACKET;
++ sa.ll.sll_ifindex = ifr.ifr_ifindex;
++ if (bind (sock, &sa.common, sizeof sa)) {
+ if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
+ errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT ||
+ errno == EAFNOSUPPORT || errno == EINVAL) {
+@@ -171,9 +195,18 @@ static void lpf_gen_filter_setup (struct
+ void if_register_receive (info)
+ struct interface_info *info;
+ {
++ int val;
++
+ /* Open a LPF device and hang it on this interface... */
+ info -> rfdesc = if_register_lpf (info);
+
++ val = 1;
++ if (setsockopt (info -> rfdesc, SOL_PACKET, PACKET_AUXDATA, &val,
++ sizeof val) < 0) {
++ if (errno != ENOPROTOOPT)
++ log_fatal ("Failed to set auxiliary packet data: %m");
++ }
++
+ #if defined (HAVE_TR_SUPPORT)
+ if (info -> hw_address.hbuf [0] == HTYPE_IEEE802)
+ lpf_tr_filter_setup (info);
+@@ -295,7 +328,6 @@ ssize_t send_packet (interface, packet,
+ double hh [16];
+ double ih [1536 / sizeof (double)];
+ unsigned char *buf = (unsigned char *)ih;
+- struct sockaddr_pkt sa;
+ int result;
+ int fudge;
+
+@@ -316,17 +348,7 @@ ssize_t send_packet (interface, packet,
+ (unsigned char *)raw, len);
+ memcpy (buf + ibufp, raw, len);
+
+- /* For some reason, SOCK_PACKET sockets can't be connected,
+- so we have to do a sentdo every time. */
+- memset (&sa, 0, sizeof sa);
+- sa.spkt_family = AF_PACKET;
+- strncpy ((char *)sa.spkt_device,
+- (const char *)interface -> ifp, sizeof sa.spkt_device);
+- sa.spkt_protocol = htons(ETH_P_IP);
+-
+- result = sendto (interface -> wfdesc,
+- buf + fudge, ibufp + len - fudge, 0,
+- (const struct sockaddr *)&sa, sizeof sa);
++ result = write (interface -> wfdesc, buf + fudge, ibufp + len - fudge);
+ if (result < 0)
+ log_error ("send_packet: %m");
+ return result;
+@@ -343,14 +365,35 @@ ssize_t receive_packet (interface, buf,
+ {
+ int length = 0;
+ int offset = 0;
++ int nocsum = 0;
+ unsigned char ibuf [1536];
+ unsigned bufix = 0;
+ unsigned paylen;
++ unsigned char cmsgbuf[CMSG_LEN(sizeof(struct tpacket_auxdata))];
++ struct iovec iov = {
++ .iov_base = ibuf,
++ .iov_len = sizeof ibuf,
++ };
++ struct msghdr msg = {
++ .msg_iov = &iov,
++ .msg_iovlen = 1,
++ .msg_control = cmsgbuf,
++ .msg_controllen = sizeof(cmsgbuf),
++ };
++ struct cmsghdr *cmsg;
+
+- length = read (interface -> rfdesc, ibuf, sizeof ibuf);
++ length = recvmsg (interface -> rfdesc, &msg, 0);
+ if (length <= 0)
+ return length;
+
++ for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
++ if (cmsg->cmsg_level == SOL_PACKET &&
++ cmsg->cmsg_type == PACKET_AUXDATA) {
++ struct tpacket_auxdata *aux = (void *)CMSG_DATA(cmsg);
++ nocsum = aux->tp_status & TP_STATUS_CSUMNOTREADY;
++ }
++ }
++
+ bufix = 0;
+ /* Decode the physical header... */
+ offset = decode_hw_header (interface, ibuf, bufix, hfrom);
+@@ -367,7 +410,7 @@ ssize_t receive_packet (interface, buf,
+
+ /* Decode the IP and UDP headers... */
+ offset = decode_udp_ip_header (interface, ibuf, bufix, from,
+- (unsigned)length, &paylen);
++ (unsigned)length, &paylen, nocsum);
+
+ /* If the IP or UDP checksum was bad, skip the packet... */
+ if (offset < 0)
+diff -up dhcp-4.2.2b1/common/nit.c.xen dhcp-4.2.2b1/common/nit.c
+--- dhcp-4.2.2b1/common/nit.c.xen 2009-11-20 02:49:01.000000000 +0100
++++ dhcp-4.2.2b1/common/nit.c 2011-07-01 14:00:16.939958989 +0200
+@@ -369,7 +369,7 @@ ssize_t receive_packet (interface, buf,
+
+ /* Decode the IP and UDP headers... */
+ offset = decode_udp_ip_header (interface, ibuf, bufix,
+- from, length, &paylen);
++ from, length, &paylen, 0);
+
+ /* If the IP or UDP checksum was bad, skip the packet... */
+ if (offset < 0)
+diff -up dhcp-4.2.2b1/common/packet.c.xen dhcp-4.2.2b1/common/packet.c
+--- dhcp-4.2.2b1/common/packet.c.xen 2009-07-23 20:52:20.000000000 +0200
++++ dhcp-4.2.2b1/common/packet.c 2011-07-01 14:00:16.939958989 +0200
+@@ -211,7 +211,7 @@ ssize_t
+ decode_udp_ip_header(struct interface_info *interface,
+ unsigned char *buf, unsigned bufix,
+ struct sockaddr_in *from, unsigned buflen,
+- unsigned *rbuflen)
++ unsigned *rbuflen, int nocsum)
+ {
+ unsigned char *data;
+ struct ip ip;
+@@ -322,7 +322,7 @@ decode_udp_ip_header(struct interface_in
+ 8, IPPROTO_UDP + ulen))));
+
+ udp_packets_seen++;
+- if (usum && usum != sum) {
++ if (!nocsum && usum && usum != sum) {
+ udp_packets_bad_checksum++;
+ if (udp_packets_seen > 4 &&
+ (udp_packets_seen / udp_packets_bad_checksum) < 2) {
+diff -up dhcp-4.2.2b1/common/upf.c.xen dhcp-4.2.2b1/common/upf.c
+--- dhcp-4.2.2b1/common/upf.c.xen 2009-11-20 02:49:01.000000000 +0100
++++ dhcp-4.2.2b1/common/upf.c 2011-07-01 14:00:16.940958986 +0200
+@@ -320,7 +320,7 @@ ssize_t receive_packet (interface, buf,
+
+ /* Decode the IP and UDP headers... */
+ offset = decode_udp_ip_header (interface, ibuf, bufix,
+- from, length, &paylen);
++ from, length, &paylen, 0);
+
+ /* If the IP or UDP checksum was bad, skip the packet... */
+ if (offset < 0)
+diff -up dhcp-4.2.2b1/includes/dhcpd.h.xen dhcp-4.2.2b1/includes/dhcpd.h
+--- dhcp-4.2.2b1/includes/dhcpd.h.xen 2011-07-01 14:00:16.000000000 +0200
++++ dhcp-4.2.2b1/includes/dhcpd.h 2011-07-01 14:12:18.069642470 +0200
+@@ -2796,7 +2796,7 @@ ssize_t decode_hw_header (struct interfa
+ unsigned, struct hardware *);
+ ssize_t decode_udp_ip_header (struct interface_info *, unsigned char *,
+ unsigned, struct sockaddr_in *,
+- unsigned, unsigned *);
++ unsigned, unsigned *, int);
+
+ /* ethernet.c */
+ void assemble_ethernet_header (struct interface_info *, unsigned char *,
diff --git a/dhcp/systemd/dhcpd.service b/dhcp/systemd/dhcpd.service
new file mode 100644
index 0000000..51f1a56
--- /dev/null
+++ b/dhcp/systemd/dhcpd.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=DHCPv4 Server Daemon
+After=syslog.target network.target
+
+[Service]
+ExecStart=/usr/sbin/dhcpd -d -user dhcpd -group dhcpd --no-pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/dhcp/systemd/dhcpd6.service b/dhcp/systemd/dhcpd6.service
new file mode 100644
index 0000000..0931264
--- /dev/null
+++ b/dhcp/systemd/dhcpd6.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=DHCPv6 Server Daemon
+After=syslog.target network.target
+
+[Service]
+ExecStart=/usr/sbin/dhcpd -d -6 -user dhcpd -group dhcpd --no-pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/dhcp/systemd/dhcrelay.service b/dhcp/systemd/dhcrelay.service
new file mode 100644
index 0000000..d47bf63
--- /dev/null
+++ b/dhcp/systemd/dhcrelay.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=DHCP Relay Agent Daemon
+After=syslog.target network.target
+
+[Service]
+ExecStart=/usr/sbin/dhcrelay -d --no-pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/shadow-utils/shadow-utils.nm b/shadow-utils/shadow-utils.nm
index 7c8b782..b8f0a14 100644
--- a/shadow-utils/shadow-utils.nm
+++ b/shadow-utils/shadow-utils.nm
@@ -5,7 +5,8 @@
name = shadow-utils
version = 4.1.4.3
-release = 1
+release = 2
+thisapp = shadow-%{version}
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
groups = Base System/Base
@@ -19,9 +20,6 @@ description
format, plus programs for managing user and group accounts.
end
-obsoletes += shadow
-thisapp = shadow-%{version}
-
source_dl = http://pkg-shadow.alioth.debian.org/releases/
sources = %{thisapp}.tar.bz2
@@ -45,8 +43,8 @@ build
# Do not build these files:
for i in nologin chfn chgpasswd chpasswd chsh expiry gpasswd groups login \
logoutd passwd su; do \
- sed -i "s/$$i\$%{EXEEXT}//" src/Makefile.in; \
- find man -name Makefile.in -exec sed -i "s/$$i\.1/ /" {} \;; \
+ sed -i "s/$i\$(EXEEXT)//" src/Makefile.in; \
+ find man -name Makefile.in -exec sed -i "s/$i\.1/ /" {} \;; \
done
sed -i src/Makefile.in \
@@ -67,5 +65,11 @@ end
packages
package %{name}
+ obsoletes += shadow
+
+ conflicts
+ shadow
+ pam<1.1.0-4
+ end
end
end
hooks/post-receive
--
IPFire 3.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 5fcdfe3b42dc8302e619d3af37428164a2ac8059
by gitï¼ ipfire.org 02 Oct '11
by gitï¼ ipfire.org 02 Oct '11
02 Oct '11
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via 5fcdfe3b42dc8302e619d3af37428164a2ac8059 (commit)
via 6d3b56d06f042d8d685121fad11bbe6667a20d5f (commit)
via 978f4d75694e1af373e29822101cb02bddc58cff (commit)
via a4fbcaa9fbb93460f71543be33bfcf3b537c25a2 (commit)
via a2854ff6485872e794f9fe7aac567a8ec7f4f9f4 (commit)
via b8d5575f1993db19852af06d44087911cfa7a3ea (commit)
via c698e4be7e9c1824af15c94955f78c39bf7caaf8 (commit)
via e7f6ab54f5ed2b9e58b95557cbcc2acfd2146d1a (commit)
via 47bdaf55edae167b8784c3f66ffc07c46b4efd9f (commit)
via 9788e5aff8eb8dd201f9e963d5ae48199148799b (commit)
via 49026b7ddbe382afa92fed9f82611614e0569aaf (commit)
via ac29baf9e771f45a5c69e7a113cce4d6ef06d349 (commit)
from 15a11c5bc9c5871ee0e9fa5aa01f989947c9cf53 (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 5fcdfe3b42dc8302e619d3af37428164a2ac8059
Merge: 6d3b56d ac29baf
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 21:42:27 2011 +0200
Merge remote-tracking branch 'stevee/bind'
commit 6d3b56d06f042d8d685121fad11bbe6667a20d5f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 21:41:42 2011 +0200
pcre: Update to 8.13.
Fixes #241.
commit 978f4d75694e1af373e29822101cb02bddc58cff
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 21:32:10 2011 +0200
quagga: Update to 0.99.20.
Fixes #255.
commit a4fbcaa9fbb93460f71543be33bfcf3b537c25a2
Merge: a2854ff e7f6ab5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 21:31:20 2011 +0200
Merge remote-tracking branch 'stevee/coreutils'
commit a2854ff6485872e794f9fe7aac567a8ec7f4f9f4
Merge: b8d5575 9788e5a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 21:21:57 2011 +0200
Merge remote-tracking branch 'stevee/libcap-ng'
commit b8d5575f1993db19852af06d44087911cfa7a3ea
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 21:21:10 2011 +0200
xorg-x11-fonts: Fix typos in makefile.
commit c698e4be7e9c1824af15c94955f78c39bf7caaf8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 21:20:39 2011 +0200
kernel: kernel-headers accidentially had a dep to kernel.
commit e7f6ab54f5ed2b9e58b95557cbcc2acfd2146d1a
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Oct 2 21:10:28 2011 +0200
coreutils: Update to 8.13.
Fixes #251
commit 47bdaf55edae167b8784c3f66ffc07c46b4efd9f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 2 21:06:28 2011 +0200
grub: Update to 1.99.
Fixes #232.
commit 9788e5aff8eb8dd201f9e963d5ae48199148799b
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Oct 2 21:02:46 2011 +0200
libcap-ng: Update to 0.6.6.
commit 49026b7ddbe382afa92fed9f82611614e0569aaf
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Oct 2 21:00:56 2011 +0200
libcap-ng: Move libraries to /lib.
commit ac29baf9e771f45a5c69e7a113cce4d6ef06d349
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Oct 2 12:35:58 2011 +0200
bind: Rework package.
* Update to 9.8.1.
* Add patches.
* Also build named and libs.
* Run daemon in chroot env.
* Create sub packages.
-----------------------------------------------------------------------
Summary of changes:
bind/bind.nm | 185 +++++-
bind/named.logrotate | 8 +
bind/named.tmpfiles | 1 +
bind/patches/bind-9.3.2-redhat_doc.patch | 66 ++
bind/patches/bind-9.5-PIE.patch | 27 +
bind/patches/bind-9.5-dlz-64bit.patch | 70 ++
bind/patches/bind-9.5-libidn.patch | 270 ++++++++
bind/patches/bind-9.5-libidn2.patch | 221 ++++++
bind/patches/bind-9.5-libidn3.patch | 21 +
bind/patches/bind-9.5-overflow.patch | 24 +
bind/patches/bind-9.5-parallel-build.patch | 14 +
bind/patches/bind-95-rh452060.patch | 40 ++
bind/patches/bind-96-dyndb.patch | 722 ++++++++++++++++++++
bind/patches/bind-96-libtool2.patch | 13 +
bind/patches/bind-nonexec.patch | 72 ++
bind/patches/bind93-rh490837.patch0 | 95 +++
bind/patches/bind95-rh461409.patch | 19 +
bind/patches/bind97-dist-pkcs11.patch | 22 +
bind/patches/bind97-exportlib.patch | 255 +++++++
bind/patches/bind97-rh478718.patch | 30 +
bind/patches/bind97-rh570851.patch | 153 +++++
bind/patches/bind97-rh645544.patch | 30 +
bind/patches/bind97-rh693982.patch | 35 +
bind/patches/bind97-rh699951.patch | 46 ++
bind/patches/bind97-rh700097.patch | 11 +
bind/patches/bind97-rh714049.patch | 160 +++++
bind/patches/bind98-dlz_buildfix.patch | 25 +
bind/patches/bind98-rh725741.patch | 24 +
bind/patches/bind98-rh735103.patch | 40 ++
bind/trusted-key.key | 1 +
coreutils/coreutils.nm | 14 +-
coreutils/patches/coreutils-i18n.patch | 260 ++++----
coreutils/patches/coreutils-selinux.patch | 158 +++---
grub/grub.nm | 40 +-
grub/patches/grub-1.97.1-initramfs.patch | 13 -
.../grub-1.98-GRUB_DISTRIBUTOR-spaces-fix-1.patch0 | 39 --
grub/patches/grub-1.99-just-say-linux.patch | 46 ++
kernel/kernel.nm | 8 +-
libcap-ng/libcap-ng.nm | 15 +-
pcre/pcre.nm | 9 +-
quagga/quagga.nm | 7 +-
xorg-x11-fonts/xorg-x11-fonts.nm | 8 +-
42 files changed, 3013 insertions(+), 304 deletions(-)
create mode 100644 bind/named.logrotate
create mode 100644 bind/named.tmpfiles
create mode 100644 bind/patches/bind-9.3.2-redhat_doc.patch
create mode 100644 bind/patches/bind-9.5-PIE.patch
create mode 100644 bind/patches/bind-9.5-dlz-64bit.patch
create mode 100644 bind/patches/bind-9.5-libidn.patch
create mode 100644 bind/patches/bind-9.5-libidn2.patch
create mode 100644 bind/patches/bind-9.5-libidn3.patch
create mode 100644 bind/patches/bind-9.5-overflow.patch
create mode 100644 bind/patches/bind-9.5-parallel-build.patch
create mode 100644 bind/patches/bind-95-rh452060.patch
create mode 100644 bind/patches/bind-96-dyndb.patch
create mode 100644 bind/patches/bind-96-libtool2.patch
create mode 100644 bind/patches/bind-nonexec.patch
create mode 100644 bind/patches/bind93-rh490837.patch0
create mode 100644 bind/patches/bind95-rh461409.patch
create mode 100644 bind/patches/bind97-dist-pkcs11.patch
create mode 100644 bind/patches/bind97-exportlib.patch
create mode 100644 bind/patches/bind97-rh478718.patch
create mode 100644 bind/patches/bind97-rh570851.patch
create mode 100644 bind/patches/bind97-rh645544.patch
create mode 100644 bind/patches/bind97-rh693982.patch
create mode 100644 bind/patches/bind97-rh699951.patch
create mode 100644 bind/patches/bind97-rh700097.patch
create mode 100644 bind/patches/bind97-rh714049.patch
create mode 100644 bind/patches/bind98-dlz_buildfix.patch
create mode 100644 bind/patches/bind98-rh725741.patch
create mode 100644 bind/patches/bind98-rh735103.patch
create mode 100644 bind/trusted-key.key
delete mode 100644 grub/patches/grub-1.97.1-initramfs.patch
delete mode 100644 grub/patches/grub-1.98-GRUB_DISTRIBUTOR-spaces-fix-1.patch0
create mode 100644 grub/patches/grub-1.99-just-say-linux.patch
Difference in files:
diff --git a/bind/bind.nm b/bind/bind.nm
index 4daec6d..cb40481 100644
--- a/bind/bind.nm
+++ b/bind/bind.nm
@@ -4,7 +4,7 @@
###############################################################################
name = bind
-version = 9.7.2-P3
+version = 9.8.1
release = 1
groups = Networking/Tools
@@ -19,32 +19,191 @@ end
source_dl = ftp://ftp.isc.org/isc/bind/%{version}/
+sources = \
+ bind-9.8.1.tar.gz \
+ bind-config-8.tar.bz2
+
+# Apply patches in a special order.
+patches = \
+ bind-nonexec.patch \
+ bind-9.5-PIE.patch \
+ bind-9.3.2-redhat_doc.patch \
+ bind-96-dyndb.patch \
+ bind98-rh725741.patch \
+ bind-9.5-overflow.patch \
+ bind-9.5-dlz-64bit.patch \
+ bind-9.5-libidn.patch \
+ bind-9.5-libidn2.patch \
+ bind-9.5-libidn3.patch \
+ bind-9.5-parallel-build.patch \
+ bind95-rh461409.patch\
+ bind-96-libtool2.patch \
+ bind-95-rh452060.patch \
+ bind97-dist-pkcs11.patch \
+ bind97-rh478718.patch \
+ bind97-rh570851.patch \
+ bind97-exportlib.patch \
+ bind97-rh645544.patch \
+ bind97-rh699951.patch \
+ bind97-rh693982.patch \
+ bind97-rh700097.patch \
+ bind97-rh714049.patch \
+ bind98-dlz_buildfix.patch \
+ bind98-rh735103.patch
+
build
requires
+ autoconf
+ automake
+ chrpath
db4-devel
+ libtool
+ libcap-devel
+ libidn-devel
+ pkg-config
openssl-devel
end
- build
- ./configure \
- --prefix=/usr \
- --mandir=/usr/share/man
+ configure_options += \
+ --with-libtool \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --enable-threads \
+ --enable-ipv6 \
+ --with-pic \
+ --disable-static \
+ --disable-openssl-version-check \
+ --enable-exportlib \
+ --with-export-libdir=/lib/ \
+ --with-export-includedir=/usr/include/ \
+ --includedir=/usr/include/bind9/ \
+ --with-pkcs11=/usr/lib/pkcs11/PKCS11_API.so \
+ --with-gssapi=yes \
+ --disable-isc-spnego
+
+ prepare
+ cd %{DIR_SRC} && %{MACRO_EXTRACT} %{DIR_DL}/%{thisapp}.tar.gz
+
+ # Create m4 directory.
+ cd %{DIR_APP} && mkdir -pv m4
- make -C lib/dns #%{PARALLELISMFLAGS}
- make -C lib/isc #%{PARALLELISMFLAGS}
- make -C lib/bind9 #%{PARALLELISMFLAGS}
- make -C lib/isccfg #%{PARALLELISMFLAGS}
- make -C lib/lwres #%{PARALLELISMFLAGS}
- make -C bin/dig #%{PARALLELISMFLAGS}
+ # Apply all patches.
+ %{MACRO_PATCHES}
+
+ # Branding.
+ sed -i -e 's/RELEASEVER=\(.*\)/RELEASEVER=\1-%{DISTRO_NAME}-%{version}-%{release}/' version
+
+ # Regenerate build environment
+ libtoolize -c -f
+ aclocal -I m4 --force
+ autoconf -f
end
install
- make -C bin/dig install DESTDIR=%{BUILDROOT}
+ # Compress doc files.
+ gzip -9 doc/rfc/*
+
+ # Create directory layout.
+ mkdir -pv %{BUILDROOT}/usr/lib/bind
+ mkdir -pv %{BUILDROOT}/var/named/{slaves,data,dynamic}
+ mkdir -pv %{BUILDROOT}/usr/share/man/{man1,man5,man8}
+ mkdir -pv %{BUILDROOT}/run/named
+ mkdir -pv %{BUILDROOT}/var/log
+
+ # Create named chroot environment.
+ mkdir -pv %{BUILDROOT}/var/named/chroot/{dev,etc,var}
+ mkdir -pv %{BUILDROOT}/var/named/chroot/var/{log,named,run/named,tmp}
+ mkdir -pv %{BUILDROOT}/var/named/chroot/etc/{pki/dnssec-keys,named}
+ mkdir -pv %{BUILDROOT}/var/named/chroot/usr/lib/bind
+ mkdir -pv %{BUILDROOT}/var/named/chroot/dev/null
+ mkdir -pv %{BUILDROOT}/var/named/chroot/dev/random
+ mkdir -pv %{BUILDROOT}/var/named/chroot/dev/zero
+ mkdir -pv %{BUILDROOT}/var/named/chroot/etc/localtime
+
+ touch %{BUILDROOT}/var/named/chroot/etc/named.conf
+
+ # Run make install
+ make DESTDIR=%{BUILDROOT} install
+
+ # Remove RPATH from libraries.
+ chrpath --delete %{BUILDROOT}/lib*/*export*.so.*
+
+ # Remove unwanted files
+ rm -rvf %{BUILDROOT}/etc/bind.keys
+
+ # Create ghost config files
+ touch %{BUILDROOT}/var/log/named.log
+
+ # Configuration files
+ tar -C %{BUILDROOT} -xaf %{DIR_DL}/bind-config-8.tar.bz2
+ touch %{BUILDROOT}/etc/rndc.key
+ touch %{BUILDROOT}/etc/rndc.conf
+
+ mkdir %{BUILDROOT}/etc/named
+ install -m 644 bind.keys %{BUILDROOT}/etc/named.iscdlv.key
+ install -m 644 %{DIR_SOURCE}/trusted-key.key %{BUILDROOT}/etc/trusted-key.key
+
+ # Recreate symlinks for export libraries
+ rm -rf %{BUILDROOT}/lib/lib*-export.so
+
+ ln -svf ../../lib/libdns-export.so.81 %{BUILDROOT}/usr/lib/libdns-export.so
+ ln -svf ../../lib/libirs-export.so.80 %{BUILDROOT}/usr/lib/libirs-export.so
+ ln -svf ../../lib/libisccfg-export.so.82 %{BUILDROOT}/usr/lib/libisccfg-export.so
+ ln -svf ../../lib/libisc-export.so.83 %{BUILDROOT}/usr/lib/libisc-export.so
end
end
packages
+ package %{name}
+ requires
+ bind-utils
+ bind-chroot
+ end
+
+ prerequires += shadow-utils
+
+ script prein
+ # Create unprivileged user and group.
+ getent group named > /dev/null || groupadd -r named
+ getent passwd named > /dev/null || \
+ useradd -r -g named -d /var/named -s /sbin/nologin \
+ -c "User for bind DNS server" named
+ exit0
+ end
+
+ # XXX Add systemd scriptlet if a service file becomes available
+ end
+
package %{name}-utils
- template MAIN
+ summary = Utilities for querying bind DNS name server.
+ description = %{summary}
+
+ files
+ /usr/bin/dig
+ /usr/bin/host
+ /usr/bin/nslookup
+ /usr/bin/nsupdate
+ /usr/share/man/man1/dig.1*
+ /usr/share/man/man1/host.1*
+ /usr/share/man/man1/nslookup.1*
+ /usr/share/man/man1/nsupdate.1*
+ end
+ end
+
+ package %{name}-chroot
+ summary = Chroot environment for bind DNS servers.
+ description = %{summary}
+
+ files
+ /var/named/chroot
+ end
+ end
+
+ package %{name}-libs
+ template LIBS
+ end
+
+ package %{name}-devel
+ template DEVEL
end
end
diff --git a/bind/named.logrotate b/bind/named.logrotate
new file mode 100644
index 0000000..4ed78cc
--- /dev/null
+++ b/bind/named.logrotate
@@ -0,0 +1,8 @@
+/var/named/data/named.run {
+ missingok
+ su named named
+ create 0644 named named
+ postrotate
+ /sbin/service named reload 2> /dev/null > /dev/null || true
+ endscript
+}
diff --git a/bind/named.tmpfiles b/bind/named.tmpfiles
new file mode 100644
index 0000000..8a7fa49
--- /dev/null
+++ b/bind/named.tmpfiles
@@ -0,0 +1 @@
+d /var/run/named 0755 named named -
diff --git a/bind/patches/bind-9.3.2-redhat_doc.patch b/bind/patches/bind-9.3.2-redhat_doc.patch
new file mode 100644
index 0000000..791b95f
--- /dev/null
+++ b/bind/patches/bind-9.3.2-redhat_doc.patch
@@ -0,0 +1,66 @@
+--- bind-9.4.0/bin/named/named.8.redhat_doc 2007-01-30 01:23:44.000000000 +0100
++++ bind-9.4.0/bin/named/named.8 2007-03-12 15:39:19.000000000 +0100
+@@ -205,6 +205,63 @@
+ \fI/var/run/named/named.pid\fR
+ .RS 4
+ The default process\-id file.
++.PP
++.SH "NOTES"
++.PP
++.TP
++\fBRed Hat SELinux BIND Security Profile:\fR
++.PP
++By default, Red Hat ships BIND with the most secure SELinux policy
++that will not prevent normal BIND operation and will prevent exploitation
++of all known BIND security vulnerabilities . See the selinux(8) man page
++for information about SElinux.
++.PP
++It is not necessary to run named in a chroot environment if the Red Hat
++SELinux policy for named is enabled. When enabled, this policy is far
++more secure than a chroot environment. Users are recommended to enable
++SELinux and remove the bind-chroot package.
++.PP
++With this extra security comes some restrictions:
++.PP
++By default, the SELinux policy does not allow named to write any master
++zone database files. Only the root user may create files in the $ROOTDIR/var/named
++zone database file directory (the options { "directory" } option), where
++$ROOTDIR is set in /etc/sysconfig/named.
++.PP
++The "named" group must be granted read privelege to
++these files in order for named to be enabled to read them.
++.PP
++Any file created in the zone database file directory is automatically assigned
++the SELinux file context named_zone_t .
++.PP
++By default, SELinux prevents any role from modifying named_zone_t files; this
++means that files in the zone database directory cannot be modified by dynamic
++DNS (DDNS) updates or zone transfers.
++.PP
++The Red Hat BIND distribution and SELinux policy creates three directories where
++named is allowed to create and modify files: /var/named/slaves, /var/named/dynamic
++/var/named/data. By placing files you want named to modify, such as
++slave or DDNS updateable zone files and database / statistics dump files in
++these directories, named will work normally and no further operator action is
++required. Files in these directories are automatically assigned the 'named_cache_t'
++file context, which SELinux allows named to write.
++.PP
++\fBRed Hat BIND SDB support:\fR
++.PP
++Red Hat ships named with compiled in Simplified Database Backend modules that ISC
++provides in the "contrib/sdb" directory. Install bind-sdb package if you want use them
++.PP
++The SDB modules for LDAP, PostGreSQL, DirDB and SQLite are compiled into named-sdb.
++.PP
++See the documentation for the various SDB modules in /usr/share/doc/bind-sdb-*/ .
++.br
++.PP
++\fBRed Hat system-config-bind:\fR
++.PP
++Red Hat provides the system-config-bind GUI to configure named.conf and zone
++database files. Run the "system-config-bind" command and access the manual
++by selecting the Help menu.
++.PP
+ .RE
+ .SH "SEE ALSO"
+ .PP
diff --git a/bind/patches/bind-9.5-PIE.patch b/bind/patches/bind-9.5-PIE.patch
new file mode 100644
index 0000000..a525b9b
--- /dev/null
+++ b/bind/patches/bind-9.5-PIE.patch
@@ -0,0 +1,27 @@
+--- bind-9.5.0b2/bin/named/Makefile.in.pie 2008-02-11 17:21:47.000000000 +0100
++++ bind-9.5.0b2/bin/named/Makefile.in 2008-02-11 17:22:10.000000000 +0100
+@@ -100,8 +100,12 @@ HTMLPAGES = named.html lwresd.html named
+
+ MANOBJS = ${MANPAGES} ${HTMLPAGES}
+
++EXT_CFLAGS = -fpie
++
+ @BIND9_MAKE_RULES@
+
++LDFLAGS += -pie -Wl,-z,relro,-z,now,-z,nodlopen,-z,noexecstack
++
+ main.@O@: main.c
+ ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
+ -DVERSION=\"${VERSION}\" \
+diff -up bind-9.5.0b2/bin/named/unix/Makefile.in.pie bind-9.5.0b2/bin/named/unix/Makefile.in
+--- bind-9.5.0b2/bin/named/unix/Makefile.in.pie 2008-02-11 17:22:21.000000000 +0100
++++ bind-9.5.0b2/bin/named/unix/Makefile.in 2008-02-11 17:23:00.000000000 +0100
+@@ -19,6 +19,8 @@ srcdir = @srcdir@
+ VPATH = @srcdir@
+ top_srcdir = @top_srcdir@
+
++EXT_CFLAGS = -fpie
++
+ @BIND9_MAKE_INCLUDES@
+
+ CINCLUDES = -I${srcdir}/include -I${srcdir}/../include \
diff --git a/bind/patches/bind-9.5-dlz-64bit.patch b/bind/patches/bind-9.5-dlz-64bit.patch
new file mode 100644
index 0000000..3e06577
--- /dev/null
+++ b/bind/patches/bind-9.5-dlz-64bit.patch
@@ -0,0 +1,70 @@
+diff -up bind-9.5.1b1/contrib/dlz/config.dlz.in.64bit bind-9.5.1b1/contrib/dlz/config.dlz.in
+--- bind-9.5.1b1/contrib/dlz/config.dlz.in.64bit 2008-06-17 06:03:31.000000000 +0200
++++ bind-9.5.1b1/contrib/dlz/config.dlz.in 2008-07-11 12:08:43.000000000 +0200
+@@ -17,6 +17,13 @@
+ #
+ dlzdir='${DLZ_DRIVER_DIR}'
+
++AC_MSG_CHECKING([for target libdir])
++AC_RUN_IFELSE([int main(void) {exit((sizeof(void *) == 8) ? 0 : 1);}],
++ [target_lib=lib64],
++ [target_lib=lib],
++)
++AC_MSG_RESULT(["$target_lib"])
++
+ #
+ # Private autoconf macro to simplify configuring drivers:
+ #
+@@ -135,9 +142,9 @@ then
+ then
+ use_dlz_mysql=$d
+ mysql_include=$d/include/mysql
+- if test -d $d/lib/mysql
++ if test -d $d/${target_lib}/mysql
+ then
+- mysql_lib=$d/lib/mysql
++ mysql_lib=$d/${target_lib}/mysql
+ else
+ mysql_lib=$d/lib
+ fi
+@@ -274,11 +281,11 @@ case "$use_dlz_bdb" in
+ bdb_libnames="db42 db-4.2 db41 db-4.1 db"
+ for d in $bdb_libnames
+ do
+- if test -f "$dd/lib/lib${d}.so"
++ if test -f "$dd/${target_lib}/lib${d}.so"
+ then
+ if test "$dd" != "/usr"
+ then
+- dlz_bdb_libs="-L${dd}/lib "
++ dlz_bdb_libs="-L${dd}/${target_lib} "
+ else
+ dlz_bdb_libs=""
+ fi
+@@ -383,7 +390,7 @@ case "$use_dlz_ldap" in
+ *)
+ DLZ_ADD_DRIVER(LDAP, dlz_ldap_driver,
+ [-I$use_dlz_ldap/include],
+- [-L$use_dlz_ldap/lib -lldap -llber])
++ [-L$use_dlz_ldap/${target_lib} -lldap -llber])
+
+ AC_MSG_RESULT(
+ [using LDAP from $use_dlz_ldap/lib and $use_dlz_ldap/include])
+@@ -407,7 +414,7 @@ then
+ odbcdirs="/usr /usr/local /usr/pkg"
+ for d in $odbcdirs
+ do
+- if test -f $d/include/sql.h -a -f $d/lib/libodbc.a
++ if test -f $d/include/sql.h -a -f $d/${target_lib}/libodbc.a
+ then
+ use_dlz_odbc=$d
+ break
+@@ -427,7 +434,7 @@ case "$use_dlz_odbc" in
+ *)
+ DLZ_ADD_DRIVER(ODBC, dlz_odbc_driver,
+ [-I$use_dlz_odbc/include],
+- [-L$use_dlz_odbc/lib -lodbc])
++ [-L$use_dlz_odbc/${target_lib} -lodbc])
+
+ AC_MSG_RESULT([using ODBC from $use_dlz_odbc])
+ ;;
diff --git a/bind/patches/bind-9.5-libidn.patch b/bind/patches/bind-9.5-libidn.patch
new file mode 100644
index 0000000..fccfa61
--- /dev/null
+++ b/bind/patches/bind-9.5-libidn.patch
@@ -0,0 +1,270 @@
+diff -up bind-9.7.0b1/bin/dig/dighost.c.libidn bind-9.7.0b1/bin/dig/dighost.c
+--- bind-9.7.0b1/bin/dig/dighost.c.libidn 2009-09-16 01:48:09.000000000 +0200
++++ bind-9.7.0b1/bin/dig/dighost.c 2009-10-20 10:49:26.719056220 +0200
+@@ -44,6 +44,11 @@
+ #include <idn/api.h>
+ #endif
+
++#ifdef WITH_LIBIDN
++#include <stringprep.h>
++#include <idna.h>
++#endif
++
+ #include <dns/byaddr.h>
+ #ifdef DIG_SIGCHASE
+ #include <dns/dnssec.h>
+@@ -153,6 +158,14 @@ static void idn_check_result(idn_result
+ int idnoptions = 0;
+ #endif
+
++#ifdef WITH_LIBIDN
++static isc_result_t libidn_locale_to_utf8 (const char* from, char **to);
++static isc_result_t libidn_utf8_to_ascii (const char* from, char *to);
++static isc_result_t output_filter (isc_buffer_t *buffer,
++ unsigned int used_org,
++ isc_boolean_t absolute);
++#endif
++
+ /*%
+ * Exit Codes:
+ *
+@@ -1184,6 +1197,9 @@ setup_system(void) {
+ dig_searchlist_t *domain = NULL;
+ lwres_result_t lwresult;
+ unsigned int lwresflags;
++#ifdef WITH_LIBIDN
++ isc_result_t result;
++#endif
+
+ debug("setup_system()");
+
+@@ -1242,8 +1258,15 @@ setup_system(void) {
+
+ #ifdef WITH_IDN
+ initialize_idn();
++
++#endif
++#ifdef WITH_LIBIDN
++ result = dns_name_settotextfilter(output_filter);
++ check_result(result, "dns_name_settotextfilter");
++#ifdef HAVE_SETLOCALE
++ setlocale (LC_ALL, "");
++#endif
+ #endif
+-
+ if (keyfile[0] != 0)
+ setup_file_key();
+ else if (keysecret[0] != 0)
+@@ -1957,12 +1980,18 @@ setup_lookup(dig_lookup_t *lookup) {
+ idn_result_t mr;
+ char utf8_textname[MXNAME], utf8_origin[MXNAME], idn_textname[MXNAME];
+ #endif
++#ifdef WITH_LIBIDN
++ char *utf8_str = NULL, utf8_name[MXNAME], ascii_name[MXNAME];
++#endif
+
+ #ifdef WITH_IDN
+ result = dns_name_settotextfilter(output_filter);
+ check_result(result, "dns_name_settotextfilter");
+ #endif
+-
++#ifdef WITH_LIBIDN
++ result = dns_name_settotextfilter (output_filter);
++ check_result(result, "dns_name_settotextfilter");
++#endif
+ REQUIRE(lookup != NULL);
+ INSIST(!free_now);
+
+@@ -1999,6 +2028,16 @@ setup_lookup(dig_lookup_t *lookup) {
+ mr = idn_encodename(IDN_LOCALCONV | IDN_DELIMMAP, lookup->textname,
+ utf8_textname, sizeof(utf8_textname));
+ idn_check_result(mr, "convert textname to UTF-8");
++#elif defined (WITH_LIBIDN)
++ result = libidn_locale_to_utf8 (lookup->textname, &utf8_str);
++ check_result (result, "converting textname to UTF-8");
++ len = strlen (utf8_str);
++ if (len < MXNAME) {
++ (void) strcpy (utf8_name, utf8_str);
++ } else {
++ fatal ("Too long name");
++ }
++ isc_mem_free (mctx, utf8_str);
+ #endif
+
+ /*
+@@ -2018,6 +2057,15 @@ setup_lookup(dig_lookup_t *lookup) {
+ lookup->origin = ISC_LIST_HEAD(search_list);
+ lookup->need_search = ISC_FALSE;
+ }
++#elif defined (WITH_LIBIDN)
++ if ((count_dots(utf8_name) >= ndots) || !usesearch) {
++ lookup->origin = NULL; /* Force abs lookup */
++ lookup->done_as_is = ISC_TRUE;
++ lookup->need_search = usesearch;
++ } else if (lookup->origin == NULL && usesearch) {
++ lookup->origin = ISC_LIST_HEAD(search_list);
++ lookup->need_search = ISC_FALSE;
++ }
+ #else
+ if ((count_dots(lookup->textname) >= ndots) || !usesearch) {
+ lookup->origin = NULL; /* Force abs lookup */
+@@ -2044,6 +2092,20 @@ setup_lookup(dig_lookup_t *lookup) {
+ IDN_IDNCONV | IDN_LENCHECK, utf8_textname,
+ idn_textname, sizeof(idn_textname));
+ idn_check_result(mr, "convert UTF-8 textname to IDN encoding");
++#elif defined (WITH_LIBIDN)
++ if (lookup->origin != NULL) {
++ result = libidn_locale_to_utf8 (lookup->origin->origin, &utf8_str);
++ check_result (result, "convert origin to UTF-8");
++ if (len + strlen (utf8_str) + 1 < MXNAME) {
++ utf8_name[len++] = '.';
++ (void) strcpy (utf8_name + len, utf8_str);
++ } else {
++ fatal ("Too long name + origin");
++ }
++ isc_mem_free (mctx, utf8_str);
++ }
++
++ result = libidn_utf8_to_ascii (utf8_name, ascii_name);
+ #else
+ if (lookup->origin != NULL) {
+ debug("trying origin %s", lookup->origin->origin);
+@@ -2099,6 +2161,13 @@ setup_lookup(dig_lookup_t *lookup) {
+ result = dns_name_fromtext(lookup->name, &b,
+ dns_rootname, 0,
+ &lookup->namebuf);
++#elif defined (WITH_LIBIDN)
++ len = strlen (ascii_name);
++ isc_buffer_init(&b, ascii_name, len);
++ isc_buffer_add(&b, len);
++ result = dns_name_fromtext(lookup->name, &b,
++ dns_rootname, 0,
++ &lookup->namebuf);
+ #else
+ len = strlen(lookup->textname);
+ isc_buffer_init(&b, lookup->textname, len);
+@@ -3617,7 +3686,7 @@ destroy_libs(void) {
+ void * ptr;
+ dig_message_t *chase_msg;
+ #endif
+-#ifdef WITH_IDN
++#if defined (WITH_IDN) || defined (WITH_LIBIDN)
+ isc_result_t result;
+ #endif
+
+@@ -3656,6 +3725,10 @@ destroy_libs(void) {
+ result = dns_name_settotextfilter(NULL);
+ check_result(result, "dns_name_settotextfilter");
+ #endif
++#ifdef WITH_LIBIDN
++ result = dns_name_settotextfilter (NULL);
++ check_result(result, "clearing dns_name_settotextfilter");
++#endif
+ dns_name_destroy();
+
+ if (commctx != NULL) {
+@@ -3834,6 +3907,79 @@ idn_check_result(idn_result_t r, const c
+ }
+ }
+ #endif /* WITH_IDN */
++#ifdef WITH_LIBIDN
++/* If stringprep_locale_to_utf8 fails simple copy string */
++static isc_result_t
++libidn_locale_to_utf8 (const char *from, char **to) {
++ char *utf8_str;
++
++ utf8_str = stringprep_locale_to_utf8 (from);
++ if (utf8_str == NULL) {
++ *to = isc_mem_allocate (mctx, strlen (from) + 1);
++ if (*to == NULL)
++ return (ISC_R_NOMEMORY);
++ (void) strcpy (*to, from);
++ } else {
++ *to = isc_mem_allocate (mctx, strlen (utf8_str) + 1);
++ if (*to == NULL)
++ return (ISC_R_NOMEMORY);
++ (void) strcpy (*to, utf8_str);
++ free (utf8_str);
++ }
++ return (ISC_R_SUCCESS);
++}
++static isc_result_t
++libidn_utf8_to_ascii (const char *from, char *to) {
++ char *ascii;
++
++ if (idna_to_ascii_8z (from, &ascii, 0) != IDNA_SUCCESS)
++ return (ISC_R_FAILURE);
++
++ (void) strcpy (to, ascii);
++ free (ascii);
++ return (ISC_R_SUCCESS);
++}
++/* based on idnkit's code*/
++static isc_result_t
++output_filter (isc_buffer_t *buffer, unsigned int used_org,
++ isc_boolean_t absolute) {
++ char tmp1[MXNAME], *tmp2;
++ size_t fromlen, tolen;
++ isc_boolean_t end_with_dot;
++
++ fromlen = isc_buffer_usedlength(buffer) - used_org;
++ if (fromlen >= MXNAME)
++ return (ISC_R_SUCCESS);
++ memcpy(tmp1, (char *)isc_buffer_base(buffer) + used_org, fromlen);
++ end_with_dot = (tmp1[fromlen - 1] == '.') ? ISC_TRUE : ISC_FALSE;
++ if (absolute && !end_with_dot) {
++ fromlen++;
++ if (fromlen >= MXNAME)
++ return (ISC_R_SUCCESS);
++ tmp1[fromlen - 1] = '.';
++ }
++ tmp1[fromlen] = '\0';
++
++ if (idna_to_unicode_lzlz (tmp1, &tmp2, 0) != IDNA_SUCCESS)
++ return (ISC_R_SUCCESS);
++
++ (void) strcpy (tmp1, tmp2);
++ free (tmp2);
++
++ tolen = strlen(tmp1);
++ if (absolute && !end_with_dot && tmp1[tolen - 1] == '.')
++ tolen--;
++
++ if (isc_buffer_length(buffer) < used_org + tolen)
++ return (ISC_R_NOSPACE);
++
++ isc_buffer_subtract(buffer, isc_buffer_usedlength(buffer) - used_org);
++ memcpy(isc_buffer_used(buffer), tmp1, tolen);
++ isc_buffer_add(buffer, tolen);
++
++ return (ISC_R_SUCCESS);
++}
++#endif /* WITH_LIBIDN*/
+
+ #ifdef DIG_SIGCHASE
+ void
+diff -up bind-9.7.0b1/bin/dig/Makefile.in.libidn bind-9.7.0b1/bin/dig/Makefile.in
+--- bind-9.7.0b1/bin/dig/Makefile.in.libidn 2009-09-22 10:47:55.000000000 +0200
++++ bind-9.7.0b1/bin/dig/Makefile.in 2009-10-20 10:50:06.201543709 +0200
+@@ -46,10 +46,10 @@ DEPLIBS = ${DNSDEPLIBS} ${BIND9DEPLIBS}
+ ${LWRESDEPLIBS}
+
+ LIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
+- ${ISCLIBS} @IDNLIBS@ @LIBS@
++ ${ISCLIBS} @IDNLIBS@ @LIBS@ -lidn
+
+ NOSYMLIBS = ${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
+- ${ISCNOSYMLIBS} @IDNLIBS@ @LIBS@
++ ${ISCNOSYMLIBS} @IDNLIBS@ @LIBS@ -lidn
+
+ SUBDIRS =
+
+@@ -67,6 +67,8 @@ HTMLPAGES = dig.html host.html nslookup.
+
+ MANOBJS = ${MANPAGES} ${HTMLPAGES}
+
++EXT_CFLAGS = -DWITH_LIBIDN
++
+ @BIND9_MAKE_RULES@
+
+ dig@EXEEXT@: dig.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS}
diff --git a/bind/patches/bind-9.5-libidn2.patch b/bind/patches/bind-9.5-libidn2.patch
new file mode 100644
index 0000000..785b6eb
--- /dev/null
+++ b/bind/patches/bind-9.5-libidn2.patch
@@ -0,0 +1,221 @@
+diff -up bind-9.5.0b1/bin/dig/dighost.c.libidn2 bind-9.5.0b1/bin/dig/dighost.c
+--- bind-9.5.0b1/bin/dig/dighost.c.libidn2 2007-12-10 13:12:26.000000000 +0100
++++ bind-9.5.0b1/bin/dig/dighost.c 2007-12-10 14:21:09.000000000 +0100
+@@ -153,7 +153,7 @@ int idnoptions = 0;
+ #endif
+
+ #ifdef WITH_LIBIDN
+-static isc_result_t libidn_locale_to_utf8 (const char* from, char **to);
++static isc_result_t libidn_locale_to_utf8 (const char* from, char *to);
+ static isc_result_t libidn_utf8_to_ascii (const char* from, char *to);
+ static isc_result_t output_filter (isc_buffer_t *buffer,
+ unsigned int used_org,
+@@ -1764,17 +1764,13 @@ setup_lookup(dig_lookup_t *lookup) {
+ char utf8_textname[MXNAME], utf8_origin[MXNAME], idn_textname[MXNAME];
+ #endif
+ #ifdef WITH_LIBIDN
+- char *utf8_str = NULL, utf8_name[MXNAME], ascii_name[MXNAME];
++ char utf8_str[MXNAME], utf8_name[MXNAME], ascii_name[MXNAME];
+ #endif
+
+-#ifdef WITH_IDN
++#if defined (WITH_IDN) || defined (WITH_LIBIDN)
+ result = dns_name_settotextfilter(output_filter);
+ check_result(result, "dns_name_settotextfilter");
+ #endif
+-#ifdef WITH_LIBIDN
+- result = dns_name_settotextfilter (output_filter);
+- check_result(result, "dns_name_settotextfilter");
+-#endif
+ REQUIRE(lookup != NULL);
+ INSIST(!free_now);
+
+@@ -1812,15 +1808,13 @@ setup_lookup(dig_lookup_t *lookup) {
+ utf8_textname, sizeof(utf8_textname));
+ idn_check_result(mr, "convert textname to UTF-8");
+ #elif defined (WITH_LIBIDN)
+- result = libidn_locale_to_utf8 (lookup->textname, &utf8_str);
+- check_result (result, "converting textname to UTF-8");
++ result = libidn_locale_to_utf8 (lookup->textname, utf8_str);
++ check_result (result, "convert textname to UTF-8");
+ len = strlen (utf8_str);
+- if (len < MXNAME) {
++ if (len < MXNAME)
+ (void) strcpy (utf8_name, utf8_str);
+- } else {
++ else
+ fatal ("Too long name");
+- }
+- isc_mem_free (mctx, utf8_str);
+ #endif
+
+ /*
+@@ -1833,24 +1827,11 @@ setup_lookup(dig_lookup_t *lookup) {
+ if (lookup->new_search) {
+ #ifdef WITH_IDN
+ if ((count_dots(utf8_textname) >= ndots) || !usesearch) {
+- lookup->origin = NULL; /* Force abs lookup */
+- lookup->done_as_is = ISC_TRUE;
+- lookup->need_search = usesearch;
+- } else if (lookup->origin == NULL && usesearch) {
+- lookup->origin = ISC_LIST_HEAD(search_list);
+- lookup->need_search = ISC_FALSE;
+- }
+ #elif defined (WITH_LIBIDN)
+ if ((count_dots(utf8_name) >= ndots) || !usesearch) {
+- lookup->origin = NULL; /* Force abs lookup */
+- lookup->done_as_is = ISC_TRUE;
+- lookup->need_search = usesearch;
+- } else if (lookup->origin == NULL && usesearch) {
+- lookup->origin = ISC_LIST_HEAD(search_list);
+- lookup->need_search = ISC_FALSE;
+- }
+ #else
+ if ((count_dots(lookup->textname) >= ndots) || !usesearch) {
++#endif
+ lookup->origin = NULL; /* Force abs lookup */
+ lookup->done_as_is = ISC_TRUE;
+ lookup->need_search = usesearch;
+@@ -1858,7 +1839,6 @@ setup_lookup(dig_lookup_t *lookup) {
+ lookup->origin = ISC_LIST_HEAD(search_list);
+ lookup->need_search = ISC_FALSE;
+ }
+-#endif
+ }
+
+ #ifdef WITH_IDN
+@@ -1877,15 +1857,12 @@ setup_lookup(dig_lookup_t *lookup) {
+ idn_check_result(mr, "convert UTF-8 textname to IDN encoding");
+ #elif defined (WITH_LIBIDN)
+ if (lookup->origin != NULL) {
+- result = libidn_locale_to_utf8 (lookup->origin->origin, &utf8_str);
++ result = libidn_locale_to_utf8 (lookup->origin->origin, utf8_str);
+ check_result (result, "convert origin to UTF-8");
+- if (len + strlen (utf8_str) + 1 < MXNAME) {
+- utf8_name[len++] = '.';
++ if (len + strlen (utf8_str) < MXNAME)
+ (void) strcpy (utf8_name + len, utf8_str);
+- } else {
++ else
+ fatal ("Too long name + origin");
+- }
+- isc_mem_free (mctx, utf8_str);
+ }
+
+ result = libidn_utf8_to_ascii (utf8_name, ascii_name);
+@@ -3600,76 +3577,85 @@ idn_check_result(idn_result_t r, const c
+ }
+ #endif /* WITH_IDN */
+ #ifdef WITH_LIBIDN
+-/* If stringprep_locale_to_utf8 fails simple copy string */
+ static isc_result_t
+-libidn_locale_to_utf8 (const char *from, char **to) {
++libidn_locale_to_utf8 (const char *from, char *to) {
+ char *utf8_str;
+
++ debug ("libidn_locale_to_utf8");
+ utf8_str = stringprep_locale_to_utf8 (from);
+- if (utf8_str == NULL) {
+- *to = isc_mem_allocate (mctx, strlen (from) + 1);
+- if (*to == NULL)
+- return (ISC_R_NOMEMORY);
+- (void) strcpy (*to, from);
+- } else {
+- *to = isc_mem_allocate (mctx, strlen (utf8_str) + 1);
+- if (*to == NULL)
+- return (ISC_R_NOMEMORY);
+- (void) strcpy (*to, utf8_str);
++ if (utf8_str != NULL) {
++ (void) strcpy (to, utf8_str);
+ free (utf8_str);
++ return ISC_R_SUCCESS;
+ }
+- return (ISC_R_SUCCESS);
++
++ debug ("libidn_locale_to_utf8: failure");
++ return ISC_R_FAILURE;
+ }
+ static isc_result_t
+ libidn_utf8_to_ascii (const char *from, char *to) {
+ char *ascii;
++ int iresult;
+
+- if (idna_to_ascii_8z (from, &ascii, 0) != IDNA_SUCCESS)
+- return (ISC_R_FAILURE);
++ debug ("libidn_utf8_to_ascii");
++ iresult = idna_to_ascii_8z (from, &ascii, 0);
++ if (iresult != IDNA_SUCCESS) {
++ debug ("idna_to_ascii_8z: %s", idna_strerror (iresult));
++ return ISC_R_FAILURE;
++ }
+
+ (void) strcpy (to, ascii);
+ free (ascii);
+- return (ISC_R_SUCCESS);
++ return ISC_R_SUCCESS;
+ }
+-/* based on idnkit's code*/
++
+ static isc_result_t
+ output_filter (isc_buffer_t *buffer, unsigned int used_org,
+ isc_boolean_t absolute) {
++
+ char tmp1[MXNAME], *tmp2;
+ size_t fromlen, tolen;
+ isc_boolean_t end_with_dot;
++ int iresult;
++
++ debug ("output_filter");
+
+- fromlen = isc_buffer_usedlength(buffer) - used_org;
++ fromlen = isc_buffer_usedlength (buffer) - used_org;
+ if (fromlen >= MXNAME)
+- return (ISC_R_SUCCESS);
+- memcpy(tmp1, (char *)isc_buffer_base(buffer) + used_org, fromlen);
++ return ISC_R_SUCCESS;
++ memcpy (tmp1, (char *) isc_buffer_base (buffer) + used_org, fromlen);
+ end_with_dot = (tmp1[fromlen - 1] == '.') ? ISC_TRUE : ISC_FALSE;
+ if (absolute && !end_with_dot) {
+ fromlen++;
+ if (fromlen >= MXNAME)
+- return (ISC_R_SUCCESS);
++ return ISC_R_SUCCESS;
+ tmp1[fromlen - 1] = '.';
+ }
+ tmp1[fromlen] = '\0';
+
+- if (idna_to_unicode_lzlz (tmp1, &tmp2, 0) != IDNA_SUCCESS)
+- return (ISC_R_SUCCESS);
++ iresult = idna_to_unicode_8z8z (tmp1, &tmp2, 0);
++ if (iresult != IDNA_SUCCESS) {
++ debug ("output_filter: %s", idna_strerror (iresult));
++ return ISC_R_SUCCESS;
++ }
+
+ (void) strcpy (tmp1, tmp2);
+ free (tmp2);
+
+- tolen = strlen(tmp1);
++ tolen = strlen (tmp1);
+ if (absolute && !end_with_dot && tmp1[tolen - 1] == '.')
+ tolen--;
+
+- if (isc_buffer_length(buffer) < used_org + tolen)
+- return (ISC_R_NOSPACE);
++ if (isc_buffer_length (buffer) < used_org + tolen)
++ return ISC_R_NOSPACE;
++
++ debug ("%s", tmp1);
+
+- isc_buffer_subtract(buffer, isc_buffer_usedlength(buffer) - used_org);
+- memcpy(isc_buffer_used(buffer), tmp1, tolen);
+- isc_buffer_add(buffer, tolen);
++ isc_buffer_subtract (buffer, isc_buffer_usedlength (buffer) - used_org);
++ memcpy (isc_buffer_used (buffer), tmp1, tolen);
++ isc_buffer_add (buffer, tolen);
+
+- return (ISC_R_SUCCESS);
++ return ISC_R_SUCCESS;
+ }
+ #endif /* WITH_LIBIDN*/
+
diff --git a/bind/patches/bind-9.5-libidn3.patch b/bind/patches/bind-9.5-libidn3.patch
new file mode 100644
index 0000000..3fd5573
--- /dev/null
+++ b/bind/patches/bind-9.5-libidn3.patch
@@ -0,0 +1,21 @@
+diff -up bind-9.5.0b1/bin/dig/dighost.c.libidn3 bind-9.5.0b1/bin/dig/dighost.c
+--- bind-9.5.0b1/bin/dig/dighost.c.libidn3 2007-12-20 13:24:27.000000000 +0100
++++ bind-9.5.0b1/bin/dig/dighost.c 2007-12-20 13:27:10.000000000 +0100
+@@ -1859,10 +1859,13 @@ setup_lookup(dig_lookup_t *lookup) {
+ if (lookup->origin != NULL) {
+ result = libidn_locale_to_utf8 (lookup->origin->origin, utf8_str);
+ check_result (result, "convert origin to UTF-8");
+- if (len + strlen (utf8_str) < MXNAME)
+- (void) strcpy (utf8_name + len, utf8_str);
+- else
+- fatal ("Too long name + origin");
++ if (len > 0 && utf8_name[len - 1] != '.') {
++ utf8_name[len++] = '.';
++ if (len + strlen (utf8_str) < MXNAME)
++ (void) strcpy (utf8_name + len, utf8_str);
++ else
++ fatal ("Too long name + origin");
++ }
+ }
+
+ result = libidn_utf8_to_ascii (utf8_name, ascii_name);
diff --git a/bind/patches/bind-9.5-overflow.patch b/bind/patches/bind-9.5-overflow.patch
new file mode 100644
index 0000000..34b7bed
--- /dev/null
+++ b/bind/patches/bind-9.5-overflow.patch
@@ -0,0 +1,24 @@
+diff -up bind-9.5.0a5/lib/isc/pthreads/condition.c.overflow bind-9.5.0a5/lib/isc/pthreads/condition.c
+--- bind-9.5.0a5/lib/isc/pthreads/condition.c.overflow 2007-07-17 07:53:59.000000000 +0200
++++ bind-9.5.0a5/lib/isc/pthreads/condition.c 2007-07-17 07:55:08.000000000 +0200
+@@ -43,7 +43,7 @@ isc_condition_waituntil(isc_condition_t
+ * POSIX defines a timespec's tv_sec as time_t.
+ */
+ result = isc_time_secondsastimet(t, &ts.tv_sec);
+- if (result != ISC_R_SUCCESS)
++ if (result != ISC_R_RANGE && result != ISC_R_SUCCESS)
+ return (result);
+
+ /*!
+diff -up bind-9.5.0a5/lib/isc/unix/time.c.overflow bind-9.5.0a5/lib/isc/unix/time.c
+--- bind-9.5.0a5/lib/isc/unix/time.c.overflow 2007-02-14 01:27:27.000000000 +0100
++++ bind-9.5.0a5/lib/isc/unix/time.c 2007-07-17 07:53:08.000000000 +0200
+@@ -379,6 +379,9 @@ isc_time_secondsastimet(const isc_time_t
+ * (Let's hope the compiler got the actual test right.)
+ */
+ UNUSED(i);
++
++ /* Means that t->seconds > maximum value in time_t and we have int time_t */
++ seconds = INT_MAX;
+ return (ISC_R_RANGE);
+ }
diff --git a/bind/patches/bind-9.5-parallel-build.patch b/bind/patches/bind-9.5-parallel-build.patch
new file mode 100644
index 0000000..53e34ca
--- /dev/null
+++ b/bind/patches/bind-9.5-parallel-build.patch
@@ -0,0 +1,14 @@
+diff -up bind-9.5.0b1/lib/dns/Makefile.in.parallel bind-9.5.0b1/lib/dns/Makefile.in
+--- bind-9.5.0b1/lib/dns/Makefile.in.parallel 2008-01-17 18:27:38.000000000 +0100
++++ bind-9.5.0b1/lib/dns/Makefile.in 2008-01-17 18:27:45.000000000 +0100
+@@ -19,10 +19,6 @@ srcdir = @srcdir@
+ VPATH = @srcdir@
+ top_srcdir = @top_srcdir@
+
+-# Attempt to disable parallel processing.
+-.NOTPARALLEL:
+-.NO_PARALLEL:
+-
+ @BIND9_VERSION@
+
+ @LIBDNS_API@
diff --git a/bind/patches/bind-95-rh452060.patch b/bind/patches/bind-95-rh452060.patch
new file mode 100644
index 0000000..58808b0
--- /dev/null
+++ b/bind/patches/bind-95-rh452060.patch
@@ -0,0 +1,40 @@
+diff -up bind-9.5.0-P2/bin/dig/dighost.c.rh452060 bind-9.5.0-P2/bin/dig/dighost.c
+--- bind-9.5.0-P2/bin/dig/dighost.c.rh452060 2008-12-01 22:30:01.000000000 +0100
++++ bind-9.5.0-P2/bin/dig/dighost.c 2008-12-01 22:30:07.000000000 +0100
+@@ -1280,6 +1280,12 @@ clear_query(dig_query_t *query) {
+
+ debug("clear_query(%p)", query);
+
++ if (query->waiting_senddone) {
++ debug("send_done not yet called");
++ query->pending_free = ISC_TRUE;
++ return;
++ }
++
+ lookup = query->lookup;
+
+ if (lookup->current_query == query)
+@@ -1301,10 +1307,7 @@ clear_query(dig_query_t *query) {
+ isc_mempool_put(commctx, query->recvspace);
+ isc_buffer_invalidate(&query->recvbuf);
+ isc_buffer_invalidate(&query->lengthbuf);
+- if (query->waiting_senddone)
+- query->pending_free = ISC_TRUE;
+- else
+- isc_mem_free(mctx, query);
++ isc_mem_free(mctx, query);
+ }
+
+ /*%
+@@ -2175,9 +2178,9 @@ send_done(isc_task_t *_task, isc_event_t
+ isc_event_free(&event);
+
+ if (query->pending_free)
+- isc_mem_free(mctx, query);
++ clear_query(query);
+
+- check_if_done();
++ check_next_lookup(l);
+ UNLOCK_LOOKUP;
+ }
+
diff --git a/bind/patches/bind-96-dyndb.patch b/bind/patches/bind-96-dyndb.patch
new file mode 100644
index 0000000..176be49
--- /dev/null
+++ b/bind/patches/bind-96-dyndb.patch
@@ -0,0 +1,722 @@
+diff -up bind-9.8.1rc1/bin/named/main.c.dyndb bind-9.8.1rc1/bin/named/main.c
+--- bind-9.8.1rc1/bin/named/main.c.dyndb 2011-03-11 07:47:00.000000000 +0100
++++ bind-9.8.1rc1/bin/named/main.c 2011-08-31 14:25:02.244088457 +0200
+@@ -45,6 +45,7 @@
+ #include <isccc/result.h>
+
+ #include <dns/dispatch.h>
++#include <dns/dynamic_db.h>
+ #include <dns/name.h>
+ #include <dns/result.h>
+ #include <dns/view.h>
+@@ -884,6 +885,8 @@ setup(void) {
+
+ static void
+ cleanup(void) {
++ dns_dynamic_db_cleanup(ISC_TRUE);
++
+ destroy_managers();
+
+ ns_server_destroy(&ns_g_server);
+diff -up bind-9.8.1rc1/bin/named/server.c.dyndb bind-9.8.1rc1/bin/named/server.c
+--- bind-9.8.1rc1/bin/named/server.c.dyndb 2011-08-02 06:58:45.000000000 +0200
++++ bind-9.8.1rc1/bin/named/server.c 2011-08-31 14:29:04.261071645 +0200
+@@ -61,6 +61,7 @@
+ #include <dns/db.h>
+ #include <dns/dispatch.h>
+ #include <dns/dlz.h>
++#include <dns/dynamic_db.h>
+ #include <dns/dns64.h>
+ #include <dns/forward.h>
+ #include <dns/journal.h>
+@@ -1151,6 +1152,72 @@ configure_peer(const cfg_obj_t *cpeer, i
+ }
+
+ static isc_result_t
++configure_dynamic_db(const cfg_obj_t *dynamic_db, isc_mem_t *mctx,
++ const dns_dyndb_arguments_t *dyndb_args)
++{
++ isc_result_t result;
++ const cfg_obj_t *obj;
++ const cfg_obj_t *options;
++ const cfg_listelt_t *element;
++ const char *name;
++ const char *libname;
++ const char **argv = NULL;
++ unsigned int i;
++ unsigned int len;
++
++ /* Get the name of the database. */
++ obj = cfg_tuple_get(dynamic_db, "name");
++ name = cfg_obj_asstring(obj);
++
++ /* Get options. */
++ options = cfg_tuple_get(dynamic_db, "options");
++
++ /* Get library name. */
++ obj = NULL;
++ CHECK(cfg_map_get(options, "library", &obj));
++ libname = cfg_obj_asstring(obj);
++
++ /* Create a list of arguments. */
++ obj = NULL;
++ result = cfg_map_get(options, "arg", &obj);
++ if (result == ISC_R_NOTFOUND)
++ len = 0;
++ else if (result == ISC_R_SUCCESS)
++ len = cfg_list_length(obj, isc_boolean_false);
++ else
++ goto cleanup;
++
++ /* Account for the last terminating NULL. */
++ len++;
++
++ argv = isc_mem_allocate(mctx, len * sizeof(const char *));
++ if (argv == NULL) {
++ result = ISC_R_NOMEMORY;
++ goto cleanup;
++ }
++ for (element = cfg_list_first(obj), i = 0;
++ element != NULL;
++ element = cfg_list_next(element), i++)
++ {
++ REQUIRE(i < len);
++
++ obj = cfg_listelt_value(element);
++ argv[i] = cfg_obj_asstring(obj);
++ }
++ REQUIRE(i < len);
++ argv[i] = NULL;
++
++ CHECK(dns_dynamic_db_load(libname, name, mctx, argv, dyndb_args));
++
++cleanup:
++ if (argv != NULL)
++ isc_mem_free(mctx, argv);
++
++ return result;
++}
++
++
++static isc_result_t
+ disable_algorithms(const cfg_obj_t *disabled, dns_resolver_t *resolver) {
+ isc_result_t result;
+ const cfg_obj_t *algorithms;
+@@ -1562,6 +1629,7 @@ configure_view(dns_view_t *view, cfg_obj
+ const cfg_obj_t *dlz;
+ unsigned int dlzargc;
+ char **dlzargv;
++ const cfg_obj_t *dynamic_db_list;
+ const cfg_obj_t *disabled;
+ const cfg_obj_t *obj;
+ const cfg_listelt_t *element;
+@@ -1792,6 +1860,39 @@ configure_view(dns_view_t *view, cfg_obj
+ }
+ }
+
++
++
++ /*
++ * Configure dynamic databases.
++ */
++ dynamic_db_list = NULL;
++ if (voptions != NULL)
++ (void)cfg_map_get(voptions, "dynamic-db", &dynamic_db_list);
++ else
++ (void)cfg_map_get(config, "dynamic-db", &dynamic_db_list);
++ element = cfg_list_first(dynamic_db_list);
++ if (element != NULL) {
++ dns_dyndb_arguments_t *args;
++
++ args = dns_dyndb_arguments_create(mctx);
++ if (args == NULL) {
++ result = ISC_R_NOMEMORY;
++ goto cleanup;
++ }
++ dns_dyndb_set_view(args, view);
++ dns_dyndb_set_zonemgr(args, ns_g_server->zonemgr);
++ dns_dyndb_set_task(args, ns_g_server->task);
++ dns_dyndb_set_timermgr(args, ns_g_timermgr);
++ while (element != NULL) {
++ obj = cfg_listelt_value(element);
++ CHECK(configure_dynamic_db(obj, mctx, args));
++
++ element = cfg_list_next(element);
++ }
++
++ dns_dyndb_arguments_destroy(mctx, args);
++ }
++
+ /*
+ * Obtain configuration parameters that affect the decision of whether
+ * we can reuse/share an existing cache.
+@@ -4292,6 +4393,7 @@ load_configuration(const char *filename,
+ cfg_aclconfctx_detach(&ns_g_aclconfctx);
+ CHECK(cfg_aclconfctx_create(ns_g_mctx, &ns_g_aclconfctx));
+
++ dns_dynamic_db_cleanup(ISC_FALSE);
+ /*
+ * Parse the global default pseudo-config file.
+ */
+diff -up bind-9.8.1rc1/lib/dns/dynamic_db.c.dyndb bind-9.8.1rc1/lib/dns/dynamic_db.c
+--- bind-9.8.1rc1/lib/dns/dynamic_db.c.dyndb 2011-08-31 14:25:02.249088456 +0200
++++ bind-9.8.1rc1/lib/dns/dynamic_db.c 2011-08-31 14:25:02.249088456 +0200
+@@ -0,0 +1,366 @@
++/*
++ * Copyright (C) 2008-2011 Red Hat, Inc.
++ *
++ * Permission to use, copy, modify, and/or distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND Red Hat DISCLAIMS ALL WARRANTIES WITH
++ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
++ * AND FITNESS. IN NO EVENT SHALL Red Hat BE LIABLE FOR ANY SPECIAL, DIRECT,
++ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
++ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
++ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++ * PERFORMANCE OF THIS SOFTWARE.
++ */
++
++
++#include <config.h>
++
++#include <isc/buffer.h>
++#include <isc/mem.h>
++#include <isc/mutex.h>
++#include <isc/once.h>
++#include <isc/result.h>
++#include <isc/region.h>
++#include <isc/task.h>
++#include <isc/types.h>
++#include <isc/util.h>
++
++#include <dns/dynamic_db.h>
++#include <dns/log.h>
++#include <dns/types.h>
++#include <dns/view.h>
++#include <dns/zone.h>
++
++#include <string.h>
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#ifndef DYNDB_LIBDIR
++#define DYNDB_LIBDIR ""
++#endif
++
++#define CHECK(op) \
++ do { result = (op); \
++ if (result != ISC_R_SUCCESS) goto cleanup; \
++ } while (0)
++
++
++typedef isc_result_t (*register_func_t)(isc_mem_t *mctx, const char *name,
++ const char * const *argv,
++ const dns_dyndb_arguments_t *dyndb_args);
++typedef void (*destroy_func_t)(void);
++
++typedef struct dyndb_implementation dyndb_implementation_t;
++
++struct dyndb_implementation {
++ isc_mem_t *mctx;
++ void *handle;
++ register_func_t register_function;
++ destroy_func_t destroy_function;
++ LINK(dyndb_implementation_t) link;
++};
++
++struct dns_dyndb_arguments {
++ dns_view_t *view;
++ dns_zonemgr_t *zmgr;
++ isc_task_t *task;
++ isc_timermgr_t *timermgr;
++};
++
++/* List of implementations. Locked by dyndb_lock. */
++static LIST(dyndb_implementation_t) dyndb_implementations;
++/* Locks dyndb_implementations. */
++static isc_mutex_t dyndb_lock;
++static isc_once_t once = ISC_ONCE_INIT;
++
++static void
++dyndb_initialize(void) {
++ RUNTIME_CHECK(isc_mutex_init(&dyndb_lock) == ISC_R_SUCCESS);
++ INIT_LIST(dyndb_implementations);
++}
++
++
++#if HAVE_DLFCN_H
++static isc_result_t
++load_symbol(void *handle, const char *symbol_name, void **symbolp)
++{
++ const char *errmsg;
++ void *symbol;
++
++ REQUIRE(handle != NULL);
++ REQUIRE(symbolp != NULL && *symbolp == NULL);
++
++ symbol = dlsym(handle, symbol_name);
++ if (symbol == NULL) {
++ errmsg = dlerror();
++ if (errmsg == NULL)
++ errmsg = "returned function pointer is NULL";
++ isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE,
++ DNS_LOGMODULE_DYNDB, ISC_LOG_ERROR,
++ "failed to lookup symbol %s: %s",
++ symbol_name, errmsg);
++ return ISC_R_FAILURE;
++ }
++ dlerror();
++
++ *symbolp = symbol;
++
++ return ISC_R_SUCCESS;
++}
++
++static isc_result_t
++load_library(isc_mem_t *mctx, const char *filename, dyndb_implementation_t **impp)
++{
++ isc_result_t result;
++ size_t module_size;
++ isc_buffer_t *module_buf = NULL;
++ isc_region_t module_region;
++ void *handle = NULL;
++ dyndb_implementation_t *imp;
++ register_func_t register_function = NULL;
++ destroy_func_t destroy_function = NULL;
++
++ REQUIRE(impp != NULL && *impp == NULL);
++
++ /* Build up the full path. */
++ module_size = strlen(DYNDB_LIBDIR) + strlen(filename) + 1;
++ CHECK(isc_buffer_allocate(mctx, &module_buf, module_size));
++ isc_buffer_putstr(module_buf, DYNDB_LIBDIR);
++ isc_buffer_putstr(module_buf, filename);
++ isc_buffer_putuint8(module_buf, 0);
++ isc_buffer_region(module_buf, &module_region);
++
++ handle = dlopen((char *)module_region.base, RTLD_LAZY);
++ if (handle == NULL) {
++ isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE,
++ DNS_LOGMODULE_DYNDB, ISC_LOG_ERROR,
++ "failed to dynamically load driver '%s': %s",
++ filename, dlerror());
++ result = ISC_R_FAILURE;
++ goto cleanup;
++ }
++ dlerror();
++
++ CHECK(load_symbol(handle, "dynamic_driver_init",
++ (void **)®ister_function));
++ CHECK(load_symbol(handle, "dynamic_driver_destroy",
++ (void **)&destroy_function));
++
++ imp = isc_mem_get(mctx, sizeof(dyndb_implementation_t));
++ if (imp == NULL) {
++ result = ISC_R_NOMEMORY;
++ goto cleanup;
++ }
++
++ imp->mctx = NULL;
++ isc_mem_attach(mctx, &imp->mctx);
++ imp->handle = handle;
++ imp->register_function = register_function;
++ imp->destroy_function = destroy_function;
++ INIT_LINK(imp, link);
++
++ *impp = imp;
++
++cleanup:
++ if (result != ISC_R_SUCCESS && handle != NULL)
++ dlclose(handle);
++ if (module_buf != NULL)
++ isc_buffer_free(&module_buf);
++
++ return result;
++}
++
++static void
++unload_library(dyndb_implementation_t **impp)
++{
++ dyndb_implementation_t *imp;
++
++ REQUIRE(impp != NULL && *impp != NULL);
++
++ imp = *impp;
++
++ isc_mem_putanddetach(&imp->mctx, imp, sizeof(dyndb_implementation_t));
++
++ *impp = NULL;
++}
++
++#else /* HAVE_DLFCN_H */
++static isc_result_t
++load_library(isc_mem_t *mctx, const char *filename, dyndb_implementation_t **impp)
++{
++ UNUSED(mctx);
++ UNUSED(filename);
++ UNUSED(impp);
++
++ isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE, DNS_LOGMODULE_DYNDB,
++ ISC_LOG_ERROR,
++ "dynamic database support is not implemented")
++
++ return ISC_R_NOTIMPLEMENTED;
++}
++
++static void
++unload_library(dyndb_implementation_t **impp)
++{
++ dyndb_implementation_t *imp;
++
++ REQUIRE(impp != NULL && *impp != NULL);
++
++ imp = *impp;
++
++ isc_mem_putanddetach(&imp->mctx, imp, sizeof(dyndb_implementation_t));
++
++ *impp = NULL;
++}
++#endif /* HAVE_DLFCN_H */
++
++isc_result_t
++dns_dynamic_db_load(const char *libname, const char *name, isc_mem_t *mctx,
++ const char * const *argv,
++ const dns_dyndb_arguments_t *dyndb_args)
++{
++ isc_result_t result;
++ dyndb_implementation_t *implementation = NULL;
++
++ RUNTIME_CHECK(isc_once_do(&once, dyndb_initialize) == ISC_R_SUCCESS);
++
++ CHECK(load_library(mctx, libname, &implementation));
++ CHECK(implementation->register_function(mctx, name, argv, dyndb_args));
++
++ LOCK(&dyndb_lock);
++ APPEND(dyndb_implementations, implementation, link);
++ UNLOCK(&dyndb_lock);
++
++ return ISC_R_SUCCESS;
++
++cleanup:
++ if (implementation != NULL)
++ unload_library(&implementation);
++
++ return result;
++}
++
++void
++dns_dynamic_db_cleanup(isc_boolean_t exiting)
++{
++ dyndb_implementation_t *elem;
++ dyndb_implementation_t *prev;
++
++ RUNTIME_CHECK(isc_once_do(&once, dyndb_initialize) == ISC_R_SUCCESS);
++
++ LOCK(&dyndb_lock);
++ elem = TAIL(dyndb_implementations);
++ while (elem != NULL) {
++ prev = PREV(elem, link);
++ UNLINK(dyndb_implementations, elem, link);
++ elem->destroy_function();
++ unload_library(&elem);
++ elem = prev;
++ }
++ UNLOCK(&dyndb_lock);
++
++ if (exiting == ISC_TRUE)
++ isc_mutex_destroy(&dyndb_lock);
++}
++
++dns_dyndb_arguments_t *
++dns_dyndb_arguments_create(isc_mem_t *mctx)
++{
++ dns_dyndb_arguments_t *args;
++
++ args = isc_mem_get(mctx, sizeof(*args));
++ if (args != NULL)
++ memset(args, 0, sizeof(*args));
++
++ return args;
++}
++
++void
++dns_dyndb_arguments_destroy(isc_mem_t *mctx, dns_dyndb_arguments_t *args)
++{
++ REQUIRE(args != NULL);
++
++ dns_dyndb_set_view(args, NULL);
++ dns_dyndb_set_zonemgr(args, NULL);
++ dns_dyndb_set_task(args, NULL);
++ dns_dyndb_set_timermgr(args, NULL);
++
++ isc_mem_put(mctx, args, sizeof(*args));
++}
++
++void
++dns_dyndb_set_view(dns_dyndb_arguments_t *args, dns_view_t *view)
++{
++ REQUIRE(args != NULL);
++
++ if (args->view != NULL)
++ dns_view_detach(&args->view);
++ if (view != NULL)
++ dns_view_attach(view, &args->view);
++}
++
++dns_view_t *
++dns_dyndb_get_view(dns_dyndb_arguments_t *args)
++{
++ REQUIRE(args != NULL);
++
++ return args->view;
++}
++
++void
++dns_dyndb_set_zonemgr(dns_dyndb_arguments_t *args, dns_zonemgr_t *zmgr)
++{
++ REQUIRE(args != NULL);
++
++ if (args->zmgr != NULL)
++ dns_zonemgr_detach(&args->zmgr);
++ if (zmgr != NULL)
++ dns_zonemgr_attach(zmgr, &args->zmgr);
++}
++
++dns_zonemgr_t *
++dns_dyndb_get_zonemgr(dns_dyndb_arguments_t *args)
++{
++ REQUIRE(args != NULL);
++
++ return args->zmgr;
++}
++
++void
++dns_dyndb_set_task(dns_dyndb_arguments_t *args, isc_task_t *task)
++{
++ REQUIRE(args != NULL);
++
++ if (args->task != NULL)
++ isc_task_detach(&args->task);
++ if (task != NULL)
++ isc_task_attach(task, &args->task);
++}
++
++isc_task_t *
++dns_dyndb_get_task(dns_dyndb_arguments_t *args)
++{
++ REQUIRE(args != NULL);
++
++ return args->task;
++}
++
++void
++dns_dyndb_set_timermgr(dns_dyndb_arguments_t *args, isc_timermgr_t *timermgr)
++{
++ REQUIRE(args != NULL);
++
++ args->timermgr = timermgr;
++}
++
++isc_timermgr_t *
++dns_dyndb_get_timermgr(dns_dyndb_arguments_t *args)
++{
++ REQUIRE(args != NULL);
++
++ return args->timermgr;
++}
+diff -up bind-9.8.1rc1/lib/dns/include/dns/dynamic_db.h.dyndb bind-9.8.1rc1/lib/dns/include/dns/dynamic_db.h
+--- bind-9.8.1rc1/lib/dns/include/dns/dynamic_db.h.dyndb 2011-08-31 14:25:02.249088456 +0200
++++ bind-9.8.1rc1/lib/dns/include/dns/dynamic_db.h 2011-08-31 14:25:02.249088456 +0200
+@@ -0,0 +1,50 @@
++/*
++ * Copyright (C) 2008-2011 Red Hat, Inc.
++ *
++ * Permission to use, copy, modify, and/or distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND Red Hat DISCLAIMS ALL WARRANTIES WITH
++ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
++ * AND FITNESS. IN NO EVENT SHALL Red Hat BE LIABLE FOR ANY SPECIAL, DIRECT,
++ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
++ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
++ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++ * PERFORMANCE OF THIS SOFTWARE.
++ */
++
++
++#ifndef DYNAMIC_DB_H
++#define DYNAMIC_DB_H
++
++#include <isc/types.h>
++
++#include <dns/types.h>
++
++/*
++ * TODO:
++ * Reformat the prototypes.
++ * Add annotated comments.
++ */
++
++isc_result_t dns_dynamic_db_load(const char *libname, const char *name,
++ isc_mem_t *mctx, const char * const *argv,
++ const dns_dyndb_arguments_t *dyndb_args);
++
++void dns_dynamic_db_cleanup(isc_boolean_t exiting);
++
++dns_dyndb_arguments_t *dns_dyndb_arguments_create(isc_mem_t *mctx);
++void dns_dyndb_arguments_destroy(isc_mem_t *mctx, dns_dyndb_arguments_t *args);
++
++void dns_dyndb_set_view(dns_dyndb_arguments_t *args, dns_view_t *view);
++dns_view_t *dns_dyndb_get_view(dns_dyndb_arguments_t *args);
++void dns_dyndb_set_zonemgr(dns_dyndb_arguments_t *args, dns_zonemgr_t *zmgr);
++dns_zonemgr_t *dns_dyndb_get_zonemgr(dns_dyndb_arguments_t *args);
++void dns_dyndb_set_task(dns_dyndb_arguments_t *args, isc_task_t *task);
++isc_task_t *dns_dyndb_get_task(dns_dyndb_arguments_t *args);
++void dns_dyndb_set_timermgr(dns_dyndb_arguments_t *args,
++ isc_timermgr_t *timermgr);
++isc_timermgr_t *dns_dyndb_get_timermgr(dns_dyndb_arguments_t *args);
++
++#endif
+diff -up bind-9.8.1rc1/lib/dns/include/dns/log.h.dyndb bind-9.8.1rc1/lib/dns/include/dns/log.h
+--- bind-9.8.1rc1/lib/dns/include/dns/log.h.dyndb 2009-12-18 23:16:49.000000000 +0100
++++ bind-9.8.1rc1/lib/dns/include/dns/log.h 2011-08-31 14:25:02.250088456 +0200
+@@ -74,6 +74,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodul
+ #define DNS_LOGMODULE_ACACHE (&dns_modules[25])
+ #define DNS_LOGMODULE_DLZ (&dns_modules[26])
+ #define DNS_LOGMODULE_DNSSEC (&dns_modules[27])
++#define DNS_LOGMODULE_DYNDB (&dns_modules[28])
+
+ ISC_LANG_BEGINDECLS
+
+diff -up bind-9.8.1rc1/lib/dns/include/dns/Makefile.in.dyndb bind-9.8.1rc1/lib/dns/include/dns/Makefile.in
+--- bind-9.8.1rc1/lib/dns/include/dns/Makefile.in.dyndb 2011-02-28 02:20:02.000000000 +0100
++++ bind-9.8.1rc1/lib/dns/include/dns/Makefile.in 2011-08-31 14:25:02.250088456 +0200
+@@ -22,7 +22,7 @@ top_srcdir = @top_srcdir@
+ @BIND9_VERSION@
+
+ HEADERS = acl.h adb.h byaddr.h cache.h callbacks.h cert.h compress.h \
+- db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h \
++ db.h dbiterator.h dbtable.h diff.h dispatch.h dlz.h dynamic_db.h \
+ dnssec.h ds.h events.h fixedname.h iptable.h journal.h \
+ keyflags.h keytable.h keyvalues.h lib.h log.h \
+ master.h masterdump.h message.h name.h ncache.h nsec.h \
+diff -up bind-9.8.1rc1/lib/dns/include/dns/types.h.dyndb bind-9.8.1rc1/lib/dns/include/dns/types.h
+--- bind-9.8.1rc1/lib/dns/include/dns/types.h.dyndb 2010-12-08 03:46:16.000000000 +0100
++++ bind-9.8.1rc1/lib/dns/include/dns/types.h 2011-08-31 14:25:02.251088456 +0200
+@@ -60,6 +60,7 @@ typedef struct dns_dbtable dns_dbtable
+ typedef void dns_dbversion_t;
+ typedef struct dns_dlzimplementation dns_dlzimplementation_t;
+ typedef struct dns_dlzdb dns_dlzdb_t;
++typedef struct dns_dyndb_arguments dns_dyndb_arguments_t;
+ typedef struct dns_sdlzimplementation dns_sdlzimplementation_t;
+ typedef struct dns_decompress dns_decompress_t;
+ typedef struct dns_dispatch dns_dispatch_t;
+diff -up bind-9.8.1rc1/lib/dns/log.c.dyndb bind-9.8.1rc1/lib/dns/log.c
+--- bind-9.8.1rc1/lib/dns/log.c.dyndb 2009-12-19 00:49:03.000000000 +0100
++++ bind-9.8.1rc1/lib/dns/log.c 2011-08-31 14:25:02.251088456 +0200
+@@ -80,6 +80,7 @@ LIBDNS_EXTERNAL_DATA isc_logmodule_t dns
+ { "dns/acache", 0 },
+ { "dns/dlz", 0 },
+ { "dns/dnssec", 0 },
++ { "dns/dynamic_db", 0 },
+ { NULL, 0 }
+ };
+
+diff -up bind-9.8.1rc1/lib/dns/Makefile.in.dyndb bind-9.8.1rc1/lib/dns/Makefile.in
+--- bind-9.8.1rc1/lib/dns/Makefile.in.dyndb 2011-08-31 14:25:02.230088458 +0200
++++ bind-9.8.1rc1/lib/dns/Makefile.in 2011-08-31 14:25:02.251088456 +0200
+@@ -58,7 +58,7 @@ DNSOBJS = acache.@O@ acl.@O@ adb.@O@ bya
+ cache.@O@ callbacks.@O@ compress.@O@ \
+ db.@O@ dbiterator.@O@ dbtable.@O@ diff.@O@ dispatch.@O@ \
+ dlz.@O@ dns64.@O@ dnssec.@O@ ds.@O@ forward.@O@ iptable.@O@ \
+- journal.@O@ keydata.@O@ keytable.@O@ \
++ dynamic_db.@O@ journal.@O@ keydata.@O@ keytable.@O@ \
+ lib.@O@ log.@O@ lookup.@O@ \
+ master.@O@ masterdump.@O@ message.@O@ \
+ name.@O@ ncache.@O@ nsec.@O@ nsec3.@O@ order.@O@ peer.@O@ \
+@@ -87,7 +87,7 @@ DNSSRCS = acache.c acl.c adb.c byaddr.c
+ cache.c callbacks.c compress.c \
+ db.c dbiterator.c dbtable.c diff.c dispatch.c \
+ dlz.c dns64.c dnssec.c ds.c forward.c iptable.c journal.c \
+- keydata.c keytable.c lib.c log.c lookup.c \
++ dynamic_db.c keydata.c keytable.c lib.c log.c lookup.c \
+ master.c masterdump.c message.c \
+ name.c ncache.c nsec.c nsec3.c order.c peer.c portlist.c \
+ rbt.c rbtdb.c rbtdb64.c rcode.c rdata.c rdatalist.c \
+@@ -118,6 +118,11 @@ version.@O@: version.c
+ -DLIBAGE=${LIBAGE} \
+ -c ${srcdir}/version.c
+
++dynamic_db.@O@: dynamic_db.c
++ ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
++ -DDYNDB_LIBDIR=\"@libdir@/bind/\" \
++ -c ${srcdir}/dynamic_db.c
++
+ libdns.@SA@: ${OBJS}
+ ${AR} ${ARFLAGS} $@ ${OBJS}
+ ${RANLIB} $@
+diff -up bind-9.8.1rc1/lib/isccfg/namedconf.c.dyndb bind-9.8.1rc1/lib/isccfg/namedconf.c
+--- bind-9.8.1rc1/lib/isccfg/namedconf.c.dyndb 2011-05-23 22:56:11.000000000 +0200
++++ bind-9.8.1rc1/lib/isccfg/namedconf.c 2011-08-31 14:25:02.253088456 +0200
+@@ -89,6 +89,7 @@ static cfg_type_t cfg_type_controls;
+ static cfg_type_t cfg_type_controls_sockaddr;
+ static cfg_type_t cfg_type_destinationlist;
+ static cfg_type_t cfg_type_dialuptype;
++static cfg_type_t cfg_type_dynamic_db;
+ static cfg_type_t cfg_type_ixfrdifftype;
+ static cfg_type_t cfg_type_key;
+ static cfg_type_t cfg_type_logfile;
+@@ -860,6 +861,7 @@ namedconf_or_view_clauses[] = {
+ { "zone", &cfg_type_zone, CFG_CLAUSEFLAG_MULTI },
+ /* only 1 DLZ per view allowed */
+ { "dlz", &cfg_type_dynamically_loadable_zones, 0 },
++ { "dynamic-db", &cfg_type_dynamic_db, CFG_CLAUSEFLAG_MULTI },
+ { "server", &cfg_type_server, CFG_CLAUSEFLAG_MULTI },
+ { "trusted-keys", &cfg_type_dnsseckeys, CFG_CLAUSEFLAG_MULTI },
+ { "managed-keys", &cfg_type_managedkeys, CFG_CLAUSEFLAG_MULTI },
+@@ -1860,6 +1862,40 @@ static cfg_type_t cfg_type_dialuptype =
+ &cfg_rep_string, dialup_enums
+ };
+
++/*
++ * Dynamic database clauses.
++ */
++
++static cfg_clausedef_t
++dynamic_db_clauses[] = {
++ { "library", &cfg_type_qstring, 0 },
++ { "arg", &cfg_type_qstring, CFG_CLAUSEFLAG_MULTI },
++ { NULL, NULL, 0 }
++};
++
++static cfg_clausedef_t *
++dynamic_db_clausesets[] = {
++ dynamic_db_clauses,
++ NULL
++};
++
++static cfg_type_t cfg_type_dynamic_db_opts = {
++ "dynamically_loadable_zones_opts", cfg_parse_map,
++ cfg_print_map, cfg_doc_map, &cfg_rep_map,
++ dynamic_db_clausesets
++};
++
++static cfg_tuplefielddef_t dynamic_db_fields[] = {
++ { "name", &cfg_type_astring, 0 },
++ { "options", &cfg_type_dynamic_db_opts, 0 },
++ { NULL, NULL, 0 }
++};
++
++static cfg_type_t cfg_type_dynamic_db = {
++ "dynamic_db", cfg_parse_tuple, cfg_print_tuple, cfg_doc_tuple,
++ &cfg_rep_tuple, dynamic_db_fields
++};
++
+ static const char *notify_enums[] = { "explicit", "master-only", NULL };
+ static isc_result_t
+ parse_notify_type(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
diff --git a/bind/patches/bind-96-libtool2.patch b/bind/patches/bind-96-libtool2.patch
new file mode 100644
index 0000000..8ceba2f
--- /dev/null
+++ b/bind/patches/bind-96-libtool2.patch
@@ -0,0 +1,13 @@
+diff -up bind-9.6.0b1/configure.in.libtool2 bind-9.6.0b1/configure.in
+--- bind-9.6.0b1/configure.in.libtool2 2008-11-24 13:05:37.000000000 +0100
++++ bind-9.6.0b1/configure.in 2008-11-24 13:05:56.000000000 +0100
+@@ -27,6 +27,8 @@ AC_CONFIG_SUBDIRS(lib/bind)
+
+ AC_CONFIG_HEADER(config.h)
+
++AC_CONFIG_MACRO_DIR([m4])
++
+ AC_CANONICAL_HOST
+
+ AC_PROG_MAKE_SET
+diff -up bind-9.6.0b1/Makefile.in.libtool2 bind-9.6.0b1/Makefile.in
diff --git a/bind/patches/bind-nonexec.patch b/bind/patches/bind-nonexec.patch
new file mode 100644
index 0000000..780ffed
--- /dev/null
+++ b/bind/patches/bind-nonexec.patch
@@ -0,0 +1,72 @@
+diff -up bind-9.7.0rc2/lib/bind9/Makefile.in.nonexec bind-9.7.0rc2/lib/bind9/Makefile.in
+--- bind-9.7.0rc2/lib/bind9/Makefile.in.nonexec 2009-12-06 00:31:40.000000000 +0100
++++ bind-9.7.0rc2/lib/bind9/Makefile.in 2010-01-28 12:13:33.406696161 +0100
+@@ -78,7 +78,7 @@ installdirs:
+ $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
+
+ install:: timestamp installdirs
+- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libbind9.@A@ ${DESTDIR}${libdir}
++ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libbind9.@A@ ${DESTDIR}${libdir}
+
+ clean distclean::
+ rm -f libbind9.@A@ timestamp
+diff -up bind-9.7.0rc2/lib/dns/Makefile.in.nonexec bind-9.7.0rc2/lib/dns/Makefile.in
+--- bind-9.7.0rc2/lib/dns/Makefile.in.nonexec 2009-12-06 00:31:40.000000000 +0100
++++ bind-9.7.0rc2/lib/dns/Makefile.in 2010-01-28 12:13:33.406696161 +0100
+@@ -131,7 +131,7 @@ installdirs:
+ $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
+
+ install:: timestamp installdirs
+- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libdns.@A@ ${DESTDIR}${libdir}
++ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libdns.@A@ ${DESTDIR}${libdir}
+
+ clean distclean::
+ rm -f libdns.@A@ timestamp
+diff -up bind-9.7.0rc2/lib/isccc/Makefile.in.nonexec bind-9.7.0rc2/lib/isccc/Makefile.in
+--- bind-9.7.0rc2/lib/isccc/Makefile.in.nonexec 2009-12-06 00:31:41.000000000 +0100
++++ bind-9.7.0rc2/lib/isccc/Makefile.in 2010-01-28 12:13:33.406696161 +0100
+@@ -80,7 +80,7 @@ installdirs:
+ $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
+
+ install:: timestamp installdirs
+- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisccc.@A@ ${DESTDIR}${libdir}
++ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libisccc.@A@ ${DESTDIR}${libdir}
+
+ clean distclean::
+ rm -f libisccc.@A@ timestamp
+diff -up bind-9.7.0rc2/lib/isccfg/Makefile.in.nonexec bind-9.7.0rc2/lib/isccfg/Makefile.in
+--- bind-9.7.0rc2/lib/isccfg/Makefile.in.nonexec 2009-12-06 00:31:41.000000000 +0100
++++ bind-9.7.0rc2/lib/isccfg/Makefile.in 2010-01-28 12:13:33.406696161 +0100
+@@ -77,7 +77,7 @@ installdirs:
+ $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
+
+ install:: timestamp installdirs
+- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisccfg.@A@ ${DESTDIR}${libdir}
++ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libisccfg.@A@ ${DESTDIR}${libdir}
+
+ clean distclean::
+ rm -f libisccfg.@A@ timestamp
+diff -up bind-9.7.0rc2/lib/isc/Makefile.in.nonexec bind-9.7.0rc2/lib/isc/Makefile.in
+--- bind-9.7.0rc2/lib/isc/Makefile.in.nonexec 2009-12-18 05:09:55.000000000 +0100
++++ bind-9.7.0rc2/lib/isc/Makefile.in 2010-01-28 12:13:53.566696766 +0100
+@@ -121,7 +121,7 @@ installdirs:
+ $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
+
+ install:: timestamp installdirs
+- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisc.@A@ ${DESTDIR}${libdir}
++ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libisc.@A@ ${DESTDIR}${libdir}
+
+ clean distclean::
+ rm -f libisc.@A@ libisc-nosymtbl.@A@ libisc.la \
+diff -up bind-9.7.0rc2/lib/lwres/Makefile.in.nonexec bind-9.7.0rc2/lib/lwres/Makefile.in
+--- bind-9.7.0rc2/lib/lwres/Makefile.in.nonexec 2007-06-20 01:47:22.000000000 +0200
++++ bind-9.7.0rc2/lib/lwres/Makefile.in 2010-01-28 12:13:33.406696161 +0100
+@@ -78,7 +78,7 @@ installdirs:
+ $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${libdir}
+
+ install:: timestamp installdirs
+- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} liblwres.@A@ ${DESTDIR}${libdir}
++ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} liblwres.@A@ ${DESTDIR}${libdir}
+
+ clean distclean::
+ rm -f liblwres.@A@ liblwres.la timestamp
diff --git a/bind/patches/bind93-rh490837.patch0 b/bind/patches/bind93-rh490837.patch0
new file mode 100644
index 0000000..230d7a7
--- /dev/null
+++ b/bind/patches/bind93-rh490837.patch0
@@ -0,0 +1,95 @@
+? patch
+? lib/isc/lex.c.rh490837
+Index: lib/isc/lex.c
+===================================================================
+RCS file: /var/snap/bind9/lib/isc/lex.c,v
+retrieving revision 1.86
+diff -p -u -r1.86 lex.c
+--- lib/isc/lex.c 17 Sep 2007 09:56:29 -0000 1.86
++++ lib/isc/lex.c 6 Apr 2009 13:24:15 -0000
+@@ -425,17 +425,14 @@ isc_lex_gettoken(isc_lex_t *lex, unsigne
+ if (source->is_file) {
+ stream = source->input;
+
+-#if defined(HAVE_FLOCKFILE) && defined(HAVE_GETCUNLOCKED)
+- c = getc_unlocked(stream);
+-#else
+- c = getc(stream);
+-#endif
+- if (c == EOF) {
+- if (ferror(stream)) {
+- source->result = ISC_R_IOERROR;
+- result = source->result;
++ result = isc_stdio_fgetc(stream, &c);
++
++ if (result != ISC_R_SUCCESS) {
++ if (result != ISC_R_EOF) {
++ source->result = result;
+ goto done;
+ }
++
+ source->at_eof = ISC_TRUE;
+ }
+ } else {
+Index: lib/isc/include/isc/stdio.h
+===================================================================
+RCS file: /var/snap/bind9/lib/isc/include/isc/stdio.h,v
+retrieving revision 1.13
+diff -p -u -r1.13 stdio.h
+--- lib/isc/include/isc/stdio.h 19 Jun 2007 23:47:18 -0000 1.13
++++ lib/isc/include/isc/stdio.h 6 Apr 2009 13:24:15 -0000
+@@ -72,6 +72,9 @@ isc_stdio_sync(FILE *f);
+ * direct counterpart in the stdio library.
+ */
+
++isc_result_t
++isc_stdio_fgetc(FILE *f, int *ret);
++
+ ISC_LANG_ENDDECLS
+
+ #endif /* ISC_STDIO_H */
+Index: lib/isc/unix/errno2result.c
+===================================================================
+RCS file: /var/snap/bind9/lib/isc/unix/errno2result.c,v
+retrieving revision 1.17
+diff -p -u -r1.17 errno2result.c
+--- lib/isc/unix/errno2result.c 19 Jun 2007 23:47:18 -0000 1.17
++++ lib/isc/unix/errno2result.c 6 Apr 2009 13:24:15 -0000
+@@ -43,6 +43,7 @@ isc__errno2result(int posixerrno) {
+ case EINVAL: /* XXX sometimes this is not for files */
+ case ENAMETOOLONG:
+ case EBADF:
++ case EISDIR:
+ return (ISC_R_INVALIDFILE);
+ case ENOENT:
+ return (ISC_R_FILENOTFOUND);
+Index: lib/isc/unix/stdio.c
+===================================================================
+RCS file: /var/snap/bind9/lib/isc/unix/stdio.c,v
+retrieving revision 1.8
+diff -p -u -r1.8 stdio.c
+--- lib/isc/unix/stdio.c 19 Jun 2007 23:47:18 -0000 1.8
++++ lib/isc/unix/stdio.c 6 Apr 2009 13:24:15 -0000
+@@ -115,3 +115,22 @@ isc_stdio_sync(FILE *f) {
+ return (isc__errno2result(errno));
+ }
+
++isc_result_t
++isc_stdio_fgetc(FILE *f, int *ret) {
++ int r;
++ isc_result_t result = ISC_R_SUCCESS;
++
++#if defined(HAVE_FLOCKFILE) && defined(HAVE_GETCUNLOCKED)
++ r = fgetc_unlocked(f);
++#else
++ r = fgets(f);
++#endif
++
++ if (r == EOF)
++ result = ferror(f) ? isc__errno2result(errno) : ISC_R_EOF;
++
++ *ret = r;
++
++ return result;
++}
++
diff --git a/bind/patches/bind95-rh461409.patch b/bind/patches/bind95-rh461409.patch
new file mode 100644
index 0000000..8c0c772
--- /dev/null
+++ b/bind/patches/bind95-rh461409.patch
@@ -0,0 +1,19 @@
+diff -up bind-9.5.1b1/bin/dig/dighost.c.rh461409 bind-9.5.1b1/bin/dig/dighost.c
+--- bind-9.5.1b1/bin/dig/dighost.c.rh461409 2008-09-16 14:04:03.000000000 +0200
++++ bind-9.5.1b1/bin/dig/dighost.c 2008-09-16 14:06:06.000000000 +0200
+@@ -3665,6 +3665,15 @@ output_filter (isc_buffer_t *buffer, uns
+ (void) strcpy (tmp1, tmp2);
+ free (tmp2);
+
++ tmp2 = stringprep_utf8_to_locale (tmp1);
++ if (tmp2 == NULL) {
++ debug ("output_filter: stringprep_utf8_to_locale failed");
++ return ISC_R_SUCCESS;
++ }
++
++ (void) strcpy (tmp1, tmp2);
++ free (tmp2);
++
+ tolen = strlen (tmp1);
+ if (absolute && !end_with_dot && tmp1[tolen - 1] == '.')
+ tolen--;
diff --git a/bind/patches/bind97-dist-pkcs11.patch b/bind/patches/bind97-dist-pkcs11.patch
new file mode 100644
index 0000000..cf8c9f0
--- /dev/null
+++ b/bind/patches/bind97-dist-pkcs11.patch
@@ -0,0 +1,22 @@
+diff -up bind-9.7.0b1/configure.in.dist-pkcs11 bind-9.7.0b1/configure.in
+--- bind-9.7.0b1/configure.in.dist-pkcs11 2009-11-03 11:37:25.481430279 +0100
++++ bind-9.7.0b1/configure.in 2009-11-03 11:41:04.573930858 +0100
+@@ -721,15 +721,16 @@ AC_ARG_WITH(pkcs11,
+ case "$use_pkcs11" in
+ no|'')
+ AC_MSG_RESULT(disabled)
+- USE_PKCS11=''
+ PKCS11_TOOLS=''
+ ;;
+ yes|*)
+ AC_MSG_RESULT(using OpenSSL with PKCS11 support)
+- USE_PKCS11='-DUSE_PKCS11'
+ PKCS11_TOOLS=pkcs11
+ ;;
+ esac
++# We don't want to automatically load engine because it needs to have openct,
++# opencryptoki and friends installed.
++USE_PKCS11=''
+ AC_SUBST(USE_PKCS11)
+ AC_SUBST(PKCS11_TOOLS)
+
diff --git a/bind/patches/bind97-exportlib.patch b/bind/patches/bind97-exportlib.patch
new file mode 100644
index 0000000..1f5aa20
--- /dev/null
+++ b/bind/patches/bind97-exportlib.patch
@@ -0,0 +1,255 @@
+diff -up bind-9.7.2-P2/isc-config.sh.in.exportlib bind-9.7.2-P2/isc-config.sh.in
+--- bind-9.7.2-P2/isc-config.sh.in.exportlib 2007-06-20 01:46:59.000000000 +0200
++++ bind-9.7.2-P2/isc-config.sh.in 2010-10-20 14:05:25.423861548 +0200
+@@ -20,6 +20,8 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ exec_prefix_set=
++libdir=@libdir@
++includedir=@includedir@
+
+ usage()
+ {
+@@ -115,14 +117,14 @@ if test x"$echo_exec_prefix" = x"true" ;
+ echo $exec_prefix
+ fi
+ if test x"$echo_cflags" = x"true"; then
+- includes="-I${exec_prefix}/include"
++ includes="-I${includedir}"
+ if test x"$libisc" = x"true"; then
+ includes="$includes @ALWAYS_DEFINES@ @STD_CINCLUDES@ @STD_CDEFINES@ @CCOPT@"
+ fi
+ echo $includes
+ fi
+ if test x"$echo_libs" = x"true"; then
+- libs=-L${exec_prefix}/lib
++ libs="-L${libdir}"
+ if test x"$liblwres" = x"true" ; then
+ libs="$libs -llwres"
+ fi
+diff -up bind-9.7.2-P2/lib/export/dns/Makefile.in.exportlib bind-9.7.2-P2/lib/export/dns/Makefile.in
+--- bind-9.7.2-P2/lib/export/dns/Makefile.in.exportlib 2010-06-10 01:49:43.000000000 +0200
++++ bind-9.7.2-P2/lib/export/dns/Makefile.in 2010-10-20 14:08:58.123772859 +0200
+@@ -35,9 +35,9 @@ CDEFINES = -DUSE_MD5 @USE_OPENSSL@ @USE_
+
+ CWARNINGS =
+
+-ISCLIBS = ../isc/libisc.@A@
++ISCLIBS = ../isc/libisc-export.@A@
+
+-ISCDEPLIBS = ../isc/libisc.@A@
++ISCDEPLIBS = ../isc/libisc-export.@A@
+
+ LIBS = @LIBS@
+
+@@ -114,29 +114,29 @@ version.@O@: ${srcdir}/version.c
+ -DLIBAGE=${LIBAGE} \
+ -c ${srcdir}/version.c
+
+-libdns.@SA@: ${OBJS}
++libdns-export.@SA@: ${OBJS}
+ ${AR} ${ARFLAGS} $@ ${OBJS}
+ ${RANLIB} $@
+
+-libdns.la: ${OBJS}
++libdns-export.la: ${OBJS}
+ ${LIBTOOL_MODE_LINK} \
+- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libdns.la \
++ ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libdns-export.la \
+ -rpath ${export_libdir} \
+ -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
+ ${OBJS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ ${LIBS}
+
+-timestamp: libdns.@A@
++timestamp: libdns-export.@A@
+ touch timestamp
+
+ installdirs:
+ $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${export_libdir}
+
+ install:: timestamp installdirs
+- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libdns.@A@ \
++ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libdns-export.@A@ \
+ ${DESTDIR}${export_libdir}/
+
+ clean distclean::
+- rm -f libdns.@A@ timestamp
++ rm -f libdns-export.@A@ timestamp
+ rm -f gen code.h include/dns/enumtype.h include/dns/enumclass.h
+ rm -f include/dns/rdatastruct.h
+
+diff -up bind-9.7.2-P2/lib/export/irs/Makefile.in.exportlib bind-9.7.2-P2/lib/export/irs/Makefile.in
+--- bind-9.7.2-P2/lib/export/irs/Makefile.in.exportlib 2009-12-06 00:31:40.000000000 +0100
++++ bind-9.7.2-P2/lib/export/irs/Makefile.in 2010-10-20 14:10:39.893717488 +0200
+@@ -42,9 +42,9 @@ SRCS = context.c \
+ gai_sterror.c getaddrinfo.c getnameinfo.c \
+ resconf.c
+
+-ISCLIBS = ../isc/libisc.@A@
+-DNSLIBS = ../dns/libdns.@A@
+-ISCCFGLIBS = ../isccfg/libisccfg.@A@
++ISCLIBS = ../isc/libisc-export.@A@
++DNSLIBS = ../dns/libdns-export.@A@
++ISCCFGLIBS = ../isccfg/libisccfg-export.@A@
+
+ LIBS = @LIBS@
+
+@@ -61,26 +61,26 @@ version.@O@: ${srcdir}/version.c
+ -DLIBAGE=${LIBAGE} \
+ -c ${srcdir}/version.c
+
+-libirs.@SA@: ${OBJS} version.@O@
++libirs-export.@SA@: ${OBJS} version.@O@
+ ${AR} ${ARFLAGS} $@ ${OBJS} version.@O@
+ ${RANLIB} $@
+
+-libirs.la: ${OBJS} version.@O@
++libirs-export.la: ${OBJS} version.@O@
+ ${LIBTOOL_MODE_LINK} \
+- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libirs.la \
++ ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libirs-export.la \
+ -rpath ${export_libdir} \
+ -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
+ ${OBJS} version.@O@ ${LIBS} ${ISCCFGLIBS} ${DNSLIBS} ${ISCLIBS}
+
+-timestamp: libirs.@A@
++timestamp: libirs-export.@A@
+ touch timestamp
+
+ installdirs:
+ $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${export_libdir}
+
+ install:: timestamp installdirs
+- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libirs.@A@ \
++ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libirs-export.@A@ \
+ ${DESTDIR}${export_libdir}/
+
+ clean distclean::
+- rm -f libirs.@A@ libirs.la timestamp
++ rm -f libirs-export.@A@ libirs-export.la timestamp
+diff -up bind-9.7.2-P2/lib/export/isccfg/Makefile.in.exportlib bind-9.7.2-P2/lib/export/isccfg/Makefile.in
+--- bind-9.7.2-P2/lib/export/isccfg/Makefile.in.exportlib 2009-12-06 00:31:41.000000000 +0100
++++ bind-9.7.2-P2/lib/export/isccfg/Makefile.in 2010-10-20 14:10:14.593741247 +0200
+@@ -30,11 +30,11 @@ CINCLUDES = -I. ${DNS_INCLUDES} -I${expo
+ CDEFINES =
+ CWARNINGS =
+
+-ISCLIBS = ../isc/libisc.@A@
+-DNSLIBS = ../dns/libdns.@A@
++ISCLIBS = ../isc/libisc-export.@A@
++DNSLIBS = ../dns/libdns-export.@A@
+
+ ISCDEPLIBS = ../../lib/isc/libisc.@A@
+-ISCCFGDEPLIBS = libisccfg.@A@
++ISCCFGDEPLIBS = libisccfg-export.@A@
+
+ LIBS = @LIBS@
+
+@@ -58,26 +58,26 @@ version.@O@: ${srcdir}/version.c
+ -DLIBAGE=${LIBAGE} \
+ -c ${srcdir}/version.c
+
+-libisccfg.@SA@: ${OBJS}
++libisccfg-export.@SA@: ${OBJS}
+ ${AR} ${ARFLAGS} $@ ${OBJS}
+ ${RANLIB} $@
+
+-libisccfg.la: ${OBJS}
++libisccfg-export.la: ${OBJS}
+ ${LIBTOOL_MODE_LINK} \
+- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisccfg.la \
++ ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisccfg-export.la \
+ -rpath ${export_libdir} \
+ -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
+ ${OBJS} ${LIBS} ${DNSLIBS} ${ISCLIBS}
+
+-timestamp: libisccfg.@A@
++timestamp: libisccfg-export.@A@
+ touch timestamp
+
+ installdirs:
+ $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${export_libdir}
+
+ install:: timestamp installdirs
+- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisccfg.@A@ \
++ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libisccfg-export.@A@ \
+ ${DESTDIR}${export_libdir}/
+
+ clean distclean::
+- rm -f libisccfg.@A@ timestamp
++ rm -f libisccfg-export.@A@ timestamp
+diff -up bind-9.7.2-P2/lib/export/isc/Makefile.in.exportlib bind-9.7.2-P2/lib/export/isc/Makefile.in
+--- bind-9.7.2-P2/lib/export/isc/Makefile.in.exportlib 2010-06-10 01:49:43.000000000 +0200
++++ bind-9.7.2-P2/lib/export/isc/Makefile.in 2010-10-20 14:05:25.433861543 +0200
+@@ -101,6 +101,10 @@ SRCS = @ISC_EXTRA_SRCS@ \
+
+ LIBS = @LIBS@
+
++# Note: the order of SUBDIRS is important.
++# Attempt to disable parallel processing.
++.NOTPARALLEL:
++.NO_PARALLEL:
+ SUBDIRS = include unix nls @ISC_THREAD_DIR@
+ TARGETS = timestamp
+
+@@ -114,26 +118,26 @@ version.@O@: ${srcdir}/version.c
+ -DLIBAGE=${LIBAGE} \
+ -c ${srcdir}/version.c
+
+-libisc.@SA@: ${OBJS}
++libisc-export.@SA@: ${OBJS}
+ ${AR} ${ARFLAGS} $@ ${OBJS}
+ ${RANLIB} $@
+
+-libisc.la: ${OBJS}
++libisc-export.la: ${OBJS}
+ ${LIBTOOL_MODE_LINK} \
+- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc.la \
++ ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc-export.la \
+ -rpath ${export_libdir} \
+ -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
+ ${OBJS} ${LIBS}
+
+-timestamp: libisc.@A@
++timestamp: libisc-export.@A@
+ touch timestamp
+
+ installdirs:
+ $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${export_libdir}
+
+ install:: timestamp installdirs
+- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisc.@A@ \
++ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libisc-export.@A@ \
+ ${DESTDIR}${export_libdir}
+
+ clean distclean::
+- rm -f libisc.@A@ libisc.la timestamp
++ rm -f libisc-export.@A@ libisc-export.la timestamp
+diff -up bind-9.7.2-P2/lib/export/samples/Makefile.in.exportlib bind-9.7.2-P2/lib/export/samples/Makefile.in
+--- bind-9.7.2-P2/lib/export/samples/Makefile.in.exportlib 2009-12-06 00:31:41.000000000 +0100
++++ bind-9.7.2-P2/lib/export/samples/Makefile.in 2010-10-20 14:05:25.433861543 +0200
+@@ -30,15 +30,15 @@ CINCLUDES = -I${srcdir}/include -I../dns
+ CDEFINES =
+ CWARNINGS =
+
+-DNSLIBS = ../dns/libdns.@A@ @DNS_CRYPTO_LIBS@
+-ISCLIBS = ../isc/libisc.@A@
+-ISCCFGLIBS = ../isccfg/libisccfg.@A@
+-IRSLIBS = ../irs/libirs.@A@
+-
+-DNSDEPLIBS = ../dns/libdns.@A@
+-ISCDEPLIBS = ../isc/libisc.@A@
+-ISCCFGDEPLIBS = ../isccfg/libisccfg.@A@
+-IRSDEPLIBS = ../irs/libirs.@A@
++DNSLIBS = ../dns/libdns-export.@A@ @DNS_CRYPTO_LIBS@
++ISCLIBS = ../isc/libisc-export.@A@
++ISCCFGLIBS = ../isccfg/libisccfg-export.@A@
++IRSLIBS = ../irs/libirs-export.@A@
++
++DNSDEPLIBS = ../dns/libdns-export.@A@
++ISCDEPLIBS = ../isc/libisc-export.@A@
++ISCCFGDEPLIBS = ../isccfg/libisccfg-export.@A@
++IRSDEPLIBS = ../irs/libirs-export.@A@
+
+ DEPLIBS = ${DNSDEPLIBS} ${ISCCFGDEPLIBS} ${ISCDEPLIBS}
+
diff --git a/bind/patches/bind97-rh478718.patch b/bind/patches/bind97-rh478718.patch
new file mode 100644
index 0000000..c6ea596
--- /dev/null
+++ b/bind/patches/bind97-rh478718.patch
@@ -0,0 +1,30 @@
+diff -up bind-9.7.0/configure.in.rh478718 bind-9.7.0/configure.in
+--- bind-9.7.0/configure.in.rh478718 2010-03-01 14:50:02.331207076 +0100
++++ bind-9.7.0/configure.in 2010-03-01 14:50:21.501207488 +0100
+@@ -2540,6 +2540,10 @@ main() {
+ AC_MSG_RESULT($arch)
+ fi
+
++if test ! "$arch" = "x86_64" -a "$have_xaddq" = "yes"; then
++ AC_MSG_ERROR([XADDQ present but disabled by Fedora patch!])
++fi
++
+ if test "$have_atomic" = "yes"; then
+ AC_MSG_CHECKING([compiler support for inline assembly code])
+
+diff -up bind-9.7.0/lib/isc/include/isc/platform.h.in.rh478718 bind-9.7.0/lib/isc/include/isc/platform.h.in
+--- bind-9.7.0/lib/isc/include/isc/platform.h.in.rh478718 2010-03-01 14:50:31.421207522 +0100
++++ bind-9.7.0/lib/isc/include/isc/platform.h.in 2010-03-01 14:50:40.313707286 +0100
+@@ -255,7 +255,11 @@
+ * If the "xaddq" operation (64bit xadd) is available on this architecture,
+ * ISC_PLATFORM_HAVEXADDQ will be defined.
+ */
+-@ISC_PLATFORM_HAVEXADDQ@
++#ifdef __x86_64__
++#define ISC_PLATFORM_HAVEXADDQ 1
++#else
++#undef ISC_PLATFORM_HAVEXADDQ
++#endif
+
+ /*
+ * If the "atomic swap" operation is available on this architecture,
diff --git a/bind/patches/bind97-rh570851.patch b/bind/patches/bind97-rh570851.patch
new file mode 100644
index 0000000..e24b94c
--- /dev/null
+++ b/bind/patches/bind97-rh570851.patch
@@ -0,0 +1,153 @@
+diff -up bind-9.7.2b1/bin/dig/dighost.c.rh570851 bind-9.7.2b1/bin/dig/dighost.c
+--- bind-9.7.2b1/bin/dig/dighost.c.rh570851 2010-08-10 12:55:14.219403986 +0200
++++ bind-9.7.2b1/bin/dig/dighost.c 2010-08-10 12:56:40.716015777 +0200
+@@ -126,7 +126,8 @@ isc_boolean_t
+ usesearch = ISC_FALSE,
+ showsearch = ISC_FALSE,
+ qr = ISC_FALSE,
+- is_dst_up = ISC_FALSE;
++ is_dst_up = ISC_FALSE,
++ verbose = ISC_FALSE;
+ in_port_t port = 53;
+ unsigned int timeout = 0;
+ unsigned int extrabytes;
+@@ -1240,10 +1241,24 @@ setup_system(void) {
+ }
+ }
+
++ if (lwconf->resdebug) {
++ verbose = ISC_TRUE;
++ debug("verbose is on");
++ }
+ if (ndots == -1) {
+ ndots = lwconf->ndots;
+ debug("ndots is %d.", ndots);
+ }
++ if (lwconf->attempts) {
++ tries = lwconf->attempts + 1;
++ if (tries < 2)
++ tries = 2;
++ debug("tries is %d.", tries);
++ }
++ if (lwconf->timeout) {
++ timeout = lwconf->timeout;
++ debug("timeout is %d.", timeout);
++ }
+
+ /* If user doesn't specify server use nameservers from resolv.conf. */
+ if (ISC_LIST_EMPTY(server_list))
+diff -up bind-9.7.2b1/bin/dig/host.c.rh570851 bind-9.7.2b1/bin/dig/host.c
+--- bind-9.7.2b1/bin/dig/host.c.rh570851 2010-08-10 12:57:16.032758098 +0200
++++ bind-9.7.2b1/bin/dig/host.c 2010-08-10 13:02:12.848559845 +0200
+@@ -659,6 +659,7 @@ parse_args(isc_boolean_t is_batchfile, i
+
+ lookup->servfail_stops = ISC_FALSE;
+ lookup->comments = ISC_FALSE;
++ short_form = !verbose;
+
+ while ((c = isc_commandline_parse(argc, argv, optstring)) != -1) {
+ switch (c) {
+@@ -869,8 +870,8 @@ main(int argc, char **argv) {
+ result = isc_app_start();
+ check_result(result, "isc_app_start");
+ setup_libs();
+- parse_args(ISC_FALSE, argc, argv);
+ setup_system();
++ parse_args(ISC_FALSE, argc, argv);
+ result = isc_app_onrun(mctx, global_task, onrun_callback, NULL);
+ check_result(result, "isc_app_onrun");
+ isc_app_run();
+diff -up bind-9.7.2b1/bin/dig/include/dig/dig.h.rh570851 bind-9.7.2b1/bin/dig/include/dig/dig.h
+--- bind-9.7.2b1/bin/dig/include/dig/dig.h.rh570851 2010-08-10 13:02:32.722244088 +0200
++++ bind-9.7.2b1/bin/dig/include/dig/dig.h 2010-08-10 13:02:48.465158159 +0200
+@@ -278,6 +278,7 @@ extern isc_boolean_t debugging, memdebug
+ extern char *progname;
+ extern int tries;
+ extern int fatalexit;
++extern isc_boolean_t verbose;
+ #ifdef WITH_IDN
+ extern int idnoptions;
+ #endif
+diff -up bind-9.7.2b1/lib/lwres/include/lwres/lwres.h.rh570851 bind-9.7.2b1/lib/lwres/include/lwres/lwres.h
+--- bind-9.7.2b1/lib/lwres/include/lwres/lwres.h.rh570851 2010-08-10 13:04:40.465780506 +0200
++++ bind-9.7.2b1/lib/lwres/include/lwres/lwres.h 2010-08-10 13:05:57.559867830 +0200
+@@ -243,6 +243,8 @@ typedef struct {
+ lwres_uint8_t resdebug; /*%< non-zero if 'options debug' set */
+ lwres_uint8_t ndots; /*%< set to n in 'options ndots:n' */
+ lwres_uint8_t no_tld_query; /*%< non-zero if 'options no_tld_query' */
++ lwres_int32_t attempts; /*%< set to n in 'options attempts:n' */
++ lwres_int32_t timeout; /*%< set to n in 'options timeout:n' */
+ } lwres_conf_t;
+
+ #define LWRES_ADDRTYPE_V4 0x00000001U /*%< ipv4 */
+diff -up bind-9.7.2b1/lib/lwres/lwconfig.c.rh570851 bind-9.7.2b1/lib/lwres/lwconfig.c
+--- bind-9.7.2b1/lib/lwres/lwconfig.c.rh570851 2010-08-10 13:06:08.051778429 +0200
++++ bind-9.7.2b1/lib/lwres/lwconfig.c 2010-08-10 13:09:53.972555776 +0200
+@@ -237,6 +237,8 @@ lwres_conf_init(lwres_context_t *ctx) {
+ confdata->resdebug = 0;
+ confdata->ndots = 1;
+ confdata->no_tld_query = 0;
++ confdata->attempts = 0;
++ confdata->timeout = 0;
+
+ for (i = 0; i < LWRES_CONFMAXNAMESERVERS; i++)
+ lwres_resetaddr(&confdata->nameservers[i]);
+@@ -289,6 +291,8 @@ lwres_conf_clear(lwres_context_t *ctx) {
+ confdata->resdebug = 0;
+ confdata->ndots = 1;
+ confdata->no_tld_query = 0;
++ confdata->attempts = 0;
++ confdata->timeout = 0;
+ }
+
+ static lwres_result_t
+@@ -530,6 +534,8 @@ static lwres_result_t
+ lwres_conf_parseoption(lwres_context_t *ctx, FILE *fp) {
+ int delim;
+ long ndots;
++ long attempts;
++ long timeout;
+ char *p;
+ char word[LWRES_CONFMAXLINELEN];
+ lwres_conf_t *confdata;
+@@ -546,6 +552,8 @@ lwres_conf_parseoption(lwres_context_t *
+ confdata->resdebug = 1;
+ } else if (strcmp("no_tld_query", word) == 0) {
+ confdata->no_tld_query = 1;
++ } else if (strcmp("debug", word) == 0) {
++ confdata->resdebug = 1;
+ } else if (strncmp("ndots:", word, 6) == 0) {
+ ndots = strtol(word + 6, &p, 10);
+ if (*p != '\0') /* Bad string. */
+@@ -553,6 +561,18 @@ lwres_conf_parseoption(lwres_context_t *
+ if (ndots < 0 || ndots > 0xff) /* Out of range. */
+ return (LWRES_R_FAILURE);
+ confdata->ndots = (lwres_uint8_t)ndots;
++ } else if (strncmp("timeout:", word, 8) == 0) {
++ timeout = strtol(word + 8, &p, 10);
++ if (*p != '\0') /* Bad string. */
++ return (LWRES_R_FAILURE);
++ confdata->timeout = (lwres_int32_t)timeout;
++ } else if (strncmp("attempts:", word, 9) == 0) {
++ attempts = strtol(word + 9, &p, 10);
++ if (*p != '\0') /* Bad string. */
++ return (LWRES_R_FAILURE);
++ if (attempts < 0) /* Out of range. */
++ return (LWRES_R_FAILURE);
++ confdata->attempts = (lwres_int32_t)attempts;
+ }
+
+ if (delim == EOF || delim == '\n')
+@@ -716,6 +736,12 @@ lwres_conf_print(lwres_context_t *ctx, F
+ if (confdata->no_tld_query)
+ fprintf(fp, "options no_tld_query\n");
+
++ if (confdata->attempts)
++ fprintf(fp, "options attempts:%d\n", confdata->attempts);
++
++ if (confdata->timeout)
++ fprintf(fp, "options timeout:%d\n", confdata->timeout);
++
+ return (LWRES_R_SUCCESS);
+ }
+
diff --git a/bind/patches/bind97-rh645544.patch b/bind/patches/bind97-rh645544.patch
new file mode 100644
index 0000000..8b9c4e3
--- /dev/null
+++ b/bind/patches/bind97-rh645544.patch
@@ -0,0 +1,30 @@
+diff -up bind-9.7.2-P2/lib/dns/resolver.c.rh645544 bind-9.7.2-P2/lib/dns/resolver.c
+--- bind-9.7.2-P2/lib/dns/resolver.c.rh645544 2010-11-08 14:32:12.254896255 +0100
++++ bind-9.7.2-P2/lib/dns/resolver.c 2010-11-08 14:33:18.674869633 +0100
+@@ -1097,7 +1097,7 @@ log_edns(fetchctx_t *fctx) {
+
+ dns_name_format(&fctx->domain, domainbuf, sizeof(domainbuf));
+ isc_log_write(dns_lctx, DNS_LOGCATEGORY_EDNS_DISABLED,
+- DNS_LOGMODULE_RESOLVER, ISC_LOG_INFO,
++ DNS_LOGMODULE_RESOLVER, ISC_LOG_DEBUG(1),
+ "success resolving '%s' (in '%s'?) after %s",
+ fctx->info, domainbuf, fctx->reason);
+
+@@ -3795,7 +3795,7 @@ log_lame(fetchctx_t *fctx, dns_adbaddrin
+ dns_name_format(&fctx->domain, domainbuf, sizeof(domainbuf));
+ isc_sockaddr_format(&addrinfo->sockaddr, addrbuf, sizeof(addrbuf));
+ isc_log_write(dns_lctx, DNS_LOGCATEGORY_LAME_SERVERS,
+- DNS_LOGMODULE_RESOLVER, ISC_LOG_INFO,
++ DNS_LOGMODULE_RESOLVER, ISC_LOG_DEBUG(1),
+ "lame server resolving '%s' (in '%s'?): %s",
+ namebuf, domainbuf, addrbuf);
+ }
+@@ -3822,7 +3822,7 @@ log_formerr(fetchctx_t *fctx, const char
+ }
+
+ isc_log_write(dns_lctx, DNS_LOGCATEGORY_RESOLVER,
+- DNS_LOGMODULE_RESOLVER, ISC_LOG_NOTICE,
++ DNS_LOGMODULE_RESOLVER, ISC_LOG_DEBUG(1),
+ "DNS format error from %s resolving %s%s%s: %s",
+ nsbuf, fctx->info, clmsg, clbuf, msgbuf);
+ }
diff --git a/bind/patches/bind97-rh693982.patch b/bind/patches/bind97-rh693982.patch
new file mode 100644
index 0000000..57bf812
--- /dev/null
+++ b/bind/patches/bind97-rh693982.patch
@@ -0,0 +1,35 @@
+diff -up bind-9.7.3-P3/bin/named/server.c.rh693982 bind-9.7.3-P3/bin/named/server.c
+--- bind-9.7.3-P3/bin/named/server.c.rh693982 2011-08-12 17:18:55.611978110 +0200
++++ bind-9.7.3-P3/bin/named/server.c 2011-08-12 17:19:36.009975303 +0200
+@@ -4444,15 +4444,6 @@ load_configuration(const char *filename,
+ ns_os_changeuser();
+
+ /*
+- * Check that the working directory is writable.
+- */
+- if (access(".", W_OK) != 0) {
+- isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
+- NS_LOGMODULE_SERVER, ISC_LOG_ERROR,
+- "the working directory is not writable");
+- }
+-
+- /*
+ * Configure the logging system.
+ *
+ * Do this after changing UID to make sure that any log
+@@ -4498,6 +4489,15 @@ load_configuration(const char *filename,
+ }
+
+ /*
++ * Check that the working directory is writable.
++ */
++ if (access(".", W_OK) != 0) {
++ isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
++ NS_LOGMODULE_SERVER, ISC_LOG_DEBUG(1),
++ "the working directory is not writable");
++ }
++
++ /*
+ * Set the default value of the query logging flag depending
+ * whether a "queries" category has been defined. This is
+ * a disgusting hack, but we need to do this for BIND 8
diff --git a/bind/patches/bind97-rh699951.patch b/bind/patches/bind97-rh699951.patch
new file mode 100644
index 0000000..77a807f
--- /dev/null
+++ b/bind/patches/bind97-rh699951.patch
@@ -0,0 +1,46 @@
+--- bind-9.8.0-P4/lib/dns/request.c.test 2011-08-04 19:13:34.300999355 +0200
++++ bind-9.8.0-P4/lib/dns/request.c 2011-08-04 19:37:40.347002723 +0200
+@@ -97,6 +97,7 @@ struct dns_request {
+ synchronously canceled */
+ #define DNS_REQUEST_F_TIMEDOUT 0x0008 /*%< canceled due to a timeout */
+ #define DNS_REQUEST_F_TCP 0x0010 /*%< This request used TCP */
++#define DNS_REQUEST_F_RESPONSE 0x0020 /*%< We got response */
+ #define DNS_REQUEST_CANCELED(r) \
+ (((r)->flags & DNS_REQUEST_F_CANCELED) != 0)
+ #define DNS_REQUEST_CONNECTING(r) \
+@@ -105,6 +106,8 @@ struct dns_request {
+ (((r)->flags & DNS_REQUEST_F_SENDING) != 0)
+ #define DNS_REQUEST_TIMEDOUT(r) \
+ (((r)->flags & DNS_REQUEST_F_TIMEDOUT) != 0)
++#define DNS_REQUEST_RESPONSE(r) \
++ (((r)->flags & DNS_REQUEST_F_RESPONSE) != 0)
+
+
+ /***
+@@ -1312,9 +1315,15 @@ req_senddone(isc_task_t *task, isc_event
+
+ if (DNS_REQUEST_CANCELED(request)) {
+ /*
+- * Send delayed event.
++ * Response can arrive before we proccess
++ * req_senddone which means we received cancellation
++ * request from req_response(). If we successfully
++ * fetched response, send success. Otherwise
++ * indicate failure.
+ */
+- if (DNS_REQUEST_TIMEDOUT(request))
++ if (DNS_REQUEST_RESPONSE(request))
++ send_if_done(request, ISC_R_SUCCESS);
++ else if (DNS_REQUEST_TIMEDOUT(request))
+ send_if_done(request, ISC_R_TIMEDOUT);
+ else
+ send_if_done(request, ISC_R_CANCELED);
+@@ -1367,6 +1376,8 @@ req_response(isc_task_t *task, isc_event
+ /*
+ * Send completion event.
+ */
++ if (result == ISC_R_SUCCESS)
++ request->flags |= DNS_REQUEST_F_RESPONSE;
+ send_if_done(request, result);
+ UNLOCK(&request->requestmgr->locks[request->hash]);
+ }
diff --git a/bind/patches/bind97-rh700097.patch b/bind/patches/bind97-rh700097.patch
new file mode 100644
index 0000000..60db2af
--- /dev/null
+++ b/bind/patches/bind97-rh700097.patch
@@ -0,0 +1,11 @@
+diff -up bind-9.7.3-P3/bin/nsupdate/nsupdate.c.rh700097 bind-9.7.3-P3/bin/nsupdate/nsupdate.c
+--- bind-9.7.3-P3/bin/nsupdate/nsupdate.c.rh700097 2011-08-12 16:24:18.730205763 +0200
++++ bind-9.7.3-P3/bin/nsupdate/nsupdate.c 2011-08-12 16:24:27.833205103 +0200
+@@ -2298,6 +2298,7 @@ recvsoa(isc_task_t *task, isc_event_t *e
+ dns_message_destroy(&soaquery);
+ ddebug("Out of recvsoa");
+ done_update();
++ seenerror = ISC_TRUE;
+ return;
+ }
+
diff --git a/bind/patches/bind97-rh714049.patch b/bind/patches/bind97-rh714049.patch
new file mode 100644
index 0000000..77ed806
--- /dev/null
+++ b/bind/patches/bind97-rh714049.patch
@@ -0,0 +1,160 @@
+diff -up bind-9.7.3-P3/bin/nsupdate/nsupdate.c.rh714049 bind-9.7.3-P3/bin/nsupdate/nsupdate.c
+--- bind-9.7.3-P3/bin/nsupdate/nsupdate.c.rh714049 2011-08-12 14:17:39.520175003 +0200
++++ bind-9.7.3-P3/bin/nsupdate/nsupdate.c 2011-08-12 15:11:01.812173573 +0200
+@@ -109,6 +109,13 @@ extern int h_errno;
+
+ #define DNSDEFAULTPORT 53
+
++/*
++ * Assume that bind9_getaddresses returns IPv6 and IPv4 addrs
++ * so when master server is not reachable via IPv6
++ * we can switch to IPv4.
++ */
++#define MAX_SERVERADDRS 4
++
+ static isc_uint16_t dnsport = DNSDEFAULTPORT;
+
+ #ifndef RESOLV_CONF
+@@ -151,6 +158,8 @@ static isc_sockaddr_t *servers;
+ static int ns_inuse = 0;
+ static int ns_total = 0;
+ static isc_sockaddr_t *userserver = NULL;
++static int curserver = 0;
++static int userservers = 0;
+ static isc_sockaddr_t *localaddr = NULL;
+ static isc_sockaddr_t *serveraddr = NULL;
+ static isc_sockaddr_t tempaddr;
+@@ -703,7 +712,8 @@ doshutdown(void) {
+ isc_task_detach(&global_task);
+
+ if (userserver != NULL)
+- isc_mem_put(mctx, userserver, sizeof(isc_sockaddr_t));
++ isc_mem_put(mctx, userserver,
++ MAX_SERVERADDRS * sizeof(isc_sockaddr_t));
+
+ if (localaddr != NULL)
+ isc_mem_put(mctx, localaddr, sizeof(isc_sockaddr_t));
+@@ -914,17 +924,21 @@ setup_system(void) {
+ }
+
+ static void
+-get_address(char *host, in_port_t port, isc_sockaddr_t *sockaddr) {
++get_addresses(char *host, in_port_t port, isc_sockaddr_t *sockaddr, int *naddrs) {
+ int count;
+ isc_result_t result;
+
+ isc_app_block();
+- result = bind9_getaddresses(host, port, sockaddr, 1, &count);
++ result = bind9_getaddresses(host, port, sockaddr,
++ (naddrs == NULL) ? 1 : MAX_SERVERADDRS, &count);
+ isc_app_unblock();
+ if (result != ISC_R_SUCCESS)
+ fatal("couldn't get address for '%s': %s",
+ host, isc_result_totext(result));
+- INSIST(count == 1);
++ if (naddrs == NULL)
++ INSIST(count == 1);
++ else
++ *naddrs = count;
+ }
+
+ #define PARSE_ARGS_FMT "dDML:y:ghlovk:p:rR::t:u:"
+@@ -1364,12 +1378,14 @@ evaluate_server(char *cmdline) {
+ }
+
+ if (userserver == NULL) {
+- userserver = isc_mem_get(mctx, sizeof(isc_sockaddr_t));
++ userserver = isc_mem_get(mctx,
++ MAX_SERVERADDRS * sizeof(isc_sockaddr_t));
+ if (userserver == NULL)
+ fatal("out of memory");
+ }
+
+- get_address(server, (in_port_t)port, userserver);
++ memset(userserver, 0, MAX_SERVERADDRS * sizeof(isc_sockaddr_t));
++ get_addresses(server, (in_port_t)port, userserver, &userservers);
+
+ return (STATUS_MORE);
+ }
+@@ -2207,19 +2223,25 @@ recvsoa(isc_task_t *task, isc_event_t *e
+
+ if (eresult != ISC_R_SUCCESS) {
+ char addrbuf[ISC_SOCKADDR_FORMATSIZE];
++ isc_sockaddr_t *server;
+
+ isc_sockaddr_format(addr, addrbuf, sizeof(addrbuf));
+ fprintf(stderr, "; Communication with %s failed: %s\n",
+ addrbuf, isc_result_totext(eresult));
+- if (userserver != NULL)
+- fatal("could not talk to specified name server");
+- else if (++ns_inuse >= lwconf->nsnext)
++ if (userserver != NULL) {
++ if (++curserver == MAX_SERVERADDRS)
++ fatal("could not talk to specified name server");
++ else
++ ddebug("recvsoa: trying next server");
++ } else if (++ns_inuse >= lwconf->nsnext)
+ fatal("could not talk to any default name server");
+ ddebug("Destroying request [%p]", request);
+ dns_request_destroy(&request);
+ dns_message_renderreset(soaquery);
+ dns_message_settsigkey(soaquery, NULL);
+- sendrequest(localaddr, &servers[ns_inuse], soaquery, &request);
++ server = (userserver != NULL) ? &userserver[curserver] :
++ &servers[ns_inuse];
++ sendrequest(localaddr, server, soaquery, &request);
+ isc_mem_put(mctx, reqinfo, sizeof(nsu_requestinfo_t));
+ isc_event_free(&event);
+ setzoneclass(dns_rdataclass_none);
+@@ -2351,7 +2373,7 @@ recvsoa(isc_task_t *task, isc_event_t *e
+ }
+
+ if (userserver != NULL)
+- serveraddr = userserver;
++ serveraddr = &userserver[curserver];
+ else {
+ char serverstr[DNS_NAME_MAXTEXT+1];
+ isc_buffer_t buf;
+@@ -2360,7 +2382,7 @@ recvsoa(isc_task_t *task, isc_event_t *e
+ result = dns_name_totext(&master, ISC_TRUE, &buf);
+ check_result(result, "dns_name_totext");
+ serverstr[isc_buffer_usedlength(&buf)] = 0;
+- get_address(serverstr, dnsport, &tempaddr);
++ get_addresses(serverstr, dnsport, &tempaddr, NULL);
+ serveraddr = &tempaddr;
+ }
+ dns_rdata_freestruct(&soa);
+@@ -2464,9 +2486,9 @@ start_gssrequest(dns_name_t *master)
+ fatal("out of memory");
+ }
+ if (userserver == NULL)
+- get_address(namestr, dnsport, kserver);
++ get_addresses(namestr, dnsport, kserver, NULL);
+ else
+- (void)memcpy(kserver, userserver, sizeof(isc_sockaddr_t));
++ (void)memcpy(kserver, &userserver[curserver], sizeof(isc_sockaddr_t));
+
+ dns_fixedname_init(&fname);
+ servname = dns_fixedname_name(&fname);
+@@ -2594,15 +2616,17 @@ recvgss(isc_task_t *task, isc_event_t *e
+ isc_sockaddr_format(addr, addrbuf, sizeof(addrbuf));
+ fprintf(stderr, "; Communication with %s failed: %s\n",
+ addrbuf, isc_result_totext(eresult));
+- if (userserver != NULL)
++ if (userserver != NULL) {
+ fatal("could not talk to specified name server");
+- else if (++ns_inuse >= lwconf->nsnext)
++ } else if (++ns_inuse >= lwconf->nsnext)
+ fatal("could not talk to any default name server");
+ ddebug("Destroying request [%p]", request);
+ dns_request_destroy(&request);
+ dns_message_renderreset(tsigquery);
+- sendrequest(localaddr, &servers[ns_inuse], tsigquery,
+- &request);
++ sendrequest(localaddr,
++ (userserver != NULL) ? &userserver[curserver] :
++ &servers[ns_inuse],
++ tsigquery, &request);
+ isc_mem_put(mctx, reqinfo, sizeof(nsu_gssinfo_t));
+ isc_event_free(&event);
+ return;
diff --git a/bind/patches/bind98-dlz_buildfix.patch b/bind/patches/bind98-dlz_buildfix.patch
new file mode 100644
index 0000000..dc44919
--- /dev/null
+++ b/bind/patches/bind98-dlz_buildfix.patch
@@ -0,0 +1,25 @@
+diff -up bind-9.8.1rc1/bin/tests/system/dlzexternal/Makefile.in.dlz_buildfix bind-9.8.1rc1/bin/tests/system/dlzexternal/Makefile.in
+diff -up bind-9.8.1rc1/bin/tests/system/Makefile.in.dlz_buildfix bind-9.8.1rc1/bin/tests/system/Makefile.in
+--- bind-9.8.1rc1/bin/tests/system/Makefile.in.dlz_buildfix 2011-08-31 17:04:34.466423526 +0200
++++ bind-9.8.1rc1/bin/tests/system/Makefile.in 2011-08-31 17:04:38.512423247 +0200
+@@ -21,7 +21,7 @@ top_srcdir = @top_srcdir@
+
+ @BIND9_MAKE_INCLUDES@
+
+-SUBDIRS = dlzexternal filter-aaaa lwresd rpz tkey tsiggss
++SUBDIRS = filter-aaaa lwresd rpz tkey tsiggss
+ TARGETS =
+
+ @BIND9_MAKE_RULES@
+diff -up bind-9.8.1rc1/contrib/dlz/drivers/sdlz_helper.c.dlz_buildfix bind-9.8.1rc1/contrib/dlz/drivers/sdlz_helper.c
+--- bind-9.8.1rc1/contrib/dlz/drivers/sdlz_helper.c.dlz_buildfix 2010-05-14 08:29:37.000000000 +0200
++++ bind-9.8.1rc1/contrib/dlz/drivers/sdlz_helper.c 2011-08-31 16:53:47.736468453 +0200
+@@ -50,7 +50,7 @@
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+-#ifdef DLZ
++#ifdef CONTRIB_DLZ
+
+ #include <config.h>
+
diff --git a/bind/patches/bind98-rh725741.patch b/bind/patches/bind98-rh725741.patch
new file mode 100644
index 0000000..53d924d
--- /dev/null
+++ b/bind/patches/bind98-rh725741.patch
@@ -0,0 +1,24 @@
+diff -up bind-9.8.0-P4/bin/named/main.c.rh725741 bind-9.8.0-P4/bin/named/main.c
+--- bind-9.8.0-P4/bin/named/main.c.rh725741 2011-08-03 15:20:28.487516386 +0200
++++ bind-9.8.0-P4/bin/named/main.c 2011-08-03 15:20:50.197514932 +0200
+@@ -872,8 +872,6 @@ setup(void) {
+
+ static void
+ cleanup(void) {
+- dns_dynamic_db_cleanup(ISC_TRUE);
+-
+ destroy_managers();
+
+ ns_server_destroy(&ns_g_server);
+diff -up bind-9.8.0-P4/bin/named/server.c.rh725741 bind-9.8.0-P4/bin/named/server.c
+--- bind-9.8.0-P4/bin/named/server.c.rh725741 2011-08-03 15:20:42.009515447 +0200
++++ bind-9.8.0-P4/bin/named/server.c 2011-08-03 15:21:01.878514035 +0200
+@@ -5263,6 +5263,8 @@ shutdown_server(isc_task_t *task, isc_ev
+ dns_view_detach(&view);
+ }
+
++ dns_dynamic_db_cleanup(ISC_TRUE);
++
+ while ((nsc = ISC_LIST_HEAD(server->cachelist)) != NULL) {
+ ISC_LIST_UNLINK(server->cachelist, nsc, link);
+ dns_cache_detach(&nsc->cache);
diff --git a/bind/patches/bind98-rh735103.patch b/bind/patches/bind98-rh735103.patch
new file mode 100644
index 0000000..77acfa8
--- /dev/null
+++ b/bind/patches/bind98-rh735103.patch
@@ -0,0 +1,40 @@
+diff -up bind-9.8.1rc1/lib/isc/unix/socket.c.rh735103 bind-9.8.1rc1/lib/isc/unix/socket.c
+--- bind-9.8.1rc1/lib/isc/unix/socket.c.rh735103 2011-07-29 04:19:20.000000000 +0200
++++ bind-9.8.1rc1/lib/isc/unix/socket.c 2011-09-07 18:49:54.100215897 +0200
+@@ -57,6 +57,20 @@
+ #include <isc/util.h>
+ #include <isc/xml.h>
+
++/* See task.c about the following definition: */
++#ifdef BIND9
++#ifdef ISC_PLATFORM_USETHREADS
++#define USE_WATCHER_THREAD
++#else
++#define USE_SHARED_MANAGER
++#endif /* ISC_PLATFORM_USETHREADS */
++#else /* BIND9 */
++#undef ISC_PLATFORM_HAVESYSUNH
++#undef ISC_PLATFORM_HAVEKQUEUE
++#undef ISC_PLATFORM_HAVEEPOLL
++#undef ISC_PLATFORM_HAVEDEVPOLL
++#endif /* BIND9 */
++
+ #ifdef ISC_PLATFORM_HAVESYSUNH
+ #include <sys/un.h>
+ #endif
+@@ -76,15 +90,6 @@
+
+ #include "errno2result.h"
+
+-/* See task.c about the following definition: */
+-#ifdef BIND9
+-#ifdef ISC_PLATFORM_USETHREADS
+-#define USE_WATCHER_THREAD
+-#else
+-#define USE_SHARED_MANAGER
+-#endif /* ISC_PLATFORM_USETHREADS */
+-#endif /* BIND9 */
+-
+ #ifndef USE_WATCHER_THREAD
+ #include "socket_p.h"
+ #include "../task_p.h"
diff --git a/bind/trusted-key.key b/bind/trusted-key.key
new file mode 100644
index 0000000..ea07836
--- /dev/null
+++ b/bind/trusted-key.key
@@ -0,0 +1 @@
+. 3600 IN DNSKEY 257 3 8 AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjFFVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoXbfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaDX6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpzW5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relSQageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulqQxA+Uk1ihz0=
diff --git a/coreutils/coreutils.nm b/coreutils/coreutils.nm
index a2dfed2..7686216 100644
--- a/coreutils/coreutils.nm
+++ b/coreutils/coreutils.nm
@@ -4,8 +4,8 @@
###############################################################################
name = coreutils
-version = 8.12
-release = 2
+version = 8.13
+release = 1
groups = Base Build System/Base
url = http://www.gnu.org/software/coreutils/
@@ -13,15 +13,13 @@ license = GPLv3+
summary = A set of basic GNU tools commonly used in shell scripts.
description
- These are the GNU core utilities. This package is the combination of \
+ These are the GNU core utilities. This package is the combination of
the old GNU fileutils, sh-utils, and textutils packages.
end
source_dl = http://ftp.gnu.org/gnu/coreutils/
sources = %{thisapp}.tar.xz
-CFLAGS += -D_GNU_SOURCE=1 -fno-strict-aliasing
-
build
requires
autoconf
@@ -36,10 +34,16 @@ build
pam-devel
end
+ CFLAGS += \
+ -D_GNU_SOURCE=1 \
+ -fno-strict-aliasing
+
configure_options += \
+ --libexecdir=/usr/lib \
--enable-pam \
--enable-selinux \
--enable-largefile \
+ --disable-rpath \
--enable-install-program=arch,hostname,su \
--enable-no-install-program=kill,uptime
diff --git a/coreutils/patches/coreutils-i18n.patch b/coreutils/patches/coreutils-i18n.patch
index 6e10f37..9ba6bb4 100644
--- a/coreutils/patches/coreutils-i18n.patch
+++ b/coreutils/patches/coreutils-i18n.patch
@@ -1,6 +1,6 @@
-diff -urNp coreutils-8.10-orig/lib/linebuffer.h coreutils-8.10/lib/linebuffer.h
---- coreutils-8.10-orig/lib/linebuffer.h 2011-01-06 09:47:56.000000000 +0100
-+++ coreutils-8.10/lib/linebuffer.h 2011-02-04 20:13:23.985464731 +0100
+diff -urNp coreutils-8.13-orig/lib/linebuffer.h coreutils-8.13/lib/linebuffer.h
+--- coreutils-8.13-orig/lib/linebuffer.h 2011-04-24 19:21:45.000000000 +0200
++++ coreutils-8.13/lib/linebuffer.h 2011-09-09 10:23:14.163704760 +0200
@@ -21,6 +21,11 @@
# include <stdio.h>
@@ -23,9 +23,9 @@ diff -urNp coreutils-8.10-orig/lib/linebuffer.h coreutils-8.10/lib/linebuffer.h
};
/* Initialize linebuffer LINEBUFFER for use. */
-diff -urNp coreutils-8.10-orig/src/cut.c coreutils-8.10/src/cut.c
---- coreutils-8.10-orig/src/cut.c 2011-01-31 13:40:38.000000000 +0100
-+++ coreutils-8.10/src/cut.c 2011-02-04 20:13:23.988464025 +0100
+diff -urNp coreutils-8.13-orig/src/cut.c coreutils-8.13/src/cut.c
+--- coreutils-8.13-orig/src/cut.c 2011-07-28 12:38:27.000000000 +0200
++++ coreutils-8.13/src/cut.c 2011-09-09 10:23:14.165701039 +0200
@@ -28,6 +28,11 @@
#include <assert.h>
#include <getopt.h>
@@ -75,7 +75,7 @@ diff -urNp coreutils-8.10-orig/src/cut.c coreutils-8.10/src/cut.c
+ while (0)
+
+/* Get wide character on BUFPOS. BUFPOS is not included after that.
-+ If byte sequence is not valid as a character, CONVFAIL is 1. Otherwise 0. */
++ If byte sequence is not valid as a character, CONVFAIL is 1. Otherwise 0. */
+#define GET_NEXT_WC_FROM_BUFFER(WC, BUFPOS, BUFLEN, MBLENGTH, STATE, CONVFAIL) \
+ do \
+ { \
@@ -226,7 +226,7 @@ diff -urNp coreutils-8.10-orig/src/cut.c coreutils-8.10/src/cut.c
}
max_range_endpoint = 0;
-@@ -580,6 +662,63 @@ cut_bytes (FILE *stream)
+@@ -582,6 +664,77 @@ cut_bytes (FILE *stream)
}
}
@@ -234,11 +234,11 @@ diff -urNp coreutils-8.10-orig/src/cut.c coreutils-8.10/src/cut.c
+/* This function is in use for the following case.
+
+ 1. Read from the stream STREAM, printing to standard output any selected
-+ characters.
++ characters.
+
+ 2. Read from stream STREAM, printing to standard output any selected bytes,
+ without splitting multibyte characters. */
-+
++
+static void
+cut_characters_or_cut_bytes_no_split (FILE *stream)
+{
@@ -251,6 +251,9 @@ diff -urNp coreutils-8.10-orig/src/cut.c coreutils-8.10/src/cut.c
+ as same character as WC. */
+ mbstate_t state; /* State of the stream. */
+ int convfail = 0; /* 1, when conversion is failed. Otherwise 0. */
++ /* Whether to begin printing delimiters between ranges for the current line.
++ Set after we've begun printing data corresponding to the first range. */
++ bool print_delimiter = false;
+
+ idx = 0;
+ buflen = 0;
@@ -273,12 +276,23 @@ diff -urNp coreutils-8.10-orig/src/cut.c coreutils-8.10/src/cut.c
+ {
+ putchar ('\n');
+ idx = 0;
++ print_delimiter = false;
+ }
+ else
+ {
++ bool range_start;
++ bool *rs = output_delimiter_specified ? &range_start : NULL;
+ idx += (operating_mode == byte_mode) ? mblength : 1;
-+ if (print_kth (idx, NULL))
-+ fwrite (bufpos, mblength, sizeof(char), stdout);
++ if (print_kth (idx, rs))
++ {
++ if (rs && *rs && print_delimiter)
++ {
++ fwrite (output_delimiter_string, sizeof (char),
++ output_delimiter_length, stdout);
++ }
++ print_delimiter = true;
++ fwrite (bufpos, mblength, sizeof(char), stdout);
++ }
+ }
+
+ buflen -= mblength;
@@ -286,11 +300,11 @@ diff -urNp coreutils-8.10-orig/src/cut.c coreutils-8.10/src/cut.c
+ }
+}
+#endif
-+
++
/* Read from stream STREAM, printing to standard output any selected fields. */
static void
-@@ -702,13 +841,192 @@ cut_fields (FILE *stream)
+@@ -704,13 +843,195 @@ cut_fields (FILE *stream)
}
}
@@ -310,7 +324,7 @@ diff -urNp coreutils-8.10-orig/src/cut.c coreutils-8.10/src/cut.c
+ size_t mblength; /* The byte size of a multibyte character which shows
+ as same character as WC. */
+ mbstate_t state; /* State of the stream. */
-+ int convfail; /* 1, when conversion is failed. Otherwise 0. */
++ int convfail = 0; /* 1, when conversion is failed. Otherwise 0. */
+
+ found_any_selected_field = 0;
+ field_idx = 1;
@@ -321,7 +335,10 @@ diff -urNp coreutils-8.10-orig/src/cut.c coreutils-8.10/src/cut.c
+ c = getc (stream);
+ empty_input = (c == EOF);
+ if (c != EOF)
++ {
+ ungetc (c, stream);
++ wc = 0;
++ }
+ else
+ wc = WEOF;
+
@@ -486,7 +503,7 @@ diff -urNp coreutils-8.10-orig/src/cut.c coreutils-8.10/src/cut.c
}
/* Process file FILE to standard output.
-@@ -760,6 +1078,8 @@ main (int argc, char **argv)
+@@ -762,6 +1080,8 @@ main (int argc, char **argv)
bool ok;
bool delim_specified = false;
char *spec_list_string IF_LINT ( = NULL);
@@ -495,7 +512,7 @@ diff -urNp coreutils-8.10-orig/src/cut.c coreutils-8.10/src/cut.c
initialize_main (&argc, &argv);
set_program_name (argv[0]);
-@@ -782,7 +1102,6 @@ main (int argc, char **argv)
+@@ -784,7 +1104,6 @@ main (int argc, char **argv)
switch (optc)
{
case 'b':
@@ -503,7 +520,7 @@ diff -urNp coreutils-8.10-orig/src/cut.c coreutils-8.10/src/cut.c
/* Build the byte list. */
if (operating_mode != undefined_mode)
FATAL_ERROR (_("only one type of list may be specified"));
-@@ -790,6 +1109,14 @@ main (int argc, char **argv)
+@@ -792,6 +1111,14 @@ main (int argc, char **argv)
spec_list_string = optarg;
break;
@@ -518,7 +535,7 @@ diff -urNp coreutils-8.10-orig/src/cut.c coreutils-8.10/src/cut.c
case 'f':
/* Build the field list. */
if (operating_mode != undefined_mode)
-@@ -801,10 +1128,35 @@ main (int argc, char **argv)
+@@ -803,10 +1130,35 @@ main (int argc, char **argv)
case 'd':
/* New delimiter. */
/* Interpret -d '' to mean `use the NUL byte as the delimiter.' */
@@ -558,7 +575,7 @@ diff -urNp coreutils-8.10-orig/src/cut.c coreutils-8.10/src/cut.c
break;
case OUTPUT_DELIMITER_OPTION:
-@@ -817,6 +1169,7 @@ main (int argc, char **argv)
+@@ -819,6 +1171,7 @@ main (int argc, char **argv)
break;
case 'n':
@@ -566,7 +583,7 @@ diff -urNp coreutils-8.10-orig/src/cut.c coreutils-8.10/src/cut.c
break;
case 's':
-@@ -839,7 +1192,7 @@ main (int argc, char **argv)
+@@ -841,7 +1194,7 @@ main (int argc, char **argv)
if (operating_mode == undefined_mode)
FATAL_ERROR (_("you must specify a list of bytes, characters, or fields"));
@@ -575,7 +592,7 @@ diff -urNp coreutils-8.10-orig/src/cut.c coreutils-8.10/src/cut.c
FATAL_ERROR (_("an input delimiter may be specified only\
when operating on fields"));
-@@ -866,15 +1219,34 @@ main (int argc, char **argv)
+@@ -868,15 +1221,34 @@ main (int argc, char **argv)
}
if (!delim_specified)
@@ -607,7 +624,7 @@ diff -urNp coreutils-8.10-orig/src/cut.c coreutils-8.10/src/cut.c
+ if (MB_CUR_MAX <= 1 || force_singlebyte_mode)
+#endif
+ {
-+ static char dummy[2];
++ static char dummy[2];
+ dummy[0] = delim;
+ dummy[1] = '\0';
+ output_delimiter_string = dummy;
@@ -616,9 +633,9 @@ diff -urNp coreutils-8.10-orig/src/cut.c coreutils-8.10/src/cut.c
}
if (optind == argc)
-diff -urNp coreutils-8.10-orig/src/expand.c coreutils-8.10/src/expand.c
---- coreutils-8.10-orig/src/expand.c 2011-01-31 13:40:38.000000000 +0100
-+++ coreutils-8.10/src/expand.c 2011-02-04 20:13:23.990463571 +0100
+diff -urNp coreutils-8.13-orig/src/expand.c coreutils-8.13/src/expand.c
+--- coreutils-8.13-orig/src/expand.c 2011-07-28 12:38:27.000000000 +0200
++++ coreutils-8.13/src/expand.c 2011-09-09 10:23:14.167583399 +0200
@@ -38,12 +38,29 @@
#include <stdio.h>
#include <getopt.h>
@@ -806,9 +823,9 @@ diff -urNp coreutils-8.10-orig/src/expand.c coreutils-8.10/src/expand.c
if (have_read_stdin && fclose (stdin) != 0)
error (EXIT_FAILURE, errno, "-");
-diff -urNp coreutils-8.10-orig/src/fold.c coreutils-8.10/src/fold.c
---- coreutils-8.10-orig/src/fold.c 2011-01-31 13:40:38.000000000 +0100
-+++ coreutils-8.10/src/fold.c 2011-02-04 20:13:23.992463115 +0100
+diff -urNp coreutils-8.13-orig/src/fold.c coreutils-8.13/src/fold.c
+--- coreutils-8.13-orig/src/fold.c 2011-07-28 12:38:27.000000000 +0200
++++ coreutils-8.13/src/fold.c 2011-09-09 10:23:14.169583741 +0200
@@ -22,12 +22,34 @@
#include <getopt.h>
#include <sys/types.h>
@@ -1179,7 +1196,7 @@ diff -urNp coreutils-8.10-orig/src/fold.c coreutils-8.10/src/fold.c
if (ferror (istream))
{
error (0, saved_errno, "%s", filename);
-@@ -254,7 +502,8 @@ main (int argc, char **argv)
+@@ -254,7 +501,8 @@ main (int argc, char **argv)
atexit (close_stdout);
@@ -1189,7 +1206,7 @@ diff -urNp coreutils-8.10-orig/src/fold.c coreutils-8.10/src/fold.c
while ((optc = getopt_long (argc, argv, shortopts, longopts, NULL)) != -1)
{
-@@ -263,7 +512,15 @@ main (int argc, char **argv)
+@@ -263,7 +511,15 @@ main (int argc, char **argv)
switch (optc)
{
case 'b': /* Count bytes rather than columns. */
@@ -1206,9 +1223,9 @@ diff -urNp coreutils-8.10-orig/src/fold.c coreutils-8.10/src/fold.c
break;
case 's': /* Break at word boundaries. */
-diff -urNp coreutils-8.10-orig/src/join.c coreutils-8.10/src/join.c
---- coreutils-8.10-orig/src/join.c 2011-01-31 13:40:38.000000000 +0100
-+++ coreutils-8.10/src/join.c 2011-02-04 20:20:15.985114387 +0100
+diff -urNp coreutils-8.13-orig/src/join.c coreutils-8.13/src/join.c
+--- coreutils-8.13-orig/src/join.c 2011-08-08 10:16:09.000000000 +0200
++++ coreutils-8.13/src/join.c 2011-09-09 10:23:14.172687087 +0200
@@ -22,18 +22,32 @@
#include <sys/types.h>
#include <getopt.h>
@@ -1243,7 +1260,7 @@ diff -urNp coreutils-8.10-orig/src/join.c coreutils-8.10/src/join.c
/* The official name of this program (e.g., no `g' prefix). */
#define PROGRAM_NAME "join"
-@@ -129,10 +143,12 @@ static struct outlist outlist_head;
+@@ -135,10 +149,12 @@ static struct outlist outlist_head;
/* Last element in `outlist', where a new element can be added. */
static struct outlist *outlist_end = &outlist_head;
@@ -1260,7 +1277,7 @@ diff -urNp coreutils-8.10-orig/src/join.c coreutils-8.10/src/join.c
/* If nonzero, check that the input is correctly ordered. */
static enum
-@@ -257,13 +273,14 @@ xfields (struct line *line)
+@@ -263,13 +279,14 @@ xfields (struct line *line)
if (ptr == lim)
return;
@@ -1278,7 +1295,7 @@ diff -urNp coreutils-8.10-orig/src/join.c coreutils-8.10/src/join.c
{
/* Skip leading blanks before the first field. */
while (isblank (to_uchar (*ptr)))
-@@ -287,6 +304,148 @@ xfields (struct line *line)
+@@ -293,6 +310,148 @@ xfields (struct line *line)
extract_field (line, ptr, lim - ptr);
}
@@ -1427,7 +1444,7 @@ diff -urNp coreutils-8.10-orig/src/join.c coreutils-8.10/src/join.c
static void
freeline (struct line *line)
{
-@@ -308,56 +467,115 @@ keycmp (struct line const *line1, struct
+@@ -314,56 +473,115 @@ keycmp (struct line const *line1, struct
size_t jf_1, size_t jf_2)
{
/* Start of field to compare in each file. */
@@ -1551,7 +1568,7 @@ diff -urNp coreutils-8.10-orig/src/join.c coreutils-8.10/src/join.c
- return xmemcoll (beg1, len1, beg2, len2);
- diff = memcmp (beg1, beg2, MIN (len1, len2));
+ copy[0] = (unsigned char *) beg[0];
-+ copy[1] = (unsigned char *) beg[1];
++ copy[1] = (unsigned char *) beg[1];
}
+ if (hard_LC_COLLATE)
@@ -1566,9 +1583,9 @@ diff -urNp coreutils-8.10-orig/src/join.c coreutils-8.10/src/join.c
}
/* Check that successive input lines PREV and CURRENT from input file
-@@ -438,6 +656,11 @@ get_line (FILE *fp, struct line **linep,
- return false;
+@@ -455,6 +673,11 @@ get_line (FILE *fp, struct line **linep,
}
+ ++line_no[which - 1];
+#if HAVE_MBRTOWC
+ if (MB_CUR_MAX > 1)
@@ -1578,7 +1595,7 @@ diff -urNp coreutils-8.10-orig/src/join.c coreutils-8.10/src/join.c
xfields (line);
if (prevline[which - 1])
-@@ -537,21 +760,28 @@ prfield (size_t n, struct line const *li
+@@ -554,21 +777,28 @@ prfield (size_t n, struct line const *li
/* Output all the fields in line, other than the join field. */
@@ -1610,7 +1627,7 @@ diff -urNp coreutils-8.10-orig/src/join.c coreutils-8.10/src/join.c
prfield (i, line);
}
}
-@@ -562,7 +792,6 @@ static void
+@@ -579,7 +809,6 @@ static void
prjoin (struct line const *line1, struct line const *line2)
{
const struct outlist *outlist;
@@ -1618,7 +1635,7 @@ diff -urNp coreutils-8.10-orig/src/join.c coreutils-8.10/src/join.c
size_t field;
struct line const *line;
-@@ -596,7 +825,7 @@ prjoin (struct line const *line1, struct
+@@ -613,7 +842,7 @@ prjoin (struct line const *line1, struct
o = o->next;
if (o == NULL)
break;
@@ -1627,12 +1644,12 @@ diff -urNp coreutils-8.10-orig/src/join.c coreutils-8.10/src/join.c
}
putchar ('\n');
}
-@@ -1075,21 +1304,46 @@ main (int argc, char **argv)
+@@ -1091,21 +1320,46 @@ main (int argc, char **argv)
case 't':
{
- unsigned char newtab = optarg[0];
-+ char *newtab;
++ char *newtab = NULL;
+ size_t newtablen;
+ newtab = xstrdup (optarg);
+#if HAVE_MBRTOWC
@@ -1654,7 +1671,8 @@ diff -urNp coreutils-8.10-orig/src/join.c coreutils-8.10/src/join.c
+ newtablen = 1;
if (! newtab)
+ {
- newtab = '\n'; /* '' => process the whole line. */
+- newtab = '\n'; /* '' => process the whole line. */
++ newtab = "\n"; /* '' => process the whole line. */
+ }
else if (optarg[1])
{
@@ -1683,9 +1701,9 @@ diff -urNp coreutils-8.10-orig/src/join.c coreutils-8.10/src/join.c
break;
case NOCHECK_ORDER_OPTION:
-diff -urNp coreutils-8.10-orig/src/pr.c coreutils-8.10/src/pr.c
---- coreutils-8.10-orig/src/pr.c 2011-01-31 13:40:38.000000000 +0100
-+++ coreutils-8.10/src/pr.c 2011-02-04 20:13:24.002460897 +0100
+diff -urNp coreutils-8.13-orig/src/pr.c coreutils-8.13/src/pr.c
+--- coreutils-8.13-orig/src/pr.c 2011-08-30 23:01:40.000000000 +0200
++++ coreutils-8.13/src/pr.c 2011-09-09 10:23:14.177658905 +0200
@@ -312,6 +312,32 @@
#include <getopt.h>
@@ -2408,9 +2426,9 @@ diff -urNp coreutils-8.10-orig/src/pr.c coreutils-8.10/src/pr.c
/* We've just printed some files and need to clean up things before
looking for more options and printing the next batch of files.
-diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c
---- coreutils-8.10-orig/src/sort.c 2011-02-03 11:24:35.000000000 +0100
-+++ coreutils-8.10/src/sort.c 2011-02-04 20:15:44.160384535 +0100
+diff -urNp coreutils-8.13-orig/src/sort.c coreutils-8.13/src/sort.c
+--- coreutils-8.13-orig/src/sort.c 2011-07-29 10:12:25.000000000 +0200
++++ coreutils-8.13/src/sort.c 2011-09-09 10:23:14.183686800 +0200
@@ -22,11 +22,20 @@
#include <config.h>
@@ -2432,7 +2450,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c
#include "system.h"
#include "argmatch.h"
#include "error.h"
-@@ -163,12 +172,34 @@ static int thousands_sep;
+@@ -167,12 +176,34 @@ static int thousands_sep;
/* Nonzero if the corresponding locales are hard. */
static bool hard_LC_COLLATE;
@@ -2468,7 +2486,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c
/* The kind of blanks for '-b' to skip in various options. */
enum blanktype { bl_start, bl_end, bl_both };
-@@ -335,13 +366,11 @@ static bool reverse;
+@@ -343,13 +374,11 @@ static bool reverse;
they were read if all keys compare equal. */
static bool stable;
@@ -2485,7 +2503,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c
/* Flag to remove consecutive duplicate lines from the output.
Only the last of a sequence of equal lines will be output. */
-@@ -775,6 +804,46 @@ reap_all (void)
+@@ -783,6 +812,46 @@ reap_all (void)
reap (-1);
}
@@ -2532,7 +2550,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c
/* Clean up any remaining temporary files. */
static void
-@@ -1207,7 +1276,7 @@ zaptemp (char const *name)
+@@ -1215,7 +1284,7 @@ zaptemp (char const *name)
free (node);
}
@@ -2541,7 +2559,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c
static int
struct_month_cmp (void const *m1, void const *m2)
-@@ -1222,7 +1291,7 @@ struct_month_cmp (void const *m1, void c
+@@ -1230,7 +1299,7 @@ struct_month_cmp (void const *m1, void c
/* Initialize the character class tables. */
static void
@@ -2550,7 +2568,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c
{
size_t i;
-@@ -1234,7 +1303,7 @@ inittables (void)
+@@ -1242,7 +1311,7 @@ inittables (void)
fold_toupper[i] = toupper (i);
}
@@ -2559,7 +2577,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c
/* If we're not in the "C" locale, read different names for months. */
if (hard_LC_TIME)
{
-@@ -1316,6 +1385,84 @@ specify_nmerge (int oi, char c, char con
+@@ -1324,6 +1393,84 @@ specify_nmerge (int oi, char c, char con
xstrtol_fatal (e, oi, c, long_options, s);
}
@@ -2644,7 +2662,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c
/* Specify the amount of main memory to use when sorting. */
static void
specify_sort_size (int oi, char c, char const *s)
-@@ -1544,7 +1691,7 @@ buffer_linelim (struct buffer const *buf
+@@ -1552,7 +1699,7 @@ buffer_linelim (struct buffer const *buf
by KEY in LINE. */
static char *
@@ -2653,7 +2671,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c
{
char *ptr = line->text, *lim = ptr + line->length - 1;
size_t sword = key->sword;
-@@ -1553,10 +1700,10 @@ begfield (struct line const *line, struc
+@@ -1561,10 +1708,10 @@ begfield (struct line const *line, struc
/* The leading field separator itself is included in a field when -t
is absent. */
@@ -2666,7 +2684,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c
++ptr;
if (ptr < lim)
++ptr;
-@@ -1582,11 +1729,70 @@ begfield (struct line const *line, struc
+@@ -1590,11 +1737,70 @@ begfield (struct line const *line, struc
return ptr;
}
@@ -2738,7 +2756,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c
{
char *ptr = line->text, *lim = ptr + line->length - 1;
size_t eword = key->eword, echar = key->echar;
-@@ -1601,10 +1807,10 @@ limfield (struct line const *line, struc
+@@ -1609,10 +1815,10 @@ limfield (struct line const *line, struc
`beginning' is the first character following the delimiting TAB.
Otherwise, leave PTR pointing at the first `blank' character after
the preceding field. */
@@ -2751,7 +2769,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c
++ptr;
if (ptr < lim && (eword || echar))
++ptr;
-@@ -1650,10 +1856,10 @@ limfield (struct line const *line, struc
+@@ -1658,10 +1864,10 @@ limfield (struct line const *line, struc
*/
/* Make LIM point to the end of (one byte past) the current field. */
@@ -2764,7 +2782,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c
if (newlim)
lim = newlim;
}
-@@ -1684,6 +1890,130 @@ limfield (struct line const *line, struc
+@@ -1692,6 +1898,130 @@ limfield (struct line const *line, struc
return ptr;
}
@@ -2895,7 +2913,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c
/* Fill BUF reading from FP, moving buf->left bytes from the end
of buf->buf to the beginning first. If EOF is reached and the
file wasn't terminated by a newline, supply one. Set up BUF's line
-@@ -1770,8 +2100,22 @@ fillbuf (struct buffer *buf, FILE *fp, c
+@@ -1778,8 +2108,22 @@ fillbuf (struct buffer *buf, FILE *fp, c
else
{
if (key->skipsblanks)
@@ -2920,7 +2938,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c
line->keybeg = line_start;
}
}
-@@ -1892,7 +2236,7 @@ human_numcompare (char const *a, char co
+@@ -1900,7 +2244,7 @@ human_numcompare (char const *a, char co
hideously fast. */
static int
@@ -2929,7 +2947,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c
{
while (blanks[to_uchar (*a)])
a++;
-@@ -1902,6 +2246,25 @@ numcompare (char const *a, char const *b
+@@ -1910,6 +2254,25 @@ numcompare (char const *a, char const *b
return strnumcmp (a, b, decimal_point, thousands_sep);
}
@@ -2955,7 +2973,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c
static int
general_numcompare (char const *sa, char const *sb)
{
-@@ -1934,7 +2297,7 @@ general_numcompare (char const *sa, char
+@@ -1942,7 +2305,7 @@ general_numcompare (char const *sa, char
Return 0 if the name in S is not recognized. */
static int
@@ -2964,7 +2982,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c
{
size_t lo = 0;
size_t hi = MONTHS_PER_YEAR;
-@@ -2209,15 +2572,14 @@ debug_key (struct line const *line, stru
+@@ -2217,15 +2580,14 @@ debug_key (struct line const *line, stru
char saved = *lim;
*lim = '\0';
@@ -2982,7 +3000,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c
else if (key->general_numeric)
ignore_value (strtold (beg, &tighter_lim));
else if (key->numeric || key->human_numeric)
-@@ -2361,7 +2723,7 @@ key_warnings (struct keyfield const *gke
+@@ -2369,7 +2731,7 @@ key_warnings (struct keyfield const *gke
bool maybe_space_aligned = !hard_LC_COLLATE && default_key_compare (key)
&& !(key->schar || key->echar);
bool line_offset = key->eword == 0 && key->echar != 0; /* -k1.x,1.y */
@@ -2991,7 +3009,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c
&& ((!key->skipsblanks && !(implicit_skip || maybe_space_aligned))
|| (!key->skipsblanks && key->schar)
|| (!key->skipeblanks && key->echar)))
-@@ -2419,11 +2781,83 @@ key_warnings (struct keyfield const *gke
+@@ -2427,11 +2789,83 @@ key_warnings (struct keyfield const *gke
error (0, 0, _("option `-r' only applies to last-resort comparison"));
}
@@ -3076,7 +3094,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c
{
struct keyfield *key = keylist;
-@@ -2508,7 +2942,7 @@ keycompare (struct line const *a, struct
+@@ -2516,7 +2950,7 @@ keycompare (struct line const *a, struct
else if (key->human_numeric)
diff = human_numcompare (ta, tb);
else if (key->month)
@@ -3085,7 +3103,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c
else if (key->random)
diff = compare_random (ta, tlena, tb, tlenb);
else if (key->version)
-@@ -2624,6 +3058,179 @@ keycompare (struct line const *a, struct
+@@ -2632,6 +3066,180 @@ keycompare (struct line const *a, struct
return key->reverse ? -diff : diff;
}
@@ -3167,7 +3185,8 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c
+ if (MBLENGTH == (size_t)-2 || MBLENGTH == (size_t)-1) \
+ STATE = state_bak; \
+ if (!ignore) \
-+ COPY[NEW_LEN++] = TEXT[i++]; \
++ COPY[NEW_LEN++] = TEXT[i]; \
++ i++; \
+ continue; \
+ } \
+ \
@@ -3265,7 +3284,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c
/* Compare two lines A and B, returning negative, zero, or positive
depending on whether A compares less than, equal to, or greater than B. */
-@@ -4087,7 +4694,7 @@ main (int argc, char **argv)
+@@ -4095,7 +4702,7 @@ main (int argc, char **argv)
initialize_exit_failure (SORT_FAILURE);
hard_LC_COLLATE = hard_locale (LC_COLLATE);
@@ -3274,7 +3293,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c
hard_LC_TIME = hard_locale (LC_TIME);
#endif
-@@ -4108,6 +4715,29 @@ main (int argc, char **argv)
+@@ -4116,6 +4723,29 @@ main (int argc, char **argv)
thousands_sep = -1;
}
@@ -3304,7 +3323,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c
have_read_stdin = false;
inittables ();
-@@ -4378,13 +5008,34 @@ main (int argc, char **argv)
+@@ -4386,13 +5016,34 @@ main (int argc, char **argv)
case 't':
{
@@ -3343,7 +3362,7 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c
else
{
/* Provoke with `sort -txx'. Complain about
-@@ -4395,9 +5046,12 @@ main (int argc, char **argv)
+@@ -4403,9 +5054,12 @@ main (int argc, char **argv)
quote (optarg));
}
}
@@ -3358,9 +3377,9 @@ diff -urNp coreutils-8.10-orig/src/sort.c coreutils-8.10/src/sort.c
}
break;
-diff -urNp coreutils-8.10-orig/src/unexpand.c coreutils-8.10/src/unexpand.c
---- coreutils-8.10-orig/src/unexpand.c 2011-01-31 13:40:38.000000000 +0100
-+++ coreutils-8.10/src/unexpand.c 2011-02-04 20:13:24.015458014 +0100
+diff -urNp coreutils-8.13-orig/src/unexpand.c coreutils-8.13/src/unexpand.c
+--- coreutils-8.13-orig/src/unexpand.c 2011-07-28 12:38:27.000000000 +0200
++++ coreutils-8.13/src/unexpand.c 2011-09-09 10:23:14.185647633 +0200
@@ -39,12 +39,29 @@
#include <stdio.h>
#include <getopt.h>
@@ -3614,9 +3633,9 @@ diff -urNp coreutils-8.10-orig/src/unexpand.c coreutils-8.10/src/unexpand.c
if (have_read_stdin && fclose (stdin) != 0)
error (EXIT_FAILURE, errno, "-");
-diff -urNp coreutils-8.10-orig/src/uniq.c coreutils-8.10/src/uniq.c
---- coreutils-8.10-orig/src/uniq.c 2011-01-31 13:40:38.000000000 +0100
-+++ coreutils-8.10/src/uniq.c 2011-02-04 20:13:24.018457349 +0100
+diff -urNp coreutils-8.13-orig/src/uniq.c coreutils-8.13/src/uniq.c
+--- coreutils-8.13-orig/src/uniq.c 2011-07-28 12:38:27.000000000 +0200
++++ coreutils-8.13/src/uniq.c 2011-09-09 10:24:19.631560964 +0200
@@ -21,6 +21,16 @@
#include <getopt.h>
#include <sys/types.h>
@@ -3669,7 +3688,7 @@ diff -urNp coreutils-8.10-orig/src/uniq.c coreutils-8.10/src/uniq.c
@@ -207,7 +233,7 @@ size_opt (char const *opt, char const *m
return a pointer to the beginning of the line's field to be compared. */
- static char *
+ static char * _GL_ATTRIBUTE_PURE
-find_field (struct linebuffer const *line)
+find_field_uni (struct linebuffer *line)
{
@@ -3952,7 +3971,7 @@ diff -urNp coreutils-8.10-orig/src/uniq.c coreutils-8.10/src/uniq.c
match = !different (thisfield, prevfield, thislen, prevlen);
match_count += match;
-@@ -383,6 +612,9 @@ check_file (const char *infile, const ch
+@@ -383,6 +611,9 @@ check_file (const char *infile, const ch
SWAP_LINES (prevline, thisline);
prevfield = thisfield;
prevlen = thislen;
@@ -3962,7 +3981,7 @@ diff -urNp coreutils-8.10-orig/src/uniq.c coreutils-8.10/src/uniq.c
if (!match)
match_count = 0;
}
-@@ -428,6 +660,19 @@ main (int argc, char **argv)
+@@ -428,6 +659,19 @@ main (int argc, char **argv)
atexit (close_stdout);
@@ -3982,10 +4001,10 @@ diff -urNp coreutils-8.10-orig/src/uniq.c coreutils-8.10/src/uniq.c
skip_chars = 0;
skip_fields = 0;
check_chars = SIZE_MAX;
-diff -urNp coreutils-8.10-orig/tests/Makefile.am coreutils-8.10/tests/Makefile.am
---- coreutils-8.10-orig/tests/Makefile.am 2011-02-04 20:12:58.236173903 +0100
-+++ coreutils-8.10/tests/Makefile.am 2011-02-04 20:13:24.020456905 +0100
-@@ -235,6 +235,7 @@ TESTS = \
+diff -urNp coreutils-8.13-orig/tests/Makefile.am coreutils-8.13/tests/Makefile.am
+--- coreutils-8.13-orig/tests/Makefile.am 2011-09-09 10:22:43.352561668 +0200
++++ coreutils-8.13/tests/Makefile.am 2011-09-09 10:23:14.189688942 +0200
+@@ -238,6 +238,7 @@ TESTS = \
misc/sort-debug-keys \
misc/sort-debug-warn \
misc/sort-files0-from \
@@ -3993,7 +4012,7 @@ diff -urNp coreutils-8.10-orig/tests/Makefile.am coreutils-8.10/tests/Makefile.a
misc/sort-float \
misc/sort-merge \
misc/sort-merge-fdlimit \
-@@ -505,6 +506,10 @@ TESTS = \
+@@ -518,6 +519,10 @@ TESTS = \
$(root_tests)
pr_data = \
@@ -4004,10 +4023,21 @@ diff -urNp coreutils-8.10-orig/tests/Makefile.am coreutils-8.10/tests/Makefile.a
pr/0F \
pr/0FF \
pr/0FFnt \
-diff -urNp coreutils-8.10-orig/tests/misc/cut coreutils-8.10/tests/misc/cut
---- coreutils-8.10-orig/tests/misc/cut 2011-01-31 13:40:38.000000000 +0100
-+++ coreutils-8.10/tests/misc/cut 2011-02-04 20:13:24.021456684 +0100
-@@ -26,7 +26,7 @@ use strict;
+diff -urNp coreutils-8.13-orig/tests/misc/cut coreutils-8.13/tests/misc/cut
+--- coreutils-8.13-orig/tests/misc/cut 2011-09-02 14:08:40.000000000 +0200
++++ coreutils-8.13/tests/misc/cut 2011-09-09 10:23:14.190686793 +0200
+@@ -23,14 +23,15 @@ my $mb_locale = $ENV{LOCALE_FR_UTF8};
+ # Turn off localization of executable's output.
+ @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
+
+-my $mb_locale = $ENV{LOCALE_FR_UTF8};
+-! defined $mb_locale || $mb_locale eq 'none'
+- and $mb_locale = 'C';
++#my $mb_locale = $ENV{LOCALE_FR_UTF8};
++#! defined $mb_locale || $mb_locale eq 'none'
++# and $mb_locale = 'C';
++my $mb_locale = 'C';
+
my $prog = 'cut';
my $try = "Try \`$prog --help' for more information.\n";
my $from_1 = "$prog: fields and positions are numbered from 1\n$try";
@@ -4016,7 +4046,7 @@ diff -urNp coreutils-8.10-orig/tests/misc/cut coreutils-8.10/tests/misc/cut
my $no_endpoint = "$prog: invalid range with no endpoint: -\n$try";
my @Tests =
-@@ -143,7 +143,7 @@ my @Tests =
+@@ -147,7 +147,7 @@ my @Tests =
# None of the following invalid ranges provoked an error up to coreutils-6.9.
['inval1', qw(-f 2-0), {IN=>''}, {OUT=>''}, {EXIT=>1},
@@ -4025,41 +4055,41 @@ diff -urNp coreutils-8.10-orig/tests/misc/cut coreutils-8.10/tests/misc/cut
['inval2', qw(-f -), {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}],
['inval3', '-f', '4,-', {IN=>''}, {OUT=>''}, {EXIT=>1}, {ERR=>$no_endpoint}],
['inval4', '-f', '1-2,-', {IN=>''}, {OUT=>''}, {EXIT=>1},
-diff -urNp coreutils-8.10-orig/tests/misc/mb1.I coreutils-8.10/tests/misc/mb1.I
---- coreutils-8.10-orig/tests/misc/mb1.I 1970-01-01 01:00:00.000000000 +0100
-+++ coreutils-8.10/tests/misc/mb1.I 2011-02-04 20:13:24.022456462 +0100
+diff -urNp coreutils-8.13-orig/tests/misc/mb1.I coreutils-8.13/tests/misc/mb1.I
+--- coreutils-8.13-orig/tests/misc/mb1.I 1970-01-01 01:00:00.000000000 +0100
++++ coreutils-8.13/tests/misc/mb1.I 2011-09-09 10:23:14.191687037 +0200
@@ -0,0 +1,4 @@
+Appleï¼ 10
+Bananaï¼ 5
+Citrusï¼ 20
+Cherryï¼ 30
-diff -urNp coreutils-8.10-orig/tests/misc/mb1.X coreutils-8.10/tests/misc/mb1.X
---- coreutils-8.10-orig/tests/misc/mb1.X 1970-01-01 01:00:00.000000000 +0100
-+++ coreutils-8.10/tests/misc/mb1.X 2011-02-04 20:13:24.023456240 +0100
+diff -urNp coreutils-8.13-orig/tests/misc/mb1.X coreutils-8.13/tests/misc/mb1.X
+--- coreutils-8.13-orig/tests/misc/mb1.X 1970-01-01 01:00:00.000000000 +0100
++++ coreutils-8.13/tests/misc/mb1.X 2011-09-09 10:23:14.192581910 +0200
@@ -0,0 +1,4 @@
+Bananaï¼ 5
+Appleï¼ 10
+Citrusï¼ 20
+Cherryï¼ 30
-diff -urNp coreutils-8.10-orig/tests/misc/mb2.I coreutils-8.10/tests/misc/mb2.I
---- coreutils-8.10-orig/tests/misc/mb2.I 1970-01-01 01:00:00.000000000 +0100
-+++ coreutils-8.10/tests/misc/mb2.I 2011-02-04 20:13:24.024456019 +0100
+diff -urNp coreutils-8.13-orig/tests/misc/mb2.I coreutils-8.13/tests/misc/mb2.I
+--- coreutils-8.13-orig/tests/misc/mb2.I 1970-01-01 01:00:00.000000000 +0100
++++ coreutils-8.13/tests/misc/mb2.I 2011-09-09 10:23:14.192581910 +0200
@@ -0,0 +1,4 @@
+Appleï¼ ï¼¡ï¼¡10ï¼ ï¼ 20
+Bananaï¼ ï¼¡ï¼¡5ï¼ ï¼ 30
+Citrusï¼ ï¼¡ï¼¡20ï¼ ï¼ 5
+Cherryï¼ ï¼¡ï¼¡30ï¼ ï¼ 10
-diff -urNp coreutils-8.10-orig/tests/misc/mb2.X coreutils-8.10/tests/misc/mb2.X
---- coreutils-8.10-orig/tests/misc/mb2.X 1970-01-01 01:00:00.000000000 +0100
-+++ coreutils-8.10/tests/misc/mb2.X 2011-02-04 20:13:24.024456019 +0100
+diff -urNp coreutils-8.13-orig/tests/misc/mb2.X coreutils-8.13/tests/misc/mb2.X
+--- coreutils-8.13-orig/tests/misc/mb2.X 1970-01-01 01:00:00.000000000 +0100
++++ coreutils-8.13/tests/misc/mb2.X 2011-09-09 10:23:14.193687456 +0200
@@ -0,0 +1,4 @@
+Citrusï¼ ï¼¡ï¼¡20ï¼ ï¼ 5
+Cherryï¼ ï¼¡ï¼¡30ï¼ ï¼ 10
+Appleï¼ ï¼¡ï¼¡10ï¼ ï¼ 20
+Bananaï¼ ï¼¡ï¼¡5ï¼ ï¼ 30
-diff -urNp coreutils-8.10-orig/tests/misc/sort-mb-tests coreutils-8.10/tests/misc/sort-mb-tests
---- coreutils-8.10-orig/tests/misc/sort-mb-tests 1970-01-01 01:00:00.000000000 +0100
-+++ coreutils-8.10/tests/misc/sort-mb-tests 2011-02-04 20:13:24.025455797 +0100
+diff -urNp coreutils-8.13-orig/tests/misc/sort-mb-tests coreutils-8.13/tests/misc/sort-mb-tests
+--- coreutils-8.13-orig/tests/misc/sort-mb-tests 1970-01-01 01:00:00.000000000 +0100
++++ coreutils-8.13/tests/misc/sort-mb-tests 2011-09-09 10:23:14.194687565 +0200
@@ -0,0 +1,58 @@
+#! /bin/sh
+case $# in
@@ -4079,7 +4109,7 @@ diff -urNp coreutils-8.10-orig/tests/misc/sort-mb-tests coreutils-8.10/tests/mis
+$xx -t ï¼ -k2 -n misc/mb1.I > misc/mb1.O
+code=$?
+if test $code != 0; then
-+ $echo "Test mb1 failed: $xx return code $code differs from expected value 0" 1>&2
++ $echo "Test mb1 failed: $xx return code $code differs from expected value 0"
+ errors=`expr $errors + 1`
+else
+ cmp misc/mb1.O $srcdir/misc/mb1.X > /dev/null 2>&1
diff --git a/coreutils/patches/coreutils-selinux.patch b/coreutils/patches/coreutils-selinux.patch
index 0c6c51e..7ebce30 100644
--- a/coreutils/patches/coreutils-selinux.patch
+++ b/coreutils/patches/coreutils-selinux.patch
@@ -1,7 +1,7 @@
-diff -urNp coreutils-8.11-orig/configure.ac coreutils-8.11/configure.ac
---- coreutils-8.11-orig/configure.ac 2011-04-14 11:05:27.511308852 +0200
-+++ coreutils-8.11/configure.ac 2011-04-14 11:06:05.481433832 +0200
-@@ -132,6 +132,13 @@ if test "$gl_gcc_warnings" = yes; then
+diff -urNp coreutils-8.13-orig/configure.ac coreutils-8.13/configure.ac
+--- coreutils-8.13-orig/configure.ac 2011-09-09 10:29:52.584690353 +0200
++++ coreutils-8.13/configure.ac 2011-09-09 10:30:39.524564991 +0200
+@@ -141,6 +141,13 @@ if test "$gl_gcc_warnings" = yes; then
AC_SUBST([GNULIB_TEST_WARN_CFLAGS])
fi
@@ -15,18 +15,18 @@ diff -urNp coreutils-8.11-orig/configure.ac coreutils-8.11/configure.ac
AC_FUNC_FORK
AC_ARG_ENABLE(pam, AS_HELP_STRING([--disable-pam],
-diff -urNp coreutils-8.11-orig/man/chcon.x coreutils-8.11/man/chcon.x
---- coreutils-8.11-orig/man/chcon.x 2009-09-01 13:01:16.000000000 +0200
-+++ coreutils-8.11/man/chcon.x 2011-04-14 11:06:05.482433878 +0200
+diff -urNp coreutils-8.13-orig/man/chcon.x coreutils-8.13/man/chcon.x
+--- coreutils-8.13-orig/man/chcon.x 2009-09-01 13:01:16.000000000 +0200
++++ coreutils-8.13/man/chcon.x 2011-09-09 10:30:39.524564991 +0200
@@ -1,4 +1,4 @@
[NAME]
-chcon \- change file security context
+chcon \- change file SELinux security context
[DESCRIPTION]
.\" Add any additional description here
-diff -urNp coreutils-8.11-orig/man/runcon.x coreutils-8.11/man/runcon.x
---- coreutils-8.11-orig/man/runcon.x 2009-09-01 13:01:16.000000000 +0200
-+++ coreutils-8.11/man/runcon.x 2011-04-14 11:06:05.483445779 +0200
+diff -urNp coreutils-8.13-orig/man/runcon.x coreutils-8.13/man/runcon.x
+--- coreutils-8.13-orig/man/runcon.x 2009-09-01 13:01:16.000000000 +0200
++++ coreutils-8.13/man/runcon.x 2011-09-09 10:30:39.544686472 +0200
@@ -1,5 +1,5 @@
[NAME]
-runcon \- run command with specified security context
@@ -34,9 +34,9 @@ diff -urNp coreutils-8.11-orig/man/runcon.x coreutils-8.11/man/runcon.x
[DESCRIPTION]
Run COMMAND with completely-specified CONTEXT, or with current or
transitioned security context modified by one or more of LEVEL,
-diff -urNp coreutils-8.11-orig/src/chcon.c coreutils-8.11/src/chcon.c
---- coreutils-8.11-orig/src/chcon.c 2011-02-19 18:17:03.000000000 +0100
-+++ coreutils-8.11/src/chcon.c 2011-04-14 11:06:05.489434075 +0200
+diff -urNp coreutils-8.13-orig/src/chcon.c coreutils-8.13/src/chcon.c
+--- coreutils-8.13-orig/src/chcon.c 2011-07-28 12:38:27.000000000 +0200
++++ coreutils-8.13/src/chcon.c 2011-09-09 10:30:39.562561252 +0200
@@ -356,7 +356,7 @@ Usage: %s [OPTION]... CONTEXT FILE...\n\
"),
program_name, program_name, program_name);
@@ -46,10 +46,10 @@ diff -urNp coreutils-8.11-orig/src/chcon.c coreutils-8.11/src/chcon.c
With --reference, change the security context of each FILE to that of RFILE.\n\
\n\
-h, --no-dereference affect symbolic links instead of any referenced file\n\
-diff -urNp coreutils-8.11-orig/src/copy.c coreutils-8.11/src/copy.c
---- coreutils-8.11-orig/src/copy.c 2011-04-12 12:07:43.000000000 +0200
-+++ coreutils-8.11/src/copy.c 2011-04-14 11:06:05.485433752 +0200
-@@ -2179,6 +2179,8 @@ copy_internal (char const *src_name, cha
+diff -urNp coreutils-8.13-orig/src/copy.c coreutils-8.13/src/copy.c
+--- coreutils-8.13-orig/src/copy.c 2011-07-28 12:38:27.000000000 +0200
++++ coreutils-8.13/src/copy.c 2011-09-09 10:30:39.564562214 +0200
+@@ -2244,6 +2244,8 @@ copy_internal (char const *src_name, cha
{
/* Here, we are crossing a file system boundary and cp's -x option
is in effect: so don't copy the contents of this directory. */
@@ -58,9 +58,9 @@ diff -urNp coreutils-8.11-orig/src/copy.c coreutils-8.11/src/copy.c
}
else
{
-diff -urNp coreutils-8.11-orig/src/copy.h coreutils-8.11/src/copy.h
---- coreutils-8.11-orig/src/copy.h 2011-02-19 18:17:03.000000000 +0100
-+++ coreutils-8.11/src/copy.h 2011-04-14 11:06:05.487340225 +0200
+diff -urNp coreutils-8.13-orig/src/copy.h coreutils-8.13/src/copy.h
+--- coreutils-8.13-orig/src/copy.h 2011-07-28 12:38:27.000000000 +0200
++++ coreutils-8.13/src/copy.h 2011-09-09 10:30:39.565563712 +0200
@@ -158,6 +158,9 @@ struct cp_options
bool preserve_mode;
bool preserve_timestamps;
@@ -71,9 +71,9 @@ diff -urNp coreutils-8.11-orig/src/copy.h coreutils-8.11/src/copy.h
/* Enabled for mv, and for cp by the --preserve=links option.
If true, attempt to preserve in the destination files any
logical hard links between the source files. If used with cp's
-diff -urNp coreutils-8.11-orig/src/cp.c coreutils-8.11/src/cp.c
---- coreutils-8.11-orig/src/cp.c 2011-02-19 18:17:03.000000000 +0100
-+++ coreutils-8.11/src/cp.c 2011-04-14 11:06:05.488433894 +0200
+diff -urNp coreutils-8.13-orig/src/cp.c coreutils-8.13/src/cp.c
+--- coreutils-8.13-orig/src/cp.c 2011-07-28 12:38:27.000000000 +0200
++++ coreutils-8.13/src/cp.c 2011-09-09 10:30:39.566562062 +0200
@@ -141,6 +141,7 @@ static struct option const long_opts[] =
{"target-directory", required_argument, NULL, 't'},
{"update", no_argument, NULL, 'u'},
@@ -162,9 +162,9 @@ diff -urNp coreutils-8.11-orig/src/cp.c coreutils-8.11/src/cp.c
case 'S':
make_backups = true;
backup_suffix_string = optarg;
-diff -urNp coreutils-8.11-orig/src/id.c coreutils-8.11/src/id.c
---- coreutils-8.11-orig/src/id.c 2011-02-19 18:17:03.000000000 +0100
-+++ coreutils-8.11/src/id.c 2011-04-14 11:06:05.490435340 +0200
+diff -urNp coreutils-8.13-orig/src/id.c coreutils-8.13/src/id.c
+--- coreutils-8.13-orig/src/id.c 2011-07-28 12:38:27.000000000 +0200
++++ coreutils-8.13/src/id.c 2011-09-09 10:30:39.567562153 +0200
@@ -107,7 +107,7 @@ int
main (int argc, char **argv)
{
@@ -174,9 +174,9 @@ diff -urNp coreutils-8.11-orig/src/id.c coreutils-8.11/src/id.c
/* If true, output the list of all group IDs. -G */
bool just_group_list = false;
-diff -urNp coreutils-8.11-orig/src/install.c coreutils-8.11/src/install.c
---- coreutils-8.11-orig/src/install.c 2011-04-12 12:07:43.000000000 +0200
-+++ coreutils-8.11/src/install.c 2011-04-14 11:07:58.333433706 +0200
+diff -urNp coreutils-8.13-orig/src/install.c coreutils-8.13/src/install.c
+--- coreutils-8.13-orig/src/install.c 2011-07-28 12:38:27.000000000 +0200
++++ coreutils-8.13/src/install.c 2011-09-09 10:30:39.569562422 +0200
@@ -261,6 +261,7 @@ cp_option_init (struct cp_options *x)
x->data_copy_required = true;
x->require_preserve = false;
@@ -230,10 +230,10 @@ diff -urNp coreutils-8.11-orig/src/install.c coreutils-8.11/src/install.c
use_default_selinux_context = false;
break;
case_GETOPT_HELP_CHAR;
-diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c
---- coreutils-8.11-orig/src/ls.c 2011-04-12 12:07:43.000000000 +0200
-+++ coreutils-8.11/src/ls.c 2011-04-14 11:06:05.498436329 +0200
-@@ -159,7 +159,8 @@ enum filetype
+diff -urNp coreutils-8.13-orig/src/ls.c coreutils-8.13/src/ls.c
+--- coreutils-8.13-orig/src/ls.c 2011-07-28 12:38:27.000000000 +0200
++++ coreutils-8.13/src/ls.c 2011-09-09 10:30:39.575562845 +0200
+@@ -166,7 +166,8 @@ enum filetype
symbolic_link,
sock,
whiteout,
@@ -243,7 +243,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c
};
/* Display letters and indicators for each filetype.
-@@ -276,6 +277,7 @@ static void queue_directory (char const
+@@ -283,6 +284,7 @@ static void queue_directory (char const
static void sort_files (void);
static void parse_ls_color (void);
void usage (int status);
@@ -251,7 +251,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c
/* Initial size of hash table.
Most hierarchies are likely to be shallower than this. */
-@@ -345,7 +347,7 @@ static struct pending *pending_dirs;
+@@ -352,7 +354,7 @@ static struct pending *pending_dirs;
static struct timespec current_time;
@@ -260,7 +260,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c
static char UNKNOWN_SECURITY_CONTEXT[] = "?";
/* Whether any of the files has an ACL. This affects the width of the
-@@ -385,7 +387,9 @@ enum format
+@@ -392,7 +394,9 @@ enum format
one_per_line, /* -1 */
many_per_line, /* -C */
horizontal, /* -x */
@@ -271,7 +271,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c
};
static enum format format;
-@@ -787,6 +791,9 @@ enum
+@@ -794,6 +798,9 @@ enum
SHOW_CONTROL_CHARS_OPTION,
SI_OPTION,
SORT_OPTION,
@@ -281,7 +281,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c
TIME_OPTION,
TIME_STYLE_OPTION
};
-@@ -832,7 +839,9 @@ static struct option const long_options[
+@@ -839,7 +846,9 @@ static struct option const long_options[
{"time-style", required_argument, NULL, TIME_STYLE_OPTION},
{"color", optional_argument, NULL, COLOR_OPTION},
{"block-size", required_argument, NULL, BLOCK_SIZE_OPTION},
@@ -292,7 +292,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c
{"author", no_argument, NULL, AUTHOR_OPTION},
{GETOPT_HELP_OPTION_DECL},
{GETOPT_VERSION_OPTION_DECL},
-@@ -842,12 +851,12 @@ static struct option const long_options[
+@@ -849,12 +858,12 @@ static struct option const long_options[
static char const *const format_args[] =
{
"verbose", "long", "commas", "horizontal", "across",
@@ -307,7 +307,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c
};
ARGMATCH_VERIFY (format_args, format_types);
-@@ -1289,7 +1298,8 @@ main (int argc, char **argv)
+@@ -1296,7 +1305,8 @@ main (int argc, char **argv)
/* Avoid following symbolic links when possible. */
if (is_colored (C_ORPHAN)
|| (is_colored (C_EXEC) && color_symlink_as_referent)
@@ -317,7 +317,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c
check_symlink_color = true;
/* If the standard output is a controlling terminal, watch out
-@@ -1336,7 +1346,7 @@ main (int argc, char **argv)
+@@ -1343,7 +1353,7 @@ main (int argc, char **argv)
if (dereference == DEREF_UNDEFINED)
dereference = ((immediate_dirs
|| indicator_style == classify
@@ -326,7 +326,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c
? DEREF_NEVER
: DEREF_COMMAND_LINE_SYMLINK_TO_DIR);
-@@ -1356,7 +1366,7 @@ main (int argc, char **argv)
+@@ -1363,7 +1373,7 @@ main (int argc, char **argv)
format_needs_stat = sort_type == sort_time || sort_type == sort_size
|| format == long_format
@@ -335,7 +335,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c
|| print_block_size;
format_needs_type = (! format_needs_stat
&& (recursive
-@@ -1387,7 +1397,7 @@ main (int argc, char **argv)
+@@ -1394,7 +1404,7 @@ main (int argc, char **argv)
}
else
do
@@ -344,7 +344,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c
while (i < argc);
if (cwd_n_used)
-@@ -1558,7 +1568,7 @@ decode_switches (int argc, char **argv)
+@@ -1565,7 +1575,7 @@ decode_switches (int argc, char **argv)
ignore_mode = IGNORE_DEFAULT;
ignore_patterns = NULL;
hide_patterns = NULL;
@@ -353,7 +353,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c
/* FIXME: put this in a function. */
{
-@@ -1940,13 +1950,27 @@ decode_switches (int argc, char **argv)
+@@ -1947,13 +1957,27 @@ decode_switches (int argc, char **argv)
break;
case 'Z':
@@ -382,7 +382,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c
default:
usage (LS_FAILURE);
}
-@@ -2691,8 +2715,10 @@ clear_files (void)
+@@ -2714,8 +2738,10 @@ clear_files (void)
struct fileinfo *f = sorted_file[i];
free (f->name);
free (f->linkname);
@@ -395,7 +395,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c
}
cwd_n_used = 0;
-@@ -2734,6 +2760,7 @@ gobble_file (char const *name, enum file
+@@ -2757,6 +2783,7 @@ gobble_file (char const *name, enum file
memset (f, '\0', sizeof *f);
f->stat.st_ino = inode;
f->filetype = type;
@@ -403,7 +403,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c
if (command_line_arg
|| format_needs_stat
-@@ -2843,7 +2870,7 @@ gobble_file (char const *name, enum file
+@@ -2869,7 +2896,7 @@ gobble_file (char const *name, enum file
&& print_with_color && is_colored (C_CAP))
f->has_capability = has_capability (absolute_name);
@@ -412,7 +412,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c
{
bool have_selinux = false;
bool have_acl = false;
-@@ -2866,7 +2893,7 @@ gobble_file (char const *name, enum file
+@@ -2892,7 +2919,7 @@ gobble_file (char const *name, enum file
err = 0;
}
@@ -421,7 +421,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c
{
int n = file_has_acl (absolute_name, &f->stat);
err = (n < 0);
-@@ -2885,7 +2912,8 @@ gobble_file (char const *name, enum file
+@@ -2911,7 +2938,8 @@ gobble_file (char const *name, enum file
}
if (S_ISLNK (f->stat.st_mode)
@@ -431,7 +431,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c
{
char *linkname;
struct stat linkstats;
-@@ -2905,6 +2933,7 @@ gobble_file (char const *name, enum file
+@@ -2931,6 +2959,7 @@ gobble_file (char const *name, enum file
command line are automatically traced if not being
listed as files. */
if (!command_line_arg || format == long_format
@@ -439,7 +439,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c
|| !S_ISDIR (linkstats.st_mode))
{
/* Get the linked-to file's mode for the filetype indicator
-@@ -2944,7 +2973,7 @@ gobble_file (char const *name, enum file
+@@ -2970,7 +2999,7 @@ gobble_file (char const *name, enum file
block_size_width = len;
}
@@ -448,7 +448,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c
{
if (print_owner)
{
-@@ -3445,6 +3474,13 @@ print_current_files (void)
+@@ -3471,6 +3500,13 @@ print_current_files (void)
print_long_format (sorted_file[i]);
DIRED_PUTCHAR ('\n');
}
@@ -462,7 +462,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c
break;
}
}
-@@ -3607,6 +3643,67 @@ format_inode (char *buf, size_t buflen,
+@@ -3633,6 +3669,67 @@ format_inode (char *buf, size_t buflen,
: (char *) "?");
}
@@ -530,7 +530,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c
/* Print information about F in long format. */
static void
print_long_format (const struct fileinfo *f)
-@@ -3698,9 +3795,15 @@ print_long_format (const struct fileinfo
+@@ -3724,9 +3821,15 @@ print_long_format (const struct fileinfo
The latter is wrong when nlink_width is zero. */
p += strlen (p);
@@ -547,7 +547,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c
{
DIRED_FPUTS (buf, stdout, p - buf);
-@@ -3713,9 +3816,6 @@ print_long_format (const struct fileinfo
+@@ -3739,9 +3842,6 @@ print_long_format (const struct fileinfo
if (print_author)
format_user (f->stat.st_author, author_width, f->stat_ok);
@@ -557,7 +557,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c
p = buf;
}
-@@ -4060,9 +4160,6 @@ print_file_name_and_frills (const struct
+@@ -4086,9 +4186,6 @@ print_file_name_and_frills (const struct
: human_readable (ST_NBLOCKS (f->stat), buf, human_output_opts,
ST_NBLOCKSIZE, output_block_size));
@@ -567,7 +567,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c
size_t width = print_name_with_quoting (f, false, NULL, start_col);
if (indicator_style != none)
-@@ -4266,9 +4363,6 @@ length_of_file_name_and_frills (const st
+@@ -4292,9 +4389,6 @@ length_of_file_name_and_frills (const st
output_block_size))
: block_size_width);
@@ -577,7 +577,7 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c
quote_name (NULL, f->name, filename_quoting_options, &name_width);
len += name_width;
-@@ -4707,9 +4801,16 @@ Mandatory arguments to long options are
+@@ -4733,9 +4827,16 @@ Mandatory arguments to long options are
-w, --width=COLS assume screen width instead of current value\n\
-x list entries by lines instead of by columns\n\
-X sort alphabetically by entry extension\n\
@@ -595,9 +595,9 @@ diff -urNp coreutils-8.11-orig/src/ls.c coreutils-8.11/src/ls.c
fputs (HELP_OPTION_DESCRIPTION, stdout);
fputs (VERSION_OPTION_DESCRIPTION, stdout);
emit_size_note ();
-diff -urNp coreutils-8.11-orig/src/mkdir.c coreutils-8.11/src/mkdir.c
---- coreutils-8.11-orig/src/mkdir.c 2011-02-19 18:17:03.000000000 +0100
-+++ coreutils-8.11/src/mkdir.c 2011-04-14 11:06:05.499460276 +0200
+diff -urNp coreutils-8.13-orig/src/mkdir.c coreutils-8.13/src/mkdir.c
+--- coreutils-8.13-orig/src/mkdir.c 2011-07-28 12:38:27.000000000 +0200
++++ coreutils-8.13/src/mkdir.c 2011-09-09 10:30:39.576564256 +0200
@@ -38,6 +38,7 @@
static struct option const longopts[] =
{
@@ -606,9 +606,9 @@ diff -urNp coreutils-8.11-orig/src/mkdir.c coreutils-8.11/src/mkdir.c
{"mode", required_argument, NULL, 'm'},
{"parents", no_argument, NULL, 'p'},
{"verbose", no_argument, NULL, 'v'},
-diff -urNp coreutils-8.11-orig/src/mknod.c coreutils-8.11/src/mknod.c
---- coreutils-8.11-orig/src/mknod.c 2011-02-19 18:17:03.000000000 +0100
-+++ coreutils-8.11/src/mknod.c 2011-04-14 11:06:05.500309648 +0200
+diff -urNp coreutils-8.13-orig/src/mknod.c coreutils-8.13/src/mknod.c
+--- coreutils-8.13-orig/src/mknod.c 2011-07-28 12:38:27.000000000 +0200
++++ coreutils-8.13/src/mknod.c 2011-09-09 10:30:39.577563177 +0200
@@ -35,7 +35,7 @@
static struct option const longopts[] =
@@ -618,9 +618,9 @@ diff -urNp coreutils-8.11-orig/src/mknod.c coreutils-8.11/src/mknod.c
{"mode", required_argument, NULL, 'm'},
{GETOPT_HELP_OPTION_DECL},
{GETOPT_VERSION_OPTION_DECL},
-diff -urNp coreutils-8.11-orig/src/mv.c coreutils-8.11/src/mv.c
---- coreutils-8.11-orig/src/mv.c 2011-02-19 18:17:03.000000000 +0100
-+++ coreutils-8.11/src/mv.c 2011-04-14 11:06:05.501309664 +0200
+diff -urNp coreutils-8.13-orig/src/mv.c coreutils-8.13/src/mv.c
+--- coreutils-8.13-orig/src/mv.c 2011-07-28 12:38:27.000000000 +0200
++++ coreutils-8.13/src/mv.c 2011-09-09 10:30:39.578562234 +0200
@@ -118,6 +118,7 @@ cp_option_init (struct cp_options *x)
x->preserve_mode = true;
x->preserve_timestamps = true;
@@ -629,9 +629,9 @@ diff -urNp coreutils-8.11-orig/src/mv.c coreutils-8.11/src/mv.c
x->reduce_diagnostics = false;
x->data_copy_required = true;
x->require_preserve = false; /* FIXME: maybe make this an option */
-diff -urNp coreutils-8.11-orig/src/runcon.c coreutils-8.11/src/runcon.c
---- coreutils-8.11-orig/src/runcon.c 2011-02-19 18:17:03.000000000 +0100
-+++ coreutils-8.11/src/runcon.c 2011-04-14 11:06:05.502310854 +0200
+diff -urNp coreutils-8.13-orig/src/runcon.c coreutils-8.13/src/runcon.c
+--- coreutils-8.13-orig/src/runcon.c 2011-07-28 12:38:27.000000000 +0200
++++ coreutils-8.13/src/runcon.c 2011-09-09 10:30:39.579564283 +0200
@@ -86,7 +86,7 @@ Usage: %s CONTEXT COMMAND [args]\n\
or: %s [ -c ] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] COMMAND [args]\n\
"), program_name, program_name);
@@ -641,10 +641,10 @@ diff -urNp coreutils-8.11-orig/src/runcon.c coreutils-8.11/src/runcon.c
With neither CONTEXT nor COMMAND, print the current security context.\n\
\n\
CONTEXT Complete security context\n\
-diff -urNp coreutils-8.11-orig/tests/init.cfg coreutils-8.11/tests/init.cfg
---- coreutils-8.11-orig/tests/init.cfg 2011-04-12 12:07:43.000000000 +0200
-+++ coreutils-8.11/tests/init.cfg 2011-04-14 11:06:05.503308646 +0200
-@@ -231,8 +231,8 @@ require_selinux_()
+diff -urNp coreutils-8.13-orig/tests/init.cfg coreutils-8.13/tests/init.cfg
+--- coreutils-8.13-orig/tests/init.cfg 2011-09-07 18:00:55.000000000 +0200
++++ coreutils-8.13/tests/init.cfg 2011-09-09 10:32:17.031688699 +0200
+@@ -253,8 +253,8 @@ require_selinux_()
# Independent of whether SELinux is enabled system-wide,
# the current file system may lack SELinux support.
@@ -652,12 +652,12 @@ diff -urNp coreutils-8.11-orig/tests/init.cfg coreutils-8.11/tests/init.cfg
- '? .'|'unlabeled .')
+ case `ls -Zd . | cut -f4 -d" "` in
+ '?'|'unlabeled')
- skip_test_ "this system (or maybe just" \
+ skip_ "this system (or maybe just" \
"the current file system) lacks SELinux support"
;;
-diff -urNp coreutils-8.11-orig/tests/misc/selinux coreutils-8.11/tests/misc/selinux
---- coreutils-8.11-orig/tests/misc/selinux 2011-01-31 13:40:38.000000000 +0100
-+++ coreutils-8.11/tests/misc/selinux 2011-04-14 11:06:05.504353757 +0200
+diff -urNp coreutils-8.13-orig/tests/misc/selinux coreutils-8.13/tests/misc/selinux
+--- coreutils-8.13-orig/tests/misc/selinux 2011-08-08 09:42:16.000000000 +0200
++++ coreutils-8.13/tests/misc/selinux 2011-09-09 10:30:39.586563144 +0200
@@ -37,7 +37,7 @@ chcon $ctx f d p ||
# inspect that context with both ls -Z and stat.
diff --git a/grub/grub.nm b/grub/grub.nm
index 2730668..4adffac 100644
--- a/grub/grub.nm
+++ b/grub/grub.nm
@@ -4,8 +4,8 @@
###############################################################################
name = grub
-version = 1.98
-release = 6
+version = 1.99
+release = 1
groups = Base System/Boot
url = http://www.gnu.org/software/grub/
@@ -19,7 +19,7 @@ description
systems.
end
-source_dl =
+source_dl = http://ftp.gnu.org/gnu/grub/
build
requires
@@ -30,45 +30,33 @@ build
freetype-devel
gettext
ncurses-devel
- xorg-x11-fonts
zlib-devel
end
- CFLAGS += -fno-strict-aliasing
+ # Can only use very basic CFLAGS.
+ export CFLAGS = -O2 -pipe
+ export CXXFLAGS = %{CFLAGS}
configure_options += \
--sysconfdir=/etc \
- --with-platform=pc \
- --enable-grub-emu
-
- prepare_cmds
- sed -e "s@ GNU/Linux\"@\"@" -i util/grub.d/10_linux.in
- end
+ --sbindir=/sbin \
+ --with-platform=pc
install
make install DESTDIR=%{BUILDROOT}
- sed -e "s/pkgdatadir/pkglibdir/g" -i %{BUILDROOT}/usr/sbin/grub-install
-
- mkdir -pv %{BUILDROOT}/boot/grub
-
# Install theme file
install -m 0744 %{DIR_SOURCE}/05_theme %{BUILDROOT}/etc/grub.d/
# Install splash background
+ mkdir -pv %{BUILDROOT}/boot/grub
install %{DIR_SOURCE}/splash.png %{BUILDROOT}/boot/grub
-
- # XXX - We will have to do this after the installation of the package by pakfire
- # Generate grub compatible font for graphical boot menu
- # This only converts Latin-1, Latin Extended A+B, Arrows, Box and Block characters
- %{BUILDROOT}/usr/bin/grub-mkfont --output=%{BUILDROOT}/boot/grub/unifont.pf2 \
- --range=0x0000-0x0241,0x2190-0x21FF,0x2500-0x259f /usr/share/X11/fonts/misc/unifont.pcf.gz
end
end
quality-agent
whitelist_nx
- /usr/bin/*|/usr/sbin/*
+ /sbin/*|/usr/bin/*
end
end
@@ -77,6 +65,14 @@ packages
requires
gettext
os-prober
+ /usr/share/X11/fonts/misc/unifont.pcf.gz
+ end
+
+ # Generate grub compatible font for graphical boot menu
+ # This only converts Latin-1, Latin Extended A+B, Arrows, Box and Block characters
+ script postin
+ /usr/bin/grub-mkfont --output /boot/grub/unifont.pf2 \
+ --range=0x0000-0x0241,0x2190-0x21FF,0x2500-0x259f /usr/share/X11/fonts/misc/unifont.pcf.gz
end
end
end
diff --git a/grub/patches/grub-1.97.1-initramfs.patch b/grub/patches/grub-1.97.1-initramfs.patch
deleted file mode 100644
index 85570f0..0000000
--- a/grub/patches/grub-1.97.1-initramfs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -uNr grub-1.97.1-orig/util/grub.d/10_linux.in grub-1.97.1/util/grub.d/10_linux.in
---- grub-1.97.1-orig/util/grub.d/10_linux.in 2009-11-09 09:48:16.000000000 -0600
-+++ grub-1.97.1/util/grub.d/10_linux.in 2009-12-01 15:28:16.000000000 -0600
-@@ -78,7 +78,8 @@
- initrd=
- for i in "initrd.img-${version}" "initrd-${version}.img" \
- "initrd-${version}" "initrd.img-${alt_version}" \
-- "initrd-${alt_version}.img" "initrd-${alt_version}"; do
-+ "initrd-${alt_version}.img" "initrd-${alt_version}" \
-+ "initramfs-${version}.img" ; do
- if test -e "${dirname}/${i}" ; then
- initrd="$i"
- break
diff --git a/grub/patches/grub-1.98-GRUB_DISTRIBUTOR-spaces-fix-1.patch0 b/grub/patches/grub-1.98-GRUB_DISTRIBUTOR-spaces-fix-1.patch0
deleted file mode 100644
index d3d0727..0000000
--- a/grub/patches/grub-1.98-GRUB_DISTRIBUTOR-spaces-fix-1.patch0
+++ /dev/null
@@ -1,39 +0,0 @@
-=== modified file 'util/grub.d/10_hurd.in'
---- util/grub.d/10_hurd.in 2010-02-03 00:24:07 +0000
-+++ util/grub.d/10_hurd.in 2010-04-08 09:54:44 +0000
-@@ -27,7 +27,7 @@
- OS=GNU
- else
- OS="${GRUB_DISTRIBUTOR} GNU/Hurd"
-- CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]') ${CLASS}"
-+ CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) ${CLASS}"
- fi
-
- at_least_one=false
-
-=== modified file 'util/grub.d/10_kfreebsd.in'
---- util/grub.d/10_kfreebsd.in 2010-02-03 00:24:07 +0000
-+++ util/grub.d/10_kfreebsd.in 2010-04-08 09:54:44 +0000
-@@ -30,7 +30,7 @@
- case "${GRUB_DISTRIBUTOR}" in
- Debian)
- OS="${GRUB_DISTRIBUTOR} GNU/kFreeBSD"
-- CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]') --class gnu-kfreebsd --class gnu ${CLASS}"
-+ CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) --class gnu-kfreebsd --class gnu ${CLASS}"
- ;;
- *)
- OS="FreeBSD"
-
-=== modified file 'util/grub.d/10_linux.in'
---- util/grub.d/10_linux.in 2010-02-26 13:32:24 +0000
-+++ util/grub.d/10_linux.in 2010-04-08 09:54:44 +0000
-@@ -31,7 +31,7 @@
- OS=GNU/Linux
- else
- OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-- CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]') ${CLASS}"
-+ CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) ${CLASS}"
- fi
-
- # loop-AES arranges things so that /dev/loop/X can be our root device, but
-
diff --git a/grub/patches/grub-1.99-just-say-linux.patch b/grub/patches/grub-1.99-just-say-linux.patch
new file mode 100644
index 0000000..389b163
--- /dev/null
+++ b/grub/patches/grub-1.99-just-say-linux.patch
@@ -0,0 +1,46 @@
+From d4bd41f972c6e22b86c773cbba2a1e14f400a8be Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones(a)redhat.com>
+Date: Mon, 14 Mar 2011 14:27:42 -0400
+Subject: [PATCH] Don't say "GNU/Linux" in generated menus.
+
+In Fedora and RHEL we just call it Linux.
+---
+ util/grub.d/10_linux.in | 4 ++--
+ util/grub.d/20_linux_xen.in | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index a09c3e6..0b0df78 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -29,9 +29,9 @@ export TEXTDOMAINDIR=@localedir@
+ CLASS="--class gnu-linux --class gnu --class os"
+
+ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
+- OS=GNU/Linux
++ OS=Linux
+ else
+- OS="${GRUB_DISTRIBUTOR} GNU/Linux"
++ OS="${GRUB_DISTRIBUTOR} Linux"
+ CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
+ fi
+
+diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
+index ee49cd9..10422b0 100644
+--- a/util/grub.d/20_linux_xen.in
++++ b/util/grub.d/20_linux_xen.in
+@@ -29,9 +29,9 @@ export TEXTDOMAINDIR=@localedir@
+ CLASS="--class gnu-linux --class gnu --class os --class xen"
+
+ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
+- OS=GNU/Linux
++ OS=Linux
+ else
+- OS="${GRUB_DISTRIBUTOR} GNU/Linux"
++ OS="${GRUB_DISTRIBUTOR} Linux"
+ CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
+ fi
+
+--
+1.7.4
+
diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index 3f87f09..01b2f69 100644
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
name = kernel
version = 3.0.4
-release = 1
+release = 2
thisapp = linux-%{version}
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
@@ -100,10 +100,12 @@ packages
end
package kernel-headers
- template DEVEL
-
summary = Header files of the kernel release %{fullver}.
desciption = %{summary}
+
+ files
+ /usr/include
+ end
end
end
diff --git a/libcap-ng/libcap-ng.nm b/libcap-ng/libcap-ng.nm
index 36b5a78..057bae6 100644
--- a/libcap-ng/libcap-ng.nm
+++ b/libcap-ng/libcap-ng.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libcap-ng
-version = 0.6.5
+version = 0.6.6
release = 1
groups = System/Libraries
@@ -13,11 +13,11 @@ license = LGPLv2+
summary = An alternate posix capabilities library.
description
- Libcap-ng is a library that makes using posix capabilities \
+ Libcap-ng is a library that makes using posix capabilities
easier.
end
-source_dl =
+source_dl = http://people.redhat.com/sgrubb/libcap-ng/
build
requires
@@ -25,6 +25,15 @@ build
python
end
+ install_cmds
+ # Move libraries to lib
+ mkdir -pv %{BUILDROOT}/lib
+ mv -vf %{BUILDROOT}/usr/lib/libcap-ng.so.* %{BUILDROOT}/lib/
+
+ # Recreate symlink
+ ln -svf ../../lib/libcap-ng.so.0 %{BUILDROOT}/usr/lib/libcap-ng.so
+ end
+
# XXX Testsuite is broken by the package developers
#def test
# make check
diff --git a/pcre/pcre.nm b/pcre/pcre.nm
index b7a9da2..f51e459 100644
--- a/pcre/pcre.nm
+++ b/pcre/pcre.nm
@@ -4,8 +4,8 @@
###############################################################################
name = pcre
-version = 8.12
-release = 2
+version = 8.13
+release = 1
groups = System/Libraries
url = http://www.pcre.org/
@@ -18,7 +18,7 @@ description
API are also supplied in the library libpcreposix.
end
-source_dl =
+source_dl = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/
build
requires
@@ -45,8 +45,7 @@ end
packages
package %{name}
- end
-
+
package %{name}-devel
template DEVEL
end
diff --git a/quagga/quagga.nm b/quagga/quagga.nm
index 482cbe0..459fc44 100644
--- a/quagga/quagga.nm
+++ b/quagga/quagga.nm
@@ -4,7 +4,7 @@
###############################################################################
name = quagga
-version = 0.99.18
+version = 0.99.20
release = 1
groups = Networking/Routing
@@ -41,12 +41,11 @@ end
packages
package %{name}
- end
-
+
package %{name}-libs
template LIBS
end
-
+
package %{name}-devel
template DEVEL
end
diff --git a/xorg-x11-fonts/xorg-x11-fonts.nm b/xorg-x11-fonts/xorg-x11-fonts.nm
index c931366..6b98ac6 100644
--- a/xorg-x11-fonts/xorg-x11-fonts.nm
+++ b/xorg-x11-fonts/xorg-x11-fonts.nm
@@ -5,7 +5,7 @@
name = xorg-x11-fonts
version = 7.2
-release = 2
+release = 3
arch = noarch
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -63,7 +63,7 @@ build
xorg-x11-font-utils-devel
end
- configure_optins += \
+ configure_options += \
--with-fontrootdir=/usr/share/X11/fonts \
--disable-iso8859-3 \
--disable-iso8859-4 \
@@ -110,7 +110,9 @@ build
done
# Install unifont
- cp -vf %{DIR_DL}/unifont-5.1.20080820.pcf.gz %{BUILDROOT}/usr/share/fonts/X11/misc/unifont.pcf.gz
+ mkdir -pv %{BUILDROOT}/usr/share/X11/fonts/misc
+ cp -vf %{DIR_DL}/unifont-5.1.20080820.pcf.gz \
+ %{BUILDROOT}/usr/share/X11/fonts/misc/unifont.pcf.gz
end
end
hooks/post-receive
--
IPFire 3.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. e137ec4ecf166320ce92d5068e864034e19b8f48
by gitï¼ ipfire.org 02 Oct '11
by gitï¼ ipfire.org 02 Oct '11
02 Oct '11
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 e137ec4ecf166320ce92d5068e864034e19b8f48 (commit)
via 84aed1ea54ea5e482d3e7dcd7075188062ae85b1 (commit)
via 546f69c87df84eece09b55197a6968640a991f66 (commit)
via 80756cd34478312d43c44dcb76df2532136dec3b (commit)
via b05f4b20d6cde15485bba7b491d28b82c36c2537 (commit)
via 4236ab005deb102af5ed35a6af6a7686c51a5f48 (commit)
via c72709443139371255ed8b4637fef8711aedaa5a (commit)
via 706371540dc4fa6b98a0b6f0236f1e5c1c6ff12e (commit)
via 07590904f3f340434e057f1513d83e560bbf2db3 (commit)
via 5485de953c93e39e96d18f2351390086b8b92c82 (commit)
via fa0bb39f77d3e5bbb5e178dd911f2347d6356277 (commit)
via 736d1ed96ec00bafb3635f67673796151de02774 (commit)
via 509d6c572633e475520f2ab4ba5da36a026678ec (commit)
via c0c9df130fbb3c5080755822d227277627605196 (commit)
via 828aaba2ac9d211f76ac9fef95e1dbd19c2315cb (commit)
via f1f39aea071c0660f87cbd04b385bb77cb70cf00 (commit)
via 7589902e644345a8b383d604cf5e16c786352f59 (commit)
via 38ce4769ab38fdef7fc5892b4fe554de968d8d47 (commit)
via 0f0db884a9bc1524c69c040cd84b8f23bb2c85dd (commit)
via 1a140b78980fe0f488e25a3b2dd92256e3751ab0 (commit)
via 79231dc50fd71d392ae0f6d54cfb8ec8de2bbcfe (commit)
via a01ce24dae2a6ce2438c2dd603de05af4eecbbbe (commit)
via 84f23fd9bf9d915473b49ec759099be26c903a07 (commit)
via 39017f76e77fb77fd47c17cc89da69f3b3f0e946 (commit)
from 8fb6ecda94638e10b5607bddce2881d6e4b2ed17 (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 e137ec4ecf166320ce92d5068e864034e19b8f48
Merge: 84aed1e 546f69c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Oct 2 21:27:09 2011 +0200
Merge commit 'origin/master' into next
Conflicts:
lfs/libevent2
lfs/transmission
src/paks/transmission/install.sh
src/paks/transmission/uninstall.sh
commit 84aed1ea54ea5e482d3e7dcd7075188062ae85b1
Merge: 8fb6ecd fa0bb39
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Oct 2 21:17:10 2011 +0200
Merge commit 'origin/master' into next
Conflicts:
make.sh
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/{52 => 53}/filelists/apache2 | 0
config/rootfiles/core/53/filelists/files | 8 +-
config/rootfiles/core/53/filelists/kvm-kmod | 6 +
config/rootfiles/core/53/update.sh | 4 +-
config/rootfiles/core/{53 => 54}/exclude | 0
config/rootfiles/core/54/filelists/files | 2 +
config/rootfiles/core/{52 => 54}/meta | 0
config/rootfiles/{oldcore/49 => core/54}/update.sh | 9 +-
config/rootfiles/{common => packages}/libevent2 | 0
html/cgi-bin/logs.cgi/log.dat | 2 +-
lfs/apache2 | 4 +-
lfs/libevent2 | 9 ++-
lfs/strongswan | 2 +-
lfs/transmission | 2 +-
make.sh | 4 +-
src/paks/transmission/install.sh | 8 +-
src/paks/transmission/uninstall.sh | 2 +
.../gcc-4.1.2-fix_linker_version_detection.patch | 2 +-
..._ipfire.patch => strongswan-4.5.3_ipfire.patch} | 110 +++++++++++++++-----
19 files changed, 124 insertions(+), 50 deletions(-)
copy config/rootfiles/core/{52 => 53}/filelists/apache2 (100%)
create mode 100644 config/rootfiles/core/53/filelists/kvm-kmod
copy config/rootfiles/core/{53 => 54}/exclude (100%)
create mode 100644 config/rootfiles/core/54/filelists/files
copy config/rootfiles/core/{52 => 54}/meta (100%)
copy config/rootfiles/{oldcore/49 => core/54}/update.sh (93%)
copy config/rootfiles/{common => packages}/libevent2 (100%)
rename src/patches/{strongswan-4.4.0_ipfire.patch => strongswan-4.5.3_ipfire.patch} (83%)
Difference in files:
diff --git a/config/rootfiles/core/53/filelists/apache2 b/config/rootfiles/core/53/filelists/apache2
new file mode 120000
index 0000000..eef95ef
--- /dev/null
+++ b/config/rootfiles/core/53/filelists/apache2
@@ -0,0 +1 @@
+../../../common/apache2
\ No newline at end of file
diff --git a/config/rootfiles/core/53/filelists/files b/config/rootfiles/core/53/filelists/files
index cdd78c2..2d47486 100644
--- a/config/rootfiles/core/53/filelists/files
+++ b/config/rootfiles/core/53/filelists/files
@@ -13,15 +13,13 @@ srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/pakfire.cgi
srv/web/ipfire/cgi-bin/routing.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
-var/ipfire/langs/de.pl
-var/ipfire/langs/en.pl
-var/ipfire/langs/es.pl
-var/ipfire/langs/fr.pl
-var/ipfire/langs/pl.pl
+srv/web/ipfire/cgi-bin/logs.cgi/log.dat
+var/ipfire/langs/
usr/local/bin/ipsecctrl
usr/local/bin/openvpnctrl
usr/local/bin/vpn-watch
usr/local/bin/rebuildroutes
+usr/local/sbin/setup
var/ipfire/main/routing
var/ipfire/menu.d/30-network.menu
opt/pakfire/etc/pakfire.conf
diff --git a/config/rootfiles/core/53/filelists/kvm-kmod b/config/rootfiles/core/53/filelists/kvm-kmod
new file mode 100644
index 0000000..ec75215
--- /dev/null
+++ b/config/rootfiles/core/53/filelists/kvm-kmod
@@ -0,0 +1,6 @@
+lib/modules/2.6.32.45-ipfire/kernel/arch/x86/kvm/kvm.ko
+lib/modules/2.6.32.45-ipfire/kernel/arch/x86/kvm/kvm-amd.ko
+lib/modules/2.6.32.45-ipfire/kernel/arch/x86/kvm/kvm-intel.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/arch/x86/kvm/kvm.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/arch/x86/kvm/kvm-amd.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/arch/x86/kvm/kvm-intel.ko
diff --git a/config/rootfiles/core/53/update.sh b/config/rootfiles/core/53/update.sh
index 10b45b9..a9e3dcb 100644
--- a/config/rootfiles/core/53/update.sh
+++ b/config/rootfiles/core/53/update.sh
@@ -26,7 +26,7 @@
#
# Remove old core updates from pakfire cache to save space...
-core=52
+core=53
for (( i=1; i<=$core; i++ ))
do
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
@@ -36,6 +36,7 @@ done
#Stop services
/etc/init.d/ipsec stop
+/etc/init.d/apache stop
#
# Remove old strongswan libs
@@ -65,6 +66,7 @@ sed -i -e "s|^options cfg80211 ieee80211_regdom=EU|#options cfg80211 ieee80211_r
#
#Start services
+/etc/init.d/apache start
if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
/etc/init.d/ipsec start
fi
diff --git a/config/rootfiles/core/54/exclude b/config/rootfiles/core/54/exclude
new file mode 100644
index 0000000..ca3adf5
--- /dev/null
+++ b/config/rootfiles/core/54/exclude
@@ -0,0 +1,9 @@
+srv/web/ipfire/html/proxy.pac
+etc/udev/rules.d/30-persistent-network.rules
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+var/updatecache
+etc/localtime
+var/ipfire/ovpn
diff --git a/config/rootfiles/core/54/filelists/files b/config/rootfiles/core/54/filelists/files
new file mode 100644
index 0000000..409e5fe
--- /dev/null
+++ b/config/rootfiles/core/54/filelists/files
@@ -0,0 +1,2 @@
+etc/system-release
+etc/issue
diff --git a/config/rootfiles/core/54/meta b/config/rootfiles/core/54/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/54/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/54/update.sh b/config/rootfiles/core/54/update.sh
new file mode 100644
index 0000000..38e157e
--- /dev/null
+++ b/config/rootfiles/core/54/update.sh
@@ -0,0 +1,60 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2011 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+#
+# Remove old core updates from pakfire cache to save space...
+core=54
+for (( i=1; i<=$core; i++ ))
+do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+#
+#Stop services
+
+#
+#Extract files
+extract_files
+
+#
+#Start services
+
+
+#
+#Update Language cache
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+#Rebuild module dep's
+#depmod 2.6.32.45-ipfire >/dev/null 2>&1
+#depmod 2.6.32.45-ipfire-pae >/dev/null 2>&1
+#depmod 2.6.32.45-ipfire-xen >/dev/null 2>&1
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0
diff --git a/config/rootfiles/packages/libevent2 b/config/rootfiles/packages/libevent2
new file mode 100644
index 0000000..fb3d8bd
--- /dev/null
+++ b/config/rootfiles/packages/libevent2
@@ -0,0 +1,45 @@
+#usr/include/event2
+#usr/include/event2/buffer.h
+#usr/include/event2/buffer_compat.h
+#usr/include/event2/bufferevent.h
+#usr/include/event2/bufferevent_compat.h
+#usr/include/event2/bufferevent_ssl.h
+#usr/include/event2/bufferevent_struct.h
+#usr/include/event2/dns.h
+#usr/include/event2/dns_compat.h
+#usr/include/event2/dns_struct.h
+#usr/include/event2/event-config.h
+#usr/include/event2/event.h
+#usr/include/event2/event_compat.h
+#usr/include/event2/event_struct.h
+#usr/include/event2/http.h
+#usr/include/event2/http_compat.h
+#usr/include/event2/http_struct.h
+#usr/include/event2/keyvalq_struct.h
+#usr/include/event2/listener.h
+#usr/include/event2/rpc.h
+#usr/include/event2/rpc_compat.h
+#usr/include/event2/rpc_struct.h
+#usr/include/event2/tag.h
+#usr/include/event2/tag_compat.h
+#usr/include/event2/thread.h
+#usr/include/event2/util.h
+usr/lib/libevent-2.0.so.5
+usr/lib/libevent-2.0.so.5.1.2
+usr/lib/libevent_core-2.0.so.5
+usr/lib/libevent_core-2.0.so.5.1.2
+usr/lib/libevent_extra-2.0.so.5
+usr/lib/libevent_extra-2.0.so.5.1.2
+usr/lib/libevent_openssl-2.0.so.5
+usr/lib/libevent_openssl-2.0.so.5.1.2
+#usr/lib/libevent_openssl.a
+#usr/lib/libevent_openssl.la
+#usr/lib/libevent_openssl.so
+usr/lib/libevent_pthreads-2.0.so.5
+usr/lib/libevent_pthreads-2.0.so.5.1.2
+#usr/lib/libevent_pthreads.a
+#usr/lib/libevent_pthreads.la
+#usr/lib/libevent_pthreads.so
+#usr/lib/pkgconfig/libevent.pc
+#usr/lib/pkgconfig/libevent_openssl.pc
+#usr/lib/pkgconfig/libevent_pthreads.pc
diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
index c0da266..e2d0244 100644
--- a/html/cgi-bin/logs.cgi/log.dat
+++ b/html/cgi-bin/logs.cgi/log.dat
@@ -61,7 +61,7 @@ my %sections = (
'auth' => '(\w+\(pam_unix\)\[.*\]: )',
'kernel' => '(kernel: (?!DROP_))',
'ipsec' => '(ipsec_[\w_]+: |pluto\[.*\]: |charon: |vpnwatch: )',
- 'openvpn' => '(openvpnserver)\[.*\]: ',
+ 'openvpn' => '(openvpnserver\[.*\]: |.*n2n\[.*\]: )',
'pakfire' => '(pakfire:) ',
'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:) '
);
diff --git a/lfs/apache2 b/lfs/apache2
index c5fd754..f548271 100644
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -25,7 +25,7 @@
include Config
-VER = 2.2.20
+VER = 2.2.21
THISAPP = httpd-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -47,7 +47,7 @@ objects = $(DL_FILE) \
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
httpd-2.2.2-config-1.patch = $(DL_FROM)/httpd-2.2.2-config-1.patch
-$(DL_FILE)_MD5 = 1ac251431c8c4285f6b085c1d156bb56
+$(DL_FILE)_MD5 = 1696ae62cd879ab1d4dd9ff021a470f2
httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822
install : $(TARGET)
diff --git a/lfs/libevent2 b/lfs/libevent2
index 1fbc7db..0756ab1 100644
--- a/lfs/libevent2
+++ b/lfs/libevent2
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.de> #
# #
# 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 #
@@ -32,6 +32,11 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = libevent2
+PAK_VER = 1
+
+DEPS = ""
+
###############################################################################
# Top-level Rules
###############################################################################
@@ -63,6 +68,8 @@ $(patsubst %,$(DIR_DL)/%,$(objects)) :
$(subst %,%_MD5,$(objects)) :
@$(MD5)
+dist:
+ @$(PAK)
###############################################################################
# Installation Details
###############################################################################
diff --git a/lfs/strongswan b/lfs/strongswan
index 1efd283..cb97bf7 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -71,7 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-4.4.0_ipfire.patch
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-4.5.3_ipfire.patch
cd $(DIR_APP) && ./configure --prefix="/usr" --sysconfdir="/etc" \
--enable-cisco-quirks \
diff --git a/lfs/transmission b/lfs/transmission
index b4ba4c4..d15631f 100644
--- a/lfs/transmission
+++ b/lfs/transmission
@@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP)
PROG = transmission
PAK_VER = 1
-DEPS = ""
+DEPS = "libevent2"
###############################################################################
# Top-level Rules
diff --git a/make.sh b/make.sh
index 161319d..84597c2 100755
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.11" # Version number
-CORE="53" # Core Level (Filename)
-PAKFIRE_CORE="52" # Core Level (PAKFIRE)
+CORE="54" # Core Level (Filename)
+PAKFIRE_CORE="53" # Core Level (PAKFIRE)
GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
diff --git a/src/paks/transmission/install.sh b/src/paks/transmission/install.sh
index c5907d4..6efa67e 100644
--- a/src/paks/transmission/install.sh
+++ b/src/paks/transmission/install.sh
@@ -24,18 +24,18 @@
. /opt/pakfire/lib/functions.sh
extract_files
-
+restore_backup ${NAME}
# Create download directories if they do not yet exist.
mkdir -p /var/transmission/{downloads,incomplete} 2>/dev/null
# Adjust permissions.
chown nobody.nobody /etc/transmission /var/transmission
-# Start the service.
-/etc/init.d/transmission start
-
+# create startlinks
ln -sf ../init.d/transmission /etc/rc.d/rc0.d/K20transmission
ln -sf ../init.d/transmission /etc/rc.d/rc3.d/S99transmission
ln -sf ../init.d/transmission /etc/rc.d/rc6.d/K20transmission
+# Start the service.
+start_service --background ${NAME}
exit 0
diff --git a/src/paks/transmission/uninstall.sh b/src/paks/transmission/uninstall.sh
index 5a2e708..85d7565 100644
--- a/src/paks/transmission/uninstall.sh
+++ b/src/paks/transmission/uninstall.sh
@@ -22,6 +22,8 @@
############################################################################
#
. /opt/pakfire/lib/functions.sh
+stop_service ${NAME}
+make_backup ${NAME}
remove_files
# Remove all start links.
diff --git a/src/patches/gcc-4.1.2-fix_linker_version_detection.patch b/src/patches/gcc-4.1.2-fix_linker_version_detection.patch
index c2f43be..36a756c 100644
--- a/src/patches/gcc-4.1.2-fix_linker_version_detection.patch
+++ b/src/patches/gcc-4.1.2-fix_linker_version_detection.patch
@@ -6,7 +6,7 @@ diff -Naur gcc-4.1.2.org/libstdc++-v3/configure gcc-4.1.2/libstdc++-v3/configure
ldver=`$LD --version 2>/dev/null | head -1 | \
- sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
-+ sed -e 's/GNU ld (GNU binutils) \([0-9.][0-9.]*\).*/\1/'`
++ sed -e 's/GNU ld .*) \([0-9.][0-9.]*\).*/\1/'`
glibcxx_gnu_ld_version=`echo $ldver | \
$AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'`
diff --git a/src/patches/strongswan-4.4.0_ipfire.patch b/src/patches/strongswan-4.4.0_ipfire.patch
deleted file mode 100644
index 298a1e3..0000000
--- a/src/patches/strongswan-4.4.0_ipfire.patch
+++ /dev/null
@@ -1,286 +0,0 @@
-diff -Naur strongswan-4.4.0.org/src/_updown/_updown.in strongswan-4.4.0/src/_updown/_updown.in
---- strongswan-4.4.0.org/src/_updown/_updown.in 2010-03-15 21:52:51.000000000 +0100
-+++ strongswan-4.4.0/src/_updown/_updown.in 2010-05-15 13:33:40.000000000 +0200
-@@ -374,12 +374,12 @@
- # connection to me, with (left/right)firewall=yes, coming up
- # This is used only by the default updown script, not by your custom
- # ones, so do not mess with it; see CAUTION comment up at top.
-- iptables -I INPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
-+ iptables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
- -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
- -d $PLUTO_ME $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT
-- iptables -I OUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
-+ iptables -I IPSECOUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
- -s $PLUTO_ME $S_MY_PORT $IPSEC_POLICY_OUT \
-- -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT
-+ -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j MARK --set-mark 50
- #
- # log IPsec host connection setup
- if [ $VPN_LOGGING ]
-@@ -387,10 +387,10 @@
- if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ]
- then
- logger -t $TAG -p $FAC_PRIO \
-- "+ $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME"
-+ "host+ $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME"
- else
- logger -t $TAG -p $FAC_PRIO \
-- "+ $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME"
-+ "host+ $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME"
- fi
- fi
- ;;
-@@ -398,12 +398,12 @@
- # connection to me, with (left/right)firewall=yes, going down
- # This is used only by the default updown script, not by your custom
- # ones, so do not mess with it; see CAUTION comment up at top.
-- iptables -D INPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
-+ iptables -D IPSECINPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
- -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
- -d $PLUTO_ME $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT
-- iptables -D OUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
-+ iptables -D IPSECOUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
- -s $PLUTO_ME $S_MY_PORT $IPSEC_POLICY_OUT \
-- -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT
-+ -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j MARK --set-mark 50
- #
- # log IPsec host connection teardown
- if [ $VPN_LOGGING ]
-@@ -411,10 +411,10 @@
- if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ]
- then
- logger -t $TAG -p $FAC_PRIO -- \
-- "- $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME"
-+ "host- $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME"
- else
- logger -t $TAG -p $FAC_PRIO -- \
-- "- $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME"
-+ "host- $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME"
- fi
- fi
- ;;
-@@ -424,10 +424,10 @@
- # ones, so do not mess with it; see CAUTION comment up at top.
- if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/32" ]
- then
-- iptables -I FORWARD 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
-+ iptables -I IPSECFORWARD 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
- -s $PLUTO_MY_CLIENT $S_MY_PORT \
-- -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j ACCEPT
-- iptables -I FORWARD 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
-+ -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j MARK --set-mark 50
-+ iptables -I IPSECFORWARD 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
- -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
- -d $PLUTO_MY_CLIENT $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT
- fi
-@@ -436,12 +436,12 @@
- # or sometimes host access via the internal IP is needed
- if [ -n "$PLUTO_MY_SOURCEIP" -o -n "$PLUTO_HOST_ACCESS" ]
- then
-- iptables -I INPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
-+ iptables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
- -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
- -d $PLUTO_MY_CLIENT $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT
-- iptables -I OUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
-+ iptables -I IPSECOUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
- -s $PLUTO_MY_CLIENT $S_MY_PORT \
-- -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j ACCEPT
-+ -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j MARK --set-mark 50
- fi
- #
- # log IPsec client connection setup
-@@ -450,12 +450,38 @@
- if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ]
- then
- logger -t $TAG -p $FAC_PRIO \
-- "+ $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
-+ "client+ $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
- else
- logger -t $TAG -p $FAC_PRIO \
-- "+ $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
-+ "client+ $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
- fi
- fi
-+
-+ #
-+ # Open Firewall for IPinIP + AH + ESP Traffic
-+ iptables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p IP \
-+ -s $PLUTO_PEER $S_PEER_PORT \
-+ -d $PLUTO_ME $D_MY_PORT -j ACCEPT
-+ iptables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p AH \
-+ -s $PLUTO_PEER $S_PEER_PORT \
-+ -d $PLUTO_ME $D_MY_PORT -j ACCEPT
-+ iptables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p ESP \
-+ -s $PLUTO_PEER $S_PEER_PORT \
-+ -d $PLUTO_ME $D_MY_PORT -j ACCEPT
-+ if [ $VPN_LOGGING ]
-+ then
-+ logger -t $TAG -p $FAC_PRIO \
-+ "tunnel+ $PLUTO_PEER -- $PLUTO_ME"
-+ fi
-+
-+ # Add source nat so also the gateway can access the other nets
-+ src=$(/sbin/ip route|grep $PLUTO_MY_CLIENT|(read net key_dev dev key_proto key_kernel key_scope key_link key_src src; echo $src))
-+ iptables -t nat -A IPSECNAT -o $PLUTO_INTERFACE -s $PLUTO_ME -d $PLUTO_PEER_CLIENT -j SNAT --to $src
-+ logger -t $TAG -p $FAC_PRIO \
-+ "snat+ $PLUTO_INTERFACE-$PLUTO_ME : $PLUTO_PEER_CLIENT - $src"
-+
-+ # Flush routing cache
-+ ip route flush cache
- ;;
- down-client:iptables)
- # connection to client subnet, with (left/right)firewall=yes, going down
-@@ -463,11 +489,11 @@
- # ones, so do not mess with it; see CAUTION comment up at top.
- if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/32" ]
- then
-- iptables -D FORWARD -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
-+ iptables -D IPSECFORWARD -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
- -s $PLUTO_MY_CLIENT $S_MY_PORT \
- -d $PLUTO_PEER_CLIENT $D_PEER_PORT \
-- $IPSEC_POLICY_OUT -j ACCEPT
-- iptables -D FORWARD -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
-+ $IPSEC_POLICY_OUT -j MARK --set-mark 50
-+ iptables -D IPSECFORWARD -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
- -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
- -d $PLUTO_MY_CLIENT $D_MY_PORT \
- $IPSEC_POLICY_IN -j ACCEPT
-@@ -477,14 +503,14 @@
- # or sometimes host access via the internal IP is needed
- if [ -n "$PLUTO_MY_SOURCEIP" -o -n "$PLUTO_HOST_ACCESS" ]
- then
-- iptables -D INPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
-+ iptables -D IPSECINPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
- -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
- -d $PLUTO_MY_CLIENT $D_MY_PORT \
- $IPSEC_POLICY_IN -j ACCEPT
-- iptables -D OUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
-+ iptables -D IPSECOUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
- -s $PLUTO_MY_CLIENT $S_MY_PORT \
- -d $PLUTO_PEER_CLIENT $D_PEER_PORT \
-- $IPSEC_POLICY_OUT -j ACCEPT
-+ $IPSEC_POLICY_OUT -j MARK --set-mark 50
- fi
- #
- # log IPsec client connection teardown
-@@ -493,12 +519,38 @@
- if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ]
- then
- logger -t $TAG -p $FAC_PRIO -- \
-- "- $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
-+ "client- $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
- else
- logger -t $TAG -p $FAC_PRIO -- \
-- "- $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
-+ "client- $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
- fi
- fi
-+
-+ #
-+ # Close Firewall for IPinIP + AH + ESP Traffic
-+ iptables -D IPSECINPUT -i $PLUTO_INTERFACE -p IP \
-+ -s $PLUTO_PEER $S_PEER_PORT \
-+ -d $PLUTO_ME $D_MY_PORT -j ACCEPT
-+ iptables -D IPSECINPUT -i $PLUTO_INTERFACE -p AH \
-+ -s $PLUTO_PEER $S_PEER_PORT \
-+ -d $PLUTO_ME $D_MY_PORT -j ACCEPT
-+ iptables -D IPSECINPUT -i $PLUTO_INTERFACE -p ESP \
-+ -s $PLUTO_PEER $S_PEER_PORT \
-+ -d $PLUTO_ME $D_MY_PORT -j ACCEPT
-+ if [ $VPN_LOGGING ]
-+ then
-+ logger -t $TAG -p $FAC_PRIO \
-+ "tunnel- $PLUTO_PEER -- $PLUTO_ME"
-+ fi
-+
-+ # remove source nat
-+ src=$(/sbin/ip route|grep $PLUTO_MY_CLIENT|(read net key_dev dev key_proto key_kernel key_scope key_link key_src src; echo $src))
-+ iptables -t nat -D IPSECNAT -o $PLUTO_INTERFACE -s $PLUTO_ME -d $PLUTO_PEER_CLIENT -j SNAT --to $src
-+ logger -t $TAG -p $FAC_PRIO \
-+ "snat- $PLUTO_INTERFACE-$PLUTO_ME : $PLUTO_PEER_CLIENT - $src"
-+
-+ # Flush routing cache
-+ ip route flush cache
- ;;
- #
- # IPv6
-@@ -533,10 +585,10 @@
- # connection to me, with (left/right)firewall=yes, coming up
- # This is used only by the default updown script, not by your custom
- # ones, so do not mess with it; see CAUTION comment up at top.
-- ip6tables -I INPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
-+ ip6tables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
- -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
- -d $PLUTO_ME $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT
-- ip6tables -I OUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
-+ ip6tables -I IPSECOUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
- -s $PLUTO_ME $S_MY_PORT $IPSEC_POLICY_OUT \
- -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT
- #
-@@ -557,10 +609,10 @@
- # connection to me, with (left/right)firewall=yes, going down
- # This is used only by the default updown script, not by your custom
- # ones, so do not mess with it; see CAUTION comment up at top.
-- ip6tables -D INPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
-+ ip6tables -D IPSECINPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
- -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
- -d $PLUTO_ME $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT
-- ip6tables -D OUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
-+ ip6tables -D IPSECOUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
- -s $PLUTO_ME $S_MY_PORT $IPSEC_POLICY_OUT \
- -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT
- #
-@@ -583,10 +635,10 @@
- # ones, so do not mess with it; see CAUTION comment up at top.
- if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/128" ]
- then
-- ip6tables -I FORWARD 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
-+ ip6tables -I IPSECFORWARD 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
- -s $PLUTO_MY_CLIENT $S_MY_PORT \
- -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j ACCEPT
-- ip6tables -I FORWARD 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
-+ ip6tables -I IPSECFORWARD 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
- -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
- -d $PLUTO_MY_CLIENT $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT
- fi
-@@ -595,10 +647,10 @@
- # or sometimes host access via the internal IP is needed
- if [ -n "$PLUTO_MY_SOURCEIP" -o -n "$PLUTO_HOST_ACCESS" ]
- then
-- ip6tables -I INPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
-+ ip6tables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
- -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
- -d $PLUTO_MY_CLIENT $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT
-- ip6tables -I OUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
-+ ip6tables -I IPSECOUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
- -s $PLUTO_MY_CLIENT $S_MY_PORT \
- -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j ACCEPT
- fi
-@@ -622,11 +674,11 @@
- # ones, so do not mess with it; see CAUTION comment up at top.
- if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/128" ]
- then
-- ip6tables -D FORWARD -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
-+ ip6tables -D IPSECFORWARD -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
- -s $PLUTO_MY_CLIENT $S_MY_PORT \
- -d $PLUTO_PEER_CLIENT $D_PEER_PORT \
- $IPSEC_POLICY_OUT -j ACCEPT
-- ip6tables -D FORWARD -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
-+ ip6tables -D IPSECFORWARD -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
- -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
- -d $PLUTO_MY_CLIENT $D_MY_PORT \
- $IPSEC_POLICY_IN -j ACCEPT
-@@ -636,11 +688,11 @@
- # or sometimes host access via the internal IP is needed
- if [ -n "$PLUTO_MY_SOURCEIP" -o -n "$PLUTO_HOST_ACCESS" ]
- then
-- ip6tables -D INPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
-+ ip6tables -D IPSECINPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
- -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
- -d $PLUTO_MY_CLIENT $D_MY_PORT \
- $IPSEC_POLICY_IN -j ACCEPT
-- ip6tables -D OUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
-+ ip6tables -D IPSECOUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
- -s $PLUTO_MY_CLIENT $S_MY_PORT \
- -d $PLUTO_PEER_CLIENT $D_PEER_PORT \
- $IPSEC_POLICY_OUT -j ACCEPT
diff --git a/src/patches/strongswan-4.5.3_ipfire.patch b/src/patches/strongswan-4.5.3_ipfire.patch
new file mode 100644
index 0000000..2ba975b
--- /dev/null
+++ b/src/patches/strongswan-4.5.3_ipfire.patch
@@ -0,0 +1,342 @@
+diff -Naur strongswan-4.5.3.org/src/_updown/_updown.in strongswan-4.5.3/src/_updown/_updown.in
+--- strongswan-4.5.3.org/src/_updown/_updown.in 2010-10-22 16:33:30.000000000 +0200
++++ strongswan-4.5.3/src/_updown/_updown.in 2011-09-13 14:19:31.000000000 +0200
+@@ -183,6 +183,29 @@
+ ;;
+ esac
+
++function ip_encode() {
++ local IFS=.
++
++ local int=0
++ for field in $1; do
++ int=$(( $(( $int << 8 )) | $field ))
++ done
++
++ echo $int
++}
++
++function ip_in_subnet() {
++ local netmask
++ netmask=$(_netmask $2)
++ [ $(( $(ip_encode $1) & $netmask)) = $(( $(ip_encode ${2%/*}) & $netmask )) ]
++}
++
++function _netmask() {
++ local vlsm
++ vlsm=${1#*/}
++ [ $vlsm -eq 0 ] && echo 0 || echo $(( -1 << $(( 32 - $vlsm )) ))
++}
++
+ # utility functions for route manipulation
+ # Meddling with this stuff should not be necessary and requires great care.
+ uproute() {
+@@ -387,12 +410,12 @@
+ # connection to me, with (left/right)firewall=yes, coming up
+ # This is used only by the default updown script, not by your custom
+ # ones, so do not mess with it; see CAUTION comment up at top.
+- iptables -I INPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
++ iptables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
+ -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
+ -d $PLUTO_ME $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT
+- iptables -I OUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
++ iptables -I IPSECOUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
+ -s $PLUTO_ME $S_MY_PORT $IPSEC_POLICY_OUT \
+- -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT
++ -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j MARK --set-mark 50
+ #
+ # log IPsec host connection setup
+ if [ $VPN_LOGGING ]
+@@ -400,10 +423,10 @@
+ if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ]
+ then
+ logger -t $TAG -p $FAC_PRIO \
+- "+ $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME"
++ "host+ $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME"
+ else
+ logger -t $TAG -p $FAC_PRIO \
+- "+ $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME"
++ "host+ $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME"
+ fi
+ fi
+ ;;
+@@ -411,12 +434,12 @@
+ # connection to me, with (left/right)firewall=yes, going down
+ # This is used only by the default updown script, not by your custom
+ # ones, so do not mess with it; see CAUTION comment up at top.
+- iptables -D INPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
++ iptables -D IPSECINPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
+ -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
+ -d $PLUTO_ME $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT
+- iptables -D OUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
++ iptables -D IPSECOUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
+ -s $PLUTO_ME $S_MY_PORT $IPSEC_POLICY_OUT \
+- -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT
++ -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j MARK --set-mark 50
+ #
+ # log IPsec host connection teardown
+ if [ $VPN_LOGGING ]
+@@ -424,10 +447,10 @@
+ if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ]
+ then
+ logger -t $TAG -p $FAC_PRIO -- \
+- "- $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME"
++ "host- $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME"
+ else
+ logger -t $TAG -p $FAC_PRIO -- \
+- "- $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME"
++ "host- $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME"
+ fi
+ fi
+ ;;
+@@ -437,10 +460,10 @@
+ # ones, so do not mess with it; see CAUTION comment up at top.
+ if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/32" ]
+ then
+- iptables -I FORWARD 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
++ iptables -I IPSECFORWARD 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
+ -s $PLUTO_MY_CLIENT $S_MY_PORT \
+- -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j ACCEPT
+- iptables -I FORWARD 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
++ -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j MARK --set-mark 50
++ iptables -I IPSECFORWARD 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
+ -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
+ -d $PLUTO_MY_CLIENT $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT
+ fi
+@@ -449,12 +472,12 @@
+ # or sometimes host access via the internal IP is needed
+ if [ -n "$PLUTO_MY_SOURCEIP" -o -n "$PLUTO_HOST_ACCESS" ]
+ then
+- iptables -I INPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
++ iptables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
+ -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
+ -d $PLUTO_MY_CLIENT $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT
+- iptables -I OUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
++ iptables -I IPSECOUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
+ -s $PLUTO_MY_CLIENT $S_MY_PORT \
+- -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j ACCEPT
++ -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j MARK --set-mark 50
+ fi
+ #
+ # log IPsec client connection setup
+@@ -463,12 +486,51 @@
+ if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ]
+ then
+ logger -t $TAG -p $FAC_PRIO \
+- "+ $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
++ "client+ $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
+ else
+ logger -t $TAG -p $FAC_PRIO \
+- "+ $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
++ "client+ $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
+ fi
+ fi
++
++ #
++ # Open Firewall for IPinIP + AH + ESP Traffic
++ iptables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p IP \
++ -s $PLUTO_PEER $S_PEER_PORT \
++ -d $PLUTO_ME $D_MY_PORT -j ACCEPT
++ iptables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p AH \
++ -s $PLUTO_PEER $S_PEER_PORT \
++ -d $PLUTO_ME $D_MY_PORT -j ACCEPT
++ iptables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p ESP \
++ -s $PLUTO_PEER $S_PEER_PORT \
++ -d $PLUTO_ME $D_MY_PORT -j ACCEPT
++ if [ $VPN_LOGGING ]
++ then
++ logger -t $TAG -p $FAC_PRIO \
++ "tunnel+ $PLUTO_PEER -- $PLUTO_ME"
++ fi
++
++ # Add source nat so also the gateway can access the other nets
++ eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
++ for _src in ${GREEN_ADDRESS} ${BLUE_ADDRESS} ${ORANGE_ADDRESS}; do
++ ip_in_subnet "${_src}" "${PLUTO_MY_CLIENT}"
++ if [ $? -eq 0 ]; then
++ src=${_src}
++ break
++ fi
++ done
++
++ if [ -n "${src}" ]; then
++ iptables -t nat -A IPSECNAT -o $PLUTO_INTERFACE -s $PLUTO_ME -d $PLUTO_PEER_CLIENT -j SNAT --to $src
++ logger -t $TAG -p $FAC_PRIO \
++ "snat+ $PLUTO_INTERFACE-$PLUTO_ME : $PLUTO_PEER_CLIENT - $src"
++ else
++ logger -t $TAG -p $FAC_PRIO \
++ "Cannot create NAT rule because no IP of the IPFire does match the subnet. $PLUTO_MY_CLIENT"
++ fi
++
++ # Flush routing cache
++ ip route flush cache
+ ;;
+ down-client:iptables)
+ # connection to client subnet, with (left/right)firewall=yes, going down
+@@ -476,11 +538,11 @@
+ # ones, so do not mess with it; see CAUTION comment up at top.
+ if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/32" ]
+ then
+- iptables -D FORWARD -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
++ iptables -D IPSECFORWARD -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
+ -s $PLUTO_MY_CLIENT $S_MY_PORT \
+ -d $PLUTO_PEER_CLIENT $D_PEER_PORT \
+- $IPSEC_POLICY_OUT -j ACCEPT
+- iptables -D FORWARD -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
++ $IPSEC_POLICY_OUT -j MARK --set-mark 50
++ iptables -D IPSECFORWARD -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
+ -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
+ -d $PLUTO_MY_CLIENT $D_MY_PORT \
+ $IPSEC_POLICY_IN -j ACCEPT
+@@ -490,14 +552,14 @@
+ # or sometimes host access via the internal IP is needed
+ if [ -n "$PLUTO_MY_SOURCEIP" -o -n "$PLUTO_HOST_ACCESS" ]
+ then
+- iptables -D INPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
++ iptables -D IPSECINPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
+ -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
+ -d $PLUTO_MY_CLIENT $D_MY_PORT \
+ $IPSEC_POLICY_IN -j ACCEPT
+- iptables -D OUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
++ iptables -D IPSECOUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
+ -s $PLUTO_MY_CLIENT $S_MY_PORT \
+ -d $PLUTO_PEER_CLIENT $D_PEER_PORT \
+- $IPSEC_POLICY_OUT -j ACCEPT
++ $IPSEC_POLICY_OUT -j MARK --set-mark 50
+ fi
+ #
+ # log IPsec client connection teardown
+@@ -506,12 +568,51 @@
+ if [ "$PLUTO_PEER_CLIENT" = "$PLUTO_PEER/32" ]
+ then
+ logger -t $TAG -p $FAC_PRIO -- \
+- "- $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
++ "client- $PLUTO_PEER_ID $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
+ else
+ logger -t $TAG -p $FAC_PRIO -- \
+- "- $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
++ "client- $PLUTO_PEER_ID $PLUTO_PEER_CLIENT == $PLUTO_PEER -- $PLUTO_ME == $PLUTO_MY_CLIENT"
+ fi
+ fi
++
++ #
++ # Close Firewall for IPinIP + AH + ESP Traffic
++ iptables -D IPSECINPUT -i $PLUTO_INTERFACE -p IP \
++ -s $PLUTO_PEER $S_PEER_PORT \
++ -d $PLUTO_ME $D_MY_PORT -j ACCEPT
++ iptables -D IPSECINPUT -i $PLUTO_INTERFACE -p AH \
++ -s $PLUTO_PEER $S_PEER_PORT \
++ -d $PLUTO_ME $D_MY_PORT -j ACCEPT
++ iptables -D IPSECINPUT -i $PLUTO_INTERFACE -p ESP \
++ -s $PLUTO_PEER $S_PEER_PORT \
++ -d $PLUTO_ME $D_MY_PORT -j ACCEPT
++ if [ $VPN_LOGGING ]
++ then
++ logger -t $TAG -p $FAC_PRIO \
++ "tunnel- $PLUTO_PEER -- $PLUTO_ME"
++ fi
++
++ # remove source nat
++ eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
++ for _src in ${GREEN_ADDRESS} ${BLUE_ADDRESS} ${ORANGE_ADDRESS}; do
++ ip_in_subnet "${_src}" "${PLUTO_MY_CLIENT}"
++ if [ $? -eq 0 ]; then
++ src=${_src}
++ break
++ fi
++ done
++
++ if [ -n "${src}" ]; then
++ iptables -t nat -D IPSECNAT -o $PLUTO_INTERFACE -s $PLUTO_ME -d $PLUTO_PEER_CLIENT -j SNAT --to $src
++ logger -t $TAG -p $FAC_PRIO \
++ "snat- $PLUTO_INTERFACE-$PLUTO_ME : $PLUTO_PEER_CLIENT - $src"
++ else
++ logger -t $TAG -p $FAC_PRIO \
++ "Cannot remove NAT rule because no IP of the IPFire does match the subnet."
++ fi
++
++ # Flush routing cache
++ ip route flush cache
+ ;;
+ #
+ # IPv6
+@@ -546,10 +647,10 @@
+ # connection to me, with (left/right)firewall=yes, coming up
+ # This is used only by the default updown script, not by your custom
+ # ones, so do not mess with it; see CAUTION comment up at top.
+- ip6tables -I INPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
++ ip6tables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
+ -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
+ -d $PLUTO_ME $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT
+- ip6tables -I OUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
++ ip6tables -I IPSECOUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
+ -s $PLUTO_ME $S_MY_PORT $IPSEC_POLICY_OUT \
+ -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT
+ #
+@@ -570,10 +671,10 @@
+ # connection to me, with (left/right)firewall=yes, going down
+ # This is used only by the default updown script, not by your custom
+ # ones, so do not mess with it; see CAUTION comment up at top.
+- ip6tables -D INPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
++ ip6tables -D IPSECINPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
+ -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
+ -d $PLUTO_ME $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT
+- ip6tables -D OUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
++ ip6tables -D IPSECOUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
+ -s $PLUTO_ME $S_MY_PORT $IPSEC_POLICY_OUT \
+ -d $PLUTO_PEER_CLIENT $D_PEER_PORT -j ACCEPT
+ #
+@@ -596,10 +697,10 @@
+ # ones, so do not mess with it; see CAUTION comment up at top.
+ if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/128" ]
+ then
+- ip6tables -I FORWARD 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
++ ip6tables -I IPSECFORWARD 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
+ -s $PLUTO_MY_CLIENT $S_MY_PORT \
+ -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j ACCEPT
+- ip6tables -I FORWARD 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
++ ip6tables -I IPSECFORWARD 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
+ -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
+ -d $PLUTO_MY_CLIENT $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT
+ fi
+@@ -608,10 +709,10 @@
+ # or sometimes host access via the internal IP is needed
+ if [ -n "$PLUTO_MY_SOURCEIP" -o -n "$PLUTO_HOST_ACCESS" ]
+ then
+- ip6tables -I INPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
++ ip6tables -I IPSECINPUT 1 -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
+ -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
+ -d $PLUTO_MY_CLIENT $D_MY_PORT $IPSEC_POLICY_IN -j ACCEPT
+- ip6tables -I OUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
++ ip6tables -I IPSECOUTPUT 1 -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
+ -s $PLUTO_MY_CLIENT $S_MY_PORT \
+ -d $PLUTO_PEER_CLIENT $D_PEER_PORT $IPSEC_POLICY_OUT -j ACCEPT
+ fi
+@@ -635,11 +736,11 @@
+ # ones, so do not mess with it; see CAUTION comment up at top.
+ if [ "$PLUTO_PEER_CLIENT" != "$PLUTO_MY_SOURCEIP/128" ]
+ then
+- ip6tables -D FORWARD -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
++ ip6tables -D IPSECFORWARD -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
+ -s $PLUTO_MY_CLIENT $S_MY_PORT \
+ -d $PLUTO_PEER_CLIENT $D_PEER_PORT \
+ $IPSEC_POLICY_OUT -j ACCEPT
+- ip6tables -D FORWARD -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
++ ip6tables -D IPSECFORWARD -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
+ -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
+ -d $PLUTO_MY_CLIENT $D_MY_PORT \
+ $IPSEC_POLICY_IN -j ACCEPT
+@@ -649,11 +750,11 @@
+ # or sometimes host access via the internal IP is needed
+ if [ -n "$PLUTO_MY_SOURCEIP" -o -n "$PLUTO_HOST_ACCESS" ]
+ then
+- ip6tables -D INPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
++ ip6tables -D IPSECINPUT -i $PLUTO_INTERFACE -p $PLUTO_MY_PROTOCOL \
+ -s $PLUTO_PEER_CLIENT $S_PEER_PORT \
+ -d $PLUTO_MY_CLIENT $D_MY_PORT \
+ $IPSEC_POLICY_IN -j ACCEPT
+- ip6tables -D OUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
++ ip6tables -D IPSECOUTPUT -o $PLUTO_INTERFACE -p $PLUTO_PEER_PROTOCOL \
+ -s $PLUTO_MY_CLIENT $S_MY_PORT \
+ -d $PLUTO_PEER_CLIENT $D_PEER_PORT \
+ $IPSEC_POLICY_OUT -j ACCEPT
hooks/post-receive
--
IPFire 2.x development tree
1
0
[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 546f69c87df84eece09b55197a6968640a991f66
by gitï¼ ipfire.org 02 Oct '11
by gitï¼ ipfire.org 02 Oct '11
02 Oct '11
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 546f69c87df84eece09b55197a6968640a991f66 (commit)
via 80756cd34478312d43c44dcb76df2532136dec3b (commit)
from b05f4b20d6cde15485bba7b491d28b82c36c2537 (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 546f69c87df84eece09b55197a6968640a991f66
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Oct 2 21:14:35 2011 +0200
libevent2: change to package.
add it to transmission deps.
commit 80756cd34478312d43c44dcb76df2532136dec3b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Sep 18 13:32:30 2011 +0200
libevent2: New package.
Needs to be added to core update 54.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/packages/libevent2 | 45 +++++++++++++++++++++++++++++++++++
lfs/{bwm-ng => libevent2} | 17 ++++++-------
lfs/transmission | 2 +-
make.sh | 1 +
4 files changed, 55 insertions(+), 10 deletions(-)
create mode 100644 config/rootfiles/packages/libevent2
copy lfs/{bwm-ng => libevent2} (93%)
Difference in files:
diff --git a/config/rootfiles/packages/libevent2 b/config/rootfiles/packages/libevent2
new file mode 100644
index 0000000..fb3d8bd
--- /dev/null
+++ b/config/rootfiles/packages/libevent2
@@ -0,0 +1,45 @@
+#usr/include/event2
+#usr/include/event2/buffer.h
+#usr/include/event2/buffer_compat.h
+#usr/include/event2/bufferevent.h
+#usr/include/event2/bufferevent_compat.h
+#usr/include/event2/bufferevent_ssl.h
+#usr/include/event2/bufferevent_struct.h
+#usr/include/event2/dns.h
+#usr/include/event2/dns_compat.h
+#usr/include/event2/dns_struct.h
+#usr/include/event2/event-config.h
+#usr/include/event2/event.h
+#usr/include/event2/event_compat.h
+#usr/include/event2/event_struct.h
+#usr/include/event2/http.h
+#usr/include/event2/http_compat.h
+#usr/include/event2/http_struct.h
+#usr/include/event2/keyvalq_struct.h
+#usr/include/event2/listener.h
+#usr/include/event2/rpc.h
+#usr/include/event2/rpc_compat.h
+#usr/include/event2/rpc_struct.h
+#usr/include/event2/tag.h
+#usr/include/event2/tag_compat.h
+#usr/include/event2/thread.h
+#usr/include/event2/util.h
+usr/lib/libevent-2.0.so.5
+usr/lib/libevent-2.0.so.5.1.2
+usr/lib/libevent_core-2.0.so.5
+usr/lib/libevent_core-2.0.so.5.1.2
+usr/lib/libevent_extra-2.0.so.5
+usr/lib/libevent_extra-2.0.so.5.1.2
+usr/lib/libevent_openssl-2.0.so.5
+usr/lib/libevent_openssl-2.0.so.5.1.2
+#usr/lib/libevent_openssl.a
+#usr/lib/libevent_openssl.la
+#usr/lib/libevent_openssl.so
+usr/lib/libevent_pthreads-2.0.so.5
+usr/lib/libevent_pthreads-2.0.so.5.1.2
+#usr/lib/libevent_pthreads.a
+#usr/lib/libevent_pthreads.la
+#usr/lib/libevent_pthreads.so
+#usr/lib/pkgconfig/libevent.pc
+#usr/lib/pkgconfig/libevent_openssl.pc
+#usr/lib/pkgconfig/libevent_pthreads.pc
diff --git a/lfs/libevent2 b/lfs/libevent2
new file mode 100644
index 0000000..401ccbe
--- /dev/null
+++ b/lfs/libevent2
@@ -0,0 +1,83 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.de> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 2.0.13-stable
+
+THISAPP = libevent-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+PROG = libevent2
+PAK_VER = 1
+
+DEPS = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = af786b4b3f790c9d3279792edf7867fc
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+dist:
+ @$(PAK)
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure --prefix=/usr
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/transmission b/lfs/transmission
index b4ba4c4..d15631f 100644
--- a/lfs/transmission
+++ b/lfs/transmission
@@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP)
PROG = transmission
PAK_VER = 1
-DEPS = ""
+DEPS = "libevent2"
###############################################################################
# Top-level Rules
diff --git a/make.sh b/make.sh
index 58d481f..b1e9b68 100755
--- a/make.sh
+++ b/make.sh
@@ -585,6 +585,7 @@ buildipfire() {
ipfiremake rsync
ipfiremake tcpwrapper
ipfiremake libevent
+ ipfiremake libevent2
ipfiremake portmap
ipfiremake nfs
ipfiremake nmap
hooks/post-receive
--
IPFire 2.x development tree
1
0