[git.ipfire.org] IPFire 2.x development tree branch, next, updated. be3bb6541c3ad18aea2650bf4d5459f286e7c51d
by git＠ipfire.org 26 Apr '16
by git＠ipfire.org 26 Apr '16
26 Apr '16
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 be3bb6541c3ad18aea2650bf4d5459f286e7c51d (commit)
via e4ad596bd7f27d485759986df1adf17d62eb04fe (commit)
via 4da318ab6fd0a28bf2638570400dff9503cd9e3d (commit)
via 3d4eb053a99722ff41a6b5f44ca867f469bccd90 (commit)
via 259346c504a94be324c517e09addfef82a3429f8 (commit)
via 171b8dbc74b849716e84884fa9e848c20bb7c6dd (commit)
via cd4ca08231e30fd28dbd47e1a2f7c93f8a978f1a (commit)
via bfe96f68b483c73682cd0a50959b7c6a1b90e8bf (commit)
via a420b3e7b9f3672b6c436cd7b773683fbf0c1f90 (commit)
via 54ea98e318280130e0b0bdb8daa9e999afb96a13 (commit)
via 54cc2c4e5d5abbc1972e9d996117f95d6522ade1 (commit)
via 198c39265bc110bb2130cbfd3c81d968dbcad5c8 (commit)
from 916cf307b19d6d267b3a8737ba9b299284c0f137 (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 be3bb6541c3ad18aea2650bf4d5459f286e7c51d
Author: Sascha Kilian <sascha(a)sakisoft.de>
Date: Fri Apr 15 09:19:50 2016 +0000
Update: less to 481
Signed-off-by: Sascha Kilian <sascha(a)sakisoft.de>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e4ad596bd7f27d485759986df1adf17d62eb04fe
Author: Sascha Kilian <sascha(a)sakisoft.de>
Date: Mon Apr 18 14:23:07 2016 +0000
wpa_supplicant: Update to 2.5
Signed-off-by: Sascha Kilian <sascha(a)sakisoft.de>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 4da318ab6fd0a28bf2638570400dff9503cd9e3d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Apr 26 22:32:17 2016 +0100
hostapd: Bump release version
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 3d4eb053a99722ff41a6b5f44ca867f469bccd90
Author: Sascha Kilian <sascha(a)sakisoft.de>
Date: Mon Apr 18 14:23:38 2016 +0000
Update: hostapd to 2.5
Signed-off-by: Sascha Kilian <sascha(a)sakisoft.de>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 259346c504a94be324c517e09addfef82a3429f8
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date: Thu Apr 21 08:56:25 2016 +0200
tzdata: Update to 2016d
fixes: #11103
Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
The 2016d release of the tz code and data is available. It reflects the
following changes, which were either circulated on the tz mailing list
or are relatively minor technical or administrative changes:
Changes affecting future time stamps
America/Caracas switches from -0430 to -04 on 2016-05-01 at 02:30.
(Thanks to Alexander Krivenyshev for the heads-up.)
Asia/Magadan switches from +10 to +11 on 2016-04-24 at 02:00.
(Thanks to Alexander Krivenyshev and Matt Johnson.)
New zone Asia/Tomsk, split off from Asia/Novosibirsk. It covers
Tomsk Oblast, Russia, which switches from +06 to +07 on 2016-05-29
at 02:00. (Thanks to Stepan Golosunov.)
Changes affecting past time stamps
New zone Europe/Kirov, split off from Europe/Volgograd. It covers
Kirov Oblast, Russia, which switched from +04/+05 to +03/+04 on
1989-03-26 at 02:00, roughly a year after Europe/Volgograd made
the same change. (Thanks to Stepan Golosunov.)
Russia and nearby locations had daylight-saving transitions on
1992-03-29 at 02:00 and 1992-09-27 at 03:00, instead of on
1992-03-28 at 23:00 and 1992-09-26 at 23:00. (Thanks to Stepan
Golosunov.)
Many corrections to historical time in Kazakhstan from 1991
through 2005. (Thanks to Stepan Golosunov.) Replace Kazakhstan's
invented time zone abbreviations with numeric abbreviations.
Here are links to the release files:
ftp://ftp.iana.org/tz/releases/tzcode2016d.tar.gz
ftp://ftp.iana.org/tz/releases/tzdata2016d.tar.gz
The files are also available via HTTP as follows:
http://www.iana.org/time-zones/repository/releases/tzcode2016d.tar.gz
http://www.iana.org/time-zones/repository/releases/tzdata2016d.tar.gz
As usual, links to the latest release files are here:
http://www.iana.org/time-zones/repository/tzcode-latest.tar.gz
http://www.iana.org/time-zones/repository/tzdata-latest.tar.gz
ftp://ftp.iana.org/tz/tzcode-latest.tar.gz
ftp://ftp.iana.org/tz/tzdata-latest.tar.gz
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 171b8dbc74b849716e84884fa9e848c20bb7c6dd
Author: Sascha Kilian <sascha(a)sakisoft.de>
Date: Fri Apr 22 09:11:30 2016 +0000
Update: grep to 2.24
Signed-off-by: Sascha Kilian <sascha(a)sakisoft.de>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit cd4ca08231e30fd28dbd47e1a2f7c93f8a978f1a
Author: Sascha Kilian <sascha(a)sakisoft.de>
Date: Fri Apr 22 15:55:26 2016 +0000
Update: curl to 7.48.0
Signed-off-by: Sascha Kilian <sascha(a)sakisoft.de>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit bfe96f68b483c73682cd0a50959b7c6a1b90e8bf
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Apr 23 18:54:59 2016 +0200
sdparm: Update to 1.10
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a420b3e7b9f3672b6c436cd7b773683fbf0c1f90
Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Date: Sat Apr 23 08:33:19 2016 +0200
ncurses: update to 6.0 and rename 5.9 to ncurses-compat
This patch updates the ncurses to 6.0. The old 5.9 are renamed to ncurses-compat.
The compat makes the old libs maintainable and the compat rootfile is cleaned up.
The 6.0 is build after 5.9 and all IPFire componentes will build with 6.0
In version 6 only the wide-character libraries are build. The are usable
in both multibyte and traditional 8-bit locales while normal libraries work
properly only in 8-bit locales. The toolchain is only bild with 6.0.
Please ignore my first ncurses 6.0 patch.
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 54ea98e318280130e0b0bdb8daa9e999afb96a13
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Apr 26 22:21:50 2016 +0100
nfs: Fix whitespace issues in nfs-server initscript
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 54cc2c4e5d5abbc1972e9d996117f95d6522ade1
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Mon Apr 25 17:15:18 2016 +0200
nfs: Fixes for NFS server
Fixes: #11098
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 198c39265bc110bb2130cbfd3c81d968dbcad5c8
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Tue Apr 26 18:50:14 2016 +0200
squid 3.4.14: latest patches, sorted options
The 'configure'-options were sorted (kind of) to get a better overview.
Added latest patches from upstream.
Changed '--enable-async-io=8' to '--enable-async-io=16' because of
http://www.squid-cache.org/mail-archive/squid-users/200705/0768.html :
"The default number of threads is dependent on the number of aufs
cache_dir lines, based on a reasonable estimate of how the code behaves."
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/curl | 2 +-
config/rootfiles/common/ncurses | 1863 ++++++++++----------
.../rootfiles/common/{ncurses => ncurses-compat} | 210 +--
config/rootfiles/packages/nfs | 5 +-
lfs/curl | 6 +-
lfs/grep | 4 +-
lfs/hostapd | 6 +-
lfs/less | 4 +-
lfs/ncurses | 70 +-
lfs/{ncurses => ncurses-compat} | 0
lfs/nfs | 8 +-
lfs/sdparm | 6 +-
lfs/squid | 28 +-
lfs/tzdata | 6 +-
lfs/wpa_supplicant | 4 +-
make.sh | 1 +
src/initscripts/init.d/nfs-server | 12 +-
src/patches/squid-3.4-13233.patch | 274 +++
src/patches/squid-3.4-13234.patch | 33 +
src/patches/squid-3.4-13235.patch | 97 +
20 files changed, 1541 insertions(+), 1098 deletions(-)
copy config/rootfiles/common/{ncurses => ncurses-compat} (96%)
copy lfs/{ncurses => ncurses-compat} (100%)
create mode 100644 src/patches/squid-3.4-13233.patch
create mode 100644 src/patches/squid-3.4-13234.patch
create mode 100644 src/patches/squid-3.4-13235.patch
Difference in files:
diff --git a/config/rootfiles/common/curl b/config/rootfiles/common/curl
index 0fd2819..d929ace 100644
--- a/config/rootfiles/common/curl
+++ b/config/rootfiles/common/curl
@@ -15,7 +15,7 @@ usr/bin/curl
usr/lib/libcurl.so
usr/lib/libcurl.so.3
usr/lib/libcurl.so.4
-usr/lib/libcurl.so.4.3.0
+usr/lib/libcurl.so.4.4.0
#usr/lib/pkgconfig/libcurl.pc
#usr/share/aclocal/libcurl.m4
#usr/share/man/man1/curl-config.1
diff --git a/config/rootfiles/common/ncurses b/config/rootfiles/common/ncurses
index da434e9..4f34e39 100644
--- a/config/rootfiles/common/ncurses
+++ b/config/rootfiles/common/ncurses
@@ -2,8 +2,7 @@
usr/bin/clear
#usr/bin/infocmp
#usr/bin/infotocap
-#usr/bin/ncurses5-config
-#usr/bin/ncursesw5-config
+#usr/bin/ncursesw6-config
usr/bin/reset
#usr/bin/tabs
#usr/bin/tic
@@ -30,921 +29,902 @@ usr/bin/tset
#usr/include/termcap.h
#usr/include/tic.h
#usr/include/unctrl.h
-#usr/lib/libcurses.a
#usr/lib/libcurses.so
#usr/lib/libcursesw.so
-#usr/lib/libform.a
#usr/lib/libform.so
-usr/lib/libform.so.5
-usr/lib/libform.so.5.9
-#usr/lib/libformw.a
#usr/lib/libformw.so
-usr/lib/libformw.so.5
-usr/lib/libformw.so.5.9
-#usr/lib/libmenu.a
+usr/lib/libformw.so.6
+usr/lib/libformw.so.6.0
#usr/lib/libmenu.so
-usr/lib/libmenu.so.5
-usr/lib/libmenu.so.5.9
-#usr/lib/libmenuw.a
#usr/lib/libmenuw.so
-usr/lib/libmenuw.so.5
-usr/lib/libmenuw.so.5.9
-#usr/lib/libncurses++.a
+usr/lib/libmenuw.so.6
+usr/lib/libmenuw.so.6.0
#usr/lib/libncurses++w.a
-#usr/lib/libncurses.a
#usr/lib/libncurses.so
-usr/lib/libncurses.so.5
-usr/lib/libncurses.so.5.9
-#usr/lib/libncursesw.a
#usr/lib/libncursesw.so
-usr/lib/libncursesw.so.5
-usr/lib/libncursesw.so.5.9
-#usr/lib/libpanel.a
+usr/lib/libncursesw.so.6
+usr/lib/libncursesw.so.6.0
#usr/lib/libpanel.so
-usr/lib/libpanel.so.5
-usr/lib/libpanel.so.5.9
-#usr/lib/libpanelw.a
#usr/lib/libpanelw.so
-usr/lib/libpanelw.so.5
-usr/lib/libpanelw.so.5.9
-#usr/lib/libtermcap.so
-#usr/lib/libtic.a
-#usr/lib/libtic.so
-usr/lib/libtic.so.5
-usr/lib/libtic.so.5.9
-#usr/lib/libtinfo.a
-#usr/lib/libtinfo.so
-usr/lib/libtinfo.so.5
-usr/lib/libtinfo.so.5.9
+usr/lib/libpanelw.so.6
+usr/lib/libpanelw.so.6.0
+#usr/lib/pkgconfig/form.pc
+#usr/lib/pkgconfig/formw.pc
+#usr/lib/pkgconfig/menu.pc
+#usr/lib/pkgconfig/menuw.pc
+#usr/lib/pkgconfig/ncurses++w.pc
+#usr/lib/pkgconfig/ncurses.pc
+#usr/lib/pkgconfig/ncursesw.pc
+#usr/lib/pkgconfig/panel.pc
+#usr/lib/pkgconfig/panelw.pc
#usr/lib/terminfo
-#usr/man
-#usr/man/man1
-#usr/man/man1/captoinfo.1m
-#usr/man/man1/clear.1
-#usr/man/man1/infocmp.1m
-#usr/man/man1/infotocap.1m
-#usr/man/man1/ncursesw5-config.1
-#usr/man/man1/reset.1
-#usr/man/man1/tabs.1
-#usr/man/man1/tic.1m
-#usr/man/man1/toe.1m
-#usr/man/man1/tput.1
-#usr/man/man1/tset.1
-#usr/man/man3
-#usr/man/man3/BC.3x
-#usr/man/man3/COLORS.3x
-#usr/man/man3/COLOR_PAIR.3x
-#usr/man/man3/COLOR_PAIRS.3x
-#usr/man/man3/COLS.3x
-#usr/man/man3/ESCDELAY.3x
-#usr/man/man3/LINES.3x
-#usr/man/man3/PAIR_NUMBER.3x
-#usr/man/man3/PC.3x
-#usr/man/man3/SP.3x
-#usr/man/man3/TABSIZE.3x
-#usr/man/man3/TYPE_ALNUM.3x
-#usr/man/man3/TYPE_ALPHA.3x
-#usr/man/man3/TYPE_ENUM.3x
-#usr/man/man3/TYPE_INTEGER.3x
-#usr/man/man3/TYPE_IPV4.3x
-#usr/man/man3/TYPE_NUMERIC.3x
-#usr/man/man3/TYPE_REGEXP.3x
-#usr/man/man3/UP.3x
-#usr/man/man3/_nc_free_and_exit.3x
-#usr/man/man3/_nc_freeall.3x
-#usr/man/man3/_nc_tracebits.3x
-#usr/man/man3/_traceattr.3x
-#usr/man/man3/_traceattr2.3x
-#usr/man/man3/_tracecchar_t.3x
-#usr/man/man3/_tracecchar_t2.3x
-#usr/man/man3/_tracechar.3x
-#usr/man/man3/_tracechtype.3x
-#usr/man/man3/_tracechtype2.3x
-#usr/man/man3/_tracedump.3x
-#usr/man/man3/_tracef.3x
-#usr/man/man3/_tracemouse.3x
-#usr/man/man3/acs_map.3x
-#usr/man/man3/add_wch.3x
-#usr/man/man3/add_wchnstr.3x
-#usr/man/man3/add_wchstr.3x
-#usr/man/man3/addch.3x
-#usr/man/man3/addchnstr.3x
-#usr/man/man3/addchstr.3x
-#usr/man/man3/addnstr.3x
-#usr/man/man3/addnwstr.3x
-#usr/man/man3/addstr.3x
-#usr/man/man3/addwstr.3x
-#usr/man/man3/assume_default_colors.3x
-#usr/man/man3/assume_default_colors_sp.3x
-#usr/man/man3/attr_get.3x
-#usr/man/man3/attr_off.3x
-#usr/man/man3/attr_on.3x
-#usr/man/man3/attr_set.3x
-#usr/man/man3/attroff.3x
-#usr/man/man3/attron.3x
-#usr/man/man3/attrset.3x
-#usr/man/man3/baudrate.3x
-#usr/man/man3/baudrate_sp.3x
-#usr/man/man3/beep.3x
-#usr/man/man3/beep_sp.3x
-#usr/man/man3/bkgd.3x
-#usr/man/man3/bkgdset.3x
-#usr/man/man3/bkgrnd.3x
-#usr/man/man3/bkgrndset.3x
-#usr/man/man3/boolcodes.3x
-#usr/man/man3/boolfnames.3x
-#usr/man/man3/boolnames.3x
-#usr/man/man3/border.3x
-#usr/man/man3/border_set.3x
-#usr/man/man3/bottom_panel.3x
-#usr/man/man3/box.3x
-#usr/man/man3/box_set.3x
-#usr/man/man3/can_change_color.3x
-#usr/man/man3/can_change_color_sp.3x
-#usr/man/man3/cbreak.3x
-#usr/man/man3/cbreak_sp.3x
-#usr/man/man3/ceiling_panel.3x
-#usr/man/man3/chgat.3x
-#usr/man/man3/clear.3x
-#usr/man/man3/clearok.3x
-#usr/man/man3/clrtobot.3x
-#usr/man/man3/clrtoeol.3x
-#usr/man/man3/color_content.3x
-#usr/man/man3/color_content_sp.3x
-#usr/man/man3/color_set.3x
-#usr/man/man3/copywin.3x
-#usr/man/man3/cur_term.3x
-#usr/man/man3/current_field.3x
-#usr/man/man3/current_item.3x
-#usr/man/man3/curs_add_wch.3x
-#usr/man/man3/curs_add_wchstr.3x
-#usr/man/man3/curs_addch.3x
-#usr/man/man3/curs_addchstr.3x
-#usr/man/man3/curs_addstr.3x
-#usr/man/man3/curs_addwstr.3x
-#usr/man/man3/curs_attr.3x
-#usr/man/man3/curs_beep.3x
-#usr/man/man3/curs_bkgd.3x
-#usr/man/man3/curs_bkgrnd.3x
-#usr/man/man3/curs_border.3x
-#usr/man/man3/curs_border_set.3x
-#usr/man/man3/curs_clear.3x
-#usr/man/man3/curs_color.3x
-#usr/man/man3/curs_delch.3x
-#usr/man/man3/curs_deleteln.3x
-#usr/man/man3/curs_extend.3x
-#usr/man/man3/curs_get_wch.3x
-#usr/man/man3/curs_get_wstr.3x
-#usr/man/man3/curs_getcchar.3x
-#usr/man/man3/curs_getch.3x
-#usr/man/man3/curs_getstr.3x
-#usr/man/man3/curs_getyx.3x
-#usr/man/man3/curs_in_wch.3x
-#usr/man/man3/curs_in_wchstr.3x
-#usr/man/man3/curs_inch.3x
-#usr/man/man3/curs_inchstr.3x
-#usr/man/man3/curs_initscr.3x
-#usr/man/man3/curs_inopts.3x
-#usr/man/man3/curs_ins_wch.3x
-#usr/man/man3/curs_ins_wstr.3x
-#usr/man/man3/curs_insch.3x
-#usr/man/man3/curs_insstr.3x
-#usr/man/man3/curs_instr.3x
-#usr/man/man3/curs_inwstr.3x
-#usr/man/man3/curs_kernel.3x
-#usr/man/man3/curs_legacy.3x
-#usr/man/man3/curs_memleaks.3x
-#usr/man/man3/curs_mouse.3x
-#usr/man/man3/curs_move.3x
-#usr/man/man3/curs_opaque.3x
-#usr/man/man3/curs_outopts.3x
-#usr/man/man3/curs_overlay.3x
-#usr/man/man3/curs_pad.3x
-#usr/man/man3/curs_print.3x
-#usr/man/man3/curs_printw.3x
-#usr/man/man3/curs_refresh.3x
-#usr/man/man3/curs_scanw.3x
-#usr/man/man3/curs_scr_dump.3x
-#usr/man/man3/curs_scroll.3x
-#usr/man/man3/curs_set.3x
-#usr/man/man3/curs_set_sp.3x
-#usr/man/man3/curs_slk.3x
-#usr/man/man3/curs_sp_funcs.3x
-#usr/man/man3/curs_termattrs.3x
-#usr/man/man3/curs_termcap.3x
-#usr/man/man3/curs_terminfo.3x
-#usr/man/man3/curs_threads.3x
-#usr/man/man3/curs_touch.3x
-#usr/man/man3/curs_trace.3x
-#usr/man/man3/curs_util.3x
-#usr/man/man3/curs_variables.3x
-#usr/man/man3/curs_window.3x
-#usr/man/man3/curscr.3x
-#usr/man/man3/curses_version.3x
-#usr/man/man3/data_ahead.3x
-#usr/man/man3/data_behind.3x
-#usr/man/man3/def_prog_mode.3x
-#usr/man/man3/def_prog_mode_sp.3x
-#usr/man/man3/def_shell_mode.3x
-#usr/man/man3/def_shell_mode_sp.3x
-#usr/man/man3/default_colors.3x
-#usr/man/man3/define_key.3x
-#usr/man/man3/define_key_sp.3x
-#usr/man/man3/del_curterm.3x
-#usr/man/man3/del_curterm_sp.3x
-#usr/man/man3/del_panel.3x
-#usr/man/man3/delay_output.3x
-#usr/man/man3/delay_output_sp.3x
-#usr/man/man3/delch.3x
-#usr/man/man3/deleteln.3x
-#usr/man/man3/delscreen.3x
-#usr/man/man3/delwin.3x
-#usr/man/man3/derwin.3x
-#usr/man/man3/doupdate.3x
-#usr/man/man3/doupdate_sp.3x
-#usr/man/man3/dup_field.3x
-#usr/man/man3/dupwin.3x
-#usr/man/man3/dynamic_field_info.3x
-#usr/man/man3/echo.3x
-#usr/man/man3/echo_sp.3x
-#usr/man/man3/echo_wchar.3x
-#usr/man/man3/echochar.3x
-#usr/man/man3/endwin.3x
-#usr/man/man3/endwin_sp.3x
-#usr/man/man3/erase.3x
-#usr/man/man3/erasechar.3x
-#usr/man/man3/erasechar_sp.3x
-#usr/man/man3/erasewchar.3x
-#usr/man/man3/field_arg.3x
-#usr/man/man3/field_back.3x
-#usr/man/man3/field_buffer.3x
-#usr/man/man3/field_count.3x
-#usr/man/man3/field_fore.3x
-#usr/man/man3/field_index.3x
-#usr/man/man3/field_info.3x
-#usr/man/man3/field_init.3x
-#usr/man/man3/field_just.3x
-#usr/man/man3/field_opts.3x
-#usr/man/man3/field_opts_off.3x
-#usr/man/man3/field_opts_on.3x
-#usr/man/man3/field_pad.3x
-#usr/man/man3/field_status.3x
-#usr/man/man3/field_term.3x
-#usr/man/man3/field_type.3x
-#usr/man/man3/field_userptr.3x
-#usr/man/man3/filter.3x
-#usr/man/man3/filter_sp.3x
-#usr/man/man3/flash.3x
-#usr/man/man3/flash_sp.3x
-#usr/man/man3/flushinp.3x
-#usr/man/man3/flushinp_sp.3x
-#usr/man/man3/form.3x
-#usr/man/man3/form_cursor.3x
-#usr/man/man3/form_data.3x
-#usr/man/man3/form_driver.3x
-#usr/man/man3/form_field.3x
-#usr/man/man3/form_field_attributes.3x
-#usr/man/man3/form_field_buffer.3x
-#usr/man/man3/form_field_info.3x
-#usr/man/man3/form_field_just.3x
-#usr/man/man3/form_field_new.3x
-#usr/man/man3/form_field_opts.3x
-#usr/man/man3/form_field_userptr.3x
-#usr/man/man3/form_field_validation.3x
-#usr/man/man3/form_fields.3x
-#usr/man/man3/form_fieldtype.3x
-#usr/man/man3/form_hook.3x
-#usr/man/man3/form_init.3x
-#usr/man/man3/form_new.3x
-#usr/man/man3/form_new_page.3x
-#usr/man/man3/form_opts.3x
-#usr/man/man3/form_opts_off.3x
-#usr/man/man3/form_opts_on.3x
-#usr/man/man3/form_page.3x
-#usr/man/man3/form_post.3x
-#usr/man/man3/form_request_by_name.3x
-#usr/man/man3/form_request_name.3x
-#usr/man/man3/form_requestname.3x
-#usr/man/man3/form_sub.3x
-#usr/man/man3/form_term.3x
-#usr/man/man3/form_userptr.3x
-#usr/man/man3/form_variables.3x
-#usr/man/man3/form_win.3x
-#usr/man/man3/free_field.3x
-#usr/man/man3/free_fieldtype.3x
-#usr/man/man3/free_form.3x
-#usr/man/man3/free_item.3x
-#usr/man/man3/free_menu.3x
-#usr/man/man3/get_escdelay.3x
-#usr/man/man3/get_escdelay_sp.3x
-#usr/man/man3/get_wch.3x
-#usr/man/man3/get_wstr.3x
-#usr/man/man3/getattrs.3x
-#usr/man/man3/getbegx.3x
-#usr/man/man3/getbegy.3x
-#usr/man/man3/getbegyx.3x
-#usr/man/man3/getbkgd.3x
-#usr/man/man3/getbkgrnd.3x
-#usr/man/man3/getcchar.3x
-#usr/man/man3/getch.3x
-#usr/man/man3/getcurx.3x
-#usr/man/man3/getcury.3x
-#usr/man/man3/getmaxx.3x
-#usr/man/man3/getmaxy.3x
-#usr/man/man3/getmaxyx.3x
-#usr/man/man3/getmouse.3x
-#usr/man/man3/getmouse_sp.3x
-#usr/man/man3/getn_wstr.3x
-#usr/man/man3/getnstr.3x
-#usr/man/man3/getparx.3x
-#usr/man/man3/getpary.3x
-#usr/man/man3/getparyx.3x
-#usr/man/man3/getstr.3x
-#usr/man/man3/getsyx.3x
-#usr/man/man3/getwin.3x
-#usr/man/man3/getwin_sp.3x
-#usr/man/man3/getyx.3x
-#usr/man/man3/ground_panel.3x
-#usr/man/man3/halfdelay.3x
-#usr/man/man3/halfdelay_sp.3x
-#usr/man/man3/has_colors.3x
-#usr/man/man3/has_colors_sp.3x
-#usr/man/man3/has_ic.3x
-#usr/man/man3/has_ic_sp.3x
-#usr/man/man3/has_il.3x
-#usr/man/man3/has_il_sp.3x
-#usr/man/man3/has_key.3x
-#usr/man/man3/has_key_sp.3x
-#usr/man/man3/has_mouse.3x
-#usr/man/man3/has_mouse_sp.3x
-#usr/man/man3/hide_panel.3x
-#usr/man/man3/hline.3x
-#usr/man/man3/hline_set.3x
-#usr/man/man3/idcok.3x
-#usr/man/man3/idlok.3x
-#usr/man/man3/immedok.3x
-#usr/man/man3/in_wch.3x
-#usr/man/man3/in_wchnstr.3x
-#usr/man/man3/in_wchstr.3x
-#usr/man/man3/inch.3x
-#usr/man/man3/inchnstr.3x
-#usr/man/man3/inchstr.3x
-#usr/man/man3/init_color.3x
-#usr/man/man3/init_color_sp.3x
-#usr/man/man3/init_pair.3x
-#usr/man/man3/init_pair_sp.3x
-#usr/man/man3/initscr.3x
-#usr/man/man3/innstr.3x
-#usr/man/man3/innwstr.3x
-#usr/man/man3/ins_nwstr.3x
-#usr/man/man3/ins_wch.3x
-#usr/man/man3/ins_wstr.3x
-#usr/man/man3/insch.3x
-#usr/man/man3/insdelln.3x
-#usr/man/man3/insertln.3x
-#usr/man/man3/insnstr.3x
-#usr/man/man3/insstr.3x
-#usr/man/man3/instr.3x
-#usr/man/man3/intrflush.3x
-#usr/man/man3/intrflush_sp.3x
-#usr/man/man3/inwstr.3x
-#usr/man/man3/is_cleared.3x
-#usr/man/man3/is_idcok.3x
-#usr/man/man3/is_idlok.3x
-#usr/man/man3/is_immedok.3x
-#usr/man/man3/is_keypad.3x
-#usr/man/man3/is_leaveok.3x
-#usr/man/man3/is_linetouched.3x
-#usr/man/man3/is_nodelay.3x
-#usr/man/man3/is_notimeout.3x
-#usr/man/man3/is_pad.3x
-#usr/man/man3/is_scrollok.3x
-#usr/man/man3/is_subwin.3x
-#usr/man/man3/is_syncok.3x
-#usr/man/man3/is_term_resized.3x
-#usr/man/man3/is_term_resized_sp.3x
-#usr/man/man3/is_wintouched.3x
-#usr/man/man3/isendwin.3x
-#usr/man/man3/isendwin_sp.3x
-#usr/man/man3/item_count.3x
-#usr/man/man3/item_description.3x
-#usr/man/man3/item_index.3x
-#usr/man/man3/item_init.3x
-#usr/man/man3/item_name.3x
-#usr/man/man3/item_opts.3x
-#usr/man/man3/item_opts_off.3x
-#usr/man/man3/item_opts_on.3x
-#usr/man/man3/item_term.3x
-#usr/man/man3/item_userptr.3x
-#usr/man/man3/item_value.3x
-#usr/man/man3/item_visible.3x
-#usr/man/man3/key_defined.3x
-#usr/man/man3/key_defined_sp.3x
-#usr/man/man3/key_name.3x
-#usr/man/man3/keybound.3x
-#usr/man/man3/keybound_sp.3x
-#usr/man/man3/keyname.3x
-#usr/man/man3/keyname_sp.3x
-#usr/man/man3/keyok.3x
-#usr/man/man3/keyok_sp.3x
-#usr/man/man3/keypad.3x
-#usr/man/man3/killchar.3x
-#usr/man/man3/killchar_sp.3x
-#usr/man/man3/killwchar.3x
-#usr/man/man3/leaveok.3x
-#usr/man/man3/legacy_coding.3x
-#usr/man/man3/link_field.3x
-#usr/man/man3/link_fieldtype.3x
-#usr/man/man3/longname.3x
-#usr/man/man3/mcprint.3x
-#usr/man/man3/mcprint_sp.3x
-#usr/man/man3/menu.3x
-#usr/man/man3/menu_attributes.3x
-#usr/man/man3/menu_back.3x
-#usr/man/man3/menu_cursor.3x
-#usr/man/man3/menu_driver.3x
-#usr/man/man3/menu_fore.3x
-#usr/man/man3/menu_format.3x
-#usr/man/man3/menu_grey.3x
-#usr/man/man3/menu_hook.3x
-#usr/man/man3/menu_init.3x
-#usr/man/man3/menu_items.3x
-#usr/man/man3/menu_mark.3x
-#usr/man/man3/menu_new.3x
-#usr/man/man3/menu_opts.3x
-#usr/man/man3/menu_opts_off.3x
-#usr/man/man3/menu_opts_on.3x
-#usr/man/man3/menu_pad.3x
-#usr/man/man3/menu_pattern.3x
-#usr/man/man3/menu_post.3x
-#usr/man/man3/menu_request_by_name.3x
-#usr/man/man3/menu_request_name.3x
-#usr/man/man3/menu_requestname.3x
-#usr/man/man3/menu_spacing.3x
-#usr/man/man3/menu_sub.3x
-#usr/man/man3/menu_term.3x
-#usr/man/man3/menu_userptr.3x
-#usr/man/man3/menu_win.3x
-#usr/man/man3/meta.3x
-#usr/man/man3/mitem_current.3x
-#usr/man/man3/mitem_name.3x
-#usr/man/man3/mitem_new.3x
-#usr/man/man3/mitem_opts.3x
-#usr/man/man3/mitem_userptr.3x
-#usr/man/man3/mitem_value.3x
-#usr/man/man3/mitem_visible.3x
-#usr/man/man3/mouse_trafo.3x
-#usr/man/man3/mouseinterval.3x
-#usr/man/man3/mouseinterval_sp.3x
-#usr/man/man3/mousemask.3x
-#usr/man/man3/mousemask_sp.3x
-#usr/man/man3/move.3x
-#usr/man/man3/move_field.3x
-#usr/man/man3/move_panel.3x
-#usr/man/man3/mvadd_wch.3x
-#usr/man/man3/mvadd_wchnstr.3x
-#usr/man/man3/mvadd_wchstr.3x
-#usr/man/man3/mvaddch.3x
-#usr/man/man3/mvaddchnstr.3x
-#usr/man/man3/mvaddchstr.3x
-#usr/man/man3/mvaddnstr.3x
-#usr/man/man3/mvaddnwstr.3x
-#usr/man/man3/mvaddstr.3x
-#usr/man/man3/mvaddwstr.3x
-#usr/man/man3/mvchgat.3x
-#usr/man/man3/mvcur.3x
-#usr/man/man3/mvcur_sp.3x
-#usr/man/man3/mvdelch.3x
-#usr/man/man3/mvderwin.3x
-#usr/man/man3/mvget_wch.3x
-#usr/man/man3/mvget_wstr.3x
-#usr/man/man3/mvgetch.3x
-#usr/man/man3/mvgetn_wstr.3x
-#usr/man/man3/mvgetnstr.3x
-#usr/man/man3/mvgetstr.3x
-#usr/man/man3/mvhline.3x
-#usr/man/man3/mvhline_set.3x
-#usr/man/man3/mvin_wch.3x
-#usr/man/man3/mvin_wchnstr.3x
-#usr/man/man3/mvin_wchstr.3x
-#usr/man/man3/mvinch.3x
-#usr/man/man3/mvinchnstr.3x
-#usr/man/man3/mvinchstr.3x
-#usr/man/man3/mvinnstr.3x
-#usr/man/man3/mvinnwstr.3x
-#usr/man/man3/mvins_nwstr.3x
-#usr/man/man3/mvins_wch.3x
-#usr/man/man3/mvins_wstr.3x
-#usr/man/man3/mvinsch.3x
-#usr/man/man3/mvinsnstr.3x
-#usr/man/man3/mvinsstr.3x
-#usr/man/man3/mvinstr.3x
-#usr/man/man3/mvinwstr.3x
-#usr/man/man3/mvprintw.3x
-#usr/man/man3/mvscanw.3x
-#usr/man/man3/mvvline.3x
-#usr/man/man3/mvvline_set.3x
-#usr/man/man3/mvwadd_wch.3x
-#usr/man/man3/mvwadd_wchnstr.3x
-#usr/man/man3/mvwadd_wchstr.3x
-#usr/man/man3/mvwaddch.3x
-#usr/man/man3/mvwaddchnstr.3x
-#usr/man/man3/mvwaddchstr.3x
-#usr/man/man3/mvwaddnstr.3x
-#usr/man/man3/mvwaddnwstr.3x
-#usr/man/man3/mvwaddstr.3x
-#usr/man/man3/mvwaddwstr.3x
-#usr/man/man3/mvwchgat.3x
-#usr/man/man3/mvwdelch.3x
-#usr/man/man3/mvwget_wch.3x
-#usr/man/man3/mvwget_wstr.3x
-#usr/man/man3/mvwgetch.3x
-#usr/man/man3/mvwgetn_wstr.3x
-#usr/man/man3/mvwgetnstr.3x
-#usr/man/man3/mvwgetstr.3x
-#usr/man/man3/mvwhline.3x
-#usr/man/man3/mvwhline_set.3x
-#usr/man/man3/mvwin.3x
-#usr/man/man3/mvwin_wch.3x
-#usr/man/man3/mvwin_wchnstr.3x
-#usr/man/man3/mvwin_wchstr.3x
-#usr/man/man3/mvwinch.3x
-#usr/man/man3/mvwinchnstr.3x
-#usr/man/man3/mvwinchstr.3x
-#usr/man/man3/mvwinnstr.3x
-#usr/man/man3/mvwinnwstr.3x
-#usr/man/man3/mvwins_nwstr.3x
-#usr/man/man3/mvwins_wch.3x
-#usr/man/man3/mvwins_wstr.3x
-#usr/man/man3/mvwinsch.3x
-#usr/man/man3/mvwinsnstr.3x
-#usr/man/man3/mvwinsstr.3x
-#usr/man/man3/mvwinstr.3x
-#usr/man/man3/mvwinwstr.3x
-#usr/man/man3/mvwprintw.3x
-#usr/man/man3/mvwscanw.3x
-#usr/man/man3/mvwvline.3x
-#usr/man/man3/mvwvline_set.3x
-#usr/man/man3/napms.3x
-#usr/man/man3/napms_sp.3x
-#usr/man/man3/ncurses.3x
-#usr/man/man3/new_field.3x
-#usr/man/man3/new_fieldtype.3x
-#usr/man/man3/new_form.3x
-#usr/man/man3/new_form_sp.3x
-#usr/man/man3/new_item.3x
-#usr/man/man3/new_menu.3x
-#usr/man/man3/new_menu_sp.3x
-#usr/man/man3/new_page.3x
-#usr/man/man3/new_panel.3x
-#usr/man/man3/new_prescr.3x
-#usr/man/man3/newpad.3x
-#usr/man/man3/newpad_sp.3x
-#usr/man/man3/newscr.3x
-#usr/man/man3/newterm.3x
-#usr/man/man3/newterm_sp.3x
-#usr/man/man3/newwin.3x
-#usr/man/man3/newwin_sp.3x
-#usr/man/man3/nl.3x
-#usr/man/man3/nl_sp.3x
-#usr/man/man3/nocbreak.3x
-#usr/man/man3/nocbreak_sp.3x
-#usr/man/man3/nodelay.3x
-#usr/man/man3/noecho.3x
-#usr/man/man3/noecho_sp.3x
-#usr/man/man3/nofilter.3x
-#usr/man/man3/nofilter_sp.3x
-#usr/man/man3/nonl.3x
-#usr/man/man3/nonl_sp.3x
-#usr/man/man3/noqiflush.3x
-#usr/man/man3/noqiflush_sp.3x
-#usr/man/man3/noraw.3x
-#usr/man/man3/noraw_sp.3x
-#usr/man/man3/notimeout.3x
-#usr/man/man3/numcodes.3x
-#usr/man/man3/numfnames.3x
-#usr/man/man3/numnames.3x
-#usr/man/man3/ospeed.3x
-#usr/man/man3/overlay.3x
-#usr/man/man3/overwrite.3x
-#usr/man/man3/pair_content.3x
-#usr/man/man3/pair_content_sp.3x
-#usr/man/man3/panel.3x
-#usr/man/man3/panel_above.3x
-#usr/man/man3/panel_below.3x
-#usr/man/man3/panel_hidden.3x
-#usr/man/man3/panel_userptr.3x
-#usr/man/man3/panel_window.3x
-#usr/man/man3/pecho_wchar.3x
-#usr/man/man3/pechochar.3x
-#usr/man/man3/pnoutrefresh.3x
-#usr/man/man3/pos_form_cursor.3x
-#usr/man/man3/pos_menu_cursor.3x
-#usr/man/man3/post_form.3x
-#usr/man/man3/post_menu.3x
-#usr/man/man3/prefresh.3x
-#usr/man/man3/printw.3x
-#usr/man/man3/putp.3x
-#usr/man/man3/putp_sp.3x
-#usr/man/man3/putwin.3x
-#usr/man/man3/qiflush.3x
-#usr/man/man3/qiflush_sp.3x
-#usr/man/man3/raw.3x
-#usr/man/man3/raw_sp.3x
-#usr/man/man3/redrawwin.3x
-#usr/man/man3/refresh.3x
-#usr/man/man3/replace_panel.3x
-#usr/man/man3/reset_prog_mode.3x
-#usr/man/man3/reset_prog_mode_sp.3x
-#usr/man/man3/reset_shell_mode.3x
-#usr/man/man3/reset_shell_mode_sp.3x
-#usr/man/man3/resetty.3x
-#usr/man/man3/resetty_sp.3x
-#usr/man/man3/resize_term.3x
-#usr/man/man3/resize_term_sp.3x
-#usr/man/man3/resizeterm.3x
-#usr/man/man3/resizeterm_sp.3x
-#usr/man/man3/restartterm.3x
-#usr/man/man3/restartterm_sp.3x
-#usr/man/man3/ripoffline.3x
-#usr/man/man3/ripoffline_sp.3x
-#usr/man/man3/savetty.3x
-#usr/man/man3/savetty_sp.3x
-#usr/man/man3/scale_form.3x
-#usr/man/man3/scale_menu.3x
-#usr/man/man3/scanw.3x
-#usr/man/man3/scr_dump.3x
-#usr/man/man3/scr_init.3x
-#usr/man/man3/scr_init_sp.3x
-#usr/man/man3/scr_restore.3x
-#usr/man/man3/scr_restore_sp.3x
-#usr/man/man3/scr_set.3x
-#usr/man/man3/scr_set_sp.3x
-#usr/man/man3/scrl.3x
-#usr/man/man3/scroll.3x
-#usr/man/man3/scrollok.3x
-#usr/man/man3/set_current_field.3x
-#usr/man/man3/set_current_item.3x
-#usr/man/man3/set_curterm.3x
-#usr/man/man3/set_curterm_sp.3x
-#usr/man/man3/set_escdelay.3x
-#usr/man/man3/set_escdelay_sp.3x
-#usr/man/man3/set_field_back.3x
-#usr/man/man3/set_field_buffer.3x
-#usr/man/man3/set_field_fore.3x
-#usr/man/man3/set_field_init.3x
-#usr/man/man3/set_field_just.3x
-#usr/man/man3/set_field_opts.3x
-#usr/man/man3/set_field_pad.3x
-#usr/man/man3/set_field_status.3x
-#usr/man/man3/set_field_term.3x
-#usr/man/man3/set_field_type.3x
-#usr/man/man3/set_field_userptr.3x
-#usr/man/man3/set_fieldtype_arg.3x
-#usr/man/man3/set_fieldtype_choice.3x
-#usr/man/man3/set_form_fields.3x
-#usr/man/man3/set_form_init.3x
-#usr/man/man3/set_form_opts.3x
-#usr/man/man3/set_form_page.3x
-#usr/man/man3/set_form_sub.3x
-#usr/man/man3/set_form_term.3x
-#usr/man/man3/set_form_userptr.3x
-#usr/man/man3/set_form_win.3x
-#usr/man/man3/set_item_init.3x
-#usr/man/man3/set_item_opts.3x
-#usr/man/man3/set_item_term.3x
-#usr/man/man3/set_item_userptr.3x
-#usr/man/man3/set_item_value.3x
-#usr/man/man3/set_max_field.3x
-#usr/man/man3/set_menu_back.3x
-#usr/man/man3/set_menu_fore.3x
-#usr/man/man3/set_menu_format.3x
-#usr/man/man3/set_menu_grey.3x
-#usr/man/man3/set_menu_init.3x
-#usr/man/man3/set_menu_items.3x
-#usr/man/man3/set_menu_mark.3x
-#usr/man/man3/set_menu_opts.3x
-#usr/man/man3/set_menu_pad.3x
-#usr/man/man3/set_menu_pattern.3x
-#usr/man/man3/set_menu_spacing.3x
-#usr/man/man3/set_menu_sub.3x
-#usr/man/man3/set_menu_term.3x
-#usr/man/man3/set_menu_userptr.3x
-#usr/man/man3/set_menu_win.3x
-#usr/man/man3/set_new_page.3x
-#usr/man/man3/set_panel_userptr.3x
-#usr/man/man3/set_tabsize.3x
-#usr/man/man3/set_tabsize_sp.3x
-#usr/man/man3/set_term.3x
-#usr/man/man3/set_top_row.3x
-#usr/man/man3/setcchar.3x
-#usr/man/man3/setscrreg.3x
-#usr/man/man3/setsyx.3x
-#usr/man/man3/setterm.3x
-#usr/man/man3/setupterm.3x
-#usr/man/man3/show_panel.3x
-#usr/man/man3/slk_attr.3x
-#usr/man/man3/slk_attr_off.3x
-#usr/man/man3/slk_attr_on.3x
-#usr/man/man3/slk_attr_set.3x
-#usr/man/man3/slk_attr_set_sp.3x
-#usr/man/man3/slk_attr_sp.3x
-#usr/man/man3/slk_attroff.3x
-#usr/man/man3/slk_attroff_sp.3x
-#usr/man/man3/slk_attron.3x
-#usr/man/man3/slk_attron_sp.3x
-#usr/man/man3/slk_attrset.3x
-#usr/man/man3/slk_attrset_sp.3x
-#usr/man/man3/slk_clear.3x
-#usr/man/man3/slk_clear_sp.3x
-#usr/man/man3/slk_color.3x
-#usr/man/man3/slk_color_sp.3x
-#usr/man/man3/slk_init.3x
-#usr/man/man3/slk_init_sp.3x
-#usr/man/man3/slk_label.3x
-#usr/man/man3/slk_label_sp.3x
-#usr/man/man3/slk_noutrefresh.3x
-#usr/man/man3/slk_noutrefresh_sp.3x
-#usr/man/man3/slk_refresh.3x
-#usr/man/man3/slk_refresh_sp.3x
-#usr/man/man3/slk_restore.3x
-#usr/man/man3/slk_restore_sp.3x
-#usr/man/man3/slk_set.3x
-#usr/man/man3/slk_set_sp.3x
-#usr/man/man3/slk_touch.3x
-#usr/man/man3/slk_touch_sp.3x
-#usr/man/man3/slk_wset.3x
-#usr/man/man3/standend.3x
-#usr/man/man3/standout.3x
-#usr/man/man3/start_color.3x
-#usr/man/man3/start_color_sp.3x
-#usr/man/man3/stdscr.3x
-#usr/man/man3/strcodes.3x
-#usr/man/man3/strfnames.3x
-#usr/man/man3/strnames.3x
-#usr/man/man3/subpad.3x
-#usr/man/man3/subwin.3x
-#usr/man/man3/syncok.3x
-#usr/man/man3/term_attrs.3x
-#usr/man/man3/term_attrs_sp.3x
-#usr/man/man3/term_variables.3x
-#usr/man/man3/termattrs.3x
-#usr/man/man3/termattrs_sp.3x
-#usr/man/man3/termname.3x
-#usr/man/man3/termname_sp.3x
-#usr/man/man3/tgetent.3x
-#usr/man/man3/tgetent_sp.3x
-#usr/man/man3/tgetflag.3x
-#usr/man/man3/tgetflag_sp.3x
-#usr/man/man3/tgetnum.3x
-#usr/man/man3/tgetnum_sp.3x
-#usr/man/man3/tgetstr.3x
-#usr/man/man3/tgetstr_sp.3x
-#usr/man/man3/tgoto.3x
-#usr/man/man3/tigetflag.3x
-#usr/man/man3/tigetflag_sp.3x
-#usr/man/man3/tigetnum.3x
-#usr/man/man3/tigetnum_sp.3x
-#usr/man/man3/tigetstr.3x
-#usr/man/man3/tigetstr_sp.3x
-#usr/man/man3/timeout.3x
-#usr/man/man3/tiparm.3x
-#usr/man/man3/top_panel.3x
-#usr/man/man3/top_row.3x
-#usr/man/man3/touchline.3x
-#usr/man/man3/touchwin.3x
-#usr/man/man3/tparm.3x
-#usr/man/man3/tputs.3x
-#usr/man/man3/tputs_sp.3x
-#usr/man/man3/trace.3x
-#usr/man/man3/ttytype.3x
-#usr/man/man3/typeahead.3x
-#usr/man/man3/typeahead_sp.3x
-#usr/man/man3/unctrl.3x
-#usr/man/man3/unctrl_sp.3x
-#usr/man/man3/unget_wch.3x
-#usr/man/man3/unget_wch_sp.3x
-#usr/man/man3/ungetch.3x
-#usr/man/man3/ungetch_sp.3x
-#usr/man/man3/ungetmouse.3x
-#usr/man/man3/ungetmouse_sp.3x
-#usr/man/man3/unpost_form.3x
-#usr/man/man3/unpost_menu.3x
-#usr/man/man3/untouchwin.3x
-#usr/man/man3/update_panels.3x
-#usr/man/man3/update_panels_sp.3x
-#usr/man/man3/use_default_colors.3x
-#usr/man/man3/use_default_colors_sp.3x
-#usr/man/man3/use_env.3x
-#usr/man/man3/use_env_sp.3x
-#usr/man/man3/use_extended_names.3x
-#usr/man/man3/use_legacy_coding.3x
-#usr/man/man3/use_legacy_coding_sp.3x
-#usr/man/man3/use_screen.3x
-#usr/man/man3/use_window.3x
-#usr/man/man3/vid_attr.3x
-#usr/man/man3/vid_attr_sp.3x
-#usr/man/man3/vid_puts.3x
-#usr/man/man3/vid_puts_sp.3x
-#usr/man/man3/vidattr.3x
-#usr/man/man3/vidattr_sp.3x
-#usr/man/man3/vidputs.3x
-#usr/man/man3/vidputs_sp.3x
-#usr/man/man3/vline.3x
-#usr/man/man3/vline_set.3x
-#usr/man/man3/vw_printw.3x
-#usr/man/man3/vw_scanw.3x
-#usr/man/man3/vwprintw.3x
-#usr/man/man3/vwscanw.3x
-#usr/man/man3/wadd_wch.3x
-#usr/man/man3/wadd_wchnstr.3x
-#usr/man/man3/wadd_wchstr.3x
-#usr/man/man3/waddch.3x
-#usr/man/man3/waddchnstr.3x
-#usr/man/man3/waddchstr.3x
-#usr/man/man3/waddnstr.3x
-#usr/man/man3/waddnwstr.3x
-#usr/man/man3/waddstr.3x
-#usr/man/man3/waddwstr.3x
-#usr/man/man3/wattr_get.3x
-#usr/man/man3/wattr_off.3x
-#usr/man/man3/wattr_on.3x
-#usr/man/man3/wattr_set.3x
-#usr/man/man3/wattroff.3x
-#usr/man/man3/wattron.3x
-#usr/man/man3/wattrset.3x
-#usr/man/man3/wbkgd.3x
-#usr/man/man3/wbkgdset.3x
-#usr/man/man3/wbkgrnd.3x
-#usr/man/man3/wbkgrndset.3x
-#usr/man/man3/wborder.3x
-#usr/man/man3/wborder_set.3x
-#usr/man/man3/wchgat.3x
-#usr/man/man3/wclear.3x
-#usr/man/man3/wclrtobot.3x
-#usr/man/man3/wclrtoeol.3x
-#usr/man/man3/wcolor_set.3x
-#usr/man/man3/wcursyncup.3x
-#usr/man/man3/wdelch.3x
-#usr/man/man3/wdeleteln.3x
-#usr/man/man3/wecho_wchar.3x
-#usr/man/man3/wechochar.3x
-#usr/man/man3/wenclose.3x
-#usr/man/man3/werase.3x
-#usr/man/man3/wget_wch.3x
-#usr/man/man3/wget_wstr.3x
-#usr/man/man3/wgetbkgrnd.3x
-#usr/man/man3/wgetch.3x
-#usr/man/man3/wgetn_wstr.3x
-#usr/man/man3/wgetnstr.3x
-#usr/man/man3/wgetparent.3x
-#usr/man/man3/wgetscrreg.3x
-#usr/man/man3/wgetstr.3x
-#usr/man/man3/whline.3x
-#usr/man/man3/whline_set.3x
-#usr/man/man3/win_wch.3x
-#usr/man/man3/win_wchnstr.3x
-#usr/man/man3/win_wchstr.3x
-#usr/man/man3/winch.3x
-#usr/man/man3/winchnstr.3x
-#usr/man/man3/winchstr.3x
-#usr/man/man3/winnstr.3x
-#usr/man/man3/winnwstr.3x
-#usr/man/man3/wins_nwstr.3x
-#usr/man/man3/wins_wch.3x
-#usr/man/man3/wins_wstr.3x
-#usr/man/man3/winsch.3x
-#usr/man/man3/winsdelln.3x
-#usr/man/man3/winsertln.3x
-#usr/man/man3/winsnstr.3x
-#usr/man/man3/winsstr.3x
-#usr/man/man3/winstr.3x
-#usr/man/man3/winwstr.3x
-#usr/man/man3/wmouse_trafo.3x
-#usr/man/man3/wmove.3x
-#usr/man/man3/wnoutrefresh.3x
-#usr/man/man3/wprintw.3x
-#usr/man/man3/wredrawln.3x
-#usr/man/man3/wrefresh.3x
-#usr/man/man3/wresize.3x
-#usr/man/man3/wscanw.3x
-#usr/man/man3/wscrl.3x
-#usr/man/man3/wsetscrreg.3x
-#usr/man/man3/wstandend.3x
-#usr/man/man3/wstandout.3x
-#usr/man/man3/wsyncdown.3x
-#usr/man/man3/wsyncup.3x
-#usr/man/man3/wtimeout.3x
-#usr/man/man3/wtouchln.3x
-#usr/man/man3/wunctrl.3x
-#usr/man/man3/wunctrl_sp.3x
-#usr/man/man3/wvline.3x
-#usr/man/man3/wvline_set.3x
-#usr/man/man5
-#usr/man/man5/term.5
-#usr/man/man5/terminfo.5
-#usr/man/man7
-#usr/man/man7/term.7
+#usr/share/man/man1/captoinfo.1m
+#usr/share/man/man1/clear.1
+#usr/share/man/man1/infocmp.1m
+#usr/share/man/man1/infotocap.1m
+#usr/share/man/man1/ncursesw6-config.1
+#usr/share/man/man1/reset.1
+#usr/share/man/man1/tabs.1
+#usr/share/man/man1/tic.1m
+#usr/share/man/man1/toe.1m
+#usr/share/man/man1/tput.1
+#usr/share/man/man1/tset.1
+#usr/share/man/man3/BC.3x
+#usr/share/man/man3/COLORS.3x
+#usr/share/man/man3/COLOR_PAIR.3x
+#usr/share/man/man3/COLOR_PAIRS.3x
+#usr/share/man/man3/COLS.3x
+#usr/share/man/man3/ESCDELAY.3x
+#usr/share/man/man3/LINES.3x
+#usr/share/man/man3/PAIR_NUMBER.3x
+#usr/share/man/man3/PC.3x
+#usr/share/man/man3/SP.3x
+#usr/share/man/man3/TABSIZE.3x
+#usr/share/man/man3/TYPE_ALNUM.3x
+#usr/share/man/man3/TYPE_ALPHA.3x
+#usr/share/man/man3/TYPE_ENUM.3x
+#usr/share/man/man3/TYPE_INTEGER.3x
+#usr/share/man/man3/TYPE_IPV4.3x
+#usr/share/man/man3/TYPE_NUMERIC.3x
+#usr/share/man/man3/TYPE_REGEXP.3x
+#usr/share/man/man3/UP.3x
+#usr/share/man/man3/_nc_free_and_exit.3x
+#usr/share/man/man3/_nc_freeall.3x
+#usr/share/man/man3/_nc_tracebits.3x
+#usr/share/man/man3/_traceattr.3x
+#usr/share/man/man3/_traceattr2.3x
+#usr/share/man/man3/_tracecchar_t.3x
+#usr/share/man/man3/_tracecchar_t2.3x
+#usr/share/man/man3/_tracechar.3x
+#usr/share/man/man3/_tracechtype.3x
+#usr/share/man/man3/_tracechtype2.3x
+#usr/share/man/man3/_tracedump.3x
+#usr/share/man/man3/_tracef.3x
+#usr/share/man/man3/_tracemouse.3x
+#usr/share/man/man3/acs_map.3x
+#usr/share/man/man3/add_wch.3x
+#usr/share/man/man3/add_wchnstr.3x
+#usr/share/man/man3/add_wchstr.3x
+#usr/share/man/man3/addch.3x
+#usr/share/man/man3/addchnstr.3x
+#usr/share/man/man3/addchstr.3x
+#usr/share/man/man3/addnstr.3x
+#usr/share/man/man3/addnwstr.3x
+#usr/share/man/man3/addstr.3x
+#usr/share/man/man3/addwstr.3x
+#usr/share/man/man3/assume_default_colors.3x
+#usr/share/man/man3/assume_default_colors_sp.3x
+#usr/share/man/man3/attr_get.3x
+#usr/share/man/man3/attr_off.3x
+#usr/share/man/man3/attr_on.3x
+#usr/share/man/man3/attr_set.3x
+#usr/share/man/man3/attroff.3x
+#usr/share/man/man3/attron.3x
+#usr/share/man/man3/attrset.3x
+#usr/share/man/man3/baudrate.3x
+#usr/share/man/man3/baudrate_sp.3x
+#usr/share/man/man3/beep.3x
+#usr/share/man/man3/beep_sp.3x
+#usr/share/man/man3/bkgd.3x
+#usr/share/man/man3/bkgdset.3x
+#usr/share/man/man3/bkgrnd.3x
+#usr/share/man/man3/bkgrndset.3x
+#usr/share/man/man3/boolcodes.3x
+#usr/share/man/man3/boolfnames.3x
+#usr/share/man/man3/boolnames.3x
+#usr/share/man/man3/border.3x
+#usr/share/man/man3/border_set.3x
+#usr/share/man/man3/bottom_panel.3x
+#usr/share/man/man3/box.3x
+#usr/share/man/man3/box_set.3x
+#usr/share/man/man3/can_change_color.3x
+#usr/share/man/man3/can_change_color_sp.3x
+#usr/share/man/man3/cbreak.3x
+#usr/share/man/man3/cbreak_sp.3x
+#usr/share/man/man3/ceiling_panel.3x
+#usr/share/man/man3/chgat.3x
+#usr/share/man/man3/clear.3x
+#usr/share/man/man3/clearok.3x
+#usr/share/man/man3/clrtobot.3x
+#usr/share/man/man3/clrtoeol.3x
+#usr/share/man/man3/color_content.3x
+#usr/share/man/man3/color_content_sp.3x
+#usr/share/man/man3/color_set.3x
+#usr/share/man/man3/copywin.3x
+#usr/share/man/man3/cur_term.3x
+#usr/share/man/man3/current_field.3x
+#usr/share/man/man3/current_item.3x
+#usr/share/man/man3/curs_add_wch.3x
+#usr/share/man/man3/curs_add_wchstr.3x
+#usr/share/man/man3/curs_addch.3x
+#usr/share/man/man3/curs_addchstr.3x
+#usr/share/man/man3/curs_addstr.3x
+#usr/share/man/man3/curs_addwstr.3x
+#usr/share/man/man3/curs_attr.3x
+#usr/share/man/man3/curs_beep.3x
+#usr/share/man/man3/curs_bkgd.3x
+#usr/share/man/man3/curs_bkgrnd.3x
+#usr/share/man/man3/curs_border.3x
+#usr/share/man/man3/curs_border_set.3x
+#usr/share/man/man3/curs_clear.3x
+#usr/share/man/man3/curs_color.3x
+#usr/share/man/man3/curs_delch.3x
+#usr/share/man/man3/curs_deleteln.3x
+#usr/share/man/man3/curs_extend.3x
+#usr/share/man/man3/curs_get_wch.3x
+#usr/share/man/man3/curs_get_wstr.3x
+#usr/share/man/man3/curs_getcchar.3x
+#usr/share/man/man3/curs_getch.3x
+#usr/share/man/man3/curs_getstr.3x
+#usr/share/man/man3/curs_getyx.3x
+#usr/share/man/man3/curs_in_wch.3x
+#usr/share/man/man3/curs_in_wchstr.3x
+#usr/share/man/man3/curs_inch.3x
+#usr/share/man/man3/curs_inchstr.3x
+#usr/share/man/man3/curs_initscr.3x
+#usr/share/man/man3/curs_inopts.3x
+#usr/share/man/man3/curs_ins_wch.3x
+#usr/share/man/man3/curs_ins_wstr.3x
+#usr/share/man/man3/curs_insch.3x
+#usr/share/man/man3/curs_insstr.3x
+#usr/share/man/man3/curs_instr.3x
+#usr/share/man/man3/curs_inwstr.3x
+#usr/share/man/man3/curs_kernel.3x
+#usr/share/man/man3/curs_legacy.3x
+#usr/share/man/man3/curs_memleaks.3x
+#usr/share/man/man3/curs_mouse.3x
+#usr/share/man/man3/curs_move.3x
+#usr/share/man/man3/curs_opaque.3x
+#usr/share/man/man3/curs_outopts.3x
+#usr/share/man/man3/curs_overlay.3x
+#usr/share/man/man3/curs_pad.3x
+#usr/share/man/man3/curs_print.3x
+#usr/share/man/man3/curs_printw.3x
+#usr/share/man/man3/curs_refresh.3x
+#usr/share/man/man3/curs_scanw.3x
+#usr/share/man/man3/curs_scr_dump.3x
+#usr/share/man/man3/curs_scroll.3x
+#usr/share/man/man3/curs_set.3x
+#usr/share/man/man3/curs_set_sp.3x
+#usr/share/man/man3/curs_slk.3x
+#usr/share/man/man3/curs_sp_funcs.3x
+#usr/share/man/man3/curs_termattrs.3x
+#usr/share/man/man3/curs_termcap.3x
+#usr/share/man/man3/curs_terminfo.3x
+#usr/share/man/man3/curs_threads.3x
+#usr/share/man/man3/curs_touch.3x
+#usr/share/man/man3/curs_trace.3x
+#usr/share/man/man3/curs_util.3x
+#usr/share/man/man3/curs_variables.3x
+#usr/share/man/man3/curs_window.3x
+#usr/share/man/man3/curscr.3x
+#usr/share/man/man3/curses.3x
+#usr/share/man/man3/curses_version.3x
+#usr/share/man/man3/data_ahead.3x
+#usr/share/man/man3/data_behind.3x
+#usr/share/man/man3/def_prog_mode.3x
+#usr/share/man/man3/def_prog_mode_sp.3x
+#usr/share/man/man3/def_shell_mode.3x
+#usr/share/man/man3/def_shell_mode_sp.3x
+#usr/share/man/man3/default_colors.3x
+#usr/share/man/man3/define_key.3x
+#usr/share/man/man3/define_key_sp.3x
+#usr/share/man/man3/del_curterm.3x
+#usr/share/man/man3/del_curterm_sp.3x
+#usr/share/man/man3/del_panel.3x
+#usr/share/man/man3/delay_output.3x
+#usr/share/man/man3/delay_output_sp.3x
+#usr/share/man/man3/delch.3x
+#usr/share/man/man3/deleteln.3x
+#usr/share/man/man3/delscreen.3x
+#usr/share/man/man3/delwin.3x
+#usr/share/man/man3/derwin.3x
+#usr/share/man/man3/doupdate.3x
+#usr/share/man/man3/doupdate_sp.3x
+#usr/share/man/man3/dup_field.3x
+#usr/share/man/man3/dupwin.3x
+#usr/share/man/man3/dynamic_field_info.3x
+#usr/share/man/man3/echo.3x
+#usr/share/man/man3/echo_sp.3x
+#usr/share/man/man3/echo_wchar.3x
+#usr/share/man/man3/echochar.3x
+#usr/share/man/man3/endwin.3x
+#usr/share/man/man3/endwin_sp.3x
+#usr/share/man/man3/erase.3x
+#usr/share/man/man3/erasechar.3x
+#usr/share/man/man3/erasechar_sp.3x
+#usr/share/man/man3/erasewchar.3x
+#usr/share/man/man3/field_arg.3x
+#usr/share/man/man3/field_back.3x
+#usr/share/man/man3/field_buffer.3x
+#usr/share/man/man3/field_count.3x
+#usr/share/man/man3/field_fore.3x
+#usr/share/man/man3/field_index.3x
+#usr/share/man/man3/field_info.3x
+#usr/share/man/man3/field_init.3x
+#usr/share/man/man3/field_just.3x
+#usr/share/man/man3/field_opts.3x
+#usr/share/man/man3/field_opts_off.3x
+#usr/share/man/man3/field_opts_on.3x
+#usr/share/man/man3/field_pad.3x
+#usr/share/man/man3/field_status.3x
+#usr/share/man/man3/field_term.3x
+#usr/share/man/man3/field_type.3x
+#usr/share/man/man3/field_userptr.3x
+#usr/share/man/man3/filter.3x
+#usr/share/man/man3/filter_sp.3x
+#usr/share/man/man3/flash.3x
+#usr/share/man/man3/flash_sp.3x
+#usr/share/man/man3/flushinp.3x
+#usr/share/man/man3/flushinp_sp.3x
+#usr/share/man/man3/form.3x
+#usr/share/man/man3/form_cursor.3x
+#usr/share/man/man3/form_data.3x
+#usr/share/man/man3/form_driver.3x
+#usr/share/man/man3/form_driver_w.3x
+#usr/share/man/man3/form_field.3x
+#usr/share/man/man3/form_field_attributes.3x
+#usr/share/man/man3/form_field_buffer.3x
+#usr/share/man/man3/form_field_info.3x
+#usr/share/man/man3/form_field_just.3x
+#usr/share/man/man3/form_field_new.3x
+#usr/share/man/man3/form_field_opts.3x
+#usr/share/man/man3/form_field_userptr.3x
+#usr/share/man/man3/form_field_validation.3x
+#usr/share/man/man3/form_fields.3x
+#usr/share/man/man3/form_fieldtype.3x
+#usr/share/man/man3/form_hook.3x
+#usr/share/man/man3/form_init.3x
+#usr/share/man/man3/form_new.3x
+#usr/share/man/man3/form_new_page.3x
+#usr/share/man/man3/form_opts.3x
+#usr/share/man/man3/form_opts_off.3x
+#usr/share/man/man3/form_opts_on.3x
+#usr/share/man/man3/form_page.3x
+#usr/share/man/man3/form_post.3x
+#usr/share/man/man3/form_request_by_name.3x
+#usr/share/man/man3/form_request_name.3x
+#usr/share/man/man3/form_requestname.3x
+#usr/share/man/man3/form_sub.3x
+#usr/share/man/man3/form_term.3x
+#usr/share/man/man3/form_userptr.3x
+#usr/share/man/man3/form_variables.3x
+#usr/share/man/man3/form_win.3x
+#usr/share/man/man3/free_field.3x
+#usr/share/man/man3/free_fieldtype.3x
+#usr/share/man/man3/free_form.3x
+#usr/share/man/man3/free_item.3x
+#usr/share/man/man3/free_menu.3x
+#usr/share/man/man3/get_escdelay.3x
+#usr/share/man/man3/get_escdelay_sp.3x
+#usr/share/man/man3/get_wch.3x
+#usr/share/man/man3/get_wstr.3x
+#usr/share/man/man3/getattrs.3x
+#usr/share/man/man3/getbegx.3x
+#usr/share/man/man3/getbegy.3x
+#usr/share/man/man3/getbegyx.3x
+#usr/share/man/man3/getbkgd.3x
+#usr/share/man/man3/getbkgrnd.3x
+#usr/share/man/man3/getcchar.3x
+#usr/share/man/man3/getch.3x
+#usr/share/man/man3/getcurx.3x
+#usr/share/man/man3/getcury.3x
+#usr/share/man/man3/getmaxx.3x
+#usr/share/man/man3/getmaxy.3x
+#usr/share/man/man3/getmaxyx.3x
+#usr/share/man/man3/getmouse.3x
+#usr/share/man/man3/getmouse_sp.3x
+#usr/share/man/man3/getn_wstr.3x
+#usr/share/man/man3/getnstr.3x
+#usr/share/man/man3/getparx.3x
+#usr/share/man/man3/getpary.3x
+#usr/share/man/man3/getparyx.3x
+#usr/share/man/man3/getstr.3x
+#usr/share/man/man3/getsyx.3x
+#usr/share/man/man3/getwin.3x
+#usr/share/man/man3/getwin_sp.3x
+#usr/share/man/man3/getyx.3x
+#usr/share/man/man3/ground_panel.3x
+#usr/share/man/man3/halfdelay.3x
+#usr/share/man/man3/halfdelay_sp.3x
+#usr/share/man/man3/has_colors.3x
+#usr/share/man/man3/has_colors_sp.3x
+#usr/share/man/man3/has_ic.3x
+#usr/share/man/man3/has_ic_sp.3x
+#usr/share/man/man3/has_il.3x
+#usr/share/man/man3/has_il_sp.3x
+#usr/share/man/man3/has_key.3x
+#usr/share/man/man3/has_key_sp.3x
+#usr/share/man/man3/has_mouse.3x
+#usr/share/man/man3/has_mouse_sp.3x
+#usr/share/man/man3/hide_panel.3x
+#usr/share/man/man3/hline.3x
+#usr/share/man/man3/hline_set.3x
+#usr/share/man/man3/idcok.3x
+#usr/share/man/man3/idlok.3x
+#usr/share/man/man3/immedok.3x
+#usr/share/man/man3/in_wch.3x
+#usr/share/man/man3/in_wchnstr.3x
+#usr/share/man/man3/in_wchstr.3x
+#usr/share/man/man3/inch.3x
+#usr/share/man/man3/inchnstr.3x
+#usr/share/man/man3/inchstr.3x
+#usr/share/man/man3/init_color.3x
+#usr/share/man/man3/init_color_sp.3x
+#usr/share/man/man3/init_pair.3x
+#usr/share/man/man3/init_pair_sp.3x
+#usr/share/man/man3/initscr.3x
+#usr/share/man/man3/innstr.3x
+#usr/share/man/man3/innwstr.3x
+#usr/share/man/man3/ins_nwstr.3x
+#usr/share/man/man3/ins_wch.3x
+#usr/share/man/man3/ins_wstr.3x
+#usr/share/man/man3/insch.3x
+#usr/share/man/man3/insdelln.3x
+#usr/share/man/man3/insertln.3x
+#usr/share/man/man3/insnstr.3x
+#usr/share/man/man3/insstr.3x
+#usr/share/man/man3/instr.3x
+#usr/share/man/man3/intrflush.3x
+#usr/share/man/man3/intrflush_sp.3x
+#usr/share/man/man3/inwstr.3x
+#usr/share/man/man3/is_cleared.3x
+#usr/share/man/man3/is_idcok.3x
+#usr/share/man/man3/is_idlok.3x
+#usr/share/man/man3/is_immedok.3x
+#usr/share/man/man3/is_keypad.3x
+#usr/share/man/man3/is_leaveok.3x
+#usr/share/man/man3/is_linetouched.3x
+#usr/share/man/man3/is_nodelay.3x
+#usr/share/man/man3/is_notimeout.3x
+#usr/share/man/man3/is_pad.3x
+#usr/share/man/man3/is_scrollok.3x
+#usr/share/man/man3/is_subwin.3x
+#usr/share/man/man3/is_syncok.3x
+#usr/share/man/man3/is_term_resized.3x
+#usr/share/man/man3/is_term_resized_sp.3x
+#usr/share/man/man3/is_wintouched.3x
+#usr/share/man/man3/isendwin.3x
+#usr/share/man/man3/isendwin_sp.3x
+#usr/share/man/man3/item_count.3x
+#usr/share/man/man3/item_description.3x
+#usr/share/man/man3/item_index.3x
+#usr/share/man/man3/item_init.3x
+#usr/share/man/man3/item_name.3x
+#usr/share/man/man3/item_opts.3x
+#usr/share/man/man3/item_opts_off.3x
+#usr/share/man/man3/item_opts_on.3x
+#usr/share/man/man3/item_term.3x
+#usr/share/man/man3/item_userptr.3x
+#usr/share/man/man3/item_value.3x
+#usr/share/man/man3/item_visible.3x
+#usr/share/man/man3/key_defined.3x
+#usr/share/man/man3/key_defined_sp.3x
+#usr/share/man/man3/key_name.3x
+#usr/share/man/man3/keybound.3x
+#usr/share/man/man3/keybound_sp.3x
+#usr/share/man/man3/keyname.3x
+#usr/share/man/man3/keyname_sp.3x
+#usr/share/man/man3/keyok.3x
+#usr/share/man/man3/keyok_sp.3x
+#usr/share/man/man3/keypad.3x
+#usr/share/man/man3/killchar.3x
+#usr/share/man/man3/killchar_sp.3x
+#usr/share/man/man3/killwchar.3x
+#usr/share/man/man3/leaveok.3x
+#usr/share/man/man3/legacy_coding.3x
+#usr/share/man/man3/link_field.3x
+#usr/share/man/man3/link_fieldtype.3x
+#usr/share/man/man3/longname.3x
+#usr/share/man/man3/mcprint.3x
+#usr/share/man/man3/mcprint_sp.3x
+#usr/share/man/man3/menu.3x
+#usr/share/man/man3/menu_attributes.3x
+#usr/share/man/man3/menu_back.3x
+#usr/share/man/man3/menu_cursor.3x
+#usr/share/man/man3/menu_driver.3x
+#usr/share/man/man3/menu_fore.3x
+#usr/share/man/man3/menu_format.3x
+#usr/share/man/man3/menu_grey.3x
+#usr/share/man/man3/menu_hook.3x
+#usr/share/man/man3/menu_init.3x
+#usr/share/man/man3/menu_items.3x
+#usr/share/man/man3/menu_mark.3x
+#usr/share/man/man3/menu_new.3x
+#usr/share/man/man3/menu_opts.3x
+#usr/share/man/man3/menu_opts_off.3x
+#usr/share/man/man3/menu_opts_on.3x
+#usr/share/man/man3/menu_pad.3x
+#usr/share/man/man3/menu_pattern.3x
+#usr/share/man/man3/menu_post.3x
+#usr/share/man/man3/menu_request_by_name.3x
+#usr/share/man/man3/menu_request_name.3x
+#usr/share/man/man3/menu_requestname.3x
+#usr/share/man/man3/menu_spacing.3x
+#usr/share/man/man3/menu_sub.3x
+#usr/share/man/man3/menu_term.3x
+#usr/share/man/man3/menu_userptr.3x
+#usr/share/man/man3/menu_win.3x
+#usr/share/man/man3/meta.3x
+#usr/share/man/man3/mitem_current.3x
+#usr/share/man/man3/mitem_name.3x
+#usr/share/man/man3/mitem_new.3x
+#usr/share/man/man3/mitem_opts.3x
+#usr/share/man/man3/mitem_userptr.3x
+#usr/share/man/man3/mitem_value.3x
+#usr/share/man/man3/mitem_visible.3x
+#usr/share/man/man3/mouse_trafo.3x
+#usr/share/man/man3/mouseinterval.3x
+#usr/share/man/man3/mouseinterval_sp.3x
+#usr/share/man/man3/mousemask.3x
+#usr/share/man/man3/mousemask_sp.3x
+#usr/share/man/man3/move.3x
+#usr/share/man/man3/move_field.3x
+#usr/share/man/man3/move_panel.3x
+#usr/share/man/man3/mvadd_wch.3x
+#usr/share/man/man3/mvadd_wchnstr.3x
+#usr/share/man/man3/mvadd_wchstr.3x
+#usr/share/man/man3/mvaddch.3x
+#usr/share/man/man3/mvaddchnstr.3x
+#usr/share/man/man3/mvaddchstr.3x
+#usr/share/man/man3/mvaddnstr.3x
+#usr/share/man/man3/mvaddnwstr.3x
+#usr/share/man/man3/mvaddstr.3x
+#usr/share/man/man3/mvaddwstr.3x
+#usr/share/man/man3/mvchgat.3x
+#usr/share/man/man3/mvcur.3x
+#usr/share/man/man3/mvcur_sp.3x
+#usr/share/man/man3/mvdelch.3x
+#usr/share/man/man3/mvderwin.3x
+#usr/share/man/man3/mvget_wch.3x
+#usr/share/man/man3/mvget_wstr.3x
+#usr/share/man/man3/mvgetch.3x
+#usr/share/man/man3/mvgetn_wstr.3x
+#usr/share/man/man3/mvgetnstr.3x
+#usr/share/man/man3/mvgetstr.3x
+#usr/share/man/man3/mvhline.3x
+#usr/share/man/man3/mvhline_set.3x
+#usr/share/man/man3/mvin_wch.3x
+#usr/share/man/man3/mvin_wchnstr.3x
+#usr/share/man/man3/mvin_wchstr.3x
+#usr/share/man/man3/mvinch.3x
+#usr/share/man/man3/mvinchnstr.3x
+#usr/share/man/man3/mvinchstr.3x
+#usr/share/man/man3/mvinnstr.3x
+#usr/share/man/man3/mvinnwstr.3x
+#usr/share/man/man3/mvins_nwstr.3x
+#usr/share/man/man3/mvins_wch.3x
+#usr/share/man/man3/mvins_wstr.3x
+#usr/share/man/man3/mvinsch.3x
+#usr/share/man/man3/mvinsnstr.3x
+#usr/share/man/man3/mvinsstr.3x
+#usr/share/man/man3/mvinstr.3x
+#usr/share/man/man3/mvinwstr.3x
+#usr/share/man/man3/mvprintw.3x
+#usr/share/man/man3/mvscanw.3x
+#usr/share/man/man3/mvvline.3x
+#usr/share/man/man3/mvvline_set.3x
+#usr/share/man/man3/mvwadd_wch.3x
+#usr/share/man/man3/mvwadd_wchnstr.3x
+#usr/share/man/man3/mvwadd_wchstr.3x
+#usr/share/man/man3/mvwaddch.3x
+#usr/share/man/man3/mvwaddchnstr.3x
+#usr/share/man/man3/mvwaddchstr.3x
+#usr/share/man/man3/mvwaddnstr.3x
+#usr/share/man/man3/mvwaddnwstr.3x
+#usr/share/man/man3/mvwaddstr.3x
+#usr/share/man/man3/mvwaddwstr.3x
+#usr/share/man/man3/mvwchgat.3x
+#usr/share/man/man3/mvwdelch.3x
+#usr/share/man/man3/mvwget_wch.3x
+#usr/share/man/man3/mvwget_wstr.3x
+#usr/share/man/man3/mvwgetch.3x
+#usr/share/man/man3/mvwgetn_wstr.3x
+#usr/share/man/man3/mvwgetnstr.3x
+#usr/share/man/man3/mvwgetstr.3x
+#usr/share/man/man3/mvwhline.3x
+#usr/share/man/man3/mvwhline_set.3x
+#usr/share/man/man3/mvwin.3x
+#usr/share/man/man3/mvwin_wch.3x
+#usr/share/man/man3/mvwin_wchnstr.3x
+#usr/share/man/man3/mvwin_wchstr.3x
+#usr/share/man/man3/mvwinch.3x
+#usr/share/man/man3/mvwinchnstr.3x
+#usr/share/man/man3/mvwinchstr.3x
+#usr/share/man/man3/mvwinnstr.3x
+#usr/share/man/man3/mvwinnwstr.3x
+#usr/share/man/man3/mvwins_nwstr.3x
+#usr/share/man/man3/mvwins_wch.3x
+#usr/share/man/man3/mvwins_wstr.3x
+#usr/share/man/man3/mvwinsch.3x
+#usr/share/man/man3/mvwinsnstr.3x
+#usr/share/man/man3/mvwinsstr.3x
+#usr/share/man/man3/mvwinstr.3x
+#usr/share/man/man3/mvwinwstr.3x
+#usr/share/man/man3/mvwprintw.3x
+#usr/share/man/man3/mvwscanw.3x
+#usr/share/man/man3/mvwvline.3x
+#usr/share/man/man3/mvwvline_set.3x
+#usr/share/man/man3/napms.3x
+#usr/share/man/man3/napms_sp.3x
+#usr/share/man/man3/ncurses.3x
+#usr/share/man/man3/new_field.3x
+#usr/share/man/man3/new_fieldtype.3x
+#usr/share/man/man3/new_form.3x
+#usr/share/man/man3/new_form_sp.3x
+#usr/share/man/man3/new_item.3x
+#usr/share/man/man3/new_menu.3x
+#usr/share/man/man3/new_menu_sp.3x
+#usr/share/man/man3/new_page.3x
+#usr/share/man/man3/new_panel.3x
+#usr/share/man/man3/new_prescr.3x
+#usr/share/man/man3/newpad.3x
+#usr/share/man/man3/newpad_sp.3x
+#usr/share/man/man3/newscr.3x
+#usr/share/man/man3/newterm.3x
+#usr/share/man/man3/newterm_sp.3x
+#usr/share/man/man3/newwin.3x
+#usr/share/man/man3/newwin_sp.3x
+#usr/share/man/man3/nl.3x
+#usr/share/man/man3/nl_sp.3x
+#usr/share/man/man3/nocbreak.3x
+#usr/share/man/man3/nocbreak_sp.3x
+#usr/share/man/man3/nodelay.3x
+#usr/share/man/man3/noecho.3x
+#usr/share/man/man3/noecho_sp.3x
+#usr/share/man/man3/nofilter.3x
+#usr/share/man/man3/nofilter_sp.3x
+#usr/share/man/man3/nonl.3x
+#usr/share/man/man3/nonl_sp.3x
+#usr/share/man/man3/noqiflush.3x
+#usr/share/man/man3/noqiflush_sp.3x
+#usr/share/man/man3/noraw.3x
+#usr/share/man/man3/noraw_sp.3x
+#usr/share/man/man3/notimeout.3x
+#usr/share/man/man3/numcodes.3x
+#usr/share/man/man3/numfnames.3x
+#usr/share/man/man3/numnames.3x
+#usr/share/man/man3/ospeed.3x
+#usr/share/man/man3/overlay.3x
+#usr/share/man/man3/overwrite.3x
+#usr/share/man/man3/pair_content.3x
+#usr/share/man/man3/pair_content_sp.3x
+#usr/share/man/man3/panel.3x
+#usr/share/man/man3/panel_above.3x
+#usr/share/man/man3/panel_below.3x
+#usr/share/man/man3/panel_hidden.3x
+#usr/share/man/man3/panel_userptr.3x
+#usr/share/man/man3/panel_window.3x
+#usr/share/man/man3/pecho_wchar.3x
+#usr/share/man/man3/pechochar.3x
+#usr/share/man/man3/pnoutrefresh.3x
+#usr/share/man/man3/pos_form_cursor.3x
+#usr/share/man/man3/pos_menu_cursor.3x
+#usr/share/man/man3/post_form.3x
+#usr/share/man/man3/post_menu.3x
+#usr/share/man/man3/prefresh.3x
+#usr/share/man/man3/printw.3x
+#usr/share/man/man3/putp.3x
+#usr/share/man/man3/putp_sp.3x
+#usr/share/man/man3/putwin.3x
+#usr/share/man/man3/qiflush.3x
+#usr/share/man/man3/qiflush_sp.3x
+#usr/share/man/man3/raw.3x
+#usr/share/man/man3/raw_sp.3x
+#usr/share/man/man3/redrawwin.3x
+#usr/share/man/man3/refresh.3x
+#usr/share/man/man3/replace_panel.3x
+#usr/share/man/man3/reset_prog_mode.3x
+#usr/share/man/man3/reset_prog_mode_sp.3x
+#usr/share/man/man3/reset_shell_mode.3x
+#usr/share/man/man3/reset_shell_mode_sp.3x
+#usr/share/man/man3/resetty.3x
+#usr/share/man/man3/resetty_sp.3x
+#usr/share/man/man3/resize_term.3x
+#usr/share/man/man3/resize_term_sp.3x
+#usr/share/man/man3/resizeterm.3x
+#usr/share/man/man3/resizeterm_sp.3x
+#usr/share/man/man3/restartterm.3x
+#usr/share/man/man3/restartterm_sp.3x
+#usr/share/man/man3/ripoffline.3x
+#usr/share/man/man3/ripoffline_sp.3x
+#usr/share/man/man3/savetty.3x
+#usr/share/man/man3/savetty_sp.3x
+#usr/share/man/man3/scale_form.3x
+#usr/share/man/man3/scale_menu.3x
+#usr/share/man/man3/scanw.3x
+#usr/share/man/man3/scr_dump.3x
+#usr/share/man/man3/scr_init.3x
+#usr/share/man/man3/scr_init_sp.3x
+#usr/share/man/man3/scr_restore.3x
+#usr/share/man/man3/scr_restore_sp.3x
+#usr/share/man/man3/scr_set.3x
+#usr/share/man/man3/scr_set_sp.3x
+#usr/share/man/man3/scrl.3x
+#usr/share/man/man3/scroll.3x
+#usr/share/man/man3/scrollok.3x
+#usr/share/man/man3/set_current_field.3x
+#usr/share/man/man3/set_current_item.3x
+#usr/share/man/man3/set_curterm.3x
+#usr/share/man/man3/set_curterm_sp.3x
+#usr/share/man/man3/set_escdelay.3x
+#usr/share/man/man3/set_escdelay_sp.3x
+#usr/share/man/man3/set_field_back.3x
+#usr/share/man/man3/set_field_buffer.3x
+#usr/share/man/man3/set_field_fore.3x
+#usr/share/man/man3/set_field_init.3x
+#usr/share/man/man3/set_field_just.3x
+#usr/share/man/man3/set_field_opts.3x
+#usr/share/man/man3/set_field_pad.3x
+#usr/share/man/man3/set_field_status.3x
+#usr/share/man/man3/set_field_term.3x
+#usr/share/man/man3/set_field_type.3x
+#usr/share/man/man3/set_field_userptr.3x
+#usr/share/man/man3/set_fieldtype_arg.3x
+#usr/share/man/man3/set_fieldtype_choice.3x
+#usr/share/man/man3/set_form_fields.3x
+#usr/share/man/man3/set_form_init.3x
+#usr/share/man/man3/set_form_opts.3x
+#usr/share/man/man3/set_form_page.3x
+#usr/share/man/man3/set_form_sub.3x
+#usr/share/man/man3/set_form_term.3x
+#usr/share/man/man3/set_form_userptr.3x
+#usr/share/man/man3/set_form_win.3x
+#usr/share/man/man3/set_item_init.3x
+#usr/share/man/man3/set_item_opts.3x
+#usr/share/man/man3/set_item_term.3x
+#usr/share/man/man3/set_item_userptr.3x
+#usr/share/man/man3/set_item_value.3x
+#usr/share/man/man3/set_max_field.3x
+#usr/share/man/man3/set_menu_back.3x
+#usr/share/man/man3/set_menu_fore.3x
+#usr/share/man/man3/set_menu_format.3x
+#usr/share/man/man3/set_menu_grey.3x
+#usr/share/man/man3/set_menu_init.3x
+#usr/share/man/man3/set_menu_items.3x
+#usr/share/man/man3/set_menu_mark.3x
+#usr/share/man/man3/set_menu_opts.3x
+#usr/share/man/man3/set_menu_pad.3x
+#usr/share/man/man3/set_menu_pattern.3x
+#usr/share/man/man3/set_menu_spacing.3x
+#usr/share/man/man3/set_menu_sub.3x
+#usr/share/man/man3/set_menu_term.3x
+#usr/share/man/man3/set_menu_userptr.3x
+#usr/share/man/man3/set_menu_win.3x
+#usr/share/man/man3/set_new_page.3x
+#usr/share/man/man3/set_panel_userptr.3x
+#usr/share/man/man3/set_tabsize.3x
+#usr/share/man/man3/set_tabsize_sp.3x
+#usr/share/man/man3/set_term.3x
+#usr/share/man/man3/set_top_row.3x
+#usr/share/man/man3/setcchar.3x
+#usr/share/man/man3/setscrreg.3x
+#usr/share/man/man3/setsyx.3x
+#usr/share/man/man3/setterm.3x
+#usr/share/man/man3/setupterm.3x
+#usr/share/man/man3/show_panel.3x
+#usr/share/man/man3/slk_attr.3x
+#usr/share/man/man3/slk_attr_off.3x
+#usr/share/man/man3/slk_attr_on.3x
+#usr/share/man/man3/slk_attr_set.3x
+#usr/share/man/man3/slk_attr_set_sp.3x
+#usr/share/man/man3/slk_attr_sp.3x
+#usr/share/man/man3/slk_attroff.3x
+#usr/share/man/man3/slk_attroff_sp.3x
+#usr/share/man/man3/slk_attron.3x
+#usr/share/man/man3/slk_attron_sp.3x
+#usr/share/man/man3/slk_attrset.3x
+#usr/share/man/man3/slk_attrset_sp.3x
+#usr/share/man/man3/slk_clear.3x
+#usr/share/man/man3/slk_clear_sp.3x
+#usr/share/man/man3/slk_color.3x
+#usr/share/man/man3/slk_color_sp.3x
+#usr/share/man/man3/slk_init.3x
+#usr/share/man/man3/slk_init_sp.3x
+#usr/share/man/man3/slk_label.3x
+#usr/share/man/man3/slk_label_sp.3x
+#usr/share/man/man3/slk_noutrefresh.3x
+#usr/share/man/man3/slk_noutrefresh_sp.3x
+#usr/share/man/man3/slk_refresh.3x
+#usr/share/man/man3/slk_refresh_sp.3x
+#usr/share/man/man3/slk_restore.3x
+#usr/share/man/man3/slk_restore_sp.3x
+#usr/share/man/man3/slk_set.3x
+#usr/share/man/man3/slk_set_sp.3x
+#usr/share/man/man3/slk_touch.3x
+#usr/share/man/man3/slk_touch_sp.3x
+#usr/share/man/man3/slk_wset.3x
+#usr/share/man/man3/standend.3x
+#usr/share/man/man3/standout.3x
+#usr/share/man/man3/start_color.3x
+#usr/share/man/man3/start_color_sp.3x
+#usr/share/man/man3/stdscr.3x
+#usr/share/man/man3/strcodes.3x
+#usr/share/man/man3/strfnames.3x
+#usr/share/man/man3/strnames.3x
+#usr/share/man/man3/subpad.3x
+#usr/share/man/man3/subwin.3x
+#usr/share/man/man3/syncok.3x
+#usr/share/man/man3/term_attrs.3x
+#usr/share/man/man3/term_attrs_sp.3x
+#usr/share/man/man3/term_variables.3x
+#usr/share/man/man3/termattrs.3x
+#usr/share/man/man3/termattrs_sp.3x
+#usr/share/man/man3/termname.3x
+#usr/share/man/man3/termname_sp.3x
+#usr/share/man/man3/tgetent.3x
+#usr/share/man/man3/tgetent_sp.3x
+#usr/share/man/man3/tgetflag.3x
+#usr/share/man/man3/tgetflag_sp.3x
+#usr/share/man/man3/tgetnum.3x
+#usr/share/man/man3/tgetnum_sp.3x
+#usr/share/man/man3/tgetstr.3x
+#usr/share/man/man3/tgetstr_sp.3x
+#usr/share/man/man3/tgoto.3x
+#usr/share/man/man3/tigetflag.3x
+#usr/share/man/man3/tigetflag_sp.3x
+#usr/share/man/man3/tigetnum.3x
+#usr/share/man/man3/tigetnum_sp.3x
+#usr/share/man/man3/tigetstr.3x
+#usr/share/man/man3/tigetstr_sp.3x
+#usr/share/man/man3/timeout.3x
+#usr/share/man/man3/tiparm.3x
+#usr/share/man/man3/top_panel.3x
+#usr/share/man/man3/top_row.3x
+#usr/share/man/man3/touchline.3x
+#usr/share/man/man3/touchwin.3x
+#usr/share/man/man3/tparm.3x
+#usr/share/man/man3/tputs.3x
+#usr/share/man/man3/tputs_sp.3x
+#usr/share/man/man3/trace.3x
+#usr/share/man/man3/ttytype.3x
+#usr/share/man/man3/typeahead.3x
+#usr/share/man/man3/typeahead_sp.3x
+#usr/share/man/man3/unctrl.3x
+#usr/share/man/man3/unctrl_sp.3x
+#usr/share/man/man3/unget_wch.3x
+#usr/share/man/man3/unget_wch_sp.3x
+#usr/share/man/man3/ungetch.3x
+#usr/share/man/man3/ungetch_sp.3x
+#usr/share/man/man3/ungetmouse.3x
+#usr/share/man/man3/ungetmouse_sp.3x
+#usr/share/man/man3/unpost_form.3x
+#usr/share/man/man3/unpost_menu.3x
+#usr/share/man/man3/untouchwin.3x
+#usr/share/man/man3/update_panels.3x
+#usr/share/man/man3/update_panels_sp.3x
+#usr/share/man/man3/use_default_colors.3x
+#usr/share/man/man3/use_default_colors_sp.3x
+#usr/share/man/man3/use_env.3x
+#usr/share/man/man3/use_env_sp.3x
+#usr/share/man/man3/use_extended_names.3x
+#usr/share/man/man3/use_legacy_coding.3x
+#usr/share/man/man3/use_legacy_coding_sp.3x
+#usr/share/man/man3/use_screen.3x
+#usr/share/man/man3/use_tioctl.3x
+#usr/share/man/man3/use_window.3x
+#usr/share/man/man3/vid_attr.3x
+#usr/share/man/man3/vid_attr_sp.3x
+#usr/share/man/man3/vid_puts.3x
+#usr/share/man/man3/vid_puts_sp.3x
+#usr/share/man/man3/vidattr.3x
+#usr/share/man/man3/vidattr_sp.3x
+#usr/share/man/man3/vidputs.3x
+#usr/share/man/man3/vidputs_sp.3x
+#usr/share/man/man3/vline.3x
+#usr/share/man/man3/vline_set.3x
+#usr/share/man/man3/vw_printw.3x
+#usr/share/man/man3/vw_scanw.3x
+#usr/share/man/man3/vwprintw.3x
+#usr/share/man/man3/vwscanw.3x
+#usr/share/man/man3/wadd_wch.3x
+#usr/share/man/man3/wadd_wchnstr.3x
+#usr/share/man/man3/wadd_wchstr.3x
+#usr/share/man/man3/waddch.3x
+#usr/share/man/man3/waddchnstr.3x
+#usr/share/man/man3/waddchstr.3x
+#usr/share/man/man3/waddnstr.3x
+#usr/share/man/man3/waddnwstr.3x
+#usr/share/man/man3/waddstr.3x
+#usr/share/man/man3/waddwstr.3x
+#usr/share/man/man3/wattr_get.3x
+#usr/share/man/man3/wattr_off.3x
+#usr/share/man/man3/wattr_on.3x
+#usr/share/man/man3/wattr_set.3x
+#usr/share/man/man3/wattroff.3x
+#usr/share/man/man3/wattron.3x
+#usr/share/man/man3/wattrset.3x
+#usr/share/man/man3/wbkgd.3x
+#usr/share/man/man3/wbkgdset.3x
+#usr/share/man/man3/wbkgrnd.3x
+#usr/share/man/man3/wbkgrndset.3x
+#usr/share/man/man3/wborder.3x
+#usr/share/man/man3/wborder_set.3x
+#usr/share/man/man3/wchgat.3x
+#usr/share/man/man3/wclear.3x
+#usr/share/man/man3/wclrtobot.3x
+#usr/share/man/man3/wclrtoeol.3x
+#usr/share/man/man3/wcolor_set.3x
+#usr/share/man/man3/wcursyncup.3x
+#usr/share/man/man3/wdelch.3x
+#usr/share/man/man3/wdeleteln.3x
+#usr/share/man/man3/wecho_wchar.3x
+#usr/share/man/man3/wechochar.3x
+#usr/share/man/man3/wenclose.3x
+#usr/share/man/man3/werase.3x
+#usr/share/man/man3/wget_wch.3x
+#usr/share/man/man3/wget_wstr.3x
+#usr/share/man/man3/wgetbkgrnd.3x
+#usr/share/man/man3/wgetch.3x
+#usr/share/man/man3/wgetdelay.3x
+#usr/share/man/man3/wgetn_wstr.3x
+#usr/share/man/man3/wgetnstr.3x
+#usr/share/man/man3/wgetparent.3x
+#usr/share/man/man3/wgetscrreg.3x
+#usr/share/man/man3/wgetstr.3x
+#usr/share/man/man3/whline.3x
+#usr/share/man/man3/whline_set.3x
+#usr/share/man/man3/win_wch.3x
+#usr/share/man/man3/win_wchnstr.3x
+#usr/share/man/man3/win_wchstr.3x
+#usr/share/man/man3/winch.3x
+#usr/share/man/man3/winchnstr.3x
+#usr/share/man/man3/winchstr.3x
+#usr/share/man/man3/winnstr.3x
+#usr/share/man/man3/winnwstr.3x
+#usr/share/man/man3/wins_nwstr.3x
+#usr/share/man/man3/wins_wch.3x
+#usr/share/man/man3/wins_wstr.3x
+#usr/share/man/man3/winsch.3x
+#usr/share/man/man3/winsdelln.3x
+#usr/share/man/man3/winsertln.3x
+#usr/share/man/man3/winsnstr.3x
+#usr/share/man/man3/winsstr.3x
+#usr/share/man/man3/winstr.3x
+#usr/share/man/man3/winwstr.3x
+#usr/share/man/man3/wmouse_trafo.3x
+#usr/share/man/man3/wmove.3x
+#usr/share/man/man3/wnoutrefresh.3x
+#usr/share/man/man3/wprintw.3x
+#usr/share/man/man3/wredrawln.3x
+#usr/share/man/man3/wrefresh.3x
+#usr/share/man/man3/wresize.3x
+#usr/share/man/man3/wscanw.3x
+#usr/share/man/man3/wscrl.3x
+#usr/share/man/man3/wsetscrreg.3x
+#usr/share/man/man3/wstandend.3x
+#usr/share/man/man3/wstandout.3x
+#usr/share/man/man3/wsyncdown.3x
+#usr/share/man/man3/wsyncup.3x
+#usr/share/man/man3/wtimeout.3x
+#usr/share/man/man3/wtouchln.3x
+#usr/share/man/man3/wunctrl.3x
+#usr/share/man/man3/wunctrl_sp.3x
+#usr/share/man/man3/wvline.3x
+#usr/share/man/man3/wvline_set.3x
+#usr/share/man/man5/term.5
+#usr/share/man/man5/terminfo.5
+#usr/share/man/man7/term.7
#usr/share/tabset
#usr/share/tabset/std
#usr/share/tabset/stdcrt
@@ -1722,6 +1702,8 @@ usr/share/terminfo/c/cygwin
#usr/share/terminfo/d/dd5000
#usr/share/terminfo/d/ddr
#usr/share/terminfo/d/ddr3180
+#usr/share/terminfo/d/dec+pp
+#usr/share/terminfo/d/dec+sl
#usr/share/terminfo/d/dec-vt100
#usr/share/terminfo/d/dec-vt220
#usr/share/terminfo/d/dec-vt330
@@ -1886,6 +1868,7 @@ usr/share/terminfo/g/gnome
#usr/share/terminfo/g/gnome+pcfkeys
#usr/share/terminfo/g/gnome-2007
#usr/share/terminfo/g/gnome-2008
+#usr/share/terminfo/g/gnome-2012
usr/share/terminfo/g/gnome-256color
#usr/share/terminfo/g/gnome-fc5
#usr/share/terminfo/g/gnome-rh62
@@ -2152,6 +2135,7 @@ usr/share/terminfo/h/hurd
#usr/share/terminfo/i/iris-ansi-net
#usr/share/terminfo/i/iris-color
#usr/share/terminfo/i/iris40
+#usr/share/terminfo/i/iterm
#usr/share/terminfo/j
#usr/share/terminfo/j/jaixterm
#usr/share/terminfo/j/jaixterm-m
@@ -2208,7 +2192,10 @@ usr/share/terminfo/l/linux
#usr/share/terminfo/l/linux-m
#usr/share/terminfo/l/linux-nic
#usr/share/terminfo/l/linux-vt
+#usr/share/terminfo/l/linux2.2
+#usr/share/terminfo/l/linux2.6
#usr/share/terminfo/l/linux2.6.26
+#usr/share/terminfo/l/linux3.0
#usr/share/terminfo/l/lisa
#usr/share/terminfo/l/lisaterm
#usr/share/terminfo/l/lisaterm-w
@@ -2225,6 +2212,8 @@ usr/share/terminfo/l/linux
usr/share/terminfo/m/mach
usr/share/terminfo/m/mach-bold
usr/share/terminfo/m/mach-color
+usr/share/terminfo/m/mach-gnu
+usr/share/terminfo/m/mach-gnu-color
#usr/share/terminfo/m/macintosh
#usr/share/terminfo/m/macterminal-w
#usr/share/terminfo/m/mai
@@ -2267,11 +2256,14 @@ usr/share/terminfo/m/mach-color
#usr/share/terminfo/m/minix
#usr/share/terminfo/m/minix-1.5
#usr/share/terminfo/m/minix-1.7
+#usr/share/terminfo/m/minix-3.0
#usr/share/terminfo/m/minix-old
#usr/share/terminfo/m/minix-old-am
usr/share/terminfo/m/mlterm
#usr/share/terminfo/m/mlterm+pcfkeys
#usr/share/terminfo/m/mlterm-256color
+#usr/share/terminfo/m/mlterm2
+#usr/share/terminfo/m/mlterm3
#usr/share/terminfo/m/mm314
#usr/share/terminfo/m/mm340
#usr/share/terminfo/m/mod
@@ -2374,6 +2366,7 @@ usr/share/terminfo/m/mrxvt
#usr/share/terminfo/n/ndr9500-nl
#usr/share/terminfo/n/nec
#usr/share/terminfo/n/nec5520
+#usr/share/terminfo/n/netbsd6
#usr/share/terminfo/n/newhp
#usr/share/terminfo/n/newhpkeyboard
#usr/share/terminfo/n/news
@@ -2416,6 +2409,7 @@ usr/share/terminfo/n/nsterm
#usr/share/terminfo/n/nsterm+mac
#usr/share/terminfo/n/nsterm+s
#usr/share/terminfo/n/nsterm-16color
+#usr/share/terminfo/n/nsterm-256color
#usr/share/terminfo/n/nsterm-7
#usr/share/terminfo/n/nsterm-7-c
#usr/share/terminfo/n/nsterm-7-c-s
@@ -2429,6 +2423,8 @@ usr/share/terminfo/n/nsterm
#usr/share/terminfo/n/nsterm-acs-m-s
#usr/share/terminfo/n/nsterm-acs-s
#usr/share/terminfo/n/nsterm-bce
+#usr/share/terminfo/n/nsterm-build326
+#usr/share/terminfo/n/nsterm-build343
#usr/share/terminfo/n/nsterm-c
#usr/share/terminfo/n/nsterm-c-7
#usr/share/terminfo/n/nsterm-c-acs
@@ -2497,6 +2493,7 @@ usr/share/terminfo/n/nsterm
#usr/share/terminfo/o/oconcept
#usr/share/terminfo/o/ofcons
#usr/share/terminfo/o/ojerq
+#usr/share/terminfo/o/old-st
#usr/share/terminfo/o/oldibmpc3
#usr/share/terminfo/o/oldpc3
#usr/share/terminfo/o/oldsun
@@ -2577,6 +2574,15 @@ usr/share/terminfo/p/pcansi
#usr/share/terminfo/p/pcansi33
#usr/share/terminfo/p/pcansi33m
#usr/share/terminfo/p/pcansi43
+usr/share/terminfo/p/pccon
+#usr/share/terminfo/p/pccon+base
+#usr/share/terminfo/p/pccon+colors
+#usr/share/terminfo/p/pccon+keys
+#usr/share/terminfo/p/pccon+sgr+acs
+#usr/share/terminfo/p/pccon+sgr+acs0
+#usr/share/terminfo/p/pccon-m
+#usr/share/terminfo/p/pccon0
+#usr/share/terminfo/p/pccon0-m
#usr/share/terminfo/p/pccons
#usr/share/terminfo/p/pcconsole
#usr/share/terminfo/p/pcix
@@ -2653,7 +2659,15 @@ usr/share/terminfo/p/pcansi
#usr/share/terminfo/p/pt505-24
#usr/share/terminfo/p/pty
usr/share/terminfo/p/putty
+usr/share/terminfo/p/putty+fnkeys
+usr/share/terminfo/p/putty+fnkeys+esc
+usr/share/terminfo/p/putty+fnkeys+linux
+usr/share/terminfo/p/putty+fnkeys+sco
+usr/share/terminfo/p/putty+fnkeys+vt100
+usr/share/terminfo/p/putty+fnkeys+vt400
+usr/share/terminfo/p/putty+fnkeys+xterm
usr/share/terminfo/p/putty-256color
+usr/share/terminfo/p/putty-sco
usr/share/terminfo/p/putty-vt100
#usr/share/terminfo/q
#usr/share/terminfo/q/qansi
@@ -2741,6 +2755,7 @@ usr/share/terminfo/r/rxvt-xpm
#usr/share/terminfo/s/scoansi-old
usr/share/terminfo/s/screen
#usr/share/terminfo/s/screen+fkeys
+#usr/share/terminfo/s/screen+italics
usr/share/terminfo/s/screen-16color
#usr/share/terminfo/s/screen-16color-bce
#usr/share/terminfo/s/screen-16color-bce-s
@@ -2754,7 +2769,6 @@ usr/share/terminfo/s/screen-bce
#usr/share/terminfo/s/screen-bce.gnome
#usr/share/terminfo/s/screen-bce.konsole
#usr/share/terminfo/s/screen-bce.linux
-#usr/share/terminfo/s/screen-bce.mlterm
#usr/share/terminfo/s/screen-bce.mrxvt
#usr/share/terminfo/s/screen-bce.rxvt
#usr/share/terminfo/s/screen-bce.xterm-new
@@ -2763,12 +2777,18 @@ usr/share/terminfo/s/screen-w
usr/share/terminfo/s/screen.Eterm
usr/share/terminfo/s/screen.gnome
usr/share/terminfo/s/screen.konsole
+usr/share/terminfo/s/screen.konsole-256color
usr/share/terminfo/s/screen.linux
usr/share/terminfo/s/screen.mlterm
+usr/share/terminfo/s/screen.mlterm-256color
usr/share/terminfo/s/screen.mrxvt
+usr/share/terminfo/s/screen.putty
+usr/share/terminfo/s/screen.putty-256color
usr/share/terminfo/s/screen.rxvt
usr/share/terminfo/s/screen.teraterm
usr/share/terminfo/s/screen.vte
+usr/share/terminfo/s/screen.vte-256color
+usr/share/terminfo/s/screen.xterm-256color
usr/share/terminfo/s/screen.xterm-new
usr/share/terminfo/s/screen.xterm-r6
usr/share/terminfo/s/screen.xterm-xfree86
@@ -2777,18 +2797,26 @@ usr/share/terminfo/s/screen3
#usr/share/terminfo/s/screwpoint
#usr/share/terminfo/s/scrhp
#usr/share/terminfo/s/sibo
+#usr/share/terminfo/s/simpleterm
#usr/share/terminfo/s/simterm
#usr/share/terminfo/s/soroc
#usr/share/terminfo/s/soroc120
#usr/share/terminfo/s/soroc140
#usr/share/terminfo/s/spinwriter
+#usr/share/terminfo/s/st
+#usr/share/terminfo/s/st-16color
+#usr/share/terminfo/s/st-256color
#usr/share/terminfo/s/st52
#usr/share/terminfo/s/st52-color
#usr/share/terminfo/s/st52-m
#usr/share/terminfo/s/st52-old
+#usr/share/terminfo/s/stterm
+#usr/share/terminfo/s/stterm-16color
+#usr/share/terminfo/s/stterm-256color
#usr/share/terminfo/s/stv52
#usr/share/terminfo/s/stv52pc
usr/share/terminfo/s/sun
+#usr/share/terminfo/s/sun+sl
#usr/share/terminfo/s/sun-1
#usr/share/terminfo/s/sun-12
#usr/share/terminfo/s/sun-17
@@ -2874,14 +2902,17 @@ usr/share/terminfo/s/sun
#usr/share/terminfo/t/tek4207
#usr/share/terminfo/t/tek4207-s
#usr/share/terminfo/t/tek4404
+#usr/share/terminfo/t/teken
#usr/share/terminfo/t/teleray
#usr/share/terminfo/t/teletec
usr/share/terminfo/t/teraterm
usr/share/terminfo/t/teraterm2.3
#usr/share/terminfo/t/teraterm4.59
+#usr/share/terminfo/t/terminator
#usr/share/terminfo/t/terminet
#usr/share/terminfo/t/terminet1200
#usr/share/terminfo/t/terminet300
+#usr/share/terminfo/t/terminology
#usr/share/terminfo/t/tgtelnet
#usr/share/terminfo/t/ti700
#usr/share/terminfo/t/ti733
@@ -2905,6 +2936,8 @@ usr/share/terminfo/t/teraterm2.3
#usr/share/terminfo/t/ti931
#usr/share/terminfo/t/ti_ansi
#usr/share/terminfo/t/tkterm
+#usr/share/terminfo/t/tmux
+#usr/share/terminfo/t/tmux-256color
#usr/share/terminfo/t/tn1200
#usr/share/terminfo/t/tn300
#usr/share/terminfo/t/trs16
@@ -3202,6 +3235,7 @@ usr/share/terminfo/v/vt220
#usr/share/terminfo/v/vt510pcdos
usr/share/terminfo/v/vt52
#usr/share/terminfo/v/vt520
+#usr/share/terminfo/v/vt520ansi
#usr/share/terminfo/v/vt525
#usr/share/terminfo/v/vt61
#usr/share/terminfo/v/vt61.5
@@ -3209,6 +3243,8 @@ usr/share/terminfo/v/vte
#usr/share/terminfo/v/vte+pcfkeys
#usr/share/terminfo/v/vte-2007
#usr/share/terminfo/v/vte-2008
+#usr/share/terminfo/v/vte-2012
+#usr/share/terminfo/v/vte-2014
usr/share/terminfo/v/vte-256color
#usr/share/terminfo/v/vtnt
#usr/share/terminfo/v/vv100
@@ -3521,9 +3557,11 @@ usr/share/terminfo/x/xfce
#usr/share/terminfo/x/xtalk
usr/share/terminfo/x/xterm
#usr/share/terminfo/x/xterm+256color
+#usr/share/terminfo/x/xterm+256setaf
#usr/share/terminfo/x/xterm+88color
#usr/share/terminfo/x/xterm+app
#usr/share/terminfo/x/xterm+edit
+#usr/share/terminfo/x/xterm+kbs
#usr/share/terminfo/x/xterm+noapp
#usr/share/terminfo/x/xterm+pc+edit
#usr/share/terminfo/x/xterm+pcc0
@@ -3537,9 +3575,19 @@ usr/share/terminfo/x/xterm
#usr/share/terminfo/x/xterm+r6f2
#usr/share/terminfo/x/xterm+sl
#usr/share/terminfo/x/xterm+sl-twm
+#usr/share/terminfo/x/xterm+sm+1002
+#usr/share/terminfo/x/xterm+sm+1003
+#usr/share/terminfo/x/xterm+sm+1005
+#usr/share/terminfo/x/xterm+sm+1006
+#usr/share/terminfo/x/xterm+tmux
#usr/share/terminfo/x/xterm+vt+edit
+#usr/share/terminfo/x/xterm+x10mouse
+#usr/share/terminfo/x/xterm+x11hilite
+#usr/share/terminfo/x/xterm+x11mouse
usr/share/terminfo/x/xterm-1002
usr/share/terminfo/x/xterm-1003
+usr/share/terminfo/x/xterm-1005
+usr/share/terminfo/x/xterm-1006
usr/share/terminfo/x/xterm-16color
usr/share/terminfo/x/xterm-24
usr/share/terminfo/x/xterm-256color
@@ -3561,6 +3609,9 @@ usr/share/terminfo/x/xterm-sun
usr/share/terminfo/x/xterm-utf8
usr/share/terminfo/x/xterm-vt220
usr/share/terminfo/x/xterm-vt52
+usr/share/terminfo/x/xterm-x10mouse
+usr/share/terminfo/x/xterm-x11hilite
+usr/share/terminfo/x/xterm-x11mouse
usr/share/terminfo/x/xterm-xf86-v32
usr/share/terminfo/x/xterm-xf86-v33
usr/share/terminfo/x/xterm-xf86-v333
diff --git a/config/rootfiles/common/ncurses-compat b/config/rootfiles/common/ncurses-compat
new file mode 100644
index 0000000..821e71b
--- /dev/null
+++ b/config/rootfiles/common/ncurses-compat
@@ -0,0 +1,3610 @@
+#usr/bin/captoinfo
+#usr/bin/clear
+#usr/bin/infocmp
+#usr/bin/infotocap
+#usr/bin/ncurses5-config
+#usr/bin/ncursesw5-config
+#usr/bin/reset
+#usr/bin/tabs
+#usr/bin/tic
+#usr/bin/toe
+#usr/bin/tput
+#usr/bin/tset
+#usr/include/curses.h
+#usr/include/cursesapp.h
+#usr/include/cursesf.h
+#usr/include/cursesm.h
+#usr/include/cursesp.h
+#usr/include/cursesw.h
+#usr/include/cursslk.h
+#usr/include/eti.h
+#usr/include/etip.h
+#usr/include/form.h
+#usr/include/menu.h
+#usr/include/nc_tparm.h
+#usr/include/ncurses.h
+#usr/include/ncurses_dll.h
+#usr/include/panel.h
+#usr/include/term.h
+#usr/include/term_entry.h
+#usr/include/termcap.h
+#usr/include/tic.h
+#usr/include/unctrl.h
+#usr/lib/libcurses.a
+#usr/lib/libcurses.so
+#usr/lib/libcursesw.so
+#usr/lib/libform.a
+#usr/lib/libform.so
+usr/lib/libform.so.5
+usr/lib/libform.so.5.9
+#usr/lib/libformw.a
+#usr/lib/libformw.so
+usr/lib/libformw.so.5
+usr/lib/libformw.so.5.9
+#usr/lib/libmenu.a
+#usr/lib/libmenu.so
+usr/lib/libmenu.so.5
+usr/lib/libmenu.so.5.9
+#usr/lib/libmenuw.a
+#usr/lib/libmenuw.so
+usr/lib/libmenuw.so.5
+usr/lib/libmenuw.so.5.9
+#usr/lib/libncurses++.a
+#usr/lib/libncurses++w.a
+#usr/lib/libncurses.a
+#usr/lib/libncurses.so
+usr/lib/libncurses.so.5
+usr/lib/libncurses.so.5.9
+#usr/lib/libncursesw.a
+#usr/lib/libncursesw.so
+usr/lib/libncursesw.so.5
+usr/lib/libncursesw.so.5.9
+#usr/lib/libpanel.a
+#usr/lib/libpanel.so
+usr/lib/libpanel.so.5
+usr/lib/libpanel.so.5.9
+#usr/lib/libpanelw.a
+#usr/lib/libpanelw.so
+usr/lib/libpanelw.so.5
+usr/lib/libpanelw.so.5.9
+#usr/lib/libtermcap.so
+#usr/lib/libtic.a
+#usr/lib/libtic.so
+usr/lib/libtic.so.5
+usr/lib/libtic.so.5.9
+#usr/lib/libtinfo.a
+#usr/lib/libtinfo.so
+usr/lib/libtinfo.so.5
+usr/lib/libtinfo.so.5.9
+#usr/lib/terminfo
+#usr/man
+#usr/man/man1
+#usr/man/man1/captoinfo.1m
+#usr/man/man1/clear.1
+#usr/man/man1/infocmp.1m
+#usr/man/man1/infotocap.1m
+#usr/man/man1/ncursesw5-config.1
+#usr/man/man1/reset.1
+#usr/man/man1/tabs.1
+#usr/man/man1/tic.1m
+#usr/man/man1/toe.1m
+#usr/man/man1/tput.1
+#usr/man/man1/tset.1
+#usr/man/man3
+#usr/man/man3/BC.3x
+#usr/man/man3/COLORS.3x
+#usr/man/man3/COLOR_PAIR.3x
+#usr/man/man3/COLOR_PAIRS.3x
+#usr/man/man3/COLS.3x
+#usr/man/man3/ESCDELAY.3x
+#usr/man/man3/LINES.3x
+#usr/man/man3/PAIR_NUMBER.3x
+#usr/man/man3/PC.3x
+#usr/man/man3/SP.3x
+#usr/man/man3/TABSIZE.3x
+#usr/man/man3/TYPE_ALNUM.3x
+#usr/man/man3/TYPE_ALPHA.3x
+#usr/man/man3/TYPE_ENUM.3x
+#usr/man/man3/TYPE_INTEGER.3x
+#usr/man/man3/TYPE_IPV4.3x
+#usr/man/man3/TYPE_NUMERIC.3x
+#usr/man/man3/TYPE_REGEXP.3x
+#usr/man/man3/UP.3x
+#usr/man/man3/_nc_free_and_exit.3x
+#usr/man/man3/_nc_freeall.3x
+#usr/man/man3/_nc_tracebits.3x
+#usr/man/man3/_traceattr.3x
+#usr/man/man3/_traceattr2.3x
+#usr/man/man3/_tracecchar_t.3x
+#usr/man/man3/_tracecchar_t2.3x
+#usr/man/man3/_tracechar.3x
+#usr/man/man3/_tracechtype.3x
+#usr/man/man3/_tracechtype2.3x
+#usr/man/man3/_tracedump.3x
+#usr/man/man3/_tracef.3x
+#usr/man/man3/_tracemouse.3x
+#usr/man/man3/acs_map.3x
+#usr/man/man3/add_wch.3x
+#usr/man/man3/add_wchnstr.3x
+#usr/man/man3/add_wchstr.3x
+#usr/man/man3/addch.3x
+#usr/man/man3/addchnstr.3x
+#usr/man/man3/addchstr.3x
+#usr/man/man3/addnstr.3x
+#usr/man/man3/addnwstr.3x
+#usr/man/man3/addstr.3x
+#usr/man/man3/addwstr.3x
+#usr/man/man3/assume_default_colors.3x
+#usr/man/man3/assume_default_colors_sp.3x
+#usr/man/man3/attr_get.3x
+#usr/man/man3/attr_off.3x
+#usr/man/man3/attr_on.3x
+#usr/man/man3/attr_set.3x
+#usr/man/man3/attroff.3x
+#usr/man/man3/attron.3x
+#usr/man/man3/attrset.3x
+#usr/man/man3/baudrate.3x
+#usr/man/man3/baudrate_sp.3x
+#usr/man/man3/beep.3x
+#usr/man/man3/beep_sp.3x
+#usr/man/man3/bkgd.3x
+#usr/man/man3/bkgdset.3x
+#usr/man/man3/bkgrnd.3x
+#usr/man/man3/bkgrndset.3x
+#usr/man/man3/boolcodes.3x
+#usr/man/man3/boolfnames.3x
+#usr/man/man3/boolnames.3x
+#usr/man/man3/border.3x
+#usr/man/man3/border_set.3x
+#usr/man/man3/bottom_panel.3x
+#usr/man/man3/box.3x
+#usr/man/man3/box_set.3x
+#usr/man/man3/can_change_color.3x
+#usr/man/man3/can_change_color_sp.3x
+#usr/man/man3/cbreak.3x
+#usr/man/man3/cbreak_sp.3x
+#usr/man/man3/ceiling_panel.3x
+#usr/man/man3/chgat.3x
+#usr/man/man3/clear.3x
+#usr/man/man3/clearok.3x
+#usr/man/man3/clrtobot.3x
+#usr/man/man3/clrtoeol.3x
+#usr/man/man3/color_content.3x
+#usr/man/man3/color_content_sp.3x
+#usr/man/man3/color_set.3x
+#usr/man/man3/copywin.3x
+#usr/man/man3/cur_term.3x
+#usr/man/man3/current_field.3x
+#usr/man/man3/current_item.3x
+#usr/man/man3/curs_add_wch.3x
+#usr/man/man3/curs_add_wchstr.3x
+#usr/man/man3/curs_addch.3x
+#usr/man/man3/curs_addchstr.3x
+#usr/man/man3/curs_addstr.3x
+#usr/man/man3/curs_addwstr.3x
+#usr/man/man3/curs_attr.3x
+#usr/man/man3/curs_beep.3x
+#usr/man/man3/curs_bkgd.3x
+#usr/man/man3/curs_bkgrnd.3x
+#usr/man/man3/curs_border.3x
+#usr/man/man3/curs_border_set.3x
+#usr/man/man3/curs_clear.3x
+#usr/man/man3/curs_color.3x
+#usr/man/man3/curs_delch.3x
+#usr/man/man3/curs_deleteln.3x
+#usr/man/man3/curs_extend.3x
+#usr/man/man3/curs_get_wch.3x
+#usr/man/man3/curs_get_wstr.3x
+#usr/man/man3/curs_getcchar.3x
+#usr/man/man3/curs_getch.3x
+#usr/man/man3/curs_getstr.3x
+#usr/man/man3/curs_getyx.3x
+#usr/man/man3/curs_in_wch.3x
+#usr/man/man3/curs_in_wchstr.3x
+#usr/man/man3/curs_inch.3x
+#usr/man/man3/curs_inchstr.3x
+#usr/man/man3/curs_initscr.3x
+#usr/man/man3/curs_inopts.3x
+#usr/man/man3/curs_ins_wch.3x
+#usr/man/man3/curs_ins_wstr.3x
+#usr/man/man3/curs_insch.3x
+#usr/man/man3/curs_insstr.3x
+#usr/man/man3/curs_instr.3x
+#usr/man/man3/curs_inwstr.3x
+#usr/man/man3/curs_kernel.3x
+#usr/man/man3/curs_legacy.3x
+#usr/man/man3/curs_memleaks.3x
+#usr/man/man3/curs_mouse.3x
+#usr/man/man3/curs_move.3x
+#usr/man/man3/curs_opaque.3x
+#usr/man/man3/curs_outopts.3x
+#usr/man/man3/curs_overlay.3x
+#usr/man/man3/curs_pad.3x
+#usr/man/man3/curs_print.3x
+#usr/man/man3/curs_printw.3x
+#usr/man/man3/curs_refresh.3x
+#usr/man/man3/curs_scanw.3x
+#usr/man/man3/curs_scr_dump.3x
+#usr/man/man3/curs_scroll.3x
+#usr/man/man3/curs_set.3x
+#usr/man/man3/curs_set_sp.3x
+#usr/man/man3/curs_slk.3x
+#usr/man/man3/curs_sp_funcs.3x
+#usr/man/man3/curs_termattrs.3x
+#usr/man/man3/curs_termcap.3x
+#usr/man/man3/curs_terminfo.3x
+#usr/man/man3/curs_threads.3x
+#usr/man/man3/curs_touch.3x
+#usr/man/man3/curs_trace.3x
+#usr/man/man3/curs_util.3x
+#usr/man/man3/curs_variables.3x
+#usr/man/man3/curs_window.3x
+#usr/man/man3/curscr.3x
+#usr/man/man3/curses_version.3x
+#usr/man/man3/data_ahead.3x
+#usr/man/man3/data_behind.3x
+#usr/man/man3/def_prog_mode.3x
+#usr/man/man3/def_prog_mode_sp.3x
+#usr/man/man3/def_shell_mode.3x
+#usr/man/man3/def_shell_mode_sp.3x
+#usr/man/man3/default_colors.3x
+#usr/man/man3/define_key.3x
+#usr/man/man3/define_key_sp.3x
+#usr/man/man3/del_curterm.3x
+#usr/man/man3/del_curterm_sp.3x
+#usr/man/man3/del_panel.3x
+#usr/man/man3/delay_output.3x
+#usr/man/man3/delay_output_sp.3x
+#usr/man/man3/delch.3x
+#usr/man/man3/deleteln.3x
+#usr/man/man3/delscreen.3x
+#usr/man/man3/delwin.3x
+#usr/man/man3/derwin.3x
+#usr/man/man3/doupdate.3x
+#usr/man/man3/doupdate_sp.3x
+#usr/man/man3/dup_field.3x
+#usr/man/man3/dupwin.3x
+#usr/man/man3/dynamic_field_info.3x
+#usr/man/man3/echo.3x
+#usr/man/man3/echo_sp.3x
+#usr/man/man3/echo_wchar.3x
+#usr/man/man3/echochar.3x
+#usr/man/man3/endwin.3x
+#usr/man/man3/endwin_sp.3x
+#usr/man/man3/erase.3x
+#usr/man/man3/erasechar.3x
+#usr/man/man3/erasechar_sp.3x
+#usr/man/man3/erasewchar.3x
+#usr/man/man3/field_arg.3x
+#usr/man/man3/field_back.3x
+#usr/man/man3/field_buffer.3x
+#usr/man/man3/field_count.3x
+#usr/man/man3/field_fore.3x
+#usr/man/man3/field_index.3x
+#usr/man/man3/field_info.3x
+#usr/man/man3/field_init.3x
+#usr/man/man3/field_just.3x
+#usr/man/man3/field_opts.3x
+#usr/man/man3/field_opts_off.3x
+#usr/man/man3/field_opts_on.3x
+#usr/man/man3/field_pad.3x
+#usr/man/man3/field_status.3x
+#usr/man/man3/field_term.3x
+#usr/man/man3/field_type.3x
+#usr/man/man3/field_userptr.3x
+#usr/man/man3/filter.3x
+#usr/man/man3/filter_sp.3x
+#usr/man/man3/flash.3x
+#usr/man/man3/flash_sp.3x
+#usr/man/man3/flushinp.3x
+#usr/man/man3/flushinp_sp.3x
+#usr/man/man3/form.3x
+#usr/man/man3/form_cursor.3x
+#usr/man/man3/form_data.3x
+#usr/man/man3/form_driver.3x
+#usr/man/man3/form_field.3x
+#usr/man/man3/form_field_attributes.3x
+#usr/man/man3/form_field_buffer.3x
+#usr/man/man3/form_field_info.3x
+#usr/man/man3/form_field_just.3x
+#usr/man/man3/form_field_new.3x
+#usr/man/man3/form_field_opts.3x
+#usr/man/man3/form_field_userptr.3x
+#usr/man/man3/form_field_validation.3x
+#usr/man/man3/form_fields.3x
+#usr/man/man3/form_fieldtype.3x
+#usr/man/man3/form_hook.3x
+#usr/man/man3/form_init.3x
+#usr/man/man3/form_new.3x
+#usr/man/man3/form_new_page.3x
+#usr/man/man3/form_opts.3x
+#usr/man/man3/form_opts_off.3x
+#usr/man/man3/form_opts_on.3x
+#usr/man/man3/form_page.3x
+#usr/man/man3/form_post.3x
+#usr/man/man3/form_request_by_name.3x
+#usr/man/man3/form_request_name.3x
+#usr/man/man3/form_requestname.3x
+#usr/man/man3/form_sub.3x
+#usr/man/man3/form_term.3x
+#usr/man/man3/form_userptr.3x
+#usr/man/man3/form_variables.3x
+#usr/man/man3/form_win.3x
+#usr/man/man3/free_field.3x
+#usr/man/man3/free_fieldtype.3x
+#usr/man/man3/free_form.3x
+#usr/man/man3/free_item.3x
+#usr/man/man3/free_menu.3x
+#usr/man/man3/get_escdelay.3x
+#usr/man/man3/get_escdelay_sp.3x
+#usr/man/man3/get_wch.3x
+#usr/man/man3/get_wstr.3x
+#usr/man/man3/getattrs.3x
+#usr/man/man3/getbegx.3x
+#usr/man/man3/getbegy.3x
+#usr/man/man3/getbegyx.3x
+#usr/man/man3/getbkgd.3x
+#usr/man/man3/getbkgrnd.3x
+#usr/man/man3/getcchar.3x
+#usr/man/man3/getch.3x
+#usr/man/man3/getcurx.3x
+#usr/man/man3/getcury.3x
+#usr/man/man3/getmaxx.3x
+#usr/man/man3/getmaxy.3x
+#usr/man/man3/getmaxyx.3x
+#usr/man/man3/getmouse.3x
+#usr/man/man3/getmouse_sp.3x
+#usr/man/man3/getn_wstr.3x
+#usr/man/man3/getnstr.3x
+#usr/man/man3/getparx.3x
+#usr/man/man3/getpary.3x
+#usr/man/man3/getparyx.3x
+#usr/man/man3/getstr.3x
+#usr/man/man3/getsyx.3x
+#usr/man/man3/getwin.3x
+#usr/man/man3/getwin_sp.3x
+#usr/man/man3/getyx.3x
+#usr/man/man3/ground_panel.3x
+#usr/man/man3/halfdelay.3x
+#usr/man/man3/halfdelay_sp.3x
+#usr/man/man3/has_colors.3x
+#usr/man/man3/has_colors_sp.3x
+#usr/man/man3/has_ic.3x
+#usr/man/man3/has_ic_sp.3x
+#usr/man/man3/has_il.3x
+#usr/man/man3/has_il_sp.3x
+#usr/man/man3/has_key.3x
+#usr/man/man3/has_key_sp.3x
+#usr/man/man3/has_mouse.3x
+#usr/man/man3/has_mouse_sp.3x
+#usr/man/man3/hide_panel.3x
+#usr/man/man3/hline.3x
+#usr/man/man3/hline_set.3x
+#usr/man/man3/idcok.3x
+#usr/man/man3/idlok.3x
+#usr/man/man3/immedok.3x
+#usr/man/man3/in_wch.3x
+#usr/man/man3/in_wchnstr.3x
+#usr/man/man3/in_wchstr.3x
+#usr/man/man3/inch.3x
+#usr/man/man3/inchnstr.3x
+#usr/man/man3/inchstr.3x
+#usr/man/man3/init_color.3x
+#usr/man/man3/init_color_sp.3x
+#usr/man/man3/init_pair.3x
+#usr/man/man3/init_pair_sp.3x
+#usr/man/man3/initscr.3x
+#usr/man/man3/innstr.3x
+#usr/man/man3/innwstr.3x
+#usr/man/man3/ins_nwstr.3x
+#usr/man/man3/ins_wch.3x
+#usr/man/man3/ins_wstr.3x
+#usr/man/man3/insch.3x
+#usr/man/man3/insdelln.3x
+#usr/man/man3/insertln.3x
+#usr/man/man3/insnstr.3x
+#usr/man/man3/insstr.3x
+#usr/man/man3/instr.3x
+#usr/man/man3/intrflush.3x
+#usr/man/man3/intrflush_sp.3x
+#usr/man/man3/inwstr.3x
+#usr/man/man3/is_cleared.3x
+#usr/man/man3/is_idcok.3x
+#usr/man/man3/is_idlok.3x
+#usr/man/man3/is_immedok.3x
+#usr/man/man3/is_keypad.3x
+#usr/man/man3/is_leaveok.3x
+#usr/man/man3/is_linetouched.3x
+#usr/man/man3/is_nodelay.3x
+#usr/man/man3/is_notimeout.3x
+#usr/man/man3/is_pad.3x
+#usr/man/man3/is_scrollok.3x
+#usr/man/man3/is_subwin.3x
+#usr/man/man3/is_syncok.3x
+#usr/man/man3/is_term_resized.3x
+#usr/man/man3/is_term_resized_sp.3x
+#usr/man/man3/is_wintouched.3x
+#usr/man/man3/isendwin.3x
+#usr/man/man3/isendwin_sp.3x
+#usr/man/man3/item_count.3x
+#usr/man/man3/item_description.3x
+#usr/man/man3/item_index.3x
+#usr/man/man3/item_init.3x
+#usr/man/man3/item_name.3x
+#usr/man/man3/item_opts.3x
+#usr/man/man3/item_opts_off.3x
+#usr/man/man3/item_opts_on.3x
+#usr/man/man3/item_term.3x
+#usr/man/man3/item_userptr.3x
+#usr/man/man3/item_value.3x
+#usr/man/man3/item_visible.3x
+#usr/man/man3/key_defined.3x
+#usr/man/man3/key_defined_sp.3x
+#usr/man/man3/key_name.3x
+#usr/man/man3/keybound.3x
+#usr/man/man3/keybound_sp.3x
+#usr/man/man3/keyname.3x
+#usr/man/man3/keyname_sp.3x
+#usr/man/man3/keyok.3x
+#usr/man/man3/keyok_sp.3x
+#usr/man/man3/keypad.3x
+#usr/man/man3/killchar.3x
+#usr/man/man3/killchar_sp.3x
+#usr/man/man3/killwchar.3x
+#usr/man/man3/leaveok.3x
+#usr/man/man3/legacy_coding.3x
+#usr/man/man3/link_field.3x
+#usr/man/man3/link_fieldtype.3x
+#usr/man/man3/longname.3x
+#usr/man/man3/mcprint.3x
+#usr/man/man3/mcprint_sp.3x
+#usr/man/man3/menu.3x
+#usr/man/man3/menu_attributes.3x
+#usr/man/man3/menu_back.3x
+#usr/man/man3/menu_cursor.3x
+#usr/man/man3/menu_driver.3x
+#usr/man/man3/menu_fore.3x
+#usr/man/man3/menu_format.3x
+#usr/man/man3/menu_grey.3x
+#usr/man/man3/menu_hook.3x
+#usr/man/man3/menu_init.3x
+#usr/man/man3/menu_items.3x
+#usr/man/man3/menu_mark.3x
+#usr/man/man3/menu_new.3x
+#usr/man/man3/menu_opts.3x
+#usr/man/man3/menu_opts_off.3x
+#usr/man/man3/menu_opts_on.3x
+#usr/man/man3/menu_pad.3x
+#usr/man/man3/menu_pattern.3x
+#usr/man/man3/menu_post.3x
+#usr/man/man3/menu_request_by_name.3x
+#usr/man/man3/menu_request_name.3x
+#usr/man/man3/menu_requestname.3x
+#usr/man/man3/menu_spacing.3x
+#usr/man/man3/menu_sub.3x
+#usr/man/man3/menu_term.3x
+#usr/man/man3/menu_userptr.3x
+#usr/man/man3/menu_win.3x
+#usr/man/man3/meta.3x
+#usr/man/man3/mitem_current.3x
+#usr/man/man3/mitem_name.3x
+#usr/man/man3/mitem_new.3x
+#usr/man/man3/mitem_opts.3x
+#usr/man/man3/mitem_userptr.3x
+#usr/man/man3/mitem_value.3x
+#usr/man/man3/mitem_visible.3x
+#usr/man/man3/mouse_trafo.3x
+#usr/man/man3/mouseinterval.3x
+#usr/man/man3/mouseinterval_sp.3x
+#usr/man/man3/mousemask.3x
+#usr/man/man3/mousemask_sp.3x
+#usr/man/man3/move.3x
+#usr/man/man3/move_field.3x
+#usr/man/man3/move_panel.3x
+#usr/man/man3/mvadd_wch.3x
+#usr/man/man3/mvadd_wchnstr.3x
+#usr/man/man3/mvadd_wchstr.3x
+#usr/man/man3/mvaddch.3x
+#usr/man/man3/mvaddchnstr.3x
+#usr/man/man3/mvaddchstr.3x
+#usr/man/man3/mvaddnstr.3x
+#usr/man/man3/mvaddnwstr.3x
+#usr/man/man3/mvaddstr.3x
+#usr/man/man3/mvaddwstr.3x
+#usr/man/man3/mvchgat.3x
+#usr/man/man3/mvcur.3x
+#usr/man/man3/mvcur_sp.3x
+#usr/man/man3/mvdelch.3x
+#usr/man/man3/mvderwin.3x
+#usr/man/man3/mvget_wch.3x
+#usr/man/man3/mvget_wstr.3x
+#usr/man/man3/mvgetch.3x
+#usr/man/man3/mvgetn_wstr.3x
+#usr/man/man3/mvgetnstr.3x
+#usr/man/man3/mvgetstr.3x
+#usr/man/man3/mvhline.3x
+#usr/man/man3/mvhline_set.3x
+#usr/man/man3/mvin_wch.3x
+#usr/man/man3/mvin_wchnstr.3x
+#usr/man/man3/mvin_wchstr.3x
+#usr/man/man3/mvinch.3x
+#usr/man/man3/mvinchnstr.3x
+#usr/man/man3/mvinchstr.3x
+#usr/man/man3/mvinnstr.3x
+#usr/man/man3/mvinnwstr.3x
+#usr/man/man3/mvins_nwstr.3x
+#usr/man/man3/mvins_wch.3x
+#usr/man/man3/mvins_wstr.3x
+#usr/man/man3/mvinsch.3x
+#usr/man/man3/mvinsnstr.3x
+#usr/man/man3/mvinsstr.3x
+#usr/man/man3/mvinstr.3x
+#usr/man/man3/mvinwstr.3x
+#usr/man/man3/mvprintw.3x
+#usr/man/man3/mvscanw.3x
+#usr/man/man3/mvvline.3x
+#usr/man/man3/mvvline_set.3x
+#usr/man/man3/mvwadd_wch.3x
+#usr/man/man3/mvwadd_wchnstr.3x
+#usr/man/man3/mvwadd_wchstr.3x
+#usr/man/man3/mvwaddch.3x
+#usr/man/man3/mvwaddchnstr.3x
+#usr/man/man3/mvwaddchstr.3x
+#usr/man/man3/mvwaddnstr.3x
+#usr/man/man3/mvwaddnwstr.3x
+#usr/man/man3/mvwaddstr.3x
+#usr/man/man3/mvwaddwstr.3x
+#usr/man/man3/mvwchgat.3x
+#usr/man/man3/mvwdelch.3x
+#usr/man/man3/mvwget_wch.3x
+#usr/man/man3/mvwget_wstr.3x
+#usr/man/man3/mvwgetch.3x
+#usr/man/man3/mvwgetn_wstr.3x
+#usr/man/man3/mvwgetnstr.3x
+#usr/man/man3/mvwgetstr.3x
+#usr/man/man3/mvwhline.3x
+#usr/man/man3/mvwhline_set.3x
+#usr/man/man3/mvwin.3x
+#usr/man/man3/mvwin_wch.3x
+#usr/man/man3/mvwin_wchnstr.3x
+#usr/man/man3/mvwin_wchstr.3x
+#usr/man/man3/mvwinch.3x
+#usr/man/man3/mvwinchnstr.3x
+#usr/man/man3/mvwinchstr.3x
+#usr/man/man3/mvwinnstr.3x
+#usr/man/man3/mvwinnwstr.3x
+#usr/man/man3/mvwins_nwstr.3x
+#usr/man/man3/mvwins_wch.3x
+#usr/man/man3/mvwins_wstr.3x
+#usr/man/man3/mvwinsch.3x
+#usr/man/man3/mvwinsnstr.3x
+#usr/man/man3/mvwinsstr.3x
+#usr/man/man3/mvwinstr.3x
+#usr/man/man3/mvwinwstr.3x
+#usr/man/man3/mvwprintw.3x
+#usr/man/man3/mvwscanw.3x
+#usr/man/man3/mvwvline.3x
+#usr/man/man3/mvwvline_set.3x
+#usr/man/man3/napms.3x
+#usr/man/man3/napms_sp.3x
+#usr/man/man3/ncurses.3x
+#usr/man/man3/new_field.3x
+#usr/man/man3/new_fieldtype.3x
+#usr/man/man3/new_form.3x
+#usr/man/man3/new_form_sp.3x
+#usr/man/man3/new_item.3x
+#usr/man/man3/new_menu.3x
+#usr/man/man3/new_menu_sp.3x
+#usr/man/man3/new_page.3x
+#usr/man/man3/new_panel.3x
+#usr/man/man3/new_prescr.3x
+#usr/man/man3/newpad.3x
+#usr/man/man3/newpad_sp.3x
+#usr/man/man3/newscr.3x
+#usr/man/man3/newterm.3x
+#usr/man/man3/newterm_sp.3x
+#usr/man/man3/newwin.3x
+#usr/man/man3/newwin_sp.3x
+#usr/man/man3/nl.3x
+#usr/man/man3/nl_sp.3x
+#usr/man/man3/nocbreak.3x
+#usr/man/man3/nocbreak_sp.3x
+#usr/man/man3/nodelay.3x
+#usr/man/man3/noecho.3x
+#usr/man/man3/noecho_sp.3x
+#usr/man/man3/nofilter.3x
+#usr/man/man3/nofilter_sp.3x
+#usr/man/man3/nonl.3x
+#usr/man/man3/nonl_sp.3x
+#usr/man/man3/noqiflush.3x
+#usr/man/man3/noqiflush_sp.3x
+#usr/man/man3/noraw.3x
+#usr/man/man3/noraw_sp.3x
+#usr/man/man3/notimeout.3x
+#usr/man/man3/numcodes.3x
+#usr/man/man3/numfnames.3x
+#usr/man/man3/numnames.3x
+#usr/man/man3/ospeed.3x
+#usr/man/man3/overlay.3x
+#usr/man/man3/overwrite.3x
+#usr/man/man3/pair_content.3x
+#usr/man/man3/pair_content_sp.3x
+#usr/man/man3/panel.3x
+#usr/man/man3/panel_above.3x
+#usr/man/man3/panel_below.3x
+#usr/man/man3/panel_hidden.3x
+#usr/man/man3/panel_userptr.3x
+#usr/man/man3/panel_window.3x
+#usr/man/man3/pecho_wchar.3x
+#usr/man/man3/pechochar.3x
+#usr/man/man3/pnoutrefresh.3x
+#usr/man/man3/pos_form_cursor.3x
+#usr/man/man3/pos_menu_cursor.3x
+#usr/man/man3/post_form.3x
+#usr/man/man3/post_menu.3x
+#usr/man/man3/prefresh.3x
+#usr/man/man3/printw.3x
+#usr/man/man3/putp.3x
+#usr/man/man3/putp_sp.3x
+#usr/man/man3/putwin.3x
+#usr/man/man3/qiflush.3x
+#usr/man/man3/qiflush_sp.3x
+#usr/man/man3/raw.3x
+#usr/man/man3/raw_sp.3x
+#usr/man/man3/redrawwin.3x
+#usr/man/man3/refresh.3x
+#usr/man/man3/replace_panel.3x
+#usr/man/man3/reset_prog_mode.3x
+#usr/man/man3/reset_prog_mode_sp.3x
+#usr/man/man3/reset_shell_mode.3x
+#usr/man/man3/reset_shell_mode_sp.3x
+#usr/man/man3/resetty.3x
+#usr/man/man3/resetty_sp.3x
+#usr/man/man3/resize_term.3x
+#usr/man/man3/resize_term_sp.3x
+#usr/man/man3/resizeterm.3x
+#usr/man/man3/resizeterm_sp.3x
+#usr/man/man3/restartterm.3x
+#usr/man/man3/restartterm_sp.3x
+#usr/man/man3/ripoffline.3x
+#usr/man/man3/ripoffline_sp.3x
+#usr/man/man3/savetty.3x
+#usr/man/man3/savetty_sp.3x
+#usr/man/man3/scale_form.3x
+#usr/man/man3/scale_menu.3x
+#usr/man/man3/scanw.3x
+#usr/man/man3/scr_dump.3x
+#usr/man/man3/scr_init.3x
+#usr/man/man3/scr_init_sp.3x
+#usr/man/man3/scr_restore.3x
+#usr/man/man3/scr_restore_sp.3x
+#usr/man/man3/scr_set.3x
+#usr/man/man3/scr_set_sp.3x
+#usr/man/man3/scrl.3x
+#usr/man/man3/scroll.3x
+#usr/man/man3/scrollok.3x
+#usr/man/man3/set_current_field.3x
+#usr/man/man3/set_current_item.3x
+#usr/man/man3/set_curterm.3x
+#usr/man/man3/set_curterm_sp.3x
+#usr/man/man3/set_escdelay.3x
+#usr/man/man3/set_escdelay_sp.3x
+#usr/man/man3/set_field_back.3x
+#usr/man/man3/set_field_buffer.3x
+#usr/man/man3/set_field_fore.3x
+#usr/man/man3/set_field_init.3x
+#usr/man/man3/set_field_just.3x
+#usr/man/man3/set_field_opts.3x
+#usr/man/man3/set_field_pad.3x
+#usr/man/man3/set_field_status.3x
+#usr/man/man3/set_field_term.3x
+#usr/man/man3/set_field_type.3x
+#usr/man/man3/set_field_userptr.3x
+#usr/man/man3/set_fieldtype_arg.3x
+#usr/man/man3/set_fieldtype_choice.3x
+#usr/man/man3/set_form_fields.3x
+#usr/man/man3/set_form_init.3x
+#usr/man/man3/set_form_opts.3x
+#usr/man/man3/set_form_page.3x
+#usr/man/man3/set_form_sub.3x
+#usr/man/man3/set_form_term.3x
+#usr/man/man3/set_form_userptr.3x
+#usr/man/man3/set_form_win.3x
+#usr/man/man3/set_item_init.3x
+#usr/man/man3/set_item_opts.3x
+#usr/man/man3/set_item_term.3x
+#usr/man/man3/set_item_userptr.3x
+#usr/man/man3/set_item_value.3x
+#usr/man/man3/set_max_field.3x
+#usr/man/man3/set_menu_back.3x
+#usr/man/man3/set_menu_fore.3x
+#usr/man/man3/set_menu_format.3x
+#usr/man/man3/set_menu_grey.3x
+#usr/man/man3/set_menu_init.3x
+#usr/man/man3/set_menu_items.3x
+#usr/man/man3/set_menu_mark.3x
+#usr/man/man3/set_menu_opts.3x
+#usr/man/man3/set_menu_pad.3x
+#usr/man/man3/set_menu_pattern.3x
+#usr/man/man3/set_menu_spacing.3x
+#usr/man/man3/set_menu_sub.3x
+#usr/man/man3/set_menu_term.3x
+#usr/man/man3/set_menu_userptr.3x
+#usr/man/man3/set_menu_win.3x
+#usr/man/man3/set_new_page.3x
+#usr/man/man3/set_panel_userptr.3x
+#usr/man/man3/set_tabsize.3x
+#usr/man/man3/set_tabsize_sp.3x
+#usr/man/man3/set_term.3x
+#usr/man/man3/set_top_row.3x
+#usr/man/man3/setcchar.3x
+#usr/man/man3/setscrreg.3x
+#usr/man/man3/setsyx.3x
+#usr/man/man3/setterm.3x
+#usr/man/man3/setupterm.3x
+#usr/man/man3/show_panel.3x
+#usr/man/man3/slk_attr.3x
+#usr/man/man3/slk_attr_off.3x
+#usr/man/man3/slk_attr_on.3x
+#usr/man/man3/slk_attr_set.3x
+#usr/man/man3/slk_attr_set_sp.3x
+#usr/man/man3/slk_attr_sp.3x
+#usr/man/man3/slk_attroff.3x
+#usr/man/man3/slk_attroff_sp.3x
+#usr/man/man3/slk_attron.3x
+#usr/man/man3/slk_attron_sp.3x
+#usr/man/man3/slk_attrset.3x
+#usr/man/man3/slk_attrset_sp.3x
+#usr/man/man3/slk_clear.3x
+#usr/man/man3/slk_clear_sp.3x
+#usr/man/man3/slk_color.3x
+#usr/man/man3/slk_color_sp.3x
+#usr/man/man3/slk_init.3x
+#usr/man/man3/slk_init_sp.3x
+#usr/man/man3/slk_label.3x
+#usr/man/man3/slk_label_sp.3x
+#usr/man/man3/slk_noutrefresh.3x
+#usr/man/man3/slk_noutrefresh_sp.3x
+#usr/man/man3/slk_refresh.3x
+#usr/man/man3/slk_refresh_sp.3x
+#usr/man/man3/slk_restore.3x
+#usr/man/man3/slk_restore_sp.3x
+#usr/man/man3/slk_set.3x
+#usr/man/man3/slk_set_sp.3x
+#usr/man/man3/slk_touch.3x
+#usr/man/man3/slk_touch_sp.3x
+#usr/man/man3/slk_wset.3x
+#usr/man/man3/standend.3x
+#usr/man/man3/standout.3x
+#usr/man/man3/start_color.3x
+#usr/man/man3/start_color_sp.3x
+#usr/man/man3/stdscr.3x
+#usr/man/man3/strcodes.3x
+#usr/man/man3/strfnames.3x
+#usr/man/man3/strnames.3x
+#usr/man/man3/subpad.3x
+#usr/man/man3/subwin.3x
+#usr/man/man3/syncok.3x
+#usr/man/man3/term_attrs.3x
+#usr/man/man3/term_attrs_sp.3x
+#usr/man/man3/term_variables.3x
+#usr/man/man3/termattrs.3x
+#usr/man/man3/termattrs_sp.3x
+#usr/man/man3/termname.3x
+#usr/man/man3/termname_sp.3x
+#usr/man/man3/tgetent.3x
+#usr/man/man3/tgetent_sp.3x
+#usr/man/man3/tgetflag.3x
+#usr/man/man3/tgetflag_sp.3x
+#usr/man/man3/tgetnum.3x
+#usr/man/man3/tgetnum_sp.3x
+#usr/man/man3/tgetstr.3x
+#usr/man/man3/tgetstr_sp.3x
+#usr/man/man3/tgoto.3x
+#usr/man/man3/tigetflag.3x
+#usr/man/man3/tigetflag_sp.3x
+#usr/man/man3/tigetnum.3x
+#usr/man/man3/tigetnum_sp.3x
+#usr/man/man3/tigetstr.3x
+#usr/man/man3/tigetstr_sp.3x
+#usr/man/man3/timeout.3x
+#usr/man/man3/tiparm.3x
+#usr/man/man3/top_panel.3x
+#usr/man/man3/top_row.3x
+#usr/man/man3/touchline.3x
+#usr/man/man3/touchwin.3x
+#usr/man/man3/tparm.3x
+#usr/man/man3/tputs.3x
+#usr/man/man3/tputs_sp.3x
+#usr/man/man3/trace.3x
+#usr/man/man3/ttytype.3x
+#usr/man/man3/typeahead.3x
+#usr/man/man3/typeahead_sp.3x
+#usr/man/man3/unctrl.3x
+#usr/man/man3/unctrl_sp.3x
+#usr/man/man3/unget_wch.3x
+#usr/man/man3/unget_wch_sp.3x
+#usr/man/man3/ungetch.3x
+#usr/man/man3/ungetch_sp.3x
+#usr/man/man3/ungetmouse.3x
+#usr/man/man3/ungetmouse_sp.3x
+#usr/man/man3/unpost_form.3x
+#usr/man/man3/unpost_menu.3x
+#usr/man/man3/untouchwin.3x
+#usr/man/man3/update_panels.3x
+#usr/man/man3/update_panels_sp.3x
+#usr/man/man3/use_default_colors.3x
+#usr/man/man3/use_default_colors_sp.3x
+#usr/man/man3/use_env.3x
+#usr/man/man3/use_env_sp.3x
+#usr/man/man3/use_extended_names.3x
+#usr/man/man3/use_legacy_coding.3x
+#usr/man/man3/use_legacy_coding_sp.3x
+#usr/man/man3/use_screen.3x
+#usr/man/man3/use_window.3x
+#usr/man/man3/vid_attr.3x
+#usr/man/man3/vid_attr_sp.3x
+#usr/man/man3/vid_puts.3x
+#usr/man/man3/vid_puts_sp.3x
+#usr/man/man3/vidattr.3x
+#usr/man/man3/vidattr_sp.3x
+#usr/man/man3/vidputs.3x
+#usr/man/man3/vidputs_sp.3x
+#usr/man/man3/vline.3x
+#usr/man/man3/vline_set.3x
+#usr/man/man3/vw_printw.3x
+#usr/man/man3/vw_scanw.3x
+#usr/man/man3/vwprintw.3x
+#usr/man/man3/vwscanw.3x
+#usr/man/man3/wadd_wch.3x
+#usr/man/man3/wadd_wchnstr.3x
+#usr/man/man3/wadd_wchstr.3x
+#usr/man/man3/waddch.3x
+#usr/man/man3/waddchnstr.3x
+#usr/man/man3/waddchstr.3x
+#usr/man/man3/waddnstr.3x
+#usr/man/man3/waddnwstr.3x
+#usr/man/man3/waddstr.3x
+#usr/man/man3/waddwstr.3x
+#usr/man/man3/wattr_get.3x
+#usr/man/man3/wattr_off.3x
+#usr/man/man3/wattr_on.3x
+#usr/man/man3/wattr_set.3x
+#usr/man/man3/wattroff.3x
+#usr/man/man3/wattron.3x
+#usr/man/man3/wattrset.3x
+#usr/man/man3/wbkgd.3x
+#usr/man/man3/wbkgdset.3x
+#usr/man/man3/wbkgrnd.3x
+#usr/man/man3/wbkgrndset.3x
+#usr/man/man3/wborder.3x
+#usr/man/man3/wborder_set.3x
+#usr/man/man3/wchgat.3x
+#usr/man/man3/wclear.3x
+#usr/man/man3/wclrtobot.3x
+#usr/man/man3/wclrtoeol.3x
+#usr/man/man3/wcolor_set.3x
+#usr/man/man3/wcursyncup.3x
+#usr/man/man3/wdelch.3x
+#usr/man/man3/wdeleteln.3x
+#usr/man/man3/wecho_wchar.3x
+#usr/man/man3/wechochar.3x
+#usr/man/man3/wenclose.3x
+#usr/man/man3/werase.3x
+#usr/man/man3/wget_wch.3x
+#usr/man/man3/wget_wstr.3x
+#usr/man/man3/wgetbkgrnd.3x
+#usr/man/man3/wgetch.3x
+#usr/man/man3/wgetn_wstr.3x
+#usr/man/man3/wgetnstr.3x
+#usr/man/man3/wgetparent.3x
+#usr/man/man3/wgetscrreg.3x
+#usr/man/man3/wgetstr.3x
+#usr/man/man3/whline.3x
+#usr/man/man3/whline_set.3x
+#usr/man/man3/win_wch.3x
+#usr/man/man3/win_wchnstr.3x
+#usr/man/man3/win_wchstr.3x
+#usr/man/man3/winch.3x
+#usr/man/man3/winchnstr.3x
+#usr/man/man3/winchstr.3x
+#usr/man/man3/winnstr.3x
+#usr/man/man3/winnwstr.3x
+#usr/man/man3/wins_nwstr.3x
+#usr/man/man3/wins_wch.3x
+#usr/man/man3/wins_wstr.3x
+#usr/man/man3/winsch.3x
+#usr/man/man3/winsdelln.3x
+#usr/man/man3/winsertln.3x
+#usr/man/man3/winsnstr.3x
+#usr/man/man3/winsstr.3x
+#usr/man/man3/winstr.3x
+#usr/man/man3/winwstr.3x
+#usr/man/man3/wmouse_trafo.3x
+#usr/man/man3/wmove.3x
+#usr/man/man3/wnoutrefresh.3x
+#usr/man/man3/wprintw.3x
+#usr/man/man3/wredrawln.3x
+#usr/man/man3/wrefresh.3x
+#usr/man/man3/wresize.3x
+#usr/man/man3/wscanw.3x
+#usr/man/man3/wscrl.3x
+#usr/man/man3/wsetscrreg.3x
+#usr/man/man3/wstandend.3x
+#usr/man/man3/wstandout.3x
+#usr/man/man3/wsyncdown.3x
+#usr/man/man3/wsyncup.3x
+#usr/man/man3/wtimeout.3x
+#usr/man/man3/wtouchln.3x
+#usr/man/man3/wunctrl.3x
+#usr/man/man3/wunctrl_sp.3x
+#usr/man/man3/wvline.3x
+#usr/man/man3/wvline_set.3x
+#usr/man/man5
+#usr/man/man5/term.5
+#usr/man/man5/terminfo.5
+#usr/man/man7
+#usr/man/man7/term.7
+#usr/share/tabset
+#usr/share/tabset/std
+#usr/share/tabset/stdcrt
+#usr/share/tabset/vt100
+#usr/share/tabset/vt300
+#usr/share/terminfo/1
+#usr/share/terminfo/1/1178
+#usr/share/terminfo/1/1730-lm
+#usr/share/terminfo/2
+#usr/share/terminfo/2/2621
+#usr/share/terminfo/2/2621-wl
+#usr/share/terminfo/2/2621A
+#usr/share/terminfo/2/2621a
+#usr/share/terminfo/3
+#usr/share/terminfo/3/386at
+#usr/share/terminfo/3/3b1
+#usr/share/terminfo/4
+#usr/share/terminfo/4/4025ex
+#usr/share/terminfo/4/4027ex
+#usr/share/terminfo/4/4410-w
+#usr/share/terminfo/5
+#usr/share/terminfo/5/5051
+#usr/share/terminfo/5/5410-w
+#usr/share/terminfo/5/5620
+#usr/share/terminfo/5/5630-24
+#usr/share/terminfo/5/5630DMD-24
+#usr/share/terminfo/6
+#usr/share/terminfo/6/6053
+#usr/share/terminfo/6/6053-dg
+#usr/share/terminfo/6/605x
+#usr/share/terminfo/6/605x-dg
+#usr/share/terminfo/6/630-lm
+#usr/share/terminfo/6/630MTG-24
+#usr/share/terminfo/7
+#usr/share/terminfo/7/730MTG-24
+#usr/share/terminfo/7/730MTG-41
+#usr/share/terminfo/7/730MTG-41r
+#usr/share/terminfo/7/730MTGr
+#usr/share/terminfo/7/730MTGr-24
+#usr/share/terminfo/8
+#usr/share/terminfo/8/8510
+#usr/share/terminfo/9
+#usr/share/terminfo/9/955-hb
+#usr/share/terminfo/9/955-w
+#usr/share/terminfo/9/9term
+#usr/share/terminfo/A
+#usr/share/terminfo/A/Apple_Terminal
+#usr/share/terminfo/E
+#usr/share/terminfo/E/Eterm
+#usr/share/terminfo/E/Eterm-256color
+#usr/share/terminfo/E/Eterm-88color
+#usr/share/terminfo/E/Eterm-color
+#usr/share/terminfo/L
+#usr/share/terminfo/L/LFT-PC850
+#usr/share/terminfo/M
+#usr/share/terminfo/M/MtxOrb
+#usr/share/terminfo/M/MtxOrb162
+#usr/share/terminfo/M/MtxOrb204
+#usr/share/terminfo/N
+#usr/share/terminfo/N/NCR260VT300WPP
+#usr/share/terminfo/N/NCRVT100WPP
+#usr/share/terminfo/P
+#usr/share/terminfo/P/P12
+#usr/share/terminfo/P/P12-M
+#usr/share/terminfo/P/P12-M-W
+#usr/share/terminfo/P/P12-W
+#usr/share/terminfo/P/P14
+#usr/share/terminfo/P/P14-M
+#usr/share/terminfo/P/P14-M-W
+#usr/share/terminfo/P/P14-W
+#usr/share/terminfo/P/P4
+#usr/share/terminfo/P/P5
+#usr/share/terminfo/P/P7
+#usr/share/terminfo/P/P8
+#usr/share/terminfo/P/P8-W
+#usr/share/terminfo/P/P9
+#usr/share/terminfo/P/P9-8
+#usr/share/terminfo/P/P9-8-W
+#usr/share/terminfo/P/P9-W
+#usr/share/terminfo/Q
+#usr/share/terminfo/Q/Q306-8-pc
+#usr/share/terminfo/Q/Q310-vip-H
+#usr/share/terminfo/Q/Q310-vip-H-am
+#usr/share/terminfo/Q/Q310-vip-Hw
+#usr/share/terminfo/Q/Q310-vip-w
+#usr/share/terminfo/Q/Q310-vip-w-am
+#usr/share/terminfo/X
+#usr/share/terminfo/X/X-hpterm
+#usr/share/terminfo/a
+#usr/share/terminfo/a/a210
+#usr/share/terminfo/a/a80
+#usr/share/terminfo/a/a980
+#usr/share/terminfo/a/aa4080
+#usr/share/terminfo/a/aaa
+#usr/share/terminfo/a/aaa+dec
+#usr/share/terminfo/a/aaa+rv
+#usr/share/terminfo/a/aaa+unk
+#usr/share/terminfo/a/aaa-18
+#usr/share/terminfo/a/aaa-18-rv
+#usr/share/terminfo/a/aaa-20
+#usr/share/terminfo/a/aaa-22
+#usr/share/terminfo/a/aaa-24
+#usr/share/terminfo/a/aaa-24-rv
+#usr/share/terminfo/a/aaa-26
+#usr/share/terminfo/a/aaa-28
+#usr/share/terminfo/a/aaa-30
+#usr/share/terminfo/a/aaa-30-ctxt
+#usr/share/terminfo/a/aaa-30-rv
+#usr/share/terminfo/a/aaa-30-rv-ctxt
+#usr/share/terminfo/a/aaa-30-s
+#usr/share/terminfo/a/aaa-30-s-ctxt
+#usr/share/terminfo/a/aaa-30-s-rv
+#usr/share/terminfo/a/aaa-30-s-rv-ct
+#usr/share/terminfo/a/aaa-36
+#usr/share/terminfo/a/aaa-36-rv
+#usr/share/terminfo/a/aaa-40
+#usr/share/terminfo/a/aaa-40-rv
+#usr/share/terminfo/a/aaa-48
+#usr/share/terminfo/a/aaa-48-rv
+#usr/share/terminfo/a/aaa-60
+#usr/share/terminfo/a/aaa-60-dec-rv
+#usr/share/terminfo/a/aaa-60-rv
+#usr/share/terminfo/a/aaa-60-s
+#usr/share/terminfo/a/aaa-60-s-rv
+#usr/share/terminfo/a/aaa-ctxt
+#usr/share/terminfo/a/aaa-db
+#usr/share/terminfo/a/aaa-rv
+#usr/share/terminfo/a/aaa-rv-ctxt
+#usr/share/terminfo/a/aaa-rv-unk
+#usr/share/terminfo/a/aaa-s
+#usr/share/terminfo/a/aaa-s-ctxt
+#usr/share/terminfo/a/aaa-s-rv
+#usr/share/terminfo/a/aaa-s-rv-ctxt
+#usr/share/terminfo/a/aaa-unk
+#usr/share/terminfo/a/aas1901
+#usr/share/terminfo/a/abm80
+#usr/share/terminfo/a/abm85
+#usr/share/terminfo/a/abm85e
+#usr/share/terminfo/a/abm85h
+#usr/share/terminfo/a/abm85h-old
+#usr/share/terminfo/a/act4
+#usr/share/terminfo/a/act5
+#usr/share/terminfo/a/addrinfo
+#usr/share/terminfo/a/adds980
+#usr/share/terminfo/a/addsviewpoint
+#usr/share/terminfo/a/addsvp60
+#usr/share/terminfo/a/adm+sgr
+#usr/share/terminfo/a/adm1
+#usr/share/terminfo/a/adm11
+#usr/share/terminfo/a/adm1178
+#usr/share/terminfo/a/adm12
+#usr/share/terminfo/a/adm1a
+#usr/share/terminfo/a/adm2
+#usr/share/terminfo/a/adm20
+#usr/share/terminfo/a/adm21
+#usr/share/terminfo/a/adm22
+#usr/share/terminfo/a/adm3
+#usr/share/terminfo/a/adm31
+#usr/share/terminfo/a/adm31-old
+#usr/share/terminfo/a/adm36
+#usr/share/terminfo/a/adm3a
+#usr/share/terminfo/a/adm3a+
+#usr/share/terminfo/a/adm42
+#usr/share/terminfo/a/adm42-ns
+#usr/share/terminfo/a/adm5
+#usr/share/terminfo/a/aepro
+#usr/share/terminfo/a/aixterm
+#usr/share/terminfo/a/aixterm-16color
+#usr/share/terminfo/a/aixterm-m
+#usr/share/terminfo/a/aixterm-m-old
+#usr/share/terminfo/a/aj
+#usr/share/terminfo/a/aj510
+#usr/share/terminfo/a/aj830
+#usr/share/terminfo/a/aj832
+#usr/share/terminfo/a/alt2
+#usr/share/terminfo/a/alt3
+#usr/share/terminfo/a/alt4
+#usr/share/terminfo/a/alt5
+#usr/share/terminfo/a/alt7
+#usr/share/terminfo/a/alt7pc
+#usr/share/terminfo/a/alto-h19
+#usr/share/terminfo/a/alto-heath
+#usr/share/terminfo/a/altoh19
+#usr/share/terminfo/a/altoheath
+#usr/share/terminfo/a/altos-2
+#usr/share/terminfo/a/altos-3
+#usr/share/terminfo/a/altos-4
+#usr/share/terminfo/a/altos-5
+#usr/share/terminfo/a/altos2
+#usr/share/terminfo/a/altos3
+#usr/share/terminfo/a/altos4
+#usr/share/terminfo/a/altos5
+#usr/share/terminfo/a/altos7
+#usr/share/terminfo/a/altos7pc
+#usr/share/terminfo/a/ambas
+#usr/share/terminfo/a/ambassador
+#usr/share/terminfo/a/amiga
+#usr/share/terminfo/a/amiga-8bit
+#usr/share/terminfo/a/amiga-h
+#usr/share/terminfo/a/amiga-vnc
+#usr/share/terminfo/a/amp219
+#usr/share/terminfo/a/amp219w
+#usr/share/terminfo/a/ampex-219
+#usr/share/terminfo/a/ampex-219w
+#usr/share/terminfo/a/ampex-232
+#usr/share/terminfo/a/ampex175
+#usr/share/terminfo/a/ampex175-b
+#usr/share/terminfo/a/ampex210
+#usr/share/terminfo/a/ampex219
+#usr/share/terminfo/a/ampex219w
+#usr/share/terminfo/a/ampex232
+#usr/share/terminfo/a/ampex232w
+#usr/share/terminfo/a/ampex80
+#usr/share/terminfo/a/annarbor4080
+#usr/share/terminfo/a/ansi
+#usr/share/terminfo/a/ansi+arrows
+#usr/share/terminfo/a/ansi+csr
+#usr/share/terminfo/a/ansi+cup
+#usr/share/terminfo/a/ansi+enq
+#usr/share/terminfo/a/ansi+erase
+#usr/share/terminfo/a/ansi+idc
+#usr/share/terminfo/a/ansi+idl
+#usr/share/terminfo/a/ansi+idl1
+#usr/share/terminfo/a/ansi+inittabs
+#usr/share/terminfo/a/ansi+local
+#usr/share/terminfo/a/ansi+local1
+#usr/share/terminfo/a/ansi+pp
+#usr/share/terminfo/a/ansi+rca
+#usr/share/terminfo/a/ansi+rep
+#usr/share/terminfo/a/ansi+sgr
+#usr/share/terminfo/a/ansi+sgrbold
+#usr/share/terminfo/a/ansi+sgrdim
+#usr/share/terminfo/a/ansi+sgrso
+#usr/share/terminfo/a/ansi+sgrul
+#usr/share/terminfo/a/ansi+tabs
+#usr/share/terminfo/a/ansi-color-2-emx
+#usr/share/terminfo/a/ansi-color-3-emx
+#usr/share/terminfo/a/ansi-emx
+#usr/share/terminfo/a/ansi-generic
+#usr/share/terminfo/a/ansi-m
+#usr/share/terminfo/a/ansi-mini
+#usr/share/terminfo/a/ansi-mono
+#usr/share/terminfo/a/ansi-mr
+#usr/share/terminfo/a/ansi-mtabs
+#usr/share/terminfo/a/ansi-nt
+#usr/share/terminfo/a/ansi.sys
+#usr/share/terminfo/a/ansi.sys-old
+#usr/share/terminfo/a/ansi.sysk
+#usr/share/terminfo/a/ansi43m
+#usr/share/terminfo/a/ansi77
+#usr/share/terminfo/a/ansi80x25
+#usr/share/terminfo/a/ansi80x25-mono
+#usr/share/terminfo/a/ansi80x25-raw
+#usr/share/terminfo/a/ansi80x30
+#usr/share/terminfo/a/ansi80x30-mono
+#usr/share/terminfo/a/ansi80x43
+#usr/share/terminfo/a/ansi80x43-mono
+#usr/share/terminfo/a/ansi80x50
+#usr/share/terminfo/a/ansi80x50-mono
+#usr/share/terminfo/a/ansi80x60
+#usr/share/terminfo/a/ansi80x60-mono
+#usr/share/terminfo/a/ansil
+#usr/share/terminfo/a/ansil-mono
+#usr/share/terminfo/a/ansis
+#usr/share/terminfo/a/ansis-mono
+#usr/share/terminfo/a/ansisysk
+#usr/share/terminfo/a/ansiw
+#usr/share/terminfo/a/ap-vm80
+#usr/share/terminfo/a/apl
+#usr/share/terminfo/a/apollo
+#usr/share/terminfo/a/apollo_15P
+#usr/share/terminfo/a/apollo_19L
+#usr/share/terminfo/a/apollo_color
+#usr/share/terminfo/a/apple-80
+#usr/share/terminfo/a/apple-ae
+#usr/share/terminfo/a/apple-soroc
+#usr/share/terminfo/a/apple-uterm
+#usr/share/terminfo/a/apple-uterm-vb
+#usr/share/terminfo/a/apple-videx
+#usr/share/terminfo/a/apple-videx2
+#usr/share/terminfo/a/apple-videx3
+#usr/share/terminfo/a/apple-vm80
+#usr/share/terminfo/a/apple2e
+#usr/share/terminfo/a/apple2e-p
+#usr/share/terminfo/a/apple80p
+#usr/share/terminfo/a/appleII
+#usr/share/terminfo/a/appleIIc
+#usr/share/terminfo/a/appleIIe
+#usr/share/terminfo/a/appleIIgs
+#usr/share/terminfo/a/arm100
+#usr/share/terminfo/a/arm100-am
+#usr/share/terminfo/a/arm100-w
+#usr/share/terminfo/a/arm100-wam
+#usr/share/terminfo/a/at
+#usr/share/terminfo/a/at-color
+#usr/share/terminfo/a/at-m
+#usr/share/terminfo/a/at386
+#usr/share/terminfo/a/atari
+#usr/share/terminfo/a/atari-color
+#usr/share/terminfo/a/atari-m
+#usr/share/terminfo/a/atari-old
+#usr/share/terminfo/a/atari_st
+#usr/share/terminfo/a/atari_st-color
+#usr/share/terminfo/a/atarist-m
+#usr/share/terminfo/a/aterm
+#usr/share/terminfo/a/att2300
+#usr/share/terminfo/a/att2350
+#usr/share/terminfo/a/att4410
+#usr/share/terminfo/a/att4410-w
+#usr/share/terminfo/a/att4410v1
+#usr/share/terminfo/a/att4410v1-w
+#usr/share/terminfo/a/att4415
+#usr/share/terminfo/a/att4415+nl
+#usr/share/terminfo/a/att4415-nl
+#usr/share/terminfo/a/att4415-rv
+#usr/share/terminfo/a/att4415-rv-nl
+#usr/share/terminfo/a/att4415-w
+#usr/share/terminfo/a/att4415-w-nl
+#usr/share/terminfo/a/att4415-w-rv
+#usr/share/terminfo/a/att4415-w-rv-n
+#usr/share/terminfo/a/att4418
+#usr/share/terminfo/a/att4418-w
+#usr/share/terminfo/a/att4420
+#usr/share/terminfo/a/att4424
+#usr/share/terminfo/a/att4424-1
+#usr/share/terminfo/a/att4424m
+#usr/share/terminfo/a/att4425
+#usr/share/terminfo/a/att4425-nl
+#usr/share/terminfo/a/att4425-w
+#usr/share/terminfo/a/att4426
+#usr/share/terminfo/a/att500
+#usr/share/terminfo/a/att505
+#usr/share/terminfo/a/att505-24
+#usr/share/terminfo/a/att510a
+#usr/share/terminfo/a/att510d
+#usr/share/terminfo/a/att513
+#usr/share/terminfo/a/att5310
+#usr/share/terminfo/a/att5320
+#usr/share/terminfo/a/att5410
+#usr/share/terminfo/a/att5410-w
+#usr/share/terminfo/a/att5410v1
+#usr/share/terminfo/a/att5410v1-w
+#usr/share/terminfo/a/att5418
+#usr/share/terminfo/a/att5418-w
+#usr/share/terminfo/a/att5420
+#usr/share/terminfo/a/att5420+nl
+#usr/share/terminfo/a/att5420-nl
+#usr/share/terminfo/a/att5420-rv
+#usr/share/terminfo/a/att5420-rv-nl
+#usr/share/terminfo/a/att5420-w
+#usr/share/terminfo/a/att5420-w-nl
+#usr/share/terminfo/a/att5420-w-rv
+#usr/share/terminfo/a/att5420-w-rv-n
+#usr/share/terminfo/a/att5420_2
+#usr/share/terminfo/a/att5420_2-w
+#usr/share/terminfo/a/att5425
+#usr/share/terminfo/a/att5425-nl
+#usr/share/terminfo/a/att5425-w
+#usr/share/terminfo/a/att5430
+#usr/share/terminfo/a/att5620
+#usr/share/terminfo/a/att5620-1
+#usr/share/terminfo/a/att5620-24
+#usr/share/terminfo/a/att5620-34
+#usr/share/terminfo/a/att5620-s
+#usr/share/terminfo/a/att605
+#usr/share/terminfo/a/att605-pc
+#usr/share/terminfo/a/att605-w
+#usr/share/terminfo/a/att610
+#usr/share/terminfo/a/att610-103k
+#usr/share/terminfo/a/att610-103k-w
+#usr/share/terminfo/a/att610-w
+#usr/share/terminfo/a/att615
+#usr/share/terminfo/a/att615-103k
+#usr/share/terminfo/a/att615-103k-w
+#usr/share/terminfo/a/att615-w
+#usr/share/terminfo/a/att620
+#usr/share/terminfo/a/att620-103k
+#usr/share/terminfo/a/att620-103k-w
+#usr/share/terminfo/a/att620-w
+#usr/share/terminfo/a/att630
+#usr/share/terminfo/a/att630-24
+#usr/share/terminfo/a/att6386
+#usr/share/terminfo/a/att700
+#usr/share/terminfo/a/att730
+#usr/share/terminfo/a/att730-24
+#usr/share/terminfo/a/att730-41
+#usr/share/terminfo/a/att7300
+#usr/share/terminfo/a/att730r
+#usr/share/terminfo/a/att730r-24
+#usr/share/terminfo/a/att730r-41
+#usr/share/terminfo/a/avatar
+#usr/share/terminfo/a/avatar0
+#usr/share/terminfo/a/avatar0+
+#usr/share/terminfo/a/avatar1
+#usr/share/terminfo/a/avt
+#usr/share/terminfo/a/avt+s
+#usr/share/terminfo/a/avt-ns
+#usr/share/terminfo/a/avt-rv
+#usr/share/terminfo/a/avt-rv-ns
+#usr/share/terminfo/a/avt-rv-s
+#usr/share/terminfo/a/avt-s
+#usr/share/terminfo/a/avt-w
+#usr/share/terminfo/a/avt-w-ns
+#usr/share/terminfo/a/avt-w-rv
+#usr/share/terminfo/a/avt-w-rv-ns
+#usr/share/terminfo/a/avt-w-rv-s
+#usr/share/terminfo/a/avt-w-s
+#usr/share/terminfo/a/aws
+#usr/share/terminfo/a/awsc
+#usr/share/terminfo/b
+#usr/share/terminfo/b/b-128
+#usr/share/terminfo/b/bantam
+#usr/share/terminfo/b/basic4
+#usr/share/terminfo/b/basis
+#usr/share/terminfo/b/bct510a
+#usr/share/terminfo/b/bct510d
+#usr/share/terminfo/b/beacon
+#usr/share/terminfo/b/bee
+#usr/share/terminfo/b/beehive
+#usr/share/terminfo/b/beehive3
+#usr/share/terminfo/b/beehive4
+#usr/share/terminfo/b/beehiveIIIm
+#usr/share/terminfo/b/beterm
+#usr/share/terminfo/b/bg1.25
+#usr/share/terminfo/b/bg1.25nv
+#usr/share/terminfo/b/bg1.25rv
+#usr/share/terminfo/b/bg2.0
+#usr/share/terminfo/b/bg2.0nv
+#usr/share/terminfo/b/bg2.0rv
+#usr/share/terminfo/b/bg3.10
+#usr/share/terminfo/b/bg3.10nv
+#usr/share/terminfo/b/bg3.10rv
+#usr/share/terminfo/b/bh3m
+#usr/share/terminfo/b/bh4
+#usr/share/terminfo/b/bitgraph
+#usr/share/terminfo/b/blit
+#usr/share/terminfo/b/bobcat
+#usr/share/terminfo/b/bq300
+#usr/share/terminfo/b/bq300-8
+#usr/share/terminfo/b/bq300-8-pc
+#usr/share/terminfo/b/bq300-8-pc-rv
+#usr/share/terminfo/b/bq300-8-pc-w
+#usr/share/terminfo/b/bq300-8-pc-w-rv
+#usr/share/terminfo/b/bq300-8rv
+#usr/share/terminfo/b/bq300-8w
+#usr/share/terminfo/b/bq300-pc
+#usr/share/terminfo/b/bq300-pc-rv
+#usr/share/terminfo/b/bq300-pc-w
+#usr/share/terminfo/b/bq300-pc-w-rv
+#usr/share/terminfo/b/bq300-rv
+#usr/share/terminfo/b/bq300-w
+#usr/share/terminfo/b/bq300-w-8rv
+#usr/share/terminfo/b/bq300-w-rv
+#usr/share/terminfo/b/bsdos-pc
+#usr/share/terminfo/b/bsdos-pc-m
+#usr/share/terminfo/b/bsdos-pc-mono
+#usr/share/terminfo/b/bsdos-pc-nobold
+#usr/share/terminfo/b/bsdos-ppc
+#usr/share/terminfo/b/bsdos-sparc
+#usr/share/terminfo/b/bterm
+#usr/share/terminfo/c
+#usr/share/terminfo/c/c100
+#usr/share/terminfo/c/c100-1p
+#usr/share/terminfo/c/c100-4p
+#usr/share/terminfo/c/c100-rv
+#usr/share/terminfo/c/c100-rv-4p
+#usr/share/terminfo/c/c104
+#usr/share/terminfo/c/c108
+#usr/share/terminfo/c/c108-4p
+#usr/share/terminfo/c/c108-8p
+#usr/share/terminfo/c/c108-rv
+#usr/share/terminfo/c/c108-rv-4p
+#usr/share/terminfo/c/c108-rv-8p
+#usr/share/terminfo/c/c108-w
+#usr/share/terminfo/c/c108-w-8p
+#usr/share/terminfo/c/c300
+#usr/share/terminfo/c/c301
+#usr/share/terminfo/c/c321
+#usr/share/terminfo/c/ca22851
+#usr/share/terminfo/c/cad68-2
+#usr/share/terminfo/c/cad68-3
+#usr/share/terminfo/c/cbblit
+#usr/share/terminfo/c/cbunix
+#usr/share/terminfo/c/cci
+#usr/share/terminfo/c/cci1
+#usr/share/terminfo/c/cdc456
+#usr/share/terminfo/c/cdc721
+#usr/share/terminfo/c/cdc721-esc
+#usr/share/terminfo/c/cdc721ll
+#usr/share/terminfo/c/cdc752
+#usr/share/terminfo/c/cdc756
+#usr/share/terminfo/c/cg7900
+#usr/share/terminfo/c/cgc2
+#usr/share/terminfo/c/cgc3
+#usr/share/terminfo/c/chromatics
+#usr/share/terminfo/c/ci8510
+#usr/share/terminfo/c/cit-80
+#usr/share/terminfo/c/cit101
+#usr/share/terminfo/c/cit101e
+#usr/share/terminfo/c/cit101e-132
+#usr/share/terminfo/c/cit101e-n
+#usr/share/terminfo/c/cit101e-n132
+#usr/share/terminfo/c/cit101e-rv
+#usr/share/terminfo/c/cit500
+#usr/share/terminfo/c/cit80
+#usr/share/terminfo/c/citc
+#usr/share/terminfo/c/citoh
+#usr/share/terminfo/c/citoh-6lpi
+#usr/share/terminfo/c/citoh-8lpi
+#usr/share/terminfo/c/citoh-comp
+#usr/share/terminfo/c/citoh-elite
+#usr/share/terminfo/c/citoh-pica
+#usr/share/terminfo/c/citoh-prop
+#usr/share/terminfo/c/citoh-ps
+#usr/share/terminfo/c/coco3
+#usr/share/terminfo/c/coherent
+#usr/share/terminfo/c/color_xterm
+#usr/share/terminfo/c/colorscan
+#usr/share/terminfo/c/commodore
+#usr/share/terminfo/c/concept
+#usr/share/terminfo/c/concept-avt
+#usr/share/terminfo/c/concept100
+#usr/share/terminfo/c/concept100-rv
+#usr/share/terminfo/c/concept108
+#usr/share/terminfo/c/concept108-4p
+#usr/share/terminfo/c/concept108-8p
+#usr/share/terminfo/c/concept108-w-8
+#usr/share/terminfo/c/concept108-w8p
+#usr/share/terminfo/c/concept108rv4p
+#usr/share/terminfo/c/cons25
+#usr/share/terminfo/c/cons25-debian
+#usr/share/terminfo/c/cons25-iso-m
+#usr/share/terminfo/c/cons25-iso8859
+#usr/share/terminfo/c/cons25-koi8-r
+#usr/share/terminfo/c/cons25-koi8r-m
+#usr/share/terminfo/c/cons25-m
+#usr/share/terminfo/c/cons25l1
+#usr/share/terminfo/c/cons25l1-m
+#usr/share/terminfo/c/cons25r
+#usr/share/terminfo/c/cons25r-m
+#usr/share/terminfo/c/cons25w
+#usr/share/terminfo/c/cons30
+#usr/share/terminfo/c/cons30-m
+#usr/share/terminfo/c/cons43
+#usr/share/terminfo/c/cons43-m
+#usr/share/terminfo/c/cons50
+#usr/share/terminfo/c/cons50-iso-m
+#usr/share/terminfo/c/cons50-iso8859
+#usr/share/terminfo/c/cons50-koi8r
+#usr/share/terminfo/c/cons50-koi8r-m
+#usr/share/terminfo/c/cons50-m
+#usr/share/terminfo/c/cons50l1
+#usr/share/terminfo/c/cons50l1-m
+#usr/share/terminfo/c/cons50r
+#usr/share/terminfo/c/cons50r-m
+#usr/share/terminfo/c/cons60
+#usr/share/terminfo/c/cons60-iso
+#usr/share/terminfo/c/cons60-iso-m
+#usr/share/terminfo/c/cons60-koi8r
+#usr/share/terminfo/c/cons60-koi8r-m
+#usr/share/terminfo/c/cons60-m
+#usr/share/terminfo/c/cons60l1
+#usr/share/terminfo/c/cons60l1-m
+#usr/share/terminfo/c/cons60r
+#usr/share/terminfo/c/cons60r-m
+#usr/share/terminfo/c/contel300
+#usr/share/terminfo/c/contel301
+#usr/share/terminfo/c/contel320
+#usr/share/terminfo/c/contel321
+#usr/share/terminfo/c/cops
+#usr/share/terminfo/c/cops-10
+#usr/share/terminfo/c/cops10
+#usr/share/terminfo/c/crt
+#usr/share/terminfo/c/crt-vt220
+#usr/share/terminfo/c/cs10
+#usr/share/terminfo/c/cs10-w
+#usr/share/terminfo/c/ct82
+#usr/share/terminfo/c/ct8500
+#usr/share/terminfo/c/ctrm
+#usr/share/terminfo/c/cx
+#usr/share/terminfo/c/cx100
+#usr/share/terminfo/c/cyb110
+#usr/share/terminfo/c/cyb83
+#usr/share/terminfo/c/cygwin
+#usr/share/terminfo/c/cygwinB19
+#usr/share/terminfo/c/cygwinDBG
+#usr/share/terminfo/d
+#usr/share/terminfo/d/d132
+#usr/share/terminfo/d/d2
+#usr/share/terminfo/d/d2-dg
+#usr/share/terminfo/d/d200
+#usr/share/terminfo/d/d200-dg
+#usr/share/terminfo/d/d210
+#usr/share/terminfo/d/d210-dg
+#usr/share/terminfo/d/d211
+#usr/share/terminfo/d/d211-7b
+#usr/share/terminfo/d/d211-dg
+#usr/share/terminfo/d/d214
+#usr/share/terminfo/d/d214-dg
+#usr/share/terminfo/d/d215
+#usr/share/terminfo/d/d215-7b
+#usr/share/terminfo/d/d215-dg
+#usr/share/terminfo/d/d216+
+#usr/share/terminfo/d/d216+25
+#usr/share/terminfo/d/d216+dg
+#usr/share/terminfo/d/d216-dg
+#usr/share/terminfo/d/d216-unix
+#usr/share/terminfo/d/d216-unix-25
+#usr/share/terminfo/d/d216e+
+#usr/share/terminfo/d/d216e+dg
+#usr/share/terminfo/d/d216e-dg
+#usr/share/terminfo/d/d216e-unix
+#usr/share/terminfo/d/d217-dg
+#usr/share/terminfo/d/d217-unix
+#usr/share/terminfo/d/d217-unix-25
+#usr/share/terminfo/d/d220
+#usr/share/terminfo/d/d220-7b
+#usr/share/terminfo/d/d220-dg
+#usr/share/terminfo/d/d230
+#usr/share/terminfo/d/d230-dg
+#usr/share/terminfo/d/d230c
+#usr/share/terminfo/d/d230c-dg
+#usr/share/terminfo/d/d400
+#usr/share/terminfo/d/d400-dg
+#usr/share/terminfo/d/d410
+#usr/share/terminfo/d/d410-7b
+#usr/share/terminfo/d/d410-7b-w
+#usr/share/terminfo/d/d410-dg
+#usr/share/terminfo/d/d410-w
+#usr/share/terminfo/d/d411
+#usr/share/terminfo/d/d411-7b
+#usr/share/terminfo/d/d411-7b-w
+#usr/share/terminfo/d/d411-dg
+#usr/share/terminfo/d/d411-w
+#usr/share/terminfo/d/d412+
+#usr/share/terminfo/d/d412+25
+#usr/share/terminfo/d/d412+dg
+#usr/share/terminfo/d/d412+s
+#usr/share/terminfo/d/d412+sr
+#usr/share/terminfo/d/d412+w
+#usr/share/terminfo/d/d412-dg
+#usr/share/terminfo/d/d412-unix
+#usr/share/terminfo/d/d412-unix-25
+#usr/share/terminfo/d/d412-unix-s
+#usr/share/terminfo/d/d412-unix-sr
+#usr/share/terminfo/d/d412-unix-w
+#usr/share/terminfo/d/d413-dg
+#usr/share/terminfo/d/d413-unix
+#usr/share/terminfo/d/d413-unix-25
+#usr/share/terminfo/d/d413-unix-s
+#usr/share/terminfo/d/d413-unix-sr
+#usr/share/terminfo/d/d413-unix-w
+#usr/share/terminfo/d/d414-unix
+#usr/share/terminfo/d/d414-unix-25
+#usr/share/terminfo/d/d414-unix-s
+#usr/share/terminfo/d/d414-unix-sr
+#usr/share/terminfo/d/d414-unix-w
+#usr/share/terminfo/d/d430-dg
+#usr/share/terminfo/d/d430-dg-ccc
+#usr/share/terminfo/d/d430-unix
+#usr/share/terminfo/d/d430-unix-25
+#usr/share/terminfo/d/d430-unix-25-ccc
+#usr/share/terminfo/d/d430-unix-ccc
+#usr/share/terminfo/d/d430-unix-s
+#usr/share/terminfo/d/d430-unix-s-ccc
+#usr/share/terminfo/d/d430-unix-sr
+#usr/share/terminfo/d/d430-unix-sr-ccc
+#usr/share/terminfo/d/d430-unix-w
+#usr/share/terminfo/d/d430-unix-w-ccc
+#usr/share/terminfo/d/d430c-dg
+#usr/share/terminfo/d/d430c-dg-ccc
+#usr/share/terminfo/d/d430c-unix
+#usr/share/terminfo/d/d430c-unix-25
+#usr/share/terminfo/d/d430c-unix-25-ccc
+#usr/share/terminfo/d/d430c-unix-ccc
+#usr/share/terminfo/d/d430c-unix-s
+#usr/share/terminfo/d/d430c-unix-s-ccc
+#usr/share/terminfo/d/d430c-unix-sr
+#usr/share/terminfo/d/d430c-unix-sr-ccc
+#usr/share/terminfo/d/d430c-unix-w
+#usr/share/terminfo/d/d430c-unix-w-ccc
+#usr/share/terminfo/d/d450
+#usr/share/terminfo/d/d450-dg
+#usr/share/terminfo/d/d460
+#usr/share/terminfo/d/d460-7b
+#usr/share/terminfo/d/d460-7b-w
+#usr/share/terminfo/d/d460-dg
+#usr/share/terminfo/d/d460-w
+#usr/share/terminfo/d/d461
+#usr/share/terminfo/d/d461-7b
+#usr/share/terminfo/d/d461-7b-w
+#usr/share/terminfo/d/d461-dg
+#usr/share/terminfo/d/d461-w
+#usr/share/terminfo/d/d462+
+#usr/share/terminfo/d/d462+25
+#usr/share/terminfo/d/d462+dg
+#usr/share/terminfo/d/d462+s
+#usr/share/terminfo/d/d462+sr
+#usr/share/terminfo/d/d462+w
+#usr/share/terminfo/d/d462-dg
+#usr/share/terminfo/d/d462-unix
+#usr/share/terminfo/d/d462-unix-25
+#usr/share/terminfo/d/d462-unix-s
+#usr/share/terminfo/d/d462-unix-sr
+#usr/share/terminfo/d/d462-unix-w
+#usr/share/terminfo/d/d462e-dg
+#usr/share/terminfo/d/d463-dg
+#usr/share/terminfo/d/d463-unix
+#usr/share/terminfo/d/d463-unix-25
+#usr/share/terminfo/d/d463-unix-s
+#usr/share/terminfo/d/d463-unix-sr
+#usr/share/terminfo/d/d463-unix-w
+#usr/share/terminfo/d/d464-unix
+#usr/share/terminfo/d/d464-unix-25
+#usr/share/terminfo/d/d464-unix-s
+#usr/share/terminfo/d/d464-unix-sr
+#usr/share/terminfo/d/d464-unix-w
+#usr/share/terminfo/d/d470
+#usr/share/terminfo/d/d470-7b
+#usr/share/terminfo/d/d470-dg
+#usr/share/terminfo/d/d470c
+#usr/share/terminfo/d/d470c-7b
+#usr/share/terminfo/d/d470c-dg
+#usr/share/terminfo/d/d555
+#usr/share/terminfo/d/d555-7b
+#usr/share/terminfo/d/d555-7b-w
+#usr/share/terminfo/d/d555-dg
+#usr/share/terminfo/d/d555-w
+#usr/share/terminfo/d/d577
+#usr/share/terminfo/d/d577-7b
+#usr/share/terminfo/d/d577-7b-w
+#usr/share/terminfo/d/d577-dg
+#usr/share/terminfo/d/d577-w
+#usr/share/terminfo/d/d578
+#usr/share/terminfo/d/d578-7b
+#usr/share/terminfo/d/d578-dg
+#usr/share/terminfo/d/d80
+#usr/share/terminfo/d/d800
+#usr/share/terminfo/d/darwin
+#usr/share/terminfo/d/darwin-100x37
+#usr/share/terminfo/d/darwin-100x37-m
+#usr/share/terminfo/d/darwin-112x37
+#usr/share/terminfo/d/darwin-112x37-m
+#usr/share/terminfo/d/darwin-128x40
+#usr/share/terminfo/d/darwin-128x40-m
+#usr/share/terminfo/d/darwin-128x48
+#usr/share/terminfo/d/darwin-128x48-m
+#usr/share/terminfo/d/darwin-144x48
+#usr/share/terminfo/d/darwin-144x48-m
+#usr/share/terminfo/d/darwin-160x64
+#usr/share/terminfo/d/darwin-160x64-m
+#usr/share/terminfo/d/darwin-200x64
+#usr/share/terminfo/d/darwin-200x64-m
+#usr/share/terminfo/d/darwin-200x75
+#usr/share/terminfo/d/darwin-200x75-m
+#usr/share/terminfo/d/darwin-256x96
+#usr/share/terminfo/d/darwin-256x96-m
+#usr/share/terminfo/d/darwin-80x25
+#usr/share/terminfo/d/darwin-80x25-m
+#usr/share/terminfo/d/darwin-80x30
+#usr/share/terminfo/d/darwin-80x30-m
+#usr/share/terminfo/d/darwin-90x30
+#usr/share/terminfo/d/darwin-90x30-m
+#usr/share/terminfo/d/darwin-b
+#usr/share/terminfo/d/darwin-f
+#usr/share/terminfo/d/darwin-f2
+#usr/share/terminfo/d/darwin-m
+#usr/share/terminfo/d/darwin-m-b
+#usr/share/terminfo/d/darwin-m-f
+#usr/share/terminfo/d/darwin-m-f2
+#usr/share/terminfo/d/datagraphix
+#usr/share/terminfo/d/datamedia2500
+#usr/share/terminfo/d/datapoint
+#usr/share/terminfo/d/dataspeed40
+#usr/share/terminfo/d/dd5000
+#usr/share/terminfo/d/ddr
+#usr/share/terminfo/d/ddr3180
+#usr/share/terminfo/d/dec-vt100
+#usr/share/terminfo/d/dec-vt220
+#usr/share/terminfo/d/dec-vt330
+#usr/share/terminfo/d/dec-vt340
+#usr/share/terminfo/d/dec-vt400
+#usr/share/terminfo/d/decansi
+#usr/share/terminfo/d/decpro
+#usr/share/terminfo/d/decwriter
+#usr/share/terminfo/d/delta
+#usr/share/terminfo/d/dg+ccc
+#usr/share/terminfo/d/dg+color
+#usr/share/terminfo/d/dg+color8
+#usr/share/terminfo/d/dg+fixed
+#usr/share/terminfo/d/dg-ansi
+#usr/share/terminfo/d/dg-generic
+#usr/share/terminfo/d/dg100
+#usr/share/terminfo/d/dg200
+#usr/share/terminfo/d/dg210
+#usr/share/terminfo/d/dg211
+#usr/share/terminfo/d/dg450
+#usr/share/terminfo/d/dg460-ansi
+#usr/share/terminfo/d/dg6053
+#usr/share/terminfo/d/dg6053-old
+#usr/share/terminfo/d/dg605x
+#usr/share/terminfo/d/dg6134
+#usr/share/terminfo/d/dgkeys+11
+#usr/share/terminfo/d/dgkeys+15
+#usr/share/terminfo/d/dgkeys+7b
+#usr/share/terminfo/d/dgkeys+8b
+#usr/share/terminfo/d/dgmode+color
+#usr/share/terminfo/d/dgmode+color8
+#usr/share/terminfo/d/dgunix+ccc
+#usr/share/terminfo/d/dgunix+fixed
+#usr/share/terminfo/d/diablo
+#usr/share/terminfo/d/diablo-lm
+#usr/share/terminfo/d/diablo1620
+#usr/share/terminfo/d/diablo1620-m8
+#usr/share/terminfo/d/diablo1640
+#usr/share/terminfo/d/diablo1640-lm
+#usr/share/terminfo/d/diablo1640-m8
+#usr/share/terminfo/d/diablo1720
+#usr/share/terminfo/d/diablo1730
+#usr/share/terminfo/d/diablo1740
+#usr/share/terminfo/d/diablo1740-lm
+#usr/share/terminfo/d/diablo450
+#usr/share/terminfo/d/diablo630
+#usr/share/terminfo/d/dialogue
+#usr/share/terminfo/d/dialogue80
+#usr/share/terminfo/d/digilog
+#usr/share/terminfo/d/djgpp
+#usr/share/terminfo/d/djgpp203
+#usr/share/terminfo/d/djgpp204
+#usr/share/terminfo/d/dku7003
+#usr/share/terminfo/d/dku7003-dumb
+#usr/share/terminfo/d/dku7102
+#usr/share/terminfo/d/dku7102-old
+#usr/share/terminfo/d/dku7102-sna
+#usr/share/terminfo/d/dku7103-sna
+#usr/share/terminfo/d/dku7202
+#usr/share/terminfo/d/dm1520
+#usr/share/terminfo/d/dm1521
+#usr/share/terminfo/d/dm2500
+#usr/share/terminfo/d/dm3025
+#usr/share/terminfo/d/dm3045
+#usr/share/terminfo/d/dm80
+#usr/share/terminfo/d/dm80w
+#usr/share/terminfo/d/dmchat
+#usr/share/terminfo/d/dmd
+#usr/share/terminfo/d/dmd-24
+#usr/share/terminfo/d/dmd-34
+#usr/share/terminfo/d/dmd1
+#usr/share/terminfo/d/dmdt80
+#usr/share/terminfo/d/dmdt80w
+#usr/share/terminfo/d/dmterm
+#usr/share/terminfo/d/dp3360
+#usr/share/terminfo/d/dp8242
+#usr/share/terminfo/d/ds40
+#usr/share/terminfo/d/ds40-2
+#usr/share/terminfo/d/dt-100
+#usr/share/terminfo/d/dt-100w
+#usr/share/terminfo/d/dt100
+#usr/share/terminfo/d/dt100w
+#usr/share/terminfo/d/dt110
+#usr/share/terminfo/d/dt80
+#usr/share/terminfo/d/dt80-sas
+#usr/share/terminfo/d/dt80w
+#usr/share/terminfo/d/dtc300s
+#usr/share/terminfo/d/dtc382
+#usr/share/terminfo/d/dtterm
+#usr/share/terminfo/d/dumb
+#usr/share/terminfo/d/dw
+#usr/share/terminfo/d/dw1
+#usr/share/terminfo/d/dw2
+#usr/share/terminfo/d/dw3
+#usr/share/terminfo/d/dw4
+#usr/share/terminfo/d/dwk
+#usr/share/terminfo/d/dwk-vt
+#usr/share/terminfo/e
+#usr/share/terminfo/e/ecma+color
+#usr/share/terminfo/e/ecma+sgr
+#usr/share/terminfo/e/elks
+#usr/share/terminfo/e/elks-ansi
+#usr/share/terminfo/e/elks-glasstty
+#usr/share/terminfo/e/elks-vt52
+#usr/share/terminfo/e/emots
+#usr/share/terminfo/e/emu
+#usr/share/terminfo/e/emu-220
+#usr/share/terminfo/e/emx-base
+#usr/share/terminfo/e/env230
+#usr/share/terminfo/e/envision230
+#usr/share/terminfo/e/ep40
+#usr/share/terminfo/e/ep4000
+#usr/share/terminfo/e/ep4080
+#usr/share/terminfo/e/ep48
+#usr/share/terminfo/e/ergo4000
+#usr/share/terminfo/e/esprit
+#usr/share/terminfo/e/esprit-am
+#usr/share/terminfo/e/eterm
+#usr/share/terminfo/e/eterm-color
+#usr/share/terminfo/e/ex155
+#usr/share/terminfo/e/excel62
+#usr/share/terminfo/e/excel62-rv
+#usr/share/terminfo/e/excel62-w
+#usr/share/terminfo/e/excel64
+#usr/share/terminfo/e/excel64-rv
+#usr/share/terminfo/e/excel64-w
+#usr/share/terminfo/e/exec80
+#usr/share/terminfo/f
+#usr/share/terminfo/f/f100
+#usr/share/terminfo/f/f100-rv
+#usr/share/terminfo/f/f110
+#usr/share/terminfo/f/f110-14
+#usr/share/terminfo/f/f110-14w
+#usr/share/terminfo/f/f110-w
+#usr/share/terminfo/f/f1720
+#usr/share/terminfo/f/f1720a
+#usr/share/terminfo/f/f200
+#usr/share/terminfo/f/f200-w
+#usr/share/terminfo/f/f200vi
+#usr/share/terminfo/f/f200vi-w
+#usr/share/terminfo/f/falco
+#usr/share/terminfo/f/falco-p
+#usr/share/terminfo/f/fenix
+#usr/share/terminfo/f/fenixw
+#usr/share/terminfo/f/fixterm
+#usr/share/terminfo/f/fortune
+#usr/share/terminfo/f/fos
+#usr/share/terminfo/f/fox
+#usr/share/terminfo/f/freedom
+#usr/share/terminfo/f/freedom-rv
+#usr/share/terminfo/f/freedom100
+#usr/share/terminfo/f/freedom110
+#usr/share/terminfo/f/freedom200
+#usr/share/terminfo/g
+#usr/share/terminfo/g/gator
+#usr/share/terminfo/g/gator-52
+#usr/share/terminfo/g/gator-52t
+#usr/share/terminfo/g/gator-t
+#usr/share/terminfo/g/gigi
+#usr/share/terminfo/g/glasstty
+#usr/share/terminfo/g/gnome
+#usr/share/terminfo/g/gnome+pcfkeys
+#usr/share/terminfo/g/gnome-2007
+#usr/share/terminfo/g/gnome-2008
+#usr/share/terminfo/g/gnome-256color
+#usr/share/terminfo/g/gnome-fc5
+#usr/share/terminfo/g/gnome-rh62
+#usr/share/terminfo/g/gnome-rh72
+#usr/share/terminfo/g/gnome-rh80
+#usr/share/terminfo/g/gnome-rh90
+#usr/share/terminfo/g/go-225
+#usr/share/terminfo/g/go140
+#usr/share/terminfo/g/go140w
+#usr/share/terminfo/g/go225
+#usr/share/terminfo/g/graphos
+#usr/share/terminfo/g/graphos-30
+#usr/share/terminfo/g/gs5430
+#usr/share/terminfo/g/gs5430-22
+#usr/share/terminfo/g/gs5430-24
+#usr/share/terminfo/g/gs6300
+#usr/share/terminfo/g/gsi
+#usr/share/terminfo/g/gt100
+#usr/share/terminfo/g/gt100a
+#usr/share/terminfo/g/gt40
+#usr/share/terminfo/g/gt42
+#usr/share/terminfo/g/guru
+#usr/share/terminfo/g/guru+rv
+#usr/share/terminfo/g/guru+s
+#usr/share/terminfo/g/guru+unk
+#usr/share/terminfo/g/guru-24
+#usr/share/terminfo/g/guru-33
+#usr/share/terminfo/g/guru-33-rv
+#usr/share/terminfo/g/guru-33-s
+#usr/share/terminfo/g/guru-44
+#usr/share/terminfo/g/guru-44-s
+#usr/share/terminfo/g/guru-76
+#usr/share/terminfo/g/guru-76-lp
+#usr/share/terminfo/g/guru-76-s
+#usr/share/terminfo/g/guru-76-w
+#usr/share/terminfo/g/guru-76-w-s
+#usr/share/terminfo/g/guru-76-wm
+#usr/share/terminfo/g/guru-lp
+#usr/share/terminfo/g/guru-nctxt
+#usr/share/terminfo/g/guru-rv
+#usr/share/terminfo/g/guru-s
+#usr/share/terminfo/h
+#usr/share/terminfo/h/h-100
+#usr/share/terminfo/h/h-100bw
+#usr/share/terminfo/h/h100
+#usr/share/terminfo/h/h100bw
+#usr/share/terminfo/h/h19
+#usr/share/terminfo/h/h19-a
+#usr/share/terminfo/h/h19-b
+#usr/share/terminfo/h/h19-bs
+#usr/share/terminfo/h/h19-g
+#usr/share/terminfo/h/h19-smul
+#usr/share/terminfo/h/h19-u
+#usr/share/terminfo/h/h19-us
+#usr/share/terminfo/h/h19a
+#usr/share/terminfo/h/h19g
+#usr/share/terminfo/h/h19k
+#usr/share/terminfo/h/h19kermit
+#usr/share/terminfo/h/h19us
+#usr/share/terminfo/h/h29a-kc-bc
+#usr/share/terminfo/h/h29a-kc-uc
+#usr/share/terminfo/h/h29a-nkc-bc
+#usr/share/terminfo/h/h29a-nkc-uc
+#usr/share/terminfo/h/h80
+#usr/share/terminfo/h/ha8675
+#usr/share/terminfo/h/ha8686
+#usr/share/terminfo/h/hazel
+#usr/share/terminfo/h/hds200
+#usr/share/terminfo/h/he80
+#usr/share/terminfo/h/heath
+#usr/share/terminfo/h/heath-19
+#usr/share/terminfo/h/heath-ansi
+#usr/share/terminfo/h/heathkit
+#usr/share/terminfo/h/heathkit-a
+#usr/share/terminfo/h/hft
+#usr/share/terminfo/h/hft-c
+#usr/share/terminfo/h/hft-c-old
+#usr/share/terminfo/h/hft-old
+#usr/share/terminfo/h/hirez100
+#usr/share/terminfo/h/hirez100-w
+#usr/share/terminfo/h/hmod1
+#usr/share/terminfo/h/hp
+#usr/share/terminfo/h/hp+arrows
+#usr/share/terminfo/h/hp+color
+#usr/share/terminfo/h/hp+labels
+#usr/share/terminfo/h/hp+pfk+arrows
+#usr/share/terminfo/h/hp+pfk+cr
+#usr/share/terminfo/h/hp+pfk-cr
+#usr/share/terminfo/h/hp+printer
+#usr/share/terminfo/h/hp110
+#usr/share/terminfo/h/hp150
+#usr/share/terminfo/h/hp2
+#usr/share/terminfo/h/hp236
+#usr/share/terminfo/h/hp2382
+#usr/share/terminfo/h/hp2382a
+#usr/share/terminfo/h/hp2392
+#usr/share/terminfo/h/hp2397
+#usr/share/terminfo/h/hp2397a
+#usr/share/terminfo/h/hp2621
+#usr/share/terminfo/h/hp2621-48
+#usr/share/terminfo/h/hp2621-a
+#usr/share/terminfo/h/hp2621-ba
+#usr/share/terminfo/h/hp2621-fl
+#usr/share/terminfo/h/hp2621-k45
+#usr/share/terminfo/h/hp2621-nl
+#usr/share/terminfo/h/hp2621-nt
+#usr/share/terminfo/h/hp2621-wl
+#usr/share/terminfo/h/hp2621A
+#usr/share/terminfo/h/hp2621a
+#usr/share/terminfo/h/hp2621a-a
+#usr/share/terminfo/h/hp2621b
+#usr/share/terminfo/h/hp2621b-kx
+#usr/share/terminfo/h/hp2621b-kx-p
+#usr/share/terminfo/h/hp2621b-p
+#usr/share/terminfo/h/hp2621k45
+#usr/share/terminfo/h/hp2621p
+#usr/share/terminfo/h/hp2621p-a
+#usr/share/terminfo/h/hp2622
+#usr/share/terminfo/h/hp2622a
+#usr/share/terminfo/h/hp2623
+#usr/share/terminfo/h/hp2623a
+#usr/share/terminfo/h/hp2624
+#usr/share/terminfo/h/hp2624-10p
+#usr/share/terminfo/h/hp2624a
+#usr/share/terminfo/h/hp2624a-10p
+#usr/share/terminfo/h/hp2624b
+#usr/share/terminfo/h/hp2624b-10p
+#usr/share/terminfo/h/hp2624b-10p-p
+#usr/share/terminfo/h/hp2624b-4p
+#usr/share/terminfo/h/hp2624b-4p-p
+#usr/share/terminfo/h/hp2624b-p
+#usr/share/terminfo/h/hp2626
+#usr/share/terminfo/h/hp2626-12
+#usr/share/terminfo/h/hp2626-12-s
+#usr/share/terminfo/h/hp2626-12x40
+#usr/share/terminfo/h/hp2626-ns
+#usr/share/terminfo/h/hp2626-s
+#usr/share/terminfo/h/hp2626-x40
+#usr/share/terminfo/h/hp2626a
+#usr/share/terminfo/h/hp2626p
+#usr/share/terminfo/h/hp2627a
+#usr/share/terminfo/h/hp2627a-rev
+#usr/share/terminfo/h/hp2627c
+#usr/share/terminfo/h/hp262x
+#usr/share/terminfo/h/hp2640a
+#usr/share/terminfo/h/hp2640b
+#usr/share/terminfo/h/hp2641a
+#usr/share/terminfo/h/hp2644a
+#usr/share/terminfo/h/hp2645
+#usr/share/terminfo/h/hp2645a
+#usr/share/terminfo/h/hp2647a
+#usr/share/terminfo/h/hp2648
+#usr/share/terminfo/h/hp2648a
+#usr/share/terminfo/h/hp300h
+#usr/share/terminfo/h/hp45
+#usr/share/terminfo/h/hp700
+#usr/share/terminfo/h/hp700-wy
+#usr/share/terminfo/h/hp70092
+#usr/share/terminfo/h/hp70092A
+#usr/share/terminfo/h/hp70092a
+#usr/share/terminfo/h/hp9837
+#usr/share/terminfo/h/hp9845
+#usr/share/terminfo/h/hp98550
+#usr/share/terminfo/h/hp98550a
+#usr/share/terminfo/h/hp98720
+#usr/share/terminfo/h/hp98721
+#usr/share/terminfo/h/hpansi
+#usr/share/terminfo/h/hpex
+#usr/share/terminfo/h/hpex2
+#usr/share/terminfo/h/hpgeneric
+#usr/share/terminfo/h/hpsub
+#usr/share/terminfo/h/hpterm
+#usr/share/terminfo/h/hpterm-color
+#usr/share/terminfo/h/htx11
+#usr/share/terminfo/h/hurd
+#usr/share/terminfo/h/hz1000
+#usr/share/terminfo/h/hz1420
+#usr/share/terminfo/h/hz1500
+#usr/share/terminfo/h/hz1510
+#usr/share/terminfo/h/hz1520
+#usr/share/terminfo/h/hz1520-noesc
+#usr/share/terminfo/h/hz1552
+#usr/share/terminfo/h/hz1552-rv
+#usr/share/terminfo/h/hz2000
+#usr/share/terminfo/i
+#usr/share/terminfo/i/i100
+#usr/share/terminfo/i/i3101
+#usr/share/terminfo/i/i3164
+#usr/share/terminfo/i/i400
+#usr/share/terminfo/i/iTerm.app
+#usr/share/terminfo/i/ibcs2
+#usr/share/terminfo/i/ibm+16color
+#usr/share/terminfo/i/ibm+color
+#usr/share/terminfo/i/ibm-apl
+#usr/share/terminfo/i/ibm-pc
+#usr/share/terminfo/i/ibm-system1
+#usr/share/terminfo/i/ibm3101
+#usr/share/terminfo/i/ibm3151
+#usr/share/terminfo/i/ibm3161
+#usr/share/terminfo/i/ibm3161-C
+#usr/share/terminfo/i/ibm3162
+#usr/share/terminfo/i/ibm3163
+#usr/share/terminfo/i/ibm3164
+#usr/share/terminfo/i/ibm327x
+#usr/share/terminfo/i/ibm5051
+#usr/share/terminfo/i/ibm5081
+#usr/share/terminfo/i/ibm5081-c
+#usr/share/terminfo/i/ibm5151
+#usr/share/terminfo/i/ibm5154
+#usr/share/terminfo/i/ibm5154-c
+#usr/share/terminfo/i/ibm6153
+#usr/share/terminfo/i/ibm6153-40
+#usr/share/terminfo/i/ibm6153-90
+#usr/share/terminfo/i/ibm6154
+#usr/share/terminfo/i/ibm6154-c
+#usr/share/terminfo/i/ibm6155
+#usr/share/terminfo/i/ibm8503
+#usr/share/terminfo/i/ibm8507
+#usr/share/terminfo/i/ibm8512
+#usr/share/terminfo/i/ibm8513
+#usr/share/terminfo/i/ibm8514
+#usr/share/terminfo/i/ibm8514-c
+#usr/share/terminfo/i/ibm8604
+#usr/share/terminfo/i/ibmaed
+#usr/share/terminfo/i/ibmapa16
+#usr/share/terminfo/i/ibmapa8
+#usr/share/terminfo/i/ibmapa8c
+#usr/share/terminfo/i/ibmapa8c-c
+#usr/share/terminfo/i/ibmega
+#usr/share/terminfo/i/ibmega-c
+#usr/share/terminfo/i/ibmmono
+#usr/share/terminfo/i/ibmmpel-c
+#usr/share/terminfo/i/ibmpc
+#usr/share/terminfo/i/ibmpc3
+#usr/share/terminfo/i/ibmpc3r
+#usr/share/terminfo/i/ibmpc3r-mono
+#usr/share/terminfo/i/ibmpcx
+#usr/share/terminfo/i/ibmvga
+#usr/share/terminfo/i/ibmvga-c
+#usr/share/terminfo/i/ibmx
+#usr/share/terminfo/i/icl6402
+#usr/share/terminfo/i/icl6404
+#usr/share/terminfo/i/icl6404-w
+#usr/share/terminfo/i/ifmr
+#usr/share/terminfo/i/ims-ansi
+#usr/share/terminfo/i/ims950
+#usr/share/terminfo/i/ims950-b
+#usr/share/terminfo/i/ims950-rv
+#usr/share/terminfo/i/infoton
+#usr/share/terminfo/i/interix
+#usr/share/terminfo/i/interix-nti
+#usr/share/terminfo/i/intertec
+#usr/share/terminfo/i/intertube
+#usr/share/terminfo/i/intertube2
+#usr/share/terminfo/i/intext
+#usr/share/terminfo/i/intext2
+#usr/share/terminfo/i/intextii
+#usr/share/terminfo/i/ips
+#usr/share/terminfo/i/ipsi
+#usr/share/terminfo/i/iq120
+#usr/share/terminfo/i/iq140
+#usr/share/terminfo/i/iris-ansi
+#usr/share/terminfo/i/iris-ansi-ap
+#usr/share/terminfo/i/iris-ansi-net
+#usr/share/terminfo/i/iris-color
+#usr/share/terminfo/i/iris40
+#usr/share/terminfo/j
+#usr/share/terminfo/j/jaixterm
+#usr/share/terminfo/j/jaixterm-m
+#usr/share/terminfo/j/jerq
+#usr/share/terminfo/j/jfbterm
+#usr/share/terminfo/k
+#usr/share/terminfo/k/k45
+#usr/share/terminfo/k/kaypro
+#usr/share/terminfo/k/kaypro2
+#usr/share/terminfo/k/kds6402
+#usr/share/terminfo/k/kds7372
+#usr/share/terminfo/k/kds7372-w
+#usr/share/terminfo/k/kermit
+#usr/share/terminfo/k/kermit-am
+#usr/share/terminfo/k/klone+acs
+#usr/share/terminfo/k/klone+color
+#usr/share/terminfo/k/klone+koi8acs
+#usr/share/terminfo/k/klone+sgr
+#usr/share/terminfo/k/klone+sgr-dumb
+#usr/share/terminfo/k/klone+sgr8
+#usr/share/terminfo/k/kon
+#usr/share/terminfo/k/kon2
+#usr/share/terminfo/k/konsole
+#usr/share/terminfo/k/konsole+pcfkeys
+#usr/share/terminfo/k/konsole-16color
+#usr/share/terminfo/k/konsole-256color
+#usr/share/terminfo/k/konsole-base
+#usr/share/terminfo/k/konsole-linux
+#usr/share/terminfo/k/konsole-solaris
+#usr/share/terminfo/k/konsole-vt100
+#usr/share/terminfo/k/konsole-vt420pc
+#usr/share/terminfo/k/konsole-xf3x
+#usr/share/terminfo/k/konsole-xf4x
+#usr/share/terminfo/k/kt7
+#usr/share/terminfo/k/kt7ix
+#usr/share/terminfo/k/kterm
+#usr/share/terminfo/k/kterm-co
+#usr/share/terminfo/k/kterm-color
+#usr/share/terminfo/k/ktm
+#usr/share/terminfo/k/kvt
+#usr/share/terminfo/l
+#usr/share/terminfo/l/la120
+#usr/share/terminfo/l/layer
+#usr/share/terminfo/l/lft
+#usr/share/terminfo/l/lft-pc850
+#usr/share/terminfo/l/linux
+#usr/share/terminfo/l/linux-16color
+#usr/share/terminfo/l/linux-basic
+#usr/share/terminfo/l/linux-c
+#usr/share/terminfo/l/linux-c-nc
+#usr/share/terminfo/l/linux-koi8
+#usr/share/terminfo/l/linux-koi8r
+#usr/share/terminfo/l/linux-lat
+#usr/share/terminfo/l/linux-m
+#usr/share/terminfo/l/linux-nic
+#usr/share/terminfo/l/linux-vt
+#usr/share/terminfo/l/linux2.6.26
+#usr/share/terminfo/l/lisa
+#usr/share/terminfo/l/lisaterm
+#usr/share/terminfo/l/lisaterm-w
+#usr/share/terminfo/l/liswb
+#usr/share/terminfo/l/ln03
+#usr/share/terminfo/l/ln03-w
+#usr/share/terminfo/l/lpr
+#usr/share/terminfo/l/luna
+#usr/share/terminfo/l/luna68k
+#usr/share/terminfo/m
+#usr/share/terminfo/m/m2-nam
+#usr/share/terminfo/m/mac
+#usr/share/terminfo/m/mac-w
+#usr/share/terminfo/m/mach
+#usr/share/terminfo/m/mach-bold
+#usr/share/terminfo/m/mach-color
+#usr/share/terminfo/m/macintosh
+#usr/share/terminfo/m/macterminal-w
+#usr/share/terminfo/m/mai
+#usr/share/terminfo/m/masscomp
+#usr/share/terminfo/m/masscomp1
+#usr/share/terminfo/m/masscomp2
+#usr/share/terminfo/m/mdl110
+#usr/share/terminfo/m/megatek
+#usr/share/terminfo/m/memhp
+#usr/share/terminfo/m/mgr
+#usr/share/terminfo/m/mgr-linux
+#usr/share/terminfo/m/mgr-sun
+#usr/share/terminfo/m/mgt
+#usr/share/terminfo/m/mgterm
+#usr/share/terminfo/m/microb
+#usr/share/terminfo/m/microbee
+#usr/share/terminfo/m/microterm
+#usr/share/terminfo/m/microterm5
+#usr/share/terminfo/m/mime
+#usr/share/terminfo/m/mime-3ax
+#usr/share/terminfo/m/mime-fb
+#usr/share/terminfo/m/mime-hb
+#usr/share/terminfo/m/mime1
+#usr/share/terminfo/m/mime2
+#usr/share/terminfo/m/mime2a
+#usr/share/terminfo/m/mime2a-s
+#usr/share/terminfo/m/mime2a-v
+#usr/share/terminfo/m/mime314
+#usr/share/terminfo/m/mime340
+#usr/share/terminfo/m/mime3a
+#usr/share/terminfo/m/mime3ax
+#usr/share/terminfo/m/mimei
+#usr/share/terminfo/m/mimeii
+#usr/share/terminfo/m/minitel
+#usr/share/terminfo/m/minitel-2
+#usr/share/terminfo/m/minitel-2-nam
+#usr/share/terminfo/m/minitel1
+#usr/share/terminfo/m/minitel1b
+#usr/share/terminfo/m/minitel1b-80
+#usr/share/terminfo/m/minix
+#usr/share/terminfo/m/minix-1.5
+#usr/share/terminfo/m/minix-1.7
+#usr/share/terminfo/m/minix-old
+#usr/share/terminfo/m/minix-old-am
+#usr/share/terminfo/m/mlterm
+#usr/share/terminfo/m/mlterm+pcfkeys
+#usr/share/terminfo/m/mlterm-256color
+#usr/share/terminfo/m/mm314
+#usr/share/terminfo/m/mm340
+#usr/share/terminfo/m/mod
+#usr/share/terminfo/m/mod24
+#usr/share/terminfo/m/modgraph
+#usr/share/terminfo/m/modgraph2
+#usr/share/terminfo/m/modgraph48
+#usr/share/terminfo/m/mono-emx
+#usr/share/terminfo/m/morphos
+#usr/share/terminfo/m/mouse-sun
+#usr/share/terminfo/m/mrxvt
+#usr/share/terminfo/m/mrxvt-256color
+#usr/share/terminfo/m/ms-vt-utf8
+#usr/share/terminfo/m/ms-vt100
+#usr/share/terminfo/m/ms-vt100+
+#usr/share/terminfo/m/ms-vt100-color
+#usr/share/terminfo/m/msk227
+#usr/share/terminfo/m/msk22714
+#usr/share/terminfo/m/msk227am
+#usr/share/terminfo/m/mskermit227
+#usr/share/terminfo/m/mskermit22714
+#usr/share/terminfo/m/mskermit227am
+#usr/share/terminfo/m/mt-70
+#usr/share/terminfo/m/mt4520-rv
+#usr/share/terminfo/m/mt70
+#usr/share/terminfo/m/mterm
+#usr/share/terminfo/m/mterm-ansi
+#usr/share/terminfo/m/mvterm
+#usr/share/terminfo/n
+#usr/share/terminfo/n/nansi.sys
+#usr/share/terminfo/n/nansi.sysk
+#usr/share/terminfo/n/nansisys
+#usr/share/terminfo/n/nansisysk
+#usr/share/terminfo/n/ncr160vppp
+#usr/share/terminfo/n/ncr160vpwpp
+#usr/share/terminfo/n/ncr160vt100an
+#usr/share/terminfo/n/ncr160vt100pp
+#usr/share/terminfo/n/ncr160vt100wan
+#usr/share/terminfo/n/ncr160vt100wpp
+#usr/share/terminfo/n/ncr160vt200an
+#usr/share/terminfo/n/ncr160vt200pp
+#usr/share/terminfo/n/ncr160vt200wan
+#usr/share/terminfo/n/ncr160vt200wpp
+#usr/share/terminfo/n/ncr160vt300an
+#usr/share/terminfo/n/ncr160vt300pp
+#usr/share/terminfo/n/ncr160vt300wan
+#usr/share/terminfo/n/ncr160vt300wpp
+#usr/share/terminfo/n/ncr160wy50+pp
+#usr/share/terminfo/n/ncr160wy50+wpp
+#usr/share/terminfo/n/ncr160wy60pp
+#usr/share/terminfo/n/ncr160wy60wpp
+#usr/share/terminfo/n/ncr260intan
+#usr/share/terminfo/n/ncr260intpp
+#usr/share/terminfo/n/ncr260intwan
+#usr/share/terminfo/n/ncr260intwpp
+#usr/share/terminfo/n/ncr260vppp
+#usr/share/terminfo/n/ncr260vpwpp
+#usr/share/terminfo/n/ncr260vt100an
+#usr/share/terminfo/n/ncr260vt100pp
+#usr/share/terminfo/n/ncr260vt100wan
+#usr/share/terminfo/n/ncr260vt100wpp
+#usr/share/terminfo/n/ncr260vt200an
+#usr/share/terminfo/n/ncr260vt200pp
+#usr/share/terminfo/n/ncr260vt200wan
+#usr/share/terminfo/n/ncr260vt200wpp
+#usr/share/terminfo/n/ncr260vt300an
+#usr/share/terminfo/n/ncr260vt300pp
+#usr/share/terminfo/n/ncr260vt300wan
+#usr/share/terminfo/n/ncr260vt300wpp
+#usr/share/terminfo/n/ncr260wy325pp
+#usr/share/terminfo/n/ncr260wy325wpp
+#usr/share/terminfo/n/ncr260wy350pp
+#usr/share/terminfo/n/ncr260wy350wpp
+#usr/share/terminfo/n/ncr260wy50+pp
+#usr/share/terminfo/n/ncr260wy50+wpp
+#usr/share/terminfo/n/ncr260wy60pp
+#usr/share/terminfo/n/ncr260wy60wpp
+#usr/share/terminfo/n/ncr7900
+#usr/share/terminfo/n/ncr7900i
+#usr/share/terminfo/n/ncr7900iv
+#usr/share/terminfo/n/ncr7901
+#usr/share/terminfo/n/ncrvt100an
+#usr/share/terminfo/n/ncrvt100pp
+#usr/share/terminfo/n/ncrvt100wan
+#usr/share/terminfo/n/ncrvt100wpp
+#usr/share/terminfo/n/ncsa
+#usr/share/terminfo/n/ncsa-m
+#usr/share/terminfo/n/ncsa-m-ns
+#usr/share/terminfo/n/ncsa-ns
+#usr/share/terminfo/n/ncsa-vt220
+#usr/share/terminfo/n/ncsa-vt220-8
+#usr/share/terminfo/n/nd9500
+#usr/share/terminfo/n/ndr9500
+#usr/share/terminfo/n/ndr9500-25
+#usr/share/terminfo/n/ndr9500-25-mc
+#usr/share/terminfo/n/ndr9500-25-mc-nl
+#usr/share/terminfo/n/ndr9500-25-nl
+#usr/share/terminfo/n/ndr9500-mc
+#usr/share/terminfo/n/ndr9500-mc-nl
+#usr/share/terminfo/n/ndr9500-nl
+#usr/share/terminfo/n/nec
+#usr/share/terminfo/n/nec5520
+#usr/share/terminfo/n/newhp
+#usr/share/terminfo/n/newhpkeyboard
+#usr/share/terminfo/n/news
+#usr/share/terminfo/n/news-29
+#usr/share/terminfo/n/news-29-euc
+#usr/share/terminfo/n/news-29-sjis
+#usr/share/terminfo/n/news-33
+#usr/share/terminfo/n/news-33-euc
+#usr/share/terminfo/n/news-33-sjis
+#usr/share/terminfo/n/news-42
+#usr/share/terminfo/n/news-42-euc
+#usr/share/terminfo/n/news-42-sjis
+#usr/share/terminfo/n/news-a
+#usr/share/terminfo/n/news-o
+#usr/share/terminfo/n/news-old-unk
+#usr/share/terminfo/n/news-unk
+#usr/share/terminfo/n/news28
+#usr/share/terminfo/n/news28-a
+#usr/share/terminfo/n/news29
+#usr/share/terminfo/n/news31
+#usr/share/terminfo/n/news31-a
+#usr/share/terminfo/n/news31-o
+#usr/share/terminfo/n/news33
+#usr/share/terminfo/n/news40
+#usr/share/terminfo/n/news40-a
+#usr/share/terminfo/n/news40-o
+#usr/share/terminfo/n/news42
+#usr/share/terminfo/n/newscbm
+#usr/share/terminfo/n/newscbm-a
+#usr/share/terminfo/n/newscbm-o
+#usr/share/terminfo/n/newscbm33
+#usr/share/terminfo/n/next
+#usr/share/terminfo/n/nextshell
+#usr/share/terminfo/n/northstar
+#usr/share/terminfo/n/nsterm
+#usr/share/terminfo/n/nsterm+7
+#usr/share/terminfo/n/nsterm+acs
+#usr/share/terminfo/n/nsterm+c
+#usr/share/terminfo/n/nsterm+c41
+#usr/share/terminfo/n/nsterm+mac
+#usr/share/terminfo/n/nsterm+s
+#usr/share/terminfo/n/nsterm-16color
+#usr/share/terminfo/n/nsterm-7
+#usr/share/terminfo/n/nsterm-7-c
+#usr/share/terminfo/n/nsterm-7-c-s
+#usr/share/terminfo/n/nsterm-7-m
+#usr/share/terminfo/n/nsterm-7-m-s
+#usr/share/terminfo/n/nsterm-7-s
+#usr/share/terminfo/n/nsterm-acs
+#usr/share/terminfo/n/nsterm-acs-c
+#usr/share/terminfo/n/nsterm-acs-c-s
+#usr/share/terminfo/n/nsterm-acs-m
+#usr/share/terminfo/n/nsterm-acs-m-s
+#usr/share/terminfo/n/nsterm-acs-s
+#usr/share/terminfo/n/nsterm-bce
+#usr/share/terminfo/n/nsterm-c
+#usr/share/terminfo/n/nsterm-c-7
+#usr/share/terminfo/n/nsterm-c-acs
+#usr/share/terminfo/n/nsterm-c-s
+#usr/share/terminfo/n/nsterm-c-s-7
+#usr/share/terminfo/n/nsterm-c-s-acs
+#usr/share/terminfo/n/nsterm-m
+#usr/share/terminfo/n/nsterm-m-7
+#usr/share/terminfo/n/nsterm-m-acs
+#usr/share/terminfo/n/nsterm-m-s
+#usr/share/terminfo/n/nsterm-m-s-7
+#usr/share/terminfo/n/nsterm-m-s-acs
+#usr/share/terminfo/n/nsterm-old
+#usr/share/terminfo/n/nsterm-s
+#usr/share/terminfo/n/nsterm-s-7
+#usr/share/terminfo/n/nsterm-s-acs
+#usr/share/terminfo/n/ntconsole
+#usr/share/terminfo/n/ntconsole-100
+#usr/share/terminfo/n/ntconsole-100-nti
+#usr/share/terminfo/n/ntconsole-25
+#usr/share/terminfo/n/ntconsole-25-nti
+#usr/share/terminfo/n/ntconsole-25-w
+#usr/share/terminfo/n/ntconsole-25-w-vt
+#usr/share/terminfo/n/ntconsole-35
+#usr/share/terminfo/n/ntconsole-35-nti
+#usr/share/terminfo/n/ntconsole-35-w
+#usr/share/terminfo/n/ntconsole-50
+#usr/share/terminfo/n/ntconsole-50-nti
+#usr/share/terminfo/n/ntconsole-50-w
+#usr/share/terminfo/n/ntconsole-60
+#usr/share/terminfo/n/ntconsole-60-nti
+#usr/share/terminfo/n/ntconsole-60-w
+#usr/share/terminfo/n/ntconsole-w
+#usr/share/terminfo/n/ntconsole-w-vt
+#usr/share/terminfo/n/nwe501
+#usr/share/terminfo/n/nwe501-a
+#usr/share/terminfo/n/nwe501-o
+#usr/share/terminfo/n/nwp-511
+#usr/share/terminfo/n/nwp-517
+#usr/share/terminfo/n/nwp-517-w
+#usr/share/terminfo/n/nwp251-a
+#usr/share/terminfo/n/nwp251-o
+#usr/share/terminfo/n/nwp511
+#usr/share/terminfo/n/nwp512
+#usr/share/terminfo/n/nwp512-a
+#usr/share/terminfo/n/nwp512-o
+#usr/share/terminfo/n/nwp513
+#usr/share/terminfo/n/nwp513-a
+#usr/share/terminfo/n/nwp513-o
+#usr/share/terminfo/n/nwp514
+#usr/share/terminfo/n/nwp514-a
+#usr/share/terminfo/n/nwp514-o
+#usr/share/terminfo/n/nwp517
+#usr/share/terminfo/n/nwp517-w
+#usr/share/terminfo/n/nwp518
+#usr/share/terminfo/n/nwp518-a
+#usr/share/terminfo/n/nwp518-o
+#usr/share/terminfo/n/nxterm
+#usr/share/terminfo/o
+#usr/share/terminfo/o/o31
+#usr/share/terminfo/o/o4112-nd
+#usr/share/terminfo/o/o85h
+#usr/share/terminfo/o/oabm85h
+#usr/share/terminfo/o/oblit
+#usr/share/terminfo/o/oc100
+#usr/share/terminfo/o/oconcept
+#usr/share/terminfo/o/ofcons
+#usr/share/terminfo/o/ojerq
+#usr/share/terminfo/o/oldibmpc3
+#usr/share/terminfo/o/oldpc3
+#usr/share/terminfo/o/oldsun
+#usr/share/terminfo/o/omron
+#usr/share/terminfo/o/opennt
+#usr/share/terminfo/o/opennt-100
+#usr/share/terminfo/o/opennt-100-nti
+#usr/share/terminfo/o/opennt-25
+#usr/share/terminfo/o/opennt-25-nti
+#usr/share/terminfo/o/opennt-25-w
+#usr/share/terminfo/o/opennt-25-w-vt
+#usr/share/terminfo/o/opennt-35
+#usr/share/terminfo/o/opennt-35-nti
+#usr/share/terminfo/o/opennt-35-w
+#usr/share/terminfo/o/opennt-50
+#usr/share/terminfo/o/opennt-50-nti
+#usr/share/terminfo/o/opennt-50-w
+#usr/share/terminfo/o/opennt-60
+#usr/share/terminfo/o/opennt-60-nti
+#usr/share/terminfo/o/opennt-60-w
+#usr/share/terminfo/o/opennt-nti
+#usr/share/terminfo/o/opennt-w
+#usr/share/terminfo/o/opennt-w-vt
+#usr/share/terminfo/o/opus3n1+
+#usr/share/terminfo/o/origibmpc3
+#usr/share/terminfo/o/origpc3
+#usr/share/terminfo/o/os9LII
+#usr/share/terminfo/o/osborne
+#usr/share/terminfo/o/osborne-w
+#usr/share/terminfo/o/osborne1
+#usr/share/terminfo/o/osborne1-w
+#usr/share/terminfo/o/osexec
+#usr/share/terminfo/o/otek4112
+#usr/share/terminfo/o/otek4113
+#usr/share/terminfo/o/otek4114
+#usr/share/terminfo/o/otek4115
+#usr/share/terminfo/o/owl
+#usr/share/terminfo/p
+#usr/share/terminfo/p/p12
+#usr/share/terminfo/p/p12-m
+#usr/share/terminfo/p/p12-m-w
+#usr/share/terminfo/p/p12-w
+#usr/share/terminfo/p/p14
+#usr/share/terminfo/p/p14-m
+#usr/share/terminfo/p/p14-m-w
+#usr/share/terminfo/p/p14-w
+#usr/share/terminfo/p/p19
+#usr/share/terminfo/p/p4
+#usr/share/terminfo/p/p5
+#usr/share/terminfo/p/p7
+#usr/share/terminfo/p/p8
+#usr/share/terminfo/p/p8-w
+#usr/share/terminfo/p/p8gl
+#usr/share/terminfo/p/p9
+#usr/share/terminfo/p/p9-8
+#usr/share/terminfo/p/p9-8-w
+#usr/share/terminfo/p/p9-w
+#usr/share/terminfo/p/pc-coherent
+#usr/share/terminfo/p/pc-minix
+#usr/share/terminfo/p/pc-venix
+#usr/share/terminfo/p/pc3
+#usr/share/terminfo/p/pc3-bold
+#usr/share/terminfo/p/pc3r
+#usr/share/terminfo/p/pc3r-m
+#usr/share/terminfo/p/pc6300plus
+#usr/share/terminfo/p/pc7300
+#usr/share/terminfo/p/pcansi
+#usr/share/terminfo/p/pcansi-25
+#usr/share/terminfo/p/pcansi-25-m
+#usr/share/terminfo/p/pcansi-33
+#usr/share/terminfo/p/pcansi-33-m
+#usr/share/terminfo/p/pcansi-43
+#usr/share/terminfo/p/pcansi-43-m
+#usr/share/terminfo/p/pcansi-m
+#usr/share/terminfo/p/pcansi-mono
+#usr/share/terminfo/p/pcansi25
+#usr/share/terminfo/p/pcansi25m
+#usr/share/terminfo/p/pcansi33
+#usr/share/terminfo/p/pcansi33m
+#usr/share/terminfo/p/pcansi43
+#usr/share/terminfo/p/pccons
+#usr/share/terminfo/p/pcconsole
+#usr/share/terminfo/p/pcix
+#usr/share/terminfo/p/pckermit
+#usr/share/terminfo/p/pckermit12
+#usr/share/terminfo/p/pckermit120
+#usr/share/terminfo/p/pcmw
+#usr/share/terminfo/p/pcplot
+#usr/share/terminfo/p/pcvt25
+#usr/share/terminfo/p/pcvt25-color
+#usr/share/terminfo/p/pcvt25w
+#usr/share/terminfo/p/pcvt28
+#usr/share/terminfo/p/pcvt28w
+#usr/share/terminfo/p/pcvt35
+#usr/share/terminfo/p/pcvt35w
+#usr/share/terminfo/p/pcvt40
+#usr/share/terminfo/p/pcvt40w
+#usr/share/terminfo/p/pcvt43
+#usr/share/terminfo/p/pcvt43w
+#usr/share/terminfo/p/pcvt50
+#usr/share/terminfo/p/pcvt50w
+#usr/share/terminfo/p/pcvtXX
+#usr/share/terminfo/p/pcz19
+#usr/share/terminfo/p/pe1100
+#usr/share/terminfo/p/pe1200
+#usr/share/terminfo/p/pe1251
+#usr/share/terminfo/p/pe550
+#usr/share/terminfo/p/pe6100
+#usr/share/terminfo/p/pe6300
+#usr/share/terminfo/p/pe6312
+#usr/share/terminfo/p/pe7000c
+#usr/share/terminfo/p/pe7000m
+#usr/share/terminfo/p/pilot
+#usr/share/terminfo/p/pmcons
+#usr/share/terminfo/p/pmconsole
+#usr/share/terminfo/p/printer
+#usr/share/terminfo/p/prism12
+#usr/share/terminfo/p/prism12-m
+#usr/share/terminfo/p/prism12-m-w
+#usr/share/terminfo/p/prism12-w
+#usr/share/terminfo/p/prism14
+#usr/share/terminfo/p/prism14-m
+#usr/share/terminfo/p/prism14-m-w
+#usr/share/terminfo/p/prism14-w
+#usr/share/terminfo/p/prism2
+#usr/share/terminfo/p/prism4
+#usr/share/terminfo/p/prism5
+#usr/share/terminfo/p/prism7
+#usr/share/terminfo/p/prism8
+#usr/share/terminfo/p/prism8-w
+#usr/share/terminfo/p/prism8gl
+#usr/share/terminfo/p/prism9
+#usr/share/terminfo/p/prism9-8
+#usr/share/terminfo/p/prism9-8-w
+#usr/share/terminfo/p/prism9-w
+#usr/share/terminfo/p/pro350
+#usr/share/terminfo/p/ps300
+#usr/share/terminfo/p/psterm
+#usr/share/terminfo/p/psterm-80x24
+#usr/share/terminfo/p/psterm-90x28
+#usr/share/terminfo/p/psterm-96x48
+#usr/share/terminfo/p/psterm-basic
+#usr/share/terminfo/p/psterm-fast
+#usr/share/terminfo/p/psx_ansi
+#usr/share/terminfo/p/pt100
+#usr/share/terminfo/p/pt100w
+#usr/share/terminfo/p/pt200
+#usr/share/terminfo/p/pt200w
+#usr/share/terminfo/p/pt210
+#usr/share/terminfo/p/pt250
+#usr/share/terminfo/p/pt250w
+#usr/share/terminfo/p/pt505
+#usr/share/terminfo/p/pt505-22
+#usr/share/terminfo/p/pt505-24
+#usr/share/terminfo/p/pty
+#usr/share/terminfo/p/putty
+#usr/share/terminfo/p/putty-256color
+#usr/share/terminfo/p/putty-vt100
+#usr/share/terminfo/q
+#usr/share/terminfo/q/qansi
+#usr/share/terminfo/q/qansi-g
+#usr/share/terminfo/q/qansi-m
+#usr/share/terminfo/q/qansi-t
+#usr/share/terminfo/q/qansi-w
+#usr/share/terminfo/q/qdcons
+#usr/share/terminfo/q/qdss
+#usr/share/terminfo/q/qnx
+#usr/share/terminfo/q/qnx4
+#usr/share/terminfo/q/qnxm
+#usr/share/terminfo/q/qnxt
+#usr/share/terminfo/q/qnxt2
+#usr/share/terminfo/q/qnxt4
+#usr/share/terminfo/q/qnxtmono
+#usr/share/terminfo/q/qnxw
+#usr/share/terminfo/q/qume
+#usr/share/terminfo/q/qume5
+#usr/share/terminfo/q/qvt101
+#usr/share/terminfo/q/qvt101+
+#usr/share/terminfo/q/qvt101p
+#usr/share/terminfo/q/qvt102
+#usr/share/terminfo/q/qvt103
+#usr/share/terminfo/q/qvt103-w
+#usr/share/terminfo/q/qvt108
+#usr/share/terminfo/q/qvt119
+#usr/share/terminfo/q/qvt119+
+#usr/share/terminfo/q/qvt119+-25
+#usr/share/terminfo/q/qvt119+-25-w
+#usr/share/terminfo/q/qvt119+-w
+#usr/share/terminfo/q/qvt119-25-w
+#usr/share/terminfo/q/qvt119-w
+#usr/share/terminfo/q/qvt119p
+#usr/share/terminfo/q/qvt119p-25
+#usr/share/terminfo/q/qvt119p-25-w
+#usr/share/terminfo/q/qvt119p-w
+#usr/share/terminfo/q/qvt203
+#usr/share/terminfo/q/qvt203+
+#usr/share/terminfo/q/qvt203-25
+#usr/share/terminfo/q/qvt203-25-w
+#usr/share/terminfo/q/qvt203-w
+#usr/share/terminfo/q/qvt203-w-am
+#usr/share/terminfo/r
+#usr/share/terminfo/r/rbcomm
+#usr/share/terminfo/r/rbcomm-nam
+#usr/share/terminfo/r/rbcomm-w
+#usr/share/terminfo/r/rca
+#usr/share/terminfo/r/rcons
+#usr/share/terminfo/r/rcons-color
+#usr/share/terminfo/r/rebus3180
+#usr/share/terminfo/r/regent
+#usr/share/terminfo/r/regent100
+#usr/share/terminfo/r/regent20
+#usr/share/terminfo/r/regent200
+#usr/share/terminfo/r/regent25
+#usr/share/terminfo/r/regent40
+#usr/share/terminfo/r/regent40+
+#usr/share/terminfo/r/regent60
+#usr/share/terminfo/r/rt6221
+#usr/share/terminfo/r/rt6221-w
+#usr/share/terminfo/r/rtpc
+#usr/share/terminfo/r/rxvt
+#usr/share/terminfo/r/rxvt+pcfkeys
+#usr/share/terminfo/r/rxvt-16color
+#usr/share/terminfo/r/rxvt-256color
+#usr/share/terminfo/r/rxvt-88color
+#usr/share/terminfo/r/rxvt-basic
+#usr/share/terminfo/r/rxvt-color
+#usr/share/terminfo/r/rxvt-cygwin
+#usr/share/terminfo/r/rxvt-cygwin-native
+#usr/share/terminfo/r/rxvt-xpm
+#usr/share/terminfo/s
+#usr/share/terminfo/s/s4
+#usr/share/terminfo/s/sb1
+#usr/share/terminfo/s/sb2
+#usr/share/terminfo/s/sb3
+#usr/share/terminfo/s/sbi
+#usr/share/terminfo/s/sbobcat
+#usr/share/terminfo/s/sc410
+#usr/share/terminfo/s/sc415
+#usr/share/terminfo/s/scanset
+#usr/share/terminfo/s/scoansi
+#usr/share/terminfo/s/scoansi-new
+#usr/share/terminfo/s/scoansi-old
+#usr/share/terminfo/s/screen
+#usr/share/terminfo/s/screen+fkeys
+#usr/share/terminfo/s/screen-16color
+#usr/share/terminfo/s/screen-16color-bce
+#usr/share/terminfo/s/screen-16color-bce-s
+#usr/share/terminfo/s/screen-16color-s
+#usr/share/terminfo/s/screen-256color
+#usr/share/terminfo/s/screen-256color-bce
+#usr/share/terminfo/s/screen-256color-bce-s
+#usr/share/terminfo/s/screen-256color-s
+#usr/share/terminfo/s/screen-bce
+#usr/share/terminfo/s/screen-bce.Eterm
+#usr/share/terminfo/s/screen-bce.gnome
+#usr/share/terminfo/s/screen-bce.konsole
+#usr/share/terminfo/s/screen-bce.linux
+#usr/share/terminfo/s/screen-bce.mlterm
+#usr/share/terminfo/s/screen-bce.mrxvt
+#usr/share/terminfo/s/screen-bce.rxvt
+#usr/share/terminfo/s/screen-bce.xterm-new
+#usr/share/terminfo/s/screen-s
+#usr/share/terminfo/s/screen-w
+#usr/share/terminfo/s/screen.Eterm
+#usr/share/terminfo/s/screen.gnome
+#usr/share/terminfo/s/screen.konsole
+#usr/share/terminfo/s/screen.linux
+#usr/share/terminfo/s/screen.mlterm
+#usr/share/terminfo/s/screen.mrxvt
+#usr/share/terminfo/s/screen.rxvt
+#usr/share/terminfo/s/screen.teraterm
+#usr/share/terminfo/s/screen.vte
+#usr/share/terminfo/s/screen.xterm-new
+#usr/share/terminfo/s/screen.xterm-r6
+#usr/share/terminfo/s/screen.xterm-xfree86
+#usr/share/terminfo/s/screen2
+#usr/share/terminfo/s/screen3
+#usr/share/terminfo/s/screwpoint
+#usr/share/terminfo/s/scrhp
+#usr/share/terminfo/s/sibo
+#usr/share/terminfo/s/simterm
+#usr/share/terminfo/s/soroc
+#usr/share/terminfo/s/soroc120
+#usr/share/terminfo/s/soroc140
+#usr/share/terminfo/s/spinwriter
+#usr/share/terminfo/s/st52
+#usr/share/terminfo/s/st52-color
+#usr/share/terminfo/s/st52-m
+#usr/share/terminfo/s/st52-old
+#usr/share/terminfo/s/stv52
+#usr/share/terminfo/s/stv52pc
+#usr/share/terminfo/s/sun
+#usr/share/terminfo/s/sun-1
+#usr/share/terminfo/s/sun-12
+#usr/share/terminfo/s/sun-17
+#usr/share/terminfo/s/sun-24
+#usr/share/terminfo/s/sun-34
+#usr/share/terminfo/s/sun-48
+#usr/share/terminfo/s/sun-c
+#usr/share/terminfo/s/sun-cgsix
+#usr/share/terminfo/s/sun-cmd
+#usr/share/terminfo/s/sun-color
+#usr/share/terminfo/s/sun-e
+#usr/share/terminfo/s/sun-e-s
+#usr/share/terminfo/s/sun-il
+#usr/share/terminfo/s/sun-nic
+#usr/share/terminfo/s/sun-s
+#usr/share/terminfo/s/sun-s-e
+#usr/share/terminfo/s/sun-ss5
+#usr/share/terminfo/s/sun-type4
+#usr/share/terminfo/s/sun1
+#usr/share/terminfo/s/sun2
+#usr/share/terminfo/s/sune
+#usr/share/terminfo/s/superbee
+#usr/share/terminfo/s/superbee-xsb
+#usr/share/terminfo/s/superbeeic
+#usr/share/terminfo/s/superbrain
+#usr/share/terminfo/s/sv80
+#usr/share/terminfo/s/swtp
+#usr/share/terminfo/s/synertek
+#usr/share/terminfo/s/synertek380
+#usr/share/terminfo/s/system1
+#usr/share/terminfo/t
+#usr/share/terminfo/t/t10
+#usr/share/terminfo/t/t1061
+#usr/share/terminfo/t/t1061f
+#usr/share/terminfo/t/t16
+#usr/share/terminfo/t/t3700
+#usr/share/terminfo/t/t3800
+#usr/share/terminfo/t/t653x
+#usr/share/terminfo/t/tab
+#usr/share/terminfo/t/tab132
+#usr/share/terminfo/t/tab132-15
+#usr/share/terminfo/t/tab132-rv
+#usr/share/terminfo/t/tab132-w
+#usr/share/terminfo/t/tab132-w-rv
+#usr/share/terminfo/t/tandem6510
+#usr/share/terminfo/t/tandem653
+#usr/share/terminfo/t/tek
+#usr/share/terminfo/t/tek4012
+#usr/share/terminfo/t/tek4013
+#usr/share/terminfo/t/tek4014
+#usr/share/terminfo/t/tek4014-sm
+#usr/share/terminfo/t/tek4015
+#usr/share/terminfo/t/tek4015-sm
+#usr/share/terminfo/t/tek4023
+#usr/share/terminfo/t/tek4024
+#usr/share/terminfo/t/tek4025
+#usr/share/terminfo/t/tek4025-17
+#usr/share/terminfo/t/tek4025-17-ws
+#usr/share/terminfo/t/tek4025-cr
+#usr/share/terminfo/t/tek4025-ex
+#usr/share/terminfo/t/tek4025a
+#usr/share/terminfo/t/tek4025ex
+#usr/share/terminfo/t/tek4027
+#usr/share/terminfo/t/tek4027-ex
+#usr/share/terminfo/t/tek4105
+#usr/share/terminfo/t/tek4105-30
+#usr/share/terminfo/t/tek4105a
+#usr/share/terminfo/t/tek4106brl
+#usr/share/terminfo/t/tek4107
+#usr/share/terminfo/t/tek4107brl
+#usr/share/terminfo/t/tek4109
+#usr/share/terminfo/t/tek4109brl
+#usr/share/terminfo/t/tek4112
+#usr/share/terminfo/t/tek4112-5
+#usr/share/terminfo/t/tek4112-nd
+#usr/share/terminfo/t/tek4113
+#usr/share/terminfo/t/tek4113-34
+#usr/share/terminfo/t/tek4113-nd
+#usr/share/terminfo/t/tek4114
+#usr/share/terminfo/t/tek4115
+#usr/share/terminfo/t/tek4125
+#usr/share/terminfo/t/tek4205
+#usr/share/terminfo/t/tek4207
+#usr/share/terminfo/t/tek4207-s
+#usr/share/terminfo/t/tek4404
+#usr/share/terminfo/t/teleray
+#usr/share/terminfo/t/teletec
+#usr/share/terminfo/t/teraterm
+#usr/share/terminfo/t/teraterm2.3
+#usr/share/terminfo/t/teraterm4.59
+#usr/share/terminfo/t/terminet
+#usr/share/terminfo/t/terminet1200
+#usr/share/terminfo/t/terminet300
+#usr/share/terminfo/t/tgtelnet
+#usr/share/terminfo/t/ti700
+#usr/share/terminfo/t/ti733
+#usr/share/terminfo/t/ti735
+#usr/share/terminfo/t/ti745
+#usr/share/terminfo/t/ti800
+#usr/share/terminfo/t/ti916
+#usr/share/terminfo/t/ti916-132
+#usr/share/terminfo/t/ti916-220-7
+#usr/share/terminfo/t/ti916-220-8
+#usr/share/terminfo/t/ti916-8
+#usr/share/terminfo/t/ti916-8-132
+#usr/share/terminfo/t/ti924
+#usr/share/terminfo/t/ti924-8
+#usr/share/terminfo/t/ti924-8w
+#usr/share/terminfo/t/ti924w
+#usr/share/terminfo/t/ti926
+#usr/share/terminfo/t/ti926-8
+#usr/share/terminfo/t/ti928
+#usr/share/terminfo/t/ti928-8
+#usr/share/terminfo/t/ti931
+#usr/share/terminfo/t/ti_ansi
+#usr/share/terminfo/t/tkterm
+#usr/share/terminfo/t/tn1200
+#usr/share/terminfo/t/tn300
+#usr/share/terminfo/t/trs16
+#usr/share/terminfo/t/trs2
+#usr/share/terminfo/t/trs80II
+#usr/share/terminfo/t/trsII
+#usr/share/terminfo/t/ts-1
+#usr/share/terminfo/t/ts-1p
+#usr/share/terminfo/t/ts1
+#usr/share/terminfo/t/ts100
+#usr/share/terminfo/t/ts100-ctxt
+#usr/share/terminfo/t/ts100-sp
+#usr/share/terminfo/t/ts1p
+#usr/share/terminfo/t/tt
+#usr/share/terminfo/t/tt505-22
+#usr/share/terminfo/t/tt52
+#usr/share/terminfo/t/tty33
+#usr/share/terminfo/t/tty35
+#usr/share/terminfo/t/tty37
+#usr/share/terminfo/t/tty40
+#usr/share/terminfo/t/tty43
+#usr/share/terminfo/t/tty4420
+#usr/share/terminfo/t/tty4424
+#usr/share/terminfo/t/tty4424-1
+#usr/share/terminfo/t/tty4424m
+#usr/share/terminfo/t/tty4426
+#usr/share/terminfo/t/tty5410
+#usr/share/terminfo/t/tty5410-w
+#usr/share/terminfo/t/tty5410v1
+#usr/share/terminfo/t/tty5410v1-w
+#usr/share/terminfo/t/tty5420
+#usr/share/terminfo/t/tty5420+nl
+#usr/share/terminfo/t/tty5420-nl
+#usr/share/terminfo/t/tty5420-rv
+#usr/share/terminfo/t/tty5420-rv-nl
+#usr/share/terminfo/t/tty5420-w
+#usr/share/terminfo/t/tty5420-w-nl
+#usr/share/terminfo/t/tty5420-w-rv
+#usr/share/terminfo/t/tty5420-w-rv-n
+#usr/share/terminfo/t/tty5425
+#usr/share/terminfo/t/tty5425-nl
+#usr/share/terminfo/t/tty5425-w
+#usr/share/terminfo/t/tty5620
+#usr/share/terminfo/t/tty5620-1
+#usr/share/terminfo/t/tty5620-24
+#usr/share/terminfo/t/tty5620-34
+#usr/share/terminfo/t/tty5620-s
+#usr/share/terminfo/t/ttydmd
+#usr/share/terminfo/t/tvi803
+#usr/share/terminfo/t/tvi9065
+#usr/share/terminfo/t/tvi910
+#usr/share/terminfo/t/tvi910+
+#usr/share/terminfo/t/tvi912
+#usr/share/terminfo/t/tvi912b
+#usr/share/terminfo/t/tvi912b+2p
+#usr/share/terminfo/t/tvi912b+dim
+#usr/share/terminfo/t/tvi912b+mc
+#usr/share/terminfo/t/tvi912b+printer
+#usr/share/terminfo/t/tvi912b+vb
+#usr/share/terminfo/t/tvi912b-2p
+#usr/share/terminfo/t/tvi912b-2p-mc
+#usr/share/terminfo/t/tvi912b-2p-p
+#usr/share/terminfo/t/tvi912b-2p-unk
+#usr/share/terminfo/t/tvi912b-mc
+#usr/share/terminfo/t/tvi912b-mc-2p
+#usr/share/terminfo/t/tvi912b-mc-vb
+#usr/share/terminfo/t/tvi912b-p
+#usr/share/terminfo/t/tvi912b-p-2p
+#usr/share/terminfo/t/tvi912b-p-vb
+#usr/share/terminfo/t/tvi912b-unk
+#usr/share/terminfo/t/tvi912b-unk-2p
+#usr/share/terminfo/t/tvi912b-unk-vb
+#usr/share/terminfo/t/tvi912b-vb
+#usr/share/terminfo/t/tvi912b-vb-mc
+#usr/share/terminfo/t/tvi912b-vb-p
+#usr/share/terminfo/t/tvi912b-vb-unk
+#usr/share/terminfo/t/tvi912c
+#usr/share/terminfo/t/tvi912c-2p
+#usr/share/terminfo/t/tvi912c-2p-mc
+#usr/share/terminfo/t/tvi912c-2p-p
+#usr/share/terminfo/t/tvi912c-2p-unk
+#usr/share/terminfo/t/tvi912c-mc
+#usr/share/terminfo/t/tvi912c-mc-2p
+#usr/share/terminfo/t/tvi912c-mc-vb
+#usr/share/terminfo/t/tvi912c-p
+#usr/share/terminfo/t/tvi912c-p-2p
+#usr/share/terminfo/t/tvi912c-p-vb
+#usr/share/terminfo/t/tvi912c-unk
+#usr/share/terminfo/t/tvi912c-unk-2p
+#usr/share/terminfo/t/tvi912c-unk-vb
+#usr/share/terminfo/t/tvi912c-vb
+#usr/share/terminfo/t/tvi912c-vb-mc
+#usr/share/terminfo/t/tvi912c-vb-p
+#usr/share/terminfo/t/tvi912c-vb-unk
+#usr/share/terminfo/t/tvi912cc
+#usr/share/terminfo/t/tvi914
+#usr/share/terminfo/t/tvi920
+#usr/share/terminfo/t/tvi920b
+#usr/share/terminfo/t/tvi920b+fn
+#usr/share/terminfo/t/tvi920b-2p
+#usr/share/terminfo/t/tvi920b-2p-mc
+#usr/share/terminfo/t/tvi920b-2p-p
+#usr/share/terminfo/t/tvi920b-2p-unk
+#usr/share/terminfo/t/tvi920b-mc
+#usr/share/terminfo/t/tvi920b-mc-2p
+#usr/share/terminfo/t/tvi920b-mc-vb
+#usr/share/terminfo/t/tvi920b-p
+#usr/share/terminfo/t/tvi920b-p-2p
+#usr/share/terminfo/t/tvi920b-p-vb
+#usr/share/terminfo/t/tvi920b-unk
+#usr/share/terminfo/t/tvi920b-unk-2p
+#usr/share/terminfo/t/tvi920b-unk-vb
+#usr/share/terminfo/t/tvi920b-vb
+#usr/share/terminfo/t/tvi920b-vb-mc
+#usr/share/terminfo/t/tvi920b-vb-p
+#usr/share/terminfo/t/tvi920b-vb-unk
+#usr/share/terminfo/t/tvi920c
+#usr/share/terminfo/t/tvi920c-2p
+#usr/share/terminfo/t/tvi920c-2p-mc
+#usr/share/terminfo/t/tvi920c-2p-p
+#usr/share/terminfo/t/tvi920c-2p-unk
+#usr/share/terminfo/t/tvi920c-mc
+#usr/share/terminfo/t/tvi920c-mc-2p
+#usr/share/terminfo/t/tvi920c-mc-vb
+#usr/share/terminfo/t/tvi920c-p
+#usr/share/terminfo/t/tvi920c-p-2p
+#usr/share/terminfo/t/tvi920c-p-vb
+#usr/share/terminfo/t/tvi920c-unk
+#usr/share/terminfo/t/tvi920c-unk-2p
+#usr/share/terminfo/t/tvi920c-unk-vb
+#usr/share/terminfo/t/tvi920c-vb
+#usr/share/terminfo/t/tvi920c-vb-mc
+#usr/share/terminfo/t/tvi920c-vb-p
+#usr/share/terminfo/t/tvi920c-vb-unk
+#usr/share/terminfo/t/tvi921
+#usr/share/terminfo/t/tvi924
+#usr/share/terminfo/t/tvi925
+#usr/share/terminfo/t/tvi925-hi
+#usr/share/terminfo/t/tvi92B
+#usr/share/terminfo/t/tvi92D
+#usr/share/terminfo/t/tvi950
+#usr/share/terminfo/t/tvi950-2p
+#usr/share/terminfo/t/tvi950-4p
+#usr/share/terminfo/t/tvi950-rv
+#usr/share/terminfo/t/tvi950-rv-2p
+#usr/share/terminfo/t/tvi950-rv-4p
+#usr/share/terminfo/t/tvi955
+#usr/share/terminfo/t/tvi955-hb
+#usr/share/terminfo/t/tvi955-w
+#usr/share/terminfo/t/tvi970
+#usr/share/terminfo/t/tvi970-2p
+#usr/share/terminfo/t/tvi970-vb
+#usr/share/terminfo/t/tvipt
+#usr/share/terminfo/t/tw100
+#usr/share/terminfo/t/tw52
+#usr/share/terminfo/t/tw52-color
+#usr/share/terminfo/t/tw52-m
+#usr/share/terminfo/t/tws-generic
+#usr/share/terminfo/t/tws2102-sna
+#usr/share/terminfo/t/tws2103
+#usr/share/terminfo/t/tws2103-sna
+#usr/share/terminfo/u
+#usr/share/terminfo/u/ultima2
+#usr/share/terminfo/u/ultimaII
+#usr/share/terminfo/u/uniterm
+#usr/share/terminfo/u/uniterm49
+#usr/share/terminfo/u/unixpc
+#usr/share/terminfo/u/unknown
+#usr/share/terminfo/u/uts30
+#usr/share/terminfo/u/uwin
+#usr/share/terminfo/v
+#usr/share/terminfo/v/v200-nam
+#usr/share/terminfo/v/v320n
+#usr/share/terminfo/v/v3220
+#usr/share/terminfo/v/v5410
+#usr/share/terminfo/v/vanilla
+#usr/share/terminfo/v/vapple
+#usr/share/terminfo/v/vc103
+#usr/share/terminfo/v/vc203
+#usr/share/terminfo/v/vc303
+#usr/share/terminfo/v/vc303a
+#usr/share/terminfo/v/vc403a
+#usr/share/terminfo/v/vc404
+#usr/share/terminfo/v/vc404-s
+#usr/share/terminfo/v/vc414
+#usr/share/terminfo/v/vc414h
+#usr/share/terminfo/v/vc415
+#usr/share/terminfo/v/venix
+#usr/share/terminfo/v/versaterm
+#usr/share/terminfo/v/vi200
+#usr/share/terminfo/v/vi200-f
+#usr/share/terminfo/v/vi200-rv
+#usr/share/terminfo/v/vi300
+#usr/share/terminfo/v/vi300-old
+#usr/share/terminfo/v/vi50
+#usr/share/terminfo/v/vi500
+#usr/share/terminfo/v/vi50adm
+#usr/share/terminfo/v/vi55
+#usr/share/terminfo/v/vi550
+#usr/share/terminfo/v/vi603
+#usr/share/terminfo/v/viewpoint
+#usr/share/terminfo/v/viewpoint3a+
+#usr/share/terminfo/v/viewpoint60
+#usr/share/terminfo/v/viewpoint90
+#usr/share/terminfo/v/vip
+#usr/share/terminfo/v/vip-H
+#usr/share/terminfo/v/vip-Hw
+#usr/share/terminfo/v/vip-w
+#usr/share/terminfo/v/vip7800-H
+#usr/share/terminfo/v/vip7800-Hw
+#usr/share/terminfo/v/vip7800-w
+#usr/share/terminfo/v/visa50
+#usr/share/terminfo/v/visual603
+#usr/share/terminfo/v/vitty
+#usr/share/terminfo/v/vk100
+#usr/share/terminfo/v/vp3a+
+#usr/share/terminfo/v/vp60
+#usr/share/terminfo/v/vp90
+#usr/share/terminfo/v/vremote
+#usr/share/terminfo/v/vs100
+#usr/share/terminfo/v/vs100-x10
+#usr/share/terminfo/v/vsc
+#usr/share/terminfo/v/vt-61
+#usr/share/terminfo/v/vt-utf8
+#usr/share/terminfo/v/vt100
+#usr/share/terminfo/v/vt100+
+#usr/share/terminfo/v/vt100+enq
+#usr/share/terminfo/v/vt100+fnkeys
+#usr/share/terminfo/v/vt100+keypad
+#usr/share/terminfo/v/vt100+pfkeys
+#usr/share/terminfo/v/vt100-am
+#usr/share/terminfo/v/vt100-bm
+#usr/share/terminfo/v/vt100-bm-o
+#usr/share/terminfo/v/vt100-bot-s
+#usr/share/terminfo/v/vt100-nam
+#usr/share/terminfo/v/vt100-nam-w
+#usr/share/terminfo/v/vt100-nav
+#usr/share/terminfo/v/vt100-nav-w
+#usr/share/terminfo/v/vt100-putty
+#usr/share/terminfo/v/vt100-s
+#usr/share/terminfo/v/vt100-s-bot
+#usr/share/terminfo/v/vt100-s-top
+#usr/share/terminfo/v/vt100-top-s
+#usr/share/terminfo/v/vt100-vb
+#usr/share/terminfo/v/vt100-w
+#usr/share/terminfo/v/vt100-w-am
+#usr/share/terminfo/v/vt100-w-nam
+#usr/share/terminfo/v/vt100-w-nav
+#usr/share/terminfo/v/vt100nam
+#usr/share/terminfo/v/vt102
+#usr/share/terminfo/v/vt102+enq
+#usr/share/terminfo/v/vt102-nsgr
+#usr/share/terminfo/v/vt102-w
+#usr/share/terminfo/v/vt125
+#usr/share/terminfo/v/vt131
+#usr/share/terminfo/v/vt132
+#usr/share/terminfo/v/vt200
+#usr/share/terminfo/v/vt200-8
+#usr/share/terminfo/v/vt200-8bit
+#usr/share/terminfo/v/vt200-js
+#usr/share/terminfo/v/vt200-old
+#usr/share/terminfo/v/vt200-w
+#usr/share/terminfo/v/vt220
+#usr/share/terminfo/v/vt220+keypad
+#usr/share/terminfo/v/vt220-8
+#usr/share/terminfo/v/vt220-8bit
+#usr/share/terminfo/v/vt220-js
+#usr/share/terminfo/v/vt220-nam
+#usr/share/terminfo/v/vt220-old
+#usr/share/terminfo/v/vt220-w
+#usr/share/terminfo/v/vt220d
+#usr/share/terminfo/v/vt300
+#usr/share/terminfo/v/vt300-nam
+#usr/share/terminfo/v/vt300-w
+#usr/share/terminfo/v/vt300-w-nam
+#usr/share/terminfo/v/vt320
+#usr/share/terminfo/v/vt320-k3
+#usr/share/terminfo/v/vt320-k311
+#usr/share/terminfo/v/vt320-nam
+#usr/share/terminfo/v/vt320-w
+#usr/share/terminfo/v/vt320-w-nam
+#usr/share/terminfo/v/vt320nam
+#usr/share/terminfo/v/vt330
+#usr/share/terminfo/v/vt340
+#usr/share/terminfo/v/vt400
+#usr/share/terminfo/v/vt400-24
+#usr/share/terminfo/v/vt420
+#usr/share/terminfo/v/vt420f
+#usr/share/terminfo/v/vt420pc
+#usr/share/terminfo/v/vt420pcdos
+#usr/share/terminfo/v/vt50
+#usr/share/terminfo/v/vt50h
+#usr/share/terminfo/v/vt510
+#usr/share/terminfo/v/vt510pc
+#usr/share/terminfo/v/vt510pcdos
+#usr/share/terminfo/v/vt52
+#usr/share/terminfo/v/vt520
+#usr/share/terminfo/v/vt525
+#usr/share/terminfo/v/vt61
+#usr/share/terminfo/v/vt61.5
+#usr/share/terminfo/v/vte
+#usr/share/terminfo/v/vte+pcfkeys
+#usr/share/terminfo/v/vte-2007
+#usr/share/terminfo/v/vte-2008
+#usr/share/terminfo/v/vte-256color
+#usr/share/terminfo/v/vtnt
+#usr/share/terminfo/v/vv100
+usr/share/terminfo/v/vwmterm
+#usr/share/terminfo/w
+#usr/share/terminfo/w/wren
+#usr/share/terminfo/w/wrenw
+#usr/share/terminfo/w/wsiris
+#usr/share/terminfo/w/wsvt25
+#usr/share/terminfo/w/wsvt25m
+#usr/share/terminfo/w/wy-75ap
+#usr/share/terminfo/w/wy-99fgt
+#usr/share/terminfo/w/wy-99fgta
+#usr/share/terminfo/w/wy100
+#usr/share/terminfo/w/wy100q
+#usr/share/terminfo/w/wy120
+#usr/share/terminfo/w/wy120-25
+#usr/share/terminfo/w/wy120-25-w
+#usr/share/terminfo/w/wy120-vb
+#usr/share/terminfo/w/wy120-w
+#usr/share/terminfo/w/wy120-w-vb
+#usr/share/terminfo/w/wy120-wvb
+#usr/share/terminfo/w/wy150
+#usr/share/terminfo/w/wy150-25
+#usr/share/terminfo/w/wy150-25-w
+#usr/share/terminfo/w/wy150-vb
+#usr/share/terminfo/w/wy150-w
+#usr/share/terminfo/w/wy150-w-vb
+#usr/share/terminfo/w/wy160
+#usr/share/terminfo/w/wy160-25
+#usr/share/terminfo/w/wy160-25-w
+#usr/share/terminfo/w/wy160-42
+#usr/share/terminfo/w/wy160-42-w
+#usr/share/terminfo/w/wy160-43
+#usr/share/terminfo/w/wy160-43-w
+#usr/share/terminfo/w/wy160-tek
+#usr/share/terminfo/w/wy160-vb
+#usr/share/terminfo/w/wy160-w
+#usr/share/terminfo/w/wy160-w-vb
+#usr/share/terminfo/w/wy160-wvb
+#usr/share/terminfo/w/wy185
+#usr/share/terminfo/w/wy185-24
+#usr/share/terminfo/w/wy185-vb
+#usr/share/terminfo/w/wy185-w
+#usr/share/terminfo/w/wy185-wvb
+#usr/share/terminfo/w/wy30
+#usr/share/terminfo/w/wy30-mc
+#usr/share/terminfo/w/wy30-vb
+#usr/share/terminfo/w/wy325
+#usr/share/terminfo/w/wy325-25
+#usr/share/terminfo/w/wy325-25w
+#usr/share/terminfo/w/wy325-42
+#usr/share/terminfo/w/wy325-42w
+#usr/share/terminfo/w/wy325-42w-vb
+#usr/share/terminfo/w/wy325-42wvb
+#usr/share/terminfo/w/wy325-43
+#usr/share/terminfo/w/wy325-43w
+#usr/share/terminfo/w/wy325-43w-vb
+#usr/share/terminfo/w/wy325-43wvb
+#usr/share/terminfo/w/wy325-80
+#usr/share/terminfo/w/wy325-vb
+#usr/share/terminfo/w/wy325-w
+#usr/share/terminfo/w/wy325-w-vb
+#usr/share/terminfo/w/wy325-wvb
+#usr/share/terminfo/w/wy325w-24
+#usr/share/terminfo/w/wy350
+#usr/share/terminfo/w/wy350-vb
+#usr/share/terminfo/w/wy350-w
+#usr/share/terminfo/w/wy350-wvb
+#usr/share/terminfo/w/wy370
+#usr/share/terminfo/w/wy370-101k
+#usr/share/terminfo/w/wy370-105k
+#usr/share/terminfo/w/wy370-EPC
+#usr/share/terminfo/w/wy370-nk
+#usr/share/terminfo/w/wy370-rv
+#usr/share/terminfo/w/wy370-tek
+#usr/share/terminfo/w/wy370-vb
+#usr/share/terminfo/w/wy370-w
+#usr/share/terminfo/w/wy370-wvb
+#usr/share/terminfo/w/wy50
+#usr/share/terminfo/w/wy50-mc
+#usr/share/terminfo/w/wy50-vb
+#usr/share/terminfo/w/wy50-w
+#usr/share/terminfo/w/wy50-wvb
+#usr/share/terminfo/w/wy520
+#usr/share/terminfo/w/wy520-24
+#usr/share/terminfo/w/wy520-36
+#usr/share/terminfo/w/wy520-36pc
+#usr/share/terminfo/w/wy520-36w
+#usr/share/terminfo/w/wy520-36wpc
+#usr/share/terminfo/w/wy520-48
+#usr/share/terminfo/w/wy520-48pc
+#usr/share/terminfo/w/wy520-48w
+#usr/share/terminfo/w/wy520-48wpc
+#usr/share/terminfo/w/wy520-epc
+#usr/share/terminfo/w/wy520-epc-24
+#usr/share/terminfo/w/wy520-epc-vb
+#usr/share/terminfo/w/wy520-epc-w
+#usr/share/terminfo/w/wy520-epc-wvb
+#usr/share/terminfo/w/wy520-vb
+#usr/share/terminfo/w/wy520-w
+#usr/share/terminfo/w/wy520-wvb
+#usr/share/terminfo/w/wy60
+#usr/share/terminfo/w/wy60-25
+#usr/share/terminfo/w/wy60-25-w
+#usr/share/terminfo/w/wy60-316X
+#usr/share/terminfo/w/wy60-42
+#usr/share/terminfo/w/wy60-42-w
+#usr/share/terminfo/w/wy60-43
+#usr/share/terminfo/w/wy60-43-w
+#usr/share/terminfo/w/wy60-AT
+#usr/share/terminfo/w/wy60-PC
+#usr/share/terminfo/w/wy60-vb
+#usr/share/terminfo/w/wy60-w
+#usr/share/terminfo/w/wy60-w-vb
+#usr/share/terminfo/w/wy60-wvb
+#usr/share/terminfo/w/wy75
+#usr/share/terminfo/w/wy75-mc
+#usr/share/terminfo/w/wy75-vb
+#usr/share/terminfo/w/wy75-w
+#usr/share/terminfo/w/wy75-wvb
+#usr/share/terminfo/w/wy75ap
+#usr/share/terminfo/w/wy85
+#usr/share/terminfo/w/wy85-8bit
+#usr/share/terminfo/w/wy85-vb
+#usr/share/terminfo/w/wy85-w
+#usr/share/terminfo/w/wy85-wvb
+#usr/share/terminfo/w/wy99-ansi
+#usr/share/terminfo/w/wy99a-ansi
+#usr/share/terminfo/w/wy99f
+#usr/share/terminfo/w/wy99fa
+#usr/share/terminfo/w/wy99fgt
+#usr/share/terminfo/w/wy99fgta
+#usr/share/terminfo/w/wy99gt
+#usr/share/terminfo/w/wy99gt-25
+#usr/share/terminfo/w/wy99gt-25-w
+#usr/share/terminfo/w/wy99gt-tek
+#usr/share/terminfo/w/wy99gt-vb
+#usr/share/terminfo/w/wy99gt-w
+#usr/share/terminfo/w/wy99gt-w-vb
+#usr/share/terminfo/w/wy99gt-wvb
+#usr/share/terminfo/w/wyse-325
+#usr/share/terminfo/w/wyse-75ap
+#usr/share/terminfo/w/wyse-vp
+#usr/share/terminfo/w/wyse120
+#usr/share/terminfo/w/wyse120-25
+#usr/share/terminfo/w/wyse120-25-w
+#usr/share/terminfo/w/wyse120-vb
+#usr/share/terminfo/w/wyse120-w
+#usr/share/terminfo/w/wyse120-wvb
+#usr/share/terminfo/w/wyse150
+#usr/share/terminfo/w/wyse150-25
+#usr/share/terminfo/w/wyse150-25-w
+#usr/share/terminfo/w/wyse150-vb
+#usr/share/terminfo/w/wyse150-w
+#usr/share/terminfo/w/wyse150-w-vb
+#usr/share/terminfo/w/wyse160
+#usr/share/terminfo/w/wyse160-25
+#usr/share/terminfo/w/wyse160-25-w
+#usr/share/terminfo/w/wyse160-42
+#usr/share/terminfo/w/wyse160-42-w
+#usr/share/terminfo/w/wyse160-43
+#usr/share/terminfo/w/wyse160-43-w
+#usr/share/terminfo/w/wyse160-vb
+#usr/share/terminfo/w/wyse160-w
+#usr/share/terminfo/w/wyse160-wvb
+#usr/share/terminfo/w/wyse185
+#usr/share/terminfo/w/wyse185-24
+#usr/share/terminfo/w/wyse185-vb
+#usr/share/terminfo/w/wyse185-w
+#usr/share/terminfo/w/wyse185-wvb
+#usr/share/terminfo/w/wyse30
+#usr/share/terminfo/w/wyse30-mc
+#usr/share/terminfo/w/wyse30-vb
+#usr/share/terminfo/w/wyse325
+#usr/share/terminfo/w/wyse325-25
+#usr/share/terminfo/w/wyse325-25w
+#usr/share/terminfo/w/wyse325-42
+#usr/share/terminfo/w/wyse325-42w
+#usr/share/terminfo/w/wyse325-43
+#usr/share/terminfo/w/wyse325-43w
+#usr/share/terminfo/w/wyse325-vb
+#usr/share/terminfo/w/wyse325-w
+#usr/share/terminfo/w/wyse325-wvb
+#usr/share/terminfo/w/wyse350
+#usr/share/terminfo/w/wyse350-vb
+#usr/share/terminfo/w/wyse350-w
+#usr/share/terminfo/w/wyse350-wvb
+#usr/share/terminfo/w/wyse370
+#usr/share/terminfo/w/wyse50
+#usr/share/terminfo/w/wyse50-mc
+#usr/share/terminfo/w/wyse50-vb
+#usr/share/terminfo/w/wyse50-w
+#usr/share/terminfo/w/wyse50-wvb
+#usr/share/terminfo/w/wyse520
+#usr/share/terminfo/w/wyse520-24
+#usr/share/terminfo/w/wyse520-36
+#usr/share/terminfo/w/wyse520-36pc
+#usr/share/terminfo/w/wyse520-36w
+#usr/share/terminfo/w/wyse520-36wpc
+#usr/share/terminfo/w/wyse520-48
+#usr/share/terminfo/w/wyse520-48pc
+#usr/share/terminfo/w/wyse520-48w
+#usr/share/terminfo/w/wyse520-48wpc
+#usr/share/terminfo/w/wyse520-epc
+#usr/share/terminfo/w/wyse520-epc-w
+#usr/share/terminfo/w/wyse520-p-wvb
+#usr/share/terminfo/w/wyse520-pc-24
+#usr/share/terminfo/w/wyse520-pc-vb
+#usr/share/terminfo/w/wyse520-vb
+#usr/share/terminfo/w/wyse520-w
+#usr/share/terminfo/w/wyse520-wvb
+#usr/share/terminfo/w/wyse60
+#usr/share/terminfo/w/wyse60-25
+#usr/share/terminfo/w/wyse60-25-w
+#usr/share/terminfo/w/wyse60-316X
+#usr/share/terminfo/w/wyse60-42
+#usr/share/terminfo/w/wyse60-42-w
+#usr/share/terminfo/w/wyse60-43
+#usr/share/terminfo/w/wyse60-43-w
+#usr/share/terminfo/w/wyse60-AT
+#usr/share/terminfo/w/wyse60-PC
+#usr/share/terminfo/w/wyse60-vb
+#usr/share/terminfo/w/wyse60-w
+#usr/share/terminfo/w/wyse60-wvb
+#usr/share/terminfo/w/wyse75
+#usr/share/terminfo/w/wyse75-mc
+#usr/share/terminfo/w/wyse75-vb
+#usr/share/terminfo/w/wyse75-w
+#usr/share/terminfo/w/wyse75-wvb
+#usr/share/terminfo/w/wyse75ap
+#usr/share/terminfo/w/wyse85
+#usr/share/terminfo/w/wyse85-8bit
+#usr/share/terminfo/w/wyse85-vb
+#usr/share/terminfo/w/wyse85-w
+#usr/share/terminfo/w/wyse85-wvb
+#usr/share/terminfo/w/wyse99gt
+#usr/share/terminfo/w/wyse99gt-25
+#usr/share/terminfo/w/wyse99gt-25-w
+#usr/share/terminfo/w/wyse99gt-vb
+#usr/share/terminfo/w/wyse99gt-w
+#usr/share/terminfo/w/wyse99gt-wvb
+#usr/share/terminfo/x
+#usr/share/terminfo/x/x10term
+#usr/share/terminfo/x/x1700
+#usr/share/terminfo/x/x1700-lm
+#usr/share/terminfo/x/x1720
+#usr/share/terminfo/x/x1750
+#usr/share/terminfo/x/x68k
+#usr/share/terminfo/x/x68k-ite
+#usr/share/terminfo/x/x820
+#usr/share/terminfo/x/xdku
+#usr/share/terminfo/x/xenix
+#usr/share/terminfo/x/xerox
+#usr/share/terminfo/x/xerox-lm
+#usr/share/terminfo/x/xerox1720
+#usr/share/terminfo/x/xerox820
+#usr/share/terminfo/x/xfce
+#usr/share/terminfo/x/xiterm
+#usr/share/terminfo/x/xl83
+#usr/share/terminfo/x/xnuppc
+#usr/share/terminfo/x/xnuppc+100x37
+#usr/share/terminfo/x/xnuppc+112x37
+#usr/share/terminfo/x/xnuppc+128x40
+#usr/share/terminfo/x/xnuppc+128x48
+#usr/share/terminfo/x/xnuppc+144x48
+#usr/share/terminfo/x/xnuppc+160x64
+#usr/share/terminfo/x/xnuppc+200x64
+#usr/share/terminfo/x/xnuppc+200x75
+#usr/share/terminfo/x/xnuppc+256x96
+#usr/share/terminfo/x/xnuppc+80x25
+#usr/share/terminfo/x/xnuppc+80x30
+#usr/share/terminfo/x/xnuppc+90x30
+#usr/share/terminfo/x/xnuppc+b
+#usr/share/terminfo/x/xnuppc+basic
+#usr/share/terminfo/x/xnuppc+c
+#usr/share/terminfo/x/xnuppc+f
+#usr/share/terminfo/x/xnuppc+f2
+#usr/share/terminfo/x/xnuppc-100x37
+#usr/share/terminfo/x/xnuppc-100x37-m
+#usr/share/terminfo/x/xnuppc-112x37
+#usr/share/terminfo/x/xnuppc-112x37-m
+#usr/share/terminfo/x/xnuppc-128x40
+#usr/share/terminfo/x/xnuppc-128x40-m
+#usr/share/terminfo/x/xnuppc-128x48
+#usr/share/terminfo/x/xnuppc-128x48-m
+#usr/share/terminfo/x/xnuppc-144x48
+#usr/share/terminfo/x/xnuppc-144x48-m
+#usr/share/terminfo/x/xnuppc-160x64
+#usr/share/terminfo/x/xnuppc-160x64-m
+#usr/share/terminfo/x/xnuppc-200x64
+#usr/share/terminfo/x/xnuppc-200x64-m
+#usr/share/terminfo/x/xnuppc-200x75
+#usr/share/terminfo/x/xnuppc-200x75-m
+#usr/share/terminfo/x/xnuppc-256x96
+#usr/share/terminfo/x/xnuppc-256x96-m
+#usr/share/terminfo/x/xnuppc-80x25
+#usr/share/terminfo/x/xnuppc-80x25-m
+#usr/share/terminfo/x/xnuppc-80x30
+#usr/share/terminfo/x/xnuppc-80x30-m
+#usr/share/terminfo/x/xnuppc-90x30
+#usr/share/terminfo/x/xnuppc-90x30-m
+#usr/share/terminfo/x/xnuppc-b
+#usr/share/terminfo/x/xnuppc-f
+#usr/share/terminfo/x/xnuppc-f2
+#usr/share/terminfo/x/xnuppc-m
+#usr/share/terminfo/x/xnuppc-m-b
+#usr/share/terminfo/x/xnuppc-m-f
+#usr/share/terminfo/x/xnuppc-m-f2
+#usr/share/terminfo/x/xtalk
+#usr/share/terminfo/x/xterm
+#usr/share/terminfo/x/xterm+256color
+#usr/share/terminfo/x/xterm+88color
+#usr/share/terminfo/x/xterm+app
+#usr/share/terminfo/x/xterm+edit
+#usr/share/terminfo/x/xterm+noapp
+#usr/share/terminfo/x/xterm+pc+edit
+#usr/share/terminfo/x/xterm+pcc0
+#usr/share/terminfo/x/xterm+pcc1
+#usr/share/terminfo/x/xterm+pcc2
+#usr/share/terminfo/x/xterm+pcc3
+#usr/share/terminfo/x/xterm+pce2
+#usr/share/terminfo/x/xterm+pcf0
+#usr/share/terminfo/x/xterm+pcf2
+#usr/share/terminfo/x/xterm+pcfkeys
+#usr/share/terminfo/x/xterm+r6f2
+#usr/share/terminfo/x/xterm+sl
+#usr/share/terminfo/x/xterm+sl-twm
+#usr/share/terminfo/x/xterm+vt+edit
+#usr/share/terminfo/x/xterm-1002
+#usr/share/terminfo/x/xterm-1003
+#usr/share/terminfo/x/xterm-16color
+#usr/share/terminfo/x/xterm-24
+#usr/share/terminfo/x/xterm-256color
+#usr/share/terminfo/x/xterm-88color
+#usr/share/terminfo/x/xterm-8bit
+#usr/share/terminfo/x/xterm-basic
+#usr/share/terminfo/x/xterm-bold
+#usr/share/terminfo/x/xterm-color
+#usr/share/terminfo/x/xterm-hp
+#usr/share/terminfo/x/xterm-new
+#usr/share/terminfo/x/xterm-nic
+#usr/share/terminfo/x/xterm-noapp
+#usr/share/terminfo/x/xterm-old
+#usr/share/terminfo/x/xterm-pcolor
+#usr/share/terminfo/x/xterm-r5
+#usr/share/terminfo/x/xterm-r6
+#usr/share/terminfo/x/xterm-sco
+#usr/share/terminfo/x/xterm-sun
+#usr/share/terminfo/x/xterm-utf8
+#usr/share/terminfo/x/xterm-vt220
+#usr/share/terminfo/x/xterm-vt52
+#usr/share/terminfo/x/xterm-xf86-v32
+#usr/share/terminfo/x/xterm-xf86-v33
+#usr/share/terminfo/x/xterm-xf86-v333
+#usr/share/terminfo/x/xterm-xf86-v40
+#usr/share/terminfo/x/xterm-xf86-v43
+#usr/share/terminfo/x/xterm-xf86-v44
+#usr/share/terminfo/x/xterm-xfree86
+#usr/share/terminfo/x/xterm-xi
+#usr/share/terminfo/x/xterm1
+#usr/share/terminfo/x/xtermc
+#usr/share/terminfo/x/xtermm
+#usr/share/terminfo/x/xterms
+#usr/share/terminfo/x/xterms-sun
+#usr/share/terminfo/x/xwsh
+#usr/share/terminfo/z
+#usr/share/terminfo/z/z-100
+#usr/share/terminfo/z/z-100bw
+#usr/share/terminfo/z/z100
+#usr/share/terminfo/z/z100bw
+#usr/share/terminfo/z/z110
+#usr/share/terminfo/z/z110bw
+#usr/share/terminfo/z/z19
+#usr/share/terminfo/z/z29
+#usr/share/terminfo/z/z29a
+#usr/share/terminfo/z/z29a-kc-bc
+#usr/share/terminfo/z/z29a-kc-uc
+#usr/share/terminfo/z/z29a-nkc-bc
+#usr/share/terminfo/z/z29a-nkc-uc
+#usr/share/terminfo/z/z29b
+#usr/share/terminfo/z/z30
+#usr/share/terminfo/z/z340
+#usr/share/terminfo/z/z340-nam
+#usr/share/terminfo/z/z39-a
+#usr/share/terminfo/z/z39a
+#usr/share/terminfo/z/z50
+#usr/share/terminfo/z/z8001
+#usr/share/terminfo/z/zen30
+#usr/share/terminfo/z/zen50
+#usr/share/terminfo/z/zen8001
+#usr/share/terminfo/z/zenith
+#usr/share/terminfo/z/zenith29
+#usr/share/terminfo/z/zenith39-a
+#usr/share/terminfo/z/zenith39-ansi
+#usr/share/terminfo/z/zt-1
+#usr/share/terminfo/z/ztx
+#usr/share/terminfo/z/ztx-1-a
+#usr/share/terminfo/z/ztx11
diff --git a/config/rootfiles/packages/nfs b/config/rootfiles/packages/nfs
index 666512b..08fcca9 100644
--- a/config/rootfiles/packages/nfs
+++ b/config/rootfiles/packages/nfs
@@ -1,5 +1,6 @@
sbin/mount.nfs
sbin/mount.nfs4
+sbin/nfsdcltrack
sbin/osd_login
sbin/umount.nfs
sbin/umount.nfs4
@@ -22,7 +23,6 @@ usr/lib/libnfsidmap/umich_ldap.so
#usr/lib/pkgconfig/libnfsidmap.pc
usr/sbin/exportfs
usr/sbin/mountstats
-usr/sbin/nfsdcltrack
usr/sbin/nfsiostat
usr/sbin/nfsstat
usr/sbin/rpc.idmapd
@@ -37,6 +37,7 @@ usr/sbin/start-statd
#usr/share/man/man5/exports.5
#usr/share/man/man5/idmapd.conf.5
#usr/share/man/man5/nfs.5
+#usr/share/man/man5/nfsmount.conf.5
#usr/share/man/man7/nfsd.7
#usr/share/man/man8/exportfs.8
#usr/share/man/man8/idmapd.8
@@ -61,7 +62,7 @@ usr/sbin/start-statd
var/lib/nfs/etab
var/lib/nfs/rmtab
var/lib/nfs/sm
-#var/lib/nfs/sm.bak
+var/lib/nfs/sm.bak
var/lib/nfs/state
var/lib/nfs/xtab
etc/rc.d/init.d/nfs-server
diff --git a/lfs/curl b/lfs/curl
index 29de280..2fcfa7e 100644
--- a/lfs/curl
+++ b/lfs/curl
@@ -24,10 +24,10 @@
include Config
-VER = 7.43.0
+VER = 7.48.0
THISAPP = curl-$(VER)
-DL_FILE = $(THISAPP).tar.gz
+DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 3037f0b6ce03d434618e9db5506ae6be
+$(DL_FILE)_MD5 = d42e0fc34a5cace5739631cc040974fe
install : $(TARGET)
diff --git a/lfs/grep b/lfs/grep
index 9f3a38e..32a6748 100644
--- a/lfs/grep
+++ b/lfs/grep
@@ -24,7 +24,7 @@
include Config
-VER = 2.23
+VER = 2.24
THISAPP = grep-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -51,7 +51,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f46aa9d0d2577b9212a104348a286787
+$(DL_FILE)_MD5 = f1c980134c04692a90078e87283074b6
install : $(TARGET)
diff --git a/lfs/hostapd b/lfs/hostapd
index f393d91..7d193d9 100644
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -24,7 +24,7 @@
include Config
-VER = 2.4
+VER = 2.5
THISAPP = hostapd-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = hostapd
-PAK_VER = 35
+PAK_VER = 36
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 04578f3f2c3eb1bec1adf30473813912
+$(DL_FILE)_MD5 = 69f9cec3f76d74f402864a43e4f8624f
install : $(TARGET)
diff --git a/lfs/less b/lfs/less
index d9680c8..3a35483 100644
--- a/lfs/less
+++ b/lfs/less
@@ -24,7 +24,7 @@
include Config
-VER = 443
+VER = 481
THISAPP = less-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 47db098fb3cdaf847b3c4be05ee954fc
+$(DL_FILE)_MD5 = 50ef46065c65257141a7340123527767
install : $(TARGET)
diff --git a/lfs/ncurses b/lfs/ncurses
index 1c0fb04..8ff0c0d 100644
--- a/lfs/ncurses
+++ b/lfs/ncurses
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 5.9
+VER = 6.0
THISAPP = ncurses-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -41,20 +41,6 @@ else
PREFIX = /tools
endif
-EXTRA_CONFIG += \
- --prefix=$(PREFIX) \
- --with-shared \
- --without-debug \
- --without-ada \
- --with-ospeed=unsigned \
- --with-chtype=long \
- --enable-hard-tabs \
- --enable-xmc-glitch \
- --enable-colorfgbg \
- --enable-overwrite \
- --with-termlib=tinfo \
- --disable-nls
-
###############################################################################
# Top-level Rules
###############################################################################
@@ -63,7 +49,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 8cb9c412e5f2d96bc6f459aa8c6282a1
+$(DL_FILE)_MD5 = ee13d052e1ead260d7c28071f46eefb1
install : $(TARGET)
@@ -93,35 +79,31 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && mkdir -pv narrowc widec
-
- # Build narrowc version.
- cd $(DIR_APP)/narrowc && ln -svf ../configure .
- cd $(DIR_APP)/narrowc && ./configure $(EXTRA_CONFIG) --with-ticlib
- cd $(DIR_APP)/narrowc && make libs
- cd $(DIR_APP)/narrowc && make -C progs
-
- # Build widec version.
- cd $(DIR_APP)/widec && ln -svf ../configure .
- cd $(DIR_APP)/widec && ./configure $(EXTRA_CONFIG) \
- --enable-widec --without-progs
- cd $(DIR_APP)/widec && make libs
-
- # Install everything.
- cd $(DIR_APP) && make -C narrowc install.{libs,progs,data}
- rm -vf $(PREFIX)/lib/libtinfo.*
- cd $(DIR_APP) && make -C widec install.{libs,includes,man}
-
- # don't require -ltinfo when linking with --no-add-needed
- for l in $(PREFIX)/lib/libncurses{,w}.so; do \
- soname=$$(basename $$(readlink $$l)); \
- rm -f $$l; \
- echo "INPUT($$soname -ltinfo)" > $$l; \
+ # Don't install a static library
+ cd $(DIR_APP) && sed -i '/LIBTOOL_INSTALL/d' c++/Makefile.in
+ cd $(DIR_APP) && ./configure \
+ --prefix=$(PREFIX) \
+ --enable-widec \
+ --with-shared \
+ --without-debug \
+ --without-normal \
+ --enable-pc-files \
+ --disable-nls \
+ --mandir=/usr/share/man
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+
+ # allow the linker to find non-wide-character Ncurses libraries
+ for lib in ncurses form panel menu; do \
+ rm -vf $(PREFIX)/lib/lib$${lib}.so; \
+ echo "INPUT(-l$${lib}w)" > $(PREFIX)/lib/lib$${lib}.so; \
+ ln -sfv $${lib}w.pc $(PREFIX)/lib/pkgconfig/$${lib}.pc; \
done
- rm -vf $(PREFIX)/lib/libcurses{,w}.so
- echo "INPUT(-lncurses)" > $(PREFIX)/lib/libcurses.so
+ # old applications that look for -lcurses at build time are still buildable
+ rm -vf /usr/lib/libcursesw.so
echo "INPUT(-lncursesw)" > $(PREFIX)/lib/libcursesw.so
- echo "INPUT(-ltinfo)" > $(PREFIX)/lib/libtermcap.so
+ ln -sfv libncurses.so $(PREFIX)/lib/libcurses.so
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/ncurses-compat b/lfs/ncurses-compat
new file mode 100644
index 0000000..1c0fb04
--- /dev/null
+++ b/lfs/ncurses-compat
@@ -0,0 +1,127 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 5.9
+
+THISAPP = ncurses-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+
+# Normal build or /tools build.
+#
+ifeq "$(ROOT)" ""
+ TARGET = $(DIR_INFO)/$(THISAPP)
+ PREFIX = /usr
+else
+ TARGET = $(DIR_INFO)/$(THISAPP)-tools
+ PREFIX = /tools
+endif
+
+EXTRA_CONFIG += \
+ --prefix=$(PREFIX) \
+ --with-shared \
+ --without-debug \
+ --without-ada \
+ --with-ospeed=unsigned \
+ --with-chtype=long \
+ --enable-hard-tabs \
+ --enable-xmc-glitch \
+ --enable-colorfgbg \
+ --enable-overwrite \
+ --with-termlib=tinfo \
+ --disable-nls
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 8cb9c412e5f2d96bc6f459aa8c6282a1
+
+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)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && mkdir -pv narrowc widec
+
+ # Build narrowc version.
+ cd $(DIR_APP)/narrowc && ln -svf ../configure .
+ cd $(DIR_APP)/narrowc && ./configure $(EXTRA_CONFIG) --with-ticlib
+ cd $(DIR_APP)/narrowc && make libs
+ cd $(DIR_APP)/narrowc && make -C progs
+
+ # Build widec version.
+ cd $(DIR_APP)/widec && ln -svf ../configure .
+ cd $(DIR_APP)/widec && ./configure $(EXTRA_CONFIG) \
+ --enable-widec --without-progs
+ cd $(DIR_APP)/widec && make libs
+
+ # Install everything.
+ cd $(DIR_APP) && make -C narrowc install.{libs,progs,data}
+ rm -vf $(PREFIX)/lib/libtinfo.*
+ cd $(DIR_APP) && make -C widec install.{libs,includes,man}
+
+ # don't require -ltinfo when linking with --no-add-needed
+ for l in $(PREFIX)/lib/libncurses{,w}.so; do \
+ soname=$$(basename $$(readlink $$l)); \
+ rm -f $$l; \
+ echo "INPUT($$soname -ltinfo)" > $$l; \
+ done
+
+ rm -vf $(PREFIX)/lib/libcurses{,w}.so
+ echo "INPUT(-lncurses)" > $(PREFIX)/lib/libcurses.so
+ echo "INPUT(-lncursesw)" > $(PREFIX)/lib/libcursesw.so
+ echo "INPUT(-ltinfo)" > $(PREFIX)/lib/libtermcap.so
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/nfs b/lfs/nfs
index 417f155..b6cef7b 100644
--- a/lfs/nfs
+++ b/lfs/nfs
@@ -24,7 +24,7 @@
include Config
-VER = 1.2.7
+VER = 1.3.3
THISAPP = nfs-utils-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = nfs
-PAK_VER = 6
+PAK_VER = 7
DEPS = "portmap"
@@ -48,7 +48,7 @@ objects = $(DL_FILE) \
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
libnfsidmap-$(LIBNFSIDMAP).tar.gz = $(DL_FROM)/libnfsidmap-$(LIBNFSIDMAP).tar.gz
-$(DL_FILE)_MD5 = 3b5ca797197765dc0c3a4122720c7716
+$(DL_FILE)_MD5 = 9b87d890669eaaec8e97a2b0a35b2665
libnfsidmap-$(LIBNFSIDMAP).tar.gz_MD5 = 2ac4893c92716add1a1447ae01df77ab
install : $(TARGET)
@@ -94,7 +94,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--disable-gss \
--disable-tirpc \
--disable-nfsv41 \
- --without-tcp-wrappers
+ --without-tcp-wrappers --disable-ipv6
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
diff --git a/lfs/sdparm b/lfs/sdparm
index daa94ff..cd7bbc0 100644
--- a/lfs/sdparm
+++ b/lfs/sdparm
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 1.07
+VER = 1.10
THISAPP = sdparm-$(VER)
DL_FILE = $(THISAPP).tgz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c807f9db3dd7af175214be0d7fece494
+$(DL_FILE)_MD5 = bdae64375376ce8fe4bf9521c1db858f
install : $(TARGET)
diff --git a/lfs/squid b/lfs/squid
index 7e41c16..6725a6e 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -75,6 +75,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13230.patch
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13231.patch
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13232.patch
+ cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13233.patch
+ cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13234.patch
+ cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13235.patch
+
cd $(DIR_APP) && autoreconf -vfi
cd $(DIR_APP)/libltdl && autoreconf -vfi
@@ -85,11 +89,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--mandir=/usr/share/man \
--libexecdir=/usr/lib/squid \
--localstatedir=/var \
- --disable-ipv6 \
--disable-ssl \
- --enable-poll \
--disable-icmp \
--disable-wccp \
+ --disable-wccpv2 \
+ --disable-kqueue \
+ --disable-esi \
+ --disable-arch-native \
+ --disable-ipv6 \
+ --enable-poll \
--enable-ident-lookups \
--enable-storeio="aufs,diskd,ufs" \
--enable-underscores \
@@ -107,26 +115,22 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--enable-url-rewrite-helpers \
--enable-build-info \
--enable-eui \
- --with-pthreads \
- --with-dl \
- --with-filedescriptors=$$(( 16384 * 64 )) \
- --with-large-files \
- --with-aio \
- --enable-async-io=8 \
+ --enable-async-io=16 \
--enable-unlinkd \
--enable-internal-dns \
--enable-epoll \
- --disable-kqueue \
--enable-select \
--enable-cache-digests \
--enable-forw-via-db \
--enable-htcp \
--enable-kill-parent-hack \
- --disable-wccpv2 \
--enable-icap-client \
- --disable-esi \
--enable-zph-qos \
- --disable-arch-native
+ --with-pthreads \
+ --with-dl \
+ --with-filedescriptors=$$(( 16384 * 64 )) \
+ --with-large-files \
+ --with-aio
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
diff --git a/lfs/tzdata b/lfs/tzdata
index 5cc3fc8..7f140c0 100644
--- a/lfs/tzdata
+++ b/lfs/tzdata
@@ -24,7 +24,7 @@
include Config
-VER = 2016a
+VER = 2016d
TZDATA_VER = $(VER)
TZCODE_VER = $(VER)
@@ -45,8 +45,8 @@ objects = tzdata$(TZDATA_VER).tar.gz tzcode$(TZCODE_VER).tar.gz
tzdata$(TZDATA_VER).tar.gz = $(DL_FROM)/tzdata$(TZDATA_VER).tar.gz
tzcode$(TZCODE_VER).tar.gz = $(DL_FROM)/tzcode$(TZCODE_VER).tar.gz
-tzdata$(TZDATA_VER).tar.gz_MD5 = 0d3123eb1b453ec0620822bd65be4c42
-tzcode$(TZCODE_VER).tar.gz_MD5 = f5e0299925631da7cf82d8ce1205111d
+tzdata$(TZDATA_VER).tar.gz_MD5 = 14bf84b6c2cdab0a9428991e0150ebe6
+tzcode$(TZCODE_VER).tar.gz_MD5 = 06fc6fc111cd8dd681abdc5326529afd
install : $(TARGET)
diff --git a/lfs/wpa_supplicant b/lfs/wpa_supplicant
index e7f46de..76aa6c6 100644
--- a/lfs/wpa_supplicant
+++ b/lfs/wpa_supplicant
@@ -24,7 +24,7 @@
include Config
-VER = 2.4
+VER = 2.5
THISAPP = wpa_supplicant-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f0037dbe03897dcaf2ad2722e659095d
+$(DL_FILE)_MD5 = 96ff75c3a514f1f324560a2376f13110
install : $(TARGET)
diff --git a/make.sh b/make.sh
index 960b45d..b1840bf 100755
--- a/make.sh
+++ b/make.sh
@@ -340,6 +340,7 @@ buildbase() {
lfsmake2 iana-etc
lfsmake2 m4
lfsmake2 bison
+ lfsmake2 ncurses-compat
lfsmake2 ncurses
lfsmake2 procps
lfsmake2 libtool
diff --git a/src/initscripts/init.d/nfs-server b/src/initscripts/init.d/nfs-server
index 15284e8..a81faf7 100644
--- a/src/initscripts/init.d/nfs-server
+++ b/src/initscripts/init.d/nfs-server
@@ -13,6 +13,10 @@
case "$1" in
start)
+ boot_mesg "Mounting nfsd virtual filesystem..."
+ /bin/mount -t nfsd none /proc/fs/nfsd 2>&1 > /dev/null
+ evaluate_retval
+
boot_mesg "Starting NFS mountd..."
loadproc /usr/sbin/rpc.mountd
@@ -27,10 +31,6 @@ case "$1" in
loadproc /usr/sbin/rpc.rquotad
fi
- boot_mesg "Mounting nfsd virtual filesystem..."
- /bin/mount -t nfsd none /proc/fs/nfsd 2>&1 > /dev/null
- evaluate_retval
-
# Make ceratin that the list is refreshed on
# a restart.
boot_mesg "Exporting NFS Filesystems..."
@@ -43,8 +43,8 @@ case "$1" in
killproc /usr/sbin/rpc.statd
boot_mesg "Stopping NFS nfsd..."
- # nfsd needs HUP....
- killproc nfsd HUP
+ /usr/sbin/rpc.nfsd 0
+ evaluate_retval
boot_mesg "Stopping NFS mountd..."
killproc /usr/sbin/rpc.mountd
diff --git a/src/patches/squid-3.4-13233.patch b/src/patches/squid-3.4-13233.patch
new file mode 100644
index 0000000..d657838
--- /dev/null
+++ b/src/patches/squid-3.4-13233.patch
@@ -0,0 +1,274 @@
+------------------------------------------------------------
+revno: 13233
+revision-id: squid3(a)treenet.co.nz-20160420063907-hcnf4qmcg5hbjc11
+parent: squid3(a)treenet.co.nz-20160330141410-t6p2dhzr8ri36fap
+committer: Amos Jeffries <squid3(a)treenet.co.nz>
+branch nick: 3.4
+timestamp: Wed 2016-04-20 18:39:07 +1200
+message:
+ cachemgr.cgi: use dynamic MemBuf for internal content generation
+
+ Using a fixed size buffer limits how big content lines can be. Modern
+ HTTP is fast reaching the point where such limits are problematic.
+ Also fixes incorrect uses of snprintf() by removing them.
+------------------------------------------------------------
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: squid3(a)treenet.co.nz-20160420063907-hcnf4qmcg5hbjc11
+# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
+# testament_sha1: 161e86814f6f14d74557a3fa169b37b6601c08a1
+# timestamp: 2016-04-20 06:50:57 +0000
+# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
+# base_revision_id: squid3(a)treenet.co.nz-20160330141410-\
+# t6p2dhzr8ri36fap
+#
+# Begin patch
+=== modified file 'src/tests/stub_cbdata.cc'
+--- src/tests/stub_cbdata.cc 2012-11-01 10:31:28 +0000
++++ src/tests/stub_cbdata.cc 2016-04-20 06:39:07 +0000
+@@ -5,7 +5,13 @@
+ #include "tests/STUB.h"
+
+ void cbdataRegisterWithCacheManager(void) STUB
+-
++void *cbdataInternalAlloc(cbdata_type type, const char *, int sz) {
++ return xcalloc(1, sz);
++}
++void *cbdataInternalFree(void *p, const char *, int) {
++ xfree(p);
++ return nullptr;
++}
+ #if USE_CBDATA_DEBUG
+ void *cbdataInternalAllocDbg(cbdata_type type, const char *, int) STUB_RETVAL(NULL)
+ void *cbdataInternalFreeDbg(void *p, const char *, int) STUB_RETVAL(NULL)
+
+=== modified file 'src/tests/stub_mem.cc'
+--- src/tests/stub_mem.cc 2012-08-29 07:29:35 +0000
++++ src/tests/stub_mem.cc 2016-04-20 06:39:07 +0000
+@@ -5,7 +5,7 @@
+ #include "squid.h"
+
+ #define STUB_API "stub_mem.cc"
+-#include "STUB.h"
++#include "tests/STUB.h"
+ #include "Mem.h"
+
+ void
+
+=== modified file 'tools/Makefile.am'
+--- tools/Makefile.am 2014-04-06 04:37:08 +0000
++++ tools/Makefile.am 2016-04-20 06:39:07 +0000
+@@ -35,15 +35,24 @@
+ stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc
+ cp $(top_srcdir)/src/tests/stub_debug.cc .
+
++MemBuf.cc: $(top_srcdir)/src/MemBuf.cc
++ cp $(top_srcdir)/src/MemBuf.cc $@
++
+ time.cc: $(top_srcdir)/src/time.cc
+ cp $(top_srcdir)/src/time.cc .
+
++stub_cbdata.cc: $(top_srcdir)/src/tests/stub_cbdata.cc
++ cp $(top_srcdir)/src/tests/stub_cbdata.cc $@
++
++stub_mem.cc: $(top_srcdir)/src/tests/stub_mem.cc
++ cp $(top_srcdir)/src/tests/stub_mem.cc $@
++
+ # stock tools for unit tests - library independent versions of dlink_list
+ # etc.
+ # globals.cc is needed by test_tools.cc.
+ # Neither of these should be disted from here.
+ TESTSOURCES= test_tools.cc
+-CLEANFILES += test_tools.cc stub_debug.cc time.cc
++CLEANFILES += test_tools.cc MemBuf.cc stub_debug.cc time.cc stub_cbdata.cc stub_mem.cc
+
+ ## ##### helper-mux #####
+
+@@ -74,7 +83,10 @@
+ libexec_PROGRAMS = cachemgr$(CGIEXT)
+
+ cachemgr__CGIEXT__SOURCES = cachemgr.cc \
++ MemBuf.cc \
++ stub_cbdata.cc \
+ stub_debug.cc \
++ stub_mem.cc \
+ test_tools.cc \
+ time.cc
+
+
+=== modified file 'tools/cachemgr.cc'
+--- tools/cachemgr.cc 2015-01-09 10:32:57 +0000
++++ tools/cachemgr.cc 2016-04-20 06:39:07 +0000
+@@ -35,6 +35,7 @@
+ #include "getfullhostname.h"
+ #include "html_quote.h"
+ #include "ip/Address.h"
++#include "MemBuf.h"
+ #include "rfc1123.h"
+ #include "rfc1738.h"
+ #include "util.h"
+@@ -460,8 +461,8 @@
+ return url;
+ }
+
+-static const char *
+-munge_menu_line(const char *buf, cachemgr_request * req)
++static void
++munge_menu_line(MemBuf &out, const char *buf, cachemgr_request * req)
+ {
+ char *x;
+ const char *a;
+@@ -469,15 +470,14 @@
+ const char *p;
+ char *a_url;
+ char *buf_copy;
+- static char html[2 * 1024];
+-
+- if (strlen(buf) < 1)
+- return buf;
+-
+- if (*buf != ' ')
+- return buf;
+-
+- buf_copy = x = xstrdup(buf);
++
++ const char bufLen = strlen(buf);
++ if (bufLen < 1 || *buf != ' ') {
++ out.append(buf, bufLen);
++ return;
++ }
++
++ buf_copy = x = xstrndup(buf, bufLen);
+
+ a = xstrtok(&x, '\t');
+
+@@ -489,59 +489,56 @@
+
+ /* no reason to give a url for a disabled action */
+ if (!strcmp(p, "disabled"))
+- snprintf(html, sizeof(html), "<LI type=\"circle\">%s (disabled)<A HREF=\"%s\">.</A>\n", d, a_url);
++ out.Printf("<LI type=\"circle\">%s (disabled)<A HREF=\"%s\">.</A>\n", d, a_url);
+ else
+ /* disable a hidden action (requires a password, but password is not in squid.conf) */
+ if (!strcmp(p, "hidden"))
+- snprintf(html, sizeof(html), "<LI type=\"circle\">%s (hidden)<A HREF=\"%s\">.</A>\n", d, a_url);
++ out.Printf("<LI type=\"circle\">%s (hidden)<A HREF=\"%s\">.</A>\n", d, a_url);
+ else
+ /* disable link if authentication is required and we have no password */
+ if (!strcmp(p, "protected") && !req->passwd)
+- snprintf(html, sizeof(html), "<LI type=\"circle\">%s (requires <a href=\"%s\">authentication</a>)<A HREF=\"%s\">.</A>\n",
+- d, menu_url(req, "authenticate"), a_url);
++ out.Printf("<LI type=\"circle\">%s (requires <a href=\"%s\">authentication</a>)<A HREF=\"%s\">.</A>\n",
++ d, menu_url(req, "authenticate"), a_url);
+ else
+ /* highlight protected but probably available entries */
+ if (!strcmp(p, "protected"))
+- snprintf(html, sizeof(html), "<LI type=\"square\"><A HREF=\"%s\"><font color=\"#FF0000\">%s</font></A>\n",
+- a_url, d);
++ out.Printf("<LI type=\"square\"><A HREF=\"%s\"><font color=\"#FF0000\">%s</font></A>\n",
++ a_url, d);
+
+ /* public entry or unknown type of protection */
+ else
+- snprintf(html, sizeof(html), "<LI type=\"disk\"><A HREF=\"%s\">%s</A>\n", a_url, d);
++ out.Printf("<LI type=\"disk\"><A HREF=\"%s\">%s</A>\n", a_url, d);
+
+ xfree(a_url);
+
+ xfree(buf_copy);
+-
+- return html;
+ }
+
+-static const char *
+-munge_other_line(const char *buf, cachemgr_request * req)
++static void
++munge_other_line(MemBuf &out, const char *buf, cachemgr_request *)
+ {
+ static const char *ttags[] = {"td", "th"};
+
+- static char html[4096];
+ static int table_line_num = 0;
+ static int next_is_header = 0;
+ int is_header = 0;
+ const char *ttag;
+ char *buf_copy;
+ char *x, *p;
+- int l = 0;
+ /* does it look like a table? */
+
+ if (!strchr(buf, '\t') || *buf == '\t') {
+ /* nope, just text */
+- snprintf(html, sizeof(html), "%s%s",
+- table_line_num ? "</table>\n<pre>" : "", html_quote(buf));
++ if (table_line_num)
++ out.append("</table>\n<pre>", 14);
++ out.Printf("%s", html_quote(buf));
+ table_line_num = 0;
+- return html;
++ return;
+ }
+
+ /* start html table */
+ if (!table_line_num) {
+- l += snprintf(html + l, sizeof(html) - l, "</pre><table cellpadding=\"2\" cellspacing=\"1\">\n");
++ out.append("</pre><table cellpadding=\"2\" cellspacing=\"1\">\n", 46);
+ next_is_header = 0;
+ }
+
+@@ -551,7 +548,7 @@
+ ttag = ttags[is_header];
+
+ /* record starts */
+- l += snprintf(html + l, sizeof(html) - l, "<tr>");
++ out.append("<tr>", 4);
+
+ /* substitute '\t' */
+ buf_copy = x = xstrdup(buf);
+@@ -568,18 +565,17 @@
+ ++x;
+ }
+
+- l += snprintf(html + l, sizeof(html) - l, "<%s colspan=\"%d\" align=\"%s\">%s</%s>",
+- ttag, column_span,
+- is_header ? "center" : is_number(cell) ? "right" : "left",
+- html_quote(cell), ttag);
++ out.Printf("<%s colspan=\"%d\" align=\"%s\">%s</%s>",
++ ttag, column_span,
++ is_header ? "center" : is_number(cell) ? "right" : "left",
++ html_quote(cell), ttag);
+ }
+
+ xfree(buf_copy);
+ /* record ends */
+- snprintf(html + l, sizeof(html) - l, "</tr>\n");
++ out.append("</tr>\n", 6);
+ next_is_header = is_header && strstr(buf, "\t\t");
+ ++table_line_num;
+- return html;
+ }
+
+ static const char *
+@@ -736,14 +732,18 @@
+ /* yes, fall through, we do not want to loose the first line */
+
+ case isBody:
++ {
+ /* interpret [and reformat] cache response */
+-
++ MemBuf out;
++ out.init();
+ if (parse_menu)
+- fputs(munge_menu_line(buf, req), stdout);
++ munge_menu_line(out, buf, req);
+ else
+- fputs(munge_other_line(buf, req), stdout);
++ munge_other_line(out, buf, req);
+
+- break;
++ fputs(out.buf, stdout);
++ }
++ break;
+
+ case isForward:
+ /* forward: no modifications allowed */
+
diff --git a/src/patches/squid-3.4-13234.patch b/src/patches/squid-3.4-13234.patch
new file mode 100644
index 0000000..6f701fa
--- /dev/null
+++ b/src/patches/squid-3.4-13234.patch
@@ -0,0 +1,33 @@
+------------------------------------------------------------
+revno: 13234
+revision-id: squid3(a)treenet.co.nz-20160420101437-36eofkldxfku61kj
+parent: squid3(a)treenet.co.nz-20160420063907-hcnf4qmcg5hbjc11
+committer: Amos Jeffries <squid3(a)treenet.co.nz>
+branch nick: 3.4
+timestamp: Wed 2016-04-20 22:14:37 +1200
+message:
+ nullptr is a C++11 feature
+------------------------------------------------------------
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: squid3(a)treenet.co.nz-20160420101437-36eofkldxfku61kj
+# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
+# testament_sha1: 0f9f2a5b29a7ef02befe2a4e2e6357ef4bcffbce
+# timestamp: 2016-04-20 10:51:03 +0000
+# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
+# base_revision_id: squid3(a)treenet.co.nz-20160420063907-\
+# hcnf4qmcg5hbjc11
+#
+# Begin patch
+=== modified file 'src/tests/stub_cbdata.cc'
+--- src/tests/stub_cbdata.cc 2016-04-20 06:39:07 +0000
++++ src/tests/stub_cbdata.cc 2016-04-20 10:14:37 +0000
+@@ -10,7 +10,7 @@
+ }
+ void *cbdataInternalFree(void *p, const char *, int) {
+ xfree(p);
+- return nullptr;
++ return NULL;
+ }
+ #if USE_CBDATA_DEBUG
+ void *cbdataInternalAllocDbg(cbdata_type type, const char *, int) STUB_RETVAL(NULL)
+
diff --git a/src/patches/squid-3.4-13235.patch b/src/patches/squid-3.4-13235.patch
new file mode 100644
index 0000000..e380225
--- /dev/null
+++ b/src/patches/squid-3.4-13235.patch
@@ -0,0 +1,97 @@
+------------------------------------------------------------
+revno: 13235
+revision-id: squid3(a)treenet.co.nz-20160420111514-4hpxglbn9k15l5sa
+parent: squid3(a)treenet.co.nz-20160420101437-36eofkldxfku61kj
+committer: Amos Jeffries <squid3(a)treenet.co.nz>
+branch nick: 3.4
+timestamp: Wed 2016-04-20 23:15:14 +1200
+message:
+ Fix several ESI element construction issues
+
+ * Do not wrap active logic in assert().
+
+ * Fix localbuf array bounds checking.
+
+ * Add Must() conditions to verify array writes will succeed
+------------------------------------------------------------
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: squid3(a)treenet.co.nz-20160420111514-4hpxglbn9k15l5sa
+# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
+# testament_sha1: e95687b13c98667ab09966e7f94d511ca3e6ad96
+# timestamp: 2016-04-20 11:18:22 +0000
+# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
+# base_revision_id: squid3(a)treenet.co.nz-20160420101437-\
+# 36eofkldxfku61kj
+#
+# Begin patch
+=== modified file 'src/esi/Esi.cc'
+--- src/esi/Esi.cc 2013-06-27 15:58:46 +0000
++++ src/esi/Esi.cc 2016-04-20 11:15:14 +0000
+@@ -991,7 +991,7 @@
+ ESIElement::Pointer element;
+ int specifiedattcount = attrCount * 2;
+ char *position;
+- assert (ellen < sizeof (localbuf)); /* prevent unexpected overruns. */
++ Must(ellen < sizeof(localbuf)); /* prevent unexpected overruns. */
+
+ debugs(86, 5, "ESIContext::Start: element '" << el << "' with " << specifiedattcount << " tags");
+
+@@ -1005,15 +1005,17 @@
+ /* Spit out elements we aren't interested in */
+ localbuf[0] = '<';
+ localbuf[1] = '\0';
+- assert (xstrncpy (&localbuf[1], el, sizeof(localbuf) - 2));
++ xstrncpy(&localbuf[1], el, sizeof(localbuf) - 2);
+ position = localbuf + strlen (localbuf);
+
+ for (i = 0; i < specifiedattcount && attr[i]; i += 2) {
++ Must(static_cast<size_t>(position - localbuf) < sizeof(localbuf) - 1);
+ *position = ' ';
+ ++position;
+ /* TODO: handle thisNode gracefully */
+- assert (xstrncpy (position, attr[i], sizeof(localbuf) + (position - localbuf)));
++ xstrncpy(position, attr[i], sizeof(localbuf) - (position - localbuf));
+ position += strlen (position);
++ Must(static_cast<size_t>(position - localbuf) < sizeof(localbuf) - 2);
+ *position = '=';
+ ++position;
+ *position = '\"';
+@@ -1022,18 +1024,21 @@
+ char ch;
+ while ((ch = *chPtr++) != '\0') {
+ if (ch == '\"') {
+- assert( xstrncpy(position, """, sizeof(localbuf) + (position-localbuf)) );
++ Must(static_cast<size_t>(position - localbuf) < sizeof(localbuf) - 6);
++ xstrncpy(position, """, sizeof(localbuf) - (position-localbuf));
+ position += 6;
+ } else {
++ Must(static_cast<size_t>(position - localbuf) < sizeof(localbuf) - 1);
+ *position = ch;
+ ++position;
+ }
+ }
+- position += strlen (position);
++ Must(static_cast<size_t>(position - localbuf) < sizeof(localbuf) - 1);
+ *position = '\"';
+ ++position;
+ }
+
++ Must(static_cast<size_t>(position - localbuf) < sizeof(localbuf) - 2);
+ *position = '>';
+ ++position;
+ *position = '\0';
+@@ -1119,11 +1124,11 @@
+ switch (ESIElement::IdentifyElement (el)) {
+
+ case ESIElement::ESI_ELEMENT_NONE:
+- assert (ellen < sizeof (localbuf)); /* prevent unexpected overruns. */
++ Must(ellen < sizeof(localbuf) - 3); /* prevent unexpected overruns. */
+ /* Add elements we aren't interested in */
+ localbuf[0] = '<';
+ localbuf[1] = '/';
+- assert (xstrncpy (&localbuf[2], el, sizeof(localbuf) - 3));
++ xstrncpy(&localbuf[2], el, sizeof(localbuf) - 3);
+ position = localbuf + strlen (localbuf);
+ *position = '>';
+ ++position;
+
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree tag, v2.19-core101, created. 916cf307b19d6d267b3a8737ba9b299284c0f137
by git＠ipfire.org 25 Apr '16
by git＠ipfire.org 25 Apr '16
25 Apr '16
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 tag, v2.19-core101 has been created
at 916cf307b19d6d267b3a8737ba9b299284c0f137 (commit)
- Log -----------------------------------------------------------------
commit 916cf307b19d6d267b3a8737ba9b299284c0f137
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Apr 25 21:44:47 2016 +0200
core101: close core update.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, core101, created. 916cf307b19d6d267b3a8737ba9b299284c0f137
by git＠ipfire.org 25 Apr '16
by git＠ipfire.org 25 Apr '16
25 Apr '16
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, core101 has been created
at 916cf307b19d6d267b3a8737ba9b299284c0f137 (commit)
- Log -----------------------------------------------------------------
commit 916cf307b19d6d267b3a8737ba9b299284c0f137
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Apr 25 21:44:47 2016 +0200
core101: close core update.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 875bd87bbd1de44979d1d1a4605a5713d7d07118
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Apr 25 18:02:53 2016 +0200
backports: ath9k fix ht40 init.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit a03527d459e3e6374972698e74f097cf9bff5000
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Apr 21 17:58:07 2016 +0200
core101: remove old rpi kernel modules.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit fc9ea3bc4bb5d58fe3fa952cbe658206d3ce88e9
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Apr 21 17:53:08 2016 +0200
core101: add changed packages to updater.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit bb28d8913a53b0c854d88bff34b4b63c7383da58
Merge: 23bb683 9fcba2b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Apr 20 17:45:49 2016 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit 9fcba2b5df715041e4a9057e749de2faee46e508
Merge: 32d91ec c485f38
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 20 16:24:12 2016 +0100
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit 32d91ecad81e1d18b5631d9a58692725926cc908
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 20 16:23:22 2016 +0100
conntrack: Remove old disable_nf_sip indicator file
This is not used any more and not needed either.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 977007bfd9b463e9c6418ccf1547dee0944cc82b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 20 16:22:31 2016 +0100
core101: Migrate conntrack settings that broke in 100
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a3712ff967ddc5dff05a39a8319981ba9b42b6a6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 20 16:15:55 2016 +0100
core101: Add recent changes on firewall
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2f662bf05894c031754e4e7d9c807709a72bb674
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 20 16:14:14 2016 +0100
optionsfw.cgi: Clean up code
Add translation to radio buttons. No functional changes.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8e7c5e65ad3ad6ab9005b0018b9dfaa4532183b4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 20 16:04:24 2016 +0100
firewall: Fix connection tracking for PPTP
GRE connections were not correctly forwarded without the helper
being enabled. Choosing the wrong protocol here did not allow
us to load it properly.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 23bb6839024fd112c4a394c6f72e7707a110226c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Apr 20 10:19:46 2016 +0200
firewall: fix nat module load for application layer gateways
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit c485f38c996cab87c98a78f1cadc2c2197d30625
Merge: b243767 4bee1eb
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Apr 19 22:04:24 2016 +0200
Merge remote-tracking branch 'origin/core100' into next
commit b243767b1069c587996cad4ca60578ff8b06379d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Apr 19 18:41:32 2016 +0200
kernel: fix mac80211 build on rpi.
mac80211 depends on CRYPTO_GCM don't know why this was off before in
rpi config.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit f64aae96e49b8e81096bdb3043e79ce5edb6ebe2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Apr 17 20:22:44 2016 +0100
core101: Ship updated dma
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b01d8a6830bce91ad148d6d781ecc66fe42c01f6
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun Apr 17 19:34:47 2016 +0200
dma: Update to 0.11
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a2f63d7e2e9eebcef66dfb92dfff749e4857e445
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun Apr 17 20:50:49 2016 +0200
lcdproc 0.5.7: Fixes for rootfile
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8f31e52dbcef59c43fdede570aa9bebbe05b21fd
Author: Eberhard Beilharz <eb1(a)sil.org>
Date: Sat Apr 16 23:28:11 2016 +0200
Add missing end-quote to xen-image-maker
Signed-off-by: Eberhard Beilharz <eb1(a)sil.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0e664ce92f8f183d8b26869cae99a9955ac4db8b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Apr 15 14:19:19 2016 +0200
core101: exclude grub.cfg and grubenv from updates.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit d00032e76530e9ba18f24ed182e1b5e9a4bfebe5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Apr 14 11:24:40 2016 +0100
lcdproc: Bump release
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 41a8f7f3cc90f4abbb448d630b62a20a27c017a9
Author: Sascha Kilian <sascha(a)sakisoft.de>
Date: Wed Apr 13 15:04:39 2016 +0000
lcdproc: Update to 0.5.7
Signed-off-by: Sascha Kilian <sascha(a)sakisoft.de>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 77ecb239d30f979d6fca595aaf79c40214bf758a
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Apr 13 22:20:58 2016 +0200
samba: import RHEL security fixes.
CVE-2015-7560
CVE-2016-2110
CVE-2016-2111
CVE-2016-2112
CVE-2016-2115
CVE-2016-2118 aka Badlock
CVE-2015-5370
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 5208ceedd90d01acc3cb0ef9b34903d449aedb9a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Apr 11 10:20:00 2016 +0100
installer: Force overwriting EXT4 FS
On 64 bit systems, the installation fails if a previous XFS FS
is detected on the partition an EXT4 FS should be formatted.
This does not happen on 32 bit systems.
Fixes: #11091
Reported-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Tested-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 17d270d5c95c63b9029b3a0e87820b7d59e7da36
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Apr 10 09:41:08 2016 +0200
dnsdist: disable parallel build
on 4 core machines with 2GB ram the parallel build fails
with out of memory.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 36ba4ebe992fd023f9c86efd8a8d66fa0aa751ad
Merge: b395d32 78d4915
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 8 16:16:57 2016 +0100
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit b395d3289d0008b4fd274346f6cb5b50096b6f71
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Apr 8 15:18:03 2016 +0200
New package ncat.
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 45b7ed8519225a084a395c1ec7740646635ee9f8
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Apr 8 15:18:02 2016 +0200
Build nmap without ncat.
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 33a24fccc2840a48c89e99a388cb3923e7e6b4cd
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Apr 8 15:18:01 2016 +0200
Remove the nc symlink from netcat package and rename to gnu-netcat (gnu-netcat is no longer our standard netcat)
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 78d49152a8838474eba0ab103ad7897aa2de7b53
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 8 15:55:46 2016 +0100
core101: Ship latest changes in CGI files
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0aff7b81965c06756ff42482ef0aa3ccfa68bf8f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Apr 4 16:41:30 2016 +0100
{proxy,chpasswd}.cgi: Fix a remote code execution vulnerability
Handcrafted requests with shell commands could be sent to these
CGI files and gain shell access as unprivileged user.
References: #11087
Reported-by: Yann Cam <yann.cam(a)gmail.com>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f367d5b38845e73b6e4963374c021e565283208d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Apr 4 14:22:56 2016 +0100
ipinfo.cgi: Remove XSS vulnerability
References: #11087
Reported-by: Yann Cam <yann.cam(a)gmail.com>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c954b6acdccddaa7cda03f9cebb7db21e36123d5
Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Date: Thu Apr 7 19:37:06 2016 +0200
bwm-ng: update to 0.6.1
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 31db25e52bc08e17a789f297bb2f7e2985380075
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Apr 8 13:36:44 2016 +0200
dmidecode: fix rootfile.
symlink is not working at common/arch because the check will seek files.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit fa4ac4f3dd3fd2f8e29be1ebeff9ebbc30035216
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Apr 8 13:32:28 2016 +0200
perl-Apache-Htpasswd: fix rootfiles
Signel-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 56f2056c67c5d73d60fa6507e6ba980064610c7e
Merge: c899b16 9a6be06
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 6 21:48:32 2016 +0100
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit c899b16e2e774e65dddaf0392cf410811ffe55b2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 6 21:48:19 2016 +0100
squid: Update rootfile
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 9a6be065359cc1166af4caf61c0e3e1419cbc2d2
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Apr 6 19:57:46 2016 +0200
core101: start update.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 9f19223e4e4db2b120014d562367ce697011d3f8
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Apr 6 19:44:34 2016 +0200
mcelog: new package
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 5a9c93964bb4411fcadff78fbd6c82a043744285
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Apr 1 21:49:02 2016 +0200
New package iperf3
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c07053012f7007a627a92141db162675370c909e
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Fri Apr 1 09:01:28 2016 +0200
pcre 8.38: latest patches from upstream (LFS)
* Fix auto-callout (?# comment bug.
* Fix negated POSIX class within negated overall class UCP bug.
* Fix bug for isolated \E between an item and its qualifier
when auto callout is set.
* Give error for regexec with pmatch=NULL and REG_STARTEND set.
* Allow for up to 32-bit numbers in the ordin() function in pcregrep.
* Fix \Q\E before qualifier bug when auto callouts are enabled.
* Fix /x bug when pattern starts with white space and (?-x).
* Fix copy named substring bug.
* Fix (by hacking) another length computation issue.
* Fix get_substring_list() bug when \K is used in an assertion.
* Fix pcretest bad behaviour for callout in lookbehind.
* Fix workspace overflow for (*ACCEPT) with deeply nested parentheses.
* Yet another duplicate name bugfix by overestimating the
memory needed (i.e. another hack - PCRE2 has this "properly" fixed).
* Fix pcretest loop for global matching with an ovector size less than 2.
* Fix non-diagnosis of missing assertion after (?(?C).
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8e6421d78ec03d5ad32c82328838e4fac9dfac20
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Feb 27 09:17:26 2016 +0100
squid 3.4.14: Bugfix for #4323 (Netfilter broken cross-includes with Linux 4.2)
For details see: http://bugs.squid-cache.org/show_bug.cgi?id=4323
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit bdb319c0ca21c0540a7f2a652c0c431c6f894593
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Apr 5 22:52:54 2016 +0100
squid: Patch SQUID-2016:3/CVE-2016-3947
http://www.squid-cache.org/Advisories/SQUID-2016_3.txt
Due to a buffer overrun Squid pinger binary is vulnerable to
denial of service or information leak attack when processing
ICMPv6 packets.
This bug also permits the server response to manipulate other
ICMP and ICMPv6 queries processing to cause information leak.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 52b08bc1eab066e360f4dfeb5f2c6085be97947a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Apr 4 16:28:09 2016 +0100
perl-Apache-Htpasswd: New module
Used to change passwords in Apache's htpasswd files
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 6a30a2d4b758eb49940e40d90dbb96f597beaa03
Merge: 251cde3 b3b5bbb
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 1 19:13:17 2016 +0100
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit 251cde3dfc36c03d171dd6532787d7b5202445d3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 1 19:12:47 2016 +0100
dmidecode: Move into core system
This should not be a package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0dbd30710dab8ca9e36d10951983373ca0dac48f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 1 19:11:30 2016 +0100
dmidecode: Only build on x86
ARM is obviously not supported
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b3b5bbb95a48106dd370e5e5003bacb488e4efb7
Merge: 4ffb9f9 b580a05
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Apr 1 13:29:40 2016 +0200
Merge branch 'master' into next
commit 8aa205f5fe97a9b94f9d9f478fa62c4fc584b59f
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Wed Mar 30 11:56:37 2016 +0200
bind: Update to 9.10.3-P4
Changelog (excerpt):
[security] Duplicate EDNS COOKIE options in a response could
trigger an assertion failure. (CVE-2016-2088) [RT #41809]
[security] Fix resolver assertion failure due to improper
DNAME handling when parsing fetch reply messages.
(CVE-2016-1286) [RT #41753]
[security] Malformed control messages can trigger assertions
in named and rndc. (CVE-2016-1285) [RT #41666]
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit da0dec75a7d5e327dbf320c9c1c04361745c88af
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun Feb 7 19:11:48 2016 +0100
bind: Update to 9.10.3-p3
Changelog (excerpt):
[bug] Fixed a regression in resolver.c:possibly_mark()
which caused known-bogus servers to be queried
anyway. [RT #41321]
[security] render_ecs errors were mishandled when printing out
a OPT record resulting in a assertion failure.
(CVE-2015-8705) [RT #41397]
[security] Specific APL data could trigger a INSIST.
(CVE-2015-8704) [RT #41396]
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 4ffb9f95ad615e741954464e764ff4a70c38bf9b
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Wed Mar 30 19:31:30 2016 +0200
New package dmidecode
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit dc942e1959c29353dff5858ac8825b68d0a7462c
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Thu Mar 31 11:12:25 2016 +0200
binutils 2.24: Fixes for rootfiles
Last builds were always complaining about changes in rootfiles...
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f1a015425b64a5c0c489fed124c8fea5c8519cc5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Mar 31 13:35:57 2016 +0100
pcre: Delete old patches
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0a0059c3e6a21a19f18542c170e57509a1eb53a3
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Thu Mar 31 11:20:21 2016 +0200
pcre: Update to 8.38
Bugfix release
For complete changelog see:
http://www.pcre.org/original/changelog.txt
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 20f79e190e0bc6431f91eb9f0e4fde0e3fad5e0e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 29 21:56:05 2016 +0100
opus: Build in parallel
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ad77dfeac119582a53a97f9e30a8d634fdd6594a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 29 21:54:31 2016 +0100
opus: Don't ship development files
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 02fa48b12c16753c6622d8ab904c40d0db776a3a
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Tue Mar 29 20:57:41 2016 +0200
Enable spice support in qemu, add spice as a dependency for qemu and bump qemu version number.
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8d90174af53cb4631bf98e0f056be84b925d6228
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Tue Mar 29 20:57:40 2016 +0200
Add all new packages (opus, python-pyparsing, python-six, spice-protocol, spice) to make.sh
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit dc2f6cac63c3f336ab82235ec69e83fe32c14796
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Tue Mar 29 20:57:39 2016 +0200
New package spice
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7657c08d587d6053d9d6318fe55be6e6232686fe
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Tue Mar 29 20:57:38 2016 +0200
New package spice-protocol (required by spice (only for build))
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e54c37bba11859ad7707e7b3eab9dc99e06afe60
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Tue Mar 29 20:57:37 2016 +0200
New package python-pyparsing (required by spice (only for build))
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ef1798872ba81be24df331b8646a900d01a3ce09
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Tue Mar 29 20:57:36 2016 +0200
New package python-six (required by spice (only for build))
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a9d0172bac3a6765ca282ecec0548491ed9dbb6f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 29 21:48:23 2016 +0100
opus: Remove whitespace errors
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a7775d4dc4b7da68d292c64d3b65b740f731b674
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Tue Mar 29 20:57:35 2016 +0200
New package opus (required by spice)
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f56d44e5f20ea7093acb4f6e2280a9d52586c535
Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Date: Wed Mar 23 20:41:48 2016 +0100
libxml2: update to 2.9.3
Contains security fixes and other bug fixes:
CVE-2015-8242 Buffer overead with HTML parser in push mode (Hugh Davenport)
CVE-2015-7500 Fix memory access error due to incorrect entities boundaries (Daniel Veillard)
CVE-2015-7499-2 Detect incoherency on GROW (Daniel Veillard)
CVE-2015-7499-1 Add xmlHaltParser() to stop the parser (Daniel Veillard)
CVE-2015-5312 Another entity expansion issue (David Drysdale)
CVE-2015-7497 Avoid an heap buffer overflow in xmlDictComputeFastQKey (David Drysdale)
CVE-2015-7498 Avoid processing entities after encoding conversion failures (Daniel Veillard)
CVE-2015-8035 Fix XZ compression support loop (Daniel Veillard)
CVE-2015-7942-2 Fix an error in previous Conditional section patch (Daniel Veillard)
CVE-2015-7942 Another variation of overflow in Conditional sections (Daniel Veillard)
CVE-2015-1819 Enforce the reader to run in constant memory (Daniel Veillard)
CVE-2015-7941_2 Cleanup conditional section error handling (Daniel Veillard)
CVE-2015-7941_1 Stop parsing on entities boundaries errors (Daniel Veillard)
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8fd9a68ee5d74b28e7861e43918824605fa5f31e
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Mar 25 17:13:38 2016 +0100
bump ebtables version number
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ea1cffd50d30e0e85a5cf1ca437896f652f0e361
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Mar 25 11:13:16 2016 +0100
build ebtables with the new patch (nothing go into usr local)
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a365d9d04b47efd48b832f8bf86d223e2c0fe958
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Mar 25 11:13:15 2016 +0100
add a patch for ebtables (to fix the problem with usr local)
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit dcea7ef891e037c916d57bb33b34ea4f12ce7782
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Thu Mar 24 20:29:08 2016 +0100
nano: Update to 2.5.3
Contains several bugfixes and improvements, for details see:
http://www.nano-editor.org/dist/v2.5/ChangeLog
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 046894ab7fbe281c24e460ac48841e8d5e9f5328
Merge: e2347f4 ae04f24
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Mar 27 22:17:16 2016 +0200
Merge remote-tracking branch 'origin/master' into next
commit e2347f49bb32f81437bf01053afb7aeb96518c7b
Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Date: Thu Mar 24 15:59:11 2016 +0100
git: update to 2.7.4
Remote Code Execution in all git versions: CVE-2016-2324 and CVE-2016-2315
Git version 2.7.4 was released with the fixes for all known vulnerabilities
https://github.com/git/git/tree/master/Documentation/RelNotes
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 84fce430a3d5ee7dc7693f995143437d20f52742
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 22 22:21:25 2016 +0000
e2fsprogs: Fix indentation of makefile
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 677fa734b8c0505744d19afba56d1717d7c66616
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 22 22:19:25 2016 +0000
e2fsprogs: Only build in own directory
This makes it easier to clean up after the build
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit bda83227aa0ea509e5b78c11ce607fa8c4e34aa8
Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Date: Wed Mar 9 07:32:21 2016 +0100
e2fsprogs: update to 1.42.13
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d5f7b3aad9c260ce633d16d5a130ca21967d6717
Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Date: Thu Mar 10 17:47:55 2016 +0100
pkg-config: update to 0.29
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 52c277d917188a860ab050012e5df8685320fa56
Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Date: Thu Mar 10 18:00:17 2016 +0100
grep: update to 2.23
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b336f14656d9979d059284d9bc827c499230596d
Author: Dirk Wagner <dirk.wagner(a)ipfire.org>
Date: Sat Feb 20 21:11:03 2016 +0100
asterisk addon: update to 11.21.1
Signed-off-by: Dirk Wagner <dirk.wagner(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a82348347b2f7622f97f171f2ed67a96129300c6
Author: Dirk Wagner <dirk.wagner(a)ipfire.org>
Date: Fri Feb 19 23:58:16 2016 +0100
libsrtp: upgrade to 1.5.4
Signed-off-by: Dirk Wagner <dirk.wagner(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 4d137b36f1c669eddb938b95597f22ce168d7374
Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Date: Tue Mar 22 18:43:01 2016 +0100
git: update to 2.7.1
Fixes CVE-2016-2324 and CVE-2016‑2315
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d5ef73a3953bfc828adfd2c0a73d5e5be3617bfc
Author: Marcel Lorenz <lorenz.marcel(a)web.de>
Date: Thu Feb 18 11:38:30 2016 +0100
patch: update to 2.7.5
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f2d02e74e148ed324fe7c10bd33ce3ced42fb09f
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Fri Mar 4 17:50:54 2016 +0100
clamav: Update to 0.99.1
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 68756bd199a30443260f47a45cab9f3ad22c0c63
Author: Marcel Lorenz <lorenz.marcel(a)web.de>
Date: Fri Mar 4 08:12:00 2016 +0100
pciutils: update to 3.4.1
Update pciutils to last version from Linux from Scratch.
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5893c919c9fe19c78323094ab243ce7c16623873
Author: Marcel Lorenz <lorenz.marcel(a)web.de>
Date: Thu Mar 3 19:23:18 2016 +0100
texinfo: update to 5.2
Update texinfo to version 5.2 from linux from scratch
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1bdadcba1001f7bfef382704ce05e9e04afada80
Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Date: Wed Mar 9 07:40:25 2016 +0100
paxctl: update to 0.9
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 44c63c96123227eb5d27ff9305c20893340a4dfc
Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Date: Wed Mar 9 07:29:48 2016 +0100
mpfr: update to 3.1.3
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit de4d892ba7327209af1bdde8166285c541937e8f
Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Date: Wed Mar 9 07:36:18 2016 +0100
gmp: update to 6.0.1
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit dea4b0ab645fe1c3c621a4e79c99d6dace57c447
Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Date: Thu Mar 10 07:24:52 2016 +0100
htop: update to verion 2.0.1
With ncurses 6.0, htop will also support your mouse wheel for scrolling
I tried it... :) very nice tool...
http://hisham.hm/htop/
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a1d55fca65eb829cb5fe609640850376da1e53ee
Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Date: Thu Mar 17 15:12:29 2016 +0100
nettle: update to 3.2
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 916cf307b19d6d267b3a8737ba9b299284c0f137
by git＠ipfire.org 25 Apr '16
by git＠ipfire.org 25 Apr '16
25 Apr '16
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 916cf307b19d6d267b3a8737ba9b299284c0f137 (commit)
via 875bd87bbd1de44979d1d1a4605a5713d7d07118 (commit)
via a03527d459e3e6374972698e74f097cf9bff5000 (commit)
via fc9ea3bc4bb5d58fe3fa952cbe658206d3ce88e9 (commit)
via bb28d8913a53b0c854d88bff34b4b63c7383da58 (commit)
via 9fcba2b5df715041e4a9057e749de2faee46e508 (commit)
via 32d91ecad81e1d18b5631d9a58692725926cc908 (commit)
via 977007bfd9b463e9c6418ccf1547dee0944cc82b (commit)
via a3712ff967ddc5dff05a39a8319981ba9b42b6a6 (commit)
via 2f662bf05894c031754e4e7d9c807709a72bb674 (commit)
via 8e7c5e65ad3ad6ab9005b0018b9dfaa4532183b4 (commit)
via 23bb6839024fd112c4a394c6f72e7707a110226c (commit)
via c485f38c996cab87c98a78f1cadc2c2197d30625 (commit)
via b243767b1069c587996cad4ca60578ff8b06379d (commit)
via 4bee1eb491e8193fa75be2dd6b450aacf3772368 (commit)
via 0c459f8c7e2bb155a7fed002cc6c52fce1b14c5b (commit)
via f64aae96e49b8e81096bdb3043e79ce5edb6ebe2 (commit)
via b01d8a6830bce91ad148d6d781ecc66fe42c01f6 (commit)
via a2f63d7e2e9eebcef66dfb92dfff749e4857e445 (commit)
via 8f31e52dbcef59c43fdede570aa9bebbe05b21fd (commit)
via 0e664ce92f8f183d8b26869cae99a9955ac4db8b (commit)
via a2c6ae9e1576a5f9720f300a485a850390168bf9 (commit)
via d00032e76530e9ba18f24ed182e1b5e9a4bfebe5 (commit)
via 41a8f7f3cc90f4abbb448d630b62a20a27c017a9 (commit)
via 77ecb239d30f979d6fca595aaf79c40214bf758a (commit)
via 5208ceedd90d01acc3cb0ef9b34903d449aedb9a (commit)
via 17d270d5c95c63b9029b3a0e87820b7d59e7da36 (commit)
via 36ba4ebe992fd023f9c86efd8a8d66fa0aa751ad (commit)
via b395d3289d0008b4fd274346f6cb5b50096b6f71 (commit)
via 45b7ed8519225a084a395c1ec7740646635ee9f8 (commit)
via 33a24fccc2840a48c89e99a388cb3923e7e6b4cd (commit)
via 78d49152a8838474eba0ab103ad7897aa2de7b53 (commit)
via 0aff7b81965c06756ff42482ef0aa3ccfa68bf8f (commit)
via f367d5b38845e73b6e4963374c021e565283208d (commit)
via c954b6acdccddaa7cda03f9cebb7db21e36123d5 (commit)
via 31db25e52bc08e17a789f297bb2f7e2985380075 (commit)
via fa4ac4f3dd3fd2f8e29be1ebeff9ebbc30035216 (commit)
via 56f2056c67c5d73d60fa6507e6ba980064610c7e (commit)
via c899b16e2e774e65dddaf0392cf410811ffe55b2 (commit)
via 9a6be065359cc1166af4caf61c0e3e1419cbc2d2 (commit)
via 9f19223e4e4db2b120014d562367ce697011d3f8 (commit)
via 5a9c93964bb4411fcadff78fbd6c82a043744285 (commit)
via c07053012f7007a627a92141db162675370c909e (commit)
via 8e6421d78ec03d5ad32c82328838e4fac9dfac20 (commit)
via bdb319c0ca21c0540a7f2a652c0c431c6f894593 (commit)
via 52b08bc1eab066e360f4dfeb5f2c6085be97947a (commit)
via 6a30a2d4b758eb49940e40d90dbb96f597beaa03 (commit)
via 251cde3dfc36c03d171dd6532787d7b5202445d3 (commit)
via 0dbd30710dab8ca9e36d10951983373ca0dac48f (commit)
via b3b5bbb95a48106dd370e5e5003bacb488e4efb7 (commit)
via 8aa205f5fe97a9b94f9d9f478fa62c4fc584b59f (commit)
via da0dec75a7d5e327dbf320c9c1c04361745c88af (commit)
via 4ffb9f95ad615e741954464e764ff4a70c38bf9b (commit)
via dc942e1959c29353dff5858ac8825b68d0a7462c (commit)
via f1a015425b64a5c0c489fed124c8fea5c8519cc5 (commit)
via 0a0059c3e6a21a19f18542c170e57509a1eb53a3 (commit)
via 20f79e190e0bc6431f91eb9f0e4fde0e3fad5e0e (commit)
via ad77dfeac119582a53a97f9e30a8d634fdd6594a (commit)
via 02fa48b12c16753c6622d8ab904c40d0db776a3a (commit)
via 8d90174af53cb4631bf98e0f056be84b925d6228 (commit)
via dc2f6cac63c3f336ab82235ec69e83fe32c14796 (commit)
via 7657c08d587d6053d9d6318fe55be6e6232686fe (commit)
via e54c37bba11859ad7707e7b3eab9dc99e06afe60 (commit)
via ef1798872ba81be24df331b8646a900d01a3ce09 (commit)
via a9d0172bac3a6765ca282ecec0548491ed9dbb6f (commit)
via a7775d4dc4b7da68d292c64d3b65b740f731b674 (commit)
via f56d44e5f20ea7093acb4f6e2280a9d52586c535 (commit)
via 8fd9a68ee5d74b28e7861e43918824605fa5f31e (commit)
via ea1cffd50d30e0e85a5cf1ca437896f652f0e361 (commit)
via a365d9d04b47efd48b832f8bf86d223e2c0fe958 (commit)
via dcea7ef891e037c916d57bb33b34ea4f12ce7782 (commit)
via 046894ab7fbe281c24e460ac48841e8d5e9f5328 (commit)
via e2347f49bb32f81437bf01053afb7aeb96518c7b (commit)
via 84fce430a3d5ee7dc7693f995143437d20f52742 (commit)
via 677fa734b8c0505744d19afba56d1717d7c66616 (commit)
via bda83227aa0ea509e5b78c11ce607fa8c4e34aa8 (commit)
via d5f7b3aad9c260ce633d16d5a130ca21967d6717 (commit)
via 52c277d917188a860ab050012e5df8685320fa56 (commit)
via b336f14656d9979d059284d9bc827c499230596d (commit)
via a82348347b2f7622f97f171f2ed67a96129300c6 (commit)
via 4d137b36f1c669eddb938b95597f22ce168d7374 (commit)
via d5ef73a3953bfc828adfd2c0a73d5e5be3617bfc (commit)
via f2d02e74e148ed324fe7c10bd33ce3ced42fb09f (commit)
via 68756bd199a30443260f47a45cab9f3ad22c0c63 (commit)
via 5893c919c9fe19c78323094ab243ce7c16623873 (commit)
via 1bdadcba1001f7bfef382704ce05e9e04afada80 (commit)
via 44c63c96123227eb5d27ff9305c20893340a4dfc (commit)
via de4d892ba7327209af1bdde8166285c541937e8f (commit)
via dea4b0ab645fe1c3c621a4e79c99d6dace57c447 (commit)
via a1d55fca65eb829cb5fe609640850376da1e53ee (commit)
from b580a05b05302ab7931ca8d92e0b64fb9b23ed74 (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 916cf307b19d6d267b3a8737ba9b299284c0f137
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Apr 25 21:44:47 2016 +0200
core101: close core update.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 875bd87bbd1de44979d1d1a4605a5713d7d07118
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Apr 25 18:02:53 2016 +0200
backports: ath9k fix ht40 init.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit a03527d459e3e6374972698e74f097cf9bff5000
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Apr 21 17:58:07 2016 +0200
core101: remove old rpi kernel modules.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit fc9ea3bc4bb5d58fe3fa952cbe658206d3ce88e9
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Apr 21 17:53:08 2016 +0200
core101: add changed packages to updater.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit bb28d8913a53b0c854d88bff34b4b63c7383da58
Merge: 23bb683 9fcba2b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Apr 20 17:45:49 2016 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit 9fcba2b5df715041e4a9057e749de2faee46e508
Merge: 32d91ec c485f38
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 20 16:24:12 2016 +0100
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit 32d91ecad81e1d18b5631d9a58692725926cc908
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 20 16:23:22 2016 +0100
conntrack: Remove old disable_nf_sip indicator file
This is not used any more and not needed either.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 977007bfd9b463e9c6418ccf1547dee0944cc82b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 20 16:22:31 2016 +0100
core101: Migrate conntrack settings that broke in 100
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a3712ff967ddc5dff05a39a8319981ba9b42b6a6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 20 16:15:55 2016 +0100
core101: Add recent changes on firewall
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2f662bf05894c031754e4e7d9c807709a72bb674
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 20 16:14:14 2016 +0100
optionsfw.cgi: Clean up code
Add translation to radio buttons. No functional changes.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8e7c5e65ad3ad6ab9005b0018b9dfaa4532183b4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 20 16:04:24 2016 +0100
firewall: Fix connection tracking for PPTP
GRE connections were not correctly forwarded without the helper
being enabled. Choosing the wrong protocol here did not allow
us to load it properly.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 23bb6839024fd112c4a394c6f72e7707a110226c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Apr 20 10:19:46 2016 +0200
firewall: fix nat module load for application layer gateways
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit c485f38c996cab87c98a78f1cadc2c2197d30625
Merge: b243767 4bee1eb
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Apr 19 22:04:24 2016 +0200
Merge remote-tracking branch 'origin/core100' into next
commit b243767b1069c587996cad4ca60578ff8b06379d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Apr 19 18:41:32 2016 +0200
kernel: fix mac80211 build on rpi.
mac80211 depends on CRYPTO_GCM don't know why this was off before in
rpi config.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit f64aae96e49b8e81096bdb3043e79ce5edb6ebe2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Apr 17 20:22:44 2016 +0100
core101: Ship updated dma
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b01d8a6830bce91ad148d6d781ecc66fe42c01f6
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun Apr 17 19:34:47 2016 +0200
dma: Update to 0.11
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a2f63d7e2e9eebcef66dfb92dfff749e4857e445
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun Apr 17 20:50:49 2016 +0200
lcdproc 0.5.7: Fixes for rootfile
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8f31e52dbcef59c43fdede570aa9bebbe05b21fd
Author: Eberhard Beilharz <eb1(a)sil.org>
Date: Sat Apr 16 23:28:11 2016 +0200
Add missing end-quote to xen-image-maker
Signed-off-by: Eberhard Beilharz <eb1(a)sil.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0e664ce92f8f183d8b26869cae99a9955ac4db8b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Apr 15 14:19:19 2016 +0200
core101: exclude grub.cfg and grubenv from updates.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit d00032e76530e9ba18f24ed182e1b5e9a4bfebe5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Apr 14 11:24:40 2016 +0100
lcdproc: Bump release
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 41a8f7f3cc90f4abbb448d630b62a20a27c017a9
Author: Sascha Kilian <sascha(a)sakisoft.de>
Date: Wed Apr 13 15:04:39 2016 +0000
lcdproc: Update to 0.5.7
Signed-off-by: Sascha Kilian <sascha(a)sakisoft.de>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 77ecb239d30f979d6fca595aaf79c40214bf758a
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Apr 13 22:20:58 2016 +0200
samba: import RHEL security fixes.
CVE-2015-7560
CVE-2016-2110
CVE-2016-2111
CVE-2016-2112
CVE-2016-2115
CVE-2016-2118 aka Badlock
CVE-2015-5370
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 5208ceedd90d01acc3cb0ef9b34903d449aedb9a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Apr 11 10:20:00 2016 +0100
installer: Force overwriting EXT4 FS
On 64 bit systems, the installation fails if a previous XFS FS
is detected on the partition an EXT4 FS should be formatted.
This does not happen on 32 bit systems.
Fixes: #11091
Reported-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Tested-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
commit 17d270d5c95c63b9029b3a0e87820b7d59e7da36
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Apr 10 09:41:08 2016 +0200
dnsdist: disable parallel build
on 4 core machines with 2GB ram the parallel build fails
with out of memory.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 36ba4ebe992fd023f9c86efd8a8d66fa0aa751ad
Merge: b395d32 78d4915
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 8 16:16:57 2016 +0100
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit b395d3289d0008b4fd274346f6cb5b50096b6f71
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Apr 8 15:18:03 2016 +0200
New package ncat.
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 45b7ed8519225a084a395c1ec7740646635ee9f8
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Apr 8 15:18:02 2016 +0200
Build nmap without ncat.
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 33a24fccc2840a48c89e99a388cb3923e7e6b4cd
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Apr 8 15:18:01 2016 +0200
Remove the nc symlink from netcat package and rename to gnu-netcat (gnu-netcat is no longer our standard netcat)
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 78d49152a8838474eba0ab103ad7897aa2de7b53
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 8 15:55:46 2016 +0100
core101: Ship latest changes in CGI files
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0aff7b81965c06756ff42482ef0aa3ccfa68bf8f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Apr 4 16:41:30 2016 +0100
{proxy,chpasswd}.cgi: Fix a remote code execution vulnerability
Handcrafted requests with shell commands could be sent to these
CGI files and gain shell access as unprivileged user.
References: #11087
Reported-by: Yann Cam <yann.cam(a)gmail.com>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f367d5b38845e73b6e4963374c021e565283208d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Apr 4 14:22:56 2016 +0100
ipinfo.cgi: Remove XSS vulnerability
References: #11087
Reported-by: Yann Cam <yann.cam(a)gmail.com>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c954b6acdccddaa7cda03f9cebb7db21e36123d5
Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Date: Thu Apr 7 19:37:06 2016 +0200
bwm-ng: update to 0.6.1
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 31db25e52bc08e17a789f297bb2f7e2985380075
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Apr 8 13:36:44 2016 +0200
dmidecode: fix rootfile.
symlink is not working at common/arch because the check will seek files.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit fa4ac4f3dd3fd2f8e29be1ebeff9ebbc30035216
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Apr 8 13:32:28 2016 +0200
perl-Apache-Htpasswd: fix rootfiles
Signel-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 56f2056c67c5d73d60fa6507e6ba980064610c7e
Merge: c899b16 9a6be06
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 6 21:48:32 2016 +0100
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit c899b16e2e774e65dddaf0392cf410811ffe55b2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 6 21:48:19 2016 +0100
squid: Update rootfile
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 9a6be065359cc1166af4caf61c0e3e1419cbc2d2
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Apr 6 19:57:46 2016 +0200
core101: start update.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 9f19223e4e4db2b120014d562367ce697011d3f8
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Apr 6 19:44:34 2016 +0200
mcelog: new package
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 5a9c93964bb4411fcadff78fbd6c82a043744285
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Apr 1 21:49:02 2016 +0200
New package iperf3
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c07053012f7007a627a92141db162675370c909e
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Fri Apr 1 09:01:28 2016 +0200
pcre 8.38: latest patches from upstream (LFS)
* Fix auto-callout (?# comment bug.
* Fix negated POSIX class within negated overall class UCP bug.
* Fix bug for isolated \E between an item and its qualifier
when auto callout is set.
* Give error for regexec with pmatch=NULL and REG_STARTEND set.
* Allow for up to 32-bit numbers in the ordin() function in pcregrep.
* Fix \Q\E before qualifier bug when auto callouts are enabled.
* Fix /x bug when pattern starts with white space and (?-x).
* Fix copy named substring bug.
* Fix (by hacking) another length computation issue.
* Fix get_substring_list() bug when \K is used in an assertion.
* Fix pcretest bad behaviour for callout in lookbehind.
* Fix workspace overflow for (*ACCEPT) with deeply nested parentheses.
* Yet another duplicate name bugfix by overestimating the
memory needed (i.e. another hack - PCRE2 has this "properly" fixed).
* Fix pcretest loop for global matching with an ovector size less than 2.
* Fix non-diagnosis of missing assertion after (?(?C).
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8e6421d78ec03d5ad32c82328838e4fac9dfac20
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Feb 27 09:17:26 2016 +0100
squid 3.4.14: Bugfix for #4323 (Netfilter broken cross-includes with Linux 4.2)
For details see: http://bugs.squid-cache.org/show_bug.cgi?id=4323
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit bdb319c0ca21c0540a7f2a652c0c431c6f894593
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Apr 5 22:52:54 2016 +0100
squid: Patch SQUID-2016:3/CVE-2016-3947
http://www.squid-cache.org/Advisories/SQUID-2016_3.txt
Due to a buffer overrun Squid pinger binary is vulnerable to
denial of service or information leak attack when processing
ICMPv6 packets.
This bug also permits the server response to manipulate other
ICMP and ICMPv6 queries processing to cause information leak.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 52b08bc1eab066e360f4dfeb5f2c6085be97947a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Apr 4 16:28:09 2016 +0100
perl-Apache-Htpasswd: New module
Used to change passwords in Apache's htpasswd files
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 6a30a2d4b758eb49940e40d90dbb96f597beaa03
Merge: 251cde3 b3b5bbb
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 1 19:13:17 2016 +0100
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit 251cde3dfc36c03d171dd6532787d7b5202445d3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 1 19:12:47 2016 +0100
dmidecode: Move into core system
This should not be a package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0dbd30710dab8ca9e36d10951983373ca0dac48f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 1 19:11:30 2016 +0100
dmidecode: Only build on x86
ARM is obviously not supported
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b3b5bbb95a48106dd370e5e5003bacb488e4efb7
Merge: 4ffb9f9 b580a05
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Apr 1 13:29:40 2016 +0200
Merge branch 'master' into next
commit 8aa205f5fe97a9b94f9d9f478fa62c4fc584b59f
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Wed Mar 30 11:56:37 2016 +0200
bind: Update to 9.10.3-P4
Changelog (excerpt):
[security] Duplicate EDNS COOKIE options in a response could
trigger an assertion failure. (CVE-2016-2088) [RT #41809]
[security] Fix resolver assertion failure due to improper
DNAME handling when parsing fetch reply messages.
(CVE-2016-1286) [RT #41753]
[security] Malformed control messages can trigger assertions
in named and rndc. (CVE-2016-1285) [RT #41666]
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit da0dec75a7d5e327dbf320c9c1c04361745c88af
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun Feb 7 19:11:48 2016 +0100
bind: Update to 9.10.3-p3
Changelog (excerpt):
[bug] Fixed a regression in resolver.c:possibly_mark()
which caused known-bogus servers to be queried
anyway. [RT #41321]
[security] render_ecs errors were mishandled when printing out
a OPT record resulting in a assertion failure.
(CVE-2015-8705) [RT #41397]
[security] Specific APL data could trigger a INSIST.
(CVE-2015-8704) [RT #41396]
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 4ffb9f95ad615e741954464e764ff4a70c38bf9b
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Wed Mar 30 19:31:30 2016 +0200
New package dmidecode
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit dc942e1959c29353dff5858ac8825b68d0a7462c
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Thu Mar 31 11:12:25 2016 +0200
binutils 2.24: Fixes for rootfiles
Last builds were always complaining about changes in rootfiles...
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f1a015425b64a5c0c489fed124c8fea5c8519cc5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Mar 31 13:35:57 2016 +0100
pcre: Delete old patches
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0a0059c3e6a21a19f18542c170e57509a1eb53a3
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Thu Mar 31 11:20:21 2016 +0200
pcre: Update to 8.38
Bugfix release
For complete changelog see:
http://www.pcre.org/original/changelog.txt
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 20f79e190e0bc6431f91eb9f0e4fde0e3fad5e0e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 29 21:56:05 2016 +0100
opus: Build in parallel
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ad77dfeac119582a53a97f9e30a8d634fdd6594a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 29 21:54:31 2016 +0100
opus: Don't ship development files
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 02fa48b12c16753c6622d8ab904c40d0db776a3a
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Tue Mar 29 20:57:41 2016 +0200
Enable spice support in qemu, add spice as a dependency for qemu and bump qemu version number.
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8d90174af53cb4631bf98e0f056be84b925d6228
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Tue Mar 29 20:57:40 2016 +0200
Add all new packages (opus, python-pyparsing, python-six, spice-protocol, spice) to make.sh
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit dc2f6cac63c3f336ab82235ec69e83fe32c14796
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Tue Mar 29 20:57:39 2016 +0200
New package spice
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7657c08d587d6053d9d6318fe55be6e6232686fe
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Tue Mar 29 20:57:38 2016 +0200
New package spice-protocol (required by spice (only for build))
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e54c37bba11859ad7707e7b3eab9dc99e06afe60
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Tue Mar 29 20:57:37 2016 +0200
New package python-pyparsing (required by spice (only for build))
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ef1798872ba81be24df331b8646a900d01a3ce09
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Tue Mar 29 20:57:36 2016 +0200
New package python-six (required by spice (only for build))
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a9d0172bac3a6765ca282ecec0548491ed9dbb6f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 29 21:48:23 2016 +0100
opus: Remove whitespace errors
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a7775d4dc4b7da68d292c64d3b65b740f731b674
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Tue Mar 29 20:57:35 2016 +0200
New package opus (required by spice)
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f56d44e5f20ea7093acb4f6e2280a9d52586c535
Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Date: Wed Mar 23 20:41:48 2016 +0100
libxml2: update to 2.9.3
Contains security fixes and other bug fixes:
CVE-2015-8242 Buffer overead with HTML parser in push mode (Hugh Davenport)
CVE-2015-7500 Fix memory access error due to incorrect entities boundaries (Daniel Veillard)
CVE-2015-7499-2 Detect incoherency on GROW (Daniel Veillard)
CVE-2015-7499-1 Add xmlHaltParser() to stop the parser (Daniel Veillard)
CVE-2015-5312 Another entity expansion issue (David Drysdale)
CVE-2015-7497 Avoid an heap buffer overflow in xmlDictComputeFastQKey (David Drysdale)
CVE-2015-7498 Avoid processing entities after encoding conversion failures (Daniel Veillard)
CVE-2015-8035 Fix XZ compression support loop (Daniel Veillard)
CVE-2015-7942-2 Fix an error in previous Conditional section patch (Daniel Veillard)
CVE-2015-7942 Another variation of overflow in Conditional sections (Daniel Veillard)
CVE-2015-1819 Enforce the reader to run in constant memory (Daniel Veillard)
CVE-2015-7941_2 Cleanup conditional section error handling (Daniel Veillard)
CVE-2015-7941_1 Stop parsing on entities boundaries errors (Daniel Veillard)
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8fd9a68ee5d74b28e7861e43918824605fa5f31e
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Mar 25 17:13:38 2016 +0100
bump ebtables version number
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ea1cffd50d30e0e85a5cf1ca437896f652f0e361
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Mar 25 11:13:16 2016 +0100
build ebtables with the new patch (nothing go into usr local)
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a365d9d04b47efd48b832f8bf86d223e2c0fe958
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Fri Mar 25 11:13:15 2016 +0100
add a patch for ebtables (to fix the problem with usr local)
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit dcea7ef891e037c916d57bb33b34ea4f12ce7782
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Thu Mar 24 20:29:08 2016 +0100
nano: Update to 2.5.3
Contains several bugfixes and improvements, for details see:
http://www.nano-editor.org/dist/v2.5/ChangeLog
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 046894ab7fbe281c24e460ac48841e8d5e9f5328
Merge: e2347f4 ae04f24
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Mar 27 22:17:16 2016 +0200
Merge remote-tracking branch 'origin/master' into next
commit e2347f49bb32f81437bf01053afb7aeb96518c7b
Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Date: Thu Mar 24 15:59:11 2016 +0100
git: update to 2.7.4
Remote Code Execution in all git versions: CVE-2016-2324 and CVE-2016-2315
Git version 2.7.4 was released with the fixes for all known vulnerabilities
https://github.com/git/git/tree/master/Documentation/RelNotes
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 84fce430a3d5ee7dc7693f995143437d20f52742
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 22 22:21:25 2016 +0000
e2fsprogs: Fix indentation of makefile
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 677fa734b8c0505744d19afba56d1717d7c66616
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 22 22:19:25 2016 +0000
e2fsprogs: Only build in own directory
This makes it easier to clean up after the build
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit bda83227aa0ea509e5b78c11ce607fa8c4e34aa8
Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Date: Wed Mar 9 07:32:21 2016 +0100
e2fsprogs: update to 1.42.13
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d5f7b3aad9c260ce633d16d5a130ca21967d6717
Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Date: Thu Mar 10 17:47:55 2016 +0100
pkg-config: update to 0.29
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 52c277d917188a860ab050012e5df8685320fa56
Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Date: Thu Mar 10 18:00:17 2016 +0100
grep: update to 2.23
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b336f14656d9979d059284d9bc827c499230596d
Author: Dirk Wagner <dirk.wagner(a)ipfire.org>
Date: Sat Feb 20 21:11:03 2016 +0100
asterisk addon: update to 11.21.1
Signed-off-by: Dirk Wagner <dirk.wagner(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a82348347b2f7622f97f171f2ed67a96129300c6
Author: Dirk Wagner <dirk.wagner(a)ipfire.org>
Date: Fri Feb 19 23:58:16 2016 +0100
libsrtp: upgrade to 1.5.4
Signed-off-by: Dirk Wagner <dirk.wagner(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 4d137b36f1c669eddb938b95597f22ce168d7374
Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Date: Tue Mar 22 18:43:01 2016 +0100
git: update to 2.7.1
Fixes CVE-2016-2324 and CVE-2016‑2315
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d5ef73a3953bfc828adfd2c0a73d5e5be3617bfc
Author: Marcel Lorenz <lorenz.marcel(a)web.de>
Date: Thu Feb 18 11:38:30 2016 +0100
patch: update to 2.7.5
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f2d02e74e148ed324fe7c10bd33ce3ced42fb09f
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Fri Mar 4 17:50:54 2016 +0100
clamav: Update to 0.99.1
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 68756bd199a30443260f47a45cab9f3ad22c0c63
Author: Marcel Lorenz <lorenz.marcel(a)web.de>
Date: Fri Mar 4 08:12:00 2016 +0100
pciutils: update to 3.4.1
Update pciutils to last version from Linux from Scratch.
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5893c919c9fe19c78323094ab243ce7c16623873
Author: Marcel Lorenz <lorenz.marcel(a)web.de>
Date: Thu Mar 3 19:23:18 2016 +0100
texinfo: update to 5.2
Update texinfo to version 5.2 from linux from scratch
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1bdadcba1001f7bfef382704ce05e9e04afada80
Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Date: Wed Mar 9 07:40:25 2016 +0100
paxctl: update to 0.9
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 44c63c96123227eb5d27ff9305c20893340a4dfc
Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Date: Wed Mar 9 07:29:48 2016 +0100
mpfr: update to 3.1.3
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit de4d892ba7327209af1bdde8166285c541937e8f
Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Date: Wed Mar 9 07:36:18 2016 +0100
gmp: update to 6.0.1
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit dea4b0ab645fe1c3c621a4e79c99d6dace57c447
Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Date: Thu Mar 10 07:24:52 2016 +0100
htop: update to verion 2.0.1
With ncurses 6.0, htop will also support your mouse wheel for scrolling
I tried it... :) very nice tool...
http://hisham.hm/htop/
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a1d55fca65eb829cb5fe609640850376da1e53ee
Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Date: Thu Mar 17 15:12:29 2016 +0100
nettle: update to 3.2
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/kernel/kernel.config.armv5tel-ipfire-rpi | 6 +-
config/kernel/kernel.config.i586-ipfire-pae | 4 +-
config/rootfiles/common/armv5tel/binutils | 1 +
config/rootfiles/common/armv5tel/gmp | 4 +-
config/rootfiles/common/configroot | 1 -
config/rootfiles/common/e2fsprogs | 4 +
config/rootfiles/common/i586/binutils | 1 +
config/rootfiles/common/i586/dmidecode | 12 +
config/rootfiles/common/i586/gmp | 6 +-
config/rootfiles/common/libxml2 | 432 +-
config/rootfiles/common/mpfr | 4 +-
config/rootfiles/common/nettle | 6 +-
config/rootfiles/common/pciutils | 2 +-
config/rootfiles/common/pcre | 2 +-
config/rootfiles/common/perl-Apache-Htpasswd | 6 +
config/rootfiles/common/python-pyparsing | 9 +
config/rootfiles/common/python-six | 9 +
config/rootfiles/common/spice-protocol | 42 +
config/rootfiles/common/texinfo | 395 +-
config/rootfiles/common/x86_64/binutils | 1 +
config/rootfiles/common/x86_64/dmidecode | 12 +
config/rootfiles/common/x86_64/gmp | 4 +-
config/rootfiles/core/{100 => 101}/exclude | 2 +
.../core/101/filelists/armv5tel/ath9k-module | 3 +
.../82 => core/101}/filelists/armv5tel/gmp | 0
.../core/{100 => 101}/filelists/armv5tel/linux-rpi | 0
config/rootfiles/core/{100 => 101}/filelists/bind | 0
.../{oldcore/96 => core/101}/filelists/dma | 0
.../{oldcore/77 => core/101}/filelists/e2fsprogs | 0
config/rootfiles/core/101/filelists/files | 7 +
config/rootfiles/core/{100 => 101}/filelists/grep | 0
.../rootfiles/core/101/filelists/i586/ath9k-module | 3 +
config/rootfiles/core/101/filelists/i586/dmidecode | 1 +
.../{oldcore/82 => core/101}/filelists/i586/gmp | 0
.../{oldcore/91 => core/101}/filelists/libxml2 | 0
.../{oldcore/82 => core/101}/filelists/mpfr | 0
.../{oldcore/93 => core/101}/filelists/nettle | 0
.../{oldcore/87 => core/101}/filelists/patch | 0
.../{oldcore/77 => core/101}/filelists/paxctl | 0
.../{oldcore/66 => core/101}/filelists/pciutils | 0
.../{oldcore/94 => core/101}/filelists/pcre | 0
.../core/101/filelists/perl-Apache-Htpasswd | 1 +
config/rootfiles/core/{100 => 101}/filelists/squid | 0
.../core/101/filelists/x86_64/ath9k-module | 2 +
.../rootfiles/core/101/filelists/x86_64/dmidecode | 1 +
config/rootfiles/core/101/filelists/x86_64/gmp | 1 +
config/rootfiles/core/{99 => 101}/meta | 0
config/rootfiles/core/{99 => 101}/update.sh | 45 +-
config/rootfiles/{core => oldcore}/100/exclude | 2 +
.../100/filelists/armv5tel/binutils | 0
.../{core => oldcore}/100/filelists/armv5tel/gcc | 0
.../{core => oldcore}/100/filelists/armv5tel/glibc | 0
.../100/filelists/armv5tel/linux-kirkwood | 0
.../100/filelists/armv5tel/linux-multi | 0
.../{95 => 100}/filelists/armv5tel/linux-rpi | 0
.../100/filelists/ath10k-firmware | 0
.../rootfiles/oldcore/{94 => 100}/filelists/bind | 0
.../{core => oldcore}/100/filelists/diffutils | 0
.../{core => oldcore}/100/filelists/dnsmasq | 0
.../{core => oldcore}/100/filelists/files | 0
.../rootfiles/oldcore/{89 => 100}/filelists/grep | 0
.../{core => oldcore}/100/filelists/i586/binutils | 0
.../{core => oldcore}/100/filelists/i586/gcc | 0
.../{core => oldcore}/100/filelists/i586/glibc | 0
.../{core => oldcore}/100/filelists/i586/grub | 0
.../{core => oldcore}/100/filelists/i586/linux | 0
.../100/filelists/i586/linux-initrd | 0
.../99 => oldcore/100}/filelists/i586/openssl-sse2 | 0
.../{core => oldcore}/100/filelists/libmpc | 0
.../rootfiles/{core => oldcore}/100/filelists/lua | 0
.../100/filelists/mt7601u-firmware | 0
.../{core => oldcore}/100/filelists/ncurses | 0
.../rootfiles/{core => oldcore}/100/filelists/ntp | 0
.../{core/99 => oldcore/100}/filelists/openssh | 0
.../{core/99 => oldcore/100}/filelists/openssl | 0
.../{core => oldcore}/100/filelists/openvpn | 0
.../rootfiles/{core => oldcore}/100/filelists/sed | 0
.../rootfiles/oldcore/{94 => 100}/filelists/squid | 0
.../{core => oldcore}/100/filelists/tzdata | 0
.../100/filelists/x86_64/binutils | 0
.../{core => oldcore}/100/filelists/x86_64/gcc | 0
.../{core => oldcore}/100/filelists/x86_64/glibc | 0
.../{core => oldcore}/100/filelists/x86_64/grub | 0
.../{core => oldcore}/100/filelists/x86_64/linux | 0
.../100/filelists/x86_64/linux-initrd | 0
.../rootfiles/{core => oldcore}/100/filelists/xz | 0
config/rootfiles/{core => oldcore}/100/meta | 0
config/rootfiles/{core => oldcore}/100/update.sh | 0
config/rootfiles/{core => oldcore}/99/exclude | 0
.../rootfiles/{core => oldcore}/99/filelists/files | 0
.../100 => oldcore/99}/filelists/i586/openssl-sse2 | 0
.../{core/100 => oldcore/99}/filelists/openssh | 0
.../{core/100 => oldcore/99}/filelists/openssl | 0
config/rootfiles/oldcore/{98 => 99}/meta | 0
config/rootfiles/{core => oldcore}/99/update.sh | 0
config/rootfiles/packages/ebtables | 9 +-
config/rootfiles/packages/git | 44 +-
config/rootfiles/packages/{netcat => gnu-netcat} | 1 -
config/rootfiles/packages/iperf3 | 9 +
config/rootfiles/packages/lcdproc | 1 +
config/rootfiles/packages/mcelog | 13 +
config/rootfiles/packages/ncat | 5 +
config/rootfiles/packages/nmap | 8 +-
config/rootfiles/packages/opus | 12 +
config/rootfiles/packages/spice | 17 +
config/xen-image/xen-image-maker.sh | 6 +-
html/cgi-bin/chpasswd.cgi | 46 +-
html/cgi-bin/ipinfo.cgi | 21 +-
html/cgi-bin/optionsfw.cgi | 65 +-
html/cgi-bin/proxy.cgi | 5 +-
lfs/asterisk | 8 +-
lfs/backports | 1 +
lfs/bind | 6 +-
lfs/bwm-ng | 4 +-
lfs/clamav | 8 +-
lfs/configroot | 2 +-
lfs/dma | 6 +-
lfs/{pkg-config => dmidecode} | 16 +-
lfs/dnsdist | 2 +-
lfs/e2fsprogs | 28 +-
lfs/ebtables | 3 +-
lfs/git | 9 +-
lfs/gmp | 10 +-
lfs/{netcat => gnu-netcat} | 7 +-
lfs/grep | 15 +-
lfs/htop | 8 +-
lfs/{pkg-config => iperf3} | 17 +-
lfs/lcdproc | 7 +-
lfs/libsrtp | 8 +-
lfs/libxml2 | 6 +-
lfs/linux | 2 +-
lfs/{bwm-ng => mcelog} | 14 +-
lfs/mpfr | 9 +-
lfs/nano | 16 +-
lfs/{nmap => ncat} | 24 +-
lfs/nettle | 14 +-
lfs/nmap | 6 +-
lfs/{bwm-ng => opus} | 19 +-
lfs/patch | 4 +-
lfs/paxctl | 8 +-
lfs/pciutils | 12 +-
lfs/pcre | 12 +-
lfs/{libxml2 => perl-Apache-Htpasswd} | 12 +-
lfs/pkg-config | 10 +-
lfs/{bwm-ng => python-pyparsing} | 14 +-
lfs/{bwm-ng => python-six} | 14 +-
lfs/qemu | 6 +-
lfs/samba | 17 +-
lfs/{nmap => spice} | 20 +-
lfs/{nmap => spice-protocol} | 17 +-
lfs/squid | 4 +-
lfs/texinfo | 24 +-
make.sh | 16 +-
src/initscripts/init.d/firewall | 9 +-
src/installer/hw.c | 4 +-
...ports-4.2.6-1-ath9k_add_missing_mask_init.patch | 56 +
...d-no-sysfs-option-description-to-h-output.patch | 15 +
...BIOS-nor-DMI-entry-point-found-on-SMBIOS3.patch | 26 +
...Let-read_file-return-the-actual-data-size.patch | 84 +
...se-read_file-to-read-the-DMI-table-from-s.patch | 72 +
.../0005-nothing-should-go-into-usr-local.patch | 16 +
...ables-should-install-nothing-in-usr-local.patch | 28 +
src/patches/iperf3/0001-remove-pg-flag.patch | 46 +
src/patches/lcdproc-0.5.6-menuitem.patch | 11 -
src/patches/mpfr-3.1.3-upstream_fixes-1.patch | 1707 +++++
.../pcre-8.37-Fix-another-buffer-overflow.patch | 110 -
...overflow-for-forward-reference-within-bac.patch | 68 -
...overflow-for-named-recursive-back-referen.patch | 87 -
...overflow-for-named-references-in-situatio.patch | 190 -
...orward-reference-to-duplicate-group-numbe.patch | 98 -
src/patches/pcre-8.38-upstream_fixes-1.patch | 1408 ++++
src/patches/samba/CVE-2015-5370-v3-6.patch | 3080 +++++++++
src/patches/samba/CVE-2015-7560-v3-6.patch | 341 +
src/patches/samba/CVE-2016-2110-v3-6.patch | 670 ++
src/patches/samba/CVE-2016-2111-v3-6.patch | 1058 +++
src/patches/samba/CVE-2016-2112-v3-6.patch | 184 +
src/patches/samba/CVE-2016-2115-v3-6.patch | 359 +
src/patches/samba/CVE-2016-2118-v3-6.patch | 629 ++
src/patches/samba/CVE-preparation-v3-6.patch | 6964 ++++++++++++++++++++
src/patches/squid-3.4-13231.patch | 48 +
src/patches/squid-3.4-13232.patch | 51 +
181 files changed, 18054 insertions(+), 1123 deletions(-)
create mode 100644 config/rootfiles/common/i586/dmidecode
create mode 100644 config/rootfiles/common/perl-Apache-Htpasswd
create mode 100644 config/rootfiles/common/python-pyparsing
create mode 100644 config/rootfiles/common/python-six
create mode 100644 config/rootfiles/common/spice-protocol
create mode 100644 config/rootfiles/common/x86_64/dmidecode
copy config/rootfiles/core/{100 => 101}/exclude (93%)
create mode 100644 config/rootfiles/core/101/filelists/armv5tel/ath9k-module
copy config/rootfiles/{oldcore/82 => core/101}/filelists/armv5tel/gmp (100%)
rename config/rootfiles/core/{100 => 101}/filelists/armv5tel/linux-rpi (100%)
rename config/rootfiles/core/{100 => 101}/filelists/bind (100%)
copy config/rootfiles/{oldcore/96 => core/101}/filelists/dma (100%)
copy config/rootfiles/{oldcore/77 => core/101}/filelists/e2fsprogs (100%)
create mode 100644 config/rootfiles/core/101/filelists/files
rename config/rootfiles/core/{100 => 101}/filelists/grep (100%)
create mode 100644 config/rootfiles/core/101/filelists/i586/ath9k-module
create mode 120000 config/rootfiles/core/101/filelists/i586/dmidecode
copy config/rootfiles/{oldcore/82 => core/101}/filelists/i586/gmp (100%)
copy config/rootfiles/{oldcore/91 => core/101}/filelists/libxml2 (100%)
copy config/rootfiles/{oldcore/82 => core/101}/filelists/mpfr (100%)
copy config/rootfiles/{oldcore/93 => core/101}/filelists/nettle (100%)
copy config/rootfiles/{oldcore/87 => core/101}/filelists/patch (100%)
copy config/rootfiles/{oldcore/77 => core/101}/filelists/paxctl (100%)
copy config/rootfiles/{oldcore/66 => core/101}/filelists/pciutils (100%)
copy config/rootfiles/{oldcore/94 => core/101}/filelists/pcre (100%)
create mode 120000 config/rootfiles/core/101/filelists/perl-Apache-Htpasswd
rename config/rootfiles/core/{100 => 101}/filelists/squid (100%)
create mode 100644 config/rootfiles/core/101/filelists/x86_64/ath9k-module
create mode 120000 config/rootfiles/core/101/filelists/x86_64/dmidecode
create mode 120000 config/rootfiles/core/101/filelists/x86_64/gmp
rename config/rootfiles/core/{99 => 101}/meta (100%)
copy config/rootfiles/core/{99 => 101}/update.sh (69%)
rename config/rootfiles/{core => oldcore}/100/exclude (93%)
rename config/rootfiles/{core => oldcore}/100/filelists/armv5tel/binutils (100%)
rename config/rootfiles/{core => oldcore}/100/filelists/armv5tel/gcc (100%)
rename config/rootfiles/{core => oldcore}/100/filelists/armv5tel/glibc (100%)
rename config/rootfiles/{core => oldcore}/100/filelists/armv5tel/linux-kirkwood (100%)
rename config/rootfiles/{core => oldcore}/100/filelists/armv5tel/linux-multi (100%)
copy config/rootfiles/oldcore/{95 => 100}/filelists/armv5tel/linux-rpi (100%)
rename config/rootfiles/{core => oldcore}/100/filelists/ath10k-firmware (100%)
copy config/rootfiles/oldcore/{94 => 100}/filelists/bind (100%)
rename config/rootfiles/{core => oldcore}/100/filelists/diffutils (100%)
rename config/rootfiles/{core => oldcore}/100/filelists/dnsmasq (100%)
rename config/rootfiles/{core => oldcore}/100/filelists/files (100%)
copy config/rootfiles/oldcore/{89 => 100}/filelists/grep (100%)
rename config/rootfiles/{core => oldcore}/100/filelists/i586/binutils (100%)
rename config/rootfiles/{core => oldcore}/100/filelists/i586/gcc (100%)
rename config/rootfiles/{core => oldcore}/100/filelists/i586/glibc (100%)
rename config/rootfiles/{core => oldcore}/100/filelists/i586/grub (100%)
rename config/rootfiles/{core => oldcore}/100/filelists/i586/linux (100%)
rename config/rootfiles/{core => oldcore}/100/filelists/i586/linux-initrd (100%)
rename config/rootfiles/{core/99 => oldcore/100}/filelists/i586/openssl-sse2 (100%)
rename config/rootfiles/{core => oldcore}/100/filelists/libmpc (100%)
rename config/rootfiles/{core => oldcore}/100/filelists/lua (100%)
rename config/rootfiles/{core => oldcore}/100/filelists/mt7601u-firmware (100%)
rename config/rootfiles/{core => oldcore}/100/filelists/ncurses (100%)
rename config/rootfiles/{core => oldcore}/100/filelists/ntp (100%)
rename config/rootfiles/{core/99 => oldcore/100}/filelists/openssh (100%)
rename config/rootfiles/{core/99 => oldcore/100}/filelists/openssl (100%)
rename config/rootfiles/{core => oldcore}/100/filelists/openvpn (100%)
rename config/rootfiles/{core => oldcore}/100/filelists/sed (100%)
copy config/rootfiles/oldcore/{94 => 100}/filelists/squid (100%)
rename config/rootfiles/{core => oldcore}/100/filelists/tzdata (100%)
rename config/rootfiles/{core => oldcore}/100/filelists/x86_64/binutils (100%)
rename config/rootfiles/{core => oldcore}/100/filelists/x86_64/gcc (100%)
rename config/rootfiles/{core => oldcore}/100/filelists/x86_64/glibc (100%)
rename config/rootfiles/{core => oldcore}/100/filelists/x86_64/grub (100%)
rename config/rootfiles/{core => oldcore}/100/filelists/x86_64/linux (100%)
rename config/rootfiles/{core => oldcore}/100/filelists/x86_64/linux-initrd (100%)
rename config/rootfiles/{core => oldcore}/100/filelists/xz (100%)
rename config/rootfiles/{core => oldcore}/100/meta (100%)
rename config/rootfiles/{core => oldcore}/100/update.sh (100%)
rename config/rootfiles/{core => oldcore}/99/exclude (100%)
rename config/rootfiles/{core => oldcore}/99/filelists/files (100%)
rename config/rootfiles/{core/100 => oldcore/99}/filelists/i586/openssl-sse2 (100%)
rename config/rootfiles/{core/100 => oldcore/99}/filelists/openssh (100%)
rename config/rootfiles/{core/100 => oldcore/99}/filelists/openssl (100%)
copy config/rootfiles/oldcore/{98 => 99}/meta (100%)
rename config/rootfiles/{core => oldcore}/99/update.sh (100%)
rename config/rootfiles/packages/{netcat => gnu-netcat} (92%)
create mode 100644 config/rootfiles/packages/iperf3
create mode 100644 config/rootfiles/packages/mcelog
create mode 100644 config/rootfiles/packages/ncat
create mode 100644 config/rootfiles/packages/opus
create mode 100644 config/rootfiles/packages/spice
copy lfs/{pkg-config => dmidecode} (78%)
rename lfs/{netcat => gnu-netcat} (96%)
copy lfs/{pkg-config => iperf3} (90%)
copy lfs/{bwm-ng => mcelog} (93%)
copy lfs/{nmap => ncat} (86%)
copy lfs/{bwm-ng => opus} (92%)
copy lfs/{libxml2 => perl-Apache-Htpasswd} (92%)
copy lfs/{bwm-ng => python-pyparsing} (90%)
copy lfs/{bwm-ng => python-six} (90%)
copy lfs/{nmap => spice} (88%)
copy lfs/{nmap => spice-protocol} (89%)
create mode 100644 src/patches/backports-4.2.6-1-ath9k_add_missing_mask_init.patch
create mode 100644 src/patches/dmidecode/0001-Add-no-sysfs-option-description-to-h-output.patch
create mode 100644 src/patches/dmidecode/0002-Fix-No-SMBIOS-nor-DMI-entry-point-found-on-SMBIOS3.patch
create mode 100644 src/patches/dmidecode/0003-Let-read_file-return-the-actual-data-size.patch
create mode 100644 src/patches/dmidecode/0004-dmidecode-Use-read_file-to-read-the-DMI-table-from-s.patch
create mode 100644 src/patches/dmidecode/0005-nothing-should-go-into-usr-local.patch
create mode 100644 src/patches/ebtables/0001-ebtables-should-install-nothing-in-usr-local.patch
create mode 100644 src/patches/iperf3/0001-remove-pg-flag.patch
delete mode 100644 src/patches/lcdproc-0.5.6-menuitem.patch
create mode 100644 src/patches/mpfr-3.1.3-upstream_fixes-1.patch
delete mode 100644 src/patches/pcre-8.37-Fix-another-buffer-overflow.patch
delete mode 100644 src/patches/pcre-8.37-Fix-buffer-overflow-for-forward-reference-within-bac.patch
delete mode 100644 src/patches/pcre-8.37-Fix-buffer-overflow-for-named-recursive-back-referen.patch
delete mode 100644 src/patches/pcre-8.37-Fix-buffer-overflow-for-named-references-in-situatio.patch
delete mode 100644 src/patches/pcre-8.37-Fix-named-forward-reference-to-duplicate-group-numbe.patch
create mode 100644 src/patches/pcre-8.38-upstream_fixes-1.patch
create mode 100644 src/patches/samba/CVE-2015-5370-v3-6.patch
create mode 100644 src/patches/samba/CVE-2015-7560-v3-6.patch
create mode 100644 src/patches/samba/CVE-2016-2110-v3-6.patch
create mode 100644 src/patches/samba/CVE-2016-2111-v3-6.patch
create mode 100644 src/patches/samba/CVE-2016-2112-v3-6.patch
create mode 100644 src/patches/samba/CVE-2016-2115-v3-6.patch
create mode 100644 src/patches/samba/CVE-2016-2118-v3-6.patch
create mode 100644 src/patches/samba/CVE-preparation-v3-6.patch
create mode 100644 src/patches/squid-3.4-13231.patch
create mode 100644 src/patches/squid-3.4-13232.patch
Difference in files:
diff --git a/config/kernel/kernel.config.armv5tel-ipfire-rpi b/config/kernel/kernel.config.armv5tel-ipfire-rpi
index 989b2d6..3c354e2 100644
--- a/config/kernel/kernel.config.armv5tel-ipfire-rpi
+++ b/config/kernel/kernel.config.armv5tel-ipfire-rpi
@@ -3296,8 +3296,8 @@ CONFIG_UIO_PDRV_GENIRQ=m
#
CONFIG_STAGING=y
# CONFIG_USBIP_CORE is not set
-CONFIG_W35UND=m
-CONFIG_PRISM2_USB=m
+# CONFIG_W35UND is not set
+# CONFIG_PRISM2_USB is not set
# CONFIG_ECHO is not set
# CONFIG_COMEDI is not set
# CONFIG_RTLLIB is not set
@@ -3965,7 +3965,7 @@ CONFIG_CRYPTO_AUTHENC=m
# Authenticated Encryption with Associated Data
#
CONFIG_CRYPTO_CCM=m
-# CONFIG_CRYPTO_GCM is not set
+CONFIG_CRYPTO_GCM=m
CONFIG_CRYPTO_SEQIV=m
#
diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae
index f596a44..cfc3a6a 100644
--- a/config/kernel/kernel.config.i586-ipfire-pae
+++ b/config/kernel/kernel.config.i586-ipfire-pae
@@ -246,8 +246,8 @@ CONFIG_SECCOMP_FILTER=y
CONFIG_HAVE_CC_STACKPROTECTOR=y
CONFIG_CC_STACKPROTECTOR=y
# CONFIG_CC_STACKPROTECTOR_NONE is not set
-# CONFIG_CC_STACKPROTECTOR_REGULAR is not set
-CONFIG_CC_STACKPROTECTOR_STRONG=y
+CONFIG_CC_STACKPROTECTOR_REGULAR=y
+# CONFIG_CC_STACKPROTECTOR_STRONG is not set
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
CONFIG_HAVE_ARCH_SOFT_DIRTY=y
diff --git a/config/rootfiles/common/armv5tel/binutils b/config/rootfiles/common/armv5tel/binutils
index ba64237..6fcd5ba 100644
--- a/config/rootfiles/common/armv5tel/binutils
+++ b/config/rootfiles/common/armv5tel/binutils
@@ -60,6 +60,7 @@ usr/lib/libopcodes-2.24.so
#usr/share/info/bfd.info
#usr/share/info/binutils.info
#usr/share/info/configure.info
+#usr/share/info/dir
#usr/share/info/gprof.info
#usr/share/info/ld.info
#usr/share/info/standards.info
diff --git a/config/rootfiles/common/armv5tel/gmp b/config/rootfiles/common/armv5tel/gmp
index 8f5ac55..de549fc 100644
--- a/config/rootfiles/common/armv5tel/gmp
+++ b/config/rootfiles/common/armv5tel/gmp
@@ -4,12 +4,12 @@
#usr/lib/libgmp.la
#usr/lib/libgmp.so
usr/lib/libgmp.so.10
-usr/lib/libgmp.so.10.2.0
+usr/lib/libgmp.so.10.3.0
#usr/lib/libgmpxx.a
#usr/lib/libgmpxx.la
#usr/lib/libgmpxx.so
usr/lib/libgmpxx.so.4
-usr/lib/libgmpxx.so.4.4.0
+usr/lib/libgmpxx.so.4.5.0
#usr/share/info/gmp.info
#usr/share/info/gmp.info-1
#usr/share/info/gmp.info-2
diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 71539ef..f37f97e 100644
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -94,7 +94,6 @@ var/ipfire/logging
var/ipfire/mac
#var/ipfire/mac/settings
var/ipfire/main
-#var/ipfire/main/disable_nf_sip
#var/ipfire/main/hosts
#var/ipfire/main/routing
#var/ipfire/main/settings
diff --git a/config/rootfiles/common/e2fsprogs b/config/rootfiles/common/e2fsprogs
index 9622e6c..ba4f00a 100644
--- a/config/rootfiles/common/e2fsprogs
+++ b/config/rootfiles/common/e2fsprogs
@@ -1,4 +1,5 @@
#etc/mke2fs.conf
+#etc/mke2fs.conf.e2fsprogs-new
lib/libblkid.so.1
lib/libblkid.so.1.0
lib/libcom_err.so.2
@@ -114,6 +115,9 @@ usr/sbin/uuidd
#usr/share/man/man3/uuid_unparse.3
#usr/share/man/man5/e2fsck.conf.5
#usr/share/man/man5/mke2fs.conf.5
+#usr/share/man/man5/ext2.5
+#usr/share/man/man5/ext3.5
+#usr/share/man/man5/ext4.5
#usr/share/man/man8/badblocks.8
#usr/share/man/man8/blkid.8
#usr/share/man/man8/debugfs.8
diff --git a/config/rootfiles/common/i586/binutils b/config/rootfiles/common/i586/binutils
index fd5bfb8..5f4c113 100644
--- a/config/rootfiles/common/i586/binutils
+++ b/config/rootfiles/common/i586/binutils
@@ -104,6 +104,7 @@ usr/lib/libopcodes-2.24.so
#usr/share/info/bfd.info
#usr/share/info/binutils.info
#usr/share/info/configure.info
+#usr/share/info/dir
#usr/share/info/gprof.info
#usr/share/info/ld.info
#usr/share/info/standards.info
diff --git a/config/rootfiles/common/i586/dmidecode b/config/rootfiles/common/i586/dmidecode
new file mode 100644
index 0000000..8883958
--- /dev/null
+++ b/config/rootfiles/common/i586/dmidecode
@@ -0,0 +1,12 @@
+usr/sbin/biosdecode
+usr/sbin/dmidecode
+usr/sbin/ownership
+usr/sbin/vpddecode
+#usr/share/doc/dmidecode
+#usr/share/doc/dmidecode/AUTHORS
+#usr/share/doc/dmidecode/CHANGELOG
+#usr/share/doc/dmidecode/README
+#usr/share/man/man8/biosdecode.8
+#usr/share/man/man8/dmidecode.8
+#usr/share/man/man8/ownership.8
+#usr/share/man/man8/vpddecode.8
diff --git a/config/rootfiles/common/i586/gmp b/config/rootfiles/common/i586/gmp
index 2de8123..972bca1 100644
--- a/config/rootfiles/common/i586/gmp
+++ b/config/rootfiles/common/i586/gmp
@@ -4,14 +4,14 @@
#usr/lib/libgmp.la
#usr/lib/libgmp.so
usr/lib/libgmp.so.10
-usr/lib/libgmp.so.10.2.0
+usr/lib/libgmp.so.10.3.0
#usr/lib/libgmpxx.a
#usr/lib/libgmpxx.la
#usr/lib/libgmpxx.so
usr/lib/libgmpxx.so.4
-usr/lib/libgmpxx.so.4.4.0
+usr/lib/libgmpxx.so.4.5.0
usr/lib/sse2/libgmp.so.10
-usr/lib/sse2/libgmp.so.10.2.0
+usr/lib/sse2/libgmp.so.10.3.0
#usr/share/info/gmp.info
#usr/share/info/gmp.info-1
#usr/share/info/gmp.info-2
diff --git a/config/rootfiles/common/libxml2 b/config/rootfiles/common/libxml2
index 1298651..71ec1e4 100644
--- a/config/rootfiles/common/libxml2
+++ b/config/rootfiles/common/libxml2
@@ -53,233 +53,231 @@
#usr/lib/cmake
#usr/lib/cmake/libxml2
#usr/lib/cmake/libxml2/libxml2-config.cmake
-#usr/lib/libxml2.a
#usr/lib/libxml2.la
usr/lib/libxml2.so
usr/lib/libxml2.so.2
-usr/lib/libxml2.so.2.9.2
+usr/lib/libxml2.so.2.9.3
#usr/lib/pkgconfig/libxml-2.0.pc
usr/lib/python2.7/site-packages/drv_libxml2.py
usr/lib/python2.7/site-packages/libxml2.py
-#usr/lib/python2.7/site-packages/libxml2mod.a
#usr/lib/python2.7/site-packages/libxml2mod.la
usr/lib/python2.7/site-packages/libxml2mod.so
#usr/lib/xml2Conf.sh
#usr/share/aclocal/libxml.m4
-#usr/share/doc/libxml2-2.9.2
-#usr/share/doc/libxml2-2.9.2/Copyright
-#usr/share/doc/libxml2-2.9.2/examples
-#usr/share/doc/libxml2-2.9.2/examples/testHTML.c
-#usr/share/doc/libxml2-2.9.2/examples/testSAX.c
-#usr/share/doc/libxml2-2.9.2/examples/testXPath.c
-#usr/share/doc/libxml2-2.9.2/examples/xmllint.c
-#usr/share/doc/libxml2-2.9.2/html
-#usr/share/doc/libxml2-2.9.2/html/DOM.gif
-#usr/share/doc/libxml2-2.9.2/html/FAQ.html
-#usr/share/doc/libxml2-2.9.2/html/Libxml2-Logo-180x168.gif
-#usr/share/doc/libxml2-2.9.2/html/Libxml2-Logo-90x34.gif
-#usr/share/doc/libxml2-2.9.2/html/encoding.html
-#usr/share/doc/libxml2-2.9.2/html/examples.xml
-#usr/share/doc/libxml2-2.9.2/html/examples.xsl
-#usr/share/doc/libxml2-2.9.2/html/html
-#usr/share/doc/libxml2-2.9.2/html/html/book1.html
-#usr/share/doc/libxml2-2.9.2/html/html/home.png
-#usr/share/doc/libxml2-2.9.2/html/html/index.html
-#usr/share/doc/libxml2-2.9.2/html/html/left.png
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-DOCBparser.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-HTMLparser.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-HTMLtree.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-SAX.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-SAX2.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-c14n.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-catalog.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-chvalid.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-debugXML.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-dict.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-encoding.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-entities.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-globals.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-hash.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-lib.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-list.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-nanoftp.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-nanohttp.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-parser.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-parserInternals.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-pattern.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-relaxng.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-schemasInternals.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-schematron.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-threads.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-tree.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-uri.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-valid.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-xinclude.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-xlink.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlIO.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlautomata.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlerror.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlexports.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlmemory.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlmodule.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlreader.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlregexp.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlsave.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlschemas.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlschemastypes.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlstring.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlunicode.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlversion.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-xmlwriter.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-xpath.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-xpathInternals.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-xpointer.html
-#usr/share/doc/libxml2-2.9.2/html/html/libxml-xzlib.html
-#usr/share/doc/libxml2-2.9.2/html/html/right.png
-#usr/share/doc/libxml2-2.9.2/html/html/up.png
-#usr/share/doc/libxml2-2.9.2/html/index.html
-#usr/share/doc/libxml2-2.9.2/html/io1.c
-#usr/share/doc/libxml2-2.9.2/html/io1.res
-#usr/share/doc/libxml2-2.9.2/html/io2.c
-#usr/share/doc/libxml2-2.9.2/html/io2.res
-#usr/share/doc/libxml2-2.9.2/html/libxml.gif
-#usr/share/doc/libxml2-2.9.2/html/parse1.c
-#usr/share/doc/libxml2-2.9.2/html/parse2.c
-#usr/share/doc/libxml2-2.9.2/html/parse3.c
-#usr/share/doc/libxml2-2.9.2/html/parse4.c
-#usr/share/doc/libxml2-2.9.2/html/reader1.c
-#usr/share/doc/libxml2-2.9.2/html/reader1.res
-#usr/share/doc/libxml2-2.9.2/html/reader2.c
-#usr/share/doc/libxml2-2.9.2/html/reader3.c
-#usr/share/doc/libxml2-2.9.2/html/reader3.res
-#usr/share/doc/libxml2-2.9.2/html/reader4.c
-#usr/share/doc/libxml2-2.9.2/html/reader4.res
-#usr/share/doc/libxml2-2.9.2/html/redhat.gif
-#usr/share/doc/libxml2-2.9.2/html/smallfootonly.gif
-#usr/share/doc/libxml2-2.9.2/html/structure.gif
-#usr/share/doc/libxml2-2.9.2/html/test1.xml
-#usr/share/doc/libxml2-2.9.2/html/test2.xml
-#usr/share/doc/libxml2-2.9.2/html/test3.xml
-#usr/share/doc/libxml2-2.9.2/html/testWriter.c
-#usr/share/doc/libxml2-2.9.2/html/tree1.c
-#usr/share/doc/libxml2-2.9.2/html/tree1.res
-#usr/share/doc/libxml2-2.9.2/html/tree2.c
-#usr/share/doc/libxml2-2.9.2/html/tree2.res
-#usr/share/doc/libxml2-2.9.2/html/tst.xml
-#usr/share/doc/libxml2-2.9.2/html/tutorial
-#usr/share/doc/libxml2-2.9.2/html/tutorial/apa.html
-#usr/share/doc/libxml2-2.9.2/html/tutorial/apb.html
-#usr/share/doc/libxml2-2.9.2/html/tutorial/apc.html
-#usr/share/doc/libxml2-2.9.2/html/tutorial/apd.html
-#usr/share/doc/libxml2-2.9.2/html/tutorial/ape.html
-#usr/share/doc/libxml2-2.9.2/html/tutorial/apf.html
-#usr/share/doc/libxml2-2.9.2/html/tutorial/apg.html
-#usr/share/doc/libxml2-2.9.2/html/tutorial/aph.html
-#usr/share/doc/libxml2-2.9.2/html/tutorial/api.html
-#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s02.html
-#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s03.html
-#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s04.html
-#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s05.html
-#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s06.html
-#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s07.html
-#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s08.html
-#usr/share/doc/libxml2-2.9.2/html/tutorial/ar01s09.html
-#usr/share/doc/libxml2-2.9.2/html/tutorial/images
-#usr/share/doc/libxml2-2.9.2/html/tutorial/images/blank.png
-#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts
-#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/1.png
-#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/10.png
-#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/2.png
-#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/3.png
-#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/4.png
-#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/5.png
-#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/6.png
-#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/7.png
-#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/8.png
-#usr/share/doc/libxml2-2.9.2/html/tutorial/images/callouts/9.png
-#usr/share/doc/libxml2-2.9.2/html/tutorial/images/caution.png
-#usr/share/doc/libxml2-2.9.2/html/tutorial/images/draft.png
-#usr/share/doc/libxml2-2.9.2/html/tutorial/images/home.png
-#usr/share/doc/libxml2-2.9.2/html/tutorial/images/important.png
-#usr/share/doc/libxml2-2.9.2/html/tutorial/images/next.png
-#usr/share/doc/libxml2-2.9.2/html/tutorial/images/note.png
-#usr/share/doc/libxml2-2.9.2/html/tutorial/images/prev.png
-#usr/share/doc/libxml2-2.9.2/html/tutorial/images/tip.png
-#usr/share/doc/libxml2-2.9.2/html/tutorial/images/toc-blank.png
-#usr/share/doc/libxml2-2.9.2/html/tutorial/images/toc-minus.png
-#usr/share/doc/libxml2-2.9.2/html/tutorial/images/toc-plus.png
-#usr/share/doc/libxml2-2.9.2/html/tutorial/images/up.png
-#usr/share/doc/libxml2-2.9.2/html/tutorial/images/warning.png
-#usr/share/doc/libxml2-2.9.2/html/tutorial/includeaddattribute.c
-#usr/share/doc/libxml2-2.9.2/html/tutorial/includeaddkeyword.c
-#usr/share/doc/libxml2-2.9.2/html/tutorial/includeconvert.c
-#usr/share/doc/libxml2-2.9.2/html/tutorial/includegetattribute.c
-#usr/share/doc/libxml2-2.9.2/html/tutorial/includekeyword.c
-#usr/share/doc/libxml2-2.9.2/html/tutorial/includexpath.c
-#usr/share/doc/libxml2-2.9.2/html/tutorial/index.html
-#usr/share/doc/libxml2-2.9.2/html/tutorial/ix01.html
-#usr/share/doc/libxml2-2.9.2/html/tutorial/xmltutorial.pdf
-#usr/share/doc/libxml2-2.9.2/html/w3c.png
-#usr/share/doc/libxml2-2.9.2/html/writer.xml
-#usr/share/doc/libxml2-2.9.2/html/xml.html
-#usr/share/doc/libxml2-2.9.2/html/xpath1.c
-#usr/share/doc/libxml2-2.9.2/html/xpath1.res
-#usr/share/doc/libxml2-2.9.2/html/xpath2.c
-#usr/share/doc/libxml2-2.9.2/html/xpath2.res
-#usr/share/doc/libxml2-python-2.9.2
-#usr/share/doc/libxml2-python-2.9.2/TODO
-#usr/share/doc/libxml2-python-2.9.2/examples
-#usr/share/doc/libxml2-python-2.9.2/examples/attribs.py
-#usr/share/doc/libxml2-python-2.9.2/examples/build.py
-#usr/share/doc/libxml2-python-2.9.2/examples/compareNodes.py
-#usr/share/doc/libxml2-python-2.9.2/examples/ctxterror.py
-#usr/share/doc/libxml2-python-2.9.2/examples/cutnpaste.py
-#usr/share/doc/libxml2-python-2.9.2/examples/dtdvalid.py
-#usr/share/doc/libxml2-python-2.9.2/examples/error.py
-#usr/share/doc/libxml2-python-2.9.2/examples/inbuf.py
-#usr/share/doc/libxml2-python-2.9.2/examples/indexes.py
-#usr/share/doc/libxml2-python-2.9.2/examples/input_callback.py
-#usr/share/doc/libxml2-python-2.9.2/examples/invalid.xml
-#usr/share/doc/libxml2-python-2.9.2/examples/nsdel.py
-#usr/share/doc/libxml2-python-2.9.2/examples/outbuf.py
-#usr/share/doc/libxml2-python-2.9.2/examples/push.py
-#usr/share/doc/libxml2-python-2.9.2/examples/pushSAX.py
-#usr/share/doc/libxml2-python-2.9.2/examples/pushSAXhtml.py
-#usr/share/doc/libxml2-python-2.9.2/examples/reader.py
-#usr/share/doc/libxml2-python-2.9.2/examples/reader2.py
-#usr/share/doc/libxml2-python-2.9.2/examples/reader3.py
-#usr/share/doc/libxml2-python-2.9.2/examples/reader4.py
-#usr/share/doc/libxml2-python-2.9.2/examples/reader5.py
-#usr/share/doc/libxml2-python-2.9.2/examples/reader6.py
-#usr/share/doc/libxml2-python-2.9.2/examples/reader7.py
-#usr/share/doc/libxml2-python-2.9.2/examples/reader8.py
-#usr/share/doc/libxml2-python-2.9.2/examples/readererr.py
-#usr/share/doc/libxml2-python-2.9.2/examples/readernext.py
-#usr/share/doc/libxml2-python-2.9.2/examples/regexp.py
-#usr/share/doc/libxml2-python-2.9.2/examples/relaxng.py
-#usr/share/doc/libxml2-python-2.9.2/examples/resolver.py
-#usr/share/doc/libxml2-python-2.9.2/examples/schema.py
-#usr/share/doc/libxml2-python-2.9.2/examples/serialize.py
-#usr/share/doc/libxml2-python-2.9.2/examples/sync.py
-#usr/share/doc/libxml2-python-2.9.2/examples/test.dtd
-#usr/share/doc/libxml2-python-2.9.2/examples/thread2.py
-#usr/share/doc/libxml2-python-2.9.2/examples/tst.py
-#usr/share/doc/libxml2-python-2.9.2/examples/tst.xml
-#usr/share/doc/libxml2-python-2.9.2/examples/tstLastError.py
-#usr/share/doc/libxml2-python-2.9.2/examples/tstURI.py
-#usr/share/doc/libxml2-python-2.9.2/examples/tstmem.py
-#usr/share/doc/libxml2-python-2.9.2/examples/tstxpath.py
-#usr/share/doc/libxml2-python-2.9.2/examples/valid.xml
-#usr/share/doc/libxml2-python-2.9.2/examples/validDTD.py
-#usr/share/doc/libxml2-python-2.9.2/examples/validRNG.py
-#usr/share/doc/libxml2-python-2.9.2/examples/validSchemas.py
-#usr/share/doc/libxml2-python-2.9.2/examples/validate.py
-#usr/share/doc/libxml2-python-2.9.2/examples/walker.py
-#usr/share/doc/libxml2-python-2.9.2/examples/xpath.py
-#usr/share/doc/libxml2-python-2.9.2/examples/xpathext.py
-#usr/share/doc/libxml2-python-2.9.2/examples/xpathleak.py
-#usr/share/doc/libxml2-python-2.9.2/examples/xpathns.py
-#usr/share/doc/libxml2-python-2.9.2/examples/xpathret.py
+#usr/share/doc/libxml2-2.9.3
+#usr/share/doc/libxml2-2.9.3/Copyright
+#usr/share/doc/libxml2-2.9.3/examples
+#usr/share/doc/libxml2-2.9.3/examples/testHTML.c
+#usr/share/doc/libxml2-2.9.3/examples/testSAX.c
+#usr/share/doc/libxml2-2.9.3/examples/testXPath.c
+#usr/share/doc/libxml2-2.9.3/examples/xmllint.c
+#usr/share/doc/libxml2-2.9.3/html
+#usr/share/doc/libxml2-2.9.3/html/DOM.gif
+#usr/share/doc/libxml2-2.9.3/html/FAQ.html
+#usr/share/doc/libxml2-2.9.3/html/Libxml2-Logo-180x168.gif
+#usr/share/doc/libxml2-2.9.3/html/Libxml2-Logo-90x34.gif
+#usr/share/doc/libxml2-2.9.3/html/encoding.html
+#usr/share/doc/libxml2-2.9.3/html/examples.xml
+#usr/share/doc/libxml2-2.9.3/html/examples.xsl
+#usr/share/doc/libxml2-2.9.3/html/html
+#usr/share/doc/libxml2-2.9.3/html/html/book1.html
+#usr/share/doc/libxml2-2.9.3/html/html/home.png
+#usr/share/doc/libxml2-2.9.3/html/html/index.html
+#usr/share/doc/libxml2-2.9.3/html/html/left.png
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-DOCBparser.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-HTMLparser.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-HTMLtree.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-SAX.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-SAX2.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-c14n.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-catalog.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-chvalid.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-debugXML.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-dict.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-encoding.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-entities.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-globals.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-hash.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-lib.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-list.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-nanoftp.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-nanohttp.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-parser.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-parserInternals.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-pattern.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-relaxng.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-schemasInternals.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-schematron.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-threads.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-tree.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-uri.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-valid.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-xinclude.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-xlink.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlIO.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlautomata.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlerror.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlexports.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlmemory.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlmodule.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlreader.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlregexp.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlsave.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlschemas.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlschemastypes.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlstring.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlunicode.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlversion.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlwriter.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-xpath.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-xpathInternals.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-xpointer.html
+#usr/share/doc/libxml2-2.9.3/html/html/libxml-xzlib.html
+#usr/share/doc/libxml2-2.9.3/html/html/right.png
+#usr/share/doc/libxml2-2.9.3/html/html/up.png
+#usr/share/doc/libxml2-2.9.3/html/index.html
+#usr/share/doc/libxml2-2.9.3/html/io1.c
+#usr/share/doc/libxml2-2.9.3/html/io1.res
+#usr/share/doc/libxml2-2.9.3/html/io2.c
+#usr/share/doc/libxml2-2.9.3/html/io2.res
+#usr/share/doc/libxml2-2.9.3/html/libxml.gif
+#usr/share/doc/libxml2-2.9.3/html/parse1.c
+#usr/share/doc/libxml2-2.9.3/html/parse2.c
+#usr/share/doc/libxml2-2.9.3/html/parse3.c
+#usr/share/doc/libxml2-2.9.3/html/parse4.c
+#usr/share/doc/libxml2-2.9.3/html/reader1.c
+#usr/share/doc/libxml2-2.9.3/html/reader1.res
+#usr/share/doc/libxml2-2.9.3/html/reader2.c
+#usr/share/doc/libxml2-2.9.3/html/reader3.c
+#usr/share/doc/libxml2-2.9.3/html/reader3.res
+#usr/share/doc/libxml2-2.9.3/html/reader4.c
+#usr/share/doc/libxml2-2.9.3/html/reader4.res
+#usr/share/doc/libxml2-2.9.3/html/redhat.gif
+#usr/share/doc/libxml2-2.9.3/html/smallfootonly.gif
+#usr/share/doc/libxml2-2.9.3/html/structure.gif
+#usr/share/doc/libxml2-2.9.3/html/test1.xml
+#usr/share/doc/libxml2-2.9.3/html/test2.xml
+#usr/share/doc/libxml2-2.9.3/html/test3.xml
+#usr/share/doc/libxml2-2.9.3/html/testWriter.c
+#usr/share/doc/libxml2-2.9.3/html/tree1.c
+#usr/share/doc/libxml2-2.9.3/html/tree1.res
+#usr/share/doc/libxml2-2.9.3/html/tree2.c
+#usr/share/doc/libxml2-2.9.3/html/tree2.res
+#usr/share/doc/libxml2-2.9.3/html/tst.xml
+#usr/share/doc/libxml2-2.9.3/html/tutorial
+#usr/share/doc/libxml2-2.9.3/html/tutorial/apa.html
+#usr/share/doc/libxml2-2.9.3/html/tutorial/apb.html
+#usr/share/doc/libxml2-2.9.3/html/tutorial/apc.html
+#usr/share/doc/libxml2-2.9.3/html/tutorial/apd.html
+#usr/share/doc/libxml2-2.9.3/html/tutorial/ape.html
+#usr/share/doc/libxml2-2.9.3/html/tutorial/apf.html
+#usr/share/doc/libxml2-2.9.3/html/tutorial/apg.html
+#usr/share/doc/libxml2-2.9.3/html/tutorial/aph.html
+#usr/share/doc/libxml2-2.9.3/html/tutorial/api.html
+#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s02.html
+#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s03.html
+#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s04.html
+#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s05.html
+#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s06.html
+#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s07.html
+#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s08.html
+#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s09.html
+#usr/share/doc/libxml2-2.9.3/html/tutorial/images
+#usr/share/doc/libxml2-2.9.3/html/tutorial/images/blank.png
+#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts
+#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts/1.png
+#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts/10.png
+#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts/2.png
+#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts/3.png
+#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts/4.png
+#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts/5.png
+#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts/6.png
+#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts/7.png
+#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts/8.png
+#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts/9.png
+#usr/share/doc/libxml2-2.9.3/html/tutorial/images/caution.png
+#usr/share/doc/libxml2-2.9.3/html/tutorial/images/draft.png
+#usr/share/doc/libxml2-2.9.3/html/tutorial/images/home.png
+#usr/share/doc/libxml2-2.9.3/html/tutorial/images/important.png
+#usr/share/doc/libxml2-2.9.3/html/tutorial/images/next.png
+#usr/share/doc/libxml2-2.9.3/html/tutorial/images/note.png
+#usr/share/doc/libxml2-2.9.3/html/tutorial/images/prev.png
+#usr/share/doc/libxml2-2.9.3/html/tutorial/images/tip.png
+#usr/share/doc/libxml2-2.9.3/html/tutorial/images/toc-blank.png
+#usr/share/doc/libxml2-2.9.3/html/tutorial/images/toc-minus.png
+#usr/share/doc/libxml2-2.9.3/html/tutorial/images/toc-plus.png
+#usr/share/doc/libxml2-2.9.3/html/tutorial/images/up.png
+#usr/share/doc/libxml2-2.9.3/html/tutorial/images/warning.png
+#usr/share/doc/libxml2-2.9.3/html/tutorial/includeaddattribute.c
+#usr/share/doc/libxml2-2.9.3/html/tutorial/includeaddkeyword.c
+#usr/share/doc/libxml2-2.9.3/html/tutorial/includeconvert.c
+#usr/share/doc/libxml2-2.9.3/html/tutorial/includegetattribute.c
+#usr/share/doc/libxml2-2.9.3/html/tutorial/includekeyword.c
+#usr/share/doc/libxml2-2.9.3/html/tutorial/includexpath.c
+#usr/share/doc/libxml2-2.9.3/html/tutorial/index.html
+#usr/share/doc/libxml2-2.9.3/html/tutorial/ix01.html
+#usr/share/doc/libxml2-2.9.3/html/tutorial/xmltutorial.pdf
+#usr/share/doc/libxml2-2.9.3/html/w3c.png
+#usr/share/doc/libxml2-2.9.3/html/writer.xml
+#usr/share/doc/libxml2-2.9.3/html/xml.html
+#usr/share/doc/libxml2-2.9.3/html/xpath1.c
+#usr/share/doc/libxml2-2.9.3/html/xpath1.res
+#usr/share/doc/libxml2-2.9.3/html/xpath2.c
+#usr/share/doc/libxml2-2.9.3/html/xpath2.res
+#usr/share/doc/libxml2-python-2.9.3
+#usr/share/doc/libxml2-python-2.9.3/TODO
+#usr/share/doc/libxml2-python-2.9.3/examples
+#usr/share/doc/libxml2-python-2.9.3/examples/attribs.py
+#usr/share/doc/libxml2-python-2.9.3/examples/build.py
+#usr/share/doc/libxml2-python-2.9.3/examples/compareNodes.py
+#usr/share/doc/libxml2-python-2.9.3/examples/ctxterror.py
+#usr/share/doc/libxml2-python-2.9.3/examples/cutnpaste.py
+#usr/share/doc/libxml2-python-2.9.3/examples/dtdvalid.py
+#usr/share/doc/libxml2-python-2.9.3/examples/error.py
+#usr/share/doc/libxml2-python-2.9.3/examples/inbuf.py
+#usr/share/doc/libxml2-python-2.9.3/examples/indexes.py
+#usr/share/doc/libxml2-python-2.9.3/examples/input_callback.py
+#usr/share/doc/libxml2-python-2.9.3/examples/invalid.xml
+#usr/share/doc/libxml2-python-2.9.3/examples/nsdel.py
+#usr/share/doc/libxml2-python-2.9.3/examples/outbuf.py
+#usr/share/doc/libxml2-python-2.9.3/examples/push.py
+#usr/share/doc/libxml2-python-2.9.3/examples/pushSAX.py
+#usr/share/doc/libxml2-python-2.9.3/examples/pushSAXhtml.py
+#usr/share/doc/libxml2-python-2.9.3/examples/reader.py
+#usr/share/doc/libxml2-python-2.9.3/examples/reader2.py
+#usr/share/doc/libxml2-python-2.9.3/examples/reader3.py
+#usr/share/doc/libxml2-python-2.9.3/examples/reader4.py
+#usr/share/doc/libxml2-python-2.9.3/examples/reader5.py
+#usr/share/doc/libxml2-python-2.9.3/examples/reader6.py
+#usr/share/doc/libxml2-python-2.9.3/examples/reader7.py
+#usr/share/doc/libxml2-python-2.9.3/examples/reader8.py
+#usr/share/doc/libxml2-python-2.9.3/examples/readererr.py
+#usr/share/doc/libxml2-python-2.9.3/examples/readernext.py
+#usr/share/doc/libxml2-python-2.9.3/examples/regexp.py
+#usr/share/doc/libxml2-python-2.9.3/examples/relaxng.py
+#usr/share/doc/libxml2-python-2.9.3/examples/resolver.py
+#usr/share/doc/libxml2-python-2.9.3/examples/schema.py
+#usr/share/doc/libxml2-python-2.9.3/examples/serialize.py
+#usr/share/doc/libxml2-python-2.9.3/examples/sync.py
+#usr/share/doc/libxml2-python-2.9.3/examples/test.dtd
+#usr/share/doc/libxml2-python-2.9.3/examples/thread2.py
+#usr/share/doc/libxml2-python-2.9.3/examples/tst.py
+#usr/share/doc/libxml2-python-2.9.3/examples/tst.xml
+#usr/share/doc/libxml2-python-2.9.3/examples/tstLastError.py
+#usr/share/doc/libxml2-python-2.9.3/examples/tstURI.py
+#usr/share/doc/libxml2-python-2.9.3/examples/tstmem.py
+#usr/share/doc/libxml2-python-2.9.3/examples/tstxpath.py
+#usr/share/doc/libxml2-python-2.9.3/examples/valid.xml
+#usr/share/doc/libxml2-python-2.9.3/examples/validDTD.py
+#usr/share/doc/libxml2-python-2.9.3/examples/validRNG.py
+#usr/share/doc/libxml2-python-2.9.3/examples/validSchemas.py
+#usr/share/doc/libxml2-python-2.9.3/examples/validate.py
+#usr/share/doc/libxml2-python-2.9.3/examples/walker.py
+#usr/share/doc/libxml2-python-2.9.3/examples/xpath.py
+#usr/share/doc/libxml2-python-2.9.3/examples/xpathext.py
+#usr/share/doc/libxml2-python-2.9.3/examples/xpathleak.py
+#usr/share/doc/libxml2-python-2.9.3/examples/xpathns.py
+#usr/share/doc/libxml2-python-2.9.3/examples/xpathret.py
#usr/share/gtk-doc/html/libxml2
#usr/share/gtk-doc/html/libxml2/general.html
#usr/share/gtk-doc/html/libxml2/home.png
diff --git a/config/rootfiles/common/mpfr b/config/rootfiles/common/mpfr
index 70b925b..1e33e05 100644
--- a/config/rootfiles/common/mpfr
+++ b/config/rootfiles/common/mpfr
@@ -4,7 +4,7 @@
#usr/lib/libmpfr.la
#usr/lib/libmpfr.so
usr/lib/libmpfr.so.4
-usr/lib/libmpfr.so.4.1.2
+usr/lib/libmpfr.so.4.1.3
#usr/share/doc/mpfr
#usr/share/doc/mpfr/AUTHORS
#usr/share/doc/mpfr/BUGS
@@ -19,4 +19,4 @@ usr/lib/libmpfr.so.4.1.2
#usr/share/doc/mpfr/examples/rndo-add.c
#usr/share/doc/mpfr/examples/sample.c
#usr/share/doc/mpfr/examples/version.c
-#usr/share/info/mpfr.info
+#usr/share/info/mpfr.info
\ No newline at end of file
diff --git a/config/rootfiles/common/nettle b/config/rootfiles/common/nettle
index 7845a34..5d5777b 100644
--- a/config/rootfiles/common/nettle
+++ b/config/rootfiles/common/nettle
@@ -63,11 +63,11 @@
#usr/include/nettle/yarrow.h
usr/lib/libhogweed.so
usr/lib/libhogweed.so.4
-usr/lib/libhogweed.so.4.1
+usr/lib/libhogweed.so.4.2
#usr/lib/libnettle.so
usr/lib/libnettle.so.6
-usr/lib/libnettle.so.6.1
+usr/lib/libnettle.so.6.2
#usr/lib/pkgconfig/hogweed.pc
#usr/lib/pkgconfig/nettle.pc
-#usr/share/doc/nettle-3.1.1
+usr/share/doc/nettle-3.2
#usr/share/info/nettle.info
diff --git a/config/rootfiles/common/pciutils b/config/rootfiles/common/pciutils
index 43c31a1..5bb11a2 100644
--- a/config/rootfiles/common/pciutils
+++ b/config/rootfiles/common/pciutils
@@ -1,7 +1,7 @@
bin/lspci
bin/setpci
lib/libpci.so.3
-lib/libpci.so.3.1.10
+lib/libpci.so.3.4.1
sbin/update-pciids
#usr/include/pci
#usr/include/pci/config.h
diff --git a/config/rootfiles/common/pcre b/config/rootfiles/common/pcre
index 8c4cc2a..1d6310f 100644
--- a/config/rootfiles/common/pcre
+++ b/config/rootfiles/common/pcre
@@ -10,7 +10,7 @@
#usr/lib/libpcre.la
usr/lib/libpcre.so
usr/lib/libpcre.so.1
-usr/lib/libpcre.so.1.2.5
+usr/lib/libpcre.so.1.2.6
#usr/lib/libpcrecpp.la
usr/lib/libpcrecpp.so
usr/lib/libpcrecpp.so.0
diff --git a/config/rootfiles/common/perl-Apache-Htpasswd b/config/rootfiles/common/perl-Apache-Htpasswd
new file mode 100644
index 0000000..8b25483
--- /dev/null
+++ b/config/rootfiles/common/perl-Apache-Htpasswd
@@ -0,0 +1,6 @@
+#usr/lib/perl5/site_perl/5.12.3/Apache
+usr/lib/perl5/site_perl/5.12.3/Apache/Htpasswd.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Apache
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Apache/Htpasswd
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Apache/Htpasswd/.packlist
+#usr/share/man/man3/Apache::Htpasswd.3
diff --git a/config/rootfiles/common/python-pyparsing b/config/rootfiles/common/python-pyparsing
new file mode 100644
index 0000000..f75b88e
--- /dev/null
+++ b/config/rootfiles/common/python-pyparsing
@@ -0,0 +1,9 @@
+#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg
+#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/EGG-INFO
+#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/EGG-INFO/PKG-INFO
+#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/EGG-INFO/SOURCES.txt
+#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/EGG-INFO/dependency_links.txt
+#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/EGG-INFO/not-zip-safe
+#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/EGG-INFO/top_level.txt
+#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/pyparsing.py
+#usr/lib/python2.7/site-packages/pyparsing-2.0.7-py2.7.egg/pyparsing.pyc
diff --git a/config/rootfiles/common/python-six b/config/rootfiles/common/python-six
new file mode 100644
index 0000000..9520c38a
--- /dev/null
+++ b/config/rootfiles/common/python-six
@@ -0,0 +1,9 @@
+#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg
+#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/EGG-INFO
+#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/EGG-INFO/PKG-INFO
+#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/EGG-INFO/SOURCES.txt
+#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/EGG-INFO/dependency_links.txt
+#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/EGG-INFO/not-zip-safe
+#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/EGG-INFO/top_level.txt
+#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/six.py
+#usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg/six.pyc
diff --git a/config/rootfiles/common/spice-protocol b/config/rootfiles/common/spice-protocol
new file mode 100644
index 0000000..0db86e0
--- /dev/null
+++ b/config/rootfiles/common/spice-protocol
@@ -0,0 +1,42 @@
+#usr/include/spice-1
+#usr/include/spice-1/spice
+#usr/include/spice-1/spice/barrier.h
+#usr/include/spice-1/spice/controller_prot.h
+#usr/include/spice-1/spice/end-packed.h
+#usr/include/spice-1/spice/enums.h
+#usr/include/spice-1/spice/error_codes.h
+#usr/include/spice-1/spice/foreign_menu_prot.h
+#usr/include/spice-1/spice/ipc_ring.h
+#usr/include/spice-1/spice/macros.h
+#usr/include/spice-1/spice/protocol.h
+#usr/include/spice-1/spice/qxl_dev.h
+#usr/include/spice-1/spice/qxl_windows.h
+#usr/include/spice-1/spice/start-packed.h
+#usr/include/spice-1/spice/stats.h
+#usr/include/spice-1/spice/types.h
+#usr/include/spice-1/spice/vd_agent.h
+#usr/include/spice-1/spice/vdi_dev.h
+#usr/lib/spice-protocol
+#usr/lib/spice-protocol/python_modules
+#usr/lib/spice-protocol/python_modules/__init__.py
+#usr/lib/spice-protocol/python_modules/__init__.pyc
+#usr/lib/spice-protocol/python_modules/__init__.pyo
+#usr/lib/spice-protocol/python_modules/codegen.py
+#usr/lib/spice-protocol/python_modules/codegen.pyc
+#usr/lib/spice-protocol/python_modules/codegen.pyo
+#usr/lib/spice-protocol/python_modules/demarshal.py
+#usr/lib/spice-protocol/python_modules/demarshal.pyc
+#usr/lib/spice-protocol/python_modules/demarshal.pyo
+#usr/lib/spice-protocol/python_modules/marshal.py
+#usr/lib/spice-protocol/python_modules/marshal.pyc
+#usr/lib/spice-protocol/python_modules/marshal.pyo
+#usr/lib/spice-protocol/python_modules/ptypes.py
+#usr/lib/spice-protocol/python_modules/ptypes.pyc
+#usr/lib/spice-protocol/python_modules/ptypes.pyo
+#usr/lib/spice-protocol/python_modules/spice_parser.py
+#usr/lib/spice-protocol/python_modules/spice_parser.pyc
+#usr/lib/spice-protocol/python_modules/spice_parser.pyo
+#usr/lib/spice-protocol/spice.proto
+#usr/lib/spice-protocol/spice1.proto
+#usr/lib/spice-protocol/spice_codegen.py
+#usr/share/pkgconfig/spice-protocol.pc
diff --git a/config/rootfiles/common/texinfo b/config/rootfiles/common/texinfo
index 00e9aed..781bc81 100644
--- a/config/rootfiles/common/texinfo
+++ b/config/rootfiles/common/texinfo
@@ -3,26 +3,409 @@
#usr/bin/install-info
#usr/bin/makeinfo
#usr/bin/pdftexi2dvi
+#usr/bin/pod2texi
+#usr/bin/texi2any
#usr/bin/texi2dvi
#usr/bin/texi2pdf
#usr/bin/texindex
#usr/share/info/info-stnd.info
#usr/share/info/info.info
-#usr/share/info/texinfo
-#usr/share/info/texinfo-1
-#usr/share/info/texinfo-2
-#usr/share/info/texinfo-3
+#usr/share/info/texinfo.info
+#usr/share/info/texinfo.info-1
+#usr/share/info/texinfo.info-2
+#usr/share/info/texinfo.info-3
#usr/share/man/man1/info.1
#usr/share/man/man1/infokey.1
#usr/share/man/man1/install-info.1
#usr/share/man/man1/makeinfo.1
#usr/share/man/man1/pdftexi2dvi.1
+#usr/share/man/man1/pod2texi.1
+#usr/share/man/man1/texi2any.1
#usr/share/man/man1/texi2dvi.1
#usr/share/man/man1/texi2pdf.1
#usr/share/man/man1/texindex.1
#usr/share/man/man5/info.5
#usr/share/man/man5/texinfo.5
#usr/share/texinfo
-#usr/share/texinfo/texinfo.cat
+#usr/share/texinfo/DebugTexinfo
+#usr/share/texinfo/DebugTexinfo/DebugCount.pm
+#usr/share/texinfo/DebugTexinfo/DebugTree.pm
+#usr/share/texinfo/Pod-Simple-Texinfo
+#usr/share/texinfo/Pod-Simple-Texinfo/Pod
+#usr/share/texinfo/Pod-Simple-Texinfo/Pod/Simple
+#usr/share/texinfo/Pod-Simple-Texinfo/Pod/Simple/Texinfo.pm
+#usr/share/texinfo/Texinfo
+#usr/share/texinfo/Texinfo/Common.pm
+#usr/share/texinfo/Texinfo/Convert
+#usr/share/texinfo/Texinfo/Convert/Converter.pm
+#usr/share/texinfo/Texinfo/Convert/DocBook.pm
+#usr/share/texinfo/Texinfo/Convert/HTML.pm
+#usr/share/texinfo/Texinfo/Convert/IXIN.pm
+#usr/share/texinfo/Texinfo/Convert/IXINSXML.pm
+#usr/share/texinfo/Texinfo/Convert/Info.pm
+#usr/share/texinfo/Texinfo/Convert/Line.pm
+#usr/share/texinfo/Texinfo/Convert/NodeNameNormalization.pm
+#usr/share/texinfo/Texinfo/Convert/Paragraph.pm
+#usr/share/texinfo/Texinfo/Convert/PlainTexinfo.pm
+#usr/share/texinfo/Texinfo/Convert/Plaintext.pm
+#usr/share/texinfo/Texinfo/Convert/Texinfo.pm
+#usr/share/texinfo/Texinfo/Convert/TexinfoSXML.pm
+#usr/share/texinfo/Texinfo/Convert/TexinfoXML.pm
+#usr/share/texinfo/Texinfo/Convert/Text.pm
+#usr/share/texinfo/Texinfo/Convert/TextContent.pm
+#usr/share/texinfo/Texinfo/Convert/UnFilled.pm
+#usr/share/texinfo/Texinfo/Convert/Unicode.pm
+#usr/share/texinfo/Texinfo/Documentlanguages.pm
+#usr/share/texinfo/Texinfo/Encoding.pm
+#usr/share/texinfo/Texinfo/Parser.pm
+#usr/share/texinfo/Texinfo/Report.pm
+#usr/share/texinfo/Texinfo/Structuring.pm
+#usr/share/texinfo/htmlxref.cnf
+#usr/share/texinfo/init
+#usr/share/texinfo/init/book.pm
+#usr/share/texinfo/init/chm.pm
+#usr/share/texinfo/init/html32.pm
+#usr/share/texinfo/init/latex2html.pm
+#usr/share/texinfo/init/tex4ht.pm
+#usr/share/texinfo/lib
+#usr/share/texinfo/lib/Text-Unidecode
+#usr/share/texinfo/lib/Text-Unidecode/lib
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x00.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x01.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x02.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x03.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x04.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x05.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x06.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x07.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x09.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x0a.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x0b.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x0c.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x0d.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x0e.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x0f.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x10.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x11.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x12.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x13.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x14.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x15.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x16.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x17.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x18.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x1e.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x1f.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x20.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x21.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x22.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x23.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x24.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x25.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x26.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x27.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x28.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x2e.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x2f.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x30.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x31.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x32.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x33.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x4d.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x4e.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x4f.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x50.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x51.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x52.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x53.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x54.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x55.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x56.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x57.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x58.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x59.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x5a.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x5b.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x5c.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x5d.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x5e.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x5f.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x60.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x61.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x62.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x63.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x64.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x65.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x66.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x67.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x68.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x69.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x6a.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x6b.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x6c.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x6d.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x6e.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x6f.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x70.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x71.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x72.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x73.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x74.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x75.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x76.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x77.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x78.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x79.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x7a.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x7b.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x7c.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x7d.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x7e.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x7f.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x80.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x81.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x82.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x83.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x84.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x85.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x86.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x87.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x88.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x89.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x8a.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x8b.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x8c.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x8d.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x8e.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x8f.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x90.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x91.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x92.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x93.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x94.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x95.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x96.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x97.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x98.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x99.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x9a.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x9b.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x9c.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x9d.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x9e.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/x9f.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xa0.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xa1.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xa2.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xa3.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xa4.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xac.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xad.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xae.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xaf.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xb0.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xb1.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xb2.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xb3.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xb4.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xb5.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xb6.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xb7.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xb8.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xb9.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xba.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xbb.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xbc.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xbd.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xbe.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xbf.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xc0.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xc1.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xc2.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xc3.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xc4.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xc5.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xc6.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xc7.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xc8.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xc9.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xca.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xcb.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xcc.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xcd.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xce.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xcf.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xd0.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xd1.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xd2.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xd3.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xd4.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xd5.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xd6.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xd7.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xf9.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xfa.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xfb.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xfc.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xfd.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xfe.pm
+#usr/share/texinfo/lib/Text-Unidecode/lib/Text/Unidecode/xff.pm
+#usr/share/texinfo/lib/Unicode-EastAsianWidth
+#usr/share/texinfo/lib/Unicode-EastAsianWidth/lib
+#usr/share/texinfo/lib/Unicode-EastAsianWidth/lib/Unicode
+#usr/share/texinfo/lib/Unicode-EastAsianWidth/lib/Unicode/EastAsianWidth.pm
+#usr/share/texinfo/lib/libintl-perl
+#usr/share/texinfo/lib/libintl-perl/lib
+#usr/share/texinfo/lib/libintl-perl/lib/Locale
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/Messages.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/Recode
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/Recode.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/Recode/_Aliases.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/Recode/_Conversions.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/ASMO_449.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/ATARI_ST.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/ATARI_ST_EURO.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/CP10007.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/CP1250.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/CP1251.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/CP1252.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/CP1253.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/CP1254.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/CP1256.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/CP1257.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/CSN_369103.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/CWI.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/DEC_MCS.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_AT_DE.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_AT_DE_A.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_CA_FR.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_DK_NO.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_DK_NO_A.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_ES.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_ES_A.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_ES_S.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_FI_SE.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_FI_SE_A.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_FR.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_IS_FRISS.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_IT.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_PT.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_UK.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/EBCDIC_US.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/ECMA_CYRILLIC.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/GEORGIAN_ACADEMY.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/GEORGIAN_PS.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/GOST_19768_74.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/GREEK7.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/GREEK7_OLD.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/GREEK_CCITT.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/HP_ROMAN8.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM037.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM038.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM1004.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM1026.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM1047.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM256.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM273.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM274.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM275.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM277.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM278.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM280.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM281.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM284.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM285.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM290.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM297.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM420.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM423.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM424.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM437.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM500.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM850.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM851.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM852.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM855.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM857.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM860.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM861.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM862.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM863.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM864.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM865.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM866.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM868.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM869.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM870.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM871.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM874.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM875.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM880.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM891.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM903.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM904.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM905.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IBM918.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/IEC_P27_1.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/INIS.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/INIS_8.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/INIS_CYRILLIC.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/ISO_10367_BOX.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/ISO_2033_1983.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/ISO_5427.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/ISO_5427_EXT.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/ISO_5428.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_1.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_10.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_11.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_13.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_14.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_15.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_16.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_2.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_3.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_4.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_5.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_6.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_7.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_8.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/ISO_8859_9.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/KOI8_R.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/KOI8_RU.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/KOI8_T.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/KOI8_U.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/KOI_8.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/LATIN_GREEK.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/LATIN_GREEK_1.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/MACARABIC.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/MACCROATIAN.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/MACCYRILLIC.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/MACGREEK.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/MACHEBREW.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/MACICELAND.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/MACINTOSH.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/MACROMANIA.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/MACTHAI.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/MACTURKISH.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/MACUKRAINE.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/MAC_IS.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/MAC_SAMI.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/MAC_UK.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/NATS_DANO.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/NATS_SEFI.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/NEXTSTEP.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/SAMI_WS2.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/TIS_620.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/US_ASCII.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/UTF_8.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/VISCII.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/RecodeData/_Encode.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/TextDomain.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/Util.pm
+#usr/share/texinfo/lib/libintl-perl/lib/Locale/gettext_pp.pm
#usr/share/texinfo/texinfo.dtd
-#usr/share/texinfo/texinfo.xsl
diff --git a/config/rootfiles/common/x86_64/binutils b/config/rootfiles/common/x86_64/binutils
index b1f819c..bb0bf9b 100644
--- a/config/rootfiles/common/x86_64/binutils
+++ b/config/rootfiles/common/x86_64/binutils
@@ -104,6 +104,7 @@
#usr/share/info/bfd.info
#usr/share/info/binutils.info
#usr/share/info/configure.info
+#usr/share/info/dir
#usr/share/info/gprof.info
#usr/share/info/ld.info
#usr/share/info/standards.info
diff --git a/config/rootfiles/common/x86_64/dmidecode b/config/rootfiles/common/x86_64/dmidecode
new file mode 100644
index 0000000..8883958
--- /dev/null
+++ b/config/rootfiles/common/x86_64/dmidecode
@@ -0,0 +1,12 @@
+usr/sbin/biosdecode
+usr/sbin/dmidecode
+usr/sbin/ownership
+usr/sbin/vpddecode
+#usr/share/doc/dmidecode
+#usr/share/doc/dmidecode/AUTHORS
+#usr/share/doc/dmidecode/CHANGELOG
+#usr/share/doc/dmidecode/README
+#usr/share/man/man8/biosdecode.8
+#usr/share/man/man8/dmidecode.8
+#usr/share/man/man8/ownership.8
+#usr/share/man/man8/vpddecode.8
diff --git a/config/rootfiles/common/x86_64/gmp b/config/rootfiles/common/x86_64/gmp
index 8f5ac55..de549fc 100644
--- a/config/rootfiles/common/x86_64/gmp
+++ b/config/rootfiles/common/x86_64/gmp
@@ -4,12 +4,12 @@
#usr/lib/libgmp.la
#usr/lib/libgmp.so
usr/lib/libgmp.so.10
-usr/lib/libgmp.so.10.2.0
+usr/lib/libgmp.so.10.3.0
#usr/lib/libgmpxx.a
#usr/lib/libgmpxx.la
#usr/lib/libgmpxx.so
usr/lib/libgmpxx.so.4
-usr/lib/libgmpxx.so.4.4.0
+usr/lib/libgmpxx.so.4.5.0
#usr/share/info/gmp.info
#usr/share/info/gmp.info-1
#usr/share/info/gmp.info-2
diff --git a/config/rootfiles/core/100/exclude b/config/rootfiles/core/100/exclude
deleted file mode 100644
index 8e446ce..0000000
--- a/config/rootfiles/core/100/exclude
+++ /dev/null
@@ -1,26 +0,0 @@
-boot/config.txt
-etc/alternatives
-etc/collectd.custom
-etc/default/grub
-etc/ipsec.conf
-etc/ipsec.secrets
-etc/ipsec.user.conf
-etc/ipsec.user.secrets
-etc/localtime
-etc/shadow
-etc/snort/snort.conf
-etc/ssh/ssh_config
-etc/ssh/sshd_config
-etc/ssl/openssl.cnf
-etc/sudoers
-etc/sysconfig/firewall.local
-etc/sysconfig/rc.local
-etc/udev/rules.d/30-persistent-network.rules
-srv/web/ipfire/html/proxy.pac
-var/ipfire/dma
-var/ipfire/time
-var/ipfire/ovpn
-var/lib/alternatives
-var/log/cache
-var/state/dhcp/dhcpd.leases
-var/updatecache
diff --git a/config/rootfiles/core/100/filelists/armv5tel/binutils b/config/rootfiles/core/100/filelists/armv5tel/binutils
deleted file mode 120000
index ac971f9..0000000
--- a/config/rootfiles/core/100/filelists/armv5tel/binutils
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/armv5tel/binutils
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/armv5tel/gcc b/config/rootfiles/core/100/filelists/armv5tel/gcc
deleted file mode 120000
index 84f7b93..0000000
--- a/config/rootfiles/core/100/filelists/armv5tel/gcc
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/armv5tel/gcc
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/armv5tel/glibc b/config/rootfiles/core/100/filelists/armv5tel/glibc
deleted file mode 120000
index 4c70d72..0000000
--- a/config/rootfiles/core/100/filelists/armv5tel/glibc
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/armv5tel/glibc
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/100/filelists/armv5tel/linux-kirkwood
deleted file mode 120000
index 7217107..0000000
--- a/config/rootfiles/core/100/filelists/armv5tel/linux-kirkwood
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/armv5tel/linux-kirkwood
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/armv5tel/linux-multi b/config/rootfiles/core/100/filelists/armv5tel/linux-multi
deleted file mode 120000
index 204eb4c..0000000
--- a/config/rootfiles/core/100/filelists/armv5tel/linux-multi
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/armv5tel/linux-multi
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/armv5tel/linux-rpi b/config/rootfiles/core/100/filelists/armv5tel/linux-rpi
deleted file mode 120000
index a651a49..0000000
--- a/config/rootfiles/core/100/filelists/armv5tel/linux-rpi
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/armv5tel/linux-rpi
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/ath10k-firmware b/config/rootfiles/core/100/filelists/ath10k-firmware
deleted file mode 120000
index e7e87c2..0000000
--- a/config/rootfiles/core/100/filelists/ath10k-firmware
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/ath10k-firmware
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/bind b/config/rootfiles/core/100/filelists/bind
deleted file mode 120000
index 48a0eba..0000000
--- a/config/rootfiles/core/100/filelists/bind
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/bind
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/diffutils b/config/rootfiles/core/100/filelists/diffutils
deleted file mode 120000
index a5c02f3..0000000
--- a/config/rootfiles/core/100/filelists/diffutils
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/diffutils
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/dnsmasq b/config/rootfiles/core/100/filelists/dnsmasq
deleted file mode 120000
index d469c74..0000000
--- a/config/rootfiles/core/100/filelists/dnsmasq
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/dnsmasq
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/files b/config/rootfiles/core/100/filelists/files
deleted file mode 100644
index c75a26d..0000000
--- a/config/rootfiles/core/100/filelists/files
+++ /dev/null
@@ -1,31 +0,0 @@
-etc/system-release
-etc/issue
-etc/dracut.conf
-etc/ppp/ip-up
-etc/rc.d/init.d/firewall
-etc/rc.d/init.d/functions
-etc/rc.d/init.d/networking/dhcpcd.exe
-etc/rc.d/init.d/ntp
-etc/modprobe.d/nf_conntrack.conf
-lib/udev/rules.d/60-net.rules
-opt/pakfire/etc/pakfire.conf
-srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat
-srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat
-srv/web/ipfire/cgi-bin/logs.cgi/firewalllogip.dat
-srv/web/ipfire/cgi-bin/logs.cgi/firewalllogport.dat
-srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat
-srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromip.dat
-srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromport.dat
-srv/web/ipfire/cgi-bin/optionsfw.cgi
-srv/web/ipfire/cgi-bin/ovpnmain.cgi
-srv/web/ipfire/cgi-bin/qos.cgi
-srv/web/ipfire/cgi-bin/webaccess.cgi
-usr/bin/pgrep
-usr/local/bin/backupiso
-usr/local/bin/qosctrl
-usr/local/bin/timectrl
-usr/local/bin/wirelessctrl
-usr/sbin/firewall-policy
-usr/sbin/setup
-var/ipfire/dhcpc/dhcpcd-hooks/10-mtu
-var/ipfire/langs
diff --git a/config/rootfiles/core/100/filelists/grep b/config/rootfiles/core/100/filelists/grep
deleted file mode 120000
index ab5ef8b..0000000
--- a/config/rootfiles/core/100/filelists/grep
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/grep
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/i586/binutils b/config/rootfiles/core/100/filelists/i586/binutils
deleted file mode 120000
index 78695d7..0000000
--- a/config/rootfiles/core/100/filelists/i586/binutils
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/binutils
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/i586/gcc b/config/rootfiles/core/100/filelists/i586/gcc
deleted file mode 120000
index ba328e3..0000000
--- a/config/rootfiles/core/100/filelists/i586/gcc
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/gcc
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/i586/glibc b/config/rootfiles/core/100/filelists/i586/glibc
deleted file mode 120000
index 943021f..0000000
--- a/config/rootfiles/core/100/filelists/i586/glibc
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/glibc
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/i586/grub b/config/rootfiles/core/100/filelists/i586/grub
deleted file mode 120000
index feb236a..0000000
--- a/config/rootfiles/core/100/filelists/i586/grub
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/grub
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/i586/linux b/config/rootfiles/core/100/filelists/i586/linux
deleted file mode 120000
index 693ec4b..0000000
--- a/config/rootfiles/core/100/filelists/i586/linux
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/i586/linux-initrd b/config/rootfiles/core/100/filelists/i586/linux-initrd
deleted file mode 120000
index 32a03e6..0000000
--- a/config/rootfiles/core/100/filelists/i586/linux-initrd
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/linux-initrd
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/i586/openssl-sse2 b/config/rootfiles/core/100/filelists/i586/openssl-sse2
deleted file mode 120000
index f424713..0000000
--- a/config/rootfiles/core/100/filelists/i586/openssl-sse2
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/openssl-sse2
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/libmpc b/config/rootfiles/core/100/filelists/libmpc
deleted file mode 120000
index 88840fc..0000000
--- a/config/rootfiles/core/100/filelists/libmpc
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/libmpc
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/lua b/config/rootfiles/core/100/filelists/lua
deleted file mode 120000
index 951f661..0000000
--- a/config/rootfiles/core/100/filelists/lua
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/lua
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/mt7601u-firmware b/config/rootfiles/core/100/filelists/mt7601u-firmware
deleted file mode 120000
index 300ac04..0000000
--- a/config/rootfiles/core/100/filelists/mt7601u-firmware
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/mt7601u-firmware
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/ncurses b/config/rootfiles/core/100/filelists/ncurses
deleted file mode 120000
index 512faef..0000000
--- a/config/rootfiles/core/100/filelists/ncurses
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/ncurses
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/ntp b/config/rootfiles/core/100/filelists/ntp
deleted file mode 120000
index 7542d86..0000000
--- a/config/rootfiles/core/100/filelists/ntp
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/ntp
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/openssh b/config/rootfiles/core/100/filelists/openssh
deleted file mode 120000
index d8c77fd..0000000
--- a/config/rootfiles/core/100/filelists/openssh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/openssl b/config/rootfiles/core/100/filelists/openssl
deleted file mode 120000
index e011a92..0000000
--- a/config/rootfiles/core/100/filelists/openssl
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/openvpn b/config/rootfiles/core/100/filelists/openvpn
deleted file mode 120000
index 493f3f7..0000000
--- a/config/rootfiles/core/100/filelists/openvpn
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/openvpn
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/sed b/config/rootfiles/core/100/filelists/sed
deleted file mode 120000
index fc5f5c6..0000000
--- a/config/rootfiles/core/100/filelists/sed
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/sed
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/squid b/config/rootfiles/core/100/filelists/squid
deleted file mode 120000
index 2dc8372..0000000
--- a/config/rootfiles/core/100/filelists/squid
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/tzdata b/config/rootfiles/core/100/filelists/tzdata
deleted file mode 120000
index 5a6e325..0000000
--- a/config/rootfiles/core/100/filelists/tzdata
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/tzdata
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/x86_64/binutils b/config/rootfiles/core/100/filelists/x86_64/binutils
deleted file mode 120000
index 7d0fda5..0000000
--- a/config/rootfiles/core/100/filelists/x86_64/binutils
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/x86_64/binutils
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/x86_64/gcc b/config/rootfiles/core/100/filelists/x86_64/gcc
deleted file mode 120000
index d1616d3..0000000
--- a/config/rootfiles/core/100/filelists/x86_64/gcc
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/x86_64/gcc
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/x86_64/glibc b/config/rootfiles/core/100/filelists/x86_64/glibc
deleted file mode 120000
index 1119099..0000000
--- a/config/rootfiles/core/100/filelists/x86_64/glibc
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/x86_64/glibc
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/x86_64/grub b/config/rootfiles/core/100/filelists/x86_64/grub
deleted file mode 120000
index 78d3bd7..0000000
--- a/config/rootfiles/core/100/filelists/x86_64/grub
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/x86_64/grub
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/x86_64/linux b/config/rootfiles/core/100/filelists/x86_64/linux
deleted file mode 120000
index 0615b5b..0000000
--- a/config/rootfiles/core/100/filelists/x86_64/linux
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/x86_64/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/x86_64/linux-initrd b/config/rootfiles/core/100/filelists/x86_64/linux-initrd
deleted file mode 120000
index 1b9fff7..0000000
--- a/config/rootfiles/core/100/filelists/x86_64/linux-initrd
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/x86_64/linux-initrd
\ No newline at end of file
diff --git a/config/rootfiles/core/100/filelists/xz b/config/rootfiles/core/100/filelists/xz
deleted file mode 120000
index 734e926..0000000
--- a/config/rootfiles/core/100/filelists/xz
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/xz
\ No newline at end of file
diff --git a/config/rootfiles/core/100/meta b/config/rootfiles/core/100/meta
deleted file mode 100644
index d547fa8..0000000
--- a/config/rootfiles/core/100/meta
+++ /dev/null
@@ -1 +0,0 @@
-DEPS=""
diff --git a/config/rootfiles/core/100/update.sh b/config/rootfiles/core/100/update.sh
deleted file mode 100644
index 931930a..0000000
--- a/config/rootfiles/core/100/update.sh
+++ /dev/null
@@ -1,260 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire is free software; you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation; either version 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) 2016 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1
-
-function find_device() {
- local mountpoint="${1}"
-
- local root
- local dev mp fs flags rest
- while read -r dev mp fs flags rest; do
- # Skip unwanted entries
- [ "${dev}" = "rootfs" ] && continue
-
- if [ "${mp}" = "${mountpoint}" ] && [ -b "${dev}" ]; then
- root="$(basename "${dev}")"
- break
- fi
- done < /proc/mounts
-
- # Get the actual device from the partition that holds /
- while [ -n "${root}" ]; do
- if [ -e "/sys/block/${root}" ]; then
- echo "${root}"
- return 0
- fi
-
- # Remove last character
- root="${root::-1}"
- done
-
- return 1
-}
-
-
-core=100
-
-function exit_with_error() {
- # Set last succesfull installed core.
- echo $(($core-1)) > /opt/pakfire/db/core/mine
- /usr/bin/logger -p syslog.emerg -t ipfire \
- "core-update-${core}: $1"
- exit $2
-}
-
-# Remove old core updates from pakfire cache to save space...
-for (( i=1; i<=$core; i++ ))
-do
- rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
-done
-
-#
-# Do some sanity checks.
-case $(uname -r) in
- *-ipfire* )
- # Ok.
- ;;
- * )
- exit_with_error "ERROR cannot update. No IPFire Kernel." 1
- ;;
-esac
-
-
-#
-#
-KVER="xxxKVERxxx"
-
-# Check diskspace on root
-ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
-
-if [ $ROOTSPACE -lt 100000 ]; then
- exit_with_error "ERROR cannot update because not enough free space on root." 2
- exit 2
-fi
-
-echo
-echo Update Kernel to $KVER ...
-#
-# Remove old kernel, configs, initrd, modules, dtb's ...
-#
-rm -rf /boot/System.map-*
-rm -rf /boot/config-*
-rm -rf /boot/ipfirerd-*
-rm -rf /boot/initramfs-*
-rm -rf /boot/vmlinuz-*
-rm -rf /boot/uImage-ipfire-*
-rm -rf /boot/zImage-ipfire-*
-rm -rf /boot/uInit-ipfire-*
-rm -rf /boot/dtb-*-ipfire-*
-rm -rf /lib/modules
-
-case "$(uname -m)" in
- armv*)
- # Backup uEnv.txt if exist
- if [ -e /boot/uEnv.txt ]; then
- cp -vf /boot/uEnv.txt /boot/uEnv.txt.org
- fi
-
- # work around the u-boot folder detection bug
- mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood
- mkdir -pv /boot/dtb-$KVER-ipfire-multi
- touch /boot/uImage-ipfire-kirkwood
- touch /boot/zImage-ipfire-multi
- touch /boot/uIinit-ipfire-kirkwood
- touch /boot/uIinit-ipfire-multi
- ;;
-esac
-
-# Stop services
-/etc/init.d/snort stop
-/etc/init.d/squid stop
-/etc/init.d/dnsmasq stop
-/etc/init.d/ipsec stop
-/etc/init.d/ntp stop
-/etc/init.d/apache stop
-
-
-# Extract files
-tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /
-
-# update linker config
-ldconfig
-
-# Check diskspace on boot
-BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
-
-if [ $BOOTSPACE -lt 1000 ]; then
- case $(uname -r) in
- *-ipfire-kirkwood )
- # Special handling for old kirkwood images.
- # (install only kirkwood kernel)
- rm -rf /boot/*
- # work around the u-boot folder detection bug
- mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood
- tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \
- --numeric-owner -C / --wildcards 'boot/*-kirkwood*'
- ;;
- * )
- /etc/init.d/apache start
- exit_with_error "FATAL-ERROR space run out on boot. System is not bootable..." 4
- ;;
- esac
-fi
-
-# restart init because the glibc was updated.
-telinit u
-
-# Fix hardening flags in grub
-paxctl -mpexs /usr/bin/grub-script-check
-
-# Regenerate IPsec configuration
-sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi
-
-# Update Language cache
-/usr/local/bin/update-lang-cache
-
-#
-# Start services
-#
-/etc/init.d/apache start
-/etc/init.d/ntp start
-/etc/init.d/dnsmasq start
-/etc/init.d/sshd restart
-/etc/init.d/squid start
-/etc/init.d/snort start
-if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
- /etc/init.d/ipsec start
-fi
-
-# Delete old QoS enabled indicator
-rm -f /var/ipfire/qos/enable
-
-# Upadate Kernel version uEnv.txt
-if [ -e /boot/uEnv.txt ]; then
- sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt
-fi
-
-# call user update script (needed for some arm boards)
-if [ -e /boot/pakfire-kernel-update ]; then
- /boot/pakfire-kernel-update ${KVER}
-fi
-
-case "$(uname -m)" in
- i?86)
- # Force (re)install pae kernel if pae is supported
- rm -rf /opt/pakfire/db/installed/meta-linux-pae
- if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
- ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
- BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
- if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then
- /usr/bin/logger -p syslog.emerg -t ipfire \
- "core-update-${core}: WARNING not enough space for pae kernel."
- else
- echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
- echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
- echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae
- fi
- fi
- ;;
-esac
-#
-# After pakfire has ended run it again and update the lists and do upgrade
-#
-echo '#!/bin/bash' > /tmp/pak_update
-echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update
-echo ' sleep 1' >> /tmp/pak_update
-echo 'done' >> /tmp/pak_update
-echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update
-echo ' sleep 1' >> /tmp/pak_update
-echo 'done' >> /tmp/pak_update
-echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update
-echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
-echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
-echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
-echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub/uboot config"' >> /tmp/pak_update
-echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update
-echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update
-echo 'touch /var/run/need_reboot ' >> /tmp/pak_update
-#
-killall -KILL pak_update
-chmod +x /tmp/pak_update
-/tmp/pak_update &
-
-sync
-
-# This update need a reboot...
-touch /var/run/need_reboot
-
-# Finish
-/etc/init.d/fireinfo start
-sendprofile
-# Update grub config to display new core version
-if [ -e /boot/grub/grub.cfg ]; then
- grub-mkconfig -o /boot/grub/grub.cfg
-fi
-sync
-
-# Don't report the exitcode last command
-exit 0
diff --git a/config/rootfiles/core/101/exclude b/config/rootfiles/core/101/exclude
new file mode 100644
index 0000000..7ddeae0
--- /dev/null
+++ b/config/rootfiles/core/101/exclude
@@ -0,0 +1,28 @@
+boot/config.txt
+boot/grub/grub.cfg
+boot/grub/grubenv
+etc/alternatives
+etc/collectd.custom
+etc/default/grub
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/snort/snort.conf
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+var/ipfire/dma
+var/ipfire/time
+var/ipfire/ovpn
+var/lib/alternatives
+var/log/cache
+var/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/core/101/filelists/armv5tel/ath9k-module b/config/rootfiles/core/101/filelists/armv5tel/ath9k-module
new file mode 100644
index 0000000..92f518e
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/armv5tel/ath9k-module
@@ -0,0 +1,3 @@
+lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/ath/ath9k
+lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ath/ath9k
+
diff --git a/config/rootfiles/core/101/filelists/armv5tel/gmp b/config/rootfiles/core/101/filelists/armv5tel/gmp
new file mode 120000
index 0000000..2bdf30d
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/armv5tel/gmp
@@ -0,0 +1 @@
+../../../../common/armv5tel/gmp
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/armv5tel/linux-rpi b/config/rootfiles/core/101/filelists/armv5tel/linux-rpi
new file mode 120000
index 0000000..a651a49
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/armv5tel/linux-rpi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-rpi
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/bind b/config/rootfiles/core/101/filelists/bind
new file mode 120000
index 0000000..48a0eba
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/bind
@@ -0,0 +1 @@
+../../../common/bind
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/dma b/config/rootfiles/core/101/filelists/dma
new file mode 120000
index 0000000..60f4682
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/dma
@@ -0,0 +1 @@
+../../../common/dma
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/e2fsprogs b/config/rootfiles/core/101/filelists/e2fsprogs
new file mode 120000
index 0000000..37b55de
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/e2fsprogs
@@ -0,0 +1 @@
+../../../common/e2fsprogs
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/files b/config/rootfiles/core/101/filelists/files
new file mode 100644
index 0000000..c04cff6
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/files
@@ -0,0 +1,7 @@
+etc/system-release
+etc/issue
+etc/rc.d/init.d/firewall
+srv/web/ipfire/cgi-bin/chpasswd.cgi
+srv/web/ipfire/cgi-bin/ipinfo.cgi
+srv/web/ipfire/cgi-bin/optionsfw.cgi
+srv/web/ipfire/cgi-bin/proxy.cgi
diff --git a/config/rootfiles/core/101/filelists/grep b/config/rootfiles/core/101/filelists/grep
new file mode 120000
index 0000000..ab5ef8b
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/grep
@@ -0,0 +1 @@
+../../../common/grep
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/i586/ath9k-module b/config/rootfiles/core/101/filelists/i586/ath9k-module
new file mode 100644
index 0000000..2490e61
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/i586/ath9k-module
@@ -0,0 +1,3 @@
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/ath9k
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k
+
diff --git a/config/rootfiles/core/101/filelists/i586/dmidecode b/config/rootfiles/core/101/filelists/i586/dmidecode
new file mode 120000
index 0000000..1add99b
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/i586/dmidecode
@@ -0,0 +1 @@
+../../../../common/i586/dmidecode
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/i586/gmp b/config/rootfiles/core/101/filelists/i586/gmp
new file mode 120000
index 0000000..52a09cd
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/i586/gmp
@@ -0,0 +1 @@
+../../../../common/i586/gmp
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/libxml2 b/config/rootfiles/core/101/filelists/libxml2
new file mode 120000
index 0000000..242e69f
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/libxml2
@@ -0,0 +1 @@
+../../../common/libxml2
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/mpfr b/config/rootfiles/core/101/filelists/mpfr
new file mode 120000
index 0000000..c8468bf
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/mpfr
@@ -0,0 +1 @@
+../../../common/mpfr
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/nettle b/config/rootfiles/core/101/filelists/nettle
new file mode 120000
index 0000000..f0dba7a
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/nettle
@@ -0,0 +1 @@
+../../../common/nettle
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/patch b/config/rootfiles/core/101/filelists/patch
new file mode 120000
index 0000000..27a3825
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/patch
@@ -0,0 +1 @@
+../../../common/patch
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/paxctl b/config/rootfiles/core/101/filelists/paxctl
new file mode 120000
index 0000000..dda8d9f
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/paxctl
@@ -0,0 +1 @@
+../../../common/paxctl
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/pciutils b/config/rootfiles/core/101/filelists/pciutils
new file mode 120000
index 0000000..aeb45e7
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/pciutils
@@ -0,0 +1 @@
+../../../common/pciutils
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/pcre b/config/rootfiles/core/101/filelists/pcre
new file mode 120000
index 0000000..b390d9a
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/pcre
@@ -0,0 +1 @@
+../../../common/pcre
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/perl-Apache-Htpasswd b/config/rootfiles/core/101/filelists/perl-Apache-Htpasswd
new file mode 120000
index 0000000..c7d2c8d
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/perl-Apache-Htpasswd
@@ -0,0 +1 @@
+../../../common/perl-Apache-Htpasswd
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/squid b/config/rootfiles/core/101/filelists/squid
new file mode 120000
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/x86_64/ath9k-module b/config/rootfiles/core/101/filelists/x86_64/ath9k-module
new file mode 100644
index 0000000..25361ce
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/x86_64/ath9k-module
@@ -0,0 +1,2 @@
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/ath9k
+
diff --git a/config/rootfiles/core/101/filelists/x86_64/dmidecode b/config/rootfiles/core/101/filelists/x86_64/dmidecode
new file mode 120000
index 0000000..88f5f0a
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/x86_64/dmidecode
@@ -0,0 +1 @@
+../../../../common/x86_64/dmidecode
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/x86_64/gmp b/config/rootfiles/core/101/filelists/x86_64/gmp
new file mode 120000
index 0000000..7c59c60
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/x86_64/gmp
@@ -0,0 +1 @@
+../../../../common/x86_64/gmp
\ No newline at end of file
diff --git a/config/rootfiles/core/101/meta b/config/rootfiles/core/101/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/101/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/101/update.sh b/config/rootfiles/core/101/update.sh
new file mode 100644
index 0000000..207b046
--- /dev/null
+++ b/config/rootfiles/core/101/update.sh
@@ -0,0 +1,95 @@
+#!/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) 2016 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=101
+
+function exit_with_error() {
+ # Set last succesfull installed core.
+ echo $(($core-1)) > /opt/pakfire/db/core/mine
+ /usr/bin/logger -p syslog.emerg -t ipfire \
+ "core-update-${core}: $1"
+ exit $2
+}
+
+# Remove old core updates from pakfire cache to save space...
+for (( i=1; i<=$core; i++ ))
+do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+
+# Stop services
+/etc/init.d/squid stop
+
+# Remove old raspberrypi modules
+rm -rf /lib/modules/3.14.65-ipfire-rpi
+
+# Extract files
+extract_files
+
+# update linker config
+ldconfig
+
+# Fix conntrack configuration
+for i in CONNTRACK_H323 CONNTRACK_FTP CONNTRACK_PPTP CONNTRACK_TFTP CONNTRACK_IRC; do
+ if ! grep -q "^${i}" /var/ipfire/optionsfw/settings; then
+ echo "${i}=on"
+ fi
+done >> /var/ipfire/optionsfw/settings
+
+# Special handling for SIP
+if ! grep -q "^CONNTRACK_SIP" /var/ipfire/optionsfw/settings; then
+ if [ -e "/var/ipfire/main/disable_nf_sip" ]; then
+ echo "CONNTRACK_SIP=off" >> /var/ipfire/optionsfw/settings
+ rm -f /var/ipfire/main/disable_nf_sip
+ else
+ echo "CONNTRACK_SIP=on" >> /var/ipfire/optionsfw/settings
+ fi
+fi
+
+# Update Language cache
+#/usr/local/bin/update-lang-cache
+
+#
+# Start services
+#
+/etc/init.d/squid start
+
+sync
+# This update need a reboot...
+touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+# Update grub config to display new core version
+if [ -e /boot/grub/grub.cfg ]; then
+ grub-mkconfig -o /boot/grub/grub.cfg
+fi
+sync
+
+# Don't report the exitcode last command
+exit 0
diff --git a/config/rootfiles/core/99/exclude b/config/rootfiles/core/99/exclude
deleted file mode 100644
index d87f175..0000000
--- a/config/rootfiles/core/99/exclude
+++ /dev/null
@@ -1,25 +0,0 @@
-boot/config.txt
-etc/alternatives
-etc/collectd.custom
-etc/ipsec.conf
-etc/ipsec.secrets
-etc/ipsec.user.conf
-etc/ipsec.user.secrets
-etc/localtime
-etc/shadow
-etc/snort/snort.conf
-etc/ssh/ssh_config
-etc/ssh/sshd_config
-etc/ssl/openssl.cnf
-etc/sudoers
-etc/sysconfig/firewall.local
-etc/sysconfig/rc.local
-etc/udev/rules.d/30-persistent-network.rules
-srv/web/ipfire/html/proxy.pac
-var/ipfire/dma
-var/ipfire/time
-var/ipfire/ovpn
-var/lib/alternatives
-var/log/cache
-var/state/dhcp/dhcpd.leases
-var/updatecache
diff --git a/config/rootfiles/core/99/filelists/files b/config/rootfiles/core/99/filelists/files
deleted file mode 100644
index 76b5b4e..0000000
--- a/config/rootfiles/core/99/filelists/files
+++ /dev/null
@@ -1,3 +0,0 @@
-etc/system-release
-etc/issue
-var/ipfire/backup/include
diff --git a/config/rootfiles/core/99/filelists/i586/openssl-sse2 b/config/rootfiles/core/99/filelists/i586/openssl-sse2
deleted file mode 120000
index f424713..0000000
--- a/config/rootfiles/core/99/filelists/i586/openssl-sse2
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/openssl-sse2
\ No newline at end of file
diff --git a/config/rootfiles/core/99/filelists/openssh b/config/rootfiles/core/99/filelists/openssh
deleted file mode 120000
index d8c77fd..0000000
--- a/config/rootfiles/core/99/filelists/openssh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/core/99/filelists/openssl b/config/rootfiles/core/99/filelists/openssl
deleted file mode 120000
index e011a92..0000000
--- a/config/rootfiles/core/99/filelists/openssl
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/core/99/meta b/config/rootfiles/core/99/meta
deleted file mode 100644
index d547fa8..0000000
--- a/config/rootfiles/core/99/meta
+++ /dev/null
@@ -1 +0,0 @@
-DEPS=""
diff --git a/config/rootfiles/core/99/update.sh b/config/rootfiles/core/99/update.sh
deleted file mode 100644
index b57d0a7..0000000
--- a/config/rootfiles/core/99/update.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-############################################################################
-# #
-# This file is part of the IPFire Firewall. #
-# #
-# IPFire is free software; you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation; either version 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) 2016 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=99
-for (( i=1; i<=$core; i++ ))
-do
- rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
-done
-
-# Stop services
-
-# remove slogin which is not included in new OpenSSH
-rm /usr/bin/slogin
-
-# Extract files
-extract_files
-
-# Update Language cache
-# /usr/local/bin/update-lang-cache
-
-# Start services
-/etc/init.d/sshd restart
-/etc/init.d/apache restart
-
-# This update need a reboot...
-touch /var/run/need_reboot
-
-# Finish
-/etc/init.d/fireinfo start
-sendprofile
-# Update grub config to display new core version
-if [ -e /boot/grub/grub.cfg ]; then
- grub-mkconfig -o /boot/grub/grub.cfg
-fi
-sync
-
-# Don't report the exitcode last command
-exit 0
diff --git a/config/rootfiles/oldcore/100/exclude b/config/rootfiles/oldcore/100/exclude
new file mode 100644
index 0000000..7ddeae0
--- /dev/null
+++ b/config/rootfiles/oldcore/100/exclude
@@ -0,0 +1,28 @@
+boot/config.txt
+boot/grub/grub.cfg
+boot/grub/grubenv
+etc/alternatives
+etc/collectd.custom
+etc/default/grub
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/snort/snort.conf
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+var/ipfire/dma
+var/ipfire/time
+var/ipfire/ovpn
+var/lib/alternatives
+var/log/cache
+var/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/oldcore/100/filelists/armv5tel/binutils b/config/rootfiles/oldcore/100/filelists/armv5tel/binutils
new file mode 120000
index 0000000..ac971f9
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/armv5tel/binutils
@@ -0,0 +1 @@
+../../../../common/armv5tel/binutils
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/armv5tel/gcc b/config/rootfiles/oldcore/100/filelists/armv5tel/gcc
new file mode 120000
index 0000000..84f7b93
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/armv5tel/gcc
@@ -0,0 +1 @@
+../../../../common/armv5tel/gcc
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/armv5tel/glibc b/config/rootfiles/oldcore/100/filelists/armv5tel/glibc
new file mode 120000
index 0000000..4c70d72
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/armv5tel/glibc
@@ -0,0 +1 @@
+../../../../common/armv5tel/glibc
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/100/filelists/armv5tel/linux-kirkwood
new file mode 120000
index 0000000..7217107
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/armv5tel/linux-kirkwood
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-kirkwood
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/100/filelists/armv5tel/linux-multi
new file mode 120000
index 0000000..204eb4c
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/armv5tel/linux-multi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-multi
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/armv5tel/linux-rpi b/config/rootfiles/oldcore/100/filelists/armv5tel/linux-rpi
new file mode 120000
index 0000000..a651a49
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/armv5tel/linux-rpi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-rpi
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/ath10k-firmware b/config/rootfiles/oldcore/100/filelists/ath10k-firmware
new file mode 120000
index 0000000..e7e87c2
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/ath10k-firmware
@@ -0,0 +1 @@
+../../../common/ath10k-firmware
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/bind b/config/rootfiles/oldcore/100/filelists/bind
new file mode 120000
index 0000000..48a0eba
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/bind
@@ -0,0 +1 @@
+../../../common/bind
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/diffutils b/config/rootfiles/oldcore/100/filelists/diffutils
new file mode 120000
index 0000000..a5c02f3
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/diffutils
@@ -0,0 +1 @@
+../../../common/diffutils
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/dnsmasq b/config/rootfiles/oldcore/100/filelists/dnsmasq
new file mode 120000
index 0000000..d469c74
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/dnsmasq
@@ -0,0 +1 @@
+../../../common/dnsmasq
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/files b/config/rootfiles/oldcore/100/filelists/files
new file mode 100644
index 0000000..c75a26d
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/files
@@ -0,0 +1,31 @@
+etc/system-release
+etc/issue
+etc/dracut.conf
+etc/ppp/ip-up
+etc/rc.d/init.d/firewall
+etc/rc.d/init.d/functions
+etc/rc.d/init.d/networking/dhcpcd.exe
+etc/rc.d/init.d/ntp
+etc/modprobe.d/nf_conntrack.conf
+lib/udev/rules.d/60-net.rules
+opt/pakfire/etc/pakfire.conf
+srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat
+srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat
+srv/web/ipfire/cgi-bin/logs.cgi/firewalllogip.dat
+srv/web/ipfire/cgi-bin/logs.cgi/firewalllogport.dat
+srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat
+srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromip.dat
+srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromport.dat
+srv/web/ipfire/cgi-bin/optionsfw.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
+srv/web/ipfire/cgi-bin/qos.cgi
+srv/web/ipfire/cgi-bin/webaccess.cgi
+usr/bin/pgrep
+usr/local/bin/backupiso
+usr/local/bin/qosctrl
+usr/local/bin/timectrl
+usr/local/bin/wirelessctrl
+usr/sbin/firewall-policy
+usr/sbin/setup
+var/ipfire/dhcpc/dhcpcd-hooks/10-mtu
+var/ipfire/langs
diff --git a/config/rootfiles/oldcore/100/filelists/grep b/config/rootfiles/oldcore/100/filelists/grep
new file mode 120000
index 0000000..ab5ef8b
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/grep
@@ -0,0 +1 @@
+../../../common/grep
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/i586/binutils b/config/rootfiles/oldcore/100/filelists/i586/binutils
new file mode 120000
index 0000000..78695d7
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/i586/binutils
@@ -0,0 +1 @@
+../../../../common/i586/binutils
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/i586/gcc b/config/rootfiles/oldcore/100/filelists/i586/gcc
new file mode 120000
index 0000000..ba328e3
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/i586/gcc
@@ -0,0 +1 @@
+../../../../common/i586/gcc
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/i586/glibc b/config/rootfiles/oldcore/100/filelists/i586/glibc
new file mode 120000
index 0000000..943021f
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/i586/glibc
@@ -0,0 +1 @@
+../../../../common/i586/glibc
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/i586/grub b/config/rootfiles/oldcore/100/filelists/i586/grub
new file mode 120000
index 0000000..feb236a
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/i586/grub
@@ -0,0 +1 @@
+../../../../common/i586/grub
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/i586/linux b/config/rootfiles/oldcore/100/filelists/i586/linux
new file mode 120000
index 0000000..693ec4b
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/i586/linux
@@ -0,0 +1 @@
+../../../../common/i586/linux
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/i586/linux-initrd b/config/rootfiles/oldcore/100/filelists/i586/linux-initrd
new file mode 120000
index 0000000..32a03e6
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/i586/linux-initrd
@@ -0,0 +1 @@
+../../../../common/i586/linux-initrd
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/100/filelists/i586/openssl-sse2
new file mode 120000
index 0000000..f424713
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/i586/openssl-sse2
@@ -0,0 +1 @@
+../../../../common/i586/openssl-sse2
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/libmpc b/config/rootfiles/oldcore/100/filelists/libmpc
new file mode 120000
index 0000000..88840fc
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/libmpc
@@ -0,0 +1 @@
+../../../common/libmpc
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/lua b/config/rootfiles/oldcore/100/filelists/lua
new file mode 120000
index 0000000..951f661
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/lua
@@ -0,0 +1 @@
+../../../common/lua
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/mt7601u-firmware b/config/rootfiles/oldcore/100/filelists/mt7601u-firmware
new file mode 120000
index 0000000..300ac04
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/mt7601u-firmware
@@ -0,0 +1 @@
+../../../common/mt7601u-firmware
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/ncurses b/config/rootfiles/oldcore/100/filelists/ncurses
new file mode 120000
index 0000000..512faef
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/ncurses
@@ -0,0 +1 @@
+../../../common/ncurses
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/ntp b/config/rootfiles/oldcore/100/filelists/ntp
new file mode 120000
index 0000000..7542d86
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/ntp
@@ -0,0 +1 @@
+../../../common/ntp
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/openssh b/config/rootfiles/oldcore/100/filelists/openssh
new file mode 120000
index 0000000..d8c77fd
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/openssl b/config/rootfiles/oldcore/100/filelists/openssl
new file mode 120000
index 0000000..e011a92
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/openvpn b/config/rootfiles/oldcore/100/filelists/openvpn
new file mode 120000
index 0000000..493f3f7
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/openvpn
@@ -0,0 +1 @@
+../../../common/openvpn
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/sed b/config/rootfiles/oldcore/100/filelists/sed
new file mode 120000
index 0000000..fc5f5c6
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/sed
@@ -0,0 +1 @@
+../../../common/sed
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/squid b/config/rootfiles/oldcore/100/filelists/squid
new file mode 120000
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/tzdata b/config/rootfiles/oldcore/100/filelists/tzdata
new file mode 120000
index 0000000..5a6e325
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/tzdata
@@ -0,0 +1 @@
+../../../common/tzdata
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/x86_64/binutils b/config/rootfiles/oldcore/100/filelists/x86_64/binutils
new file mode 120000
index 0000000..7d0fda5
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/x86_64/binutils
@@ -0,0 +1 @@
+../../../../common/x86_64/binutils
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/x86_64/gcc b/config/rootfiles/oldcore/100/filelists/x86_64/gcc
new file mode 120000
index 0000000..d1616d3
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/x86_64/gcc
@@ -0,0 +1 @@
+../../../../common/x86_64/gcc
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/x86_64/glibc b/config/rootfiles/oldcore/100/filelists/x86_64/glibc
new file mode 120000
index 0000000..1119099
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/x86_64/glibc
@@ -0,0 +1 @@
+../../../../common/x86_64/glibc
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/x86_64/grub b/config/rootfiles/oldcore/100/filelists/x86_64/grub
new file mode 120000
index 0000000..78d3bd7
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/x86_64/grub
@@ -0,0 +1 @@
+../../../../common/x86_64/grub
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/x86_64/linux b/config/rootfiles/oldcore/100/filelists/x86_64/linux
new file mode 120000
index 0000000..0615b5b
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/x86_64/linux
@@ -0,0 +1 @@
+../../../../common/x86_64/linux
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/x86_64/linux-initrd b/config/rootfiles/oldcore/100/filelists/x86_64/linux-initrd
new file mode 120000
index 0000000..1b9fff7
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/x86_64/linux-initrd
@@ -0,0 +1 @@
+../../../../common/x86_64/linux-initrd
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/filelists/xz b/config/rootfiles/oldcore/100/filelists/xz
new file mode 120000
index 0000000..734e926
--- /dev/null
+++ b/config/rootfiles/oldcore/100/filelists/xz
@@ -0,0 +1 @@
+../../../common/xz
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/100/meta b/config/rootfiles/oldcore/100/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/oldcore/100/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/oldcore/100/update.sh b/config/rootfiles/oldcore/100/update.sh
new file mode 100644
index 0000000..931930a
--- /dev/null
+++ b/config/rootfiles/oldcore/100/update.sh
@@ -0,0 +1,260 @@
+#!/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) 2016 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+function find_device() {
+ local mountpoint="${1}"
+
+ local root
+ local dev mp fs flags rest
+ while read -r dev mp fs flags rest; do
+ # Skip unwanted entries
+ [ "${dev}" = "rootfs" ] && continue
+
+ if [ "${mp}" = "${mountpoint}" ] && [ -b "${dev}" ]; then
+ root="$(basename "${dev}")"
+ break
+ fi
+ done < /proc/mounts
+
+ # Get the actual device from the partition that holds /
+ while [ -n "${root}" ]; do
+ if [ -e "/sys/block/${root}" ]; then
+ echo "${root}"
+ return 0
+ fi
+
+ # Remove last character
+ root="${root::-1}"
+ done
+
+ return 1
+}
+
+
+core=100
+
+function exit_with_error() {
+ # Set last succesfull installed core.
+ echo $(($core-1)) > /opt/pakfire/db/core/mine
+ /usr/bin/logger -p syslog.emerg -t ipfire \
+ "core-update-${core}: $1"
+ exit $2
+}
+
+# Remove old core updates from pakfire cache to save space...
+for (( i=1; i<=$core; i++ ))
+do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+#
+# Do some sanity checks.
+case $(uname -r) in
+ *-ipfire* )
+ # Ok.
+ ;;
+ * )
+ exit_with_error "ERROR cannot update. No IPFire Kernel." 1
+ ;;
+esac
+
+
+#
+#
+KVER="xxxKVERxxx"
+
+# Check diskspace on root
+ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+
+if [ $ROOTSPACE -lt 100000 ]; then
+ exit_with_error "ERROR cannot update because not enough free space on root." 2
+ exit 2
+fi
+
+echo
+echo Update Kernel to $KVER ...
+#
+# Remove old kernel, configs, initrd, modules, dtb's ...
+#
+rm -rf /boot/System.map-*
+rm -rf /boot/config-*
+rm -rf /boot/ipfirerd-*
+rm -rf /boot/initramfs-*
+rm -rf /boot/vmlinuz-*
+rm -rf /boot/uImage-ipfire-*
+rm -rf /boot/zImage-ipfire-*
+rm -rf /boot/uInit-ipfire-*
+rm -rf /boot/dtb-*-ipfire-*
+rm -rf /lib/modules
+
+case "$(uname -m)" in
+ armv*)
+ # Backup uEnv.txt if exist
+ if [ -e /boot/uEnv.txt ]; then
+ cp -vf /boot/uEnv.txt /boot/uEnv.txt.org
+ fi
+
+ # work around the u-boot folder detection bug
+ mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood
+ mkdir -pv /boot/dtb-$KVER-ipfire-multi
+ touch /boot/uImage-ipfire-kirkwood
+ touch /boot/zImage-ipfire-multi
+ touch /boot/uIinit-ipfire-kirkwood
+ touch /boot/uIinit-ipfire-multi
+ ;;
+esac
+
+# Stop services
+/etc/init.d/snort stop
+/etc/init.d/squid stop
+/etc/init.d/dnsmasq stop
+/etc/init.d/ipsec stop
+/etc/init.d/ntp stop
+/etc/init.d/apache stop
+
+
+# Extract files
+tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /
+
+# update linker config
+ldconfig
+
+# Check diskspace on boot
+BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+
+if [ $BOOTSPACE -lt 1000 ]; then
+ case $(uname -r) in
+ *-ipfire-kirkwood )
+ # Special handling for old kirkwood images.
+ # (install only kirkwood kernel)
+ rm -rf /boot/*
+ # work around the u-boot folder detection bug
+ mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood
+ tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \
+ --numeric-owner -C / --wildcards 'boot/*-kirkwood*'
+ ;;
+ * )
+ /etc/init.d/apache start
+ exit_with_error "FATAL-ERROR space run out on boot. System is not bootable..." 4
+ ;;
+ esac
+fi
+
+# restart init because the glibc was updated.
+telinit u
+
+# Fix hardening flags in grub
+paxctl -mpexs /usr/bin/grub-script-check
+
+# Regenerate IPsec configuration
+sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+#
+# Start services
+#
+/etc/init.d/apache start
+/etc/init.d/ntp start
+/etc/init.d/dnsmasq start
+/etc/init.d/sshd restart
+/etc/init.d/squid start
+/etc/init.d/snort start
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
+ /etc/init.d/ipsec start
+fi
+
+# Delete old QoS enabled indicator
+rm -f /var/ipfire/qos/enable
+
+# Upadate Kernel version uEnv.txt
+if [ -e /boot/uEnv.txt ]; then
+ sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt
+fi
+
+# call user update script (needed for some arm boards)
+if [ -e /boot/pakfire-kernel-update ]; then
+ /boot/pakfire-kernel-update ${KVER}
+fi
+
+case "$(uname -m)" in
+ i?86)
+ # Force (re)install pae kernel if pae is supported
+ rm -rf /opt/pakfire/db/installed/meta-linux-pae
+ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
+ ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+ BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+ if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then
+ /usr/bin/logger -p syslog.emerg -t ipfire \
+ "core-update-${core}: WARNING not enough space for pae kernel."
+ else
+ echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
+ echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
+ echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae
+ fi
+ fi
+ ;;
+esac
+#
+# After pakfire has ended run it again and update the lists and do upgrade
+#
+echo '#!/bin/bash' > /tmp/pak_update
+echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update
+echo ' sleep 1' >> /tmp/pak_update
+echo 'done' >> /tmp/pak_update
+echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update
+echo ' sleep 1' >> /tmp/pak_update
+echo 'done' >> /tmp/pak_update
+echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update
+echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
+echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
+echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update
+echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub/uboot config"' >> /tmp/pak_update
+echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update
+echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update
+echo 'touch /var/run/need_reboot ' >> /tmp/pak_update
+#
+killall -KILL pak_update
+chmod +x /tmp/pak_update
+/tmp/pak_update &
+
+sync
+
+# This update need a reboot...
+touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+# Update grub config to display new core version
+if [ -e /boot/grub/grub.cfg ]; then
+ grub-mkconfig -o /boot/grub/grub.cfg
+fi
+sync
+
+# Don't report the exitcode last command
+exit 0
diff --git a/config/rootfiles/oldcore/99/exclude b/config/rootfiles/oldcore/99/exclude
new file mode 100644
index 0000000..d87f175
--- /dev/null
+++ b/config/rootfiles/oldcore/99/exclude
@@ -0,0 +1,25 @@
+boot/config.txt
+etc/alternatives
+etc/collectd.custom
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/snort/snort.conf
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+var/ipfire/dma
+var/ipfire/time
+var/ipfire/ovpn
+var/lib/alternatives
+var/log/cache
+var/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/oldcore/99/filelists/files b/config/rootfiles/oldcore/99/filelists/files
new file mode 100644
index 0000000..76b5b4e
--- /dev/null
+++ b/config/rootfiles/oldcore/99/filelists/files
@@ -0,0 +1,3 @@
+etc/system-release
+etc/issue
+var/ipfire/backup/include
diff --git a/config/rootfiles/oldcore/99/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/99/filelists/i586/openssl-sse2
new file mode 120000
index 0000000..f424713
--- /dev/null
+++ b/config/rootfiles/oldcore/99/filelists/i586/openssl-sse2
@@ -0,0 +1 @@
+../../../../common/i586/openssl-sse2
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/99/filelists/openssh b/config/rootfiles/oldcore/99/filelists/openssh
new file mode 120000
index 0000000..d8c77fd
--- /dev/null
+++ b/config/rootfiles/oldcore/99/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/99/filelists/openssl b/config/rootfiles/oldcore/99/filelists/openssl
new file mode 120000
index 0000000..e011a92
--- /dev/null
+++ b/config/rootfiles/oldcore/99/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/99/meta b/config/rootfiles/oldcore/99/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/oldcore/99/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/oldcore/99/update.sh b/config/rootfiles/oldcore/99/update.sh
new file mode 100644
index 0000000..b57d0a7
--- /dev/null
+++ b/config/rootfiles/oldcore/99/update.sh
@@ -0,0 +1,62 @@
+#!/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) 2016 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=99
+for (( i=1; i<=$core; i++ ))
+do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+# Stop services
+
+# remove slogin which is not included in new OpenSSH
+rm /usr/bin/slogin
+
+# Extract files
+extract_files
+
+# Update Language cache
+# /usr/local/bin/update-lang-cache
+
+# Start services
+/etc/init.d/sshd restart
+/etc/init.d/apache restart
+
+# This update need a reboot...
+touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+# Update grub config to display new core version
+if [ -e /boot/grub/grub.cfg ]; then
+ grub-mkconfig -o /boot/grub/grub.cfg
+fi
+sync
+
+# Don't report the exitcode last command
+exit 0
diff --git a/config/rootfiles/packages/ebtables b/config/rootfiles/packages/ebtables
index 7e10eee..8eab1f6 100644
--- a/config/rootfiles/packages/ebtables
+++ b/config/rootfiles/packages/ebtables
@@ -23,8 +23,7 @@ usr/lib/libebtable_broute.so
usr/lib/libebtable_filter.so
usr/lib/libebtable_nat.so
usr/lib/libebtc.so
-#usr/local/man/man8
-#usr/local/man/man8/ebtables.8
-usr/local/sbin/ebtables
-usr/local/sbin/ebtables-restore
-usr/local/sbin/ebtables-save
+#usr/man/man8/ebtables.8
+usr/sbin/ebtables
+usr/sbin/ebtables-restore
+usr/sbin/ebtables-save
diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git
index e168483..ea31b20 100644
--- a/config/rootfiles/packages/git
+++ b/config/rootfiles/packages/git
@@ -6,26 +6,26 @@ usr/bin/git-upload-archive
usr/bin/git-upload-pack
#usr/bin/gitk
usr/lib/perl5/site_perl/5.12.3/Error.pm
-usr/lib/perl5/site_perl/5.12.3/Git
+#usr/lib/perl5/site_perl/5.12.3/Git
usr/lib/perl5/site_perl/5.12.3/Git.pm
usr/lib/perl5/site_perl/5.12.3/Git/I18N.pm
-#usr/lib/perl5/site_perl/5.12.3/Git/IndexInfo.pm
+usr/lib/perl5/site_perl/5.12.3/Git/IndexInfo.pm
#usr/lib/perl5/site_perl/5.12.3/Git/SVN
-#usr/lib/perl5/site_perl/5.12.3/Git/SVN.pm
-#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Editor.pm
-#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Fetcher.pm
-#usr/lib/perl5/site_perl/5.12.3/Git/SVN/GlobSpec.pm
-#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Log.pm
-#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Memoize
-#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Memoize/YAML.pm
-#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Migration.pm
-#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Prompt.pm
-#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Ra.pm
-#usr/lib/perl5/site_perl/5.12.3/Git/SVN/Utils.pm
+usr/lib/perl5/site_perl/5.12.3/Git/SVN.pm
+usr/lib/perl5/site_perl/5.12.3/Git/SVN/Editor.pm
+usr/lib/perl5/site_perl/5.12.3/Git/SVN/Fetcher.pm
+usr/lib/perl5/site_perl/5.12.3/Git/SVN/GlobSpec.pm
+usr/lib/perl5/site_perl/5.12.3/Git/SVN/Log.pm
+usr/lib/perl5/site_perl/5.12.3/Git/SVN/Memoize
+usr/lib/perl5/site_perl/5.12.3/Git/SVN/Memoize/YAML.pm
+usr/lib/perl5/site_perl/5.12.3/Git/SVN/Migration.pm
+usr/lib/perl5/site_perl/5.12.3/Git/SVN/Prompt.pm
+usr/lib/perl5/site_perl/5.12.3/Git/SVN/Ra.pm
+usr/lib/perl5/site_perl/5.12.3/Git/SVN/Utils.pm
#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Git
#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Git/.packlist
-usr/libexec/git-core
-usr/libexec/git-core/git
+#usr/libexec/git-core
+#usr/libexec/git-core/git
usr/libexec/git-core/git-add
usr/libexec/git-core/git-add--interactive
usr/libexec/git-core/git-am
@@ -172,6 +172,7 @@ usr/libexec/git-core/git-stash
usr/libexec/git-core/git-status
usr/libexec/git-core/git-stripspace
usr/libexec/git-core/git-submodule
+usr/libexec/git-core/git-submodule--helper
usr/libexec/git-core/git-svn
usr/libexec/git-core/git-symbolic-ref
usr/libexec/git-core/git-tag
@@ -188,8 +189,9 @@ usr/libexec/git-core/git-verify-pack
usr/libexec/git-core/git-verify-tag
usr/libexec/git-core/git-web--browse
usr/libexec/git-core/git-whatchanged
+usr/libexec/git-core/git-worktree
usr/libexec/git-core/git-write-tree
-usr/libexec/git-core/mergetools
+#usr/libexec/git-core/mergetools
usr/libexec/git-core/mergetools/araxis
usr/libexec/git-core/mergetools/bc
usr/libexec/git-core/mergetools/bc3
@@ -212,12 +214,13 @@ usr/libexec/git-core/mergetools/tortoisemerge
usr/libexec/git-core/mergetools/vimdiff
usr/libexec/git-core/mergetools/vimdiff2
usr/libexec/git-core/mergetools/vimdiff3
+usr/libexec/git-core/mergetools/winmerge
usr/libexec/git-core/mergetools/xxdiff
-usr/share/git-core
-usr/share/git-core/templates
+#usr/share/git-core
+#usr/share/git-core/templates
usr/share/git-core/templates/branches
usr/share/git-core/templates/description
-usr/share/git-core/templates/hooks
+#usr/share/git-core/templates/hooks
usr/share/git-core/templates/hooks/applypatch-msg.sample
usr/share/git-core/templates/hooks/commit-msg.sample
usr/share/git-core/templates/hooks/post-update.sample
@@ -227,7 +230,7 @@ usr/share/git-core/templates/hooks/pre-push.sample
usr/share/git-core/templates/hooks/pre-rebase.sample
usr/share/git-core/templates/hooks/prepare-commit-msg.sample
usr/share/git-core/templates/hooks/update.sample
-usr/share/git-core/templates/info
+#usr/share/git-core/templates/info
usr/share/git-core/templates/info/exclude
#usr/share/git-gui
#usr/share/git-gui/lib
@@ -315,6 +318,7 @@ usr/share/git-core/templates/info/exclude
#usr/share/locale/fr/LC_MESSAGES/git.mo
#usr/share/locale/is/LC_MESSAGES/git.mo
#usr/share/locale/it/LC_MESSAGES/git.mo
+#usr/share/locale/ko/LC_MESSAGES/git.mo
#usr/share/locale/pt_PT/LC_MESSAGES/git.mo
#usr/share/locale/ru/LC_MESSAGES/git.mo
#usr/share/locale/sv/LC_MESSAGES/git.mo
diff --git a/config/rootfiles/packages/gnu-netcat b/config/rootfiles/packages/gnu-netcat
new file mode 100644
index 0000000..f043ed2
--- /dev/null
+++ b/config/rootfiles/packages/gnu-netcat
@@ -0,0 +1,5 @@
+usr/bin/netcat
+#usr/info/netcat.info
+#usr/man/man1/netcat.1
+#usr/share/locale/it/LC_MESSAGES/netcat.mo
+#usr/share/locale/sk/LC_MESSAGES/netcat.mo
diff --git a/config/rootfiles/packages/iperf3 b/config/rootfiles/packages/iperf3
new file mode 100644
index 0000000..7057f11
--- /dev/null
+++ b/config/rootfiles/packages/iperf3
@@ -0,0 +1,9 @@
+usr/bin/iperf3
+#usr/include/iperf_api.h
+#usr/lib/libiperf.a
+#usr/lib/libiperf.la
+#usr/lib/libiperf.so
+usr/lib/libiperf.so.0
+usr/lib/libiperf.so.0.0.0
+#usr/share/man/man1/iperf3.1
+#usr/share/man/man3/libiperf.3
diff --git a/config/rootfiles/packages/lcdproc b/config/rootfiles/packages/lcdproc
index 8bef5a3..d2a59e0 100644
--- a/config/rootfiles/packages/lcdproc
+++ b/config/rootfiles/packages/lcdproc
@@ -44,6 +44,7 @@ usr/lib/lcdproc
#usr/lib/lcdproc/mtc_s16209x.so
#usr/lib/lcdproc/picolcd.so
#usr/lib/lcdproc/pyramid.so
+#usr/lib/lcdproc/rawserial.so
#usr/lib/lcdproc/sdeclcd.so
#usr/lib/lcdproc/sed1330.so
#usr/lib/lcdproc/sed1520.so
diff --git a/config/rootfiles/packages/mcelog b/config/rootfiles/packages/mcelog
new file mode 100644
index 0000000..04f439e
--- /dev/null
+++ b/config/rootfiles/packages/mcelog
@@ -0,0 +1,13 @@
+#etc/mcelog
+etc/mcelog/bus-error-trigger
+etc/mcelog/cache-error-trigger
+etc/mcelog/dimm-error-trigger
+etc/mcelog/iomca-error-trigger
+etc/mcelog/mcelog.conf
+etc/mcelog/page-error-trigger
+etc/mcelog/socket-memory-error-trigger
+etc/mcelog/unknown-error-trigger
+usr/sbin/mcelog
+#usr/share/man/man5/mcelog.conf.5
+#usr/share/man/man5/mcelog.triggers.5
+#usr/share/man/man8/mcelog.8
diff --git a/config/rootfiles/packages/ncat b/config/rootfiles/packages/ncat
new file mode 100644
index 0000000..f1cf714
--- /dev/null
+++ b/config/rootfiles/packages/ncat
@@ -0,0 +1,5 @@
+usr/bin/nc
+usr/bin/ncat
+#usr/share/man/man1/ncat.1
+#usr/share/ncat
+#usr/share/ncat/ca-bundle.crt
diff --git a/config/rootfiles/packages/netcat b/config/rootfiles/packages/netcat
deleted file mode 100644
index c236959..0000000
--- a/config/rootfiles/packages/netcat
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/bin/nc
-usr/bin/netcat
-#usr/info/netcat.info
-#usr/man/man1/netcat.1
-#usr/share/locale/it/LC_MESSAGES/netcat.mo
-#usr/share/locale/sk/LC_MESSAGES/netcat.mo
diff --git a/config/rootfiles/packages/nmap b/config/rootfiles/packages/nmap
index 3370600..b91f954 100644
--- a/config/rootfiles/packages/nmap
+++ b/config/rootfiles/packages/nmap
@@ -1,4 +1,3 @@
-usr/bin/ncat
usr/bin/ndiff
usr/bin/nmap
usr/bin/nping
@@ -15,7 +14,6 @@ usr/lib/python2.7/site-packages/ndiff.pyc
#usr/share/man/hu/man1/nmap.1
#usr/share/man/it/man1/nmap.1
#usr/share/man/ja/man1/nmap.1
-#usr/share/man/man1/ncat.1
#usr/share/man/man1/ndiff.1
#usr/share/man/man1/nmap.1
#usr/share/man/man1/nping.1
@@ -40,8 +38,6 @@ usr/lib/python2.7/site-packages/ndiff.pyc
#usr/share/man/zh
#usr/share/man/zh/man1
#usr/share/man/zh/man1/nmap.1
-#usr/share/ncat
-#usr/share/ncat/ca-bundle.crt
#usr/share/nmap
usr/share/nmap/nmap-mac-prefixes
usr/share/nmap/nmap-os-db
@@ -53,7 +49,7 @@ usr/share/nmap/nmap-services
usr/share/nmap/nmap.dtd
usr/share/nmap/nmap.xsl
usr/share/nmap/nse_main.lua
-usr/share/nmap/nselib
+#usr/share/nmap/nselib
usr/share/nmap/nselib/afp.lua
usr/share/nmap/nselib/ajp.lua
usr/share/nmap/nselib/amqp.lua
@@ -71,7 +67,7 @@ usr/share/nmap/nselib/citrixxml.lua
usr/share/nmap/nselib/comm.lua
usr/share/nmap/nselib/creds.lua
usr/share/nmap/nselib/cvs.lua
-usr/share/nmap/nselib/data
+#usr/share/nmap/nselib/data
usr/share/nmap/nselib/data/dns-srv-names
usr/share/nmap/nselib/data/drupal-modules.lst
usr/share/nmap/nselib/data/favicon-db
diff --git a/config/rootfiles/packages/opus b/config/rootfiles/packages/opus
new file mode 100644
index 0000000..db98a1d
--- /dev/null
+++ b/config/rootfiles/packages/opus
@@ -0,0 +1,12 @@
+#usr/include/opus
+#usr/include/opus/opus.h
+#usr/include/opus/opus_defines.h
+#usr/include/opus/opus_multistream.h
+#usr/include/opus/opus_types.h
+#usr/lib/libopus.a
+#usr/lib/libopus.la
+#usr/lib/libopus.so
+usr/lib/libopus.so.0
+usr/lib/libopus.so.0.5.2
+#usr/lib/pkgconfig/opus.pc
+#usr/share/aclocal/opus.m4
diff --git a/config/rootfiles/packages/spice b/config/rootfiles/packages/spice
new file mode 100644
index 0000000..93d2e9e
--- /dev/null
+++ b/config/rootfiles/packages/spice
@@ -0,0 +1,17 @@
+#usr/include/spice-server
+#usr/include/spice-server/spice-audio.h
+#usr/include/spice-server/spice-char.h
+#usr/include/spice-server/spice-core.h
+#usr/include/spice-server/spice-experimental.h
+#usr/include/spice-server/spice-input.h
+#usr/include/spice-server/spice-migration.h
+#usr/include/spice-server/spice-qxl.h
+#usr/include/spice-server/spice-server.h
+#usr/include/spice-server/spice-version.h
+#usr/include/spice-server/spice.h
+#usr/lib/libspice-server.a
+#usr/lib/libspice-server.la
+#usr/lib/libspice-server.so
+usr/lib/libspice-server.so.1
+usr/lib/libspice-server.so.1.10.0
+#usr/lib/pkgconfig/spice-server.pc
diff --git a/config/xen-image/xen-image-maker.sh b/config/xen-image/xen-image-maker.sh
index 07414f7..00abb89 100644
--- a/config/xen-image/xen-image-maker.sh
+++ b/config/xen-image/xen-image-maker.sh
@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2014 Arne Fitzenreiter <arne_f(a)ipfire.org> #
+# Copyright (C) 2007-2016 Arne Fitzenreiter <arne_f(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -104,7 +104,7 @@ dd bs=1M if=/dev/zero of=$IMGvar count=$SIZEvar
mkfs.$FSTYPE -F $IMGvar
echo --------------------------------------------------------
-echo - Intall IPFire to the Images ...
+echo - Install IPFire to the images ...
echo --------------------------------------------------------
# Mount Images
@@ -130,7 +130,7 @@ mkdir $MNThdd/boot/grub
echo "timeout 10" > $MNThdd/boot/grub/grub.conf
echo "default 0" >> $MNThdd/boot/grub/grub.conf
echo "title IPFire ($KERN_TYPE-kernel)" >> $MNThdd/boot/grub/grub.conf
-echo " root (hd0) >> $MNThdd/boot/grub/grub.conf
+echo " root (hd0)" >> $MNThdd/boot/grub/grub.conf
echo " kernel /vmlinuz-$KVER-ipfire-$KERN_TYPE root=/dev/$P3 rootdelay=10 panic=10 console=$CONSOLE" \
>> $MNThdd/boot/grub/grub.conf
echo " initrd /initramfs-$KVER-ipfire-$KERN_TYPE.img" >> $MNThdd/boot/grub/grub.conf
diff --git a/html/cgi-bin/chpasswd.cgi b/html/cgi-bin/chpasswd.cgi
index ae9e6ec..0a66062 100644
--- a/html/cgi-bin/chpasswd.cgi
+++ b/html/cgi-bin/chpasswd.cgi
@@ -20,6 +20,7 @@
###############################################################################
use CGI qw(param);
+use Apache::Htpasswd;
use Crypt::PasswdMD5;
$swroot = "/var/ipfire";
@@ -74,48 +75,25 @@ if ($cgiparams{'SUBMIT'} eq $tr{'advproxy chgwebpwd change password'})
$errormessage = $tr{'advproxy errmsg password length 1'}.$proxysettings{'NCSA_MIN_PASS_LEN'}.$tr{'advproxy errmsg password length 2'};
goto ERROR;
}
- if (! -z $userdb)
- {
- open FILE, $userdb;
- @users = <FILE>;
- close FILE;
- $username = '';
- $cryptpwd = '';
+ my $htpasswd = new Apache::Htpasswd("$userdb");
- foreach (@users)
- {
- chomp;
- @temp = split(/:/,$_);
- if ($temp[0] =~ /^$cgiparams{'USERNAME'}$/i)
- {
- $username = $temp[0];
- $cryptpwd = $temp[1];
- }
- }
- }
- if ($username eq '')
- {
+ # Check if a user with this name exists
+ my $old_password = $htpasswd->fetchPass($cgiparams{'USERNAME'});
+ if (!$old_password) {
$errormessage = $tr{'advproxy errmsg invalid user'};
goto ERROR;
}
- if (
- !(crypt($cgiparams{'OLD_PASSWORD'}, $cryptpwd) eq $cryptpwd) &&
- !(apache_md5_crypt($cgiparams{'OLD_PASSWORD'}, $cryptpwd) eq $cryptpwd)
- )
- {
+
+ # Reset password
+ if (!$htpasswd->htpasswd($cgiparams{'USERNAME'}, $cgiparams{'NEW_PASSWORD_1'},
+ $cgiparams{'OLD_PASSWORD'})) {
$errormessage = $tr{'advproxy errmsg password incorrect'};
goto ERROR;
}
- $returncode = system("/usr/sbin/htpasswd -b $userdb $username $cgiparams{'NEW_PASSWORD_1'}");
- if ($returncode == 0)
- {
- $success = 1;
- undef %cgiparams;
- } else {
- $errormessage = $tr{'advproxy errmsg change fail'};
- goto ERROR;
- }
+
+ $success = 1;
+ undef %cgiparams;
}
ERROR:
diff --git a/html/cgi-bin/ipinfo.cgi b/html/cgi-bin/ipinfo.cgi
index 71098a2..8cefe6e 100644
--- a/html/cgi-bin/ipinfo.cgi
+++ b/html/cgi-bin/ipinfo.cgi
@@ -19,6 +19,7 @@
# #
###############################################################################
+use CGI;
use IO::Socket;
use strict;
@@ -34,18 +35,14 @@ my %cgiparams=();
&Header::showhttpheaders();
-&Header::getcgihash(\%cgiparams);
-
-$ENV{'QUERY_STRING'} =~s/&//g;
-my @addrs = split(/ip=/,$ENV{'QUERY_STRING'});
-
&Header::openpage($Lang::tr{'ip info'}, 1, '');
-
&Header::openbigbox('100%', 'left');
my @lines=();
my $extraquery='';
-foreach my $addr (@addrs) {
-next if $addr eq "";
+
+my $addr = CGI::param("ip") || "";
+
+if (&General::validip($addr)) {
$extraquery='';
@lines=();
my $whoisname = "whois.arin.net";
@@ -91,6 +88,14 @@ next if $addr eq "";
}
print "</pre>\n";
&Header::closebox();
+} else {
+ &Header::openbox('100%', 'left', $Lang::tr{'invalid ip'});
+ print <<EOF;
+ <p style="text-align: center;">
+ $Lang::tr{'invalid ip'}
+ </p>
+EOF
+ &Header::closebox();
}
print <<END
diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi
index 7a0e8e0..1ab3c7d 100644
--- a/html/cgi-bin/optionsfw.cgi
+++ b/html/cgi-bin/optionsfw.cgi
@@ -129,6 +129,9 @@ $checked{'CONNTRACK_H323'}{$settings{'CONNTRACK_H323'}} = "checked='checked'";
$checked{'CONNTRACK_IRC'}{'off'} = '';
$checked{'CONNTRACK_IRC'}{'on'} = '';
$checked{'CONNTRACK_IRC'}{$settings{'CONNTRACK_IRC'}} = "checked='checked'";
+$checked{'CONNTRACK_PPTP'}{'off'} = '';
+$checked{'CONNTRACK_PPTP'}{'on'} = '';
+$checked{'CONNTRACK_PPTP'}{$settings{'CONNTRACK_PPTP'}} = "checked='checked'";
$checked{'CONNTRACK_SIP'}{'off'} = '';
$checked{'CONNTRACK_SIP'}{'on'} = '';
$checked{'CONNTRACK_SIP'}{$settings{'CONNTRACK_SIP'}} = "checked='checked'";
@@ -239,21 +242,59 @@ END
<tr><td align='left' width='60%'>$Lang::tr{'fw settings dropdown'}</td><td align='left'>on <input type='radio' name='SHOWDROPDOWN' value='on' $checked{'SHOWDROPDOWN'}{'on'} />/
<input type='radio' name='SHOWDROPDOWN' value='off' $checked{'SHOWDROPDOWN'}{'off'} /> off</td></tr>
</table>
+
<br />
-<table width='95%' cellspacing='0'>
-<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'application layer gateways'}</b></td></tr>
-<tr><td align='left' width='60%'>FTP</td><td align='left'>on <input type='radio' name='CONNTRACK_FTP' value='on' $checked{'CONNTRACK_FTP'}{'on'} />/
- <input type='radio' name='CONNTRACK_FTP' value='off' $checked{'CONNTRACK_FTP'}{'off'} /> off</td></tr>
-<tr><td align='left' width='60%'>H.323</td><td align='left'>on <input type='radio' name='CONNTRACK_H323' value='on' $checked{'CONNTRACK_H323'}{'on'} />/
- <input type='radio' name='CONNTRACK_H323' value='off' $checked{'CONNTRACK_H323'}{'off'} /> off</td></tr>
-<tr><td align='left' width='60%'>IRC</td><td align='left'>on <input type='radio' name='CONNTRACK_IRC' value='on' $checked{'CONNTRACK_IRC'}{'on'} />/
- <input type='radio' name='CONNTRACK_IRC' value='off' $checked{'CONNTRACK_IRC'}{'off'} /> off</td></tr>
-<tr><td align='left' width='60%'>SIP</td><td align='left'>on <input type='radio' name='CONNTRACK_SIP' value='on' $checked{'CONNTRACK_SIP'}{'on'} />/
- <input type='radio' name='CONNTRACK_SIP' value='off' $checked{'CONNTRACK_SIP'}{'off'} /> off</td></tr>
-<tr><td align='left' width='60%'>TFTP</td><td align='left'>on <input type='radio' name='CONNTRACK_TFTP' value='on' $checked{'CONNTRACK_TFTP'}{'on'} />/
- <input type='radio' name='CONNTRACK_TFTP' value='off' $checked{'CONNTRACK_TFTP'}{'off'} /> off</td></tr>
+<table width='95%' cellspacing='0'>
+ <tr bgcolor='$color{'color20'}'>
+ <td colspan='2' align='left'>
+ <b>$Lang::tr{'application layer gateways'}</b>
+ </td>
+ </tr>
+ <tr>
+ <td align='left' width='60%'>FTP</td>
+ <td align='left'>
+ $Lang::tr{'on'} <input type='radio' name='CONNTRACK_FTP' value='on' $checked{'CONNTRACK_FTP'}{'on'} /> /
+ <input type='radio' name='CONNTRACK_FTP' value='off' $checked{'CONNTRACK_FTP'}{'off'} /> $Lang::tr{'off'}
+ </td>
+ </tr>
+ <tr>
+ <td align='left' width='60%'>H.323</td>
+ <td align='left'>
+ $Lang::tr{'on'} <input type='radio' name='CONNTRACK_H323' value='on' $checked{'CONNTRACK_H323'}{'on'} /> /
+ <input type='radio' name='CONNTRACK_H323' value='off' $checked{'CONNTRACK_H323'}{'off'} /> $Lang::tr{'off'}
+ </td>
+ </tr>
+ <tr>
+ <td align='left' width='60%'>IRC</td>
+ <td align='left'>
+ $Lang::tr{'on'} <input type='radio' name='CONNTRACK_IRC' value='on' $checked{'CONNTRACK_IRC'}{'on'} /> /
+ <input type='radio' name='CONNTRACK_IRC' value='off' $checked{'CONNTRACK_IRC'}{'off'} /> $Lang::tr{'off'}
+ </td>
+ </tr>
+ <tr>
+ <td align='left' width='60%'>PPTP</td>
+ <td align='left'>
+ $Lang::tr{'on'} <input type='radio' name='CONNTRACK_PPTP' value='on' $checked{'CONNTRACK_PPTP'}{'on'} /> /
+ <input type='radio' name='CONNTRACK_PPTP' value='off' $checked{'CONNTRACK_PPTP'}{'off'} /> $Lang::tr{'off'}
+ </td>
+ </tr>
+ <tr>
+ <td align='left' width='60%'>SIP</td>
+ <td align='left'>
+ $Lang::tr{'on'} <input type='radio' name='CONNTRACK_SIP' value='on' $checked{'CONNTRACK_SIP'}{'on'} /> /
+ <input type='radio' name='CONNTRACK_SIP' value='off' $checked{'CONNTRACK_SIP'}{'off'} /> $Lang::tr{'off'}
+ </td>
+ </tr>
+ <tr>
+ <td align='left' width='60%'>TFTP</td>
+ <td align='left'>
+ $Lang::tr{'on'} <input type='radio' name='CONNTRACK_TFTP' value='on' $checked{'CONNTRACK_TFTP'}{'on'} /> /
+ <input type='radio' name='CONNTRACK_TFTP' value='off' $checked{'CONNTRACK_TFTP'}{'off'} /> $Lang::tr{'off'}
+ </td>
+ </tr>
</table>
+
<br />
<table width='95%' cellspacing='0'>
<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'fw default drop'}</b></td></tr>
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 6c4e2b0..1c9bb87 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -27,6 +27,7 @@
#
use strict;
+use Apache::Htpasswd;
# enable only the following on debugging purpose
#use warnings;
@@ -4134,7 +4135,9 @@ sub adduser
close(FILE);
} else {
&deluser($str_user);
- system("/usr/sbin/htpasswd -b $userdb $str_user $str_pass");
+
+ my $htpasswd = new Apache::Htpasswd("$userdb");
+ $htpasswd->htpasswd($str_user, $str_pass);
}
if ($str_group eq 'standard') { open(FILE, ">>$stdgrp");
diff --git a/lfs/asterisk b/lfs/asterisk
index 91dc4fd..9fc90ea 100755
--- a/lfs/asterisk
+++ b/lfs/asterisk
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -20,7 +20,7 @@
include Config
-VER = 11.20.0
+VER = 11.21.1
THISAPP = asterisk-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -28,7 +28,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = asterisk
-PAK_VER = 18
+PAK_VER = 19
DEPS = "libsrtp"
@@ -46,7 +46,7 @@ asterisk-extra-sounds-en-gsm-1.4.15.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds
asterisk-moh-opsound-gsm-2.03.tar.gz = $(URL_IPFIRE)/asterisk-moh-opsound-gsm-2.03.tar.gz
asterisk-1.4-de-prompts.tar.gz = $(URL_IPFIRE)/asterisk-1.4-de-prompts.tar.gz
-$(DL_FILE)_MD5 = d15759b05862250073e2708394ad2f4c
+$(DL_FILE)_MD5 = 9594c3cdcf6dc16c719b5abb00dbdd8f
asterisk-extra-sounds-en-gsm-1.4.15.tar.gz_MD5 = 5099fc65f49008e33ba7fb043a4ec995
asterisk-moh-opsound-gsm-2.03.tar.gz_MD5 = 09066f55f1358f298bc1a6e4678a3ddf
asterisk-1.4-de-prompts.tar.gz_MD5 = 626a2b95071a5505851e43874dfbfd5c
diff --git a/lfs/backports b/lfs/backports
index 12bd83f..3c8e6cd 100644
--- a/lfs/backports
+++ b/lfs/backports
@@ -102,6 +102,7 @@ endif
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-4.2.6-1-mt7601_upstream_fixes.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1_add_libertas_uap.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-4.2.6-1_ath10k_remove_logspam.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-4.2.6-1-ath9k_add_missing_mask_init.patch
# smsc mac address patch for pandaboard and raspberry pi
ifeq "$(KCFG)" "-multi"
diff --git a/lfs/bind b/lfs/bind
index b0d5185..630b9b4 100644
--- a/lfs/bind
+++ b/lfs/bind
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2015 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2016 Michael Tremer & Christian Schmidt #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -25,7 +25,7 @@
include Config
-VER = 9.10.3-P2
+VER = 9.10.3-P4
THISAPP = bind-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 672dd3c2796b12ac8440f55bcaecfa82
+$(DL_FILE)_MD5 = 173ce5e83e9ba31f8368367ee1ff7807
install : $(TARGET)
diff --git a/lfs/bwm-ng b/lfs/bwm-ng
index 65f22a3..c989757 100644
--- a/lfs/bwm-ng
+++ b/lfs/bwm-ng
@@ -24,7 +24,7 @@
include Config
-VER = 0.6
+VER = 0.6.1
THISAPP = bwm-ng-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = d3a02484fb7946371bfb4e10927cebfb
+$(DL_FILE)_MD5 = ef0c7669508e95f56250ad4f8db98b7f
install : $(TARGET)
diff --git a/lfs/clamav b/lfs/clamav
index ea6efc3..3c778c3 100644
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 0.99
+VER = 0.99.1
THISAPP = clamav-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = clamav
-PAK_VER = 30
+PAK_VER = 31
DEPS = ""
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ae79c3982761ba1815dbce17f846bab6
+$(DL_FILE)_MD5 = cf1f3cbe62a08c9165801f79239166ff
install : $(TARGET)
diff --git a/lfs/configroot b/lfs/configroot
index f8e9ce4..f02894e 100644
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -66,7 +66,7 @@ $(TARGET) :
dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/settings dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings firewall/settings firewall/config firewall/geoipblock firewall/input firewall/outgoing \
fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwhosts/customgeoipgrp fwlogs/ipsettings fwlogs/portsettings \
- isdn/settings mac/settings main/disable_nf_sip main/hosts main/routing main/settings net-traffic/settings optionsfw/settings \
+ isdn/settings mac/settings main/hosts main/routing main/settings net-traffic/settings optionsfw/settings \
ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
ppp/settings-5 ppp/settings proxy/settings proxy/squid.conf proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
qos/tosconfig snort/settings upnp/settings vpn/config vpn/settings vpn/ipsec.conf \
diff --git a/lfs/dma b/lfs/dma
index 64ed944..fc49122 100644
--- a/lfs/dma
+++ b/lfs/dma
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2015 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 0.10
+VER = 0.11
THISAPP = dma-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 91f521b0749e16f5d78e139e717245ea
+$(DL_FILE)_MD5 = 4090572921fc33be0977f4010881b501
install : $(TARGET)
diff --git a/lfs/dmidecode b/lfs/dmidecode
new file mode 100644
index 0000000..a2dcc23
--- /dev/null
+++ b/lfs/dmidecode
@@ -0,0 +1,81 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 3.0
+
+THISAPP = dmidecode-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+SUP_ARCH = i586 x86_64
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = be7501ad0f844e875976b96106afaa3c
+
+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)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dmidecode/0001-Add-no-sysfs-option-description-to-h-output.patch
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dmidecode/0002-Fix-No-SMBIOS-nor-DMI-entry-point-found-on-SMBIOS3.patch
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dmidecode/0003-Let-read_file-return-the-actual-data-size.patch
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dmidecode/0004-dmidecode-Use-read_file-to-read-the-DMI-table-from-s.patch
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dmidecode/0005-nothing-should-go-into-usr-local.patch
+ cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/dnsdist b/lfs/dnsdist
index 62c17cf..a5d9fea 100644
--- a/lfs/dnsdist
+++ b/lfs/dnsdist
@@ -79,7 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
- cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/e2fsprogs b/lfs/e2fsprogs
index dff6393..90e28ac 100644
--- a/lfs/e2fsprogs
+++ b/lfs/e2fsprogs
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 1.42.6
+VER = 1.42.13
THISAPP = e2fsprogs-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 9e444c240c1001b3292d108fbad0f49c
+$(DL_FILE)_MD5 = bc759fc62666786f5436e2075beb3265
install : $(TARGET)
@@ -69,12 +69,18 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) $(DIR_SRC)/e2fsprogs-build && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_SRC) && mkdir build
- cd $(DIR_SRC)/build && $(DIR_APP)/configure --prefix=/usr --with-root-prefix="" \
- --enable-elf-shlibs --disable-evms --disable-nls
- cd $(DIR_SRC)/build && make $(MAKETUNING)
- cd $(DIR_SRC)/build && make install
- cd $(DIR_SRC)/build && make install-libs
- @rm -rf $(DIR_APP) $(DIR_SRC)/e2fsprogs-build
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ -mkdir -pv $(DIR_APP)/build
+ cd $(DIR_APP)/build && \
+ $(DIR_APP)/configure \
+ --prefix=/usr \
+ --with-root-prefix="" \
+ --enable-elf-shlibs \
+ --disable-evms \
+ --disable-nls
+ cd $(DIR_APP)/build && make $(MAKETUNING)
+ cd $(DIR_APP)/build && make install
+ cd $(DIR_APP)/build && make install-libs
+ chmod -v u+w /usr/lib/{libcom_err,libe2p,libext2fs,libss}.a
+ @rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/ebtables b/lfs/ebtables
index 0c55a21..0fe9731 100644
--- a/lfs/ebtables
+++ b/lfs/ebtables
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = ebtables
-PAK_VER = 2
+PAK_VER = 3
DEPS = ""
@@ -77,6 +77,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ebtables/0001-ebtables-should-install-nothing-in-usr-local.patch
cd $(DIR_APP) && make $(MAKETUNING) CFLAGS="$(CFLAGS)"
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
diff --git a/lfs/git b/lfs/git
index bbec140..564bc09 100644
--- a/lfs/git
+++ b/lfs/git
@@ -24,7 +24,7 @@
include Config
-VER = 2.4.4
+VER = 2.7.4
THISAPP = git-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = git
-PAK_VER = 12
+PAK_VER = 13
DEPS = "perl-Authen-SASL perl-MIME-Base64 perl-Net-SMTP-SSL"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 847787cd0616d38b0e429ea85f558c31
+$(DL_FILE)_MD5 = b0219fcb6d73104361f4fbdba3741d00
install : $(TARGET)
@@ -78,13 +78,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure \
+ --with-gitconfig=/etc/gitconfig \
--prefix=/usr \
--with-libpcre \
--with-curl \
--with-expat
-
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
-
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/gmp b/lfs/gmp
index 780e7f6..5ac0eb8 100644
--- a/lfs/gmp
+++ b/lfs/gmp
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2014 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,10 +24,10 @@
include Config
-VER = 6.0.0
+VER = 6.1.0
THISAPP = gmp-$(VER)
-DL_FILE = $(THISAPP)a.tar.xz
+DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -51,7 +51,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 1e6da4e434553d2811437aa42c7f7c76
+$(DL_FILE)_MD5 = a9868ef2556ad6a2909babcd1428f3c7
install : $(TARGET)
@@ -102,7 +102,7 @@ ifeq "$(MACHINE)" "i586"
cd $(DIR_APP) && make $(MAKETUNING)
-mkdir -pv /usr/lib/sse2
- cd $(DIR_APP) && install -v -m 755 .libs/libgmp.so.10.2.0 /usr/lib/sse2
+ cd $(DIR_APP) && install -v -m 755 .libs/libgmp.so.10.3.0 /usr/lib/sse2
endif
@rm -rf $(DIR_APP)
diff --git a/lfs/gnu-netcat b/lfs/gnu-netcat
new file mode 100644
index 0000000..77ddf5e
--- /dev/null
+++ b/lfs/gnu-netcat
@@ -0,0 +1,85 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 0.7.1
+
+THISAPP = netcat-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = gnu-netcat
+PAK_VER = 1
+
+DEPS = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 088def25efe04dcdd1f8369d8926ab34
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure --prefix=/usr
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ rm -f /usr/bin/nc
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/grep b/lfs/grep
index d22b359..9f3a38e 100644
--- a/lfs/grep
+++ b/lfs/grep
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2016 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 2.22
+VER = 2.23
THISAPP = grep-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -36,14 +36,11 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
ifeq "$(ROOT)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
EXTRA_CONFIG = --prefix=/usr --bindir=/bin --disable-nls
- EXTRA_MAKE =
- EXTRA_INSTALL =
else
TARGET = $(DIR_INFO)/$(THISAPP)-tools
EXTRA_CONFIG = --prefix=/tools --disable-nls \
--disable-perl-regexp --without-included-regex
- EXTRA_MAKE =
- EXTRA_INSTALL =
+
endif
###############################################################################
@@ -54,7 +51,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = e1015e951a49a82b02e38891026ef5df
+$(DL_FILE)_MD5 = f46aa9d0d2577b9212a104348a286787
install : $(TARGET)
@@ -85,7 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
- cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
- cd $(DIR_APP) && make $(EXTRA_INSTALL) install
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/htop b/lfs/htop
index 3e5b532..9c0a90c 100644
--- a/lfs/htop
+++ b/lfs/htop
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2014 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 1.0.3
+VER = 2.0.1
THISAPP = htop-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = htop
-PAK_VER = 7
+PAK_VER = 8
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = e768b9b55c033d9c1dffda72db3a6ac7
+$(DL_FILE)_MD5 = f75fe92b4defaa80d99109830f34b5e2
install : $(TARGET)
diff --git a/lfs/iperf3 b/lfs/iperf3
new file mode 100644
index 0000000..9eb1e8a
--- /dev/null
+++ b/lfs/iperf3
@@ -0,0 +1,84 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 3.1.2
+
+THISAPP = iperf-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = iperf3
+PAK_VER = 1
+
+DEPS = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = f48a1b45c68647a9d8a8491af44470d6
+
+install : $(TARGET)
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:.
+ $(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/iperf3/0001-remove-pg-flag.patch
+ cd $(DIR_APP) && ./configure --prefix=/usr
+ cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/lcdproc b/lfs/lcdproc
index 9e88622..83b2437 100644
--- a/lfs/lcdproc
+++ b/lfs/lcdproc
@@ -24,7 +24,7 @@
include Config
-VER = 0.5.6
+VER = 0.5.7
THISAPP = lcdproc-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = lcdproc
-PAK_VER = 1
+PAK_VER = 2
DEPS =
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = df4f5c2c7285eaf6979b9c7768b4877f
+$(DL_FILE)_MD5 = 2f8e064233ef1d03e98c0b426595750d
install : $(TARGET)
@@ -77,7 +77,6 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/lcdproc-0.5.6-menuitem.patch
cd $(DIR_APP) && \
./configure \
--prefix=/usr \
diff --git a/lfs/libsrtp b/lfs/libsrtp
index 47c0cad..cc1eef3 100644
--- a/lfs/libsrtp
+++ b/lfs/libsrtp
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,14 +24,14 @@
include Config
-VER = 1.5.2
+VER = 1.5.4
THISAPP = libsrtp-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = libsrtp
-PAK_VER = 2
+PAK_VER = 3
DEPS = ""
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 2309aa6027992810a4285b042c71e644
+$(DL_FILE)_MD5 = 64a9580f86a9c3e1c4986e944e6a5a84
install : $(TARGET)
diff --git a/lfs/libxml2 b/lfs/libxml2
index ae2621b..b45ea6b 100644
--- a/lfs/libxml2
+++ b/lfs/libxml2
@@ -24,7 +24,7 @@
include Config
-VER = 2.9.2
+VER = 2.9.3
THISAPP = libxml2-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 9e6a9aca9d155737868b3dc5fd82f788
+$(DL_FILE)_MD5 = daece17e045f1c107610e137ab50c179
install : $(TARGET)
@@ -72,7 +72,7 @@ $(subst %,%_MD5,$(objects)) :
$(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) && ./configure --prefix=/usr --disable-static --with-history
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
diff --git a/lfs/linux b/lfs/linux
index be2e105..8e1536c 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -37,7 +37,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
CFLAGS =
CXXFLAGS =
-PAK_VER = 67
+PAK_VER = 68
DEPS = ""
KERNEL_ARCH = $(MACHINE)
diff --git a/lfs/mcelog b/lfs/mcelog
new file mode 100644
index 0000000..6821c73
--- /dev/null
+++ b/lfs/mcelog
@@ -0,0 +1,86 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 135
+
+THISAPP = mcelog-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = mcelog
+PAK_VER = 1
+SUP_ARCH = i586 x86_64
+
+DEPS = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 7819c74796c1e52e3e56fc065b9fe26a
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/mpfr b/lfs/mpfr
index b4cfc66..bdf083b 100644
--- a/lfs/mpfr
+++ b/lfs/mpfr
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 3.1.2
+VER = 3.1.3
THISAPP = mpfr-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = e3d203d188b8fe60bb6578dd3152e05c
+$(DL_FILE)_MD5 = 6969398cd2fbc56a6af570b5273c56a9
install : $(TARGET)
@@ -70,8 +70,9 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/mpfr-3.1.3-upstream_fixes-1.patch
cd $(DIR_APP) && $(CONFIGURE_ARGS) ./configure --prefix=/usr \
- --enable-thread-safe --disable-nls
+ --enable-thread-safe --disable-nls
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
diff --git a/lfs/nano b/lfs/nano
index 0d92c6b..70991d2 100644
--- a/lfs/nano
+++ b/lfs/nano
@@ -24,7 +24,7 @@
include Config
-VER = 2.5.1
+VER = 2.5.3
THISAPP = nano-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = nano
-PAK_VER = 8
+PAK_VER = 9
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f25c7da9813ae5f1df7e5dd1072de4ce
+$(DL_FILE)_MD5 = a04d77611422ab4b6a7b489650c7a793
install : $(TARGET)
@@ -77,8 +77,14 @@ $(subst %,%_MD5,$(objects)) :
$(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 --sysconfdir=/etc/nano \
- --enable-color --enable-multibuffer --enable-nanorc --disable-nls
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc/nano \
+ --enable-color \
+ --enable-multibuffer \
+ --enable-nanorc \
+ --disable-nls
+
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
cd $(DIR_APP) && install -v -m644 -D doc/nanorc.sample /etc/nano/nanorc.sample
diff --git a/lfs/ncat b/lfs/ncat
new file mode 100644
index 0000000..6f1b703
--- /dev/null
+++ b/lfs/ncat
@@ -0,0 +1,86 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 7.12
+
+THISAPP = ncat-$(VER)
+DL_FILE = nmap-$(VER).tar.bz2
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/nmap-$(VER)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = ncat
+PAK_VER = 1
+
+DEPS = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 0764f4dabe7cccda3c49fc3990b62a8a
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && mkdir -p build
+ cd $(DIR_APP) && ./configure --prefix=/usr --without-nmapfe --without-zenmap --without-ndiff --without-nping -without-liblua --without-nmap-update
+ cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+ cd $(DIR_APP)/ncat && make install
+ ln -f -s /usr/bin/ncat /usr/bin/nc
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/netcat b/lfs/netcat
deleted file mode 100644
index d07669b..0000000
--- a/lfs/netcat
+++ /dev/null
@@ -1,84 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
-# #
-# This program is free software: you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation, either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# This program is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER = 0.7.1
-
-THISAPP = netcat-$(VER)
-DL_FILE = $(THISAPP).tar.gz
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = netcat
-PAK_VER = 1
-
-DEPS = ""
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 088def25efe04dcdd1f8369d8926ab34
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-dist:
- @$(PAK)
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
- @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
- @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
- @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
- @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/lfs/nettle b/lfs/nettle
index b48b405..d0a3e5a 100644
--- a/lfs/nettle
+++ b/lfs/nettle
@@ -24,7 +24,7 @@
include Config
-VER = 3.1.1
+VER = 3.2
THISAPP = nettle-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b40fa88dc32f37a182b6b42092ebb144
+$(DL_FILE)_MD5 = afb15b4764ebf1b4e6d06c62bd4d29e4
install : $(TARGET)
@@ -70,16 +70,10 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure \
- --prefix=/usr \
- --enable-shared
-
+ cd $(DIR_APP) && ./configure --prefix=/usr --disable-static
cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && sed -i '/^install-here/ s/ install-static//' Makefile
cd $(DIR_APP) && make install
-
chmod -v 755 /usr/lib/lib{hogweed,nettle}.so
- install -v -m755 -d /usr/share/doc/nettle-3.1.1
-
+ install -v -m755 -d /usr/share/doc/nettle-3.2
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/nmap b/lfs/nmap
index a7870da..5907f5c 100644
--- a/lfs/nmap
+++ b/lfs/nmap
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2015 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -54,7 +54,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
-dist:
+dist:
@$(PAK)
###############################################################################
@@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr --without-nmapfe --without-zenmap
+ cd $(DIR_APP) && ./configure --prefix=/usr --without-nmapfe --without-zenmap --without-ncat
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
diff --git a/lfs/opus b/lfs/opus
new file mode 100644
index 0000000..2446edb
--- /dev/null
+++ b/lfs/opus
@@ -0,0 +1,83 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 1.1.2
+
+THISAPP = opus-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = opus
+PAK_VER = 1
+
+DEPS = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 1f08a661bc72930187893a07f3741a91
+
+install : $(TARGET)
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ $(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure --prefix=/usr --libdir=/usr/lib
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/patch b/lfs/patch
index b5bd787..88adf25 100644
--- a/lfs/patch
+++ b/lfs/patch
@@ -24,7 +24,7 @@
include Config
-VER = 2.7.1
+VER = 2.7.5
THISAPP = patch-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -53,7 +53,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = e9ae5393426d3ad783a300a338c09b72
+$(DL_FILE)_MD5 = e3da7940431633fb65a01b91d3b7a27a
install : $(TARGET)
diff --git a/lfs/paxctl b/lfs/paxctl
index c55f293..387f384 100644
--- a/lfs/paxctl
+++ b/lfs/paxctl
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2013 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,10 +24,10 @@
include Config
-VER = 0.7
+VER = 0.9
THISAPP = paxctl-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
+DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 25bf9df751976e87be20243e75291263
+$(DL_FILE)_MD5 = 9bea59b1987dc4e16c2d22d745374e64
install : $(TARGET)
diff --git a/lfs/pciutils b/lfs/pciutils
index fc4a962..7c313ba 100644
--- a/lfs/pciutils
+++ b/lfs/pciutils
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2012 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,10 +24,10 @@
include Config
-VER = 3.1.10
+VER = 3.4.1
THISAPP = pciutils-$(VER)
-DL_FILE = $(THISAPP).tar.gz
+DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = cdb1e5a95ab7ac67349f10c8f77a6d3c
+$(DL_FILE)_MD5 = 35763bb1eab7bc9bf6eb6efb72cbc8a1
install : $(TARGET)
@@ -71,7 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && make SHARED=yes OPT="$(CFLAGS)" PREFIX=/usr STRIP="" \
- IDSDIR=/usr/share/hwdata ZLIB=no $(MAKETUNING)
+ SHAREDIR=/usr/share/hwdata $(MAKETUNING)
cd $(DIR_APP) && install -p lspci setpci /bin
cd $(DIR_APP) && install -p update-pciids /sbin
@@ -85,6 +85,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && install -p lib/config.h /usr/include/pci
cd $(DIR_APP) && install -p lib/types.h /usr/include/pci
cd $(DIR_APP) && install -p lib/libpci.pc /usr/lib/pkgconfig
-
+ chmod -v 755 /usr/lib/libpci.so
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/pcre b/lfs/pcre
index fd66350..c946714 100644
--- a/lfs/pcre
+++ b/lfs/pcre
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2015 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2016 Michael Tremer & Christian Schmidt #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 8.37
+VER = 8.38
THISAPP = pcre-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 6e0cc6d1bdac7a4308151f9b3571b86e
+$(DL_FILE)_MD5 = 8a353fe1450216b6655dfcf3561716d9
install : $(TARGET)
@@ -70,11 +70,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-recursive-back-referen.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-buffer-overflow-for-forward-reference-within-bac.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-named-forward-reference-to-duplicate-group-numbe.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-another-buffer-overflow.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-references-in-situatio.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.38-upstream_fixes-1.patch
cd $(DIR_APP) && ./configure \
--prefix=/usr \
--disable-static \
diff --git a/lfs/perl-Apache-Htpasswd b/lfs/perl-Apache-Htpasswd
new file mode 100644
index 0000000..9d9ed90
--- /dev/null
+++ b/lfs/perl-Apache-Htpasswd
@@ -0,0 +1,77 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2014 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 1.9
+
+THISAPP = Apache-Htpasswd-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = ee2ca41f9dd92d7a830a5ba65fcbeef0
+
+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)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && perl Makefile.PL
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/pkg-config b/lfs/pkg-config
index b3db91f..3da8556 100644
--- a/lfs/pkg-config
+++ b/lfs/pkg-config
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 0.20
+VER = 0.29
THISAPP = pkg-config-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = fb42402593e4198bc252ab248dd4158b
+$(DL_FILE)_MD5 = 77f27dce7ef88d0634d0d6f90e03a77f
install : $(TARGET)
@@ -70,8 +70,8 @@ $(subst %,%_MD5,$(objects)) :
$(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) $(EXTRA_MAKE)
+ cd $(DIR_APP) && ./configure --prefix=/usr --with-internal-glib
+ cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/python-pyparsing b/lfs/python-pyparsing
new file mode 100644
index 0000000..f84253b
--- /dev/null
+++ b/lfs/python-pyparsing
@@ -0,0 +1,82 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 2.0.7
+
+THISAPP = pyparsing-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = python-pyparsing
+PAK_VER = 1
+
+DEPS = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 1c8bed7530642ca19197f3caa05fd28b
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && python setup.py install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/python-six b/lfs/python-six
new file mode 100644
index 0000000..d210e4c
--- /dev/null
+++ b/lfs/python-six
@@ -0,0 +1,82 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 1.10.0
+
+THISAPP = six-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = python-six
+PAK_VER = 1
+
+DEPS = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 34eed507548117b2ab523ab14b2f8b55
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && python setup.py install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/qemu b/lfs/qemu
index a15dccd..804ec26 100644
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -33,9 +33,9 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
SUP_ARCH = i586 x86_64
PROG = qemu
-PAK_VER = 17
+PAK_VER = 18
-DEPS = "sdl"
+DEPS = "sdl spice"
###############################################################################
# Top-level Rules
@@ -81,7 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
--enable-kvm --disable-attr \
--target-list="i386-linux-user x86_64-linux-user arm-linux-user i386-softmmu x86_64-softmmu arm-softmmu" \
- --extra-cflags="$(CFLAGS)"
+ --extra-cflags="$(CFLAGS)" --enable-spice
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
diff --git a/lfs/samba b/lfs/samba
index f0dcf83..b58bf79 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = samba
-PAK_VER = 60
+PAK_VER = 61
DEPS = "cups krb5"
@@ -77,6 +77,18 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+
+ # Apply Redhat CVE patches
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/CVE-2015-7560-v3-6.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/CVE-preparation-v3-6.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/CVE-2016-2110-v3-6.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/CVE-2016-2111-v3-6.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/CVE-2016-2112-v3-6.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/CVE-2016-2115-v3-6.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/CVE-2016-2118-v3-6.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/CVE-2015-5370-v3-6.patch
+
+ cd $(DIR_APP)/source3 && ./autogen.sh
cd $(DIR_APP)/source3 && ./configure \
--prefix=/usr \
--libdir=/usr/lib/ \
@@ -99,6 +111,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--enable-cups \
--disable-avahi \
--with-syslog
+ cd $(DIR_APP)/source3 && make idl_full
cd $(DIR_APP)/source3 && make proto && make all $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP)/source3 && make install
cd $(DIR_APP)/source3 && chmod -v 644 /usr/include/libsmbclient.h
diff --git a/lfs/spice b/lfs/spice
new file mode 100644
index 0000000..415d5aa
--- /dev/null
+++ b/lfs/spice
@@ -0,0 +1,84 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 0.12.6
+
+THISAPP = spice-$(VER)
+DL_FILE = $(THISAPP).tar.bz2
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = spice
+PAK_VER = 1
+
+DEPS = "opus"
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 605a8c8ea80bc95076c4b3539c6dd026
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ $(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure --prefix=/usr --disable-celt051
+ cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/spice-protocol b/lfs/spice-protocol
new file mode 100644
index 0000000..c399fac
--- /dev/null
+++ b/lfs/spice-protocol
@@ -0,0 +1,85 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 0.12.10
+
+THISAPP = spice-protocol-$(VER)
+DL_FILE = $(THISAPP).tar.bz2
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = spice-protocol
+PAK_VER = 1
+
+DEPS = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 1fb9d0dcdd42dce1b476ae8aa7569bcc
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure --prefix=/usr
+ cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+ cd $(DIR_APP) && make install
+ /usr/share/automake-*/py-compile /usr/lib/spice-protocol/python_modules/*
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/squid b/lfs/squid
index 997c660..7e41c16 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -73,6 +73,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13228.patch
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4.14-fix-max-file-descriptors.patch
cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13230.patch
+ cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13231.patch
+ cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13232.patch
cd $(DIR_APP) && autoreconf -vfi
cd $(DIR_APP)/libltdl && autoreconf -vfi
diff --git a/lfs/texinfo b/lfs/texinfo
index 4ac591e..40af8dc 100644
--- a/lfs/texinfo
+++ b/lfs/texinfo
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2015 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,25 +24,21 @@
include Config
-VER = 4.13a
+VER = 5.2
THISAPP = texinfo-$(VER)
-DL_FILE = $(THISAPP).tar.gz
+DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/texinfo-4.13
+DIR_APP = $(DIR_SRC)/texinfo-5.2
# Normal build or /tools build.
#
ifeq "$(ROOT)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
- EXTRA_CONFIG = --prefix=/usr --disable-nls
- EXTRA_MAKE =
- EXTRA_INSTALL =
+ EXTRA_CONFIG = --prefix=/usr
else
TARGET = $(DIR_INFO)/$(THISAPP)-tools
- EXTRA_CONFIG = --prefix=/tools --disable-nls
- EXTRA_MAKE =
- EXTRA_INSTALL =
+ EXTRA_CONFIG = --prefix=/tools
endif
###############################################################################
@@ -53,7 +49,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 71ba711519209b5fb583fed2b3d86fcb
+$(DL_FILE)_MD5 = cb489df8a7ee9d10a236197aefdb32c5
install : $(TARGET)
@@ -83,8 +79,8 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
- cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
- cd $(DIR_APP) && make $(EXTRA_INSTALL) install
+ cd $(DIR_APP) && ./configure $(EXTRA_CONFIG) --disable-nls
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index da4bf16..960b45d 100755
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.19" # Version number
-CORE="100" # Core Level (Filename)
-PAKFIRE_CORE="100" # Core Level (PAKFIRE)
+CORE="101" # Core Level (Filename)
+PAKFIRE_CORE="101" # Core Level (PAKFIRE)
GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
@@ -550,6 +550,7 @@ buildipfire() {
ipfiremake GD-TextUtil
ipfiremake perl-Device-SerialPort
ipfiremake perl-Device-Modem
+ ipfiremake perl-Apache-Htpasswd
ipfiremake gnupg
ipfiremake hdparm
ipfiremake sdparm
@@ -679,6 +680,8 @@ buildipfire() {
ipfiremake libevent2
ipfiremake portmap
ipfiremake nfs
+ ipfiremake gnu-netcat
+ ipfiremake ncat
ipfiremake nmap
ipfiremake ncftp
ipfiremake etherwake
@@ -696,6 +699,11 @@ buildipfire() {
ipfiremake elinks
ipfiremake igmpproxy
ipfiremake fbset
+ ipfiremake opus
+ ipfiremake python-six
+ ipfiremake python-pyparsing
+ ipfiremake spice-protocol
+ ipfiremake spice
ipfiremake sdl
ipfiremake qemu
ipfiremake sane
@@ -744,7 +752,7 @@ buildipfire() {
ipfiremake gutenprint
ipfiremake apcupsd
ipfiremake iperf
- ipfiremake netcat
+ ipfiremake iperf3
ipfiremake 7zip
ipfiremake lynis
ipfiremake streamripper
@@ -851,6 +859,8 @@ buildipfire() {
ipfiremake lua
ipfiremake dnsdist
ipfiremake bird
+ ipfiremake dmidecode
+ ipfiremake mcelog
}
buildinstaller() {
diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index cb52670..7bdb292 100644
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -98,6 +98,7 @@ iptables_init() {
# SIP
if [ "${CONNTRACK_SIP}" = "on" ]; then
+ modprobe nf_nat_sip
iptables -A CONNTRACK -m conntrack --ctstate RELATED \
-m helper --helper sip -j ACCEPT
for proto in udp tcp; do
@@ -107,6 +108,7 @@ iptables_init() {
# H.323
if [ "${CONNTRACK_H323}" = "on" ]; then
+ modprobe nf_nat_h323
iptables -A CONNTRACK -m conntrack --ctstate RELATED \
-m helper --helper h323 -j ACCEPT
@@ -119,6 +121,7 @@ iptables_init() {
# FTP
if [ "${CONNTRACK_FTP}" = "on" ]; then
+ modprobe nf_nat_ftp
iptables -A CONNTRACK -m conntrack --ctstate RELATED \
-m helper --helper ftp -p tcp --dport 1024: -j ACCEPT
iptables -t raw -A CONNTRACK -p tcp --dport 21 -j CT --helper ftp
@@ -126,13 +129,15 @@ iptables_init() {
# PPTP
if [ "${CONNTRACK_PPTP}" = "on" ]; then
+ modprobe nf_nat_pptp
iptables -A CONNTRACK -m conntrack --ctstate RELATED \
-m helper --helper pptp -j ACCEPT
- iptables -t raw -A CONNTRACK -p udp --dport 1723 -j CT --helper pptp
+ iptables -t raw -A CONNTRACK -p tcp --dport 1723 -j CT --helper pptp
fi
# TFTP
if [ "${CONNTRACK_TFTP}" = "on" ]; then
+ modprobe nf_nat_tftp
iptables -A CONNTRACK -m conntrack --ctstate RELATED \
-m helper --helper tftp -j ACCEPT
iptables -t raw -A CONNTRACK -p udp --dport 69 -j CT --helper tftp
@@ -140,6 +145,7 @@ iptables_init() {
# IRC
if [ "${CONNTRACK_IRC}" = "on" ]; then
+ modprobe nf_nat_irc
iptables -A CONNTRACK -m conntrack --ctstate RELATED \
-m helper --helper irc -j ACCEPT
iptables -t raw -A CONNTRACK -p tcp --dport 6667 -j CT --helper irc
@@ -147,6 +153,7 @@ iptables_init() {
# Amanda
if [ "${CONNTRACK_AMANDA}" = "on" ]; then
+ modprobe nf_nat_amanda
iptables -A CONNTRACK -m conntrack --ctstate RELATED \
-m helper --helper amanda -j ACCEPT
iptables -t raw -A CONNTRACK -p tcp -j CT --helper amanda
diff --git a/src/installer/hw.c b/src/installer/hw.c
index 92d0ae5..362be47 100644
--- a/src/installer/hw.c
+++ b/src/installer/hw.c
@@ -747,11 +747,11 @@ static int hw_format_filesystem(const char* path, int fs, const char* output) {
// EXT4
} else if (fs == HW_FS_EXT4) {
- snprintf(cmd, sizeof(cmd), "/sbin/mke2fs -T ext4 %s", path);
+ snprintf(cmd, sizeof(cmd), "/sbin/mke2fs -FF -T ext4 %s", path);
// EXT4 w/o journal
} else if (fs == HW_FS_EXT4_WO_JOURNAL) {
- snprintf(cmd, sizeof(cmd), "/sbin/mke2fs -T ext4 -O ^has_journal %s", path);
+ snprintf(cmd, sizeof(cmd), "/sbin/mke2fs -FF -T ext4 -O ^has_journal %s", path);
// XFS
} else if (fs == HW_FS_XFS) {
diff --git a/src/patches/backports-4.2.6-1-ath9k_add_missing_mask_init.patch b/src/patches/backports-4.2.6-1-ath9k_add_missing_mask_init.patch
new file mode 100644
index 0000000..01aee6d
--- /dev/null
+++ b/src/patches/backports-4.2.6-1-ath9k_add_missing_mask_init.patch
@@ -0,0 +1,56 @@
+by moving common code to ar5008_hw_cmn_spur_mitigate i forgot to move
+mask_m & mask_p initialisation. This coused a performance regression
+on ar9281.
+
+
+Fixes: f911085ffa88 ("ath9k: split ar5008_hw_spur_mitigate and reuse common
+code in ar9002_hw_spur_mitigate.")
+Reported-by: Gustav Frederiksen <lkml2...(a)openmailbox.org>
+Tested-by: Gustav Frederiksen <lkml2...(a)openmailbox.org>
+Signed-off-by: Oleksij Rempel <li...(a)rempel-privat.de>
+diff -Naur backports-4.2.6-1.org/drivers/net/wireless/ath/ath9k/ar5008_phy.c backports-4.2.6-1/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+--- backports-4.2.6-1.org/drivers/net/wireless/ath/ath9k/ar5008_phy.c 2015-11-15 22:19:39.000000000 +0100
++++ backports-4.2.6-1/drivers/net/wireless/ath/ath9k/ar5008_phy.c 2016-04-25 09:37:58.765112541 +0200
+@@ -274,6 +274,9 @@
+ };
+ static const int inc[4] = { 0, 100, 0, 0 };
+
++ memset(&mask_m, 0, sizeof(int8_t) * 123);
++ memset(&mask_p, 0, sizeof(int8_t) * 123);
++
+ cur_bin = -6000;
+ upper = bin + 100;
+ lower = bin - 100;
+@@ -424,14 +427,9 @@
+ int tmp, new;
+ int i;
+
+- int8_t mask_m[123];
+- int8_t mask_p[123];
+ int cur_bb_spur;
+ bool is2GHz = IS_CHAN_2GHZ(chan);
+
+- memset(&mask_m, 0, sizeof(int8_t) * 123);
+- memset(&mask_p, 0, sizeof(int8_t) * 123);
+-
+ for (i = 0; i < AR_EEPROM_MODAL_SPURS; i++) {
+ cur_bb_spur = ah->eep_ops->get_spur_channel(ah, i, is2GHz);
+ if (AR_NO_SPUR == cur_bb_spur)
+diff -Naur backports-4.2.6-1.org/drivers/net/wireless/ath/ath9k/ar9002_phy.c backports-4.2.6-1/drivers/net/wireless/ath/ath9k/ar9002_phy.c
+--- backports-4.2.6-1.org/drivers/net/wireless/ath/ath9k/ar9002_phy.c 2015-11-15 22:19:39.000000000 +0100
++++ backports-4.2.6-1/drivers/net/wireless/ath/ath9k/ar9002_phy.c 2016-04-25 09:38:57.729109148 +0200
+@@ -178,14 +178,9 @@
+ int i;
+ struct chan_centers centers;
+
+- int8_t mask_m[123];
+- int8_t mask_p[123];
+ int cur_bb_spur;
+ bool is2GHz = IS_CHAN_2GHZ(chan);
+
+- memset(&mask_m, 0, sizeof(int8_t) * 123);
+- memset(&mask_p, 0, sizeof(int8_t) * 123);
+-
+ ath9k_hw_get_channel_centers(ah, chan, ¢ers);
+ freq = centers.synth_center;
+
diff --git a/src/patches/dmidecode/0001-Add-no-sysfs-option-description-to-h-output.patch b/src/patches/dmidecode/0001-Add-no-sysfs-option-description-to-h-output.patch
new file mode 100644
index 0000000..4b6c117
--- /dev/null
+++ b/src/patches/dmidecode/0001-Add-no-sysfs-option-description-to-h-output.patch
@@ -0,0 +1,15 @@
+diff --git a/dmiopt.c b/dmiopt.c
+index 0d142d2..de607f4 100644
+--- a/dmiopt.c
++++ b/dmiopt.c
+@@ -314,6 +314,7 @@ void print_help(void)
+ " -u, --dump Do not decode the entries\n"
+ " --dump-bin FILE Dump the DMI data to a binary file\n"
+ " --from-dump FILE Read the DMI data from a binary file\n"
++ " --no-sysfs Do not attempt to read DMI data from sysfs files\n"
+ " -V, --version Display the version and exit\n";
+
+ printf("%s", help);
+--
+2.1.4
+
diff --git a/src/patches/dmidecode/0002-Fix-No-SMBIOS-nor-DMI-entry-point-found-on-SMBIOS3.patch b/src/patches/dmidecode/0002-Fix-No-SMBIOS-nor-DMI-entry-point-found-on-SMBIOS3.patch
new file mode 100644
index 0000000..9f7db9c
--- /dev/null
+++ b/src/patches/dmidecode/0002-Fix-No-SMBIOS-nor-DMI-entry-point-found-on-SMBIOS3.patch
@@ -0,0 +1,26 @@
+diff --git a/dmidecode.c b/dmidecode.c
+index ce0511b..cfcade4 100644
+--- a/dmidecode.c
++++ b/dmidecode.c
+@@ -4866,8 +4866,16 @@ int main(int argc, char * const argv[])
+ goto exit_free;
+ }
+
+- if (smbios_decode(buf, opt.devmem, 0))
+- found++;
++ if (memcmp(buf, "_SM3_", 5) == 0)
++ {
++ if (smbios3_decode(buf, opt.devmem, 0))
++ found++;
++ }
++ else if (memcmp(buf, "_SM_", 4) == 0)
++ {
++ if (smbios_decode(buf, opt.devmem, 0))
++ found++;
++ }
+ goto done;
+
+ memory_scan:
+--
+2.1.4
+
diff --git a/src/patches/dmidecode/0003-Let-read_file-return-the-actual-data-size.patch b/src/patches/dmidecode/0003-Let-read_file-return-the-actual-data-size.patch
new file mode 100644
index 0000000..3fea6bc
--- /dev/null
+++ b/src/patches/dmidecode/0003-Let-read_file-return-the-actual-data-size.patch
@@ -0,0 +1,84 @@
+diff --git a/dmidecode.c b/dmidecode.c
+index 183ced4..a43cfd1 100644
+--- a/dmidecode.c
++++ b/dmidecode.c
+@@ -4751,6 +4751,7 @@ int main(int argc, char * const argv[])
+ int ret = 0; /* Returned value */
+ int found = 0;
+ off_t fp;
++ size_t size;
+ int efi;
+ u8 *buf;
+
+@@ -4820,8 +4821,9 @@ int main(int argc, char * const argv[])
+ * contain one of several types of entry points, so read enough for
+ * the largest one, then determine what type it contains.
+ */
++ size = 0x20;
+ if (!(opt.flags & FLAG_NO_SYSFS)
+- && (buf = read_file(0x20, SYS_ENTRY_FILE)) != NULL)
++ && (buf = read_file(&size, SYS_ENTRY_FILE)) != NULL)
+ {
+ if (!(opt.flags & FLAG_QUIET))
+ printf("Getting SMBIOS data from sysfs.\n");
+diff --git a/util.c b/util.c
+index f97ac0d..52ed413 100644
+--- a/util.c
++++ b/util.c
+@@ -94,10 +94,11 @@ int checksum(const u8 *buf, size_t len)
+ * needs to be freed by the caller.
+ * This provides a similar usage model to mem_chunk()
+ *
+- * Returns pointer to buffer of max_len bytes, or NULL on error
++ * Returns pointer to buffer of max_len bytes, or NULL on error, and
++ * sets max_len to the length actually read.
+ *
+ */
+-void *read_file(size_t max_len, const char *filename)
++void *read_file(size_t *max_len, const char *filename)
+ {
+ int fd;
+ size_t r2 = 0;
+@@ -115,7 +116,7 @@ void *read_file(size_t max_len, const char *filename)
+ return(NULL);
+ }
+
+- if ((p = malloc(max_len)) == NULL)
++ if ((p = malloc(*max_len)) == NULL)
+ {
+ perror("malloc");
+ return NULL;
+@@ -123,7 +124,7 @@ void *read_file(size_t max_len, const char *filename)
+
+ do
+ {
+- r = read(fd, p + r2, max_len - r2);
++ r = read(fd, p + r2, *max_len - r2);
+ if (r == -1)
+ {
+ if (errno != EINTR)
+@@ -140,6 +141,8 @@ void *read_file(size_t max_len, const char *filename)
+ while (r != 0);
+
+ close(fd);
++ *max_len = r2;
++
+ return p;
+ }
+
+diff --git a/util.h b/util.h
+index 9d409cd..b8748f1 100644
+--- a/util.h
++++ b/util.h
+@@ -25,7 +25,7 @@
+ #define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
+
+ int checksum(const u8 *buf, size_t len);
+-void *read_file(size_t len, const char *filename);
++void *read_file(size_t *len, const char *filename);
+ void *mem_chunk(off_t base, size_t len, const char *devmem);
+ int write_dump(size_t base, size_t len, const void *data, const char *dumpfile, int add);
+ u64 u64_range(u64 start, u64 end);
+--
+2.1.4
+
diff --git a/src/patches/dmidecode/0004-dmidecode-Use-read_file-to-read-the-DMI-table-from-s.patch b/src/patches/dmidecode/0004-dmidecode-Use-read_file-to-read-the-DMI-table-from-s.patch
new file mode 100644
index 0000000..45584b7
--- /dev/null
+++ b/src/patches/dmidecode/0004-dmidecode-Use-read_file-to-read-the-DMI-table-from-s.patch
@@ -0,0 +1,72 @@
+From 364055211b1956539c6a6268e111e244e1292c8c Mon Sep 17 00:00:00 2001
+From: Jean Delvare <jdelvare(a)suse.de>
+Date: Mon, 2 Nov 2015 09:45:31 +0100
+Subject: [PATCH] dmidecode: Use read_file() to read the DMI table from sysfs
+
+We shouldn't use mem_chunk() to read the DMI table from sysfs. This
+will fail for SMBIOS v3 implementations which specify a maximum length
+for the table rather than its exact length. The kernel will trim the
+table to the actual length, so the DMI file will be shorter than the
+length announced in entry point.
+
+read_file() fits the bill in this case, as it deals with end of file
+nicely.
+
+This also helps with corrupted DMI tables, as the kernel will not
+export the part of the table that it wasn't able to parse, effectively
+trimming it.
+
+This fixes bug #46176:
+https://savannah.nongnu.org/bugs/?46176
+Unexpected end of file error
+---
+ CHANGELOG | 3 +++
+ dmidecode.c | 29 +++++++++++++++++++++--------
+ 2 files changed, 24 insertions(+), 8 deletions(-)
+
+
+diff --git a/dmidecode.c b/dmidecode.c
+index a43cfd1..16d1823 100644
+--- a/dmidecode.c
++++ b/dmidecode.c
+@@ -4524,16 +4524,29 @@ static void dmi_table(off_t base, u32 len, u16 num, u16 ver, const char *devmem,
+ printf("\n");
+ }
+
+- /*
+- * When we are reading the DMI table from sysfs, we want to print
+- * the address of the table (done above), but the offset of the
+- * data in the file is 0. When reading from /dev/mem, the offset
+- * in the file is the address.
+- */
+ if (flags & FLAG_NO_FILE_OFFSET)
+- base = 0;
++ {
++ /*
++ * When reading from sysfs, the file may be shorter than
++ * announced. For SMBIOS v3 this is expcted, as we only know
++ * the maximum table size, not the actual table size. For older
++ * implementations (and for SMBIOS v3 too), this would be the
++ * result of the kernel truncating the table on parse error.
++ */
++ size_t size = len;
++ buf = read_file(&size, devmem);
++ if (!(opt.flags & FLAG_QUIET) && num && size != (size_t)len)
++ {
++ printf("Wrong DMI structures length: %u bytes "
++ "announced, only %lu bytes available.\n",
++ len, (unsigned long)size);
++ }
++ len = size;
++ }
++ else
++ buf = mem_chunk(base, len, devmem);
+
+- if ((buf = mem_chunk(base, len, devmem)) == NULL)
++ if (buf == NULL)
+ {
+ fprintf(stderr, "Table is unreachable, sorry."
+ #ifndef USE_MMAP
+--
+2.1.4
+
diff --git a/src/patches/dmidecode/0005-nothing-should-go-into-usr-local.patch b/src/patches/dmidecode/0005-nothing-should-go-into-usr-local.patch
new file mode 100644
index 0000000..4c36dc5
--- /dev/null
+++ b/src/patches/dmidecode/0005-nothing-should-go-into-usr-local.patch
@@ -0,0 +1,16 @@
+diff --git a/Makefile b/Makefile
+index 1f54a1f..8cb7c44 100644
+--- a/Makefile
++++ b/Makefile
+@@ -30,7 +30,7 @@ CFLAGS += -O2
+ LDFLAGS =
+
+ DESTDIR =
+-prefix = /usr/local
++prefix = /usr
+ sbindir = $(prefix)/sbin
+ mandir = $(prefix)/share/man
+ man8dir = $(mandir)/man8
+--
+2.1.4
+
diff --git a/src/patches/ebtables/0001-ebtables-should-install-nothing-in-usr-local.patch b/src/patches/ebtables/0001-ebtables-should-install-nothing-in-usr-local.patch
new file mode 100644
index 0000000..2cccb90
--- /dev/null
+++ b/src/patches/ebtables/0001-ebtables-should-install-nothing-in-usr-local.patch
@@ -0,0 +1,28 @@
+From 373fb7d2d22fcf3328702e719793526e215822ca Mon Sep 17 00:00:00 2001
+From: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
+Date: Thu, 24 Mar 2016 18:35:51 +0100
+Subject: [PATCH] ebtables should install nothing in usr local
+
+Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index c1106a4..b5f4447 100644
+--- a/Makefile
++++ b/Makefile
+@@ -10,8 +10,8 @@ LOCKDIR:=$(shell echo $(LOCKFILE) | sed 's/\(.*\)\/.*/\1/')/
+
+ # default paths
+ LIBDIR:=/usr/lib
+-MANDIR:=/usr/local/man
+-BINDIR:=/usr/local/sbin
++MANDIR:=/usr/man
++BINDIR:=/usr/sbin
+ ETCDIR:=/etc
+ INITDIR:=/etc/rc.d/init.d
+ SYSCONFIGDIR:=/etc/sysconfig
+--
+2.1.4
+
diff --git a/src/patches/iperf3/0001-remove-pg-flag.patch b/src/patches/iperf3/0001-remove-pg-flag.patch
new file mode 100644
index 0000000..601712d
--- /dev/null
+++ b/src/patches/iperf3/0001-remove-pg-flag.patch
@@ -0,0 +1,46 @@
+From be7dafdb802f39c3ad8bcc896216508842c42751 Mon Sep 17 00:00:00 2001
+From: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
+Date: Thu, 31 Mar 2016 19:33:17 +0200
+Subject: [PATCH] remove -pg flag
+
+Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
+---
+ src/Makefile.am | 4 ++--
+ src/Makefile.in | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 23b0c72..6268145 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -49,9 +49,9 @@ iperf3_LDFLAGS = -g
+ iperf3_profile_SOURCES = main.c \
+ $(libiperf_la_SOURCES)
+
+-iperf3_profile_CFLAGS = -pg -g
++iperf3_profile_CFLAGS = -g
+ iperf3_profile_LDADD = libiperf.la
+-iperf3_profile_LDFLAGS = -pg -g
++iperf3_profile_LDFLAGS = -g
+
+ # Specify the sources and various flags for the test cases
+ t_timer_SOURCES = t_timer.c
+diff --git a/src/Makefile.in b/src/Makefile.in
+index f7c46ad..016a022 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -610,9 +610,9 @@ iperf3_LDFLAGS = -g
+ iperf3_profile_SOURCES = main.c \
+ $(libiperf_la_SOURCES)
+
+-iperf3_profile_CFLAGS = -pg -g
++iperf3_profile_CFLAGS = -g
+ iperf3_profile_LDADD = libiperf.la
+-iperf3_profile_LDFLAGS = -pg -g
++iperf3_profile_LDFLAGS = -g
+
+ # Specify the sources and various flags for the test cases
+ t_timer_SOURCES = t_timer.c
+--
+2.1.4
+
diff --git a/src/patches/lcdproc-0.5.6-menuitem.patch b/src/patches/lcdproc-0.5.6-menuitem.patch
deleted file mode 100644
index b9e933d..0000000
--- a/src/patches/lcdproc-0.5.6-menuitem.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- server/menuitem.c 2012/04/25 19:53:15 1.37
-+++ server/menuitem.c 2013/01/17 21:27:27 1.38
-@@ -33,6 +33,8 @@
-
- #define MAX_NUMERIC_LEN 40
-
-+extern Menu *main_menu; /* Access to the main menu */
-+
- char *error_strs[] = {"", "Out of range", "Too long", "Too short", "Invalid Address"};
- char *menuitemtypenames[] = {"menu", "action", "checkbox", "ring", "slider", "numeric", "alpha", "ip"};
- char *menueventtypenames[] = {"select", "update", "plus", "minus", "enter", "leave"};
diff --git a/src/patches/mpfr-3.1.3-upstream_fixes-1.patch b/src/patches/mpfr-3.1.3-upstream_fixes-1.patch
new file mode 100644
index 0000000..949ff73
--- /dev/null
+++ b/src/patches/mpfr-3.1.3-upstream_fixes-1.patch
@@ -0,0 +1,1707 @@
+Submitted By: Bruce Dubbs <bdubbs_at_linuxfromscratch_dot_org>
+Date: 2015-08-25
+Initial Package Version: 3.3.3
+Upstream Status: Already in upstream patch repo
+Origin: Upstream http://www.mpfr.org/mpfr-current/allpatches
+ as of 2015-08-25.
+Description: This patch contains bug fixes identified upstream.
+
+diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
+--- mpfr-3.1.3-a/PATCHES 2015-07-02 10:49:23.950112879 +0000
++++ mpfr-3.1.3-b/PATCHES 2015-07-02 10:49:24.042113845 +0000
+@@ -0,0 +1 @@
++lngamma-and-doc
+diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
+--- mpfr-3.1.3-a/VERSION 2015-06-19 19:55:09.000000000 +0000
++++ mpfr-3.1.3-b/VERSION 2015-07-02 10:49:24.042113845 +0000
+@@ -1 +1 @@
+-3.1.3
++3.1.3-p1
+diff -Naurd mpfr-3.1.3-a/doc/mpfr.texi mpfr-3.1.3-b/doc/mpfr.texi
+--- mpfr-3.1.3-a/doc/mpfr.texi 2015-06-19 19:55:11.000000000 +0000
++++ mpfr-3.1.3-b/doc/mpfr.texi 2015-07-02 10:49:24.018113593 +0000
+@@ -810,13 +810,17 @@
+ When the input point is in the closure of the domain of the mathematical
+ function and an input argument is +0 (resp.@: @minus{}0), one considers
+ the limit when the corresponding argument approaches 0 from above
+-(resp.@: below). If the limit is not defined (e.g., @code{mpfr_log} on
+-@minus{}0), the behavior is specified in the description of the MPFR function.
++(resp.@: below), if possible. If the limit is not defined (e.g.,
++@code{mpfr_sqrt} and @code{mpfr_log} on @minus{}0), the behavior is
++specified in the description of the MPFR function, but must be consistent
++with the rule from the above paragraph (e.g., @code{mpfr_log} on @pom{}0
++gives @minus{}Inf).
+
+ When the result is equal to 0, its sign is determined by considering the
+ limit as if the input point were not in the domain: If one approaches 0
+ from above (resp.@: below), the result is +0 (resp.@: @minus{}0);
+-for example, @code{mpfr_sin} on +0 gives +0.
++for example, @code{mpfr_sin} on @minus{}0 gives @minus{}0 and
++@code{mpfr_acos} on 1 gives +0 (in all rounding modes).
+ In the other cases, the sign is specified in the description of the MPFR
+ function; for example @code{mpfr_max} on @minus{}0 and +0 gives +0.
+
+@@ -832,8 +836,8 @@
+ @c that advantages in practice), like for any bug fix.
+ Example: @code{mpfr_hypot} on (NaN,0) gives NaN, but @code{mpfr_hypot}
+ on (NaN,+Inf) gives +Inf (as specified in @ref{Special Functions}),
+-since for any finite input @var{x}, @code{mpfr_hypot} on (@var{x},+Inf)
+-gives +Inf.
++since for any finite or infinite input @var{x}, @code{mpfr_hypot} on
++(@var{x},+Inf) gives +Inf.
+
+ @node Exceptions, Memory Handling, Floating-Point Values on Special Numbers, MPFR Basics
+ @comment node-name, next, previous, up
+@@ -1581,7 +1585,8 @@
+ @deftypefunx int mpfr_add_z (mpfr_t @var{rop}, mpfr_t @var{op1}, mpz_t @var{op2}, mpfr_rnd_t @var{rnd})
+ @deftypefunx int mpfr_add_q (mpfr_t @var{rop}, mpfr_t @var{op1}, mpq_t @var{op2}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to @math{@var{op1} + @var{op2}} rounded in the direction
+-@var{rnd}. For types having no signed zero, it is considered unsigned
++@var{rnd}. The IEEE-754 rules are used, in particular for signed zeros.
++But for types having no signed zeros, 0 is considered unsigned
+ (i.e., (+0) + 0 = (+0) and (@minus{}0) + 0 = (@minus{}0)).
+ The @code{mpfr_add_d} function assumes that the radix of the @code{double} type
+ is a power of 2, with a precision at most that declared by the C implementation
+@@ -1599,7 +1604,8 @@
+ @deftypefunx int mpfr_sub_z (mpfr_t @var{rop}, mpfr_t @var{op1}, mpz_t @var{op2}, mpfr_rnd_t @var{rnd})
+ @deftypefunx int mpfr_sub_q (mpfr_t @var{rop}, mpfr_t @var{op1}, mpq_t @var{op2}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to @math{@var{op1} - @var{op2}} rounded in the direction
+-@var{rnd}. For types having no signed zero, it is considered unsigned
++@var{rnd}. The IEEE-754 rules are used, in particular for signed zeros.
++But for types having no signed zeros, 0 is considered unsigned
+ (i.e., (+0) @minus{} 0 = (+0), (@minus{}0) @minus{} 0 = (@minus{}0),
+ 0 @minus{} (+0) = (@minus{}0) and 0 @minus{} (@minus{}0) = (+0)).
+ The same restrictions than for @code{mpfr_add_d} apply to @code{mpfr_d_sub}
+@@ -1615,7 +1621,7 @@
+ Set @var{rop} to @math{@var{op1} @GMPtimes{} @var{op2}} rounded in the
+ direction @var{rnd}.
+ When a result is zero, its sign is the product of the signs of the operands
+-(for types having no signed zero, it is considered positive).
++(for types having no signed zeros, 0 is considered positive).
+ The same restrictions than for @code{mpfr_add_d} apply to @code{mpfr_mul_d}.
+ @end deftypefun
+
+@@ -1635,7 +1641,7 @@
+ @deftypefunx int mpfr_div_q (mpfr_t @var{rop}, mpfr_t @var{op1}, mpq_t @var{op2}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to @math{@var{op1}/@var{op2}} rounded in the direction @var{rnd}.
+ When a result is zero, its sign is the product of the signs of the operands
+-(for types having no signed zero, it is considered positive).
++(for types having no signed zeros, 0 is considered positive).
+ The same restrictions than for @code{mpfr_add_d} apply to @code{mpfr_d_div}
+ and @code{mpfr_div_d}.
+ @end deftypefun
+@@ -1643,15 +1649,18 @@
+ @deftypefun int mpfr_sqrt (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
+ @deftypefunx int mpfr_sqrt_ui (mpfr_t @var{rop}, unsigned long int @var{op}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to @m{\sqrt{@var{op}}, the square root of @var{op}}
+-rounded in the direction @var{rnd} (set @var{rop} to @minus{}0 if @var{op} is
+-@minus{}0, to be consistent with the IEEE 754 standard).
++rounded in the direction @var{rnd}. Set @var{rop} to @minus{}0 if
++@var{op} is @minus{}0, to be consistent with the IEEE 754 standard.
+ Set @var{rop} to NaN if @var{op} is negative.
+ @end deftypefun
+
+ @deftypefun int mpfr_rec_sqrt (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to @m{1/\sqrt{@var{op}}, the reciprocal square root of @var{op}}
+-rounded in the direction @var{rnd}. Set @var{rop} to +Inf if @var{op} is
+-@pom{}0, +0 if @var{op} is +Inf, and NaN if @var{op} is negative.
++rounded in the direction @var{rnd}. Set @var{rop} to +Inf if @var{op} is
++@pom{}0, +0 if @var{op} is +Inf, and NaN if @var{op} is negative. Warning!
++Therefore the result on @minus{}0 is different from the one of the rSqrt
++function recommended by the IEEE 754-2008 standard (Section 9.2.1), which
++is @minus{}Inf instead of +Inf.
+ @end deftypefun
+
+ @deftypefun int mpfr_cbrt (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
+@@ -1832,7 +1841,9 @@
+ @m{\log_2 @var{op}, log2(@var{op})} or
+ @m{\log_{10} @var{op}, log10(@var{op})}, respectively,
+ rounded in the direction @var{rnd}.
+-Set @var{rop} to @minus{}Inf if @var{op} is @minus{}0
++Set @var{rop} to +0 if @var{op} is 1 (in all rounding modes),
++for consistency with the ISO C99 and IEEE 754-2008 standards.
++Set @var{rop} to @minus{}Inf if @var{op} is @pom{}0
+ (i.e., the sign of the zero has no influence on the result).
+ @end deftypefun
+
+@@ -2003,8 +2014,11 @@
+ @deftypefun int mpfr_lngamma (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to the value of the logarithm of the Gamma function on @var{op},
+ rounded in the direction @var{rnd}.
+-When @math{@minus{}2@var{k}@minus{}1 @le{} @var{op} @le{} @minus{}2@var{k}},
+-@var{k} being a non-negative integer, @var{rop} is set to NaN.
++When @var{op} is 1 or 2, set @var{rop} to +0 (in all rounding modes).
++When @var{op} is an infinity or a nonpositive integer, set @var{rop} to +Inf,
++following the general rules on special values.
++When @math{@minus{}2@var{k}@minus{}1 < @var{op} < @minus{}2@var{k}},
++@var{k} being a nonnegative integer, set @var{rop} to NaN@.
+ See also @code{mpfr_lgamma}.
+ @end deftypefun
+
+@@ -2012,10 +2026,11 @@
+ Set @var{rop} to the value of the logarithm of the absolute value of the
+ Gamma function on @var{op}, rounded in the direction @var{rnd}. The sign
+ (1 or @minus{}1) of Gamma(@var{op}) is returned in the object pointed to
+-by @var{signp}. When @var{op} is an infinity or a non-positive integer, set
+-@var{rop} to +Inf. When @var{op} is NaN, @minus{}Inf or a negative integer,
+-*@var{signp} is undefined, and when @var{op} is @pom{}0, *@var{signp} is
+-the sign of the zero.
++by @var{signp}.
++When @var{op} is 1 or 2, set @var{rop} to +0 (in all rounding modes).
++When @var{op} is an infinity or a nonpositive integer, set @var{rop} to +Inf.
++When @var{op} is NaN, @minus{}Inf or a negative integer, *@var{signp} is
++undefined, and when @var{op} is @pom{}0, *@var{signp} is the sign of the zero.
+ @end deftypefun
+
+ @deftypefun int mpfr_digamma (mpfr_t @var{rop}, mpfr_t @var{op}, mpfr_rnd_t @var{rnd})
+@@ -2064,7 +2079,10 @@
+ @deftypefunx int mpfr_fms (mpfr_t @var{rop}, mpfr_t @var{op1}, mpfr_t @var{op2}, mpfr_t @var{op3}, mpfr_rnd_t @var{rnd})
+ Set @var{rop} to @math{(@var{op1} @GMPtimes{} @var{op2}) + @var{op3}}
+ (resp.@: @math{(@var{op1} @GMPtimes{} @var{op2}) - @var{op3}})
+-rounded in the direction @var{rnd}.
++rounded in the direction @var{rnd}. Concerning special values (signed zeros,
++infinities, NaN), these functions behave like a multiplication followed by a
++separate addition or subtraction. That is, the fused operation matters only
++for rounding.
+ @end deftypefun
+
+ @deftypefun int mpfr_agm (mpfr_t @var{rop}, mpfr_t @var{op1}, mpfr_t @var{op2}, mpfr_rnd_t @var{rnd})
+@@ -2089,8 +2107,8 @@
+ i.e., $\sqrt{x^2+y^2}$,
+ @end tex
+ rounded in the direction @var{rnd}.
+-Special values are handled as described in Section F.9.4.3 of
+-the ISO C99 and IEEE 754-2008 standards:
++Special values are handled as described in the ISO C99 (Section F.9.4.3)
++and IEEE 754-2008 (Section 9.2.1) standards:
+ If @var{x} or @var{y} is an infinity, then +Inf is returned in @var{rop},
+ even if the other number is NaN.
+ @end deftypefun
+diff -Naurd mpfr-3.1.3-a/doc/mpfr.info mpfr-3.1.3-b/doc/mpfr.info
+--- mpfr-3.1.3-a/doc/mpfr.info 2015-06-19 19:55:53.000000000 +0000
++++ mpfr-3.1.3-b/doc/mpfr.info 2015-07-02 10:49:38.718267817 +0000
+@@ -1,4 +1,4 @@
+-This is mpfr.info, produced by makeinfo version 5.2 from mpfr.texi.
++This is mpfr.info, produced by makeinfo version 6.0 from mpfr.texi.
+
+ This manual documents how to install and use the Multiple Precision
+ Floating-Point Reliable Library, version 3.1.3.
+@@ -55,7 +55,7 @@
+ MPFR Copying Conditions
+ ***********************
+
+-The GNU MPFR library (or MPFR for short) is "free"; this means that
++The GNU MPFR library (or MPFR for short) is “free”; this means that
+ everyone is free to use it and free to redistribute it on a free basis.
+ The library is not in the public domain; it is copyrighted and there are
+ restrictions on its distribution, but these restrictions are designed to
+@@ -418,7 +418,7 @@
+ 4.2 Nomenclature and Types
+ ==========================
+
+-A "floating-point number", or "float" for short, is an arbitrary
++A “floating-point number”, or “float” for short, is an arbitrary
+ precision significand (also called mantissa) with a limited precision
+ exponent. The C data type for such objects is ‘mpfr_t’ (internally
+ defined as a one-element array of a structure, and ‘mpfr_ptr’ is the C
+@@ -432,7 +432,7 @@
+ to the other functions supported by MPFR. Unless documented otherwise,
+ the sign bit of a NaN is unspecified.
+
+-The "precision" is the number of bits used to represent the significand
++The “precision” is the number of bits used to represent the significand
+ of a floating-point number; the corresponding C data type is
+ ‘mpfr_prec_t’. The precision can be any integer between ‘MPFR_PREC_MIN’
+ and ‘MPFR_PREC_MAX’. In the current implementation, ‘MPFR_PREC_MIN’ is
+@@ -446,7 +446,7 @@
+ may abort, crash or have undefined behavior (depending on your C
+ implementation).
+
+-The "rounding mode" specifies the way to round the result of a
++The “rounding mode” specifies the way to round the result of a
+ floating-point operation, in case the exact result can not be
+ represented exactly in the destination significand; the corresponding C
+ data type is ‘mpfr_rnd_t’.
+@@ -499,14 +499,14 @@
+ representable numbers, it is rounded to the one with the least
+ significant bit set to zero. For example, the number 2.5, which is
+ represented by (10.1) in binary, is rounded to (10.0)=2 with a precision
+-of two bits, and not to (11.0)=3. This rule avoids the "drift"
++of two bits, and not to (11.0)=3. This rule avoids the “drift”
+ phenomenon mentioned by Knuth in volume 2 of The Art of Computer
+ Programming (Section 4.2.2).
+
+ Most MPFR functions take as first argument the destination variable,
+ as second and following arguments the input variables, as last argument
+ a rounding mode, and have a return value of type ‘int’, called the
+-"ternary value". The value stored in the destination variable is
++“ternary value”. The value stored in the destination variable is
+ correctly rounded, i.e., MPFR behaves as if it computed the result with
+ an infinite precision, then rounded it to the precision of this
+ variable. The input variables are regarded as exact (in particular,
+@@ -572,15 +572,18 @@
+ When the input point is in the closure of the domain of the
+ mathematical function and an input argument is +0 (resp. −0), one
+ considers the limit when the corresponding argument approaches 0 from
+-above (resp. below). If the limit is not defined (e.g., ‘mpfr_log’ on
+-−0), the behavior is specified in the description of the MPFR function.
++above (resp. below), if possible. If the limit is not defined (e.g.,
++‘mpfr_sqrt’ and ‘mpfr_log’ on −0), the behavior is specified in the
++description of the MPFR function, but must be consistent with the rule
++from the above paragraph (e.g., ‘mpfr_log’ on ±0 gives −Inf).
+
+ When the result is equal to 0, its sign is determined by considering
+ the limit as if the input point were not in the domain: If one
+ approaches 0 from above (resp. below), the result is +0 (resp. −0); for
+-example, ‘mpfr_sin’ on +0 gives +0. In the other cases, the sign is
+-specified in the description of the MPFR function; for example
+-‘mpfr_max’ on −0 and +0 gives +0.
++example, ‘mpfr_sin’ on −0 gives −0 and ‘mpfr_acos’ on 1 gives +0 (in all
++rounding modes). In the other cases, the sign is specified in the
++description of the MPFR function; for example ‘mpfr_max’ on −0 and +0
++gives +0.
+
+ When the input point is not in the closure of the domain of the
+ function, the result is NaN. Example: ‘mpfr_sqrt’ on −17 gives NaN.
+@@ -590,8 +593,8 @@
+ numbers; such a case is always explicitly specified in *note MPFR
+ Interface::. Example: ‘mpfr_hypot’ on (NaN,0) gives NaN, but
+ ‘mpfr_hypot’ on (NaN,+Inf) gives +Inf (as specified in *note Special
+-Functions::), since for any finite input X, ‘mpfr_hypot’ on (X,+Inf)
+-gives +Inf.
++Functions::), since for any finite or infinite input X, ‘mpfr_hypot’ on
++(X,+Inf) gives +Inf.
+
+
+ File: mpfr.info, Node: Exceptions, Next: Memory Handling, Prev: Floating-Point Values on Special Numbers, Up: MPFR Basics
+@@ -1253,8 +1256,9 @@
+ mpfr_rnd_t RND)
+ -- Function: int mpfr_add_q (mpfr_t ROP, mpfr_t OP1, mpq_t OP2,
+ mpfr_rnd_t RND)
+- Set ROP to OP1 + OP2 rounded in the direction RND. For types
+- having no signed zero, it is considered unsigned (i.e., (+0) + 0 =
++ Set ROP to OP1 + OP2 rounded in the direction RND. The IEEE-754
++ rules are used, in particular for signed zeros. But for types
++ having no signed zeros, 0 is considered unsigned (i.e., (+0) + 0 =
+ (+0) and (−0) + 0 = (−0)). The ‘mpfr_add_d’ function assumes that
+ the radix of the ‘double’ type is a power of 2, with a precision at
+ most that declared by the C implementation (macro
+@@ -1280,8 +1284,9 @@
+ mpfr_rnd_t RND)
+ -- Function: int mpfr_sub_q (mpfr_t ROP, mpfr_t OP1, mpq_t OP2,
+ mpfr_rnd_t RND)
+- Set ROP to OP1 - OP2 rounded in the direction RND. For types
+- having no signed zero, it is considered unsigned (i.e., (+0) − 0 =
++ Set ROP to OP1 - OP2 rounded in the direction RND. The IEEE-754
++ rules are used, in particular for signed zeros. But for types
++ having no signed zeros, 0 is considered unsigned (i.e., (+0) − 0 =
+ (+0), (−0) − 0 = (−0), 0 − (+0) = (−0) and 0 − (−0) = (+0)). The
+ same restrictions than for ‘mpfr_add_d’ apply to ‘mpfr_d_sub’ and
+ ‘mpfr_sub_d’.
+@@ -1300,7 +1305,7 @@
+ mpfr_rnd_t RND)
+ Set ROP to OP1 times OP2 rounded in the direction RND. When a
+ result is zero, its sign is the product of the signs of the
+- operands (for types having no signed zero, it is considered
++ operands (for types having no signed zeros, 0 is considered
+ positive). The same restrictions than for ‘mpfr_add_d’ apply to
+ ‘mpfr_mul_d’.
+
+@@ -1327,21 +1332,24 @@
+ mpfr_rnd_t RND)
+ Set ROP to OP1/OP2 rounded in the direction RND. When a result is
+ zero, its sign is the product of the signs of the operands (for
+- types having no signed zero, it is considered positive). The same
++ types having no signed zeros, 0 is considered positive). The same
+ restrictions than for ‘mpfr_add_d’ apply to ‘mpfr_d_div’ and
+ ‘mpfr_div_d’.
+
+ -- Function: int mpfr_sqrt (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+ -- Function: int mpfr_sqrt_ui (mpfr_t ROP, unsigned long int OP,
+ mpfr_rnd_t RND)
+- Set ROP to the square root of OP rounded in the direction RND (set
+- ROP to −0 if OP is −0, to be consistent with the IEEE 754
+- standard). Set ROP to NaN if OP is negative.
++ Set ROP to the square root of OP rounded in the direction RND. Set
++ ROP to −0 if OP is −0, to be consistent with the IEEE 754 standard.
++ Set ROP to NaN if OP is negative.
+
+ -- Function: int mpfr_rec_sqrt (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+ Set ROP to the reciprocal square root of OP rounded in the
+ direction RND. Set ROP to +Inf if OP is ±0, +0 if OP is +Inf, and
+- NaN if OP is negative.
++ NaN if OP is negative. Warning! Therefore the result on −0 is
++ different from the one of the rSqrt function recommended by the
++ IEEE 754-2008 standard (Section 9.2.1), which is −Inf instead of
++ +Inf.
+
+ -- Function: int mpfr_cbrt (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+ -- Function: int mpfr_root (mpfr_t ROP, mpfr_t OP, unsigned long int K,
+@@ -1515,8 +1523,10 @@
+ -- Function: int mpfr_log2 (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+ -- Function: int mpfr_log10 (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+ Set ROP to the natural logarithm of OP, log2(OP) or log10(OP),
+- respectively, rounded in the direction RND. Set ROP to −Inf if OP
+- is −0 (i.e., the sign of the zero has no influence on the result).
++ respectively, rounded in the direction RND. Set ROP to +0 if OP is
++ 1 (in all rounding modes), for consistency with the ISO C99 and
++ IEEE 754-2008 standards. Set ROP to −Inf if OP is ±0 (i.e., the
++ sign of the zero has no influence on the result).
+
+ -- Function: int mpfr_exp (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+ -- Function: int mpfr_exp2 (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+@@ -1649,17 +1659,21 @@
+
+ -- Function: int mpfr_lngamma (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+ Set ROP to the value of the logarithm of the Gamma function on OP,
+- rounded in the direction RND. When −2K−1 <= OP <= −2K, K being a
+- non-negative integer, ROP is set to NaN. See also ‘mpfr_lgamma’.
++ rounded in the direction RND. When OP is 1 or 2, set ROP to +0 (in
++ all rounding modes). When OP is an infinity or a nonpositive
++ integer, set ROP to +Inf, following the general rules on special
++ values. When −2K−1 < OP < −2K, K being a nonnegative integer, set
++ ROP to NaN. See also ‘mpfr_lgamma’.
+
+ -- Function: int mpfr_lgamma (mpfr_t ROP, int *SIGNP, mpfr_t OP,
+ mpfr_rnd_t RND)
+ Set ROP to the value of the logarithm of the absolute value of the
+ Gamma function on OP, rounded in the direction RND. The sign (1 or
+ −1) of Gamma(OP) is returned in the object pointed to by SIGNP.
+- When OP is an infinity or a non-positive integer, set ROP to +Inf.
+- When OP is NaN, −Inf or a negative integer, *SIGNP is undefined,
+- and when OP is ±0, *SIGNP is the sign of the zero.
++ When OP is 1 or 2, set ROP to +0 (in all rounding modes). When OP
++ is an infinity or a nonpositive integer, set ROP to +Inf. When OP
++ is NaN, −Inf or a negative integer, *SIGNP is undefined, and when
++ OP is ±0, *SIGNP is the sign of the zero.
+
+ -- Function: int mpfr_digamma (mpfr_t ROP, mpfr_t OP, mpfr_rnd_t RND)
+ Set ROP to the value of the Digamma (sometimes also called Psi)
+@@ -1703,7 +1717,10 @@
+ -- Function: int mpfr_fms (mpfr_t ROP, mpfr_t OP1, mpfr_t OP2, mpfr_t
+ OP3, mpfr_rnd_t RND)
+ Set ROP to (OP1 times OP2) + OP3 (resp. (OP1 times OP2) - OP3)
+- rounded in the direction RND.
++ rounded in the direction RND. Concerning special values (signed
++ zeros, infinities, NaN), these functions behave like a
++ multiplication followed by a separate addition or subtraction.
++ That is, the fused operation matters only for rounding.
+
+ -- Function: int mpfr_agm (mpfr_t ROP, mpfr_t OP1, mpfr_t OP2,
+ mpfr_rnd_t RND)
+@@ -1717,9 +1734,10 @@
+ RND)
+ Set ROP to the Euclidean norm of X and Y, i.e., the square root of
+ the sum of the squares of X and Y, rounded in the direction RND.
+- Special values are handled as described in Section F.9.4.3 of the
+- ISO C99 and IEEE 754-2008 standards: If X or Y is an infinity, then
+- +Inf is returned in ROP, even if the other number is NaN.
++ Special values are handled as described in the ISO C99 (Section
++ F.9.4.3) and IEEE 754-2008 (Section 9.2.1) standards: If X or Y is
++ an infinity, then +Inf is returned in ROP, even if the other number
++ is NaN.
+
+ -- Function: int mpfr_ai (mpfr_t ROP, mpfr_t X, mpfr_rnd_t RND)
+ Set ROP to the value of the Airy function Ai on X, rounded in the
+@@ -2670,7 +2688,7 @@
+ 5.16 Internals
+ ==============
+
+-A "limb" means the part of a multi-precision number that fits in a
++A “limb” means the part of a multi-precision number that fits in a
+ single word. Usually a limb contains 32 or 64 bits. The C data type
+ for a limb is ‘mp_limb_t’.
+
+@@ -3140,7 +3158,7 @@
+ 0. PREAMBLE
+
+ The purpose of this License is to make a manual, textbook, or other
+- functional and useful document "free" in the sense of freedom: to
++ functional and useful document “free” in the sense of freedom: to
+ assure everyone the effective freedom to copy and redistribute it,
+ with or without modifying it, either commercially or
+ noncommercially. Secondarily, this License preserves for the
+@@ -3655,9 +3673,9 @@
+ * Menu:
+
+ * mpfr_abs: Basic Arithmetic Functions.
+- (line 160)
+-* mpfr_acos: Special Functions. (line 51)
+-* mpfr_acosh: Special Functions. (line 115)
++ (line 165)
++* mpfr_acos: Special Functions. (line 53)
++* mpfr_acosh: Special Functions. (line 117)
+ * mpfr_add: Basic Arithmetic Functions.
+ (line 6)
+ * mpfr_add_d: Basic Arithmetic Functions.
+@@ -3670,15 +3688,15 @@
+ (line 8)
+ * mpfr_add_z: Basic Arithmetic Functions.
+ (line 14)
+-* mpfr_agm: Special Functions. (line 210)
+-* mpfr_ai: Special Functions. (line 226)
+-* mpfr_asin: Special Functions. (line 52)
+-* mpfr_asinh: Special Functions. (line 116)
++* mpfr_agm: Special Functions. (line 219)
++* mpfr_ai: Special Functions. (line 236)
++* mpfr_asin: Special Functions. (line 54)
++* mpfr_asinh: Special Functions. (line 118)
+ * mpfr_asprintf: Formatted Output Functions.
+ (line 193)
+-* mpfr_atan: Special Functions. (line 53)
+-* mpfr_atan2: Special Functions. (line 63)
+-* mpfr_atanh: Special Functions. (line 117)
++* mpfr_atan: Special Functions. (line 55)
++* mpfr_atan2: Special Functions. (line 65)
++* mpfr_atanh: Special Functions. (line 119)
+ * mpfr_buildopt_decimal_p: Miscellaneous Functions.
+ (line 162)
+ * mpfr_buildopt_gmpinternals_p: Miscellaneous Functions.
+@@ -3690,7 +3708,7 @@
+ * mpfr_can_round: Rounding Related Functions.
+ (line 39)
+ * mpfr_cbrt: Basic Arithmetic Functions.
+- (line 108)
++ (line 113)
+ * mpfr_ceil: Integer Related Functions.
+ (line 7)
+ * mpfr_check_range: Exception Related Functions.
+@@ -3735,18 +3753,18 @@
+ (line 27)
+ * mpfr_cmp_z: Comparison Functions.
+ (line 11)
+-* mpfr_const_catalan: Special Functions. (line 237)
+-* mpfr_const_euler: Special Functions. (line 236)
+-* mpfr_const_log2: Special Functions. (line 234)
+-* mpfr_const_pi: Special Functions. (line 235)
++* mpfr_const_catalan: Special Functions. (line 247)
++* mpfr_const_euler: Special Functions. (line 246)
++* mpfr_const_log2: Special Functions. (line 244)
++* mpfr_const_pi: Special Functions. (line 245)
+ * mpfr_copysign: Miscellaneous Functions.
+ (line 109)
+-* mpfr_cos: Special Functions. (line 29)
+-* mpfr_cosh: Special Functions. (line 95)
+-* mpfr_cot: Special Functions. (line 47)
+-* mpfr_coth: Special Functions. (line 111)
+-* mpfr_csc: Special Functions. (line 46)
+-* mpfr_csch: Special Functions. (line 110)
++* mpfr_cos: Special Functions. (line 31)
++* mpfr_cosh: Special Functions. (line 97)
++* mpfr_cot: Special Functions. (line 49)
++* mpfr_coth: Special Functions. (line 113)
++* mpfr_csc: Special Functions. (line 48)
++* mpfr_csch: Special Functions. (line 112)
+ * mpfr_custom_get_exp: Custom Interface. (line 75)
+ * mpfr_custom_get_kind: Custom Interface. (line 65)
+ * mpfr_custom_get_significand: Custom Interface. (line 70)
+@@ -3756,47 +3774,47 @@
+ * mpfr_custom_move: Custom Interface. (line 82)
+ * MPFR_DECL_INIT: Initialization Functions.
+ (line 74)
+-* mpfr_digamma: Special Functions. (line 166)
++* mpfr_digamma: Special Functions. (line 172)
+ * mpfr_dim: Basic Arithmetic Functions.
+- (line 166)
++ (line 171)
+ * mpfr_div: Basic Arithmetic Functions.
+- (line 72)
++ (line 74)
+ * mpfr_divby0_p: Exception Related Functions.
+ (line 134)
+ * mpfr_div_2exp: Compatibility with MPF.
+ (line 49)
+ * mpfr_div_2si: Basic Arithmetic Functions.
+- (line 181)
++ (line 186)
+ * mpfr_div_2ui: Basic Arithmetic Functions.
+- (line 179)
++ (line 184)
+ * mpfr_div_d: Basic Arithmetic Functions.
+- (line 84)
++ (line 86)
+ * mpfr_div_q: Basic Arithmetic Functions.
+- (line 88)
++ (line 90)
+ * mpfr_div_si: Basic Arithmetic Functions.
+- (line 80)
++ (line 82)
+ * mpfr_div_ui: Basic Arithmetic Functions.
+- (line 76)
++ (line 78)
+ * mpfr_div_z: Basic Arithmetic Functions.
+- (line 86)
++ (line 88)
+ * mpfr_d_div: Basic Arithmetic Functions.
+- (line 82)
++ (line 84)
+ * mpfr_d_sub: Basic Arithmetic Functions.
+- (line 35)
+-* mpfr_eint: Special Functions. (line 133)
++ (line 36)
++* mpfr_eint: Special Functions. (line 135)
+ * mpfr_eq: Compatibility with MPF.
+ (line 28)
+ * mpfr_equal_p: Comparison Functions.
+ (line 59)
+ * mpfr_erangeflag_p: Exception Related Functions.
+ (line 137)
+-* mpfr_erf: Special Functions. (line 177)
+-* mpfr_erfc: Special Functions. (line 178)
+-* mpfr_exp: Special Functions. (line 23)
+-* mpfr_exp10: Special Functions. (line 25)
+-* mpfr_exp2: Special Functions. (line 24)
+-* mpfr_expm1: Special Functions. (line 129)
+-* mpfr_fac_ui: Special Functions. (line 121)
++* mpfr_erf: Special Functions. (line 183)
++* mpfr_erfc: Special Functions. (line 184)
++* mpfr_exp: Special Functions. (line 25)
++* mpfr_exp10: Special Functions. (line 27)
++* mpfr_exp2: Special Functions. (line 26)
++* mpfr_expm1: Special Functions. (line 131)
++* mpfr_fac_ui: Special Functions. (line 123)
+ * mpfr_fits_intmax_p: Conversion Functions.
+ (line 150)
+ * mpfr_fits_sint_p: Conversion Functions.
+@@ -3815,20 +3833,20 @@
+ (line 147)
+ * mpfr_floor: Integer Related Functions.
+ (line 8)
+-* mpfr_fma: Special Functions. (line 203)
++* mpfr_fma: Special Functions. (line 209)
+ * mpfr_fmod: Integer Related Functions.
+ (line 92)
+-* mpfr_fms: Special Functions. (line 205)
++* mpfr_fms: Special Functions. (line 211)
+ * mpfr_fprintf: Formatted Output Functions.
+ (line 157)
+ * mpfr_frac: Integer Related Functions.
+ (line 76)
+-* mpfr_free_cache: Special Functions. (line 244)
++* mpfr_free_cache: Special Functions. (line 254)
+ * mpfr_free_str: Conversion Functions.
+ (line 137)
+ * mpfr_frexp: Conversion Functions.
+ (line 45)
+-* mpfr_gamma: Special Functions. (line 148)
++* mpfr_gamma: Special Functions. (line 150)
+ * mpfr_get_d: Conversion Functions.
+ (line 7)
+ * mpfr_get_decimal64: Conversion Functions.
+@@ -3887,7 +3905,7 @@
+ (line 56)
+ * mpfr_greater_p: Comparison Functions.
+ (line 55)
+-* mpfr_hypot: Special Functions. (line 218)
++* mpfr_hypot: Special Functions. (line 227)
+ * mpfr_inexflag_p: Exception Related Functions.
+ (line 136)
+ * mpfr_inf_p: Comparison Functions.
+@@ -3922,21 +3940,21 @@
+ (line 31)
+ * mpfr_integer_p: Integer Related Functions.
+ (line 119)
+-* mpfr_j0: Special Functions. (line 182)
+-* mpfr_j1: Special Functions. (line 183)
+-* mpfr_jn: Special Functions. (line 184)
++* mpfr_j0: Special Functions. (line 188)
++* mpfr_j1: Special Functions. (line 189)
++* mpfr_jn: Special Functions. (line 190)
+ * mpfr_lessequal_p: Comparison Functions.
+ (line 58)
+ * mpfr_lessgreater_p: Comparison Functions.
+ (line 64)
+ * mpfr_less_p: Comparison Functions.
+ (line 57)
+-* mpfr_lgamma: Special Functions. (line 157)
+-* mpfr_li2: Special Functions. (line 143)
+-* mpfr_lngamma: Special Functions. (line 152)
++* mpfr_lgamma: Special Functions. (line 162)
++* mpfr_li2: Special Functions. (line 145)
++* mpfr_lngamma: Special Functions. (line 154)
+ * mpfr_log: Special Functions. (line 16)
+ * mpfr_log10: Special Functions. (line 18)
+-* mpfr_log1p: Special Functions. (line 125)
++* mpfr_log1p: Special Functions. (line 127)
+ * mpfr_log2: Special Functions. (line 17)
+ * mpfr_max: Miscellaneous Functions.
+ (line 22)
+@@ -3947,29 +3965,29 @@
+ * mpfr_modf: Integer Related Functions.
+ (line 82)
+ * mpfr_mul: Basic Arithmetic Functions.
+- (line 51)
++ (line 53)
+ * mpfr_mul_2exp: Compatibility with MPF.
+ (line 47)
+ * mpfr_mul_2si: Basic Arithmetic Functions.
+- (line 174)
++ (line 179)
+ * mpfr_mul_2ui: Basic Arithmetic Functions.
+- (line 172)
++ (line 177)
+ * mpfr_mul_d: Basic Arithmetic Functions.
+- (line 57)
++ (line 59)
+ * mpfr_mul_q: Basic Arithmetic Functions.
+- (line 61)
++ (line 63)
+ * mpfr_mul_si: Basic Arithmetic Functions.
+- (line 55)
++ (line 57)
+ * mpfr_mul_ui: Basic Arithmetic Functions.
+- (line 53)
++ (line 55)
+ * mpfr_mul_z: Basic Arithmetic Functions.
+- (line 59)
++ (line 61)
+ * mpfr_nanflag_p: Exception Related Functions.
+ (line 135)
+ * mpfr_nan_p: Comparison Functions.
+ (line 39)
+ * mpfr_neg: Basic Arithmetic Functions.
+- (line 159)
++ (line 164)
+ * mpfr_nextabove: Miscellaneous Functions.
+ (line 15)
+ * mpfr_nextbelow: Miscellaneous Functions.
+@@ -3983,13 +4001,13 @@
+ * mpfr_overflow_p: Exception Related Functions.
+ (line 133)
+ * mpfr_pow: Basic Arithmetic Functions.
+- (line 116)
++ (line 121)
+ * mpfr_pow_si: Basic Arithmetic Functions.
+- (line 120)
++ (line 125)
+ * mpfr_pow_ui: Basic Arithmetic Functions.
+- (line 118)
++ (line 123)
+ * mpfr_pow_z: Basic Arithmetic Functions.
+- (line 122)
++ (line 127)
+ * mpfr_prec_round: Rounding Related Functions.
+ (line 13)
+ * ‘mpfr_prec_t’: Nomenclature and Types.
+@@ -3999,7 +4017,7 @@
+ * mpfr_print_rnd_mode: Rounding Related Functions.
+ (line 71)
+ * mpfr_rec_sqrt: Basic Arithmetic Functions.
+- (line 103)
++ (line 105)
+ * mpfr_regular_p: Comparison Functions.
+ (line 43)
+ * mpfr_reldiff: Compatibility with MPF.
+@@ -4021,11 +4039,11 @@
+ * ‘mpfr_rnd_t’: Nomenclature and Types.
+ (line 34)
+ * mpfr_root: Basic Arithmetic Functions.
+- (line 109)
++ (line 114)
+ * mpfr_round: Integer Related Functions.
+ (line 9)
+-* mpfr_sec: Special Functions. (line 45)
+-* mpfr_sech: Special Functions. (line 109)
++* mpfr_sec: Special Functions. (line 47)
++* mpfr_sech: Special Functions. (line 111)
+ * mpfr_set: Assignment Functions.
+ (line 9)
+ * mpfr_setsign: Miscellaneous Functions.
+@@ -4100,57 +4118,57 @@
+ (line 49)
+ * mpfr_signbit: Miscellaneous Functions.
+ (line 99)
+-* mpfr_sin: Special Functions. (line 30)
+-* mpfr_sinh: Special Functions. (line 96)
+-* mpfr_sinh_cosh: Special Functions. (line 101)
+-* mpfr_sin_cos: Special Functions. (line 35)
++* mpfr_sin: Special Functions. (line 32)
++* mpfr_sinh: Special Functions. (line 98)
++* mpfr_sinh_cosh: Special Functions. (line 103)
++* mpfr_sin_cos: Special Functions. (line 37)
+ * mpfr_si_div: Basic Arithmetic Functions.
+- (line 78)
++ (line 80)
+ * mpfr_si_sub: Basic Arithmetic Functions.
+- (line 31)
++ (line 32)
+ * mpfr_snprintf: Formatted Output Functions.
+ (line 180)
+ * mpfr_sprintf: Formatted Output Functions.
+ (line 170)
+ * mpfr_sqr: Basic Arithmetic Functions.
+- (line 69)
++ (line 71)
+ * mpfr_sqrt: Basic Arithmetic Functions.
+- (line 96)
++ (line 98)
+ * mpfr_sqrt_ui: Basic Arithmetic Functions.
+- (line 97)
++ (line 99)
+ * mpfr_strtofr: Assignment Functions.
+ (line 80)
+ * mpfr_sub: Basic Arithmetic Functions.
+- (line 25)
++ (line 26)
+ * mpfr_subnormalize: Exception Related Functions.
+ (line 60)
+ * mpfr_sub_d: Basic Arithmetic Functions.
+- (line 37)
++ (line 38)
+ * mpfr_sub_q: Basic Arithmetic Functions.
+- (line 43)
++ (line 44)
+ * mpfr_sub_si: Basic Arithmetic Functions.
+- (line 33)
++ (line 34)
+ * mpfr_sub_ui: Basic Arithmetic Functions.
+- (line 29)
++ (line 30)
+ * mpfr_sub_z: Basic Arithmetic Functions.
+- (line 41)
+-* mpfr_sum: Special Functions. (line 252)
++ (line 42)
++* mpfr_sum: Special Functions. (line 262)
+ * mpfr_swap: Assignment Functions.
+ (line 150)
+ * ‘mpfr_t’: Nomenclature and Types.
+ (line 6)
+-* mpfr_tan: Special Functions. (line 31)
+-* mpfr_tanh: Special Functions. (line 97)
++* mpfr_tan: Special Functions. (line 33)
++* mpfr_tanh: Special Functions. (line 99)
+ * mpfr_trunc: Integer Related Functions.
+ (line 10)
+ * mpfr_ui_div: Basic Arithmetic Functions.
+- (line 74)
++ (line 76)
+ * mpfr_ui_pow: Basic Arithmetic Functions.
+- (line 126)
++ (line 131)
+ * mpfr_ui_pow_ui: Basic Arithmetic Functions.
+- (line 124)
++ (line 129)
+ * mpfr_ui_sub: Basic Arithmetic Functions.
+- (line 27)
++ (line 28)
+ * mpfr_underflow_p: Exception Related Functions.
+ (line 132)
+ * mpfr_unordered_p: Comparison Functions.
+@@ -4181,61 +4199,61 @@
+ (line 182)
+ * mpfr_vsprintf: Formatted Output Functions.
+ (line 171)
+-* mpfr_y0: Special Functions. (line 193)
+-* mpfr_y1: Special Functions. (line 194)
+-* mpfr_yn: Special Functions. (line 195)
++* mpfr_y0: Special Functions. (line 199)
++* mpfr_y1: Special Functions. (line 200)
++* mpfr_yn: Special Functions. (line 201)
+ * mpfr_zero_p: Comparison Functions.
+ (line 42)
+-* mpfr_zeta: Special Functions. (line 171)
+-* mpfr_zeta_ui: Special Functions. (line 172)
++* mpfr_zeta: Special Functions. (line 177)
++* mpfr_zeta_ui: Special Functions. (line 178)
+ * mpfr_z_sub: Basic Arithmetic Functions.
+- (line 39)
++ (line 40)
+
+
+
+ Tag Table:
+ Node: Top775
+ Node: Copying2007
+-Node: Introduction to MPFR3766
+-Node: Installing MPFR5880
+-Node: Reporting Bugs11323
+-Node: MPFR Basics13353
+-Node: Headers and Libraries13669
+-Node: Nomenclature and Types16828
+-Node: MPFR Variable Conventions18874
+-Node: Rounding Modes20418
+-Ref: ternary value21544
+-Node: Floating-Point Values on Special Numbers23526
+-Node: Exceptions26572
+-Node: Memory Handling29749
+-Node: MPFR Interface30894
+-Node: Initialization Functions33008
+-Node: Assignment Functions40318
+-Node: Combined Initialization and Assignment Functions49673
+-Node: Conversion Functions50974
+-Node: Basic Arithmetic Functions60035
+-Node: Comparison Functions69200
+-Node: Special Functions72687
+-Node: Input and Output Functions86672
+-Node: Formatted Output Functions88644
+-Node: Integer Related Functions98431
+-Node: Rounding Related Functions105051
+-Node: Miscellaneous Functions108888
+-Node: Exception Related Functions117568
+-Node: Compatibility with MPF124386
+-Node: Custom Interface127127
+-Node: Internals131526
+-Node: API Compatibility133066
+-Node: Type and Macro Changes134995
+-Node: Added Functions137844
+-Node: Changed Functions141132
+-Node: Removed Functions145545
+-Node: Other Changes145973
+-Node: Contributors147576
+-Node: References150219
+-Node: GNU Free Documentation License151973
+-Node: Concept Index174562
+-Node: Function and Type Index180659
++Node: Introduction to MPFR3770
++Node: Installing MPFR5884
++Node: Reporting Bugs11327
++Node: MPFR Basics13357
++Node: Headers and Libraries13673
++Node: Nomenclature and Types16832
++Node: MPFR Variable Conventions18894
++Node: Rounding Modes20438
++Ref: ternary value21568
++Node: Floating-Point Values on Special Numbers23554
++Node: Exceptions26813
++Node: Memory Handling29990
++Node: MPFR Interface31135
++Node: Initialization Functions33249
++Node: Assignment Functions40559
++Node: Combined Initialization and Assignment Functions49914
++Node: Conversion Functions51215
++Node: Basic Arithmetic Functions60276
++Node: Comparison Functions69777
++Node: Special Functions73264
++Node: Input and Output Functions87862
++Node: Formatted Output Functions89834
++Node: Integer Related Functions99621
++Node: Rounding Related Functions106241
++Node: Miscellaneous Functions110078
++Node: Exception Related Functions118758
++Node: Compatibility with MPF125576
++Node: Custom Interface128317
++Node: Internals132716
++Node: API Compatibility134260
++Node: Type and Macro Changes136189
++Node: Added Functions139038
++Node: Changed Functions142326
++Node: Removed Functions146739
++Node: Other Changes147167
++Node: Contributors148770
++Node: References151413
++Node: GNU Free Documentation License153167
++Node: Concept Index175760
++Node: Function and Type Index181857
+
+ End Tag Table
+
+diff -Naurd mpfr-3.1.3-a/src/lngamma.c mpfr-3.1.3-b/src/lngamma.c
+--- mpfr-3.1.3-a/src/lngamma.c 2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/lngamma.c 2015-07-02 10:49:24.018113593 +0000
+@@ -603,16 +603,17 @@
+ mpfr_get_prec (y), mpfr_log_prec, y, inex));
+
+ /* special cases */
+- if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (x)))
++ if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (x) ||
++ (MPFR_IS_NEG (x) && mpfr_integer_p (x))))
+ {
+- if (MPFR_IS_NAN (x) || MPFR_IS_NEG (x))
++ if (MPFR_IS_NAN (x))
+ {
+ MPFR_SET_NAN (y);
+ MPFR_RET_NAN;
+ }
+- else /* lngamma(+Inf) = lngamma(+0) = +Inf */
++ else /* lngamma(+/-Inf) = lngamma(nonpositive integer) = +Inf */
+ {
+- if (MPFR_IS_ZERO (x))
++ if (!MPFR_IS_INF (x))
+ mpfr_set_divby0 ();
+ MPFR_SET_INF (y);
+ MPFR_SET_POS (y);
+@@ -620,8 +621,8 @@
+ }
+ }
+
+- /* if x < 0 and -2k-1 <= x <= -2k, then lngamma(x) = NaN */
+- if (MPFR_IS_NEG (x) && (unit_bit (x) == 0 || mpfr_integer_p (x)))
++ /* if -2k-1 < x < -2k <= 0, then lngamma(x) = NaN */
++ if (MPFR_IS_NEG (x) && unit_bit (x) == 0)
+ {
+ MPFR_SET_NAN (y);
+ MPFR_RET_NAN;
+diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
+--- mpfr-3.1.3-a/src/mpfr.h 2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/mpfr.h 2015-07-02 10:49:24.038113803 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 3
+-#define MPFR_VERSION_STRING "3.1.3"
++#define MPFR_VERSION_STRING "3.1.3-p1"
+
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
+--- mpfr-3.1.3-a/src/version.c 2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/version.c 2015-07-02 10:49:24.042113845 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+- return "3.1.3";
++ return "3.1.3-p1";
+ }
+diff -Naurd mpfr-3.1.3-a/tests/tlngamma.c mpfr-3.1.3-b/tests/tlngamma.c
+--- mpfr-3.1.3-a/tests/tlngamma.c 2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/tests/tlngamma.c 2015-07-02 10:49:24.018113593 +0000
+@@ -33,7 +33,7 @@
+ special (void)
+ {
+ mpfr_t x, y;
+- int inex;
++ int i, inex;
+
+ mpfr_init (x);
+ mpfr_init (y);
+@@ -46,25 +46,29 @@
+ exit (1);
+ }
+
+- mpfr_set_inf (x, -1);
++ mpfr_set_inf (x, 1);
++ mpfr_clear_flags ();
+ mpfr_lngamma (y, x, MPFR_RNDN);
+- if (!mpfr_nan_p (y))
++ if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 || __gmpfr_flags != 0)
+ {
+- printf ("Error for lngamma(-Inf)\n");
++ printf ("Error for lngamma(+Inf)\n");
+ exit (1);
+ }
+
+- mpfr_set_inf (x, 1);
++ mpfr_set_inf (x, -1);
++ mpfr_clear_flags ();
+ mpfr_lngamma (y, x, MPFR_RNDN);
+- if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0)
++ if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 || __gmpfr_flags != 0)
+ {
+- printf ("Error for lngamma(+Inf)\n");
++ printf ("Error for lngamma(-Inf)\n");
+ exit (1);
+ }
+
+ mpfr_set_ui (x, 0, MPFR_RNDN);
++ mpfr_clear_flags ();
+ mpfr_lngamma (y, x, MPFR_RNDN);
+- if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0)
++ if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 ||
++ __gmpfr_flags != MPFR_FLAGS_DIVBY0)
+ {
+ printf ("Error for lngamma(+0)\n");
+ exit (1);
+@@ -72,32 +76,58 @@
+
+ mpfr_set_ui (x, 0, MPFR_RNDN);
+ mpfr_neg (x, x, MPFR_RNDN);
++ mpfr_clear_flags ();
+ mpfr_lngamma (y, x, MPFR_RNDN);
+- if (!mpfr_nan_p (y))
++ if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 ||
++ __gmpfr_flags != MPFR_FLAGS_DIVBY0)
+ {
+ printf ("Error for lngamma(-0)\n");
+ exit (1);
+ }
+
+ mpfr_set_ui (x, 1, MPFR_RNDN);
++ mpfr_clear_flags ();
+ mpfr_lngamma (y, x, MPFR_RNDN);
+- if (MPFR_IS_NAN (y) || mpfr_cmp_ui (y, 0) || MPFR_IS_NEG (y))
++ if (mpfr_cmp_ui0 (y, 0) || MPFR_IS_NEG (y))
+ {
+ printf ("Error for lngamma(1)\n");
+ exit (1);
+ }
+
+- mpfr_set_si (x, -1, MPFR_RNDN);
+- mpfr_lngamma (y, x, MPFR_RNDN);
+- if (!mpfr_nan_p (y))
++ for (i = 1; i <= 5; i++)
+ {
+- printf ("Error for lngamma(-1)\n");
+- exit (1);
++ int c;
++
++ mpfr_set_si (x, -i, MPFR_RNDN);
++ mpfr_clear_flags ();
++ mpfr_lngamma (y, x, MPFR_RNDN);
++ if (!mpfr_inf_p (y) || mpfr_sgn (y) < 0 ||
++ __gmpfr_flags != MPFR_FLAGS_DIVBY0)
++ {
++ printf ("Error for lngamma(-%d)\n", i);
++ exit (1);
++ }
++ if (i & 1)
++ {
++ mpfr_nextabove (x);
++ c = '+';
++ }
++ else
++ {
++ mpfr_nextbelow (x);
++ c = '-';
++ }
++ mpfr_lngamma (y, x, MPFR_RNDN);
++ if (!mpfr_nan_p (y))
++ {
++ printf ("Error for lngamma(-%d%cepsilon)\n", i, c);
++ exit (1);
++ }
+ }
+
+ mpfr_set_ui (x, 2, MPFR_RNDN);
+ mpfr_lngamma (y, x, MPFR_RNDN);
+- if (MPFR_IS_NAN (y) || mpfr_cmp_ui (y, 0) || MPFR_IS_NEG (y))
++ if (mpfr_cmp_ui0 (y, 0) || MPFR_IS_NEG (y))
+ {
+ printf ("Error for lngamma(2)\n");
+ exit (1);
+@@ -127,7 +157,7 @@
+ mpfr_set_str (x, CHECK_X2, 10, MPFR_RNDN);
+ mpfr_lngamma (y, x, MPFR_RNDN);
+ mpfr_set_str (x, CHECK_Y2, 10, MPFR_RNDN);
+- if (MPFR_IS_NAN (y) || mpfr_cmp (y, x))
++ if (mpfr_cmp0 (y, x))
+ {
+ printf ("mpfr_lngamma("CHECK_X2") is wrong:\n"
+ "expected ");
+@@ -143,7 +173,7 @@
+ mpfr_lngamma (y, x, MPFR_RNDU);
+ mpfr_set_prec (x, 175);
+ mpfr_set_str_binary (x, "0.1010001100011101101011001101110010100001000001000001110011000001101100001111001001000101011011100100010101011110100111110101010100010011010010000101010111001100011000101111E7");
+- if (MPFR_IS_NAN (y) || mpfr_cmp (x, y))
++ if (mpfr_cmp0 (x, y))
+ {
+ printf ("Error in mpfr_lngamma (1)\n");
+ exit (1);
+@@ -155,7 +185,7 @@
+ mpfr_lngamma (x, y, MPFR_RNDZ);
+ mpfr_set_prec (y, 21);
+ mpfr_set_str_binary (y, "0.111000101000001100101E9");
+- if (MPFR_IS_NAN (x) || mpfr_cmp (x, y))
++ if (mpfr_cmp0 (x, y))
+ {
+ printf ("Error in mpfr_lngamma (120)\n");
+ printf ("Expected "); mpfr_print_binary (y); puts ("");
+@@ -169,7 +199,7 @@
+ inex = mpfr_lngamma (y, x, MPFR_RNDN);
+ mpfr_set_prec (x, 206);
+ mpfr_set_str_binary (x, "0.10000111011000000011100010101001100110001110000111100011000100100110110010001011011110101001111011110110000001010100111011010000000011100110110101100111000111010011110010000100010111101010001101000110101001E13");
+- if (MPFR_IS_NAN (y) || mpfr_cmp (x, y))
++ if (mpfr_cmp0 (x, y))
+ {
+ printf ("Error in mpfr_lngamma (768)\n");
+ exit (1);
+@@ -185,7 +215,7 @@
+ mpfr_set_str_binary (x, "0.1100E-66");
+ mpfr_lngamma (y, x, MPFR_RNDN);
+ mpfr_set_str_binary (x, "0.1100E6");
+- if (MPFR_IS_NAN (y) || mpfr_cmp (x, y))
++ if (mpfr_cmp0 (x, y))
+ {
+ printf ("Error for lngamma(0.1100E-66)\n");
+ exit (1);
+@@ -199,7 +229,7 @@
+ mpfr_lngamma (y, x, MPFR_RNDN);
+ mpfr_set_prec (x, 32);
+ mpfr_set_str_binary (x, "-0.10001000111011111011000010100010E207");
+- if (MPFR_IS_NAN (y) || mpfr_cmp (x, y))
++ if (mpfr_cmp0 (x, y))
+ {
+ printf ("Error for lngamma(-2^199+0.5)\n");
+ printf ("Got ");
+diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
+--- mpfr-3.1.3-a/PATCHES 2015-07-02 10:50:08.046573308 +0000
++++ mpfr-3.1.3-b/PATCHES 2015-07-02 10:50:08.126574142 +0000
+@@ -0,0 +1 @@
++muldiv-2exp-overflow
+diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
+--- mpfr-3.1.3-a/VERSION 2015-07-02 10:49:24.042113845 +0000
++++ mpfr-3.1.3-b/VERSION 2015-07-02 10:50:08.126574142 +0000
+@@ -1 +1 @@
+-3.1.3-p1
++3.1.3-p2
+diff -Naurd mpfr-3.1.3-a/src/div_2si.c mpfr-3.1.3-b/src/div_2si.c
+--- mpfr-3.1.3-a/src/div_2si.c 2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/div_2si.c 2015-07-02 10:50:08.106573933 +0000
+@@ -49,7 +49,7 @@
+ rnd_mode = MPFR_RNDZ;
+ return mpfr_underflow (y, rnd_mode, MPFR_SIGN(y));
+ }
+- else if (MPFR_UNLIKELY(n < 0 && (__gmpfr_emax < MPFR_EMIN_MIN - n ||
++ else if (MPFR_UNLIKELY(n <= 0 && (__gmpfr_emax < MPFR_EMIN_MIN - n ||
+ exp > __gmpfr_emax + n)) )
+ return mpfr_overflow (y, rnd_mode, MPFR_SIGN(y));
+
+diff -Naurd mpfr-3.1.3-a/src/div_2ui.c mpfr-3.1.3-b/src/div_2ui.c
+--- mpfr-3.1.3-a/src/div_2ui.c 2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/div_2ui.c 2015-07-02 10:50:08.106573933 +0000
+@@ -32,7 +32,7 @@
+ rnd_mode),
+ ("y[%Pu]=%.*Rg inexact=%d", mpfr_get_prec(y), mpfr_log_prec, y, inexact));
+
+- if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (x)))
++ if (MPFR_UNLIKELY (n == 0 || MPFR_IS_SINGULAR (x)))
+ return mpfr_set (y, x, rnd_mode);
+ else
+ {
+diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
+--- mpfr-3.1.3-a/src/mpfr.h 2015-07-02 10:49:24.038113803 +0000
++++ mpfr-3.1.3-b/src/mpfr.h 2015-07-02 10:50:08.126574142 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 3
+-#define MPFR_VERSION_STRING "3.1.3-p1"
++#define MPFR_VERSION_STRING "3.1.3-p2"
+
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.3-a/src/mul_2si.c mpfr-3.1.3-b/src/mul_2si.c
+--- mpfr-3.1.3-a/src/mul_2si.c 2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/src/mul_2si.c 2015-07-02 10:50:08.106573933 +0000
+@@ -39,7 +39,7 @@
+ {
+ mpfr_exp_t exp = MPFR_GET_EXP (x);
+ MPFR_SETRAW (inexact, y, x, exp, rnd_mode);
+- if (MPFR_UNLIKELY( n > 0 && (__gmpfr_emax < MPFR_EMIN_MIN + n ||
++ if (MPFR_UNLIKELY(n >= 0 && (__gmpfr_emax < MPFR_EMIN_MIN + n ||
+ exp > __gmpfr_emax - n)))
+ return mpfr_overflow (y, rnd_mode, MPFR_SIGN(y));
+ else if (MPFR_UNLIKELY(n < 0 && (__gmpfr_emin > MPFR_EMAX_MAX + n ||
+diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
+--- mpfr-3.1.3-a/src/version.c 2015-07-02 10:49:24.042113845 +0000
++++ mpfr-3.1.3-b/src/version.c 2015-07-02 10:50:08.126574142 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+- return "3.1.3-p1";
++ return "3.1.3-p2";
+ }
+diff -Naurd mpfr-3.1.3-a/tests/tmul_2exp.c mpfr-3.1.3-b/tests/tmul_2exp.c
+--- mpfr-3.1.3-a/tests/tmul_2exp.c 2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/tests/tmul_2exp.c 2015-07-02 10:50:08.106573933 +0000
+@@ -242,6 +242,76 @@
+ large (MPFR_EMAX_MAX);
+ }
+
++/* Cases where the function overflows on n = 0 when rounding is like
++ away from zero. */
++static void
++overflow0 (mpfr_exp_t emax)
++{
++ mpfr_exp_t old_emax;
++ mpfr_t x, y1, y2;
++ int neg, r, op;
++ static char *sop[4] = { "mul_2ui", "mul_2si", "div_2ui", "div_2si" };
++
++ old_emax = mpfr_get_emax ();
++ set_emax (emax);
++
++ mpfr_init2 (x, 8);
++ mpfr_inits2 (6, y1, y2, (mpfr_ptr) 0);
++
++ mpfr_set_inf (x, 1);
++ mpfr_nextbelow (x);
++
++ for (neg = 0; neg <= 1; neg++)
++ {
++ RND_LOOP (r)
++ {
++ int inex1, inex2;
++ unsigned int flags1, flags2;
++
++ /* Even if there isn't an overflow (rounding ~ toward zero),
++ the result is the same as the one of an overflow. */
++ inex1 = mpfr_overflow (y1, (mpfr_rnd_t) r, neg ? -1 : 1);
++ flags1 = MPFR_FLAGS_INEXACT;
++ if (mpfr_inf_p (y1))
++ flags1 |= MPFR_FLAGS_OVERFLOW;
++ for (op = 0; op < 4; op++)
++ {
++ mpfr_clear_flags ();
++ inex2 =
++ op == 0 ? mpfr_mul_2ui (y2, x, 0, (mpfr_rnd_t) r) :
++ op == 1 ? mpfr_mul_2si (y2, x, 0, (mpfr_rnd_t) r) :
++ op == 2 ? mpfr_div_2ui (y2, x, 0, (mpfr_rnd_t) r) :
++ op == 3 ? mpfr_div_2si (y2, x, 0, (mpfr_rnd_t) r) :
++ (MPFR_ASSERTN (0), 0);
++ flags2 = __gmpfr_flags;
++ if (!(mpfr_equal_p (y1, y2) &&
++ SAME_SIGN (inex1, inex2) &&
++ flags1 == flags2))
++ {
++ printf ("Error in overflow0 for %s, mpfr_%s, emax = %"
++ MPFR_EXP_FSPEC "d,\nx = ",
++ mpfr_print_rnd_mode ((mpfr_rnd_t) r), sop[op],
++ (mpfr_eexp_t) emax);
++ mpfr_dump (x);
++ printf ("Expected ");
++ mpfr_dump (y1);
++ printf (" with inex = %d, flags =", inex1);
++ flags_out (flags1);
++ printf ("Got ");
++ mpfr_dump (y2);
++ printf (" with inex = %d, flags =", inex2);
++ flags_out (flags2);
++ exit (1);
++ }
++ }
++ }
++ mpfr_neg (x, x, MPFR_RNDN);
++ }
++
++ mpfr_clears (x, y1, y2, (mpfr_ptr) 0);
++ set_emax (old_emax);
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+@@ -334,6 +404,11 @@
+ underflow0 ();
+ large0 ();
+
++ if (mpfr_get_emax () != MPFR_EMAX_MAX)
++ overflow0 (mpfr_get_emax ());
++ overflow0 (MPFR_EMAX_MAX);
++ overflow0 (-1);
++
+ tests_end_mpfr ();
+ return 0;
+ }
+diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
+--- mpfr-3.1.3-a/PATCHES 2015-07-17 08:54:48.592799981 +0000
++++ mpfr-3.1.3-b/PATCHES 2015-07-17 08:54:48.616811495 +0000
+@@ -0,0 +1 @@
++muldiv-2exp-underflow
+diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
+--- mpfr-3.1.3-a/VERSION 2015-07-02 10:50:08.126574142 +0000
++++ mpfr-3.1.3-b/VERSION 2015-07-17 08:54:48.616811495 +0000
+@@ -1 +1 @@
+-3.1.3-p2
++3.1.3-p3
+diff -Naurd mpfr-3.1.3-a/src/div_2si.c mpfr-3.1.3-b/src/div_2si.c
+--- mpfr-3.1.3-a/src/div_2si.c 2015-07-02 10:50:08.106573933 +0000
++++ mpfr-3.1.3-b/src/div_2si.c 2015-07-17 08:54:48.608807656 +0000
+@@ -45,7 +45,8 @@
+ if (rnd_mode == MPFR_RNDN &&
+ (__gmpfr_emin > MPFR_EMAX_MAX - (n - 1) ||
+ exp < __gmpfr_emin + (n - 1) ||
+- (inexact >= 0 && mpfr_powerof2_raw (y))))
++ ((MPFR_IS_NEG (y) ? inexact <= 0 : inexact >= 0) &&
++ mpfr_powerof2_raw (y))))
+ rnd_mode = MPFR_RNDZ;
+ return mpfr_underflow (y, rnd_mode, MPFR_SIGN(y));
+ }
+diff -Naurd mpfr-3.1.3-a/src/div_2ui.c mpfr-3.1.3-b/src/div_2ui.c
+--- mpfr-3.1.3-a/src/div_2ui.c 2015-07-02 10:50:08.106573933 +0000
++++ mpfr-3.1.3-b/src/div_2ui.c 2015-07-17 08:54:48.608807656 +0000
+@@ -44,7 +44,9 @@
+ if (MPFR_UNLIKELY (n >= diffexp)) /* exp - n <= emin - 1 */
+ {
+ if (rnd_mode == MPFR_RNDN &&
+- (n > diffexp || (inexact >= 0 && mpfr_powerof2_raw (y))))
++ (n > diffexp ||
++ ((MPFR_IS_NEG (y) ? inexact <= 0 : inexact >= 0) &&
++ mpfr_powerof2_raw (y))))
+ rnd_mode = MPFR_RNDZ;
+ return mpfr_underflow (y, rnd_mode, MPFR_SIGN (y));
+ }
+diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
+--- mpfr-3.1.3-a/src/mpfr.h 2015-07-02 10:50:08.126574142 +0000
++++ mpfr-3.1.3-b/src/mpfr.h 2015-07-17 08:54:48.616811495 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 3
+-#define MPFR_VERSION_STRING "3.1.3-p2"
++#define MPFR_VERSION_STRING "3.1.3-p3"
+
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.3-a/src/mul_2si.c mpfr-3.1.3-b/src/mul_2si.c
+--- mpfr-3.1.3-a/src/mul_2si.c 2015-07-02 10:50:08.106573933 +0000
++++ mpfr-3.1.3-b/src/mul_2si.c 2015-07-17 08:54:48.608807656 +0000
+@@ -48,7 +48,8 @@
+ if (rnd_mode == MPFR_RNDN &&
+ (__gmpfr_emin > MPFR_EMAX_MAX + (n + 1) ||
+ exp < __gmpfr_emin - (n + 1) ||
+- (inexact >= 0 && mpfr_powerof2_raw (y))))
++ ((MPFR_IS_NEG (y) ? inexact <= 0 : inexact >= 0) &&
++ mpfr_powerof2_raw (y))))
+ rnd_mode = MPFR_RNDZ;
+ return mpfr_underflow (y, rnd_mode, MPFR_SIGN(y));
+ }
+diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
+--- mpfr-3.1.3-a/src/version.c 2015-07-02 10:50:08.126574142 +0000
++++ mpfr-3.1.3-b/src/version.c 2015-07-17 08:54:48.616811495 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+- return "3.1.3-p2";
++ return "3.1.3-p3";
+ }
+diff -Naurd mpfr-3.1.3-a/tests/tmul_2exp.c mpfr-3.1.3-b/tests/tmul_2exp.c
+--- mpfr-3.1.3-a/tests/tmul_2exp.c 2015-07-02 10:50:08.106573933 +0000
++++ mpfr-3.1.3-b/tests/tmul_2exp.c 2015-07-17 08:54:48.608807656 +0000
+@@ -50,77 +50,82 @@
+ {
+ mpfr_t x, y, z1, z2;
+ mpfr_exp_t emin;
+- int i, k;
++ int i, k, s;
+ int prec;
+ int rnd;
+ int div;
+ int inex1, inex2;
+ unsigned int flags1, flags2;
+
+- /* Test mul_2si(x, e - k), div_2si(x, k - e) and div_2ui(x, k - e)
+- * with emin = e, x = 1 + i/16, i in { -1, 0, 1 }, and k = 1 to 4,
+- * by comparing the result with the one of a simple division.
++ /* Test mul_2si(x, e - k), div_2si(x, k - e) and div_2ui(x, k - e) with
++ * emin = e, x = s * (1 + i/16), i in { -1, 0, 1 }, s in { -1, 1 }, and
++ * k = 1 to 4, by comparing the result with the one of a simple division.
+ */
+ emin = mpfr_get_emin ();
+ set_emin (e);
+ mpfr_inits2 (8, x, y, (mpfr_ptr) 0);
+ for (i = 15; i <= 17; i++)
+- {
+- inex1 = mpfr_set_ui_2exp (x, i, -4, MPFR_RNDN);
+- MPFR_ASSERTN (inex1 == 0);
+- for (prec = 6; prec >= 3; prec -= 3)
+- {
+- mpfr_inits2 (prec, z1, z2, (mpfr_ptr) 0);
+- RND_LOOP (rnd)
+- for (k = 1; k <= 4; k++)
+- {
+- /* The following one is assumed to be correct. */
+- inex1 = mpfr_mul_2si (y, x, e, MPFR_RNDN);
+- MPFR_ASSERTN (inex1 == 0);
+- inex1 = mpfr_set_ui (z1, 1 << k, MPFR_RNDN);
+- MPFR_ASSERTN (inex1 == 0);
+- mpfr_clear_flags ();
+- /* Do not use mpfr_div_ui to avoid the optimization
+- by mpfr_div_2si. */
+- inex1 = mpfr_div (z1, y, z1, (mpfr_rnd_t) rnd);
+- flags1 = __gmpfr_flags;
+-
+- for (div = 0; div <= 2; div++)
++ for (s = 1; s >= -1; s -= 2)
++ {
++ inex1 = mpfr_set_si_2exp (x, s * i, -4, MPFR_RNDN);
++ MPFR_ASSERTN (inex1 == 0);
++ for (prec = 6; prec >= 3; prec -= 3)
++ {
++ mpfr_inits2 (prec, z1, z2, (mpfr_ptr) 0);
++ RND_LOOP (rnd)
++ for (k = 1; k <= 4; k++)
+ {
++ /* The following one is assumed to be correct. */
++ inex1 = mpfr_mul_2si (y, x, e, MPFR_RNDN);
++ MPFR_ASSERTN (inex1 == 0);
++ inex1 = mpfr_set_ui (z1, 1 << k, MPFR_RNDN);
++ MPFR_ASSERTN (inex1 == 0);
+ mpfr_clear_flags ();
+- inex2 = div == 0 ?
+- mpfr_mul_2si (z2, x, e - k, (mpfr_rnd_t) rnd) : div == 1 ?
+- mpfr_div_2si (z2, x, k - e, (mpfr_rnd_t) rnd) :
+- mpfr_div_2ui (z2, x, k - e, (mpfr_rnd_t) rnd);
+- flags2 = __gmpfr_flags;
+- if (flags1 == flags2 && SAME_SIGN (inex1, inex2) &&
+- mpfr_equal_p (z1, z2))
+- continue;
+- printf ("Error in underflow(");
+- if (e == MPFR_EMIN_MIN)
+- printf ("MPFR_EMIN_MIN");
+- else if (e == emin)
+- printf ("default emin");
+- else if (e >= LONG_MIN)
+- printf ("%ld", (long) e);
+- else
+- printf ("<LONG_MIN");
+- printf (") with mpfr_%s,\nx = %d/16, prec = %d, k = %d, "
+- "%s\n", div == 0 ? "mul_2si" : div == 1 ?
+- "div_2si" : "div_2ui", i, prec, k,
+- mpfr_print_rnd_mode ((mpfr_rnd_t) rnd));
+- printf ("Expected ");
+- mpfr_out_str (stdout, 16, 0, z1, MPFR_RNDN);
+- printf (", inex = %d, flags = %u\n", SIGN (inex1), flags1);
+- printf ("Got ");
+- mpfr_out_str (stdout, 16, 0, z2, MPFR_RNDN);
+- printf (", inex = %d, flags = %u\n", SIGN (inex2), flags2);
+- exit (1);
+- } /* div */
+- } /* k */
+- mpfr_clears (z1, z2, (mpfr_ptr) 0);
+- } /* prec */
+- } /* i */
++ /* Do not use mpfr_div_ui to avoid the optimization
++ by mpfr_div_2si. */
++ inex1 = mpfr_div (z1, y, z1, (mpfr_rnd_t) rnd);
++ flags1 = __gmpfr_flags;
++
++ for (div = 0; div <= 2; div++)
++ {
++ mpfr_clear_flags ();
++ inex2 =
++ div == 0 ?
++ mpfr_mul_2si (z2, x, e - k, (mpfr_rnd_t) rnd) :
++ div == 1 ?
++ mpfr_div_2si (z2, x, k - e, (mpfr_rnd_t) rnd) :
++ mpfr_div_2ui (z2, x, k - e, (mpfr_rnd_t) rnd);
++ flags2 = __gmpfr_flags;
++ if (flags1 == flags2 && SAME_SIGN (inex1, inex2) &&
++ mpfr_equal_p (z1, z2))
++ continue;
++ printf ("Error in underflow(");
++ if (e == MPFR_EMIN_MIN)
++ printf ("MPFR_EMIN_MIN");
++ else if (e == emin)
++ printf ("default emin");
++ else if (e >= LONG_MIN)
++ printf ("%ld", (long) e);
++ else
++ printf ("<LONG_MIN");
++ printf (") with mpfr_%s,\nx = %d/16, prec = %d, k = %d,"
++ " %s\n", div == 0 ? "mul_2si" : div == 1 ?
++ "div_2si" : "div_2ui", s * i, prec, k,
++ mpfr_print_rnd_mode ((mpfr_rnd_t) rnd));
++ printf ("Expected ");
++ mpfr_out_str (stdout, 16, 0, z1, MPFR_RNDN);
++ printf (", inex = %d, flags = %u\n",
++ SIGN (inex1), flags1);
++ printf ("Got ");
++ mpfr_out_str (stdout, 16, 0, z2, MPFR_RNDN);
++ printf (", inex = %d, flags = %u\n",
++ SIGN (inex2), flags2);
++ exit (1);
++ } /* div */
++ } /* k */
++ mpfr_clears (z1, z2, (mpfr_ptr) 0);
++ } /* prec */
++ } /* i */
+ mpfr_clears (x, y, (mpfr_ptr) 0);
+ set_emin (emin);
+ }
+diff -Naurd mpfr-3.1.3-a/PATCHES mpfr-3.1.3-b/PATCHES
+--- mpfr-3.1.3-a/PATCHES 2015-07-17 08:58:21.094987384 +0000
++++ mpfr-3.1.3-b/PATCHES 2015-07-17 08:58:21.118986898 +0000
+@@ -0,0 +1 @@
++frexp
+diff -Naurd mpfr-3.1.3-a/VERSION mpfr-3.1.3-b/VERSION
+--- mpfr-3.1.3-a/VERSION 2015-07-17 08:54:48.616811495 +0000
++++ mpfr-3.1.3-b/VERSION 2015-07-17 08:58:21.118986898 +0000
+@@ -1 +1 @@
+-3.1.3-p3
++3.1.3-p4
+diff -Naurd mpfr-3.1.3-a/src/frexp.c mpfr-3.1.3-b/src/frexp.c
+--- mpfr-3.1.3-a/src/frexp.c 2015-06-19 19:55:09.000000000 +0000
++++ mpfr-3.1.3-b/src/frexp.c 2015-07-17 08:58:21.106987142 +0000
+@@ -26,6 +26,13 @@
+ mpfr_frexp (mpfr_exp_t *exp, mpfr_ptr y, mpfr_srcptr x, mpfr_rnd_t rnd)
+ {
+ int inex;
++ unsigned int saved_flags = __gmpfr_flags;
++ MPFR_BLOCK_DECL (flags);
++
++ MPFR_LOG_FUNC
++ (("x[%Pu]=%.*Rg rnd=%d", mpfr_get_prec (x), mpfr_log_prec, x, rnd),
++ ("y[%Pu]=%.*Rg exp=%" MPFR_EXP_FSPEC "d inex=%d", mpfr_get_prec (y),
++ mpfr_log_prec, y, (mpfr_eexp_t) *exp, inex));
+
+ if (MPFR_UNLIKELY(MPFR_IS_SINGULAR(x)))
+ {
+@@ -49,8 +56,32 @@
+ }
+ }
+
+- inex = mpfr_set (y, x, rnd);
++ MPFR_BLOCK (flags, inex = mpfr_set (y, x, rnd));
++ __gmpfr_flags = saved_flags;
++
++ /* Possible overflow due to the rounding, no possible underflow. */
++
++ if (MPFR_UNLIKELY (MPFR_OVERFLOW (flags)))
++ {
++ int inex2;
++
++ /* An overflow here means that the exponent of y would be larger than
++ the one of x, thus x would be rounded to the next power of 2, and
++ the returned y should be 1/2 in absolute value, rounded (i.e. with
++ possible underflow or overflow). This also implies that x and y are
++ different objects, so that the exponent of x has not been lost. */
++ MPFR_LOG_MSG (("Internal overflow\n", 0));
++ MPFR_ASSERTD (x != y);
++ *exp = MPFR_GET_EXP (x) + 1;
++ inex2 = mpfr_set_si_2exp (y, MPFR_INT_SIGN (x), -1, rnd);
++ MPFR_LOG_MSG (("inex=%d inex2=%d\n", inex, inex2));
++ if (inex2 != 0)
++ inex = inex2;
++ MPFR_RET (inex);
++ }
++
+ *exp = MPFR_GET_EXP (y);
+- MPFR_SET_EXP (y, 0);
++ /* Do not use MPFR_SET_EXP because the range has not been checked yet. */
++ MPFR_EXP (y) = 0;
+ return mpfr_check_range (y, inex, rnd);
+ }
+diff -Naurd mpfr-3.1.3-a/src/mpfr.h mpfr-3.1.3-b/src/mpfr.h
+--- mpfr-3.1.3-a/src/mpfr.h 2015-07-17 08:54:48.616811495 +0000
++++ mpfr-3.1.3-b/src/mpfr.h 2015-07-17 08:58:21.114986979 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 3
+-#define MPFR_VERSION_STRING "3.1.3-p3"
++#define MPFR_VERSION_STRING "3.1.3-p4"
+
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.3-a/src/version.c mpfr-3.1.3-b/src/version.c
+--- mpfr-3.1.3-a/src/version.c 2015-07-17 08:54:48.616811495 +0000
++++ mpfr-3.1.3-b/src/version.c 2015-07-17 08:58:21.118986898 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+- return "3.1.3-p3";
++ return "3.1.3-p4";
+ }
+diff -Naurd mpfr-3.1.3-a/tests/tfrexp.c mpfr-3.1.3-b/tests/tfrexp.c
+--- mpfr-3.1.3-a/tests/tfrexp.c 2015-06-19 19:55:10.000000000 +0000
++++ mpfr-3.1.3-b/tests/tfrexp.c 2015-07-17 08:58:21.106987142 +0000
+@@ -129,12 +129,115 @@
+ mpfr_clear (x);
+ }
+
++static void check1 (void)
++{
++ mpfr_exp_t emin, emax, e;
++ mpfr_t x, y1, y2;
++ int r, neg, red;
++
++ emin = mpfr_get_emin ();
++ emax = mpfr_get_emax ();
++ set_emin (MPFR_EMIN_MIN);
++ set_emax (MPFR_EMAX_MAX);
++
++ mpfr_init2 (x, 7);
++ mpfr_inits2 (4, y1, y2, (mpfr_ptr) 0);
++
++ mpfr_set_ui_2exp (x, 1, -2, MPFR_RNDN);
++ while (mpfr_regular_p (x))
++ {
++ /* Test the exponents up to 3 and with the maximum exponent
++ (to check potential intermediate overflow). */
++ if (MPFR_GET_EXP (x) == 4)
++ mpfr_set_exp (x, MPFR_EMAX_MAX);
++ e = MPFR_GET_EXP (x);
++ for (neg = 0; neg < 2; neg++)
++ {
++ RND_LOOP (r)
++ {
++ int inex1, inex2;
++ mpfr_exp_t e1, e2;
++ unsigned int flags1, flags2;
++
++ for (red = 0; red < 2; red++)
++ {
++ if (red)
++ {
++ /* e1: exponent of the rounded value of x. */
++ MPFR_ASSERTN (e1 == e || e1 == e + 1);
++ set_emin (e);
++ set_emax (e);
++ mpfr_clear_flags ();
++ inex1 = e1 < 0 ?
++ mpfr_mul_2ui (y1, x, -e1, (mpfr_rnd_t) r) :
++ mpfr_div_2ui (y1, x, e1, (mpfr_rnd_t) r);
++ flags1 = __gmpfr_flags;
++ }
++ else
++ {
++ inex1 = mpfr_set (y1, x, (mpfr_rnd_t) r);
++ e1 = MPFR_IS_INF (y1) ? e + 1 : MPFR_GET_EXP (y1);
++ flags1 = inex1 != 0 ? MPFR_FLAGS_INEXACT : 0;
++ }
++ mpfr_clear_flags ();
++ inex2 = mpfr_frexp (&e2, y2, x, (mpfr_rnd_t) r);
++ flags2 = __gmpfr_flags;
++ set_emin (MPFR_EMIN_MIN);
++ set_emax (MPFR_EMAX_MAX);
++ if ((!red || e == 0) &&
++ (! mpfr_regular_p (y2) || MPFR_GET_EXP (y2) != 0))
++ {
++ printf ("Error in check1 for %s, red = %d, x = ",
++ mpfr_print_rnd_mode ((mpfr_rnd_t) r), red);
++ mpfr_dump (x);
++ printf ("Expected 1/2 <= |y| < 1, got y = ");
++ mpfr_dump (y2);
++ exit (1);
++ }
++ if (!red)
++ {
++ if (e2 > 0)
++ mpfr_mul_2ui (y2, y2, e2, MPFR_RNDN);
++ else if (e2 < 0)
++ mpfr_div_2ui (y2, y2, -e2, MPFR_RNDN);
++ }
++ if (! (SAME_SIGN (inex1, inex2) &&
++ mpfr_equal_p (y1, y2) &&
++ flags1 == flags2))
++ {
++ printf ("Error in check1 for %s, red = %d, x = ",
++ mpfr_print_rnd_mode ((mpfr_rnd_t) r), red);
++ mpfr_dump (x);
++ printf ("Expected y1 = ");
++ mpfr_dump (y1);
++ printf ("Got y2 = ");
++ mpfr_dump (y2);
++ printf ("Expected inex ~= %d, got %d\n", inex1, inex2);
++ printf ("Expected flags:");
++ flags_out (flags1);
++ printf ("Got flags: ");
++ flags_out (flags2);
++ exit (1);
++ }
++ }
++ }
++ mpfr_neg (x, x, MPFR_RNDN);
++ }
++ mpfr_nextabove (x);
++ }
++
++ mpfr_clears (x, y1, y2, (mpfr_ptr) 0);
++ set_emin (emin);
++ set_emax (emax);
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+ tests_start_mpfr ();
+
+ check_special ();
++ check1 ();
+
+ tests_end_mpfr ();
+ return 0;
diff --git a/src/patches/pcre-8.37-Fix-another-buffer-overflow.patch b/src/patches/pcre-8.37-Fix-another-buffer-overflow.patch
deleted file mode 100644
index 20ead09..0000000
--- a/src/patches/pcre-8.37-Fix-another-buffer-overflow.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From f6efcf125123199d446c5561266c3c3846ed9f30 Mon Sep 17 00:00:00 2001
-From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
-Date: Wed, 3 Jun 2015 16:51:59 +0000
-Subject: [PATCH] Fix another buffer overflow.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Ported to 8.37:
-
-commit 225f0d5eb16c7a26591a1e3f286c7476907b5a6a
-Author: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
-Date: Wed Jun 3 16:51:59 2015 +0000
-
- Fix another buffer overflow.
-
- git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1562 2f5784b3-3f2a-0410-8824-cb99058d5e15
-
-Signed-off-by: Petr Písař <ppisar(a)redhat.com>
----
- pcre_compile.c | 7 ++++++-
- testdata/testinput2 | 2 ++
- testdata/testoutput11-16 | 2 +-
- testdata/testoutput11-32 | 2 +-
- testdata/testoutput11-8 | 2 +-
- testdata/testoutput2 | 2 ++
- 6 files changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/pcre_compile.c b/pcre_compile.c
-index 8b4aaef..f5d2384 100644
---- a/pcre_compile.c
-+++ b/pcre_compile.c
-@@ -7210,7 +7210,12 @@ for (;; ptr++)
- real compile this will be picked up and the reference wrapped with
- OP_ONCE to make it atomic, so we must space in case this occurs. */
-
-- if (recno == 0) *lengthptr += 2 + 2*LINK_SIZE;
-+ /* In fact, this can happen for a non-forward reference because
-+ another group with the same number might be created later. This
-+ issue is fixed "properly" in PCRE2. As PCRE1 is now in maintenance
-+ only mode, we finesse the bug by allowing more memory always. */
-+
-+ /* if (recno == 0) */ *lengthptr += 2 + 2*LINK_SIZE;
- }
-
- /* In the real compile, search the name table. We check the name
-diff --git a/testdata/testinput2 b/testdata/testinput2
-index 5cc9ce6..e12de3a 100644
---- a/testdata/testinput2
-+++ b/testdata/testinput2
-@@ -4156,4 +4156,6 @@ backtracking verbs. --/
-
- /(?=di(?<=(?1))|(?=(.))))/
-
-+"(?J:(?|(?'R')(\k'R')|((?'R'))))"
-+
- /-- End of testinput2 --/
-diff --git a/testdata/testoutput11-16 b/testdata/testoutput11-16
-index 422f2ad..e222e7c 100644
---- a/testdata/testoutput11-16
-+++ b/testdata/testoutput11-16
-@@ -231,7 +231,7 @@ Memory allocation (code space): 73
- ------------------------------------------------------------------
-
- /(?P<a>a)...(?P=a)bbb(?P>a)d/BM
--Memory allocation (code space): 61
-+Memory allocation (code space): 77
- ------------------------------------------------------------------
- 0 24 Bra
- 2 5 CBra 1
-diff --git a/testdata/testoutput11-32 b/testdata/testoutput11-32
-index d953ec8..9a80ec9 100644
---- a/testdata/testoutput11-32
-+++ b/testdata/testoutput11-32
-@@ -231,7 +231,7 @@ Memory allocation (code space): 155
- ------------------------------------------------------------------
-
- /(?P<a>a)...(?P=a)bbb(?P>a)d/BM
--Memory allocation (code space): 125
-+Memory allocation (code space): 157
- ------------------------------------------------------------------
- 0 24 Bra
- 2 5 CBra 1
-diff --git a/testdata/testoutput11-8 b/testdata/testoutput11-8
-index 6ec18ec..3adaca2 100644
---- a/testdata/testoutput11-8
-+++ b/testdata/testoutput11-8
-@@ -231,7 +231,7 @@ Memory allocation (code space): 45
- ------------------------------------------------------------------
-
- /(?P<a>a)...(?P=a)bbb(?P>a)d/BM
--Memory allocation (code space): 38
-+Memory allocation (code space): 50
- ------------------------------------------------------------------
- 0 30 Bra
- 3 7 CBra 1
-diff --git a/testdata/testoutput2 b/testdata/testoutput2
-index 4decb8d..5bad26c 100644
---- a/testdata/testoutput2
-+++ b/testdata/testoutput2
-@@ -14428,4 +14428,6 @@ Failed: lookbehind assertion is not fixed length at offset 17
- /(?=di(?<=(?1))|(?=(.))))/
- Failed: unmatched parentheses at offset 23
-
-+"(?J:(?|(?'R')(\k'R')|((?'R'))))"
-+
- /-- End of testinput2 --/
---
-2.4.3
-
diff --git a/src/patches/pcre-8.37-Fix-buffer-overflow-for-forward-reference-within-bac.patch b/src/patches/pcre-8.37-Fix-buffer-overflow-for-forward-reference-within-bac.patch
deleted file mode 100644
index 16fd45c..0000000
--- a/src/patches/pcre-8.37-Fix-buffer-overflow-for-forward-reference-within-bac.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 354e1f8e921dcb9cf2f3a5eac93cd826d01a7d8a Mon Sep 17 00:00:00 2001
-From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
-Date: Tue, 23 Jun 2015 16:34:53 +0000
-Subject: [PATCH] Fix buffer overflow for forward reference within backward
- assertion with excess closing parenthesis. Bugzilla 1651.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This is upstream commit ported to 8.37:
-
-commit 764692f9aea9eab50fdba6cb537441d8b34c6c37
-Author: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
-Date: Tue Jun 23 16:34:53 2015 +0000
-
- Fix buffer overflow for forward reference within backward assertion with excess
- closing parenthesis. Bugzilla 1651.
-
- git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1571 2f5784b3-3f2a-0410-8824-cb99058d5e15
-
-It fixes CVE-2015-5073.
-
-Signed-off-by: Petr Písař <ppisar(a)redhat.com>
----
- pcre_compile.c | 2 +-
- testdata/testinput2 | 2 ++
- testdata/testoutput2 | 3 +++
- 3 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/pcre_compile.c b/pcre_compile.c
-index 6f06912..b66b1f6 100644
---- a/pcre_compile.c
-+++ b/pcre_compile.c
-@@ -9392,7 +9392,7 @@ OP_RECURSE that are not fixed length get a diagnosic with a useful offset. The
- exceptional ones forgo this. We scan the pattern to check that they are fixed
- length, and set their lengths. */
-
--if (cd->check_lookbehind)
-+if (errorcode == 0 && cd->check_lookbehind)
- {
- pcre_uchar *cc = (pcre_uchar *)codestart;
-
-diff --git a/testdata/testinput2 b/testdata/testinput2
-index 83bb471..5cc9ce6 100644
---- a/testdata/testinput2
-+++ b/testdata/testinput2
-@@ -4154,4 +4154,6 @@ backtracking verbs. --/
-
- "(?J)(?'d'(?'d'\g{d}))"
-
-+/(?=di(?<=(?1))|(?=(.))))/
-+
- /-- End of testinput2 --/
-diff --git a/testdata/testoutput2 b/testdata/testoutput2
-index 7dff52a..4decb8d 100644
---- a/testdata/testoutput2
-+++ b/testdata/testoutput2
-@@ -14425,4 +14425,7 @@ Failed: lookbehind assertion is not fixed length at offset 17
-
- "(?J)(?'d'(?'d'\g{d}))"
-
-+/(?=di(?<=(?1))|(?=(.))))/
-+Failed: unmatched parentheses at offset 23
-+
- /-- End of testinput2 --/
---
-2.4.3
-
diff --git a/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-recursive-back-referen.patch b/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-recursive-back-referen.patch
deleted file mode 100644
index c97849f..0000000
--- a/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-recursive-back-referen.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 68ff1beb43bb3d4d8838f3285c97023d1e50513a Mon Sep 17 00:00:00 2001
-From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
-Date: Fri, 15 May 2015 17:17:03 +0000
-Subject: [PATCH] Fix buffer overflow for named recursive back reference when
- the name is duplicated.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream commit ported to pcre-8.37:
-
-commit 4b79af6b4cbeb5326ae5e4d83f3e935e00286c19
-Author: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
-Date: Fri May 15 17:17:03 2015 +0000
-
- Fix buffer overflow for named recursive back reference when the name is
- duplicated.
-
- git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1558 2f5784b3-3f2a-0410-8824-cb99058d5e15
-
-This fixes CVE-2015-3210.
-
-Signed-off-by: Petr Písař <ppisar(a)redhat.com>
----
- pcre_compile.c | 16 ++++++++++++++--
- testdata/testinput2 | 2 ++
- testdata/testoutput2 | 2 ++
- 3 files changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/pcre_compile.c b/pcre_compile.c
-index 0efad26..6f06912 100644
---- a/pcre_compile.c
-+++ b/pcre_compile.c
-@@ -7173,14 +7173,26 @@ for (;; ptr++)
- number. If the name is not found, set the value to 0 for a forward
- reference. */
-
-+ recno = 0;
- ng = cd->named_groups;
- for (i = 0; i < cd->names_found; i++, ng++)
- {
- if (namelen == ng->length &&
- STRNCMP_UC_UC(name, ng->name, namelen) == 0)
-- break;
-+ {
-+ open_capitem *oc;
-+ recno = ng->number;
-+ if (is_recurse) break;
-+ for (oc = cd->open_caps; oc != NULL; oc = oc->next)
-+ {
-+ if (oc->number == recno)
-+ {
-+ oc->flag = TRUE;
-+ break;
-+ }
-+ }
-+ }
- }
-- recno = (i < cd->names_found)? ng->number : 0;
-
- /* Count named back references. */
-
-diff --git a/testdata/testinput2 b/testdata/testinput2
-index 58fe53b..83bb471 100644
---- a/testdata/testinput2
-+++ b/testdata/testinput2
-@@ -4152,4 +4152,6 @@ backtracking verbs. --/
-
- /((?2){73}(?2))((?1))/
-
-+"(?J)(?'d'(?'d'\g{d}))"
-+
- /-- End of testinput2 --/
-diff --git a/testdata/testoutput2 b/testdata/testoutput2
-index b718df0..7dff52a 100644
---- a/testdata/testoutput2
-+++ b/testdata/testoutput2
-@@ -14423,4 +14423,6 @@ Failed: lookbehind assertion is not fixed length at offset 17
-
- /((?2){73}(?2))((?1))/
-
-+"(?J)(?'d'(?'d'\g{d}))"
-+
- /-- End of testinput2 --/
---
-2.4.3
-
diff --git a/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-references-in-situatio.patch b/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-references-in-situatio.patch
deleted file mode 100644
index ab1b962..0000000
--- a/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-references-in-situatio.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From b3f0b0dd971314df8f865e221aa1a88e75d6d1a6 Mon Sep 17 00:00:00 2001
-From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
-Date: Wed, 5 Aug 2015 15:38:32 +0000
-Subject: [PATCH] Fix buffer overflow for named references in (?| situations.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Ported for 8.37:
-
-commit 7af8e8717def179fd7b69e173abd347c1a3547cb
-Author: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
-Date: Wed Aug 5 15:38:32 2015 +0000
-
- Fix buffer overflow for named references in (?| situations.
-
- git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1585 2f5784b3-3f2a-0410-8824-cb99058d5e15
-
-Signed-off-by: Petr Písař <ppisar(a)redhat.com>
----
- pcre_compile.c | 74 ++++++++++++++++++++++++++++++----------------------
- pcre_internal.h | 1 +
- testdata/testinput2 | 2 ++
- testdata/testoutput2 | 2 ++
- 4 files changed, 48 insertions(+), 31 deletions(-)
-
-diff --git a/pcre_compile.c b/pcre_compile.c
-index f5d2384..5fe5c1d 100644
---- a/pcre_compile.c
-+++ b/pcre_compile.c
-@@ -6641,6 +6641,7 @@ for (;; ptr++)
- /* ------------------------------------------------------------ */
- case CHAR_VERTICAL_LINE: /* Reset capture count for each branch */
- reset_bracount = TRUE;
-+ cd->dupgroups = TRUE; /* Record (?| encountered */
- /* Fall through */
-
- /* ------------------------------------------------------------ */
-@@ -7151,7 +7152,8 @@ for (;; ptr++)
- if (lengthptr != NULL)
- {
- named_group *ng;
--
-+ recno = 0;
-+
- if (namelen == 0)
- {
- *errorcodeptr = ERR62;
-@@ -7168,32 +7170,6 @@ for (;; ptr++)
- goto FAILED;
- }
-
-- /* The name table does not exist in the first pass; instead we must
-- scan the list of names encountered so far in order to get the
-- number. If the name is not found, set the value to 0 for a forward
-- reference. */
--
-- recno = 0;
-- ng = cd->named_groups;
-- for (i = 0; i < cd->names_found; i++, ng++)
-- {
-- if (namelen == ng->length &&
-- STRNCMP_UC_UC(name, ng->name, namelen) == 0)
-- {
-- open_capitem *oc;
-- recno = ng->number;
-- if (is_recurse) break;
-- for (oc = cd->open_caps; oc != NULL; oc = oc->next)
-- {
-- if (oc->number == recno)
-- {
-- oc->flag = TRUE;
-- break;
-- }
-- }
-- }
-- }
--
- /* Count named back references. */
-
- if (!is_recurse) cd->namedrefcount++;
-@@ -7215,7 +7191,44 @@ for (;; ptr++)
- issue is fixed "properly" in PCRE2. As PCRE1 is now in maintenance
- only mode, we finesse the bug by allowing more memory always. */
-
-- /* if (recno == 0) */ *lengthptr += 2 + 2*LINK_SIZE;
-+ *lengthptr += 2 + 2*LINK_SIZE;
-+
-+ /* It is even worse than that. The current reference may be to an
-+ existing named group with a different number (so apparently not
-+ recursive) but which later on is also attached to a group with the
-+ current number. This can only happen if $(| has been previous
-+ encountered. In that case, we allow yet more memory, just in case.
-+ (Again, this is fixed "properly" in PCRE2. */
-+
-+ if (cd->dupgroups) *lengthptr += 2 + 2*LINK_SIZE;
-+
-+ /* Otherwise, check for recursion here. The name table does not exist
-+ in the first pass; instead we must scan the list of names encountered
-+ so far in order to get the number. If the name is not found, leave
-+ the value of recno as 0 for a forward reference. */
-+
-+ else
-+ {
-+ ng = cd->named_groups;
-+ for (i = 0; i < cd->names_found; i++, ng++)
-+ {
-+ if (namelen == ng->length &&
-+ STRNCMP_UC_UC(name, ng->name, namelen) == 0)
-+ {
-+ open_capitem *oc;
-+ recno = ng->number;
-+ if (is_recurse) break;
-+ for (oc = cd->open_caps; oc != NULL; oc = oc->next)
-+ {
-+ if (oc->number == recno)
-+ {
-+ oc->flag = TRUE;
-+ break;
-+ }
-+ }
-+ }
-+ }
-+ }
- }
-
- /* In the real compile, search the name table. We check the name
-@@ -7262,8 +7275,6 @@ for (;; ptr++)
- for (i++; i < cd->names_found; i++)
- {
- if (STRCMP_UC_UC(slot + IMM2_SIZE, cslot + IMM2_SIZE) != 0) break;
--
--
- count++;
- cslot += cd->name_entry_size;
- }
-@@ -9189,6 +9200,7 @@ cd->names_found = 0;
- cd->name_entry_size = 0;
- cd->name_table = NULL;
- cd->dupnames = FALSE;
-+cd->dupgroups = FALSE;
- cd->namedrefcount = 0;
- cd->start_code = cworkspace;
- cd->hwm = cworkspace;
-@@ -9223,7 +9235,7 @@ if (errorcode != 0) goto PCRE_EARLY_ERROR_RETURN;
-
- DPRINTF(("end pre-compile: length=%d workspace=%d\n", length,
- (int)(cd->hwm - cworkspace)));
--
-+
- if (length > MAX_PATTERN_SIZE)
- {
- errorcode = ERR20;
-diff --git a/pcre_internal.h b/pcre_internal.h
-index dd0ac7f..7ca6020 100644
---- a/pcre_internal.h
-+++ b/pcre_internal.h
-@@ -2446,6 +2446,7 @@ typedef struct compile_data {
- BOOL had_pruneorskip; /* (*PRUNE) or (*SKIP) encountered */
- BOOL check_lookbehind; /* Lookbehinds need later checking */
- BOOL dupnames; /* Duplicate names exist */
-+ BOOL dupgroups; /* Duplicate groups exist: (?| found */
- BOOL iscondassert; /* Next assert is a condition */
- int nltype; /* Newline type */
- int nllen; /* Newline string length */
-diff --git a/testdata/testinput2 b/testdata/testinput2
-index e12de3a..8e044f8 100644
---- a/testdata/testinput2
-+++ b/testdata/testinput2
-@@ -4158,4 +4158,6 @@ backtracking verbs. --/
-
- "(?J:(?|(?'R')(\k'R')|((?'R'))))"
-
-+/(?J:(?|(:(?|(?'R')(\k'R')|((?'R')))H'Rk'Rf)|s(?'R')))/
-+
- /-- End of testinput2 --/
-diff --git a/testdata/testoutput2 b/testdata/testoutput2
-index 5bad26c..6019425 100644
---- a/testdata/testoutput2
-+++ b/testdata/testoutput2
-@@ -14430,4 +14430,6 @@ Failed: unmatched parentheses at offset 23
-
- "(?J:(?|(?'R')(\k'R')|((?'R'))))"
-
-+/(?J:(?|(:(?|(?'R')(\k'R')|((?'R')))H'Rk'Rf)|s(?'R')))/
-+
- /-- End of testinput2 --/
---
-2.4.3
-
diff --git a/src/patches/pcre-8.37-Fix-named-forward-reference-to-duplicate-group-numbe.patch b/src/patches/pcre-8.37-Fix-named-forward-reference-to-duplicate-group-numbe.patch
deleted file mode 100644
index 837e86f..0000000
--- a/src/patches/pcre-8.37-Fix-named-forward-reference-to-duplicate-group-numbe.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 83ed574998fe7b844b98ab7cd56291068feb9e31 Mon Sep 17 00:00:00 2001
-From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
-Date: Sat, 16 May 2015 11:05:40 +0000
-Subject: [PATCH] Fix named forward reference to duplicate group number
- overflow bug.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Port to 8.37:
-
-commit 2fa78aa4e42bcebf2d616c4ee89c012f29dc3447
-Author: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
-Date: Sat May 16 11:05:40 2015 +0000
-
- Fix named forward reference to duplicate group number overflow bug.
-
- git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1559 2f5784b3-3f2a-0410-8824-cb99058d5e15
-
-Signed-off-by: Petr Písař <ppisar(a)redhat.com>
----
- pcre_compile.c | 24 ++++++++++++++++--------
- testdata/testinput1 | 3 +++
- testdata/testoutput1 | 5 +++++
- 3 files changed, 24 insertions(+), 8 deletions(-)
-
-diff --git a/pcre_compile.c b/pcre_compile.c
-index b66b1f6..8b4aaef 100644
---- a/pcre_compile.c
-+++ b/pcre_compile.c
-@@ -7183,15 +7183,15 @@ for (;; ptr++)
- open_capitem *oc;
- recno = ng->number;
- if (is_recurse) break;
-- for (oc = cd->open_caps; oc != NULL; oc = oc->next)
-- {
-- if (oc->number == recno)
-- {
-- oc->flag = TRUE;
-+ for (oc = cd->open_caps; oc != NULL; oc = oc->next)
-+ {
-+ if (oc->number == recno)
-+ {
-+ oc->flag = TRUE;
- break;
-- }
-- }
-- }
-+ }
-+ }
-+ }
- }
-
- /* Count named back references. */
-@@ -7203,6 +7203,14 @@ for (;; ptr++)
- 16-bit data item. */
-
- *lengthptr += IMM2_SIZE;
-+
-+ /* If this is a forward reference and we are within a (?|...) group,
-+ the reference may end up as the number of a group which we are
-+ currently inside, that is, it could be a recursive reference. In the
-+ real compile this will be picked up and the reference wrapped with
-+ OP_ONCE to make it atomic, so we must space in case this occurs. */
-+
-+ if (recno == 0) *lengthptr += 2 + 2*LINK_SIZE;
- }
-
- /* In the real compile, search the name table. We check the name
-diff --git a/testdata/testinput1 b/testdata/testinput1
-index 73c2f4d..8379ce0 100644
---- a/testdata/testinput1
-+++ b/testdata/testinput1
-@@ -5730,4 +5730,7 @@ AbcdCBefgBhiBqz
- "(?1)(?#?'){8}(a)"
- baaaaaaaaac
-
-+"(?|(\k'Pm')|(?'Pm'))"
-+ abcd
-+
- /-- End of testinput1 --/
-diff --git a/testdata/testoutput1 b/testdata/testoutput1
-index 0a53fd0..e852ab9 100644
---- a/testdata/testoutput1
-+++ b/testdata/testoutput1
-@@ -9429,4 +9429,9 @@ No match
- 0: aaaaaaaaa
- 1: a
-
-+"(?|(\k'Pm')|(?'Pm'))"
-+ abcd
-+ 0:
-+ 1:
-+
- /-- End of testinput1 --/
---
-2.4.3
-
diff --git a/src/patches/pcre-8.38-upstream_fixes-1.patch b/src/patches/pcre-8.38-upstream_fixes-1.patch
new file mode 100644
index 0000000..d366e22
--- /dev/null
+++ b/src/patches/pcre-8.38-upstream_fixes-1.patch
@@ -0,0 +1,1408 @@
+Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
+Date: 2016-03-16
+Initial Package Version: 8.38
+Upstream Status: Applied
+Origin: Upstream, backported to 8.38 by Petr Písař at redhat
+Description: Various fixes, including for CVE-2016-1263 and many other
+bugs which have been fixed upstream. Many of these bugs were found by
+fuzzing, upstream is trying to persuade its users to move to pcre2 and
+giving low priority to further pcre1 maintenance releases.
+
+From 3c80e02cd464ea049e117b423fd48fab294c51a9 Mon Sep 17 00:00:00 2001
+From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
+Date: Thu, 26 Nov 2015 20:29:13 +0000
+Subject: [PATCH] Fix auto-callout (?# comment bug.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1611 2f5784b3-3f2a-0410-8824-cb99058d5e15
+
+Petr Pisar: Ported to 8.38.
+
+diff --git a/pcre_compile.c b/pcre_compile.c
+index 4d3b313..3360a8b 100644
+--- a/pcre_compile.c
++++ b/pcre_compile.c
+@@ -4699,6 +4699,23 @@ for (;; ptr++)
+ }
+ }
+
++ /* Skip over (?# comments. We need to do this here because we want to know if
++ the next thing is a quantifier, and these comments may come between an item
++ and its quantifier. */
++
++ if (c == CHAR_LEFT_PARENTHESIS && ptr[1] == CHAR_QUESTION_MARK &&
++ ptr[2] == CHAR_NUMBER_SIGN)
++ {
++ ptr += 3;
++ while (*ptr != CHAR_NULL && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
++ if (*ptr == CHAR_NULL)
++ {
++ *errorcodeptr = ERR18;
++ goto FAILED;
++ }
++ continue;
++ }
++
+ /* See if the next thing is a quantifier. */
+
+ is_quantifier =
+@@ -6529,21 +6546,6 @@ for (;; ptr++)
+ case CHAR_LEFT_PARENTHESIS:
+ ptr++;
+
+- /* First deal with comments. Putting this code right at the start ensures
+- that comments have no bad side effects. */
+-
+- if (ptr[0] == CHAR_QUESTION_MARK && ptr[1] == CHAR_NUMBER_SIGN)
+- {
+- ptr += 2;
+- while (*ptr != CHAR_NULL && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
+- if (*ptr == CHAR_NULL)
+- {
+- *errorcodeptr = ERR18;
+- goto FAILED;
+- }
+- continue;
+- }
+-
+ /* Now deal with various "verbs" that can be introduced by '*'. */
+
+ if (ptr[0] == CHAR_ASTERISK && (ptr[1] == ':'
+diff --git a/testdata/testinput2 b/testdata/testinput2
+index e2e520f..92e3359 100644
+--- a/testdata/testinput2
++++ b/testdata/testinput2
+@@ -4217,4 +4217,12 @@ backtracking verbs. --/
+
+ /a[[:punct:]b]/BZ
+
++/L(?#(|++<!(2)?/BZ
++
++/L(?#(|++<!(2)?/BOZ
++
++/L(?#(|++<!(2)?/BCZ
++
++/L(?#(|++<!(2)?/BCOZ
++
+ /-- End of testinput2 --/
+diff --git a/testdata/testinput7 b/testdata/testinput7
+index e411a4b..00b9738 100644
+--- a/testdata/testinput7
++++ b/testdata/testinput7
+@@ -853,4 +853,8 @@ of case for anything other than the ASCII letters. --/
+
+ /a[b[:punct:]]/8WBZ
+
++/L(?#(|++<!(2)?/B8COZ
++
++/L(?#(|++<!(2)?/B8WCZ
++
+ /-- End of testinput7 --/
+diff --git a/testdata/testoutput2 b/testdata/testoutput2
+index 85c565d..2cf7a90 100644
+--- a/testdata/testoutput2
++++ b/testdata/testoutput2
+@@ -14574,4 +14574,40 @@ No match
+ End
+ ------------------------------------------------------------------
+
++/L(?#(|++<!(2)?/BZ
++------------------------------------------------------------------
++ Bra
++ L?+
++ Ket
++ End
++------------------------------------------------------------------
++
++/L(?#(|++<!(2)?/BOZ
++------------------------------------------------------------------
++ Bra
++ L?
++ Ket
++ End
++------------------------------------------------------------------
++
++/L(?#(|++<!(2)?/BCZ
++------------------------------------------------------------------
++ Bra
++ Callout 255 0 14
++ L?+
++ Callout 255 14 0
++ Ket
++ End
++------------------------------------------------------------------
++
++/L(?#(|++<!(2)?/BCOZ
++------------------------------------------------------------------
++ Bra
++ Callout 255 0 14
++ L?
++ Callout 255 14 0
++ Ket
++ End
++------------------------------------------------------------------
++
+ /-- End of testinput2 --/
+diff --git a/testdata/testoutput7 b/testdata/testoutput7
+index cc9ebdd..fdfff64 100644
+--- a/testdata/testoutput7
++++ b/testdata/testoutput7
+@@ -2348,4 +2348,24 @@ No match
+ End
+ ------------------------------------------------------------------
+
++/L(?#(|++<!(2)?/B8COZ
++------------------------------------------------------------------
++ Bra
++ Callout 255 0 14
++ L?
++ Callout 255 14 0
++ Ket
++ End
++------------------------------------------------------------------
++
++/L(?#(|++<!(2)?/B8WCZ
++------------------------------------------------------------------
++ Bra
++ Callout 255 0 14
++ L?+
++ Callout 255 14 0
++ Ket
++ End
++------------------------------------------------------------------
++
+ /-- End of testinput7 --/
+--
+2.4.3
+
+From ef6b10fcde41a2687f38d4a9ff2886b037948a1b Mon Sep 17 00:00:00 2001
+From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
+Date: Fri, 27 Nov 2015 17:13:13 +0000
+Subject: [PATCH 1/5] Fix negated POSIX class within negated overall class UCP
+ bug.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1612 2f5784b3-3f2a-0410-8824-cb99058d5e15
+
+Petr Písař: Ported to 8.38.
+diff --git a/pcre_compile.c b/pcre_compile.c
+index 3360a8b..3670f1e 100644
+--- a/pcre_compile.c
++++ b/pcre_compile.c
+@@ -5063,20 +5063,22 @@ for (;; ptr++)
+ ptr = tempptr + 1;
+ continue;
+
+- /* For the other POSIX classes (ascii, xdigit) we are going to fall
+- through to the non-UCP case and build a bit map for characters with
+- code points less than 256. If we are in a negated POSIX class
+- within a non-negated overall class, characters with code points
+- greater than 255 must all match. In the special case where we have
+- not yet generated any xclass data, and this is the final item in
+- the overall class, we need do nothing: later on, the opcode
++ /* For the other POSIX classes (ascii, cntrl, xdigit) we are going
++ to fall through to the non-UCP case and build a bit map for
++ characters with code points less than 256. If we are in a negated
++ POSIX class, characters with code points greater than 255 must
++ either all match or all not match. In the special case where we
++ have not yet generated any xclass data, and this is the final item
++ in the overall class, we need do nothing: later on, the opcode
+ OP_NCLASS will be used to indicate that characters greater than 255
+ are acceptable. If we have already seen an xclass item or one may
+ follow (we have to assume that it might if this is not the end of
+- the class), explicitly match all wide codepoints. */
++ the class), explicitly list all wide codepoints, which will then
++ either not match or match, depending on whether the class is or is
++ not negated. */
+
+ default:
+- if (!negate_class && local_negate &&
++ if (local_negate &&
+ (xclass || tempptr[2] != CHAR_RIGHT_SQUARE_BRACKET))
+ {
+ *class_uchardata++ = XCL_RANGE;
+diff --git a/testdata/testinput6 b/testdata/testinput6
+index aeb62a0..a178d3d 100644
+--- a/testdata/testinput6
++++ b/testdata/testinput6
+@@ -1553,4 +1553,13 @@
+ \x{200}
+ \x{37e}
+
++/[^[:^ascii:]\d]/8W
++ a
++ ~
++ 0
++ \a
++ \x{7f}
++ \x{389}
++ \x{20ac}
++
+ /-- End of testinput6 --/
+diff --git a/testdata/testoutput6 b/testdata/testoutput6
+index beb85aa..b64dc0d 100644
+--- a/testdata/testoutput6
++++ b/testdata/testoutput6
+@@ -2557,4 +2557,20 @@ No match
+ \x{37e}
+ 0: \x{37e}
+
++/[^[:^ascii:]\d]/8W
++ a
++ 0: a
++ ~
++ 0: ~
++ 0
++No match
++ \a
++ 0: \x{07}
++ \x{7f}
++ 0: \x{7f}
++ \x{389}
++No match
++ \x{20ac}
++No match
++
+ /-- End of testinput6 --/
+--
+2.4.3
+
+From bfc1dfa660c24dc7a75108d934290e50d7db2719 Mon Sep 17 00:00:00 2001
+From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
+Date: Fri, 27 Nov 2015 17:41:04 +0000
+Subject: [PATCH 2/5] Fix bug for isolated \E between an item and its qualifier
+ when auto callout is set.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1613 2f5784b3-3f2a-0410-8824-cb99058d5e15
+
+Petr Písař: Ported to 8.38.
+
+diff --git a/pcre_compile.c b/pcre_compile.c
+index 3670f1e..5786cd3 100644
+--- a/pcre_compile.c
++++ b/pcre_compile.c
+@@ -4645,9 +4645,10 @@ for (;; ptr++)
+ goto FAILED;
+ }
+
+- /* If in \Q...\E, check for the end; if not, we have a literal */
++ /* If in \Q...\E, check for the end; if not, we have a literal. Otherwise an
++ isolated \E is ignored. */
+
+- if (inescq && c != CHAR_NULL)
++ if (c != CHAR_NULL)
+ {
+ if (c == CHAR_BACKSLASH && ptr[1] == CHAR_E)
+ {
+@@ -4655,7 +4656,7 @@ for (;; ptr++)
+ ptr++;
+ continue;
+ }
+- else
++ else if (inescq)
+ {
+ if (previous_callout != NULL)
+ {
+@@ -4670,7 +4671,6 @@ for (;; ptr++)
+ }
+ goto NORMAL_CHAR;
+ }
+- /* Control does not reach here. */
+ }
+
+ /* In extended mode, skip white space and comments. We need a loop in order
+diff --git a/testdata/testinput2 b/testdata/testinput2
+index 92e3359..e8ca4fe 100644
+--- a/testdata/testinput2
++++ b/testdata/testinput2
+@@ -4225,4 +4225,6 @@ backtracking verbs. --/
+
+ /L(?#(|++<!(2)?/BCOZ
+
++/(A*)\E+/CBZ
++
+ /-- End of testinput2 --/
+diff --git a/testdata/testoutput2 b/testdata/testoutput2
+index 2cf7a90..09756b8 100644
+--- a/testdata/testoutput2
++++ b/testdata/testoutput2
+@@ -14610,4 +14610,18 @@ No match
+ End
+ ------------------------------------------------------------------
+
++/(A*)\E+/CBZ
++------------------------------------------------------------------
++ Bra
++ Callout 255 0 7
++ SCBra 1
++ Callout 255 1 2
++ A*
++ Callout 255 3 0
++ KetRmax
++ Callout 255 7 0
++ Ket
++ End
++------------------------------------------------------------------
++
+ /-- End of testinput2 --/
+--
+2.4.3
+
+From 108377b836fc29a84f5286287629d96549b1c777 Mon Sep 17 00:00:00 2001
+From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
+Date: Sun, 29 Nov 2015 17:38:25 +0000
+Subject: [PATCH 3/5] Give error for regexec with pmatch=NULL and REG_STARTEND
+ set.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1614 2f5784b3-3f2a-0410-8824-cb99058d5e15
+
+Petr Písař: Ported to 8.38.
+
+diff --git a/pcreposix.c b/pcreposix.c
+index f024423..dcc13ef 100644
+--- a/pcreposix.c
++++ b/pcreposix.c
+@@ -364,6 +364,7 @@ start location rather than being passed as a PCRE "starting offset". */
+
+ if ((eflags & REG_STARTEND) != 0)
+ {
++ if (pmatch == NULL) return REG_INVARG;
+ so = pmatch[0].rm_so;
+ eo = pmatch[0].rm_eo;
+ }
+--
+2.4.3
+
+From e347b40d5bb12f7ef1e632aa649571a107be7d8a Mon Sep 17 00:00:00 2001
+From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
+Date: Sun, 29 Nov 2015 17:46:23 +0000
+Subject: [PATCH 4/5] Allow for up to 32-bit numbers in the ordin() function in
+ pcregrep.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1615 2f5784b3-3f2a-0410-8824-cb99058d5e15
+
+Petr Písař: Ported to 8.38.
+
+diff --git a/pcregrep.c b/pcregrep.c
+index 64986b0..cd53c64 100644
+--- a/pcregrep.c
++++ b/pcregrep.c
+@@ -2437,7 +2437,7 @@ return options;
+ static char *
+ ordin(int n)
+ {
+-static char buffer[8];
++static char buffer[14];
+ char *p = buffer;
+ sprintf(p, "%d", n);
+ while (*p != 0) p++;
+--
+2.4.3
+
+From e78ad4264b16988b826bd2939a1781c1165a92d9 Mon Sep 17 00:00:00 2001
+From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
+Date: Mon, 30 Nov 2015 17:44:45 +0000
+Subject: [PATCH 5/5] Fix \Q\E before qualifier bug when auto callouts are
+ enabled.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1616 2f5784b3-3f2a-0410-8824-cb99058d5e15
+
+Petr Písař: Ported to 8.38.
+
+diff --git a/pcre_compile.c b/pcre_compile.c
+index 5786cd3..beed46b 100644
+--- a/pcre_compile.c
++++ b/pcre_compile.c
+@@ -4671,17 +4671,27 @@ for (;; ptr++)
+ }
+ goto NORMAL_CHAR;
+ }
++
++ /* Check for the start of a \Q...\E sequence. We must do this here rather
++ than later in case it is immediately followed by \E, which turns it into a
++ "do nothing" sequence. */
++
++ if (c == CHAR_BACKSLASH && ptr[1] == CHAR_Q)
++ {
++ inescq = TRUE;
++ ptr++;
++ continue;
++ }
+ }
+
+- /* In extended mode, skip white space and comments. We need a loop in order
+- to check for more white space and more comments after a comment. */
++ /* In extended mode, skip white space and comments. */
+
+ if ((options & PCRE_EXTENDED) != 0)
+ {
+- for (;;)
++ const pcre_uchar *wscptr = ptr;
++ while (MAX_255(c) && (cd->ctypes[c] & ctype_space) != 0) c = *(++ptr);
++ if (c == CHAR_NUMBER_SIGN)
+ {
+- while (MAX_255(c) && (cd->ctypes[c] & ctype_space) != 0) c = *(++ptr);
+- if (c != CHAR_NUMBER_SIGN) break;
+ ptr++;
+ while (*ptr != CHAR_NULL)
+ {
+@@ -4695,7 +4705,15 @@ for (;; ptr++)
+ if (utf) FORWARDCHAR(ptr);
+ #endif
+ }
+- c = *ptr; /* Either NULL or the char after a newline */
++ }
++
++ /* If we skipped any characters, restart the loop. Otherwise, we didn't see
++ a comment. */
++
++ if (ptr > wscptr)
++ {
++ ptr--;
++ continue;
+ }
+ }
+
+@@ -7900,16 +7918,6 @@ for (;; ptr++)
+ c = ec;
+ else
+ {
+- if (escape == ESC_Q) /* Handle start of quoted string */
+- {
+- if (ptr[1] == CHAR_BACKSLASH && ptr[2] == CHAR_E)
+- ptr += 2; /* avoid empty string */
+- else inescq = TRUE;
+- continue;
+- }
+-
+- if (escape == ESC_E) continue; /* Perl ignores an orphan \E */
+-
+ /* For metasequences that actually match a character, we disable the
+ setting of a first character if it hasn't already been set. */
+
+diff --git a/testdata/testinput2 b/testdata/testinput2
+index e8ca4fe..3a1134f 100644
+--- a/testdata/testinput2
++++ b/testdata/testinput2
+@@ -4227,4 +4227,6 @@ backtracking verbs. --/
+
+ /(A*)\E+/CBZ
+
++/()\Q\E*]/BCZ
++
+ /-- End of testinput2 --/
+diff --git a/testdata/testoutput2 b/testdata/testoutput2
+index 09756b8..ac33cc4 100644
+--- a/testdata/testoutput2
++++ b/testdata/testoutput2
+@@ -14624,4 +14624,19 @@ No match
+ End
+ ------------------------------------------------------------------
+
++/()\Q\E*]/BCZ
++------------------------------------------------------------------
++ Bra
++ Callout 255 0 7
++ Brazero
++ SCBra 1
++ Callout 255 1 0
++ KetRmax
++ Callout 255 7 1
++ ]
++ Callout 255 8 0
++ Ket
++ End
++------------------------------------------------------------------
++
+ /-- End of testinput2 --/
+--
+2.4.3
+
+From 46ed1a703b067e5b679eacf6500a54dae35f8130 Mon Sep 17 00:00:00 2001
+From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
+Date: Thu, 3 Dec 2015 17:05:40 +0000
+Subject: [PATCH] Fix /x bug when pattern starts with white space and (?-x)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1617 2f5784b3-3f2a-0410-8824-cb99058d5e15
+
+Petr Písař: Ported to 8.38.
+
+diff --git a/pcre_compile.c b/pcre_compile.c
+index beed46b..57719b9 100644
+--- a/pcre_compile.c
++++ b/pcre_compile.c
+@@ -7607,39 +7607,15 @@ for (;; ptr++)
+ newoptions = (options | set) & (~unset);
+
+ /* If the options ended with ')' this is not the start of a nested
+- group with option changes, so the options change at this level. If this
+- item is right at the start of the pattern, the options can be
+- abstracted and made external in the pre-compile phase, and ignored in
+- the compile phase. This can be helpful when matching -- for instance in
+- caseless checking of required bytes.
+-
+- If the code pointer is not (cd->start_code + 1 + LINK_SIZE), we are
+- definitely *not* at the start of the pattern because something has been
+- compiled. In the pre-compile phase, however, the code pointer can have
+- that value after the start, because it gets reset as code is discarded
+- during the pre-compile. However, this can happen only at top level - if
+- we are within parentheses, the starting BRA will still be present. At
+- any parenthesis level, the length value can be used to test if anything
+- has been compiled at that level. Thus, a test for both these conditions
+- is necessary to ensure we correctly detect the start of the pattern in
+- both phases.
+-
++ group with option changes, so the options change at this level.
+ If we are not at the pattern start, reset the greedy defaults and the
+ case value for firstchar and reqchar. */
+
+ if (*ptr == CHAR_RIGHT_PARENTHESIS)
+ {
+- if (code == cd->start_code + 1 + LINK_SIZE &&
+- (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE))
+- {
+- cd->external_options = newoptions;
+- }
+- else
+- {
+- greedy_default = ((newoptions & PCRE_UNGREEDY) != 0);
+- greedy_non_default = greedy_default ^ 1;
+- req_caseopt = ((newoptions & PCRE_CASELESS) != 0)? REQ_CASELESS:0;
+- }
++ greedy_default = ((newoptions & PCRE_UNGREEDY) != 0);
++ greedy_non_default = greedy_default ^ 1;
++ req_caseopt = ((newoptions & PCRE_CASELESS) != 0)? REQ_CASELESS:0;
+
+ /* Change options at this level, and pass them back for use
+ in subsequent branches. */
+diff --git a/testdata/testoutput2 b/testdata/testoutput2
+index ac33cc4..6c42897 100644
+--- a/testdata/testoutput2
++++ b/testdata/testoutput2
+@@ -419,7 +419,7 @@ Need char = '>'
+
+ /(?U)<.*>/I
+ Capturing subpattern count = 0
+-Options: ungreedy
++No options
+ First char = '<'
+ Need char = '>'
+ abc<def>ghi<klm>nop
+@@ -443,7 +443,7 @@ Need char = '='
+
+ /(?U)={3,}?/I
+ Capturing subpattern count = 0
+-Options: ungreedy
++No options
+ First char = '='
+ Need char = '='
+ abc========def
+@@ -477,7 +477,7 @@ Failed: lookbehind assertion is not fixed length at offset 12
+
+ /(?i)abc/I
+ Capturing subpattern count = 0
+-Options: caseless
++No options
+ First char = 'a' (caseless)
+ Need char = 'c' (caseless)
+
+@@ -489,7 +489,7 @@ No need char
+
+ /(?i)^1234/I
+ Capturing subpattern count = 0
+-Options: anchored caseless
++Options: anchored
+ No first char
+ No need char
+
+@@ -502,7 +502,7 @@ No need char
+ /(?s).*/I
+ Capturing subpattern count = 0
+ May match empty string
+-Options: anchored dotall
++Options: anchored
+ No first char
+ No need char
+
+@@ -516,7 +516,7 @@ Starting chars: a b c d
+
+ /(?i)[abcd]/IS
+ Capturing subpattern count = 0
+-Options: caseless
++No options
+ No first char
+ No need char
+ Subject length lower bound = 1
+@@ -524,7 +524,7 @@ Starting chars: A B C D a b c d
+
+ /(?m)[xy]|(b|c)/IS
+ Capturing subpattern count = 1
+-Options: multiline
++No options
+ No first char
+ No need char
+ Subject length lower bound = 1
+@@ -538,7 +538,7 @@ No need char
+
+ /(?i)(^a|^b)/Im
+ Capturing subpattern count = 1
+-Options: caseless multiline
++Options: multiline
+ First char at start or follows newline
+ No need char
+
+@@ -1179,7 +1179,7 @@ No need char
+ End
+ ------------------------------------------------------------------
+ Capturing subpattern count = 1
+-Options: anchored dotall
++Options: anchored
+ No first char
+ No need char
+
+@@ -2735,7 +2735,7 @@ No match
+ End
+ ------------------------------------------------------------------
+ Capturing subpattern count = 0
+-Options: caseless extended
++Options: extended
+ First char = 'a' (caseless)
+ Need char = 'c' (caseless)
+
+@@ -2748,7 +2748,7 @@ Need char = 'c' (caseless)
+ End
+ ------------------------------------------------------------------
+ Capturing subpattern count = 0
+-Options: caseless extended
++Options: extended
+ First char = 'a' (caseless)
+ Need char = 'c' (caseless)
+
+@@ -3095,7 +3095,7 @@ Need char = 'b'
+ End
+ ------------------------------------------------------------------
+ Capturing subpattern count = 0
+-Options: ungreedy
++No options
+ First char = 'x'
+ Need char = 'b'
+ xaaaab
+@@ -3497,7 +3497,7 @@ Need char = 'c'
+
+ /(?i)[ab]/IS
+ Capturing subpattern count = 0
+-Options: caseless
++No options
+ No first char
+ No need char
+ Subject length lower bound = 1
+@@ -6299,7 +6299,7 @@ Capturing subpattern count = 3
+ Named capturing subpatterns:
+ A 2
+ A 3
+-Options: anchored dupnames
++Options: anchored
+ Duplicate name status changes
+ No first char
+ No need char
+--
+2.4.3
+
+From db1fb68feddc9afe6f8822d099fa9ff25e3ea8e7 Mon Sep 17 00:00:00 2001
+From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
+Date: Sat, 5 Dec 2015 16:30:14 +0000
+Subject: [PATCH] Fix copy named substring bug.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1618 2f5784b3-3f2a-0410-8824-cb99058d5e15
+
+Petr Písař: Ported to 8.38.
+diff --git a/pcre_get.c b/pcre_get.c
+index 8094b34..41eda9c 100644
+--- a/pcre_get.c
++++ b/pcre_get.c
+@@ -250,6 +250,7 @@ Arguments:
+ code the compiled regex
+ stringname the name of the capturing substring
+ ovector the vector of matched substrings
++ stringcount number of captured substrings
+
+ Returns: the number of the first that is set,
+ or the number of the last one if none are set,
+@@ -258,13 +259,16 @@ Returns: the number of the first that is set,
+
+ #if defined COMPILE_PCRE8
+ static int
+-get_first_set(const pcre *code, const char *stringname, int *ovector)
++get_first_set(const pcre *code, const char *stringname, int *ovector,
++ int stringcount)
+ #elif defined COMPILE_PCRE16
+ static int
+-get_first_set(const pcre16 *code, PCRE_SPTR16 stringname, int *ovector)
++get_first_set(const pcre16 *code, PCRE_SPTR16 stringname, int *ovector,
++ int stringcount)
+ #elif defined COMPILE_PCRE32
+ static int
+-get_first_set(const pcre32 *code, PCRE_SPTR32 stringname, int *ovector)
++get_first_set(const pcre32 *code, PCRE_SPTR32 stringname, int *ovector,
++ int stringcount)
+ #endif
+ {
+ const REAL_PCRE *re = (const REAL_PCRE *)code;
+@@ -295,7 +299,7 @@ if (entrysize <= 0) return entrysize;
+ for (entry = (pcre_uchar *)first; entry <= (pcre_uchar *)last; entry += entrysize)
+ {
+ int n = GET2(entry, 0);
+- if (ovector[n*2] >= 0) return n;
++ if (n < stringcount && ovector[n*2] >= 0) return n;
+ }
+ return GET2(entry, 0);
+ }
+@@ -402,7 +406,7 @@ pcre32_copy_named_substring(const pcre32 *code, PCRE_SPTR32 subject,
+ PCRE_UCHAR32 *buffer, int size)
+ #endif
+ {
+-int n = get_first_set(code, stringname, ovector);
++int n = get_first_set(code, stringname, ovector, stringcount);
+ if (n <= 0) return n;
+ #if defined COMPILE_PCRE8
+ return pcre_copy_substring(subject, ovector, stringcount, n, buffer, size);
+@@ -619,7 +623,7 @@ pcre32_get_named_substring(const pcre32 *code, PCRE_SPTR32 subject,
+ PCRE_SPTR32 *stringptr)
+ #endif
+ {
+-int n = get_first_set(code, stringname, ovector);
++int n = get_first_set(code, stringname, ovector, stringcount);
+ if (n <= 0) return n;
+ #if defined COMPILE_PCRE8
+ return pcre_get_substring(subject, ovector, stringcount, n, stringptr);
+diff --git a/testdata/testinput2 b/testdata/testinput2
+index 3a1134f..00ffe32 100644
+--- a/testdata/testinput2
++++ b/testdata/testinput2
+@@ -4229,4 +4229,7 @@ backtracking verbs. --/
+
+ /()\Q\E*]/BCZ
+
++/(?<A>)(?J:(?<B>)(?<B>))(?<C>)/
++ \O\CC
++
+ /-- End of testinput2 --/
+diff --git a/testdata/testoutput2 b/testdata/testoutput2
+index 6c42897..ffb4466 100644
+--- a/testdata/testoutput2
++++ b/testdata/testoutput2
+@@ -14639,4 +14639,9 @@ No match
+ End
+ ------------------------------------------------------------------
+
++/(?<A>)(?J:(?<B>)(?<B>))(?<C>)/
++ \O\CC
++Matched, but too many substrings
++copy substring C failed -7
++
+ /-- End of testinput2 --/
+--
+2.4.3
+
+From 40363ebc19baeab160abaaa55dc84322a89ac35a Mon Sep 17 00:00:00 2001
+From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
+Date: Sat, 5 Dec 2015 16:58:46 +0000
+Subject: [PATCH] Fix (by hacking) another length computation issue.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1619 2f5784b3-3f2a-0410-8824-cb99058d5e15
+
+Petr Písař: Ported to 8.38.
+
+diff --git a/pcre_compile.c b/pcre_compile.c
+index 57719b9..087bf2a 100644
+--- a/pcre_compile.c
++++ b/pcre_compile.c
+@@ -7280,7 +7280,7 @@ for (;; ptr++)
+ issue is fixed "properly" in PCRE2. As PCRE1 is now in maintenance
+ only mode, we finesse the bug by allowing more memory always. */
+
+- *lengthptr += 2 + 2*LINK_SIZE;
++ *lengthptr += 4 + 4*LINK_SIZE;
+
+ /* It is even worse than that. The current reference may be to an
+ existing named group with a different number (so apparently not
+diff --git a/testdata/testoutput11-16 b/testdata/testoutput11-16
+index 9a0a12d..280692e 100644
+--- a/testdata/testoutput11-16
++++ b/testdata/testoutput11-16
+@@ -231,7 +231,7 @@ Memory allocation (code space): 73
+ ------------------------------------------------------------------
+
+ /(?P<a>a)...(?P=a)bbb(?P>a)d/BM
+-Memory allocation (code space): 77
++Memory allocation (code space): 93
+ ------------------------------------------------------------------
+ 0 24 Bra
+ 2 5 CBra 1
+diff --git a/testdata/testoutput11-32 b/testdata/testoutput11-32
+index 57e5da0..cdbda74 100644
+--- a/testdata/testoutput11-32
++++ b/testdata/testoutput11-32
+@@ -231,7 +231,7 @@ Memory allocation (code space): 155
+ ------------------------------------------------------------------
+
+ /(?P<a>a)...(?P=a)bbb(?P>a)d/BM
+-Memory allocation (code space): 157
++Memory allocation (code space): 189
+ ------------------------------------------------------------------
+ 0 24 Bra
+ 2 5 CBra 1
+diff --git a/testdata/testoutput11-8 b/testdata/testoutput11-8
+index 748548a..cb37896 100644
+--- a/testdata/testoutput11-8
++++ b/testdata/testoutput11-8
+@@ -231,7 +231,7 @@ Memory allocation (code space): 45
+ ------------------------------------------------------------------
+
+ /(?P<a>a)...(?P=a)bbb(?P>a)d/BM
+-Memory allocation (code space): 50
++Memory allocation (code space): 62
+ ------------------------------------------------------------------
+ 0 30 Bra
+ 3 7 CBra 1
+--
+2.4.3
+
+From 4f47274a2eb10131d88145ad7fd0eed4027a0c51 Mon Sep 17 00:00:00 2001
+From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
+Date: Tue, 8 Dec 2015 11:06:40 +0000
+Subject: [PATCH] Fix get_substring_list() bug when \K is used in an assertion.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1620 2f5784b3-3f2a-0410-8824-cb99058d5e15
+
+Petr Písař: ported to 8.38.
+
+diff --git a/pcre_get.c b/pcre_get.c
+index 41eda9c..cdd2abc 100644
+--- a/pcre_get.c
++++ b/pcre_get.c
+@@ -461,7 +461,10 @@ pcre_uchar **stringlist;
+ pcre_uchar *p;
+
+ for (i = 0; i < double_count; i += 2)
+- size += sizeof(pcre_uchar *) + IN_UCHARS(ovector[i+1] - ovector[i] + 1);
++ {
++ size += sizeof(pcre_uchar *) + IN_UCHARS(1);
++ if (ovector[i+1] > ovector[i]) size += IN_UCHARS(ovector[i+1] - ovector[i]);
++ }
+
+ stringlist = (pcre_uchar **)(PUBL(malloc))(size);
+ if (stringlist == NULL) return PCRE_ERROR_NOMEMORY;
+@@ -477,7 +480,7 @@ p = (pcre_uchar *)(stringlist + stringcount + 1);
+
+ for (i = 0; i < double_count; i += 2)
+ {
+- int len = ovector[i+1] - ovector[i];
++ int len = (ovector[i+1] > ovector[i])? (ovector[i+1] - ovector[i]) : 0;
+ memcpy(p, subject + ovector[i], IN_UCHARS(len));
+ *stringlist++ = p;
+ p += len;
+diff --git a/testdata/testinput2 b/testdata/testinput2
+index 00ffe32..967a241 100644
+--- a/testdata/testinput2
++++ b/testdata/testinput2
+@@ -4232,4 +4232,7 @@ backtracking verbs. --/
+ /(?<A>)(?J:(?<B>)(?<B>))(?<C>)/
+ \O\CC
+
++/(?=a\K)/
++ ring bpattingbobnd $ 1,oern cou \rb\L
++
+ /-- End of testinput2 --/
+diff --git a/testdata/testoutput2 b/testdata/testoutput2
+index ffb4466..5fb28d5 100644
+--- a/testdata/testoutput2
++++ b/testdata/testoutput2
+@@ -14644,4 +14644,10 @@ No match
+ Matched, but too many substrings
+ copy substring C failed -7
+
++/(?=a\K)/
++ ring bpattingbobnd $ 1,oern cou \rb\L
++Start of matched string is beyond its end - displaying from end to start.
++ 0: a
++ 0L
++
+ /-- End of testinput2 --/
+--
+2.5.0
+
+From 3da5528b47b88c32224cf9d14d8a4e80cd7a0815 Mon Sep 17 00:00:00 2001
+From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
+Date: Sat, 6 Feb 2016 16:54:14 +0000
+Subject: [PATCH] Fix pcretest bad behaviour for callout in lookbehind.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1625 2f5784b3-3f2a-0410-8824-cb99058d5e15
+
+Petr Písař: Ported to 8.38.
+
+diff --git a/pcretest.c b/pcretest.c
+index 488e419..63869fd 100644
+--- a/pcretest.c
++++ b/pcretest.c
+@@ -2250,7 +2250,7 @@ data is not zero. */
+ static int callout(pcre_callout_block *cb)
+ {
+ FILE *f = (first_callout | callout_extra)? outfile : NULL;
+-int i, pre_start, post_start, subject_length;
++int i, current_position, pre_start, post_start, subject_length;
+
+ if (callout_extra)
+ {
+@@ -2280,14 +2280,19 @@ printed lengths of the substrings. */
+
+ if (f != NULL) fprintf(f, "--->");
+
++/* If a lookbehind is involved, the current position may be earlier than the
++match start. If so, use the match start instead. */
++
++current_position = (cb->current_position >= cb->start_match)?
++ cb->current_position : cb->start_match;
++
+ PCHARS(pre_start, cb->subject, 0, cb->start_match, f);
+ PCHARS(post_start, cb->subject, cb->start_match,
+- cb->current_position - cb->start_match, f);
++ current_position - cb->start_match, f);
+
+ PCHARS(subject_length, cb->subject, 0, cb->subject_length, NULL);
+
+-PCHARSV(cb->subject, cb->current_position,
+- cb->subject_length - cb->current_position, f);
++PCHARSV(cb->subject, current_position, cb->subject_length - current_position, f);
+
+ if (f != NULL) fprintf(f, "\n");
+
+@@ -5740,3 +5745,4 @@ return yield;
+ }
+
+ /* End of pcretest.c */
++
+diff --git a/testdata/testinput2 b/testdata/testinput2
+index 967a241..086e0f4 100644
+--- a/testdata/testinput2
++++ b/testdata/testinput2
+@@ -4235,4 +4235,8 @@ backtracking verbs. --/
+ /(?=a\K)/
+ ring bpattingbobnd $ 1,oern cou \rb\L
+
++/(?<=((?C)0))/
++ 9010
++ abcd
++
+ /-- End of testinput2 --/
+diff --git a/testdata/testoutput2 b/testdata/testoutput2
+index 5fb28d5..d414a72 100644
+--- a/testdata/testoutput2
++++ b/testdata/testoutput2
+@@ -14650,4 +14650,19 @@ Start of matched string is beyond its end - displaying from end to start.
+ 0: a
+ 0L
+
++/(?<=((?C)0))/
++ 9010
++--->9010
++ 0 ^ 0
++ 0 ^ 0
++ 0:
++ 1: 0
++ abcd
++--->abcd
++ 0 ^ 0
++ 0 ^ 0
++ 0 ^ 0
++ 0 ^ 0
++No match
++
+ /-- End of testinput2 --/
+--
+2.5.0
+
+From 943a5105b9fe2842851003f692c7077a6cdbeefe Mon Sep 17 00:00:00 2001
+From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
+Date: Wed, 10 Feb 2016 19:13:17 +0000
+Subject: [PATCH] Fix workspace overflow for (*ACCEPT) with deeply nested
+ parentheses.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1631 2f5784b3-3f2a-0410-8824-cb99058d5e15
+
+Petr Písař: Ported to 8.38.
+
+diff --git a/pcre_compile.c b/pcre_compile.c
+index b9a239e..5019854 100644
+--- a/pcre_compile.c
++++ b/pcre_compile.c
+@@ -6,7 +6,7 @@
+ and semantics are as close as possible to those of the Perl 5 language.
+
+ Written by Philip Hazel
+- Copyright (c) 1997-2014 University of Cambridge
++ Copyright (c) 1997-2016 University of Cambridge
+
+ -----------------------------------------------------------------------------
+ Redistribution and use in source and binary forms, with or without
+@@ -560,6 +560,7 @@ static const char error_texts[] =
+ /* 85 */
+ "parentheses are too deeply nested (stack check)\0"
+ "digits missing in \\x{} or \\o{}\0"
++ "regular expression is too complicated\0"
+ ;
+
+ /* Table to identify digits and hex digits. This is used when compiling
+@@ -4591,7 +4592,8 @@ for (;; ptr++)
+ if (code > cd->start_workspace + cd->workspace_size -
+ WORK_SIZE_SAFETY_MARGIN) /* Check for overrun */
+ {
+- *errorcodeptr = ERR52;
++ *errorcodeptr = (code >= cd->start_workspace + cd->workspace_size)?
++ ERR52 : ERR87;
+ goto FAILED;
+ }
+
+@@ -6626,8 +6628,21 @@ for (;; ptr++)
+ cd->had_accept = TRUE;
+ for (oc = cd->open_caps; oc != NULL; oc = oc->next)
+ {
+- *code++ = OP_CLOSE;
+- PUT2INC(code, 0, oc->number);
++ if (lengthptr != NULL)
++ {
++#ifdef COMPILE_PCRE8
++ *lengthptr += 1 + IMM2_SIZE;
++#elif defined COMPILE_PCRE16
++ *lengthptr += 2 + IMM2_SIZE;
++#elif defined COMPILE_PCRE32
++ *lengthptr += 4 + IMM2_SIZE;
++#endif
++ }
++ else
++ {
++ *code++ = OP_CLOSE;
++ PUT2INC(code, 0, oc->number);
++ }
+ }
+ setverb = *code++ =
+ (cd->assert_depth > 0)? OP_ASSERT_ACCEPT : OP_ACCEPT;
+diff --git a/pcre_internal.h b/pcre_internal.h
+index f7a5ee7..dbfe80e 100644
+--- a/pcre_internal.h
++++ b/pcre_internal.h
+@@ -7,7 +7,7 @@
+ and semantics are as close as possible to those of the Perl 5 language.
+
+ Written by Philip Hazel
+- Copyright (c) 1997-2014 University of Cambridge
++ Copyright (c) 1997-2016 University of Cambridge
+
+ -----------------------------------------------------------------------------
+ Redistribution and use in source and binary forms, with or without
+@@ -2289,7 +2289,7 @@ enum { ERR0, ERR1, ERR2, ERR3, ERR4, ERR5, ERR6, ERR7, ERR8, ERR9,
+ ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59,
+ ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68, ERR69,
+ ERR70, ERR71, ERR72, ERR73, ERR74, ERR75, ERR76, ERR77, ERR78, ERR79,
+- ERR80, ERR81, ERR82, ERR83, ERR84, ERR85, ERR86, ERRCOUNT };
++ ERR80, ERR81, ERR82, ERR83, ERR84, ERR85, ERR86, ERR87, ERRCOUNT };
+
+ /* JIT compiling modes. The function list is indexed by them. */
+
+diff --git a/pcreposix.c b/pcreposix.c
+index dcc13ef..55b6ddc 100644
+--- a/pcreposix.c
++++ b/pcreposix.c
+@@ -6,7 +6,7 @@
+ and semantics are as close as possible to those of the Perl 5 language.
+
+ Written by Philip Hazel
+- Copyright (c) 1997-2014 University of Cambridge
++ Copyright (c) 1997-2016 University of Cambridge
+
+ -----------------------------------------------------------------------------
+ Redistribution and use in source and binary forms, with or without
+@@ -173,7 +173,8 @@ static const int eint[] = {
+ REG_BADPAT, /* group name must start with a non-digit */
+ /* 85 */
+ REG_BADPAT, /* parentheses too deeply nested (stack check) */
+- REG_BADPAT /* missing digits in \x{} or \o{} */
++ REG_BADPAT, /* missing digits in \x{} or \o{} */
++ REG_BADPAT /* pattern too complicated */
+ };
+
+ /* Table of texts corresponding to POSIX error codes */
+diff --git a/testdata/testinput11 b/testdata/testinput11
+index ac9d228..6f0989a 100644
+--- a/testdata/testinput11
++++ b/testdata/testinput11
+@@ -138,4 +138,6 @@ is required for these tests. --/
+
+ /.((?2)(?R)\1)()/B
+
++/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/
++
+ /-- End of testinput11 --/
+diff --git a/testdata/testoutput11-16 b/testdata/testoutput11-16
+index 280692e..3c485da 100644
+--- a/testdata/testoutput11-16
++++ b/testdata/testoutput11-16
+@@ -765,4 +765,7 @@ Memory allocation (code space): 14
+ 25 End
+ ------------------------------------------------------------------
+
++/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/
++Failed: regular expression is too complicated at offset 490
++
+ /-- End of testinput11 --/
+diff --git a/testdata/testoutput11-32 b/testdata/testoutput11-32
+index cdbda74..e19518d 100644
+--- a/testdata/testoutput11-32
++++ b/testdata/testoutput11-32
+@@ -765,4 +765,7 @@ Memory allocation (code space): 28
+ 25 End
+ ------------------------------------------------------------------
+
++/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/
++Failed: missing ) at offset 509
++
+ /-- End of testinput11 --/
+diff --git a/testdata/testoutput11-8 b/testdata/testoutput11-8
+index cb37896..5a4fbb2 100644
+--- a/testdata/testoutput11-8
++++ b/testdata/testoutput11-8
+@@ -765,4 +765,7 @@ Memory allocation (code space): 10
+ 38 End
+ ------------------------------------------------------------------
+
++/([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00]([00](*ACCEPT)/
++Failed: missing ) at offset 509
++
+ /-- End of testinput11 --/
+--
+2.5.0
+
+From b7537308b7c758f33c347cb0bec62754c43c271f Mon Sep 17 00:00:00 2001
+From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
+Date: Sat, 27 Feb 2016 17:38:11 +0000
+Subject: [PATCH] Yet another duplicate name bugfix by overestimating the
+ memory needed (i.e. another hack - PCRE2 has this "properly" fixed).
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1636 2f5784b3-3f2a-0410-8824-cb99058d5e15
+
+Petr Písař: Ported to 8.38.
+
+diff --git a/pcre_compile.c b/pcre_compile.c
+index 5019854..4ffea0c 100644
+--- a/pcre_compile.c
++++ b/pcre_compile.c
+@@ -7311,7 +7311,12 @@ for (;; ptr++)
+ so far in order to get the number. If the name is not found, leave
+ the value of recno as 0 for a forward reference. */
+
+- else
++ /* This patch (removing "else") fixes a problem when a reference is
++ to multiple identically named nested groups from within the nest.
++ Once again, it is not the "proper" fix, and it results in an
++ over-allocation of memory. */
++
++ /* else */
+ {
+ ng = cd->named_groups;
+ for (i = 0; i < cd->names_found; i++, ng++)
+diff --git a/testdata/testinput2 b/testdata/testinput2
+index 086e0f4..c805f5f 100644
+--- a/testdata/testinput2
++++ b/testdata/testinput2
+@@ -4239,4 +4239,6 @@ backtracking verbs. --/
+ 9010
+ abcd
+
++/((?J)(?'R'(?'R'(?'R'(?'R'(?'R'(?|(\k'R'))))))))/
++
+ /-- End of testinput2 --/
+diff --git a/testdata/testoutput2 b/testdata/testoutput2
+index d414a72..800a72f 100644
+--- a/testdata/testoutput2
++++ b/testdata/testoutput2
+@@ -14665,4 +14665,6 @@ Start of matched string is beyond its end - displaying from end to start.
+ 0 ^ 0
+ No match
+
++/((?J)(?'R'(?'R'(?'R'(?'R'(?'R'(?|(\k'R'))))))))/
++
+ /-- End of testinput2 --/
+--
+2.5.0
+
+From 0fc2edb79b3815c6511fd75c36a57893e4acaee6 Mon Sep 17 00:00:00 2001
+From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
+Date: Sat, 27 Feb 2016 17:55:24 +0000
+Subject: [PATCH] Fix pcretest loop for global matching with an ovector size
+ less than 2.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1637 2f5784b3-3f2a-0410-8824-cb99058d5e15
+
+Petr Písař: Ported to 8.38.
+
+diff --git a/pcretest.c b/pcretest.c
+index 63869fd..78ef517 100644
+--- a/pcretest.c
++++ b/pcretest.c
+@@ -5617,6 +5617,12 @@ while (!done)
+ break;
+ }
+
++ if (use_size_offsets < 2)
++ {
++ fprintf(outfile, "Cannot do global matching with an ovector size < 2\n");
++ break;
++ }
++
+ /* If we have matched an empty string, first check to see if we are at
+ the end of the subject. If so, the /g loop is over. Otherwise, mimic what
+ Perl's /g options does. This turns out to be rather cunning. First we set
+--
+2.5.0
+
+From b3db1b7de5cfaa026ec2bc4a393129461a0f5c57 Mon Sep 17 00:00:00 2001
+From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
+Date: Sat, 27 Feb 2016 18:44:41 +0000
+Subject: [PATCH] Fix non-diagnosis of missing assertion after (?(?C).
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1638 2f5784b3-3f2a-0410-8824-cb99058d5e15
+
+Petr Písař: Ported to 8.38.
+
+diff --git a/pcre_compile.c b/pcre_compile.c
+index 4ffea0c..254c629 100644
+--- a/pcre_compile.c
++++ b/pcre_compile.c
+@@ -485,7 +485,7 @@ static const char error_texts[] =
+ "lookbehind assertion is not fixed length\0"
+ "malformed number or name after (?(\0"
+ "conditional group contains more than two branches\0"
+- "assertion expected after (?(\0"
++ "assertion expected after (?( or (?(?C)\0"
+ "(?R or (?[+-]digits must be followed by )\0"
+ /* 30 */
+ "unknown POSIX class name\0"
+@@ -6771,6 +6771,15 @@ for (;; ptr++)
+ for (i = 3;; i++) if (!IS_DIGIT(ptr[i])) break;
+ if (ptr[i] == CHAR_RIGHT_PARENTHESIS)
+ tempptr += i + 1;
++
++ /* tempptr should now be pointing to the opening parenthesis of the
++ assertion condition. */
++
++ if (*tempptr != CHAR_LEFT_PARENTHESIS)
++ {
++ *errorcodeptr = ERR28;
++ goto FAILED;
++ }
+ }
+
+ /* For conditions that are assertions, check the syntax, and then exit
+diff --git a/testdata/testinput2 b/testdata/testinput2
+index c805f5f..75e402e 100644
+--- a/testdata/testinput2
++++ b/testdata/testinput2
+@@ -4241,4 +4241,6 @@ backtracking verbs. --/
+
+ /((?J)(?'R'(?'R'(?'R'(?'R'(?'R'(?|(\k'R'))))))))/
+
++/\N(?(?C)0?!.)*/
++
+ /-- End of testinput2 --/
+diff --git a/testdata/testoutput2 b/testdata/testoutput2
+index 800a72f..5e88d1a 100644
+--- a/testdata/testoutput2
++++ b/testdata/testoutput2
+@@ -555,13 +555,13 @@ Failed: malformed number or name after (?( at offset 4
+ Failed: malformed number or name after (?( at offset 4
+
+ /(?(?i))/
+-Failed: assertion expected after (?( at offset 3
++Failed: assertion expected after (?( or (?(?C) at offset 3
+
+ /(?(abc))/
+ Failed: reference to non-existent subpattern at offset 7
+
+ /(?(?<ab))/
+-Failed: assertion expected after (?( at offset 3
++Failed: assertion expected after (?( or (?(?C) at offset 3
+
+ /((?s)blah)\s+\1/I
+ Capturing subpattern count = 1
+@@ -7870,7 +7870,7 @@ No match
+ Failed: malformed number or name after (?( at offset 6
+
+ /(?(''))/
+-Failed: assertion expected after (?( at offset 4
++Failed: assertion expected after (?( or (?(?C) at offset 4
+
+ /(?('R')stuff)/
+ Failed: reference to non-existent subpattern at offset 7
+@@ -14346,7 +14346,7 @@ No match
+ "((?2)+)((?1))"
+
+ "(?(?<E>.*!.*)?)"
+-Failed: assertion expected after (?( at offset 3
++Failed: assertion expected after (?( or (?(?C) at offset 3
+
+ "X((?2)()*+){2}+"BZ
+ ------------------------------------------------------------------
+@@ -14667,4 +14667,7 @@ No match
+
+ /((?J)(?'R'(?'R'(?'R'(?'R'(?'R'(?|(\k'R'))))))))/
+
++/\N(?(?C)0?!.)*/
++Failed: assertion expected after (?( or (?(?C) at offset 4
++
+ /-- End of testinput2 --/
+--
+2.5.0
+
diff --git a/src/patches/samba/CVE-2015-5370-v3-6.patch b/src/patches/samba/CVE-2015-5370-v3-6.patch
new file mode 100644
index 0000000..7af1dd3
--- /dev/null
+++ b/src/patches/samba/CVE-2015-5370-v3-6.patch
@@ -0,0 +1,3080 @@
+From 8368c32cb69da82c8df36404ec8042c3046866ca Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Thu, 16 Jul 2015 22:46:05 +0200
+Subject: [PATCH 01/40] CVE-2015-5370: dcerpc.idl: add
+ DCERPC_{NCACN_PAYLOAD,FRAG}_MAX_SIZE defines
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+---
+ librpc/idl/dcerpc.idl | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/librpc/idl/dcerpc.idl b/librpc/idl/dcerpc.idl
+index 75ef2ec..bbb42d1 100644
+--- a/librpc/idl/dcerpc.idl
++++ b/librpc/idl/dcerpc.idl
+@@ -475,9 +475,11 @@ interface dcerpc
+ const uint8 DCERPC_PFC_OFFSET = 3;
+ const uint8 DCERPC_DREP_OFFSET = 4;
+ const uint8 DCERPC_FRAG_LEN_OFFSET = 8;
++ const uint32 DCERPC_FRAG_MAX_SIZE = 5840;
+ const uint8 DCERPC_AUTH_LEN_OFFSET = 10;
+ const uint8 DCERPC_CALL_ID_OFFSET = 12;
+ const uint8 DCERPC_NCACN_PAYLOAD_OFFSET = 16;
++ const uint32 DCERPC_NCACN_PAYLOAD_MAX_SIZE = 0x400000; /* 4 MByte */
+
+ /* little-endian flag */
+ const uint8 DCERPC_DREP_LE = 0x10;
+--
+2.8.1
+
+
+From e3043ba5aafdb0605ab14b11917d497b59d82bec Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Sun, 28 Jun 2015 01:19:57 +0200
+Subject: [PATCH 02/40] CVE-2015-5370: librpc/rpc: simplify and harden
+ dcerpc_pull_auth_trailer()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+---
+ librpc/rpc/dcerpc_util.c | 63 ++++++++++++++++++++++++++++++++++++------------
+ librpc/rpc/rpc_common.h | 4 +--
+ 2 files changed, 49 insertions(+), 18 deletions(-)
+
+diff --git a/librpc/rpc/dcerpc_util.c b/librpc/rpc/dcerpc_util.c
+index 97ef798..f936ef4 100644
+--- a/librpc/rpc/dcerpc_util.c
++++ b/librpc/rpc/dcerpc_util.c
+@@ -92,31 +92,44 @@ uint8_t dcerpc_get_endian_flag(DATA_BLOB *blob)
+ *
+ * @return - A NTSTATUS error code.
+ */
+-NTSTATUS dcerpc_pull_auth_trailer(struct ncacn_packet *pkt,
++NTSTATUS dcerpc_pull_auth_trailer(const struct ncacn_packet *pkt,
+ TALLOC_CTX *mem_ctx,
+- DATA_BLOB *pkt_trailer,
++ const DATA_BLOB *pkt_trailer,
+ struct dcerpc_auth *auth,
+- uint32_t *auth_length,
++ uint32_t *_auth_length,
+ bool auth_data_only)
+ {
+ struct ndr_pull *ndr;
+ enum ndr_err_code ndr_err;
+- uint32_t data_and_pad;
++ uint16_t data_and_pad;
++ uint16_t auth_length;
++ uint32_t tmp_length;
+
+- data_and_pad = pkt_trailer->length
+- - (DCERPC_AUTH_TRAILER_LENGTH + pkt->auth_length);
++ ZERO_STRUCTP(auth);
++ if (_auth_length != NULL) {
++ *_auth_length = 0;
++ }
+
+- /* paranoia check for pad size. This would be caught anyway by
+- the ndr_pull_advance() a few lines down, but it scared
+- Jeremy enough for him to call me, so we might as well check
+- it now, just to prevent someone posting a bogus YouTube
+- video in the future.
+- */
+- if (data_and_pad > pkt_trailer->length) {
+- return NT_STATUS_INFO_LENGTH_MISMATCH;
++ /* Paranoia checks for auth_length. The caller should check this... */
++ if (pkt->auth_length > pkt->frag_length) {
++ return NT_STATUS_INTERNAL_ERROR;
++ }
++ tmp_length = DCERPC_NCACN_PAYLOAD_OFFSET;
++ tmp_length += DCERPC_AUTH_TRAILER_LENGTH;
++ tmp_length += pkt->auth_length;
++ if (tmp_length > pkt->frag_length) {
++ return NT_STATUS_INTERNAL_ERROR;
++ }
++ if (pkt_trailer->length > UINT16_MAX) {
++ return NT_STATUS_INTERNAL_ERROR;
+ }
+
+- *auth_length = pkt_trailer->length - data_and_pad;
++ auth_length = DCERPC_AUTH_TRAILER_LENGTH + pkt->auth_length;
++ if (pkt_trailer->length < auth_length) {
++ return NT_STATUS_RPC_PROTOCOL_ERROR;
++ }
++
++ data_and_pad = pkt_trailer->length - auth_length;
+
+ ndr = ndr_pull_init_blob(pkt_trailer, mem_ctx);
+ if (!ndr) {
+@@ -136,14 +149,28 @@ NTSTATUS dcerpc_pull_auth_trailer(struct ncacn_packet *pkt,
+ ndr_err = ndr_pull_dcerpc_auth(ndr, NDR_SCALARS|NDR_BUFFERS, auth);
+ if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+ talloc_free(ndr);
++ ZERO_STRUCTP(auth);
+ return ndr_map_error2ntstatus(ndr_err);
+ }
+
++ if (data_and_pad < auth->auth_pad_length) {
++ DEBUG(1, (__location__ ": ERROR: pad length mismatch. "
++ "Calculated %u got %u\n",
++ (unsigned)data_and_pad,
++ (unsigned)auth->auth_pad_length));
++ talloc_free(ndr);
++ ZERO_STRUCTP(auth);
++ return NT_STATUS_RPC_PROTOCOL_ERROR;
++ }
++
+ if (auth_data_only && data_and_pad != auth->auth_pad_length) {
+- DEBUG(1, (__location__ ": WARNING: pad length mismatch. "
++ DEBUG(1, (__location__ ": ERROR: pad length mismatch. "
+ "Calculated %u got %u\n",
+ (unsigned)data_and_pad,
+ (unsigned)auth->auth_pad_length));
++ talloc_free(ndr);
++ ZERO_STRUCTP(auth);
++ return NT_STATUS_RPC_PROTOCOL_ERROR;
+ }
+
+ DEBUG(6,(__location__ ": auth_pad_length %u\n",
+@@ -152,6 +179,10 @@ NTSTATUS dcerpc_pull_auth_trailer(struct ncacn_packet *pkt,
+ talloc_steal(mem_ctx, auth->credentials.data);
+ talloc_free(ndr);
+
++ if (_auth_length != NULL) {
++ *_auth_length = auth_length;
++ }
++
+ return NT_STATUS_OK;
+ }
+
+diff --git a/librpc/rpc/rpc_common.h b/librpc/rpc/rpc_common.h
+index fe8129d..98a2e95 100644
+--- a/librpc/rpc/rpc_common.h
++++ b/librpc/rpc/rpc_common.h
+@@ -158,9 +158,9 @@ uint8_t dcerpc_get_endian_flag(DATA_BLOB *blob);
+ *
+ * @return - A NTSTATUS error code.
+ */
+-NTSTATUS dcerpc_pull_auth_trailer(struct ncacn_packet *pkt,
++NTSTATUS dcerpc_pull_auth_trailer(const struct ncacn_packet *pkt,
+ TALLOC_CTX *mem_ctx,
+- DATA_BLOB *pkt_trailer,
++ const DATA_BLOB *pkt_trailer,
+ struct dcerpc_auth *auth,
+ uint32_t *auth_length,
+ bool auth_data_only);
+--
+2.8.1
+
+
+From 397300d996299400842938131691fbbeb88c2c82 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Mon, 29 Jun 2015 10:24:45 +0200
+Subject: [PATCH 03/40] CVE-2015-5370: s3:librpc/rpc: don't call
+ dcerpc_pull_auth_trailer() if auth_length is 0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+All other paranoia checks are done within dcerpc_pull_auth_trailer()
+now.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+---
+ source3/librpc/rpc/dcerpc_helpers.c | 12 ++----------
+ 1 file changed, 2 insertions(+), 10 deletions(-)
+
+diff --git a/source3/librpc/rpc/dcerpc_helpers.c b/source3/librpc/rpc/dcerpc_helpers.c
+index 24f2f52..76f2acc 100644
+--- a/source3/librpc/rpc/dcerpc_helpers.c
++++ b/source3/librpc/rpc/dcerpc_helpers.c
+@@ -899,16 +899,8 @@ NTSTATUS dcerpc_check_auth(struct pipe_auth_data *auth,
+ return NT_STATUS_INVALID_PARAMETER;
+ }
+
+- /* Paranioa checks for auth_length. */
+- if (pkt->auth_length > pkt->frag_length) {
+- return NT_STATUS_INFO_LENGTH_MISMATCH;
+- }
+- if (((unsigned int)pkt->auth_length
+- + DCERPC_AUTH_TRAILER_LENGTH < (unsigned int)pkt->auth_length) ||
+- ((unsigned int)pkt->auth_length
+- + DCERPC_AUTH_TRAILER_LENGTH < DCERPC_AUTH_TRAILER_LENGTH)) {
+- /* Integer wrap attempt. */
+- return NT_STATUS_INFO_LENGTH_MISMATCH;
++ if (pkt->auth_length == 0) {
++ return NT_STATUS_INVALID_PARAMETER;
+ }
+
+ status = dcerpc_pull_auth_trailer(pkt, pkt, pkt_trailer,
+--
+2.8.1
+
+
+From faa20091b4a456a5e29f852561f6f5e9863860e0 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Fri, 26 Jun 2015 08:10:46 +0200
+Subject: [PATCH 04/40] CVE-2015-5370: librpc/rpc: add a
+ dcerpc_verify_ncacn_packet_header() helper function
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit 8266be48f455a5e541d0f7f62a1c8c38e0835976)
+---
+ librpc/rpc/dcerpc_util.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++
+ librpc/rpc/rpc_common.h | 5 ++++
+ 2 files changed, 78 insertions(+)
+
+diff --git a/librpc/rpc/dcerpc_util.c b/librpc/rpc/dcerpc_util.c
+index f936ef4..2f599d5 100644
+--- a/librpc/rpc/dcerpc_util.c
++++ b/librpc/rpc/dcerpc_util.c
+@@ -186,6 +186,79 @@ NTSTATUS dcerpc_pull_auth_trailer(const struct ncacn_packet *pkt,
+ return NT_STATUS_OK;
+ }
+
++/**
++* @brief Verify the fields in ncacn_packet header.
++*
++* @param pkt - The ncacn_packet strcuture
++* @param ptype - The expected PDU type
++* @param max_auth_info - The maximum size of a possible auth trailer
++* @param required_flags - The required flags for the pdu.
++* @param optional_flags - The possible optional flags for the pdu.
++*
++* @return - A NTSTATUS error code.
++*/
++NTSTATUS dcerpc_verify_ncacn_packet_header(const struct ncacn_packet *pkt,
++ enum dcerpc_pkt_type ptype,
++ size_t max_auth_info,
++ uint8_t required_flags,
++ uint8_t optional_flags)
++{
++ if (pkt->rpc_vers != 5) {
++ return NT_STATUS_RPC_PROTOCOL_ERROR;
++ }
++
++ if (pkt->rpc_vers_minor != 0) {
++ return NT_STATUS_RPC_PROTOCOL_ERROR;
++ }
++
++ if (pkt->auth_length > pkt->frag_length) {
++ return NT_STATUS_RPC_PROTOCOL_ERROR;
++ }
++
++ if (pkt->ptype != ptype) {
++ return NT_STATUS_RPC_PROTOCOL_ERROR;
++ }
++
++ if (max_auth_info > UINT16_MAX) {
++ return NT_STATUS_INTERNAL_ERROR;
++ }
++
++ if (pkt->auth_length > 0) {
++ size_t max_auth_length;
++
++ if (max_auth_info <= DCERPC_AUTH_TRAILER_LENGTH) {
++ return NT_STATUS_RPC_PROTOCOL_ERROR;
++ }
++ max_auth_length = max_auth_info - DCERPC_AUTH_TRAILER_LENGTH;
++
++ if (pkt->auth_length > max_auth_length) {
++ return NT_STATUS_RPC_PROTOCOL_ERROR;
++ }
++ }
++
++ if ((pkt->pfc_flags & required_flags) != required_flags) {
++ return NT_STATUS_RPC_PROTOCOL_ERROR;
++ }
++ if (pkt->pfc_flags & ~(optional_flags|required_flags)) {
++ return NT_STATUS_RPC_PROTOCOL_ERROR;
++ }
++
++ if (pkt->drep[0] & ~DCERPC_DREP_LE) {
++ return NT_STATUS_RPC_PROTOCOL_ERROR;
++ }
++ if (pkt->drep[1] != 0) {
++ return NT_STATUS_RPC_PROTOCOL_ERROR;
++ }
++ if (pkt->drep[2] != 0) {
++ return NT_STATUS_RPC_PROTOCOL_ERROR;
++ }
++ if (pkt->drep[3] != 0) {
++ return NT_STATUS_RPC_PROTOCOL_ERROR;
++ }
++
++ return NT_STATUS_OK;
++}
++
+ struct dcerpc_read_ncacn_packet_state {
+ #if 0
+ struct {
+diff --git a/librpc/rpc/rpc_common.h b/librpc/rpc/rpc_common.h
+index 98a2e95..b3ae5b2 100644
+--- a/librpc/rpc/rpc_common.h
++++ b/librpc/rpc/rpc_common.h
+@@ -164,6 +164,11 @@ NTSTATUS dcerpc_pull_auth_trailer(const struct ncacn_packet *pkt,
+ struct dcerpc_auth *auth,
+ uint32_t *auth_length,
+ bool auth_data_only);
++NTSTATUS dcerpc_verify_ncacn_packet_header(const struct ncacn_packet *pkt,
++ enum dcerpc_pkt_type ptype,
++ size_t max_auth_info,
++ uint8_t required_flags,
++ uint8_t optional_flags);
+ struct tevent_req *dcerpc_read_ncacn_packet_send(TALLOC_CTX *mem_ctx,
+ struct tevent_context *ev,
+ struct tstream_context *stream);
+--
+2.8.1
+
+
+From c176174588c1119a11066b6188ac50cd3c9603f4 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Tue, 7 Jul 2015 13:05:01 +0200
+Subject: [PATCH 05/40] CVE-2015-5370: s3:rpc_client: move AS/U hack to the top
+ of cli_pipe_validate_current_pdu()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit 665b874b6022bfcdec3f13a9f5a844e5d1784aba)
+---
+ source3/rpc_client/cli_pipe.c | 24 +++++++++++++-----------
+ 1 file changed, 13 insertions(+), 11 deletions(-)
+
+diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
+index 5ddabb7..295b88f 100644
+--- a/source3/rpc_client/cli_pipe.c
++++ b/source3/rpc_client/cli_pipe.c
+@@ -414,6 +414,19 @@ static NTSTATUS cli_pipe_validate_current_pdu(TALLOC_CTX *mem_ctx,
+ */
+ *rdata = *pdu;
+
++ if ((pkt->ptype == DCERPC_PKT_BIND_ACK) &&
++ !(pkt->pfc_flags & DCERPC_PFC_FLAG_LAST)) {
++ /*
++ * TODO: do we still need this hack which was introduced
++ * in commit a42afcdcc7ab9aa9ed193ae36d3dbb10843447f0.
++ *
++ * I don't even know what AS/U might be...
++ */
++ DEBUG(5, (__location__ ": bug in server (AS/U?), setting "
++ "fragment first/last ON.\n"));
++ pkt->pfc_flags |= DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST;
++ }
++
+ /* Ensure we have the correct type. */
+ switch (pkt->ptype) {
+ case DCERPC_PKT_ALTER_RESP:
+@@ -518,17 +531,6 @@ static NTSTATUS cli_pipe_validate_current_pdu(TALLOC_CTX *mem_ctx,
+ return NT_STATUS_RPC_PROTOCOL_ERROR;
+ }
+
+- /* Do this just before return - we don't want to modify any rpc header
+- data before now as we may have needed to do cryptographic actions on
+- it before. */
+-
+- if ((pkt->ptype == DCERPC_PKT_BIND_ACK) &&
+- !(pkt->pfc_flags & DCERPC_PFC_FLAG_LAST)) {
+- DEBUG(5, (__location__ ": bug in server (AS/U?), setting "
+- "fragment first/last ON.\n"));
+- pkt->pfc_flags |= DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST;
+- }
+-
+ return NT_STATUS_OK;
+ }
+
+--
+2.8.1
+
+
+From b9ae0068be4dfc6f7d09144c353689ab01955b93 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Tue, 7 Jul 2015 13:05:01 +0200
+Subject: [PATCH 06/40] CVE-2015-5370: s3:rpc_client: remove useless
+ frag_length check in rpc_api_pipe_got_pdu()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+dcerpc_pull_ncacn_packet() already verifies this.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit 9a3f045244b12ff9f77d2664396137c390042297)
+---
+ source3/rpc_client/cli_pipe.c | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
+index 295b88f..2787fbc 100644
+--- a/source3/rpc_client/cli_pipe.c
++++ b/source3/rpc_client/cli_pipe.c
+@@ -898,14 +898,6 @@ static void rpc_api_pipe_got_pdu(struct tevent_req *subreq)
+ return;
+ }
+
+- if (state->incoming_frag.length != state->pkt->frag_length) {
+- DEBUG(5, ("Incorrect pdu length %u, expected %u\n",
+- (unsigned int)state->incoming_frag.length,
+- (unsigned int)state->pkt->frag_length));
+- tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+- return;
+- }
+-
+ status = cli_pipe_validate_current_pdu(state,
+ state->cli, state->pkt,
+ &state->incoming_frag,
+--
+2.8.1
+
+
+From 05688274f03e6086e3ba4d7b4cb4409f9c4d9cb1 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Fri, 26 Jun 2015 08:10:46 +0200
+Subject: [PATCH 07/40] CVE-2015-5370: s4:rpc_server: no authentication is
+ indicated by pkt->auth_length == 0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+pkt->u.*.auth_info.length is not the correct thing to check.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(packported from commit c0236de09e542dbb168969d8ae9f0c150a75198e)
+---
+ source4/rpc_server/dcesrv_auth.c | 23 ++++++++++++++---------
+ 1 file changed, 14 insertions(+), 9 deletions(-)
+
+diff --git a/source4/rpc_server/dcesrv_auth.c b/source4/rpc_server/dcesrv_auth.c
+index 1e6aa24..61f2176 100644
+--- a/source4/rpc_server/dcesrv_auth.c
++++ b/source4/rpc_server/dcesrv_auth.c
+@@ -46,7 +46,7 @@ bool dcesrv_auth_bind(struct dcesrv_call_state *call)
+ NTSTATUS status;
+ uint32_t auth_length;
+
+- if (pkt->u.bind.auth_info.length == 0) {
++ if (pkt->auth_length == 0) {
+ dce_conn->auth_state.auth_info = NULL;
+ return true;
+ }
+@@ -108,7 +108,7 @@ NTSTATUS dcesrv_auth_bind_ack(struct dcesrv_call_state *call, struct ncacn_packe
+ struct dcesrv_connection *dce_conn = call->conn;
+ NTSTATUS status;
+
+- if (!call->conn->auth_state.gensec_security) {
++ if (call->pkt.auth_length == 0) {
+ return NT_STATUS_OK;
+ }
+
+@@ -155,10 +155,16 @@ bool dcesrv_auth_auth3(struct dcesrv_call_state *call)
+ NTSTATUS status;
+ uint32_t auth_length;
+
+- /* We can't work without an existing gensec state, and an new blob to feed it */
+- if (!dce_conn->auth_state.auth_info ||
+- !dce_conn->auth_state.gensec_security ||
+- pkt->u.auth3.auth_info.length == 0) {
++ if (pkt->auth_length == 0) {
++ return false;
++ }
++
++ if (!dce_conn->auth_state.auth_info) {
++ return false;
++ }
++
++ /* We can't work without an existing gensec state */
++ if (!dce_conn->auth_state.gensec_security) {
+ return false;
+ }
+
+@@ -203,7 +209,7 @@ bool dcesrv_auth_alter(struct dcesrv_call_state *call)
+ uint32_t auth_length;
+
+ /* on a pure interface change there is no auth blob */
+- if (pkt->u.alter.auth_info.length == 0) {
++ if (pkt->auth_length == 0) {
+ return true;
+ }
+
+@@ -238,8 +244,7 @@ NTSTATUS dcesrv_auth_alter_ack(struct dcesrv_call_state *call, struct ncacn_pack
+
+ /* on a pure interface change there is no auth_info structure
+ setup */
+- if (!call->conn->auth_state.auth_info ||
+- dce_conn->auth_state.auth_info->credentials.length == 0) {
++ if (call->pkt.auth_length == 0) {
+ return NT_STATUS_OK;
+ }
+
+--
+2.8.1
+
+
+From 57230961cee9e82ab060b54b5fb8c2b19f672111 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Sat, 27 Jun 2015 10:31:48 +0200
+Subject: [PATCH 08/40] CVE-2015-5370: s4:librpc/rpc: check pkt->auth_length
+ before calling dcerpc_pull_auth_trailer
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Ralph Boehme <slow(a)samba.org>
+(backported from 630dcb55ad7a3a89bcd8643c98a5cdbfb8735ef7)
+---
+ source4/librpc/rpc/dcerpc.c | 13 ++++++++++---
+ source4/rpc_server/dcesrv_auth.c | 5 +++++
+ 2 files changed, 15 insertions(+), 3 deletions(-)
+
+diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c
+index 742d710..cfbccd6 100644
+--- a/source4/librpc/rpc/dcerpc.c
++++ b/source4/librpc/rpc/dcerpc.c
+@@ -701,6 +701,14 @@ static NTSTATUS ncacn_pull_request_auth(struct dcecli_connection *c, TALLOC_CTX
+ return NT_STATUS_INVALID_LEVEL;
+ }
+
++ if (pkt->auth_length == 0) {
++ return NT_STATUS_INVALID_NETWORK_RESPONSE;
++ }
++
++ if (c->security_state.generic_state == NULL) {
++ return NT_STATUS_INTERNAL_ERROR;
++ }
++
+ status = dcerpc_pull_auth_trailer(pkt, mem_ctx,
+ &pkt->u.response.stub_and_verifier,
+ &auth, &auth_length, false);
+@@ -1074,7 +1082,7 @@ static void dcerpc_bind_recv_handler(struct rpc_request *req,
+ }
+
+ /* the bind_ack might contain a reply set of credentials */
+- if (conn->security_state.auth_info && pkt->u.bind_ack.auth_info.length) {
++ if (conn->security_state.auth_info && pkt->auth_length) {
+ NTSTATUS status;
+ uint32_t auth_length;
+ status = dcerpc_pull_auth_trailer(pkt, conn, &pkt->u.bind_ack.auth_info,
+@@ -1847,8 +1855,7 @@ static void dcerpc_alter_recv_handler(struct rpc_request *req,
+ }
+
+ /* the alter_resp might contain a reply set of credentials */
+- if (recv_pipe->conn->security_state.auth_info &&
+- pkt->u.alter_resp.auth_info.length) {
++ if (recv_pipe->conn->security_state.auth_info && pkt->auth_length) {
+ struct dcecli_connection *conn = recv_pipe->conn;
+ NTSTATUS status;
+ uint32_t auth_length;
+diff --git a/source4/rpc_server/dcesrv_auth.c b/source4/rpc_server/dcesrv_auth.c
+index 61f2176..3051c1c 100644
+--- a/source4/rpc_server/dcesrv_auth.c
++++ b/source4/rpc_server/dcesrv_auth.c
+@@ -320,6 +320,11 @@ bool dcesrv_auth_request(struct dcesrv_call_state *call, DATA_BLOB *full_packet)
+ return false;
+ }
+
++ if (pkt->auth_length == 0) {
++ DEBUG(1,("dcesrv_auth_request: unexpected auth_length of 0\n"));
++ return false;
++ }
++
+ status = dcerpc_pull_auth_trailer(pkt, call,
+ &pkt->u.request.stub_and_verifier,
+ &auth, &auth_length, false);
+--
+2.8.1
+
+
+From c35b0e37f7d37459f55d67a5037c08bea4d33acf Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Sun, 28 Jun 2015 01:19:57 +0200
+Subject: [PATCH 09/40] CVE-2015-5370: librpc/rpc: don't allow pkt->auth_length
+ == 0 in dcerpc_pull_auth_trailer()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+All callers should have already checked that.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit 1ed83c7657a3b405db1928db06c29f41d2738186)
+---
+ librpc/rpc/dcerpc_util.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/librpc/rpc/dcerpc_util.c b/librpc/rpc/dcerpc_util.c
+index 2f599d5..89b7597 100644
+--- a/librpc/rpc/dcerpc_util.c
++++ b/librpc/rpc/dcerpc_util.c
+@@ -111,6 +111,11 @@ NTSTATUS dcerpc_pull_auth_trailer(const struct ncacn_packet *pkt,
+ }
+
+ /* Paranoia checks for auth_length. The caller should check this... */
++ if (pkt->auth_length == 0) {
++ return NT_STATUS_INTERNAL_ERROR;
++ }
++
++ /* Paranoia checks for auth_length. The caller should check this... */
+ if (pkt->auth_length > pkt->frag_length) {
+ return NT_STATUS_INTERNAL_ERROR;
+ }
+--
+2.8.1
+
+
+From 2341eb0cf8395b1fed628ee6779207d916827a5d Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Thu, 9 Jul 2015 07:59:24 +0200
+Subject: [PATCH 10/40] CVE-2015-5370: s3:librpc/rpc: remove auth trailer and
+ possible padding within dcerpc_check_auth()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This simplifies the callers a lot.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit df3cdf072d1c1e6fd0a58e0374348758f5c65a49)
+---
+ source3/librpc/rpc/dcerpc.h | 5 ++---
+ source3/librpc/rpc/dcerpc_helpers.c | 31 ++++++++++++++++++++-----------
+ source3/rpc_client/cli_pipe.c | 33 ++++++++++-----------------------
+ source3/rpc_server/srv_pipe.c | 17 +----------------
+ 4 files changed, 33 insertions(+), 53 deletions(-)
+
+diff --git a/source3/librpc/rpc/dcerpc.h b/source3/librpc/rpc/dcerpc.h
+index d14d8e0..e7cca9e 100644
+--- a/source3/librpc/rpc/dcerpc.h
++++ b/source3/librpc/rpc/dcerpc.h
+@@ -85,9 +85,8 @@ NTSTATUS dcerpc_add_auth_footer(struct pipe_auth_data *auth,
+ NTSTATUS dcerpc_check_auth(struct pipe_auth_data *auth,
+ struct ncacn_packet *pkt,
+ DATA_BLOB *pkt_trailer,
+- size_t header_size,
+- DATA_BLOB *raw_pkt,
+- size_t *pad_len);
++ uint8_t header_size,
++ DATA_BLOB *raw_pkt);
+
+ /* The following definitions come from librpc/rpc/rpc_common.c */
+
+diff --git a/source3/librpc/rpc/dcerpc_helpers.c b/source3/librpc/rpc/dcerpc_helpers.c
+index 76f2acc..d871339 100644
+--- a/source3/librpc/rpc/dcerpc_helpers.c
++++ b/source3/librpc/rpc/dcerpc_helpers.c
+@@ -844,19 +844,18 @@ NTSTATUS dcerpc_add_auth_footer(struct pipe_auth_data *auth,
+ *
+ * @param auth The auth data for the connection
+ * @param pkt The actual ncacn_packet
+-* @param pkt_trailer The stub_and_verifier part of the packet
++* @param pkt_trailer [in][out] The stub_and_verifier part of the packet,
++* the auth_trailer and padding will be removed.
+ * @param header_size The header size
+ * @param raw_pkt The whole raw packet data blob
+-* @param pad_len [out] The padding length used in the packet
+ *
+ * @return A NTSTATUS error code
+ */
+ NTSTATUS dcerpc_check_auth(struct pipe_auth_data *auth,
+ struct ncacn_packet *pkt,
+ DATA_BLOB *pkt_trailer,
+- size_t header_size,
+- DATA_BLOB *raw_pkt,
+- size_t *pad_len)
++ uint8_t header_size,
++ DATA_BLOB *raw_pkt)
+ {
+ struct schannel_state *schannel_auth;
+ struct auth_ntlmssp_state *ntlmssp_ctx;
+@@ -868,6 +867,14 @@ NTSTATUS dcerpc_check_auth(struct pipe_auth_data *auth,
+ DATA_BLOB full_pkt;
+ DATA_BLOB data;
+
++ /*
++ * These check should be done in the caller.
++ */
++ SMB_ASSERT(raw_pkt->length == pkt->frag_length);
++ SMB_ASSERT(header_size <= pkt->frag_length);
++ SMB_ASSERT(pkt_trailer->length < pkt->frag_length);
++ SMB_ASSERT((pkt_trailer->length + header_size) <= pkt->frag_length);
++
+ switch (auth->auth_level) {
+ case DCERPC_AUTH_LEVEL_PRIVACY:
+ DEBUG(10, ("Requested Privacy.\n"));
+@@ -881,7 +888,6 @@ NTSTATUS dcerpc_check_auth(struct pipe_auth_data *auth,
+ if (pkt->auth_length != 0) {
+ break;
+ }
+- *pad_len = 0;
+ return NT_STATUS_OK;
+
+ case DCERPC_AUTH_LEVEL_NONE:
+@@ -890,7 +896,6 @@ NTSTATUS dcerpc_check_auth(struct pipe_auth_data *auth,
+ "authenticated connection!\n"));
+ return NT_STATUS_INVALID_PARAMETER;
+ }
+- *pad_len = 0;
+ return NT_STATUS_OK;
+
+ default:
+@@ -909,10 +914,11 @@ NTSTATUS dcerpc_check_auth(struct pipe_auth_data *auth,
+ return status;
+ }
+
++ pkt_trailer->length -= auth_length;
+ data = data_blob_const(raw_pkt->data + header_size,
+- pkt_trailer->length - auth_length);
+- full_pkt = data_blob_const(raw_pkt->data,
+- raw_pkt->length - auth_info.credentials.length);
++ pkt_trailer->length);
++ full_pkt = data_blob_const(raw_pkt->data, raw_pkt->length);
++ full_pkt.length -= auth_info.credentials.length;
+
+ switch (auth->auth_type) {
+ case DCERPC_AUTH_TYPE_NONE:
+@@ -988,10 +994,13 @@ NTSTATUS dcerpc_check_auth(struct pipe_auth_data *auth,
+ * pkt_trailer actually has a copy of the raw data, and they
+ * are still both used in later calls */
+ if (auth->auth_level == DCERPC_AUTH_LEVEL_PRIVACY) {
++ if (pkt_trailer->length != data.length) {
++ return NT_STATUS_INVALID_PARAMETER;
++ }
+ memcpy(pkt_trailer->data, data.data, data.length);
+ }
+
+- *pad_len = auth_info.auth_pad_length;
++ pkt_trailer->length -= auth_info.auth_pad_length;
+ data_blob_free(&auth_info.credentials);
+ return NT_STATUS_OK;
+ }
+diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
+index 2787fbc..776e2bf 100644
+--- a/source3/rpc_client/cli_pipe.c
++++ b/source3/rpc_client/cli_pipe.c
+@@ -404,9 +404,9 @@ static NTSTATUS cli_pipe_validate_current_pdu(TALLOC_CTX *mem_ctx,
+ DATA_BLOB *rdata,
+ DATA_BLOB *reply_pdu)
+ {
+- struct dcerpc_response *r;
++ const struct dcerpc_response *r = NULL;
++ DATA_BLOB tmp_stub = data_blob_null;
+ NTSTATUS ret = NT_STATUS_OK;
+- size_t pad_len = 0;
+
+ /*
+ * Point the return values at the real data including the RPC
+@@ -440,37 +440,24 @@ static NTSTATUS cli_pipe_validate_current_pdu(TALLOC_CTX *mem_ctx,
+
+ r = &pkt->u.response;
+
++ tmp_stub.data = r->stub_and_verifier.data;
++ tmp_stub.length = r->stub_and_verifier.length;
++
+ /* Here's where we deal with incoming sign/seal. */
+ ret = dcerpc_check_auth(cli->auth, pkt,
+- &r->stub_and_verifier,
++ &tmp_stub,
+ DCERPC_RESPONSE_LENGTH,
+- pdu, &pad_len);
++ pdu);
+ if (!NT_STATUS_IS_OK(ret)) {
+ return ret;
+ }
+
+- if (pkt->frag_length < DCERPC_RESPONSE_LENGTH + pad_len) {
+- return NT_STATUS_BUFFER_TOO_SMALL;
+- }
+-
+ /* Point the return values at the NDR data. */
+- rdata->data = r->stub_and_verifier.data;
+-
+- if (pkt->auth_length) {
+- /* We've already done integer wrap tests in
+- * dcerpc_check_auth(). */
+- rdata->length = r->stub_and_verifier.length
+- - pad_len
+- - DCERPC_AUTH_TRAILER_LENGTH
+- - pkt->auth_length;
+- } else {
+- rdata->length = r->stub_and_verifier.length;
+- }
++ *rdata = tmp_stub;
+
+- DEBUG(10, ("Got pdu len %lu, data_len %lu, ss_len %u\n",
++ DEBUG(10, ("Got pdu len %lu, data_len %lu\n",
+ (long unsigned int)pdu->length,
+- (long unsigned int)rdata->length,
+- (unsigned int)pad_len));
++ (long unsigned int)rdata->length));
+
+ /*
+ * If this is the first reply, and the allocation hint is
+diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
+index 964b843..0ab7dc6 100644
+--- a/source3/rpc_server/srv_pipe.c
++++ b/source3/rpc_server/srv_pipe.c
+@@ -1848,7 +1848,6 @@ static NTSTATUS dcesrv_auth_request(struct pipe_auth_data *auth,
+ {
+ NTSTATUS status;
+ size_t hdr_size = DCERPC_REQUEST_LENGTH;
+- size_t pad_len;
+
+ DEBUG(10, ("Checking request auth.\n"));
+
+@@ -1859,25 +1858,11 @@ static NTSTATUS dcesrv_auth_request(struct pipe_auth_data *auth,
+ /* in case of sealing this function will unseal the data in place */
+ status = dcerpc_check_auth(auth, pkt,
+ &pkt->u.request.stub_and_verifier,
+- hdr_size, raw_pkt,
+- &pad_len);
++ hdr_size, raw_pkt);
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
+ }
+
+-
+- /* remove padding and auth trailer,
+- * this way the caller will get just the data */
+- if (pkt->auth_length) {
+- size_t trail_len = pad_len
+- + DCERPC_AUTH_TRAILER_LENGTH
+- + pkt->auth_length;
+- if (pkt->u.request.stub_and_verifier.length < trail_len) {
+- return NT_STATUS_INFO_LENGTH_MISMATCH;
+- }
+- pkt->u.request.stub_and_verifier.length -= trail_len;
+- }
+-
+ return NT_STATUS_OK;
+ }
+
+--
+2.8.1
+
+
+From 9ecba8f4635aa5dbd42e4838ce124a92395b64ab Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Thu, 9 Jul 2015 07:59:24 +0200
+Subject: [PATCH 11/40] CVE-2015-5370: s3:librpc/rpc: let dcerpc_check_auth()
+ auth_{type,level} against the expected values.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit 19f489d32c03ff5fafd34fe86a075d782af1989a)
+---
+ source3/librpc/rpc/dcerpc_helpers.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/source3/librpc/rpc/dcerpc_helpers.c b/source3/librpc/rpc/dcerpc_helpers.c
+index d871339..c07835f 100644
+--- a/source3/librpc/rpc/dcerpc_helpers.c
++++ b/source3/librpc/rpc/dcerpc_helpers.c
+@@ -914,6 +914,14 @@ NTSTATUS dcerpc_check_auth(struct pipe_auth_data *auth,
+ return status;
+ }
+
++ if (auth_info.auth_type != auth->auth_type) {
++ return NT_STATUS_INVALID_PARAMETER;
++ }
++
++ if (auth_info.auth_level != auth->auth_level) {
++ return NT_STATUS_INVALID_PARAMETER;
++ }
++
+ pkt_trailer->length -= auth_length;
+ data = data_blob_const(raw_pkt->data + header_size,
+ pkt_trailer->length);
+--
+2.8.1
+
+
+From 765c10dacf39a3c06c6b12651c205ac270e7fcea Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Tue, 7 Jul 2015 13:05:01 +0200
+Subject: [PATCH 12/40] CVE-2015-5370: s3:rpc_client: make use of
+ dcerpc_pull_auth_trailer()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The does much more validation than dcerpc_pull_dcerpc_auth().
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit acea87f158f02c3240abff45c3e54c7d5fa60b29)
+---
+ source3/rpc_client/cli_pipe.c | 20 ++++++--------------
+ 1 file changed, 6 insertions(+), 14 deletions(-)
+
+diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
+index 776e2bf..27e37f8 100644
+--- a/source3/rpc_client/cli_pipe.c
++++ b/source3/rpc_client/cli_pipe.c
+@@ -1938,20 +1938,15 @@ static void rpc_pipe_bind_step_one_done(struct tevent_req *subreq)
+ rpc_pipe_bind_step_two_trigger(req);
+ return;
+
+- case DCERPC_AUTH_TYPE_NTLMSSP:
+- case DCERPC_AUTH_TYPE_SPNEGO:
+- case DCERPC_AUTH_TYPE_KRB5:
+- /* Paranoid lenght checks */
+- if (pkt->frag_length < DCERPC_AUTH_TRAILER_LENGTH
+- + pkt->auth_length) {
+- tevent_req_nterror(req,
+- NT_STATUS_INFO_LENGTH_MISMATCH);
++ default:
++ if (pkt->auth_length == 0) {
++ tevent_req_nterror(req, NT_STATUS_RPC_PROTOCOL_ERROR);
+ return;
+ }
+ /* get auth credentials */
+- status = dcerpc_pull_dcerpc_auth(talloc_tos(),
+- &pkt->u.bind_ack.auth_info,
+- &auth, false);
++ status = dcerpc_pull_auth_trailer(pkt, talloc_tos(),
++ &pkt->u.bind_ack.auth_info,
++ &auth, NULL, true);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(0, ("Failed to pull dcerpc auth: %s.\n",
+ nt_errstr(status)));
+@@ -1959,9 +1954,6 @@ static void rpc_pipe_bind_step_one_done(struct tevent_req *subreq)
+ return;
+ }
+ break;
+-
+- default:
+- goto err_out;
+ }
+
+ /*
+--
+2.8.1
+
+
+From b58616bbcc810b076e5fd9dd976272847f832b06 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Tue, 7 Jul 2015 13:05:01 +0200
+Subject: [PATCH 13/40] CVE-2015-5370: s3:rpc_client: make use of
+ dcerpc_verify_ncacn_packet_header() in cli_pipe_validate_current_pdu()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit 81bbffa14f5f6faa9801a3bf2d564d2762d49bb6)
+---
+ source3/rpc_client/cli_pipe.c | 111 ++++++++++++++++++++++++++++++++++++------
+ 1 file changed, 96 insertions(+), 15 deletions(-)
+
+diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
+index 27e37f8..6a22d38 100644
+--- a/source3/rpc_client/cli_pipe.c
++++ b/source3/rpc_client/cli_pipe.c
+@@ -429,17 +429,89 @@ static NTSTATUS cli_pipe_validate_current_pdu(TALLOC_CTX *mem_ctx,
+
+ /* Ensure we have the correct type. */
+ switch (pkt->ptype) {
+- case DCERPC_PKT_ALTER_RESP:
++ case DCERPC_PKT_BIND_NAK:
++ DEBUG(1, (__location__ ": Bind NACK received from %s!\n",
++ rpccli_pipe_txt(talloc_tos(), cli)));
++
++ ret = dcerpc_verify_ncacn_packet_header(pkt,
++ DCERPC_PKT_BIND_NAK,
++ 0, /* max_auth_info */
++ DCERPC_PFC_FLAG_FIRST |
++ DCERPC_PFC_FLAG_LAST,
++ 0); /* optional flags */
++ if (!NT_STATUS_IS_OK(ret)) {
++ DEBUG(1, (__location__ ": Connection to %s got an unexpected "
++ "RPC packet type - %u, expected %u: %s\n",
++ rpccli_pipe_txt(talloc_tos(), cli),
++ pkt->ptype, expected_pkt_type,
++ nt_errstr(ret)));
++ NDR_PRINT_DEBUG(ncacn_packet, pkt);
++ return ret;
++ }
++
++ /* Use this for now... */
++ return NT_STATUS_NETWORK_ACCESS_DENIED;
++
+ case DCERPC_PKT_BIND_ACK:
++ ret = dcerpc_verify_ncacn_packet_header(pkt,
++ expected_pkt_type,
++ pkt->u.bind_ack.auth_info.length,
++ DCERPC_PFC_FLAG_FIRST |
++ DCERPC_PFC_FLAG_LAST,
++ DCERPC_PFC_FLAG_CONC_MPX |
++ DCERPC_PFC_FLAG_SUPPORT_HEADER_SIGN);
++ if (!NT_STATUS_IS_OK(ret)) {
++ DEBUG(1, (__location__ ": Connection to %s got an unexpected "
++ "RPC packet type - %u, expected %u: %s\n",
++ rpccli_pipe_txt(talloc_tos(), cli),
++ pkt->ptype, expected_pkt_type,
++ nt_errstr(ret)));
++ NDR_PRINT_DEBUG(ncacn_packet, pkt);
++ return ret;
++ }
+
+- /* Client code never receives this kind of packets */
+ break;
+
++ case DCERPC_PKT_ALTER_RESP:
++ ret = dcerpc_verify_ncacn_packet_header(pkt,
++ expected_pkt_type,
++ pkt->u.alter_resp.auth_info.length,
++ DCERPC_PFC_FLAG_FIRST |
++ DCERPC_PFC_FLAG_LAST,
++ DCERPC_PFC_FLAG_CONC_MPX |
++ DCERPC_PFC_FLAG_SUPPORT_HEADER_SIGN);
++ if (!NT_STATUS_IS_OK(ret)) {
++ DEBUG(1, (__location__ ": Connection to %s got an unexpected "
++ "RPC packet type - %u, expected %u: %s\n",
++ rpccli_pipe_txt(talloc_tos(), cli),
++ pkt->ptype, expected_pkt_type,
++ nt_errstr(ret)));
++ NDR_PRINT_DEBUG(ncacn_packet, pkt);
++ return ret;
++ }
++
++ break;
+
+ case DCERPC_PKT_RESPONSE:
+
+ r = &pkt->u.response;
+
++ ret = dcerpc_verify_ncacn_packet_header(pkt,
++ expected_pkt_type,
++ r->stub_and_verifier.length,
++ 0, /* required_flags */
++ DCERPC_PFC_FLAG_FIRST |
++ DCERPC_PFC_FLAG_LAST);
++ if (!NT_STATUS_IS_OK(ret)) {
++ DEBUG(1, (__location__ ": Connection to %s got an unexpected "
++ "RPC packet type - %u, expected %u: %s\n",
++ rpccli_pipe_txt(talloc_tos(), cli),
++ pkt->ptype, expected_pkt_type,
++ nt_errstr(ret)));
++ NDR_PRINT_DEBUG(ncacn_packet, pkt);
++ return ret;
++ }
++
+ tmp_stub.data = r->stub_and_verifier.data;
+ tmp_stub.length = r->stub_and_verifier.length;
+
+@@ -449,6 +521,12 @@ static NTSTATUS cli_pipe_validate_current_pdu(TALLOC_CTX *mem_ctx,
+ DCERPC_RESPONSE_LENGTH,
+ pdu);
+ if (!NT_STATUS_IS_OK(ret)) {
++ DEBUG(1, (__location__ ": Connection to %s got an unexpected "
++ "RPC packet type - %u, expected %u: %s\n",
++ rpccli_pipe_txt(talloc_tos(), cli),
++ pkt->ptype, expected_pkt_type,
++ nt_errstr(ret)));
++ NDR_PRINT_DEBUG(ncacn_packet, pkt);
+ return ret;
+ }
+
+@@ -478,14 +556,24 @@ static NTSTATUS cli_pipe_validate_current_pdu(TALLOC_CTX *mem_ctx,
+
+ break;
+
+- case DCERPC_PKT_BIND_NAK:
+- DEBUG(1, (__location__ ": Bind NACK received from %s!\n",
+- rpccli_pipe_txt(talloc_tos(), cli)));
+- /* Use this for now... */
+- return NT_STATUS_NETWORK_ACCESS_DENIED;
+-
+ case DCERPC_PKT_FAULT:
+
++ ret = dcerpc_verify_ncacn_packet_header(pkt,
++ DCERPC_PKT_FAULT,
++ 0, /* max_auth_info */
++ DCERPC_PFC_FLAG_FIRST |
++ DCERPC_PFC_FLAG_LAST,
++ DCERPC_PFC_FLAG_DID_NOT_EXECUTE);
++ if (!NT_STATUS_IS_OK(ret)) {
++ DEBUG(1, (__location__ ": Connection to %s got an unexpected "
++ "RPC packet type - %u, expected %u: %s\n",
++ rpccli_pipe_txt(talloc_tos(), cli),
++ pkt->ptype, expected_pkt_type,
++ nt_errstr(ret)));
++ NDR_PRINT_DEBUG(ncacn_packet, pkt);
++ return ret;
++ }
++
+ DEBUG(1, (__location__ ": RPC fault code %s received "
+ "from %s!\n",
+ dcerpc_errstr(talloc_tos(),
+@@ -502,13 +590,6 @@ static NTSTATUS cli_pipe_validate_current_pdu(TALLOC_CTX *mem_ctx,
+ return NT_STATUS_RPC_PROTOCOL_ERROR;
+ }
+
+- if (pkt->ptype != expected_pkt_type) {
+- DEBUG(3, (__location__ ": Connection to %s got an unexpected "
+- "RPC packet type - %u, not %u\n",
+- rpccli_pipe_txt(talloc_tos(), cli),
+- pkt->ptype, expected_pkt_type));
+- return NT_STATUS_RPC_PROTOCOL_ERROR;
+- }
+
+ if (pkt->call_id != call_id) {
+ DEBUG(3, (__location__ ": Connection to %s got an unexpected "
+--
+2.8.1
+
+
+From 3e03b1e6d5b20c14d53763f22442bf510a8d6dcd Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Fri, 10 Jul 2015 14:48:38 +0200
+Subject: [PATCH 14/40] CVE-2015-5370: s3:rpc_client: protect
+ rpc_api_pipe_got_pdu() against too large payloads
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit 98182969e761429e577064e1a0fd5cbc6b50d7d9)
+---
+ source3/rpc_client/cli_pipe.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
+index 6a22d38..755b458 100644
+--- a/source3/rpc_client/cli_pipe.c
++++ b/source3/rpc_client/cli_pipe.c
+@@ -1007,6 +1007,11 @@ static void rpc_api_pipe_got_pdu(struct tevent_req *subreq)
+ return;
+ }
+
++ if (state->reply_pdu_offset + rdata.length > MAX_RPC_DATA_SIZE) {
++ tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
++ return;
++ }
++
+ /* Now copy the data portion out of the pdu into rbuf. */
+ if (state->reply_pdu.length < state->reply_pdu_offset + rdata.length) {
+ if (!data_blob_realloc(NULL, &state->reply_pdu,
+--
+2.8.1
+
+
+From fa884c266be5d808d19955f92921417f435b2957 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Tue, 7 Jul 2015 22:51:18 +0200
+Subject: [PATCH 15/40] CVE-2015-5370: s3:rpc_client: verify auth_{type,level}
+ in rpc_pipe_bind_step_one_done()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit df51c22bea7fbf906613ceb160f16f298b2e3106)
+---
+ source3/rpc_client/cli_pipe.c | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
+index 755b458..1c4ff01 100644
+--- a/source3/rpc_client/cli_pipe.c
++++ b/source3/rpc_client/cli_pipe.c
+@@ -2039,6 +2039,21 @@ static void rpc_pipe_bind_step_one_done(struct tevent_req *subreq)
+ tevent_req_nterror(req, status);
+ return;
+ }
++
++ if (auth.auth_type != pauth->auth_type) {
++ DEBUG(0, (__location__ " Auth type %u mismatch expected %u.\n",
++ auth.auth_type, pauth->auth_type));
++ tevent_req_nterror(req, NT_STATUS_RPC_PROTOCOL_ERROR);
++ return;
++ }
++
++ if (auth.auth_level != pauth->auth_level) {
++ DEBUG(0, (__location__ " Auth level %u mismatch expected %u.\n",
++ auth.auth_level, pauth->auth_level));
++ tevent_req_nterror(req, NT_STATUS_RPC_PROTOCOL_ERROR);
++ return;
++ }
++
+ break;
+ }
+
+--
+2.8.1
+
+
+From 6d2767ad8b084590c572e90d1985ca6d7d36b188 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Tue, 7 Jul 2015 13:05:01 +0200
+Subject: [PATCH 16/40] CVE-2015-5370: s3:rpc_server: make use of
+ dcerpc_pull_auth_trailer() in api_pipe_{bind_req,alter_context,bind_auth3}()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit 2a92546590a78760d2fe0e63067a3888dbce53be)
+---
+ source3/rpc_server/srv_pipe.c | 62 +++++++++----------------------------------
+ 1 file changed, 13 insertions(+), 49 deletions(-)
+
+diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
+index 0ab7dc6..40b1b8e 100644
+--- a/source3/rpc_server/srv_pipe.c
++++ b/source3/rpc_server/srv_pipe.c
+@@ -1012,25 +1012,12 @@ static bool api_pipe_bind_req(struct pipes_struct *p,
+ * Check if this is an authenticated bind request.
+ */
+ if (pkt->auth_length) {
+- /* Quick length check. Won't catch a bad auth footer,
+- * prevents overrun. */
+-
+- if (pkt->frag_length < RPC_HEADER_LEN +
+- DCERPC_AUTH_TRAILER_LENGTH +
+- pkt->auth_length) {
+- DEBUG(0,("api_pipe_bind_req: auth_len (%u) "
+- "too long for fragment %u.\n",
+- (unsigned int)pkt->auth_length,
+- (unsigned int)pkt->frag_length));
+- goto err_exit;
+- }
+-
+ /*
+ * Decode the authentication verifier.
+ */
+- status = dcerpc_pull_dcerpc_auth(pkt,
+- &pkt->u.bind.auth_info,
+- &auth_info, p->endian);
++ status = dcerpc_pull_auth_trailer(pkt, pkt,
++ &pkt->u.bind.auth_info,
++ &auth_info, NULL, true);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(0, ("Unable to unmarshall dcerpc_auth.\n"));
+ goto err_exit;
+@@ -1233,23 +1220,13 @@ bool api_pipe_bind_auth3(struct pipes_struct *p, struct ncacn_packet *pkt)
+ goto err;
+ }
+
+- /* Ensure there's enough data for an authenticated request. */
+- if (pkt->frag_length < RPC_HEADER_LEN
+- + DCERPC_AUTH_TRAILER_LENGTH
+- + pkt->auth_length) {
+- DEBUG(0,("api_pipe_ntlmssp_auth_process: auth_len "
+- "%u is too large.\n",
+- (unsigned int)pkt->auth_length));
+- goto err;
+- }
+-
+ /*
+ * Decode the authentication verifier response.
+ */
+
+- status = dcerpc_pull_dcerpc_auth(pkt,
+- &pkt->u.auth3.auth_info,
+- &auth_info, p->endian);
++ status = dcerpc_pull_auth_trailer(pkt, pkt,
++ &pkt->u.auth3.auth_info,
++ &auth_info, NULL, true);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(0, ("Failed to unmarshall dcerpc_auth.\n"));
+ goto err;
+@@ -1382,34 +1359,21 @@ static bool api_pipe_alter_context(struct pipes_struct *p,
+ * Check if this is an authenticated alter context request.
+ */
+ if (pkt->auth_length) {
+- /* Quick length check. Won't catch a bad auth footer,
+- * prevents overrun. */
+-
+- if (pkt->frag_length < RPC_HEADER_LEN +
+- DCERPC_AUTH_TRAILER_LENGTH +
+- pkt->auth_length) {
+- DEBUG(0,("api_pipe_alter_context: auth_len (%u) "
+- "too long for fragment %u.\n",
+- (unsigned int)pkt->auth_length,
+- (unsigned int)pkt->frag_length ));
++ /* We can only finish if the pipe is unbound for now */
++ if (p->pipe_bound) {
++ DEBUG(0, (__location__ ": Pipe already bound, "
++ "Altering Context not yet supported!\n"));
+ goto err_exit;
+ }
+
+- status = dcerpc_pull_dcerpc_auth(pkt,
+- &pkt->u.bind.auth_info,
+- &auth_info, p->endian);
++ status = dcerpc_pull_auth_trailer(pkt, pkt,
++ &pkt->u.bind.auth_info,
++ &auth_info, NULL, true);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(0, ("Unable to unmarshall dcerpc_auth.\n"));
+ goto err_exit;
+ }
+
+- /* We can only finish if the pipe is unbound for now */
+- if (p->pipe_bound) {
+- DEBUG(0, (__location__ ": Pipe already bound, "
+- "Altering Context not yet supported!\n"));
+- goto err_exit;
+- }
+-
+ if (auth_info.auth_type != p->auth.auth_type) {
+ DEBUG(0, ("Auth type mismatch! Client sent %d, "
+ "but auth was started as type %d!\n",
+--
+2.8.1
+
+
+From 7400ac11282d540d4f5f80d0f58ec99beabb7d8e Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Wed, 23 Dec 2015 12:38:55 +0100
+Subject: [PATCH 17/40] CVE-2015-5370: s3:rpc_server: let a failing
+ sec_verification_trailer mark the connection as broken
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+(cherry picked from commit 189c0fbb7a3405f0893f23e5b8d755d259f98eaf)
+---
+ source3/rpc_server/srv_pipe.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
+index 40b1b8e..da9b91c 100644
+--- a/source3/rpc_server/srv_pipe.c
++++ b/source3/rpc_server/srv_pipe.c
+@@ -1663,6 +1663,7 @@ static bool api_pipe_request(struct pipes_struct *p,
+
+ if (!srv_pipe_check_verification_trailer(p, pkt, pipe_fns)) {
+ DEBUG(1, ("srv_pipe_check_verification_trailer: failed\n"));
++ set_incoming_fault(p);
+ setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_ACCESS_DENIED));
+ data_blob_free(&p->out_data.rdata);
+ TALLOC_FREE(frame);
+--
+2.8.1
+
+
+From 55da4653f5986989e46be6320f96590f8ebb4ef7 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Tue, 7 Jul 2015 13:05:01 +0200
+Subject: [PATCH 18/40] CVE-2015-5370: s3:rpc_server: don't ignore failures of
+ dcerpc_push_ncacn_packet()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit 25bf597124f217c55b5ca71a5ea9cb0ea83943e5)
+---
+ source3/rpc_server/srv_pipe.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
+index da9b91c..71b4665 100644
+--- a/source3/rpc_server/srv_pipe.c
++++ b/source3/rpc_server/srv_pipe.c
+@@ -1152,6 +1152,7 @@ static bool api_pipe_bind_req(struct pipes_struct *p,
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(0, ("Failed to marshall bind_ack packet. (%s)\n",
+ nt_errstr(status)));
++ goto err_exit;
+ }
+
+ if (auth_resp.length) {
+@@ -1469,6 +1470,7 @@ static bool api_pipe_alter_context(struct pipes_struct *p,
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(0, ("Failed to marshall bind_ack packet. (%s)\n",
+ nt_errstr(status)));
++ goto err_exit;
+ }
+
+ if (auth_resp.length) {
+--
+2.8.1
+
+
+From 893c840a1aac6711a081eb8e25f2c2a6078fc373 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Tue, 7 Jul 2015 13:05:01 +0200
+Subject: [PATCH 19/40] CVE-2015-5370: s3:rpc_server: don't allow auth3 if the
+ authentication was already finished
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit 69280e6acef7c3941407d4308b659c5e90ed702d)
+---
+ source3/rpc_server/srv_pipe.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
+index 71b4665..4e5b50d4 100644
+--- a/source3/rpc_server/srv_pipe.c
++++ b/source3/rpc_server/srv_pipe.c
+@@ -1216,8 +1216,15 @@ bool api_pipe_bind_auth3(struct pipes_struct *p, struct ncacn_packet *pkt)
+
+ DEBUG(5, ("api_pipe_bind_auth3: decode request. %d\n", __LINE__));
+
++ /* We can only finish if the pipe is unbound for now */
++ if (p->pipe_bound) {
++ DEBUG(0, (__location__ ": Pipe already bound, "
++ "AUTH3 not supported!\n"));
++ goto err;
++ }
++
+ if (pkt->auth_length == 0) {
+- DEBUG(0, ("No auth field sent for bind request!\n"));
++ DEBUG(1, ("No auth field sent for auth3 request!\n"));
+ goto err;
+ }
+
+--
+2.8.1
+
+
+From a66baed0c65b7acb4d76ef9ea3ae1248a6b5773a Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Tue, 14 Jul 2015 16:18:45 +0200
+Subject: [PATCH 20/40] CVE-2015-5370: s3:rpc_server: let a failing auth3 mark
+ the authentication as invalid
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit 8c96ef7b4fbd925607b26d351b14ad9a95febd88)
+---
+ source3/rpc_server/srv_pipe.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
+index 4e5b50d4..d28ba8e 100644
+--- a/source3/rpc_server/srv_pipe.c
++++ b/source3/rpc_server/srv_pipe.c
+@@ -1304,7 +1304,7 @@ bool api_pipe_bind_auth3(struct pipes_struct *p, struct ncacn_packet *pkt)
+ return true;
+
+ err:
+-
++ p->pipe_bound = false;
+ TALLOC_FREE(p->auth.auth_ctx);
+ return false;
+ }
+--
+2.8.1
+
+
+From e47becdf2c03d68662ab998c4608adb371ca2f08 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Tue, 7 Jul 2015 13:05:01 +0200
+Subject: [PATCH 21/40] CVE-2015-5370: s3:rpc_server: make sure auth_level
+ isn't changed by alter_context or auth3
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit 63d21d2546a1064be73582a499ec15b0e11e2708)
+---
+ source3/rpc_server/srv_pipe.c | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
+index d28ba8e..1b81a4c 100644
+--- a/source3/rpc_server/srv_pipe.c
++++ b/source3/rpc_server/srv_pipe.c
+@@ -1252,6 +1252,13 @@ bool api_pipe_bind_auth3(struct pipes_struct *p, struct ncacn_packet *pkt)
+ goto err;
+ }
+
++ if (auth_info.auth_level != p->auth.auth_level) {
++ DEBUG(1, ("Auth level mismatch! Client sent %d, "
++ "but auth was started as level %d!\n",
++ auth_info.auth_level, p->auth.auth_level));
++ goto err;
++ }
++
+ switch (auth_info.auth_type) {
+ case DCERPC_AUTH_TYPE_NTLMSSP:
+ ntlmssp_ctx = talloc_get_type_abort(p->auth.auth_ctx,
+@@ -1389,6 +1396,12 @@ static bool api_pipe_alter_context(struct pipes_struct *p,
+ goto err_exit;
+ }
+
++ if (auth_info.auth_level != p->auth.auth_level) {
++ DEBUG(0, ("Auth level mismatch! Client sent %d, "
++ "but auth was started as level %d!\n",
++ auth_info.auth_level, p->auth.auth_level));
++ goto err_exit;
++ }
+
+ switch (auth_info.auth_type) {
+ case DCERPC_AUTH_TYPE_SPNEGO:
+--
+2.8.1
+
+
+From 687a4801391c946a62d07a7bdad096a97da0d432 Mon Sep 17 00:00:00 2001
+From: Jeremy Allison <jra(a)samba.org>
+Date: Tue, 7 Jul 2015 09:15:39 +0200
+Subject: [PATCH 22/40] CVE-2015-5370: s3:rpc_server: ensure that the message
+ ordering doesn't violate the spec
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The first pdu is always a BIND.
+
+REQUEST pdus are only allowed once the authentication
+is finished.
+
+A simple anonymous authentication is finished after the BIND.
+Real authentication may need additional ALTER or AUTH3 exchanges.
+
+Pair-Programmed-With: Stefan Metzmacher <metze(a)samba.org>
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Jeremy Allison <jra(a)samba.org>
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit 0239bfa562ee303c4ac204375b3c66ca287f6cb0)
+---
+ source3/include/ntdomain.h | 7 ++++++
+ source3/rpc_server/rpc_ncacn_np.c | 1 +
+ source3/rpc_server/rpc_server.c | 1 +
+ source3/rpc_server/srv_pipe.c | 51 ++++++++++++++++++++++++++++++++++-----
+ 4 files changed, 54 insertions(+), 6 deletions(-)
+
+diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h
+index 650f1d0..b3c5451 100644
+--- a/source3/include/ntdomain.h
++++ b/source3/include/ntdomain.h
+@@ -139,6 +139,13 @@ struct pipes_struct {
+ bool pipe_bound;
+
+ /*
++ * States we can be in.
++ */
++ bool allow_alter;
++ bool allow_bind;
++ bool allow_auth3;
++
++ /*
+ * Set the DCERPC_FAULT to return.
+ */
+
+diff --git a/source3/rpc_server/rpc_ncacn_np.c b/source3/rpc_server/rpc_ncacn_np.c
+index efdee27..f2e9d10 100644
+--- a/source3/rpc_server/rpc_ncacn_np.c
++++ b/source3/rpc_server/rpc_ncacn_np.c
+@@ -171,6 +171,7 @@ struct pipes_struct *make_internal_rpc_pipe_p(TALLOC_CTX *mem_ctx,
+
+ p->syntax = *syntax;
+ p->transport = NCALRPC;
++ p->allow_bind = true;
+
+ DEBUG(4,("Created internal pipe %s (pipes_open=%d)\n",
+ get_pipe_name_from_syntax(talloc_tos(), syntax), pipes_open));
+diff --git a/source3/rpc_server/rpc_server.c b/source3/rpc_server/rpc_server.c
+index 8ec55bb..376d26a 100644
+--- a/source3/rpc_server/rpc_server.c
++++ b/source3/rpc_server/rpc_server.c
+@@ -102,6 +102,7 @@ static int make_server_pipes_struct(TALLOC_CTX *mem_ctx,
+ p->syntax = id;
+ p->transport = transport;
+ p->ncalrpc_as_system = ncalrpc_as_system;
++ p->allow_bind = true;
+
+ p->mem_ctx = talloc_named(p, 0, "pipe %s %p", pipe_name, p);
+ if (!p->mem_ctx) {
+diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
+index 1b81a4c..41111aa 100644
+--- a/source3/rpc_server/srv_pipe.c
++++ b/source3/rpc_server/srv_pipe.c
+@@ -279,6 +279,9 @@ static bool setup_bind_nak(struct pipes_struct *p, struct ncacn_packet *pkt)
+ p->auth.auth_level = DCERPC_AUTH_LEVEL_NONE;
+ p->auth.auth_type = DCERPC_AUTH_TYPE_NONE;
+ p->pipe_bound = False;
++ p->allow_bind = false;
++ p->allow_alter = false;
++ p->allow_auth3 = false;
+
+ return True;
+ }
+@@ -828,6 +831,11 @@ static NTSTATUS pipe_auth_verify_final(struct pipes_struct *p)
+ void *mech_ctx;
+ NTSTATUS status;
+
++ if (p->auth.auth_type == DCERPC_AUTH_TYPE_NONE) {
++ p->pipe_bound = true;
++ return NT_STATUS_OK;
++ }
++
+ switch (p->auth.auth_type) {
+ case DCERPC_AUTH_TYPE_NTLMSSP:
+ ntlmssp_ctx = talloc_get_type_abort(p->auth.auth_ctx,
+@@ -919,13 +927,11 @@ static bool api_pipe_bind_req(struct pipes_struct *p,
+ DATA_BLOB auth_resp = data_blob_null;
+ DATA_BLOB auth_blob = data_blob_null;
+
+- /* No rebinds on a bound pipe - use alter context. */
+- if (p->pipe_bound) {
+- DEBUG(2,("api_pipe_bind_req: rejecting bind request on bound "
+- "pipe %s.\n",
+- get_pipe_name_from_syntax(talloc_tos(), &p->syntax)));
++ if (!p->allow_bind) {
++ DEBUG(2,("Pipe not in allow bind state\n"));
+ return setup_bind_nak(p, pkt);
+ }
++ p->allow_bind = false;
+
+ if (pkt->u.bind.num_contexts == 0) {
+ DEBUG(0, ("api_pipe_bind_req: no rpc contexts around\n"));
+@@ -1192,6 +1198,22 @@ static bool api_pipe_bind_req(struct pipes_struct *p,
+ p->out_data.current_pdu_sent = 0;
+
+ TALLOC_FREE(auth_blob.data);
++
++ if (bind_ack_ctx.result == 0) {
++ p->allow_alter = true;
++ p->allow_auth3 = true;
++ if (p->auth.auth_type == DCERPC_AUTH_TYPE_NONE) {
++ status = pipe_auth_verify_final(p);
++ if (!NT_STATUS_IS_OK(status)) {
++ DEBUG(0, ("pipe_auth_verify_final failed: %s\n",
++ nt_errstr(status)));
++ goto err_exit;
++ }
++ }
++ } else {
++ goto err_exit;
++ }
++
+ return True;
+
+ err_exit:
+@@ -1216,6 +1238,11 @@ bool api_pipe_bind_auth3(struct pipes_struct *p, struct ncacn_packet *pkt)
+
+ DEBUG(5, ("api_pipe_bind_auth3: decode request. %d\n", __LINE__));
+
++ if (!p->allow_auth3) {
++ DEBUG(1, ("Pipe not in allow auth3 state.\n"));
++ goto err;
++ }
++
+ /* We can only finish if the pipe is unbound for now */
+ if (p->pipe_bound) {
+ DEBUG(0, (__location__ ": Pipe already bound, "
+@@ -1312,6 +1339,10 @@ bool api_pipe_bind_auth3(struct pipes_struct *p, struct ncacn_packet *pkt)
+
+ err:
+ p->pipe_bound = false;
++ p->allow_bind = false;
++ p->allow_alter = false;
++ p->allow_auth3 = false;
++
+ TALLOC_FREE(p->auth.auth_ctx);
+ return false;
+ }
+@@ -1338,6 +1369,11 @@ static bool api_pipe_alter_context(struct pipes_struct *p,
+
+ DEBUG(5,("api_pipe_alter_context: make response. %d\n", __LINE__));
+
++ if (!p->allow_alter) {
++ DEBUG(1, ("Pipe not in allow alter state.\n"));
++ goto err_exit;
++ }
++
+ if (pkt->u.bind.assoc_group_id != 0) {
+ assoc_gid = pkt->u.bind.assoc_group_id;
+ } else {
+@@ -1363,7 +1399,6 @@ static bool api_pipe_alter_context(struct pipes_struct *p,
+ bind_ack_ctx.reason = 0;
+ bind_ack_ctx.syntax = pkt->u.bind.ctx_list[0].transfer_syntaxes[0];
+ } else {
+- p->pipe_bound = False;
+ /* Rejection reason: abstract syntax not supported */
+ bind_ack_ctx.result = DCERPC_BIND_PROVIDER_REJECT;
+ bind_ack_ctx.reason = DCERPC_BIND_REASON_ASYNTAX;
+@@ -1826,6 +1861,10 @@ void set_incoming_fault(struct pipes_struct *p)
+ p->in_data.pdu.length = 0;
+ p->fault_state = DCERPC_FAULT_CANT_PERFORM;
+
++ p->allow_alter = false;
++ p->allow_auth3 = false;
++ p->pipe_bound = false;
++
+ DEBUG(10, ("Setting fault state\n"));
+ }
+
+--
+2.8.1
+
+
+From 45701966d49ec1003f19c137a548c26915f75a99 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Tue, 7 Jul 2015 16:06:59 +0200
+Subject: [PATCH 23/40] CVE-2015-5370: s3:rpc_server: use 'alter' instead of
+ 'bind' for variables in api_pipe_alter_context()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit cdefee174d2f8920323e9e62966df4f4ced49ed3)
+---
+ source3/rpc_server/srv_pipe.c | 32 ++++++++++++++++----------------
+ 1 file changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
+index 41111aa..382d94a 100644
+--- a/source3/rpc_server/srv_pipe.c
++++ b/source3/rpc_server/srv_pipe.c
+@@ -1359,7 +1359,7 @@ static bool api_pipe_alter_context(struct pipes_struct *p,
+ uint16 assoc_gid;
+ NTSTATUS status;
+ union dcerpc_payload u;
+- struct dcerpc_ack_ctx bind_ack_ctx;
++ struct dcerpc_ack_ctx alter_ack_ctx;
+ DATA_BLOB auth_resp = data_blob_null;
+ DATA_BLOB auth_blob = data_blob_null;
+ int pad_len = 0;
+@@ -1374,8 +1374,8 @@ static bool api_pipe_alter_context(struct pipes_struct *p,
+ goto err_exit;
+ }
+
+- if (pkt->u.bind.assoc_group_id != 0) {
+- assoc_gid = pkt->u.bind.assoc_group_id;
++ if (pkt->u.alter.assoc_group_id != 0) {
++ assoc_gid = pkt->u.alter.assoc_group_id;
+ } else {
+ assoc_gid = 0x53f0;
+ }
+@@ -1385,24 +1385,24 @@ static bool api_pipe_alter_context(struct pipes_struct *p,
+ */
+
+ /* If the requested abstract synt uuid doesn't match our client pipe,
+- reject the bind_ack & set the transfer interface synt to all 0's,
++ reject the alter_ack & set the transfer interface synt to all 0's,
+ ver 0 (observed when NT5 attempts to bind to abstract interfaces
+ unknown to NT4)
+ Needed when adding entries to a DACL from NT5 - SK */
+
+ if (check_bind_req(p,
+- &pkt->u.bind.ctx_list[0].abstract_syntax,
+- &pkt->u.bind.ctx_list[0].transfer_syntaxes[0],
+- pkt->u.bind.ctx_list[0].context_id)) {
++ &pkt->u.alter.ctx_list[0].abstract_syntax,
++ &pkt->u.alter.ctx_list[0].transfer_syntaxes[0],
++ pkt->u.alter.ctx_list[0].context_id)) {
+
+- bind_ack_ctx.result = 0;
+- bind_ack_ctx.reason = 0;
+- bind_ack_ctx.syntax = pkt->u.bind.ctx_list[0].transfer_syntaxes[0];
++ alter_ack_ctx.result = 0;
++ alter_ack_ctx.reason = 0;
++ alter_ack_ctx.syntax = pkt->u.alter.ctx_list[0].transfer_syntaxes[0];
+ } else {
+ /* Rejection reason: abstract syntax not supported */
+- bind_ack_ctx.result = DCERPC_BIND_PROVIDER_REJECT;
+- bind_ack_ctx.reason = DCERPC_BIND_REASON_ASYNTAX;
+- bind_ack_ctx.syntax = null_ndr_syntax_id;
++ alter_ack_ctx.result = DCERPC_BIND_PROVIDER_REJECT;
++ alter_ack_ctx.reason = DCERPC_BIND_REASON_ASYNTAX;
++ alter_ack_ctx.syntax = null_ndr_syntax_id;
+ }
+
+ /*
+@@ -1417,7 +1417,7 @@ static bool api_pipe_alter_context(struct pipes_struct *p,
+ }
+
+ status = dcerpc_pull_auth_trailer(pkt, pkt,
+- &pkt->u.bind.auth_info,
++ &pkt->u.alter.auth_info,
+ &auth_info, NULL, true);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(0, ("Unable to unmarshall dcerpc_auth.\n"));
+@@ -1503,7 +1503,7 @@ static bool api_pipe_alter_context(struct pipes_struct *p,
+ u.alter_resp.secondary_address_size = 1;
+
+ u.alter_resp.num_results = 1;
+- u.alter_resp.ctx_list = &bind_ack_ctx;
++ u.alter_resp.ctx_list = &alter_ack_ctx;
+
+ /* NOTE: We leave the auth_info empty so we can calculate the padding
+ * later and then append the auth_info --simo */
+@@ -1523,7 +1523,7 @@ static bool api_pipe_alter_context(struct pipes_struct *p,
+ &u,
+ &p->out_data.frag);
+ if (!NT_STATUS_IS_OK(status)) {
+- DEBUG(0, ("Failed to marshall bind_ack packet. (%s)\n",
++ DEBUG(0, ("Failed to marshall alter_resp packet. (%s)\n",
+ nt_errstr(status)));
+ goto err_exit;
+ }
+--
+2.8.1
+
+
+From 62b936e134a53662601b0f614f95dbca5ff7a369 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Tue, 7 Jul 2015 16:06:59 +0200
+Subject: [PATCH 24/40] CVE-2015-5370: s3:rpc_server: verify presentation
+ context arrays
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit 1e6b4abac14840e4cee1afc5d4811b0f0277eade)
+---
+ source3/rpc_server/srv_pipe.c | 17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
+
+diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
+index 382d94a..335af2a 100644
+--- a/source3/rpc_server/srv_pipe.c
++++ b/source3/rpc_server/srv_pipe.c
+@@ -934,7 +934,12 @@ static bool api_pipe_bind_req(struct pipes_struct *p,
+ p->allow_bind = false;
+
+ if (pkt->u.bind.num_contexts == 0) {
+- DEBUG(0, ("api_pipe_bind_req: no rpc contexts around\n"));
++ DEBUG(1, ("api_pipe_bind_req: no rpc contexts around\n"));
++ goto err_exit;
++ }
++
++ if (pkt->u.bind.ctx_list[0].num_transfer_syntaxes == 0) {
++ DEBUG(1, ("api_pipe_bind_req: no transfer syntaxes around\n"));
+ goto err_exit;
+ }
+
+@@ -1374,6 +1379,16 @@ static bool api_pipe_alter_context(struct pipes_struct *p,
+ goto err_exit;
+ }
+
++ if (pkt->u.alter.num_contexts == 0) {
++ DEBUG(1, ("api_pipe_alter_context: no rpc contexts around\n"));
++ goto err_exit;
++ }
++
++ if (pkt->u.alter.ctx_list[0].num_transfer_syntaxes == 0) {
++ DEBUG(1, ("api_pipe_alter_context: no transfer syntaxes around\n"));
++ goto err_exit;
++ }
++
+ if (pkt->u.alter.assoc_group_id != 0) {
+ assoc_gid = pkt->u.alter.assoc_group_id;
+ } else {
+--
+2.8.1
+
+
+From 585e8aefafcb5f8c501cdf4454b375ebda82f7a6 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Tue, 7 Jul 2015 16:06:59 +0200
+Subject: [PATCH 25/40] CVE-2015-5370: s3:rpc_server: make use of
+ dcerpc_verify_ncacn_packet_header() to verify incoming pdus
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit e39fdceb25fc75b6f8c77c097bf8dbd2f4286618)
+---
+ source3/rpc_server/srv_pipe.c | 81 +++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 81 insertions(+)
+
+diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
+index 335af2a..2f404b4 100644
+--- a/source3/rpc_server/srv_pipe.c
++++ b/source3/rpc_server/srv_pipe.c
+@@ -42,6 +42,7 @@
+ #include "auth.h"
+ #include "ntdomain.h"
+ #include "rpc_server/srv_pipe.h"
++#include "../librpc/gen_ndr/ndr_dcerpc.h"
+ #include "../librpc/ndr/ndr_dcerpc.h"
+ #include "../librpc/gen_ndr/ndr_samr.h"
+ #include "../librpc/gen_ndr/ndr_lsa.h"
+@@ -933,6 +934,25 @@ static bool api_pipe_bind_req(struct pipes_struct *p,
+ }
+ p->allow_bind = false;
+
++ status = dcerpc_verify_ncacn_packet_header(pkt,
++ DCERPC_PKT_BIND,
++ pkt->u.bind.auth_info.length,
++ 0, /* required flags */
++ DCERPC_PFC_FLAG_FIRST |
++ DCERPC_PFC_FLAG_LAST |
++ DCERPC_PFC_FLAG_SUPPORT_HEADER_SIGN |
++ 0x08 | /* this is not defined, but should be ignored */
++ DCERPC_PFC_FLAG_CONC_MPX |
++ DCERPC_PFC_FLAG_DID_NOT_EXECUTE |
++ DCERPC_PFC_FLAG_MAYBE |
++ DCERPC_PFC_FLAG_OBJECT_UUID);
++ if (!NT_STATUS_IS_OK(status)) {
++ DEBUG(1, ("api_pipe_bind_req: invalid pdu: %s\n",
++ nt_errstr(status)));
++ NDR_PRINT_DEBUG(ncacn_packet, pkt);
++ goto err_exit;
++ }
++
+ if (pkt->u.bind.num_contexts == 0) {
+ DEBUG(1, ("api_pipe_bind_req: no rpc contexts around\n"));
+ goto err_exit;
+@@ -1248,6 +1268,25 @@ bool api_pipe_bind_auth3(struct pipes_struct *p, struct ncacn_packet *pkt)
+ goto err;
+ }
+
++ status = dcerpc_verify_ncacn_packet_header(pkt,
++ DCERPC_PKT_AUTH3,
++ pkt->u.auth3.auth_info.length,
++ 0, /* required flags */
++ DCERPC_PFC_FLAG_FIRST |
++ DCERPC_PFC_FLAG_LAST |
++ DCERPC_PFC_FLAG_SUPPORT_HEADER_SIGN |
++ 0x08 | /* this is not defined, but should be ignored */
++ DCERPC_PFC_FLAG_CONC_MPX |
++ DCERPC_PFC_FLAG_DID_NOT_EXECUTE |
++ DCERPC_PFC_FLAG_MAYBE |
++ DCERPC_PFC_FLAG_OBJECT_UUID);
++ if (!NT_STATUS_IS_OK(status)) {
++ DEBUG(1, ("api_pipe_bind_auth3: invalid pdu: %s\n",
++ nt_errstr(status)));
++ NDR_PRINT_DEBUG(ncacn_packet, pkt);
++ goto err;
++ }
++
+ /* We can only finish if the pipe is unbound for now */
+ if (p->pipe_bound) {
+ DEBUG(0, (__location__ ": Pipe already bound, "
+@@ -1379,6 +1418,25 @@ static bool api_pipe_alter_context(struct pipes_struct *p,
+ goto err_exit;
+ }
+
++ status = dcerpc_verify_ncacn_packet_header(pkt,
++ DCERPC_PKT_ALTER,
++ pkt->u.alter.auth_info.length,
++ 0, /* required flags */
++ DCERPC_PFC_FLAG_FIRST |
++ DCERPC_PFC_FLAG_LAST |
++ DCERPC_PFC_FLAG_SUPPORT_HEADER_SIGN |
++ 0x08 | /* this is not defined, but should be ignored */
++ DCERPC_PFC_FLAG_CONC_MPX |
++ DCERPC_PFC_FLAG_DID_NOT_EXECUTE |
++ DCERPC_PFC_FLAG_MAYBE |
++ DCERPC_PFC_FLAG_OBJECT_UUID);
++ if (!NT_STATUS_IS_OK(status)) {
++ DEBUG(1, ("api_pipe_alter_context: invalid pdu: %s\n",
++ nt_errstr(status)));
++ NDR_PRINT_DEBUG(ncacn_packet, pkt);
++ goto err_exit;
++ }
++
+ if (pkt->u.alter.num_contexts == 0) {
+ DEBUG(1, ("api_pipe_alter_context: no rpc contexts around\n"));
+ goto err_exit;
+@@ -1923,6 +1981,29 @@ static bool process_request_pdu(struct pipes_struct *p, struct ncacn_packet *pkt
+ return False;
+ }
+
++ /*
++ * We don't ignore DCERPC_PFC_FLAG_PENDING_CANCEL.
++ * TODO: we can reject it with DCERPC_FAULT_NO_CALL_ACTIVE later.
++ */
++ status = dcerpc_verify_ncacn_packet_header(pkt,
++ DCERPC_PKT_REQUEST,
++ pkt->u.request.stub_and_verifier.length,
++ 0, /* required_flags */
++ DCERPC_PFC_FLAG_FIRST |
++ DCERPC_PFC_FLAG_LAST |
++ 0x08 | /* this is not defined, but should be ignored */
++ DCERPC_PFC_FLAG_CONC_MPX |
++ DCERPC_PFC_FLAG_DID_NOT_EXECUTE |
++ DCERPC_PFC_FLAG_MAYBE |
++ DCERPC_PFC_FLAG_OBJECT_UUID);
++ if (!NT_STATUS_IS_OK(status)) {
++ DEBUG(1, ("process_request_pdu: invalid pdu: %s\n",
++ nt_errstr(status)));
++ NDR_PRINT_DEBUG(ncacn_packet, pkt);
++ set_incoming_fault(p);
++ return false;
++ }
++
+ /* Store the opnum */
+ p->opnum = pkt->u.request.opnum;
+
+--
+2.8.1
+
+
+From b16b1a5f331adc3bb2f3d0bee586ec084935a202 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Wed, 23 Dec 2015 12:40:58 +0100
+Subject: [PATCH 26/40] CVE-2015-5370: s3:rpc_server: disconnect the connection
+ after a fatal FAULT pdu
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit 664d7ace0e68b42d2de99583757e0a985647eb4b)
+---
+ source3/rpc_server/rpc_server.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/source3/rpc_server/rpc_server.c b/source3/rpc_server/rpc_server.c
+index 376d26a..3ba83e0 100644
+--- a/source3/rpc_server/rpc_server.c
++++ b/source3/rpc_server/rpc_server.c
+@@ -664,6 +664,12 @@ static void named_pipe_packet_done(struct tevent_req *subreq)
+ goto fail;
+ }
+
++ if (npc->p->fault_state != 0) {
++ DEBUG(2, ("Disconnect after fault\n"));
++ sys_errno = EINVAL;
++ goto fail;
++ }
++
+ /* clear out any data that may have been left around */
+ npc->count = 0;
+ TALLOC_FREE(npc->iov);
+@@ -1392,6 +1398,12 @@ static void dcerpc_ncacn_packet_done(struct tevent_req *subreq)
+ goto fail;
+ }
+
++ if (ncacn_conn->p->fault_state != 0) {
++ DEBUG(2, ("Disconnect after fault\n"));
++ sys_errno = EINVAL;
++ goto fail;
++ }
++
+ /* clear out any data that may have been left around */
+ ncacn_conn->count = 0;
+ TALLOC_FREE(ncacn_conn->iov);
+--
+2.8.1
+
+
+From 642d2b7090e46a87bc94cabf29eccb09e329c125 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Wed, 23 Dec 2015 12:38:55 +0100
+Subject: [PATCH 27/40] CVE-2015-5370: s3:rpc_server: let a failing BIND mark
+ the connection as broken
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit 8d97085efd8782e48d0f1162e3f56756acb99472)
+---
+ source3/rpc_server/srv_pipe.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
+index 2f404b4..6275190 100644
+--- a/source3/rpc_server/srv_pipe.c
++++ b/source3/rpc_server/srv_pipe.c
+@@ -276,6 +276,7 @@ static bool setup_bind_nak(struct pipes_struct *p, struct ncacn_packet *pkt)
+ p->out_data.data_sent_length = 0;
+ p->out_data.current_pdu_sent = 0;
+
++ set_incoming_fault(p);
+ TALLOC_FREE(p->auth.auth_ctx);
+ p->auth.auth_level = DCERPC_AUTH_LEVEL_NONE;
+ p->auth.auth_type = DCERPC_AUTH_TYPE_NONE;
+--
+2.8.1
+
+
+From f4aa07176636982d9be3c0ce2452fc43a8781d47 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Wed, 23 Dec 2015 12:38:55 +0100
+Subject: [PATCH 28/40] CVE-2015-5370: s3:rpc_server: use
+ DCERPC_NCA_S_PROTO_ERROR FAULTs for protocol errors
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit d30363f08efb81b22055d4445977c96df3737adf)
+---
+ source3/rpc_server/srv_pipe.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
+index 6275190..3fb8855 100644
+--- a/source3/rpc_server/srv_pipe.c
++++ b/source3/rpc_server/srv_pipe.c
+@@ -1933,7 +1933,7 @@ void set_incoming_fault(struct pipes_struct *p)
+ data_blob_free(&p->in_data.data);
+ p->in_data.pdu_needed_len = 0;
+ p->in_data.pdu.length = 0;
+- p->fault_state = DCERPC_FAULT_CANT_PERFORM;
++ p->fault_state = DCERPC_NCA_S_PROTO_ERROR;
+
+ p->allow_alter = false;
+ p->allow_auth3 = false;
+@@ -2254,7 +2254,7 @@ done:
+ "pipe %s\n", get_pipe_name_from_syntax(talloc_tos(),
+ &p->syntax)));
+ set_incoming_fault(p);
+- setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR));
++ setup_fault_pdu(p, NT_STATUS(DCERPC_NCA_S_PROTO_ERROR));
+ TALLOC_FREE(pkt);
+ } else {
+ /*
+--
+2.8.1
+
+
+From ef175975f587d73092461c36b10e4c9cf1805727 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Sat, 11 Jul 2015 10:58:07 +0200
+Subject: [PATCH 29/40] CVE-2015-5370: s3:librpc/rpc: remove unused
+ dcerpc_pull_dcerpc_auth()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit 02aef978ff8f16009a52c2d981d414d019bc8dd9)
+---
+ source3/librpc/rpc/dcerpc.h | 4 ----
+ source3/librpc/rpc/dcerpc_helpers.c | 41 -------------------------------------
+ 2 files changed, 45 deletions(-)
+
+diff --git a/source3/librpc/rpc/dcerpc.h b/source3/librpc/rpc/dcerpc.h
+index e7cca9e..9452e85 100644
+--- a/source3/librpc/rpc/dcerpc.h
++++ b/source3/librpc/rpc/dcerpc.h
+@@ -71,10 +71,6 @@ NTSTATUS dcerpc_push_dcerpc_auth(TALLOC_CTX *mem_ctx,
+ uint32_t auth_context_id,
+ const DATA_BLOB *credentials,
+ DATA_BLOB *blob);
+-NTSTATUS dcerpc_pull_dcerpc_auth(TALLOC_CTX *mem_ctx,
+- const DATA_BLOB *blob,
+- struct dcerpc_auth *r,
+- bool bigendian);
+ NTSTATUS dcerpc_guess_sizes(struct pipe_auth_data *auth,
+ size_t header_len, size_t data_left,
+ size_t max_xmit_frag, size_t pad_alignment,
+diff --git a/source3/librpc/rpc/dcerpc_helpers.c b/source3/librpc/rpc/dcerpc_helpers.c
+index c07835f..e4d0e3a 100644
+--- a/source3/librpc/rpc/dcerpc_helpers.c
++++ b/source3/librpc/rpc/dcerpc_helpers.c
+@@ -210,47 +210,6 @@ NTSTATUS dcerpc_push_dcerpc_auth(TALLOC_CTX *mem_ctx,
+ }
+
+ /**
+-* @brief Decodes a dcerpc_auth blob
+-*
+-* @param mem_ctx The memory context on which to allocate the packet
+-* elements
+-* @param blob The blob of data to decode
+-* @param r An empty dcerpc_auth structure, must not be NULL
+-*
+-* @return a NTSTATUS error code
+-*/
+-NTSTATUS dcerpc_pull_dcerpc_auth(TALLOC_CTX *mem_ctx,
+- const DATA_BLOB *blob,
+- struct dcerpc_auth *r,
+- bool bigendian)
+-{
+- enum ndr_err_code ndr_err;
+- struct ndr_pull *ndr;
+-
+- ndr = ndr_pull_init_blob(blob, mem_ctx);
+- if (!ndr) {
+- return NT_STATUS_NO_MEMORY;
+- }
+- if (bigendian) {
+- ndr->flags |= LIBNDR_FLAG_BIGENDIAN;
+- }
+-
+- ndr_err = ndr_pull_dcerpc_auth(ndr, NDR_SCALARS|NDR_BUFFERS, r);
+-
+- if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+- talloc_free(ndr);
+- return ndr_map_error2ntstatus(ndr_err);
+- }
+- talloc_free(ndr);
+-
+- if (DEBUGLEVEL >= 10) {
+- NDR_PRINT_DEBUG(dcerpc_auth, r);
+- }
+-
+- return NT_STATUS_OK;
+-}
+-
+-/**
+ * @brief Calculate how much data we can in a packet, including calculating
+ * auth token and pad lengths.
+ *
+--
+2.8.1
+
+
+From 49d0e60d28d3b615d4ee368cd3f260b3a6386858 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Tue, 7 Jul 2015 13:05:01 +0200
+Subject: [PATCH 30/40] CVE-2015-5370: s3:rpc_server: check the transfer syntax
+ in check_bind_req() first
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit 9464684010461947fa98d8ee084069e9cf362625)
+---
+ source3/rpc_server/srv_pipe.c | 20 ++++++++++++++------
+ 1 file changed, 14 insertions(+), 6 deletions(-)
+
+diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
+index 3fb8855..0e6b073 100644
+--- a/source3/rpc_server/srv_pipe.c
++++ b/source3/rpc_server/srv_pipe.c
+@@ -351,16 +351,24 @@ static bool check_bind_req(struct pipes_struct *p,
+ DEBUG(3,("check_bind_req for %s\n",
+ get_pipe_name_from_syntax(talloc_tos(), abstract)));
+
++ ok = ndr_syntax_id_equal(transfer, &ndr_transfer_syntax);
++ if (!ok) {
++ DEBUG(1,("check_bind_req unknown transfer syntax for "
++ "%s context_id=%u\n",
++ get_pipe_name_from_syntax(talloc_tos(), abstract),
++ (unsigned)context_id));
++ return false;
++ }
++
+ /* we have to check all now since win2k introduced a new UUID on the lsaprpc pipe */
+- if (rpc_srv_pipe_exists_by_id(abstract) &&
+- ndr_syntax_id_equal(transfer, &ndr_transfer_syntax)) {
+- DEBUG(3, ("check_bind_req: \\PIPE\\%s -> \\PIPE\\%s\n",
+- rpc_srv_get_pipe_cli_name(abstract),
+- rpc_srv_get_pipe_srv_name(abstract)));
+- } else {
++ if (!rpc_srv_pipe_exists_by_id(abstract)) {
+ return false;
+ }
+
++ DEBUG(3, ("check_bind_req: %s -> %s rpc service\n",
++ rpc_srv_get_pipe_cli_name(abstract),
++ rpc_srv_get_pipe_srv_name(abstract)));
++
+ context_fns = SMB_MALLOC_P(struct pipe_rpc_fns);
+ if (context_fns == NULL) {
+ DEBUG(0,("check_bind_req: malloc() failed!\n"));
+--
+2.8.1
+
+
+From 7ee6698f706e51568f53347f422ac6671cdba9a4 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Tue, 7 Jul 2015 13:05:01 +0200
+Subject: [PATCH 31/40] CVE-2015-5370: s3:rpc_server: don't allow an existing
+ context to be changed in check_bind_req()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+An alter context can't change the syntax of an existing context,
+a new context_id will be used for that.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit a995740d4e7fbd8fbb5c8c6280b73eaceae53574)
+---
+ source3/rpc_server/srv_pipe.c | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+
+diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
+index 0e6b073..4263a91 100644
+--- a/source3/rpc_server/srv_pipe.c
++++ b/source3/rpc_server/srv_pipe.c
+@@ -360,6 +360,28 @@ static bool check_bind_req(struct pipes_struct *p,
+ return false;
+ }
+
++ for (context_fns = p->contexts;
++ context_fns != NULL;
++ context_fns = context_fns->next)
++ {
++ if (context_fns->context_id != context_id) {
++ continue;
++ }
++
++ ok = ndr_syntax_id_equal(&context_fns->syntax,
++ abstract);
++ if (ok) {
++ return true;
++ }
++
++ DEBUG(1,("check_bind_req: changing abstract syntax for "
++ "%s context_id=%u into %s not supported\n",
++ get_pipe_name_from_syntax(talloc_tos(), &context_fns->syntax),
++ (unsigned)context_id,
++ get_pipe_name_from_syntax(talloc_tos(), abstract)));
++ return false;
++ }
++
+ /* we have to check all now since win2k introduced a new UUID on the lsaprpc pipe */
+ if (!rpc_srv_pipe_exists_by_id(abstract)) {
+ return false;
+--
+2.8.1
+
+
+From 79a238d0c868c7e182f49637b66f544dc1dd86da Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Wed, 8 Jul 2015 00:01:37 +0200
+Subject: [PATCH 32/40] CVE-2015-5370: s3:rpc_client: pass struct
+ pipe_auth_data to create_rpc_{bind_auth3,alter_context}()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit f556d9245c13d018d4e772f06d013ebe558703d9)
+---
+ source3/rpc_client/cli_pipe.c | 26 ++++++++++----------------
+ 1 file changed, 10 insertions(+), 16 deletions(-)
+
+diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
+index 1c4ff01..3af3d8f 100644
+--- a/source3/rpc_client/cli_pipe.c
++++ b/source3/rpc_client/cli_pipe.c
+@@ -1816,9 +1816,8 @@ static bool check_bind_response(const struct dcerpc_bind_ack *r,
+
+ static NTSTATUS create_rpc_bind_auth3(TALLOC_CTX *mem_ctx,
+ struct rpc_pipe_client *cli,
+- uint32 rpc_call_id,
+- enum dcerpc_AuthType auth_type,
+- enum dcerpc_AuthLevel auth_level,
++ struct pipe_auth_data *auth,
++ uint32_t rpc_call_id,
+ DATA_BLOB *pauth_blob,
+ DATA_BLOB *rpc_out)
+ {
+@@ -1828,8 +1827,8 @@ static NTSTATUS create_rpc_bind_auth3(TALLOC_CTX *mem_ctx,
+ u.auth3._pad = 0;
+
+ status = dcerpc_push_dcerpc_auth(mem_ctx,
+- auth_type,
+- auth_level,
++ auth->auth_type,
++ auth->auth_level,
+ 0, /* auth_pad_length */
+ 1, /* auth_context_id */
+ pauth_blob,
+@@ -1861,9 +1860,8 @@ static NTSTATUS create_rpc_bind_auth3(TALLOC_CTX *mem_ctx,
+ ********************************************************************/
+
+ static NTSTATUS create_rpc_alter_context(TALLOC_CTX *mem_ctx,
+- enum dcerpc_AuthType auth_type,
+- enum dcerpc_AuthLevel auth_level,
+- uint32 rpc_call_id,
++ struct pipe_auth_data *auth,
++ uint32_t rpc_call_id,
+ const struct ndr_syntax_id *abstract,
+ const struct ndr_syntax_id *transfer,
+ const DATA_BLOB *pauth_blob, /* spnego auth blob already created. */
+@@ -1873,8 +1871,8 @@ static NTSTATUS create_rpc_alter_context(TALLOC_CTX *mem_ctx,
+ NTSTATUS status;
+
+ status = dcerpc_push_dcerpc_auth(mem_ctx,
+- auth_type,
+- auth_level,
++ auth->auth_type,
++ auth->auth_level,
+ 0, /* auth_pad_length */
+ 1, /* auth_context_id */
+ pauth_blob,
+@@ -2300,9 +2298,7 @@ static NTSTATUS rpc_bind_next_send(struct tevent_req *req,
+ /* Now prepare the alter context pdu. */
+ data_blob_free(&state->rpc_out);
+
+- status = create_rpc_alter_context(state,
+- auth->auth_type,
+- auth->auth_level,
++ status = create_rpc_alter_context(state, auth,
+ state->rpc_call_id,
+ &state->cli->abstract_syntax,
+ &state->cli->transfer_syntax,
+@@ -2335,10 +2331,8 @@ static NTSTATUS rpc_bind_finish_send(struct tevent_req *req,
+ /* Now prepare the auth3 context pdu. */
+ data_blob_free(&state->rpc_out);
+
+- status = create_rpc_bind_auth3(state, state->cli,
++ status = create_rpc_bind_auth3(state, state->cli, auth,
+ state->rpc_call_id,
+- auth->auth_type,
+- auth->auth_level,
+ auth_token,
+ &state->rpc_out);
+ if (!NT_STATUS_IS_OK(status)) {
+--
+2.8.1
+
+
+From 18a50ed6ead11287ff72cb38f100d0f2641c3e7d Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Wed, 8 Jul 2015 00:01:37 +0200
+Subject: [PATCH 33/40] CVE-2015-5370: s3:librpc/rpc: add auth_context_id to
+ struct pipe_auth_data
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit cbf20b43d7b40e3b6ccf044f6f51a5adff1f5e6d)
+---
+ source3/librpc/rpc/dcerpc.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/source3/librpc/rpc/dcerpc.h b/source3/librpc/rpc/dcerpc.h
+index 9452e85..c25b0f5 100644
+--- a/source3/librpc/rpc/dcerpc.h
++++ b/source3/librpc/rpc/dcerpc.h
+@@ -42,6 +42,7 @@ struct pipe_auth_data {
+ bool verified_bitmask1;
+
+ void *auth_ctx;
++ uint32_t auth_context_id;
+
+ /* Only the client code uses these 3 for now */
+ char *domain;
+--
+2.8.1
+
+
+From 7dbaaca2a638406331d4653e1afdc18f7c8502f6 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Wed, 8 Jul 2015 00:01:37 +0200
+Subject: [PATCH 34/40] CVE-2015-5370: s3:rpc_client: make use of
+ pipe_auth_data->auth_context_id
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is better than using hardcoded values.
+We need to use auth_context_id = 1 for authenticated
+connections, as old Samba server (before this patchset)
+will use a hardcoded value of 1.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit ae68d3f325c3880144b80385779c9445897646e6)
+---
+ source3/rpc_client/cli_pipe.c | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
+index 3af3d8f..755d676 100644
+--- a/source3/rpc_client/cli_pipe.c
++++ b/source3/rpc_client/cli_pipe.c
+@@ -1314,7 +1314,7 @@ static NTSTATUS create_rpc_bind_req(TALLOC_CTX *mem_ctx,
+ auth->auth_type,
+ auth->auth_level,
+ 0, /* auth_pad_length */
+- 1, /* auth_context_id */
++ auth->auth_context_id,
+ &auth_token,
+ &auth_info);
+ if (!NT_STATUS_IS_OK(ret)) {
+@@ -1830,7 +1830,7 @@ static NTSTATUS create_rpc_bind_auth3(TALLOC_CTX *mem_ctx,
+ auth->auth_type,
+ auth->auth_level,
+ 0, /* auth_pad_length */
+- 1, /* auth_context_id */
++ auth->auth_context_id,
+ pauth_blob,
+ &u.auth3.auth_info);
+ if (!NT_STATUS_IS_OK(status)) {
+@@ -1874,7 +1874,7 @@ static NTSTATUS create_rpc_alter_context(TALLOC_CTX *mem_ctx,
+ auth->auth_type,
+ auth->auth_level,
+ 0, /* auth_pad_length */
+- 1, /* auth_context_id */
++ auth->auth_context_id,
+ pauth_blob,
+ &auth_info);
+ if (!NT_STATUS_IS_OK(status)) {
+@@ -2704,6 +2704,7 @@ NTSTATUS rpccli_ncalrpc_bind_data(TALLOC_CTX *mem_ctx,
+
+ result->auth_type = DCERPC_AUTH_TYPE_NCALRPC_AS_SYSTEM;
+ result->auth_level = DCERPC_AUTH_LEVEL_CONNECT;
++ result->auth_context_id = 1;
+
+ result->user_name = talloc_strdup(result, "");
+ result->domain = talloc_strdup(result, "");
+@@ -2728,6 +2729,7 @@ NTSTATUS rpccli_anon_bind_data(TALLOC_CTX *mem_ctx,
+
+ result->auth_type = DCERPC_AUTH_TYPE_NONE;
+ result->auth_level = DCERPC_AUTH_LEVEL_NONE;
++ result->auth_context_id = 0;
+
+ result->user_name = talloc_strdup(result, "");
+ result->domain = talloc_strdup(result, "");
+@@ -2765,6 +2767,7 @@ static NTSTATUS rpccli_ntlmssp_bind_data(TALLOC_CTX *mem_ctx,
+
+ result->auth_type = auth_type;
+ result->auth_level = auth_level;
++ result->auth_context_id = 1;
+
+ result->user_name = talloc_strdup(result, username);
+ result->domain = talloc_strdup(result, domain);
+@@ -2836,6 +2839,7 @@ NTSTATUS rpccli_schannel_bind_data(TALLOC_CTX *mem_ctx, const char *domain,
+
+ result->auth_type = DCERPC_AUTH_TYPE_SCHANNEL;
+ result->auth_level = auth_level;
++ result->auth_context_id = 1;
+
+ result->user_name = talloc_strdup(result, "");
+ result->domain = talloc_strdup(result, domain);
+@@ -3500,6 +3504,7 @@ NTSTATUS cli_rpc_pipe_open_krb5(struct cli_state *cli,
+ }
+ auth->auth_type = DCERPC_AUTH_TYPE_KRB5;
+ auth->auth_level = auth_level;
++ auth->auth_context_id = 1;
+
+ if (!username) {
+ username = "";
+@@ -3570,6 +3575,7 @@ NTSTATUS cli_rpc_pipe_open_spnego_krb5(struct cli_state *cli,
+ }
+ auth->auth_type = DCERPC_AUTH_TYPE_SPNEGO;
+ auth->auth_level = auth_level;
++ auth->auth_context_id = 1;
+
+ if (!username) {
+ username = "";
+@@ -3644,6 +3650,7 @@ NTSTATUS cli_rpc_pipe_open_spnego_ntlmssp(struct cli_state *cli,
+ }
+ auth->auth_type = DCERPC_AUTH_TYPE_SPNEGO;
+ auth->auth_level = auth_level;
++ auth->auth_context_id = 1;
+
+ if (!username) {
+ username = "";
+--
+2.8.1
+
+
+From 82cd4e90c70d1ababd5fa1ee61206e37edbf40e4 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Wed, 8 Jul 2015 00:01:37 +0200
+Subject: [PATCH 35/40] CVE-2015-5370: s3:rpc_server: make use of
+ pipe_auth_data->auth_context_id
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is better than using hardcoded values.
+We need to use the value the client used in the BIND request.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit 2bc617293a5d8652e484af69660b3646f3d48690)
+---
+ source3/rpc_server/rpc_ncacn_np.c | 1 +
+ source3/rpc_server/srv_pipe.c | 11 +++++++----
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/source3/rpc_server/rpc_ncacn_np.c b/source3/rpc_server/rpc_ncacn_np.c
+index f2e9d10..c0f24a6 100644
+--- a/source3/rpc_server/rpc_ncacn_np.c
++++ b/source3/rpc_server/rpc_ncacn_np.c
+@@ -781,6 +781,7 @@ static NTSTATUS rpc_pipe_open_external(TALLOC_CTX *mem_ctx,
+ }
+ result->auth->auth_type = DCERPC_AUTH_TYPE_NONE;
+ result->auth->auth_level = DCERPC_AUTH_LEVEL_NONE;
++ result->auth->auth_context_id = 0;
+
+ status = rpccli_anon_bind_data(result, &auth);
+ if (!NT_STATUS_IS_OK(status)) {
+diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
+index 4263a91..d6c4118 100644
+--- a/source3/rpc_server/srv_pipe.c
++++ b/source3/rpc_server/srv_pipe.c
+@@ -534,6 +534,7 @@ static bool pipe_spnego_auth_bind(struct pipes_struct *p,
+
+ p->auth.auth_ctx = spnego_ctx;
+ p->auth.auth_type = DCERPC_AUTH_TYPE_SPNEGO;
++ p->auth.auth_context_id = auth_info->auth_context_id;
+
+ DEBUG(10, ("SPNEGO auth started\n"));
+
+@@ -644,6 +645,7 @@ static bool pipe_schannel_auth_bind(struct pipes_struct *p,
+ /* We're finished with this bind - no more packets. */
+ p->auth.auth_ctx = schannel_auth;
+ p->auth.auth_type = DCERPC_AUTH_TYPE_SCHANNEL;
++ p->auth.auth_context_id = auth_info->auth_context_id;
+
+ p->pipe_bound = True;
+
+@@ -688,6 +690,7 @@ static bool pipe_ntlmssp_auth_bind(struct pipes_struct *p,
+
+ p->auth.auth_ctx = ntlmssp_state;
+ p->auth.auth_type = DCERPC_AUTH_TYPE_NTLMSSP;
++ p->auth.auth_context_id = auth_info->auth_context_id;
+
+ DEBUG(10, (__location__ ": NTLMSSP auth started\n"));
+
+@@ -1173,6 +1176,7 @@ static bool api_pipe_bind_req(struct pipes_struct *p,
+ p->pipe_bound = True;
+ /* The session key was initialized from the SMB
+ * session in make_internal_rpc_pipe_p */
++ p->auth.auth_context_id = 0;
+ }
+
+ ZERO_STRUCT(u.bind_ack);
+@@ -1218,12 +1222,11 @@ static bool api_pipe_bind_req(struct pipes_struct *p,
+ }
+
+ if (auth_resp.length) {
+-
+ status = dcerpc_push_dcerpc_auth(pkt,
+ auth_type,
+ auth_info.auth_level,
+- 0,
+- 1, /* auth_context_id */
++ 0, /* pad_len */
++ p->auth.auth_context_id,
+ &auth_resp,
+ &auth_blob);
+ if (!NT_STATUS_IS_OK(status)) {
+@@ -1646,7 +1649,7 @@ static bool api_pipe_alter_context(struct pipes_struct *p,
+ auth_info.auth_type,
+ auth_info.auth_level,
+ pad_len,
+- 1, /* auth_context_id */
++ p->auth.auth_context_id,
+ &auth_resp,
+ &auth_blob);
+ if (!NT_STATUS_IS_OK(status)) {
+--
+2.8.1
+
+
+From 8d1fb1fcf58b08cbf27579382ea648aefb9e7dc6 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Wed, 8 Jul 2015 00:01:37 +0200
+Subject: [PATCH 36/40] CVE-2015-5370: s3:librpc/rpc: make use of
+ auth->auth_context_id in dcerpc_add_auth_footer()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit 61faaa63e7e610308c72ae4c41a5c7b5b7312685)
+---
+ source3/librpc/rpc/dcerpc_helpers.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source3/librpc/rpc/dcerpc_helpers.c b/source3/librpc/rpc/dcerpc_helpers.c
+index e4d0e3a..977a372 100644
+--- a/source3/librpc/rpc/dcerpc_helpers.c
++++ b/source3/librpc/rpc/dcerpc_helpers.c
+@@ -741,7 +741,7 @@ NTSTATUS dcerpc_add_auth_footer(struct pipe_auth_data *auth,
+ auth->auth_type,
+ auth->auth_level,
+ pad_len,
+- 1 /* context id. */,
++ auth->auth_context_id,
+ &auth_blob,
+ &auth_info);
+ if (!NT_STATUS_IS_OK(status)) {
+--
+2.8.1
+
+
+From 2a44cfc65f7dc1ccfd2d6a5abe5d26e94a085aa9 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Wed, 8 Jul 2015 00:01:37 +0200
+Subject: [PATCH 37/40] CVE-2015-5370: s3:librpc/rpc: verify auth_context_id in
+ dcerpc_check_auth()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit 0cf3151c843e2c779b534743b455e630d89e2ba9)
+---
+ source3/librpc/rpc/dcerpc_helpers.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/source3/librpc/rpc/dcerpc_helpers.c b/source3/librpc/rpc/dcerpc_helpers.c
+index 977a372..b00cf1bf 100644
+--- a/source3/librpc/rpc/dcerpc_helpers.c
++++ b/source3/librpc/rpc/dcerpc_helpers.c
+@@ -881,6 +881,10 @@ NTSTATUS dcerpc_check_auth(struct pipe_auth_data *auth,
+ return NT_STATUS_INVALID_PARAMETER;
+ }
+
++ if (auth_info.auth_context_id != auth->auth_context_id) {
++ return NT_STATUS_INVALID_PARAMETER;
++ }
++
+ pkt_trailer->length -= auth_length;
+ data = data_blob_const(raw_pkt->data + header_size,
+ pkt_trailer->length);
+--
+2.8.1
+
+
+From 68dcc277d5af506706d3fdac43891e43ccb4ceea Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Tue, 7 Jul 2015 22:51:18 +0200
+Subject: [PATCH 38/40] CVE-2015-5370: s3:rpc_client: verify auth_context_id in
+ rpc_pipe_bind_step_one_done()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit 93a0f92b8ebecb38f92d3b2c9a946b486ee91d3c)
+---
+ source3/rpc_client/cli_pipe.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
+index 755d676..ee33e80 100644
+--- a/source3/rpc_client/cli_pipe.c
++++ b/source3/rpc_client/cli_pipe.c
+@@ -2052,6 +2052,14 @@ static void rpc_pipe_bind_step_one_done(struct tevent_req *subreq)
+ return;
+ }
+
++ if (auth.auth_context_id != pauth->auth_context_id) {
++ DEBUG(0, (__location__ " Auth context id %u mismatch expected %u.\n",
++ (unsigned)auth.auth_context_id,
++ (unsigned)pauth->auth_context_id));
++ tevent_req_nterror(req, NT_STATUS_RPC_PROTOCOL_ERROR);
++ return;
++ }
++
+ break;
+ }
+
+--
+2.8.1
+
+
+From 8787dd5053974c1f42ae85a310e9522795f4ccfe Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Wed, 8 Jul 2015 00:01:37 +0200
+Subject: [PATCH 39/40] CVE-2015-5370: s3:rpc_server: verify auth_context_id in
+ api_pipe_{bind_auth3,alter_context}
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit 3ef461d8304ee36184cd7a3963676eedff4ef1eb)
+---
+ source3/rpc_server/srv_pipe.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
+index d6c4118..26c4ee0 100644
+--- a/source3/rpc_server/srv_pipe.c
++++ b/source3/rpc_server/srv_pipe.c
+@@ -1364,6 +1364,14 @@ bool api_pipe_bind_auth3(struct pipes_struct *p, struct ncacn_packet *pkt)
+ goto err;
+ }
+
++ if (auth_info.auth_context_id != p->auth.auth_context_id) {
++ DEBUG(0, ("Auth context id mismatch! Client sent %u, "
++ "but auth was started as level %u!\n",
++ (unsigned)auth_info.auth_context_id,
++ (unsigned)p->auth.auth_context_id));
++ goto err;
++ }
++
+ switch (auth_info.auth_type) {
+ case DCERPC_AUTH_TYPE_NTLMSSP:
+ ntlmssp_ctx = talloc_get_type_abort(p->auth.auth_ctx,
+@@ -1545,6 +1553,14 @@ static bool api_pipe_alter_context(struct pipes_struct *p,
+ goto err_exit;
+ }
+
++ if (auth_info.auth_context_id != p->auth.auth_context_id) {
++ DEBUG(0, ("Auth context id mismatch! Client sent %u, "
++ "but auth was started as level %u!\n",
++ (unsigned)auth_info.auth_context_id,
++ (unsigned)p->auth.auth_context_id));
++ goto err_exit;
++ }
++
+ switch (auth_info.auth_type) {
+ case DCERPC_AUTH_TYPE_SPNEGO:
+ spnego_ctx = talloc_get_type_abort(p->auth.auth_ctx,
+--
+2.8.1
+
+
+From bf0040fb860527cb0c54ab0ef301153bdad650c0 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Tue, 22 Dec 2015 21:23:14 +0100
+Subject: [PATCH 40/40] CVE-2015-5370: s3:rpc_client: disconnect connection on
+ protocol errors
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit 024d3b263a2879cee4fb7794d70f253c948cc043)
+---
+ source3/rpc_client/cli_pipe.c | 67 +++++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 64 insertions(+), 3 deletions(-)
+
+diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
+index ee33e80..a3810f0 100644
+--- a/source3/rpc_client/cli_pipe.c
++++ b/source3/rpc_client/cli_pipe.c
+@@ -953,6 +953,12 @@ static void rpc_api_pipe_got_pdu(struct tevent_req *subreq)
+
+ state->pkt = talloc(state, struct ncacn_packet);
+ if (!state->pkt) {
++ /*
++ * TODO: do a real async disconnect ...
++ *
++ * For now do it sync...
++ */
++ TALLOC_FREE(state->cli->transport);
+ tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
+ return;
+ }
+@@ -962,6 +968,12 @@ static void rpc_api_pipe_got_pdu(struct tevent_req *subreq)
+ state->pkt,
+ !state->endianess);
+ if (!NT_STATUS_IS_OK(status)) {
++ /*
++ * TODO: do a real async disconnect ...
++ *
++ * For now do it sync...
++ */
++ TALLOC_FREE(state->cli->transport);
+ tevent_req_nterror(req, status);
+ return;
+ }
+@@ -979,6 +991,28 @@ static void rpc_api_pipe_got_pdu(struct tevent_req *subreq)
+ (unsigned)state->reply_pdu_offset,
+ nt_errstr(status)));
+
++ if (state->pkt->ptype != DCERPC_PKT_FAULT && !NT_STATUS_IS_OK(status)) {
++ /*
++ * TODO: do a real async disconnect ...
++ *
++ * For now do it sync...
++ */
++ TALLOC_FREE(state->cli->transport);
++ } else if (NT_STATUS_EQUAL(status, NT_STATUS_RPC_PROTOCOL_ERROR)) {
++ /*
++ * TODO: do a real async disconnect ...
++ *
++ * For now do it sync...
++ */
++ TALLOC_FREE(state->cli->transport);
++ } else if (NT_STATUS_EQUAL(status, NT_STATUS_RPC_SEC_PKG_ERROR)) {
++ /*
++ * TODO: do a real async disconnect ...
++ *
++ * For now do it sync...
++ */
++ TALLOC_FREE(state->cli->transport);
++ }
+ if (!NT_STATUS_IS_OK(status)) {
+ tevent_req_nterror(req, status);
+ return;
+@@ -1003,12 +1037,24 @@ static void rpc_api_pipe_got_pdu(struct tevent_req *subreq)
+ "%s\n",
+ state->endianess?"little":"big",
+ state->pkt->drep[0]?"little":"big"));
+- tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
++ /*
++ * TODO: do a real async disconnect ...
++ *
++ * For now do it sync...
++ */
++ TALLOC_FREE(state->cli->transport);
++ tevent_req_nterror(req, NT_STATUS_RPC_PROTOCOL_ERROR);
+ return;
+ }
+
+ if (state->reply_pdu_offset + rdata.length > MAX_RPC_DATA_SIZE) {
+- tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
++ /*
++ * TODO: do a real async disconnect ...
++ *
++ * For now do it sync...
++ */
++ TALLOC_FREE(state->cli->transport);
++ tevent_req_nterror(req, NT_STATUS_RPC_PROTOCOL_ERROR);
+ return;
+ }
+
+@@ -1016,6 +1062,12 @@ static void rpc_api_pipe_got_pdu(struct tevent_req *subreq)
+ if (state->reply_pdu.length < state->reply_pdu_offset + rdata.length) {
+ if (!data_blob_realloc(NULL, &state->reply_pdu,
+ state->reply_pdu_offset + rdata.length)) {
++ /*
++ * TODO: do a real async disconnect ...
++ *
++ * For now do it sync...
++ */
++ TALLOC_FREE(state->cli->transport);
+ tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
+ return;
+ }
+@@ -1045,6 +1097,14 @@ static void rpc_api_pipe_got_pdu(struct tevent_req *subreq)
+ subreq = get_complete_frag_send(state, state->ev, state->cli,
+ state->call_id,
+ &state->incoming_frag);
++ if (subreq == NULL) {
++ /*
++ * TODO: do a real async disconnect ...
++ *
++ * For now do it sync...
++ */
++ TALLOC_FREE(state->cli->transport);
++ }
+ if (tevent_req_nomem(subreq, req)) {
+ return;
+ }
+@@ -2574,8 +2634,9 @@ static struct tevent_req *rpccli_bh_disconnect_send(TALLOC_CTX *mem_ctx,
+ /*
+ * TODO: do a real async disconnect ...
+ *
+- * For now the caller needs to free rpc_cli
++ * For now we do it sync...
+ */
++ TALLOC_FREE(hs->rpc_cli->transport);
+ hs->rpc_cli = NULL;
+
+ tevent_req_done(req);
+--
+2.8.1
+
diff --git a/src/patches/samba/CVE-2015-7560-v3-6.patch b/src/patches/samba/CVE-2015-7560-v3-6.patch
new file mode 100644
index 0000000..1cf30ae
--- /dev/null
+++ b/src/patches/samba/CVE-2015-7560-v3-6.patch
@@ -0,0 +1,341 @@
+From eb27f9b7bf9c1dc902d9545eecf805831bd4e46c Mon Sep 17 00:00:00 2001
+From: Jeremy Allison <jra(a)samba.org>
+Date: Tue, 5 Jan 2016 11:18:12 -0800
+Subject: [PATCH 1/8] CVE-2015-7560: s3: smbd: Add refuse_symlink() function
+ that can be used to prevent operations on a symlink.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11648
+
+Signed-off-by: Jeremy Allison <jra(a)samba.org>
+Reviewed-by: Michael Adam <obnox(a)samba.org>
+---
+ source3/smbd/trans2.c | 28 ++++++++++++++++++++++++++++
+ 1 file changed, 28 insertions(+)
+
+diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
+index 26b6523..7f47579 100644
+--- a/source3/smbd/trans2.c
++++ b/source3/smbd/trans2.c
+@@ -51,6 +51,34 @@ static char *store_file_unix_basic_info2(connection_struct *conn,
+ files_struct *fsp,
+ const SMB_STRUCT_STAT *psbuf);
+
++/****************************************************************************
++ Check if an open file handle or pathname is a symlink.
++****************************************************************************/
++
++static NTSTATUS refuse_symlink(connection_struct *conn,
++ const files_struct *fsp,
++ const char *name)
++{
++ SMB_STRUCT_STAT sbuf;
++ const SMB_STRUCT_STAT *pst = NULL;
++
++ if (fsp) {
++ pst = &fsp->fsp_name->st;
++ } else {
++ int ret = vfs_stat_smb_fname(conn,
++ name,
++ &sbuf);
++ if (ret == -1) {
++ return map_nt_error_from_unix(errno);
++ }
++ pst = &sbuf;
++ }
++ if (S_ISLNK(pst->st_ex_mode)) {
++ return NT_STATUS_ACCESS_DENIED;
++ }
++ return NT_STATUS_OK;
++}
++
+ /********************************************************************
+ Roundup a value to the nearest allocation roundup size boundary.
+ Only do this for Windows clients.
+--
+2.5.0
+
+
+From f5b1bcc51e18bc85f376701bb4ae6894d97addfd Mon Sep 17 00:00:00 2001
+From: Jeremy Allison <jra(a)samba.org>
+Date: Tue, 5 Jan 2016 10:38:28 -0800
+Subject: [PATCH 2/8] CVE-2015-7560: s3: smbd: Refuse to get an ACL from a
+ POSIX file handle on a symlink.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11648
+
+Signed-off-by: Jeremy Allison <jra(a)samba.org>
+Reviewed-by: Michael Adam <obnox(a)samba.org>
+---
+ source3/smbd/nttrans.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
+index 4c145e0..7255600 100644
+--- a/source3/smbd/nttrans.c
++++ b/source3/smbd/nttrans.c
+@@ -1925,6 +1925,12 @@ NTSTATUS smbd_do_query_security_desc(connection_struct *conn,
+ return NT_STATUS_ACCESS_DENIED;
+ }
+
++ if (S_ISLNK(fsp->fsp_name->st.st_ex_mode)) {
++ DEBUG(10, ("ACL get on symlink %s denied.\n",
++ fsp_str_dbg(fsp)));
++ return NT_STATUS_ACCESS_DENIED;
++ }
++
+ if (security_info_wanted & (SECINFO_DACL|SECINFO_OWNER|
+ SECINFO_GROUP|SECINFO_SACL)) {
+ /* Don't return SECINFO_LABEL if anything else was
+--
+2.5.0
+
+
+From 8bdbe1c90c98efbd08fc70d773d236c4ba00b1ae Mon Sep 17 00:00:00 2001
+From: Jeremy Allison <jra(a)samba.org>
+Date: Tue, 5 Jan 2016 10:52:50 -0800
+Subject: [PATCH 3/8] CVE-2015-7560: s3: smbd: Refuse to set an ACL from a
+ POSIX file handle on a symlink.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11648
+
+Signed-off-by: Jeremy Allison <jra(a)samba.org>
+Reviewed-by: Michael Adam <obnox(a)samba.org>
+---
+ source3/smbd/nttrans.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
+index 7255600..d2102ca 100644
+--- a/source3/smbd/nttrans.c
++++ b/source3/smbd/nttrans.c
+@@ -877,6 +877,12 @@ NTSTATUS set_sd(files_struct *fsp, struct security_descriptor *psd,
+ return NT_STATUS_OK;
+ }
+
++ if (S_ISLNK(fsp->fsp_name->st.st_ex_mode)) {
++ DEBUG(10, ("ACL set on symlink %s denied.\n",
++ fsp_str_dbg(fsp)));
++ return NT_STATUS_ACCESS_DENIED;
++ }
++
+ if (psd->owner_sid == NULL) {
+ security_info_sent &= ~SECINFO_OWNER;
+ }
+--
+2.5.0
+
+
+From 612b032e2dedd3e07bbe79718ecbb3b68ffbb7a5 Mon Sep 17 00:00:00 2001
+From: Jeremy Allison <jra(a)samba.org>
+Date: Tue, 5 Jan 2016 11:22:12 -0800
+Subject: [PATCH 4/8] CVE-2015-7560: s3: smbd: Refuse to set a POSIX ACL on a
+ symlink.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11648
+
+Signed-off-by: Jeremy Allison <jra(a)samba.org>
+Reviewed-by: Michael Adam <obnox(a)samba.org>
+---
+ source3/smbd/trans2.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
+index 7f47579..2f01e87 100644
+--- a/source3/smbd/trans2.c
++++ b/source3/smbd/trans2.c
+@@ -6480,6 +6480,7 @@ static NTSTATUS smb_set_posix_acl(connection_struct *conn,
+ uint16 num_def_acls;
+ bool valid_file_acls = True;
+ bool valid_def_acls = True;
++ NTSTATUS status;
+
+ if (total_data < SMB_POSIX_ACL_HEADER_SIZE) {
+ return NT_STATUS_INVALID_PARAMETER;
+@@ -6507,6 +6508,11 @@ static NTSTATUS smb_set_posix_acl(connection_struct *conn,
+ return NT_STATUS_INVALID_PARAMETER;
+ }
+
++ status = refuse_symlink(conn, fsp, smb_fname->base_name);
++ if (!NT_STATUS_IS_OK(status)) {
++ return status;
++ }
++
+ DEBUG(10,("smb_set_posix_acl: file %s num_file_acls = %u, num_def_acls = %u\n",
+ smb_fname ? smb_fname_str_dbg(smb_fname) : fsp_str_dbg(fsp),
+ (unsigned int)num_file_acls,
+--
+2.5.0
+
+
+From 28e6120d14e5a942df386db0444abaa93a764207 Mon Sep 17 00:00:00 2001
+From: Jeremy Allison <jra(a)samba.org>
+Date: Tue, 5 Jan 2016 11:24:36 -0800
+Subject: [PATCH 5/8] CVE-2015-7560: s3: smbd: Refuse to get a POSIX ACL on a
+ symlink.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11648
+
+Signed-off-by: Jeremy Allison <jra(a)samba.org>
+Reviewed-by: Michael Adam <obnox(a)samba.org>
+---
+ source3/smbd/trans2.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
+index 2f01e87..3a098d1 100644
+--- a/source3/smbd/trans2.c
++++ b/source3/smbd/trans2.c
+@@ -4959,6 +4959,13 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
+ uint16 num_file_acls = 0;
+ uint16 num_def_acls = 0;
+
++ status = refuse_symlink(conn,
++ fsp,
++ smb_fname->base_name);
++ if (!NT_STATUS_IS_OK(status)) {
++ return status;
++ }
++
+ if (fsp && fsp->fh->fd != -1) {
+ file_acl = SMB_VFS_SYS_ACL_GET_FD(fsp);
+ } else {
+--
+2.5.0
+
+
+From 659bdb80aa65c02cf4f44377cc3bcffb2a817ee0 Mon Sep 17 00:00:00 2001
+From: Jeremy Allison <jra(a)samba.org>
+Date: Tue, 5 Jan 2016 11:05:48 -0800
+Subject: [PATCH 6/8] CVE-2015-7560: s3: smbd: Set return values early, allows
+ removal of code duplication.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11648
+
+Signed-off-by: Jeremy Allison <jra(a)samba.org>
+Reviewed-by: Michael Adam <obnox(a)samba.org>
+---
+ source3/smbd/trans2.c | 13 +++++--------
+ 1 file changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
+index 3a098d1..6fdd1da 100644
+--- a/source3/smbd/trans2.c
++++ b/source3/smbd/trans2.c
+@@ -210,11 +210,12 @@ NTSTATUS get_ea_names_from_file(TALLOC_CTX *mem_ctx, connection_struct *conn,
+ size_t num_names;
+ ssize_t sizeret = -1;
+
++ if (pnames) {
++ *pnames = NULL;
++ }
++ *pnum_names = 0;
++
+ if (!lp_ea_support(SNUM(conn))) {
+- if (pnames) {
+- *pnames = NULL;
+- }
+- *pnum_names = 0;
+ return NT_STATUS_OK;
+ }
+
+@@ -264,10 +265,6 @@ NTSTATUS get_ea_names_from_file(TALLOC_CTX *mem_ctx, connection_struct *conn,
+
+ if (sizeret == 0) {
+ TALLOC_FREE(names);
+- if (pnames) {
+- *pnames = NULL;
+- }
+- *pnum_names = 0;
+ return NT_STATUS_OK;
+ }
+
+--
+2.5.0
+
+
+From 4ba5e7cf01b8074b0313ecb7e218355d771df1cc Mon Sep 17 00:00:00 2001
+From: Jeremy Allison <jra(a)samba.org>
+Date: Tue, 5 Jan 2016 11:29:38 -0800
+Subject: [PATCH 7/8] CVE-2015-7560: s3: smbd: Silently return no EA's
+ available on a symlink.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11648
+
+Signed-off-by: Jeremy Allison <jra(a)samba.org>
+Reviewed-by: Michael Adam <obnox(a)samba.org>
+---
+ source3/smbd/trans2.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
+index 6fdd1da..8b6e4b2 100644
+--- a/source3/smbd/trans2.c
++++ b/source3/smbd/trans2.c
+@@ -209,6 +209,7 @@ NTSTATUS get_ea_names_from_file(TALLOC_CTX *mem_ctx, connection_struct *conn,
+ char **names, **tmp;
+ size_t num_names;
+ ssize_t sizeret = -1;
++ NTSTATUS status;
+
+ if (pnames) {
+ *pnames = NULL;
+@@ -219,6 +220,14 @@ NTSTATUS get_ea_names_from_file(TALLOC_CTX *mem_ctx, connection_struct *conn,
+ return NT_STATUS_OK;
+ }
+
++ status = refuse_symlink(conn, fsp, fname);
++ if (!NT_STATUS_IS_OK(status)) {
++ /*
++ * Just return no EA's on a symlink.
++ */
++ return NT_STATUS_OK;
++ }
++
+ /*
+ * TALLOC the result early to get the talloc hierarchy right.
+ */
+--
+2.5.0
+
+
+From 9d8c7274ab87a0c07367e872ca1db7fd72886fde Mon Sep 17 00:00:00 2001
+From: Jeremy Allison <jra(a)samba.org>
+Date: Tue, 5 Jan 2016 11:33:48 -0800
+Subject: [PATCH 8/8] CVE-2015-7560: s3: smbd: Refuse to set EA's on a symlink.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11648
+
+Signed-off-by: Jeremy Allison <jra(a)samba.org>
+Reviewed-by: Michael Adam <obnox(a)samba.org>
+---
+ source3/smbd/trans2.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
+index 8b6e4b2..98fd2af 100644
+--- a/source3/smbd/trans2.c
++++ b/source3/smbd/trans2.c
+@@ -584,6 +584,7 @@ NTSTATUS set_ea(connection_struct *conn, files_struct *fsp,
+ const struct smb_filename *smb_fname, struct ea_list *ea_list)
+ {
+ char *fname = NULL;
++ NTSTATUS status;
+
+ if (!lp_ea_support(SNUM(conn))) {
+ return NT_STATUS_EAS_NOT_SUPPORTED;
+@@ -593,6 +594,12 @@ NTSTATUS set_ea(connection_struct *conn, files_struct *fsp,
+ return NT_STATUS_ACCESS_DENIED;
+ }
+
++ status = refuse_symlink(conn, fsp, smb_fname->base_name);
++ if (!NT_STATUS_IS_OK(status)) {
++ return status;
++ }
++
++
+ /* For now setting EAs on streams isn't supported. */
+ fname = smb_fname->base_name;
+
+--
+2.5.0
+
diff --git a/src/patches/samba/CVE-2016-2110-v3-6.patch b/src/patches/samba/CVE-2016-2110-v3-6.patch
new file mode 100644
index 0000000..1f454be
--- /dev/null
+++ b/src/patches/samba/CVE-2016-2110-v3-6.patch
@@ -0,0 +1,670 @@
+From 202d69267c8550b850438877fb51c3d2c992949d Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Tue, 1 Dec 2015 08:46:45 +0100
+Subject: [PATCH 01/10] CVE-2016-2110: s3:ntlmssp: set and use
+ ntlmssp_state->allow_lm_key
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11644
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+---
+ source3/libsmb/ntlmssp.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c
+index 1de6189..20a5987 100644
+--- a/source3/libsmb/ntlmssp.c
++++ b/source3/libsmb/ntlmssp.c
+@@ -530,7 +530,8 @@ noccache:
+ DEBUG(3, ("Got challenge flags:\n"));
+ debug_ntlmssp_flags(chal_flags);
+
+- ntlmssp_handle_neg_flags(ntlmssp_state, chal_flags, lp_client_lanman_auth());
++ ntlmssp_handle_neg_flags(ntlmssp_state, chal_flags,
++ ntlmssp_state->allow_lm_key);
+
+ if (ntlmssp_state->unicode) {
+ if (chal_flags & NTLMSSP_NEGOTIATE_TARGET_INFO) {
+@@ -769,6 +770,7 @@ NTSTATUS ntlmssp_client_start(TALLOC_CTX *mem_ctx,
+ ntlmssp_state->unicode = True;
+
+ ntlmssp_state->use_ntlmv2 = use_ntlmv2;
++ ntlmssp_state->allow_lm_key = lp_client_lanman_auth();
+
+ ntlmssp_state->expected_state = NTLMSSP_INITIAL;
+
+--
+2.8.1
+
+
+From a701bc5f8a76584a2e0680b2c3dd9afb77f12430 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Fri, 11 Dec 2015 14:50:23 +0100
+Subject: [PATCH 02/10] CVE-2016-2110: s3:ntlmssp: add
+ ntlmssp3_handle_neg_flags()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a copy of ntlmssp_handle_neg_flags(), which will be changed
+in an incompatible way in the following commits.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11644
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+---
+ source3/libsmb/ntlmssp.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 56 insertions(+), 2 deletions(-)
+
+diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c
+index 20a5987..ad09f9f 100644
+--- a/source3/libsmb/ntlmssp.c
++++ b/source3/libsmb/ntlmssp.c
+@@ -422,6 +422,60 @@ static NTSTATUS ntlmssp_client_initial(struct ntlmssp_state *ntlmssp_state,
+ return NT_STATUS_MORE_PROCESSING_REQUIRED;
+ }
+
++static void ntlmssp3_handle_neg_flags(struct ntlmssp_state *ntlmssp_state,
++ uint32_t neg_flags, bool allow_lm)
++{
++ if (neg_flags & NTLMSSP_NEGOTIATE_UNICODE) {
++ ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_UNICODE;
++ ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_OEM;
++ ntlmssp_state->unicode = true;
++ } else {
++ ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_UNICODE;
++ ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_OEM;
++ ntlmssp_state->unicode = false;
++ }
++
++ if ((neg_flags & NTLMSSP_NEGOTIATE_LM_KEY) && allow_lm) {
++ /* other end forcing us to use LM */
++ ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_LM_KEY;
++ ntlmssp_state->use_ntlmv2 = false;
++ } else {
++ ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY;
++ }
++
++ if (!(neg_flags & NTLMSSP_NEGOTIATE_ALWAYS_SIGN)) {
++ ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_ALWAYS_SIGN;
++ }
++
++ if (!(neg_flags & NTLMSSP_NEGOTIATE_NTLM2)) {
++ ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_NTLM2;
++ }
++
++ if (!(neg_flags & NTLMSSP_NEGOTIATE_128)) {
++ ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_128;
++ }
++
++ if (!(neg_flags & NTLMSSP_NEGOTIATE_56)) {
++ ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_56;
++ }
++
++ if (!(neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCH)) {
++ ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_KEY_EXCH;
++ }
++
++ if (!(neg_flags & NTLMSSP_NEGOTIATE_SIGN)) {
++ ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_SIGN;
++ }
++
++ if (!(neg_flags & NTLMSSP_NEGOTIATE_SEAL)) {
++ ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_SEAL;
++ }
++
++ if ((neg_flags & NTLMSSP_REQUEST_TARGET)) {
++ ntlmssp_state->neg_flags |= NTLMSSP_REQUEST_TARGET;
++ }
++}
++
+ /**
+ * Next state function for the Challenge Packet. Generate an auth packet.
+ *
+@@ -530,8 +584,8 @@ noccache:
+ DEBUG(3, ("Got challenge flags:\n"));
+ debug_ntlmssp_flags(chal_flags);
+
+- ntlmssp_handle_neg_flags(ntlmssp_state, chal_flags,
+- ntlmssp_state->allow_lm_key);
++ ntlmssp3_handle_neg_flags(ntlmssp_state, chal_flags,
++ ntlmssp_state->allow_lm_key);
+
+ if (ntlmssp_state->unicode) {
+ if (chal_flags & NTLMSSP_NEGOTIATE_TARGET_INFO) {
+--
+2.8.1
+
+
+From 92b2f5315d135b7b83a3ae106b43d18181be2f02 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn(a)cryptomilk.org>
+Date: Thu, 31 Mar 2016 12:39:50 +0200
+Subject: [PATCH 03/10] CVE-2016-2110: s3:ntlmssp: let
+ ntlmssp3_handle_neg_flags() return NTSTATUS
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In future we can do a more fine granted negotiation
+and assert specific security features.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11644
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+---
+ source3/libsmb/ntlmssp.c | 33 +++++++++++++++++++--------------
+ 1 file changed, 19 insertions(+), 14 deletions(-)
+
+diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c
+index ad09f9f..81a85ce 100644
+--- a/source3/libsmb/ntlmssp.c
++++ b/source3/libsmb/ntlmssp.c
+@@ -422,10 +422,10 @@ static NTSTATUS ntlmssp_client_initial(struct ntlmssp_state *ntlmssp_state,
+ return NT_STATUS_MORE_PROCESSING_REQUIRED;
+ }
+
+-static void ntlmssp3_handle_neg_flags(struct ntlmssp_state *ntlmssp_state,
+- uint32_t neg_flags, bool allow_lm)
++static NTSTATUS ntlmssp3_handle_neg_flags(struct ntlmssp_state *ntlmssp_state,
++ uint32_t flags)
+ {
+- if (neg_flags & NTLMSSP_NEGOTIATE_UNICODE) {
++ if (flags & NTLMSSP_NEGOTIATE_UNICODE) {
+ ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_UNICODE;
+ ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_OEM;
+ ntlmssp_state->unicode = true;
+@@ -435,7 +435,7 @@ static void ntlmssp3_handle_neg_flags(struct ntlmssp_state *ntlmssp_state,
+ ntlmssp_state->unicode = false;
+ }
+
+- if ((neg_flags & NTLMSSP_NEGOTIATE_LM_KEY) && allow_lm) {
++ if ((flags & NTLMSSP_NEGOTIATE_LM_KEY) && ntlmssp_state->allow_lm_key) {
+ /* other end forcing us to use LM */
+ ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_LM_KEY;
+ ntlmssp_state->use_ntlmv2 = false;
+@@ -443,37 +443,39 @@ static void ntlmssp3_handle_neg_flags(struct ntlmssp_state *ntlmssp_state,
+ ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY;
+ }
+
+- if (!(neg_flags & NTLMSSP_NEGOTIATE_ALWAYS_SIGN)) {
++ if (!(flags & NTLMSSP_NEGOTIATE_ALWAYS_SIGN)) {
+ ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_ALWAYS_SIGN;
+ }
+
+- if (!(neg_flags & NTLMSSP_NEGOTIATE_NTLM2)) {
++ if (!(flags & NTLMSSP_NEGOTIATE_NTLM2)) {
+ ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_NTLM2;
+ }
+
+- if (!(neg_flags & NTLMSSP_NEGOTIATE_128)) {
++ if (!(flags & NTLMSSP_NEGOTIATE_128)) {
+ ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_128;
+ }
+
+- if (!(neg_flags & NTLMSSP_NEGOTIATE_56)) {
++ if (!(flags & NTLMSSP_NEGOTIATE_56)) {
+ ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_56;
+ }
+
+- if (!(neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCH)) {
++ if (!(flags & NTLMSSP_NEGOTIATE_KEY_EXCH)) {
+ ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_KEY_EXCH;
+ }
+
+- if (!(neg_flags & NTLMSSP_NEGOTIATE_SIGN)) {
++ if (!(flags & NTLMSSP_NEGOTIATE_SIGN)) {
+ ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_SIGN;
+ }
+
+- if (!(neg_flags & NTLMSSP_NEGOTIATE_SEAL)) {
++ if (!(flags & NTLMSSP_NEGOTIATE_SEAL)) {
+ ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_SEAL;
+ }
+
+- if ((neg_flags & NTLMSSP_REQUEST_TARGET)) {
++ if ((flags & NTLMSSP_REQUEST_TARGET)) {
+ ntlmssp_state->neg_flags |= NTLMSSP_REQUEST_TARGET;
+ }
++
++ return NT_STATUS_OK;
+ }
+
+ /**
+@@ -584,8 +586,11 @@ noccache:
+ DEBUG(3, ("Got challenge flags:\n"));
+ debug_ntlmssp_flags(chal_flags);
+
+- ntlmssp3_handle_neg_flags(ntlmssp_state, chal_flags,
+- ntlmssp_state->allow_lm_key);
++ nt_status = ntlmssp3_handle_neg_flags(ntlmssp_state, chal_flags);
++ if (!NT_STATUS_IS_OK(nt_status)) {
++ return nt_status;
++ }
++
+
+ if (ntlmssp_state->unicode) {
+ if (chal_flags & NTLMSSP_NEGOTIATE_TARGET_INFO) {
+--
+2.8.1
+
+
+From a239a337e3c0081af1a41aaac8957bb1aa0771f8 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Tue, 1 Dec 2015 15:01:09 +0100
+Subject: [PATCH 04/10] CVE-2016-2110: s3:ntlmssp: don't allow a downgrade from
+ NTLMv2 to LM_AUTH
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+man smb.conf says "client ntlmv2 auth = yes" the default disables,
+"client lanman auth = yes":
+
+ ...
+ Likewise, if the client ntlmv2 auth parameter is enabled, then only NTLMv2
+ logins will be attempted.
+ ...
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11644
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+---
+ source3/libsmb/ntlmssp.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c
+index 81a85ce..23a5e5d 100644
+--- a/source3/libsmb/ntlmssp.c
++++ b/source3/libsmb/ntlmssp.c
+@@ -841,6 +841,10 @@ NTSTATUS ntlmssp_client_start(TALLOC_CTX *mem_ctx,
+ NTLMSSP_NEGOTIATE_KEY_EXCH |
+ NTLMSSP_REQUEST_TARGET;
+
++ if (ntlmssp_state->use_ntlmv2) {
++ ntlmssp_state->allow_lm_key = false;
++ }
++
+ ntlmssp_state->client.netbios_name = talloc_strdup(ntlmssp_state, netbios_name);
+ if (!ntlmssp_state->client.netbios_name) {
+ talloc_free(ntlmssp_state);
+--
+2.8.1
+
+
+From e11dc9aa90420947f9fc82365b55ecb08353451c Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Thu, 31 Mar 2016 12:59:05 +0200
+Subject: [PATCH 05/10] CVE-2016-2110: s3:ntlmssp: maintain a required_flags
+ variable
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We now give an error when required flags are missing.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11644
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+---
+ libcli/auth/ntlmssp.h | 1 +
+ source3/libsmb/ntlmssp.c | 20 ++++++++++++++++++++
+ 2 files changed, 21 insertions(+)
+
+diff --git a/libcli/auth/ntlmssp.h b/libcli/auth/ntlmssp.h
+index 495d94f..88a049b 100644
+--- a/libcli/auth/ntlmssp.h
++++ b/libcli/auth/ntlmssp.h
+@@ -83,6 +83,7 @@ struct ntlmssp_state
+ DATA_BLOB nt_resp;
+ DATA_BLOB session_key;
+
++ uint32_t required_flags;
+ uint32_t neg_flags; /* the current state of negotiation with the NTLMSSP partner */
+
+ /**
+diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c
+index 23a5e5d..48d7d45 100644
+--- a/source3/libsmb/ntlmssp.c
++++ b/source3/libsmb/ntlmssp.c
+@@ -425,6 +425,8 @@ static NTSTATUS ntlmssp_client_initial(struct ntlmssp_state *ntlmssp_state,
+ static NTSTATUS ntlmssp3_handle_neg_flags(struct ntlmssp_state *ntlmssp_state,
+ uint32_t flags)
+ {
++ uint32_t missing_flags = ntlmssp_state->required_flags;
++
+ if (flags & NTLMSSP_NEGOTIATE_UNICODE) {
+ ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_UNICODE;
+ ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_OEM;
+@@ -475,6 +477,24 @@ static NTSTATUS ntlmssp3_handle_neg_flags(struct ntlmssp_state *ntlmssp_state,
+ ntlmssp_state->neg_flags |= NTLMSSP_REQUEST_TARGET;
+ }
+
++ missing_flags &= ~ntlmssp_state->neg_flags;
++ if (missing_flags != 0) {
++ NTSTATUS status = NT_STATUS_RPC_SEC_PKG_ERROR;
++ DEBUG(1, ("%s: Got challenge flags[0x%08x] "
++ "- possible downgrade detected! "
++ "missing_flags[0x%08x] - %s\n",
++ __func__,
++ (unsigned)flags,
++ (unsigned)missing_flags,
++ nt_errstr(status)));
++ debug_ntlmssp_flags(missing_flags);
++ DEBUGADD(4, ("neg_flags[0x%08x]\n",
++ (unsigned)ntlmssp_state->neg_flags));
++ debug_ntlmssp_flags(ntlmssp_state->neg_flags);
++
++ return status;
++ }
++
+ return NT_STATUS_OK;
+ }
+
+--
+2.8.1
+
+
+From 06ca5b7655e577ff6e2d5817cf221c05f9bb5c86 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Thu, 31 Mar 2016 13:03:24 +0200
+Subject: [PATCH 06/10] CVE-2016-2110: s3:ntlmssp: don't allow a downgrade from
+ NTLMv2 to LM_AUTH
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+man smb.conf says "client ntlmv2 auth = yes" the default disables,
+"client lanman auth = yes":
+
+ ...
+ Likewise, if the client ntlmv2 auth parameter is enabled, then only
+ NTLMv2 logins will be attempted.
+ ...
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11644
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+---
+ source3/libsmb/ntlmssp.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c
+index 48d7d45..bf40404 100644
+--- a/source3/libsmb/ntlmssp.c
++++ b/source3/libsmb/ntlmssp.c
+@@ -388,6 +388,7 @@ static NTSTATUS ntlmssp_client_initial(struct ntlmssp_state *ntlmssp_state,
+
+ if (ntlmssp_state->use_ntlmv2) {
+ ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_NTLM2;
++ ntlmssp_state->allow_lm_key = false;
+ }
+
+ /* generate the ntlmssp negotiate packet */
+--
+2.8.1
+
+
+From f99d4469a8b09dd93eb7124f2814e15869915671 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn(a)samba.org>
+Date: Mon, 11 Apr 2016 16:18:44 +0200
+Subject: [PATCH 07/10] CVE-2016-2110: auth/ntlmssp: don't let
+ ntlmssp3_handle_neg_flags() change ntlmssp_state->use_ntlmv2
+
+ntlmssp_handle_neg_flags() can only disable flags, but not
+set them. All supported flags are set at start time.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11644
+
+Signed-off-by: Andreas Schneider <asn(a)samba.org>
+Reviewed-by: Guenther Deschner <gd(a)samba.org>
+---
+ source3/libsmb/ntlmssp.c | 26 +++++++++++++++++---------
+ 1 file changed, 17 insertions(+), 9 deletions(-)
+
+diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c
+index bf40404..7b17a43 100644
+--- a/source3/libsmb/ntlmssp.c
++++ b/source3/libsmb/ntlmssp.c
+@@ -391,6 +391,10 @@ static NTSTATUS ntlmssp_client_initial(struct ntlmssp_state *ntlmssp_state,
+ ntlmssp_state->allow_lm_key = false;
+ }
+
++ if (ntlmssp_state->allow_lm_key) {
++ ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_LM_KEY;
++ }
++
+ /* generate the ntlmssp negotiate packet */
+ status = msrpc_gen(ntlmssp_state, next_request, "CddAA",
+ "NTLMSSP",
+@@ -438,20 +442,24 @@ static NTSTATUS ntlmssp3_handle_neg_flags(struct ntlmssp_state *ntlmssp_state,
+ ntlmssp_state->unicode = false;
+ }
+
+- if ((flags & NTLMSSP_NEGOTIATE_LM_KEY) && ntlmssp_state->allow_lm_key) {
+- /* other end forcing us to use LM */
+- ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_LM_KEY;
+- ntlmssp_state->use_ntlmv2 = false;
+- } else {
++ /*
++ * NTLMSSP_NEGOTIATE_NTLM2 (NTLMSSP_NEGOTIATE_EXTENDED_SESSIONSECURITY)
++ * has priority over NTLMSSP_NEGOTIATE_LM_KEY
++ */
++ if (!(flags & NTLMSSP_NEGOTIATE_NTLM2)) {
++ ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_NTLM2;
++ }
++
++ if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_NTLM2) {
+ ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY;
+ }
+
+- if (!(flags & NTLMSSP_NEGOTIATE_ALWAYS_SIGN)) {
+- ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_ALWAYS_SIGN;
++ if (!(flags & NTLMSSP_NEGOTIATE_LM_KEY)) {
++ ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY;
+ }
+
+- if (!(flags & NTLMSSP_NEGOTIATE_NTLM2)) {
+- ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_NTLM2;
++ if (!(flags & NTLMSSP_NEGOTIATE_ALWAYS_SIGN)) {
++ ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_ALWAYS_SIGN;
+ }
+
+ if (!(flags & NTLMSSP_NEGOTIATE_128)) {
+--
+2.8.1
+
+
+From 71dda1c57c36a9816af7873f169306a766e0284a Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Thu, 31 Mar 2016 14:21:12 +0200
+Subject: [PATCH 08/10] CVE-2016-2110: s3:ntlmssp: let ntlmssp3_client_initial
+ require NTLM2 (EXTENDED_SESSIONSECURITY) when using ntlmv2
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11644
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+---
+ source3/libsmb/ntlmssp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c
+index 7b17a43..d5c83fd 100644
+--- a/source3/libsmb/ntlmssp.c
++++ b/source3/libsmb/ntlmssp.c
+@@ -387,7 +387,7 @@ static NTSTATUS ntlmssp_client_initial(struct ntlmssp_state *ntlmssp_state,
+ }
+
+ if (ntlmssp_state->use_ntlmv2) {
+- ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_NTLM2;
++ ntlmssp_state->required_flags |= NTLMSSP_NEGOTIATE_NTLM2;
+ ntlmssp_state->allow_lm_key = false;
+ }
+
+--
+2.8.1
+
+
+From 911e171bd6fc66e2960cbcdf8c48f2f97d19313b Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn(a)cryptomilk.org>
+Date: Thu, 31 Mar 2016 14:30:05 +0200
+Subject: [PATCH 09/10] CVE-2016-2110: s3:ntlmssp: Change want_fetures to
+ require flags
+
+Pair-Programmed-With: Ralph Boehme <slow(a)samba.org>
+Signed-off-by: Andreas Schneider <asn(a)samba.org>
+Signed-off-by: Ralph Boehme <slow(a)samba.org>
+---
+ source3/libsmb/ntlmssp.c | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c
+index d5c83fd..309175b 100644
+--- a/source3/libsmb/ntlmssp.c
++++ b/source3/libsmb/ntlmssp.c
+@@ -176,17 +176,19 @@ void ntlmssp_want_feature_list(struct ntlmssp_state *ntlmssp_state, char *featur
+ * also add NTLMSSP_NEGOTIATE_SEAL here. JRA.
+ */
+ if (in_list("NTLMSSP_FEATURE_SESSION_KEY", feature_list, True)) {
+- ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SIGN;
++ ntlmssp_state->required_flags |= NTLMSSP_NEGOTIATE_SIGN;
+ }
+ if (in_list("NTLMSSP_FEATURE_SIGN", feature_list, True)) {
+- ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SIGN;
++ ntlmssp_state->required_flags |= NTLMSSP_NEGOTIATE_SIGN;
+ }
+ if(in_list("NTLMSSP_FEATURE_SEAL", feature_list, True)) {
+- ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SEAL;
++ ntlmssp_state->required_flags |= NTLMSSP_NEGOTIATE_SEAL;
+ }
+ if (in_list("NTLMSSP_FEATURE_CCACHE", feature_list, true)) {
+ ntlmssp_state->use_ccache = true;
+ }
++
++ ntlmssp_state->neg_flags |= ntlmssp_state->required_flags;
+ }
+
+ /**
+@@ -199,17 +201,20 @@ void ntlmssp_want_feature(struct ntlmssp_state *ntlmssp_state, uint32_t feature)
+ {
+ /* As per JRA's comment above */
+ if (feature & NTLMSSP_FEATURE_SESSION_KEY) {
+- ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SIGN;
++ ntlmssp_state->required_flags |= NTLMSSP_NEGOTIATE_SIGN;
+ }
+ if (feature & NTLMSSP_FEATURE_SIGN) {
+- ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SIGN;
++ ntlmssp_state->required_flags |= NTLMSSP_NEGOTIATE_SIGN;
+ }
+ if (feature & NTLMSSP_FEATURE_SEAL) {
+- ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_SEAL;
++ ntlmssp_state->required_flags |= NTLMSSP_NEGOTIATE_SIGN;
++ ntlmssp_state->required_flags |= NTLMSSP_NEGOTIATE_SEAL;
+ }
+ if (feature & NTLMSSP_FEATURE_CCACHE) {
+ ntlmssp_state->use_ccache = true;
+ }
++
++ ntlmssp_state->neg_flags |= ntlmssp_state->required_flags;
+ }
+
+ /**
+--
+2.8.1
+
+
+From a95a44eff90cdbd42d683567e0d511e9d52026ad Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn(a)samba.org>
+Date: Thu, 31 Mar 2016 15:02:11 +0200
+Subject: [PATCH 10/10] CVE-2016-2110: s3:ntlmssp: Fix downgrade also for the
+ ntlmssp creds cache case
+
+Pair-Programmed-With: Ralph Boehme <slow(a)samba.org>
+Signed-off-by: Andreas Schneider <asn(a)samba.org>
+Signed-off-by: Ralph Boehme <slow(a)samba.org>
+---
+ source3/libsmb/ntlmssp.c | 42 ++++++++++++++++++++----------------------
+ 1 file changed, 20 insertions(+), 22 deletions(-)
+
+diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c
+index 309175b..045dc87 100644
+--- a/source3/libsmb/ntlmssp.c
++++ b/source3/libsmb/ntlmssp.c
+@@ -538,6 +538,26 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state,
+ DATA_BLOB encrypted_session_key = data_blob_null;
+ NTSTATUS nt_status = NT_STATUS_OK;
+
++ if (!msrpc_parse(ntlmssp_state, &reply, "CdBd",
++ "NTLMSSP",
++ &ntlmssp_command,
++ &server_domain_blob,
++ &chal_flags)) {
++ DEBUG(1, ("Failed to parse the NTLMSSP Challenge: (#1)\n"));
++ dump_data(2, reply.data, reply.length);
++
++ return NT_STATUS_INVALID_PARAMETER;
++ }
++ data_blob_free(&server_domain_blob);
++
++ DEBUG(3, ("Got challenge flags:\n"));
++ debug_ntlmssp_flags(chal_flags);
++
++ nt_status = ntlmssp3_handle_neg_flags(ntlmssp_state, chal_flags);
++ if (!NT_STATUS_IS_OK(nt_status)) {
++ return nt_status;
++ }
++
+ if (ntlmssp_state->use_ccache) {
+ struct wbcCredentialCacheParams params;
+ struct wbcCredentialCacheInfo *info = NULL;
+@@ -588,17 +608,6 @@ static NTSTATUS ntlmssp_client_challenge(struct ntlmssp_state *ntlmssp_state,
+
+ noccache:
+
+- if (!msrpc_parse(ntlmssp_state, &reply, "CdBd",
+- "NTLMSSP",
+- &ntlmssp_command,
+- &server_domain_blob,
+- &chal_flags)) {
+- DEBUG(1, ("Failed to parse the NTLMSSP Challenge: (#1)\n"));
+- dump_data(2, reply.data, reply.length);
+-
+- return NT_STATUS_INVALID_PARAMETER;
+- }
+-
+ if (DEBUGLEVEL >= 10) {
+ struct CHALLENGE_MESSAGE *challenge = talloc(
+ talloc_tos(), struct CHALLENGE_MESSAGE);
+@@ -615,17 +624,6 @@ noccache:
+ }
+ }
+
+- data_blob_free(&server_domain_blob);
+-
+- DEBUG(3, ("Got challenge flags:\n"));
+- debug_ntlmssp_flags(chal_flags);
+-
+- nt_status = ntlmssp3_handle_neg_flags(ntlmssp_state, chal_flags);
+- if (!NT_STATUS_IS_OK(nt_status)) {
+- return nt_status;
+- }
+-
+-
+ if (ntlmssp_state->unicode) {
+ if (chal_flags & NTLMSSP_NEGOTIATE_TARGET_INFO) {
+ chal_parse_string = "CdUdbddB";
+--
+2.8.1
+
diff --git a/src/patches/samba/CVE-2016-2111-v3-6.patch b/src/patches/samba/CVE-2016-2111-v3-6.patch
new file mode 100644
index 0000000..9817367
--- /dev/null
+++ b/src/patches/samba/CVE-2016-2111-v3-6.patch
@@ -0,0 +1,1058 @@
+From ee105156fa151ebfd34b8febc2928e144b3b7b0e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd(a)samba.org>
+Date: Sat, 26 Sep 2015 01:29:10 +0200
+Subject: [PATCH 01/15] CVE-2016-2111: s3:rpc_server/netlogon: always go
+ through netr_creds_server_step_check()
+
+The ensures we apply the "server schannel = yes" restrictions.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11749
+
+Pair-Programmed-With: Stefan Metzmacher <metze(a)samba.org>
+
+Signed-off-by: Guenther Deschner <gd(a)samba.org>
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+---
+ source3/rpc_server/netlogon/srv_netlog_nt.c | 24 ++++++++++++++----------
+ 1 file changed, 14 insertions(+), 10 deletions(-)
+
+diff --git a/source3/rpc_server/netlogon/srv_netlog_nt.c b/source3/rpc_server/netlogon/srv_netlog_nt.c
+index 4734bfe..54b8c5c 100644
+--- a/source3/rpc_server/netlogon/srv_netlog_nt.c
++++ b/source3/rpc_server/netlogon/srv_netlog_nt.c
+@@ -2271,11 +2271,13 @@ NTSTATUS _netr_GetForestTrustInformation(struct pipes_struct *p,
+
+ /* TODO: check server name */
+
+- status = schannel_check_creds_state(p->mem_ctx, lp_private_dir(),
+- r->in.computer_name,
+- r->in.credential,
+- r->out.return_authenticator,
+- &creds);
++ become_root();
++ status = netr_creds_server_step_check(p, p->mem_ctx,
++ r->in.computer_name,
++ r->in.credential,
++ r->out.return_authenticator,
++ &creds);
++ unbecome_root();
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
+ }
+@@ -2371,11 +2373,13 @@ NTSTATUS _netr_ServerGetTrustInfo(struct pipes_struct *p,
+
+ /* TODO: check server name */
+
+- status = schannel_check_creds_state(p->mem_ctx, lp_private_dir(),
+- r->in.computer_name,
+- r->in.credential,
+- r->out.return_authenticator,
+- &creds);
++ become_root();
++ status = netr_creds_server_step_check(p, p->mem_ctx,
++ r->in.computer_name,
++ r->in.credential,
++ r->out.return_authenticator,
++ &creds);
++ unbecome_root();
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
+ }
+--
+2.8.1
+
+
+From f93668be5dffea9b67c5ec2d49ebf7495b74c7fc Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Fri, 7 Aug 2015 13:33:17 +0200
+Subject: [PATCH 02/15] CVE-2016-2111: s3:rpc_server/netlogon: require
+ DCERPC_AUTH_LEVEL_PRIVACY for validation level 6
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11749
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+---
+ source3/rpc_server/netlogon/srv_netlog_nt.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/source3/rpc_server/netlogon/srv_netlog_nt.c b/source3/rpc_server/netlogon/srv_netlog_nt.c
+index 54b8c5c..30e1bc0 100644
+--- a/source3/rpc_server/netlogon/srv_netlog_nt.c
++++ b/source3/rpc_server/netlogon/srv_netlog_nt.c
+@@ -1636,6 +1636,14 @@ static NTSTATUS _netr_LogonSamLogon_base(struct pipes_struct *p,
+ r->out.validation->sam3);
+ break;
+ case 6:
++ /* Only allow this if the pipe is protected. */
++ if (p->auth.auth_level < DCERPC_AUTH_LEVEL_PRIVACY) {
++ DEBUG(0,("netr_Validation6: client %s not using privacy for netlogon\n",
++ get_remote_machine_name()));
++ status = NT_STATUS_INVALID_PARAMETER;
++ break;
++ }
++
+ status = serverinfo_to_SamInfo6(server_info, pipe_session_key, 16,
+ r->out.validation->sam6);
+ break;
+--
+2.8.1
+
+
+From 70f12940ef563f83310d5c82cf0a3fc5876d98ac Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Sat, 12 Dec 2015 22:23:18 +0100
+Subject: [PATCH 03/15] CVE-2016-2111: s4:torture/rpc: fix rpc.samba3.netlogon
+ ntlmv2 test
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The computer name of the NTLMv2 blob needs to match
+the schannel connection.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11749
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+---
+ source4/torture/rpc/samba3rpc.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c
+index 26bed19..d39cf55 100644
+--- a/source4/torture/rpc/samba3rpc.c
++++ b/source4/torture/rpc/samba3rpc.c
+@@ -1122,8 +1122,8 @@ static bool schan(struct torture_context *tctx,
+ generate_random_buffer(chal.data, chal.length);
+ names_blob = NTLMv2_generate_names_blob(
+ mem_ctx,
+- cli_credentials_get_workstation(user_creds),
+- cli_credentials_get_domain(user_creds));
++ cli_credentials_get_workstation(wks_creds),
++ cli_credentials_get_domain(wks_creds));
+ status = cli_credentials_get_ntlm_response(
+ user_creds, mem_ctx, &flags, chal, names_blob,
+ &lm_resp, &nt_resp, NULL, NULL);
+--
+2.8.1
+
+
+From d8e061a1bcbb88ab6ba0f0dffbcac16a5e1db4f9 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Tue, 23 Feb 2016 19:08:31 +0100
+Subject: [PATCH 04/15] CVE-2016-2111: libcli/auth: add
+ NTLMv2_RESPONSE_verify_netlogon_creds() helper function
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is the function that prevents spoofing like
+Microsoft's CVE-2015-0005.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11749
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+---
+ libcli/auth/proto.h | 5 ++
+ libcli/auth/smbencrypt.c | 142 +++++++++++++++++++++++++++++++++++++++++++++-
+ libcli/auth/wscript_build | 2 +-
+ source3/Makefile.in | 27 +++++----
+ 4 files changed, 163 insertions(+), 13 deletions(-)
+
+diff --git a/libcli/auth/proto.h b/libcli/auth/proto.h
+index 11b720df..558a6eb 100644
+--- a/libcli/auth/proto.h
++++ b/libcli/auth/proto.h
+@@ -139,6 +139,11 @@ bool SMBNTLMv2encrypt(TALLOC_CTX *mem_ctx,
+ const DATA_BLOB *names_blob,
+ DATA_BLOB *lm_response, DATA_BLOB *nt_response,
+ DATA_BLOB *lm_session_key, DATA_BLOB *user_session_key) ;
++NTSTATUS NTLMv2_RESPONSE_verify_netlogon_creds(const char *account_name,
++ const char *account_domain,
++ const DATA_BLOB response,
++ const struct netlogon_creds_CredentialState *creds,
++ const char *workgroup);
+
+ /***********************************************************
+ encode a password buffer with a unicode password. The buffer
+diff --git a/libcli/auth/smbencrypt.c b/libcli/auth/smbencrypt.c
+index 8fe606e..7c3142c 100644
+--- a/libcli/auth/smbencrypt.c
++++ b/libcli/auth/smbencrypt.c
+@@ -26,7 +26,7 @@
+ #include "../libcli/auth/msrpc_parse.h"
+ #include "../lib/crypto/crypto.h"
+ #include "../libcli/auth/libcli_auth.h"
+-#include "../librpc/gen_ndr/ntlmssp.h"
++#include "../librpc/gen_ndr/ndr_ntlmssp.h"
+
+ void SMBencrypt_hash(const uint8_t lm_hash[16], const uint8_t *c8, uint8_t p24[24])
+ {
+@@ -522,6 +522,146 @@ bool SMBNTLMv2encrypt(TALLOC_CTX *mem_ctx,
+ lm_response, nt_response, lm_session_key, user_session_key);
+ }
+
++NTSTATUS NTLMv2_RESPONSE_verify_netlogon_creds(const char *account_name,
++ const char *account_domain,
++ const DATA_BLOB response,
++ const struct netlogon_creds_CredentialState *creds,
++ const char *workgroup)
++{
++ TALLOC_CTX *frame = NULL;
++ /* RespType + HiRespType */
++ static const char *magic = "\x01\x01";
++ int cmp;
++ struct NTLMv2_RESPONSE v2_resp;
++ enum ndr_err_code err;
++ const struct AV_PAIR *av_nb_cn = NULL;
++ const struct AV_PAIR *av_nb_dn = NULL;
++
++ if (response.length < 48) {
++ /*
++ * NTLMv2_RESPONSE has at least 48 bytes.
++ */
++ return NT_STATUS_OK;
++ }
++
++ cmp = memcmp(response.data + 16, magic, 2);
++ if (cmp != 0) {
++ /*
++ * It doesn't look like a valid NTLMv2_RESPONSE
++ */
++ return NT_STATUS_OK;
++ }
++
++ frame = talloc_stackframe();
++
++ err = ndr_pull_struct_blob(&response, frame, &v2_resp,
++ (ndr_pull_flags_fn_t)ndr_pull_NTLMv2_RESPONSE);
++ if (!NDR_ERR_CODE_IS_SUCCESS(err)) {
++ NTSTATUS status;
++ status = ndr_map_error2ntstatus(err);
++ DEBUG(2,("Failed to parse NTLMv2_RESPONSE "
++ "length %u - %s - %s\n",
++ (unsigned)response.length,
++ ndr_map_error2string(err),
++ nt_errstr(status)));
++ dump_data(2, response.data, response.length);
++ TALLOC_FREE(frame);
++ return status;
++ }
++
++ if (DEBUGLVL(10)) {
++ NDR_PRINT_DEBUG(NTLMv2_RESPONSE, &v2_resp);
++ }
++
++ /*
++ * Make sure the netbios computer name in the
++ * NTLMv2_RESPONSE matches the computer name
++ * in the secure channel credentials for workstation
++ * trusts.
++ *
++ * And the netbios domain name matches our
++ * workgroup.
++ *
++ * This prevents workstations from requesting
++ * the session key of NTLMSSP sessions of clients
++ * to other hosts.
++ */
++ if (creds->secure_channel_type == SEC_CHAN_WKSTA) {
++ av_nb_cn = ndr_ntlmssp_find_av(&v2_resp.Challenge.AvPairs,
++ MsvAvNbComputerName);
++ av_nb_dn = ndr_ntlmssp_find_av(&v2_resp.Challenge.AvPairs,
++ MsvAvNbDomainName);
++ }
++
++ if (av_nb_cn != NULL) {
++ const char *v = NULL;
++ char *a = NULL;
++ size_t len;
++
++ v = av_nb_cn->Value.AvNbComputerName;
++
++ a = talloc_strdup(frame, creds->account_name);
++ if (a == NULL) {
++ TALLOC_FREE(frame);
++ return NT_STATUS_NO_MEMORY;
++ }
++ len = strlen(a);
++ if (len > 0 && a[len - 1] == '$') {
++ a[len - 1] = '\0';
++ }
++
++#ifdef SAMBA4_INTERNAL_HEIMDAL /* smbtorture4 for make test */
++ cmp = strcasecmp_m(a, v);
++#else /* smbd */
++ cmp = StrCaseCmp(a, v);
++#endif
++ if (cmp != 0) {
++ DEBUG(2,("%s: NTLMv2_RESPONSE with "
++ "NbComputerName[%s] rejected "
++ "for user[%s\\%s] "
++ "against SEC_CHAN_WKSTA[%s/%s] "
++ "in workgroup[%s]\n",
++ __func__, v,
++ account_domain,
++ account_name,
++ creds->computer_name,
++ creds->account_name,
++ workgroup));
++ TALLOC_FREE(frame);
++ return NT_STATUS_LOGON_FAILURE;
++ }
++ }
++ if (av_nb_dn != NULL) {
++ const char *v = NULL;
++
++ v = av_nb_dn->Value.AvNbDomainName;
++
++#ifdef SAMBA4_INTERNAL_HEIMDAL /* smbtorture4 for make test */
++ cmp = strcasecmp_m(workgroup, v);
++#else /* smbd */
++ cmp = StrCaseCmp(workgroup, v);
++#endif
++ if (cmp != 0) {
++ DEBUG(2,("%s: NTLMv2_RESPONSE with "
++ "NbDomainName[%s] rejected "
++ "for user[%s\\%s] "
++ "against SEC_CHAN_WKSTA[%s/%s] "
++ "in workgroup[%s]\n",
++ __func__, v,
++ account_domain,
++ account_name,
++ creds->computer_name,
++ creds->account_name,
++ workgroup));
++ TALLOC_FREE(frame);
++ return NT_STATUS_LOGON_FAILURE;
++ }
++ }
++
++ TALLOC_FREE(frame);
++ return NT_STATUS_OK;
++}
++
+ /***********************************************************
+ encode a password buffer with a unicode password. The buffer
+ is filled with random data to make it harder to attack.
+diff --git a/libcli/auth/wscript_build b/libcli/auth/wscript_build
+index 0f0e22b..dce6c80 100644
+--- a/libcli/auth/wscript_build
++++ b/libcli/auth/wscript_build
+@@ -19,7 +19,7 @@ bld.SAMBA_SUBSYSTEM('MSRPC_PARSE',
+
+ bld.SAMBA_SUBSYSTEM('LIBCLI_AUTH',
+ source='credentials.c session.c smbencrypt.c smbdes.c',
+- public_deps='MSRPC_PARSE',
++ public_deps='MSRPC_PARSE NDR_NTLMSSP',
+ public_headers='credentials.h:domain_credentials.h'
+ )
+
+diff --git a/source3/Makefile.in b/source3/Makefile.in
+index 2668a6b..d562d17 100644
+--- a/source3/Makefile.in
++++ b/source3/Makefile.in
+@@ -783,6 +783,7 @@ GROUPDB_OBJ = groupdb/mapping.o groupdb/mapping_tdb.o
+ PROFILE_OBJ = profile/profile.o
+ PROFILES_OBJ = utils/profiles.o \
+ $(LIBSMB_ERR_OBJ) \
++ $(LIBNDR_NTLMSSP_OBJ) \
+ $(PARAM_OBJ) \
+ $(LIB_OBJ) $(LIB_DUMMY_OBJ) \
+ $(POPT_LIB_OBJ) \
+@@ -995,10 +996,10 @@ SWAT_OBJ = $(SWAT_OBJ1) $(PARAM_OBJ) $(PRINTING_OBJ) $(PRINTBASE_OBJ) $(LIBSMB_O
+ STATUS_OBJ = utils/status.o utils/status_profile.o \
+ $(LOCKING_OBJ) $(PARAM_OBJ) \
+ $(PROFILE_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \
+- $(LIBSMB_ERR_OBJ) $(FNAME_UTIL_OBJ)
++ $(LIBSMB_ERR_OBJ) $(LIBNDR_NTLMSSP_OBJ) $(FNAME_UTIL_OBJ)
+
+ SMBCONTROL_OBJ = utils/smbcontrol.o $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
+- $(LIBSMB_ERR_OBJ) $(POPT_LIB_OBJ) $(PRINTBASE_OBJ)
++ $(LIBSMB_ERR_OBJ) $(LIBNDR_NTLMSSP_OBJ) $(POPT_LIB_OBJ) $(PRINTBASE_OBJ)
+
+ SMBTREE_OBJ = utils/smbtree.o $(PARAM_OBJ) \
+ $(PROFILE_OBJ) $(LIB_NONSMBD_OBJ) $(LIBSMB_OBJ) \
+@@ -1012,11 +1013,11 @@ SMBTREE_OBJ = utils/smbtree.o $(PARAM_OBJ) \
+
+ TESTPARM_OBJ = utils/testparm.o \
+ $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \
+- $(LIBSMB_ERR_OBJ)
++ $(LIBSMB_ERR_OBJ) $(LIBNDR_NTLMSSP_OBJ)
+
+ SMBTA_UTIL_OBJ = utils/smbta-util.o $(PARAM_OBJ) $(POPT_LIB_OBJ) \
+ $(LIB_NONSMBD_OBJ) \
+- $(LIBSMB_ERR_OBJ) $(FNAME_UTIL_OBJ)
++ $(LIBSMB_ERR_OBJ) $(LIBNDR_NTLMSSP_OBJ) $(FNAME_UTIL_OBJ)
+
+ TEST_LP_LOAD_OBJ = param/test_lp_load.o \
+ $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
+@@ -1146,6 +1147,7 @@ SMBCONFTORT_OBJ = $(SMBCONFTORT_OBJ0) \
+ $(LIB_NONSMBD_OBJ) \
+ $(PARAM_OBJ) \
+ $(LIBSMB_ERR_OBJ) \
++ $(LIBNDR_NTLMSSP_OBJ) \
+ $(POPT_LIB_OBJ)
+
+ PTHREADPOOLTEST_OBJ = lib/pthreadpool/pthreadpool.o \
+@@ -1229,7 +1231,7 @@ CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
+ $(LIBNDR_GEN_OBJ0)
+
+ NMBLOOKUP_OBJ = utils/nmblookup.o $(PARAM_OBJ) $(LIBNMB_OBJ) \
+- $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) $(LIBSMB_ERR_OBJ)
++ $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) $(LIBSMB_ERR_OBJ) $(LIBNDR_NTLMSSP_OBJ)
+
+ SMBTORTURE_OBJ1 = torture/torture.o torture/nbio.o torture/scanner.o torture/utable.o \
+ torture/denytest.o torture/mangle_test.o \
+@@ -1253,6 +1255,7 @@ MASKTEST_OBJ = torture/masktest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
+ $(LIBNDR_GEN_OBJ0)
+
+ MSGTEST_OBJ = torture/msgtest.o $(PARAM_OBJ) $(LIBSMB_ERR_OBJ) \
++ $(LIBNDR_NTLMSSP_OBJ) \
+ $(LIB_NONSMBD_OBJ) \
+ $(LIBNDR_GEN_OBJ0)
+
+@@ -1269,7 +1272,7 @@ PDBTEST_OBJ = torture/pdbtest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
+
+ VFSTEST_OBJ = torture/cmd_vfs.o torture/vfstest.o $(SMBD_OBJ_BASE) $(READLINE_OBJ)
+
+-SMBICONV_OBJ = $(PARAM_OBJ) torture/smbiconv.o $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) $(LIBSMB_ERR_OBJ)
++SMBICONV_OBJ = $(PARAM_OBJ) torture/smbiconv.o $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) $(LIBSMB_ERR_OBJ) $(LIBNDR_NTLMSSP_OBJ)
+
+ LOG2PCAP_OBJ = utils/log2pcaphex.o
+
+@@ -1297,17 +1300,17 @@ SMBCQUOTAS_OBJ = utils/smbcquotas.o $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
+ EVTLOGADM_OBJ0 = utils/eventlogadm.o
+
+ EVTLOGADM_OBJ = $(EVTLOGADM_OBJ0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
+- $(LIBSMB_ERR_OBJ) $(LIB_EVENTLOG_OBJ) \
++ $(LIBSMB_ERR_OBJ) $(LIBNDR_NTLMSSP_OBJ) $(LIB_EVENTLOG_OBJ) \
+ librpc/gen_ndr/ndr_eventlog.o \
+ librpc/gen_ndr/ndr_lsa.o
+
+ SHARESEC_OBJ0 = utils/sharesec.o
+ SHARESEC_OBJ = $(SHARESEC_OBJ0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
+- $(LIBSMB_ERR_OBJ) \
++ $(LIBSMB_ERR_OBJ) $(LIBNDR_NTLMSSP_OBJ) \
+ $(POPT_LIB_OBJ)
+
+ TALLOCTORT_OBJ = @tallocdir@/testsuite.o @tallocdir@/testsuite_main.o \
+- $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBSMB_ERR_OBJ)
++ $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBSMB_ERR_OBJ) $(LIBNDR_NTLMSSP_OBJ)
+
+ REPLACETORT_OBJ = @libreplacedir@/test/testsuite.o \
+ @libreplacedir@/test/getifaddrs.o \
+@@ -1323,7 +1326,7 @@ SMBFILTER_OBJ = utils/smbfilter.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
+ $(LIBNDR_GEN_OBJ0)
+
+ WINBIND_WINS_NSS_OBJ = ../nsswitch/wins.o $(PARAM_OBJ) \
+- $(LIB_NONSMBD_OBJ) $(LIBSMB_ERR_OBJ) $(LIBNMB_OBJ)
++ $(LIB_NONSMBD_OBJ) $(LIBSMB_ERR_OBJ) $(LIBNDR_NTLMSSP_OBJ) $(LIBNMB_OBJ)
+
+ PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \
+ pam_smbpass/pam_smb_acct.o pam_smbpass/support.o ../lib/util/asn1.o
+@@ -1531,12 +1534,14 @@ RPC_OPEN_TCP_OBJ = torture/rpc_open_tcp.o \
+ DBWRAP_TOOL_OBJ = utils/dbwrap_tool.o \
+ $(PARAM_OBJ) \
+ $(LIB_NONSMBD_OBJ) \
+- $(LIBSMB_ERR_OBJ)
++ $(LIBSMB_ERR_OBJ) \
++ $(LIBNDR_NTLMSSP_OBJ)
+
+ DBWRAP_TORTURE_OBJ = utils/dbwrap_torture.o \
+ $(PARAM_OBJ) \
+ $(LIB_NONSMBD_OBJ) \
+ $(LIBSMB_ERR_OBJ) \
++ $(LIBNDR_NTLMSSP_OBJ) \
+ $(POPT_LIB_OBJ)
+
+ SPLIT_TOKENS_OBJ = utils/split_tokens.o \
+--
+2.8.1
+
+
+From d49e3329a639a570db8e99a13796713fb5a23616 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Wed, 9 Dec 2015 13:12:43 +0100
+Subject: [PATCH 05/15] CVE-2016-2111: s3:rpc_server/netlogon: check
+ NTLMv2_RESPONSE values for SEC_CHAN_WKSTA
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This prevents spoofing like Microsoft's CVE-2015-0005.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11749
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+---
+ source3/rpc_server/netlogon/srv_netlog_nt.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/source3/rpc_server/netlogon/srv_netlog_nt.c b/source3/rpc_server/netlogon/srv_netlog_nt.c
+index 30e1bc0..a630b47 100644
+--- a/source3/rpc_server/netlogon/srv_netlog_nt.c
++++ b/source3/rpc_server/netlogon/srv_netlog_nt.c
+@@ -1508,6 +1508,7 @@ static NTSTATUS _netr_LogonSamLogon_base(struct pipes_struct *p,
+ case NetlogonNetworkTransitiveInformation:
+ {
+ const char *wksname = nt_workstation;
++ const char *workgroup = lp_workgroup();
+
+ status = make_auth_context_fixed(talloc_tos(), &auth_context,
+ logon->network->challenge);
+@@ -1532,6 +1533,14 @@ static NTSTATUS _netr_LogonSamLogon_base(struct pipes_struct *p,
+ logon->network->nt.length)) {
+ status = NT_STATUS_NO_MEMORY;
+ }
++
++ if (NT_STATUS_IS_OK(status)) {
++ status = NTLMv2_RESPONSE_verify_netlogon_creds(
++ user_info->client.account_name,
++ user_info->client.domain_name,
++ user_info->password.response.nt,
++ creds, workgroup);
++ }
+ break;
+ }
+ case NetlogonInteractiveInformation:
+--
+2.8.1
+
+
+From bded435d42be34099d28db69258b1b5ef95ced48 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Sat, 26 Mar 2016 22:24:23 +0100
+Subject: [PATCH 06/15] CVE-2016-2111: s4:torture/raw: don't use ntlmv2 for dos
+ connection in raw.samba3badpath
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11749
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Alexander Bokovoy <ab(a)samba.org>
+---
+ source4/torture/raw/samba3misc.c | 20 ++++++++++++--------
+ 1 file changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/source4/torture/raw/samba3misc.c b/source4/torture/raw/samba3misc.c
+index a603111..b99d40f 100644
+--- a/source4/torture/raw/samba3misc.c
++++ b/source4/torture/raw/samba3misc.c
+@@ -340,6 +340,7 @@ bool torture_samba3_badpath(struct torture_context *torture)
+ bool ret = true;
+ TALLOC_CTX *mem_ctx;
+ bool nt_status_support;
++ bool client_ntlmv2_auth;
+
+ if (!(mem_ctx = talloc_init("torture_samba3_badpath"))) {
+ d_printf("talloc_init failed\n");
+@@ -347,20 +348,17 @@ bool torture_samba3_badpath(struct torture_context *torture)
+ }
+
+ nt_status_support = lpcfg_nt_status_support(torture->lp_ctx);
++ client_ntlmv2_auth = lpcfg_client_ntlmv2_auth(torture->lp_ctx);
+
+- if (!lpcfg_set_cmdline(torture->lp_ctx, "nt status support", "yes")) {
+- printf("Could not set 'nt status support = yes'\n");
+- goto fail;
+- }
++ torture_assert_goto(torture, lpcfg_set_cmdline(torture->lp_ctx, "nt status support", "yes"), ret, fail, "Could not set 'nt status support = yes'\n");
++ torture_assert_goto(torture, lpcfg_set_cmdline(torture->lp_ctx, "client ntlmv2 auth", "yes"), ret, fail, "Could not set 'client ntlmv2 auth = yes'\n");
+
+ if (!torture_open_connection(&cli_nt, torture, 0)) {
+ goto fail;
+ }
+
+- if (!lpcfg_set_cmdline(torture->lp_ctx, "nt status support", "no")) {
+- printf("Could not set 'nt status support = yes'\n");
+- goto fail;
+- }
++ torture_assert_goto(torture, lpcfg_set_cmdline(torture->lp_ctx, "nt status support", "no"), ret, fail, "Could not set 'nt status support = no'\n");
++ torture_assert_goto(torture, lpcfg_set_cmdline(torture->lp_ctx, "client ntlmv2 auth", "no"), ret, fail, "Could not set 'client ntlmv2 auth = no'\n");
+
+ if (!torture_open_connection(&cli_dos, torture, 1)) {
+ goto fail;
+@@ -373,6 +371,12 @@ bool torture_samba3_badpath(struct torture_context *torture)
+ }
+
+ smbcli_deltree(cli_nt->tree, dirname);
++ torture_assert_goto(torture, lpcfg_set_cmdline(torture->lp_ctx, "nt status support",
++ nt_status_support ? "yes":"no"),
++ ret, fail, "Could not set 'nt status support' back to where it was\n");
++ torture_assert_goto(torture, lpcfg_set_cmdline(torture->lp_ctx, "client ntlmv2 auth",
++ client_ntlmv2_auth ? "yes":"no"),
++ ret, fail, "Could not set 'client ntlmv2 auth' back to where it was\n");
+
+ status = smbcli_mkdir(cli_nt->tree, dirname);
+ if (!NT_STATUS_IS_OK(status)) {
+--
+2.8.1
+
+
+From 12c908158213b1b82aca5c4485961da89299b6cf Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Sat, 26 Mar 2016 22:24:23 +0100
+Subject: [PATCH 07/15] CVE-2016-2111: s4:torture/base: don't use ntlmv2 for
+ dos connection in base.samba3error
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11749
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Alexander Bokovoy <ab(a)samba.org>
+---
+ source4/torture/basic/base.c | 19 +++++++++++++++++--
+ 1 file changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c
+index d7bac45..7f74bb9 100644
+--- a/source4/torture/basic/base.c
++++ b/source4/torture/basic/base.c
+@@ -1476,6 +1476,7 @@ static bool torture_chkpath_test(struct torture_context *tctx,
+ static bool torture_samba3_errorpaths(struct torture_context *tctx)
+ {
+ bool nt_status_support;
++ bool client_ntlmv2_auth;
+ struct smbcli_state *cli_nt = NULL, *cli_dos = NULL;
+ bool result = false;
+ int fnum;
+@@ -1485,18 +1486,27 @@ static bool torture_samba3_errorpaths(struct torture_context *tctx)
+ NTSTATUS status;
+
+ nt_status_support = lpcfg_nt_status_support(tctx->lp_ctx);
++ client_ntlmv2_auth = lpcfg_client_ntlmv2_auth(tctx->lp_ctx);
+
+ if (!lpcfg_set_cmdline(tctx->lp_ctx, "nt status support", "yes")) {
+ torture_comment(tctx, "Could not set 'nt status support = yes'\n");
+ goto fail;
+ }
++ if (!lpcfg_set_cmdline(tctx->lp_ctx, "client ntlmv2 auth", "yes")) {
++ torture_result(tctx, TORTURE_FAIL, "Could not set 'client ntlmv2 auth = yes'\n");
++ goto fail;
++ }
+
+ if (!torture_open_connection(&cli_nt, tctx, 0)) {
+ goto fail;
+ }
+
+ if (!lpcfg_set_cmdline(tctx->lp_ctx, "nt status support", "no")) {
+- torture_comment(tctx, "Could not set 'nt status support = yes'\n");
++ torture_result(tctx, TORTURE_FAIL, "Could not set 'nt status support = no'\n");
++ goto fail;
++ }
++ if (!lpcfg_set_cmdline(tctx->lp_ctx, "client ntlmv2 auth", "no")) {
++ torture_result(tctx, TORTURE_FAIL, "Could not set 'client ntlmv2 auth = no'\n");
+ goto fail;
+ }
+
+@@ -1506,7 +1516,12 @@ static bool torture_samba3_errorpaths(struct torture_context *tctx)
+
+ if (!lpcfg_set_cmdline(tctx->lp_ctx, "nt status support",
+ nt_status_support ? "yes":"no")) {
+- torture_comment(tctx, "Could not reset 'nt status support = yes'");
++ torture_result(tctx, TORTURE_FAIL, "Could not reset 'nt status support'");
++ goto fail;
++ }
++ if (!lpcfg_set_cmdline(tctx->lp_ctx, "client ntlmv2 auth",
++ client_ntlmv2_auth ? "yes":"no")) {
++ torture_result(tctx, TORTURE_FAIL, "Could not reset 'client ntlmv2 auth'");
+ goto fail;
+ }
+
+--
+2.8.1
+
+
+From 0b659fd0d7b684244c9791e01cc1370c0696e3f7 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Sat, 26 Mar 2016 18:08:16 +0100
+Subject: [PATCH 08/15] CVE-2016-2111: s3:libsmb: don't send a raw NTLMv2
+ response when we want to use spnego
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11749
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Alexander Bokovoy <ab(a)samba.org>
+---
+ source3/libsmb/cliconnect.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
+index 8653ba7..4c0abdf 100644
+--- a/source3/libsmb/cliconnect.c
++++ b/source3/libsmb/cliconnect.c
+@@ -2077,6 +2077,17 @@ NTSTATUS cli_session_setup(struct cli_state *cli,
+ NTSTATUS status;
+
+ /* otherwise do a NT1 style session setup */
++ if (lp_client_ntlmv2_auth() && lp_client_use_spnego()) {
++ /*
++ * Don't send an NTLMv2 response without NTLMSSP
++ * if we want to use spnego support
++ */
++ DEBUG(1, ("Server does not support EXTENDED_SECURITY "
++ " but 'client use spnego = yes"
++ " and 'client ntlmv2 auth = yes'\n"));
++ return NT_STATUS_ACCESS_DENIED;
++ }
++
+ status = cli_session_setup_nt1(cli, user, pass, passlen,
+ ntpass, ntpasslen, workgroup);
+ if (!NT_STATUS_IS_OK(status)) {
+--
+2.8.1
+
+
+From 5ed1b3a84a1e3d9707a788a89698aa28769a79be Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Sun, 27 Mar 2016 01:09:05 +0100
+Subject: [PATCH 09/15] CVE-2016-2111: docs-xml: document the new "client
+ NTLMv2 auth" and "client use spnego" interaction
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11749
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Alexander Bokovoy <ab(a)samba.org>
+---
+ docs-xml/smbdotconf/protocol/clientusespnego.xml | 5 +++++
+ docs-xml/smbdotconf/security/clientntlmv2auth.xml | 5 +++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/docs-xml/smbdotconf/protocol/clientusespnego.xml b/docs-xml/smbdotconf/protocol/clientusespnego.xml
+index c688a65..e538745 100644
+--- a/docs-xml/smbdotconf/protocol/clientusespnego.xml
++++ b/docs-xml/smbdotconf/protocol/clientusespnego.xml
+@@ -9,6 +9,11 @@
+ supporting servers (including WindowsXP, Windows2000 and Samba
+ 3.0) to agree upon an authentication
+ mechanism. This enables Kerberos authentication in particular.</para>
++
++ <para>When <smbconfoption name="client NTLMv2 auth"/> is also set to
++ <constant>yes</constant> extended security (SPNEGO) is required
++ in order to use NTLMv2 only within NTLMSSP. This behavior was
++ introduced with the patches for CVE-2016-2111.</para>
+ </description>
+
+ <value type="default">yes</value>
+diff --git a/docs-xml/smbdotconf/security/clientntlmv2auth.xml b/docs-xml/smbdotconf/security/clientntlmv2auth.xml
+index b151df2..1b6d887 100644
+--- a/docs-xml/smbdotconf/security/clientntlmv2auth.xml
++++ b/docs-xml/smbdotconf/security/clientntlmv2auth.xml
+@@ -28,6 +28,11 @@
+ NTLMv2 by default, and some sites (particularly those following
+ 'best practice' security polices) only allow NTLMv2 responses, and
+ not the weaker LM or NTLM.</para>
++
++ <para>When <smbconfoption name="client use spnego"/> is also set to
++ <constant>yes</constant> extended security (SPNEGO) is required
++ in order to use NTLMv2 only within NTLMSSP. This behavior was
++ introduced with the patches for CVE-2016-2111.</para>
+ </description>
+ <value type="default">yes</value>
+ </samba:parameter>
+--
+2.8.1
+
+
+From 8ac4cd75a89732938b1e3161a884f9d5df68ffaf Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Tue, 15 Mar 2016 21:02:34 +0100
+Subject: [PATCH 10/15] CVE-2016-2111: docs-xml: add "raw NTLMv2 auth"
+ defaulting to "yes"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11749
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+---
+ docs-xml/smbdotconf/security/rawntlmv2auth.xml | 20 ++++++++++++++++++++
+ source3/include/proto.h | 1 +
+ source3/param/loadparm.c | 3 +++
+ 3 files changed, 24 insertions(+)
+ create mode 100644 docs-xml/smbdotconf/security/rawntlmv2auth.xml
+
+diff --git a/docs-xml/smbdotconf/security/rawntlmv2auth.xml b/docs-xml/smbdotconf/security/rawntlmv2auth.xml
+new file mode 100644
+index 0000000..ef26297
+--- /dev/null
++++ b/docs-xml/smbdotconf/security/rawntlmv2auth.xml
+@@ -0,0 +1,20 @@
++<samba:parameter name="raw NTLMv2 auth"
++ context="G"
++ type="boolean"
++ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
++<description>
++ <para>This parameter determines whether or not <citerefentry><refentrytitle>smbd</refentrytitle>
++ <manvolnum>8</manvolnum></citerefentry> will allow SMB1 clients without
++ extended security (without SPNEGO) to use NTLMv2 authentication.</para>
++
++ <para>If this option, <command moreinfo="none">lanman auth</command>
++ and <command moreinfo="none">ntlm auth</command> are all disabled,
++ then only clients with SPNEGO support will be permitted.
++ That means NTLMv2 is only supported within NTLMSSP.</para>
++
++ <para>Note that the default will change to "no" with Samba 4.5.</para>
++</description>
++
++<value type="default">yes</value>
++<value type="example">no</value>
++</samba:parameter>
+diff --git a/source3/include/proto.h b/source3/include/proto.h
+index 8491d54..32b4e3d 100644
+--- a/source3/include/proto.h
++++ b/source3/include/proto.h
+@@ -1489,6 +1489,7 @@ bool lp_map_untrusted_to_domain(void);
+ int lp_restrict_anonymous(void);
+ bool lp_lanman_auth(void);
+ bool lp_ntlm_auth(void);
++bool lp_raw_ntlmv2_auth(void);
+ bool lp_client_plaintext_auth(void);
+ bool lp_client_lanman_auth(void);
+ bool lp_client_ntlmv2_auth(void);
+diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
+index 753252a..42ddcf5 100644
+--- a/source3/param/loadparm.c
++++ b/source3/param/loadparm.c
+@@ -336,6 +336,7 @@ struct global {
+ bool bAllowTrustedDomains;
+ bool bLanmanAuth;
+ bool bNTLMAuth;
++ bool bRawNTLMv2Auth;
+ bool bUseSpnego;
+ bool bClientLanManAuth;
+ bool bClientNTLMv2Auth;
+@@ -5337,6 +5338,7 @@ static void init_globals(bool reinit_globals)
+ Globals.bClientPlaintextAuth = False; /* Do NOT use a plaintext password even if is requested by the server */
+ Globals.bLanmanAuth = False; /* Do NOT use the LanMan hash, even if it is supplied */
+ Globals.bNTLMAuth = True; /* Do use NTLMv1 if it is supplied by the client (otherwise NTLMv2) */
++ Globals.bRawNTLMv2Auth = true; /* Allow NTLMv2 without NTLMSSP */
+ Globals.bClientNTLMv2Auth = True; /* Client should always use use NTLMv2, as we can't tell that the server supports it, but most modern servers do */
+ /* Note, that we will also use NTLM2 session security (which is different), if it is available */
+
+@@ -5819,6 +5821,7 @@ FN_GLOBAL_BOOL(lp_map_untrusted_to_domain, &Globals.bMapUntrustedToDomain)
+ FN_GLOBAL_INTEGER(lp_restrict_anonymous, &Globals.restrict_anonymous)
+ FN_GLOBAL_BOOL(lp_lanman_auth, &Globals.bLanmanAuth)
+ FN_GLOBAL_BOOL(lp_ntlm_auth, &Globals.bNTLMAuth)
++FN_GLOBAL_BOOL(lp_raw_ntlmv2_auth, &Globals.bRawNTLMv2Auth)
+ FN_GLOBAL_BOOL(lp_client_plaintext_auth, &Globals.bClientPlaintextAuth)
+ FN_GLOBAL_BOOL(lp_client_lanman_auth, &Globals.bClientLanManAuth)
+ FN_GLOBAL_BOOL(lp_client_ntlmv2_auth, &Globals.bClientNTLMv2Auth)
+--
+2.8.1
+
+
+From de2ba16834dece138d8c0761cc3c834da42dfd33 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Tue, 15 Mar 2016 21:02:34 +0100
+Subject: [PATCH 11/15] CVE-2016-2111(<=4.3): loadparm: add "raw NTLMv2 auth"
+ to param_table
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11749
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+Reviewed-by: Ralph Boehme <slow(a)samba.org>
+---
+ source3/param/loadparm.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
+index 42ddcf5..f806788 100644
+--- a/source3/param/loadparm.c
++++ b/source3/param/loadparm.c
+@@ -1384,6 +1384,15 @@ static struct parm_struct parm_table[] = {
+ .flags = FLAG_ADVANCED,
+ },
+ {
++ .label = "raw NTLMv2 auth",
++ .type = P_BOOL,
++ .p_class = P_GLOBAL,
++ .ptr = &Globals.bRawNTLMv2Auth,
++ .special = NULL,
++ .enum_list = NULL,
++ .flags = FLAG_ADVANCED,
++ },
++ {
+ .label = "client NTLMv2 auth",
+ .type = P_BOOL,
+ .p_class = P_GLOBAL,
+--
+2.8.1
+
+
+From 094fb71d1dda38894be501674c7ec3e4ec03078e Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Tue, 1 Mar 2016 10:25:54 +0100
+Subject: [PATCH 12/15] CVE-2016-2111: s3:auth: implement "raw NTLMv2 auth"
+ checks
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11749
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+---
+ source3/auth/auth_util.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
+index 288f461..98bbbef 100644
+--- a/source3/auth/auth_util.c
++++ b/source3/auth/auth_util.c
+@@ -30,6 +30,7 @@
+ #include "../lib/util/util_pw.h"
+ #include "lib/winbind_util.h"
+ #include "passdb.h"
++#include "../lib/tsocket/tsocket.h"
+
+ #undef DBGC_CLASS
+ #define DBGC_CLASS DBGC_AUTH
+@@ -367,6 +368,19 @@ NTSTATUS make_user_info_for_reply_enc(struct auth_usersupplied_info **user_info,
+ const char *client_domain,
+ DATA_BLOB lm_resp, DATA_BLOB nt_resp)
+ {
++ bool allow_raw = lp_raw_ntlmv2_auth();
++
++ if (!allow_raw && nt_resp.length >= 48) {
++ /*
++ * NTLMv2_RESPONSE has at least 48 bytes
++ * and should only be supported via NTLMSSP.
++ */
++ DEBUG(2,("Rejecting raw NTLMv2 authentication with "
++ "user [%s\\%s]\n",
++ client_domain, smb_name));
++ return NT_STATUS_INVALID_PARAMETER;
++ }
++
+ return make_user_info_map(user_info, smb_name,
+ client_domain,
+ get_remote_machine_name(),
+--
+2.8.1
+
+
+From a2ef1fb0cf0b83a2799b95795d31b8fb03da11bb Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Sat, 26 Mar 2016 22:08:38 +0100
+Subject: [PATCH 13/15] CVE-2016-2111: selftest:Samba3: use "raw NTLMv2 auth =
+ yes" for s3dc
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11749
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Alexander Bokovoy <ab(a)samba.org>
+---
+ selftest/target/Samba3.pm | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
+index 01a1c47..ee3696e 100644
+--- a/selftest/target/Samba3.pm
++++ b/selftest/target/Samba3.pm
+@@ -127,6 +127,7 @@ sub setup_dc($$)
+ domain master = yes
+ domain logons = yes
+ lanman auth = yes
++ raw NTLMv2 auth = yes
+ ";
+
+ my $vars = $self->provision($path,
+--
+2.8.1
+
+
+From 74da0e00f3b817dd20d6429f7ba7748f66b9b6a4 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Tue, 15 Mar 2016 21:59:42 +0100
+Subject: [PATCH 14/15] CVE-2016-2111: docs-xml/smbdotconf: default "raw NTLMv2
+ auth" to "no"
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11749
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Alexander Bokovoy <ab(a)samba.org>
+---
+ docs-xml/smbdotconf/security/rawntlmv2auth.xml | 7 +++----
+ source3/param/loadparm.c | 2 +-
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/docs-xml/smbdotconf/security/rawntlmv2auth.xml b/docs-xml/smbdotconf/security/rawntlmv2auth.xml
+index ef26297..30e7280 100644
+--- a/docs-xml/smbdotconf/security/rawntlmv2auth.xml
++++ b/docs-xml/smbdotconf/security/rawntlmv2auth.xml
+@@ -11,10 +11,9 @@
+ and <command moreinfo="none">ntlm auth</command> are all disabled,
+ then only clients with SPNEGO support will be permitted.
+ That means NTLMv2 is only supported within NTLMSSP.</para>
+-
+- <para>Note that the default will change to "no" with Samba 4.5.</para>
+ </description>
+
+-<value type="default">yes</value>
+-<value type="example">no</value>
++<related>lanman auth</related>
++<related>ntlm auth</related>
++<value type="default">no</value>
+ </samba:parameter>
+diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
+index f806788..7065cf6 100644
+--- a/source3/param/loadparm.c
++++ b/source3/param/loadparm.c
+@@ -5347,7 +5347,7 @@ static void init_globals(bool reinit_globals)
+ Globals.bClientPlaintextAuth = False; /* Do NOT use a plaintext password even if is requested by the server */
+ Globals.bLanmanAuth = False; /* Do NOT use the LanMan hash, even if it is supplied */
+ Globals.bNTLMAuth = True; /* Do use NTLMv1 if it is supplied by the client (otherwise NTLMv2) */
+- Globals.bRawNTLMv2Auth = true; /* Allow NTLMv2 without NTLMSSP */
++ Globals.bRawNTLMv2Auth = false; /* Allow NTLMv2 without NTLMSSP */
+ Globals.bClientNTLMv2Auth = True; /* Client should always use use NTLMv2, as we can't tell that the server supports it, but most modern servers do */
+ /* Note, that we will also use NTLM2 session security (which is different), if it is available */
+
+--
+2.8.1
+
+
+From 44530ad870745f8d649aff9cc18480aaeeccf01a Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn(a)samba.org>
+Date: Mon, 4 Apr 2016 16:44:39 +0200
+Subject: [PATCH 15/15] CVE-2016-2111: s3:selftest: Disable client ntlmv2 auth
+ for secserver
+
+The client connects with ntlmv1 to the secserver (server with
+security = share). So the secserver needs to allow to connect with
+NTLMv1 to the password server to verify the user or it will fail.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11749
+
+Signed-off-by: Andreas Schneider <asn(a)samba.org>
+---
+ selftest/target/Samba3.pm | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
+index ee3696e..7326b22 100644
+--- a/selftest/target/Samba3.pm
++++ b/selftest/target/Samba3.pm
+@@ -231,6 +231,7 @@ sub setup_secserver($$$)
+ my $secserver_options = "
+ security = server
+ password server = $s3dcvars->{SERVER_IP}
++ client ntlmv2 auth = no
+ ";
+
+ my $ret = $self->provision($prefix,
+--
+2.8.1
+
diff --git a/src/patches/samba/CVE-2016-2112-v3-6.patch b/src/patches/samba/CVE-2016-2112-v3-6.patch
new file mode 100644
index 0000000..57c6f68
--- /dev/null
+++ b/src/patches/samba/CVE-2016-2112-v3-6.patch
@@ -0,0 +1,184 @@
+From 126e3e992bed7174d60ee19212db9b717647ab2e Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn(a)cryptomilk.org>
+Date: Wed, 30 Mar 2016 16:55:44 +0200
+Subject: [PATCH 1/3] CVE-2016-2112: s3:ntlmssp: Implement missing
+ ntlmssp_have_feature()
+
+Signed-off-by: Andreas Schneider <asn(a)samba.org>
+---
+ source3/include/proto.h | 1 +
+ source3/libsmb/ntlmssp.c | 30 ++++++++++++++++++++++++++++++
+ 2 files changed, 31 insertions(+)
+
+diff --git a/source3/include/proto.h b/source3/include/proto.h
+index 32b4e3d..43008ea 100644
+--- a/source3/include/proto.h
++++ b/source3/include/proto.h
+@@ -1260,6 +1260,7 @@ NTSTATUS ntlmssp_set_password(struct ntlmssp_state *ntlmssp_state, const char *p
+ NTSTATUS ntlmssp_set_domain(struct ntlmssp_state *ntlmssp_state, const char *domain) ;
+ void ntlmssp_want_feature_list(struct ntlmssp_state *ntlmssp_state, char *feature_list);
+ void ntlmssp_want_feature(struct ntlmssp_state *ntlmssp_state, uint32_t feature);
++bool ntlmssp_have_feature(struct ntlmssp_state *ntlmssp_state, uint32_t feature);
+ NTSTATUS ntlmssp_update(struct ntlmssp_state *ntlmssp_state,
+ const DATA_BLOB in, DATA_BLOB *out) ;
+ NTSTATUS ntlmssp_server_start(TALLOC_CTX *mem_ctx,
+diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c
+index 045dc87..7e58990 100644
+--- a/source3/libsmb/ntlmssp.c
++++ b/source3/libsmb/ntlmssp.c
+@@ -162,6 +162,36 @@ NTSTATUS ntlmssp_set_domain(struct ntlmssp_state *ntlmssp_state, const char *dom
+ return NT_STATUS_OK;
+ }
+
++bool ntlmssp_have_feature(struct ntlmssp_state *ntlmssp_state,
++ uint32_t feature)
++{
++ if (feature & NTLMSSP_FEATURE_SIGN) {
++ if (ntlmssp_state->session_key.length == 0) {
++ return false;
++ }
++ if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SIGN) {
++ return true;
++ }
++ }
++
++ if (feature & NTLMSSP_FEATURE_SEAL) {
++ if (ntlmssp_state->session_key.length == 0) {
++ return false;
++ }
++ if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SEAL) {
++ return true;
++ }
++ }
++
++ if (feature & NTLMSSP_FEATURE_SESSION_KEY) {
++ if (ntlmssp_state->session_key.length > 0) {
++ return true;
++ }
++ }
++
++ return false;
++}
++
+ /**
+ * Request features for the NTLMSSP negotiation
+ *
+--
+2.8.1
+
+
+From 15338742e0c7304aeecce0e8368f0dad85e8075b Mon Sep 17 00:00:00 2001
+From: Ralph Boehme <slow(a)samba.org>
+Date: Thu, 24 Mar 2016 16:22:36 +0100
+Subject: [PATCH 2/3] CVE-2016-2112: s3:libads: make sure we detect downgrade
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11644
+
+Pair-programmed-with: Ralph Boehme <slow(a)samba.org>
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Signed-off-by: Ralph Boehme <slow(a)samba.org>
+---
+ source3/libads/sasl.c | 31 +++++++++++++++++++++++++++++++
+ 1 file changed, 31 insertions(+)
+
+diff --git a/source3/libads/sasl.c b/source3/libads/sasl.c
+index e7daa8a..6690f83 100644
+--- a/source3/libads/sasl.c
++++ b/source3/libads/sasl.c
+@@ -261,6 +261,37 @@ static ADS_STATUS ads_sasl_spnego_ntlmssp_bind(ADS_STRUCT *ads)
+ /* we have a reference conter on ntlmssp_state, if we are signing
+ then the state will be kept by the signing engine */
+
++ if (ads->ldap.wrap_type >= ADS_SASLWRAP_TYPE_SEAL) {
++ bool ok;
++
++ ok = ntlmssp_have_feature(ntlmssp_state,
++ NTLMSSP_FEATURE_SEAL);
++ if (!ok) {
++ DEBUG(0,("The ntlmssp feature sealing request, but unavailable\n"));
++ TALLOC_FREE(ntlmssp_state);
++ return ADS_ERROR_NT(NT_STATUS_INVALID_NETWORK_RESPONSE);
++ }
++
++ ok = ntlmssp_have_feature(ntlmssp_state,
++ NTLMSSP_FEATURE_SIGN);
++ if (!ok) {
++ DEBUG(0,("The ntlmssp feature signing request, but unavailable\n"));
++ TALLOC_FREE(ntlmssp_state);
++ return ADS_ERROR_NT(NT_STATUS_INVALID_NETWORK_RESPONSE);
++ }
++
++ } else if (ads->ldap.wrap_type >= ADS_SASLWRAP_TYPE_SIGN) {
++ bool ok;
++
++ ok = ntlmssp_have_feature(ntlmssp_state,
++ NTLMSSP_FEATURE_SIGN);
++ if (!ok) {
++ DEBUG(0,("The gensec feature signing request, but unavailable\n"));
++ TALLOC_FREE(ntlmssp_state);
++ return ADS_ERROR_NT(NT_STATUS_INVALID_NETWORK_RESPONSE);
++ }
++ }
++
+ if (ads->ldap.wrap_type > ADS_SASLWRAP_TYPE_PLAIN) {
+ ads->ldap.out.max_unwrapped = ADS_SASL_WRAPPING_OUT_MAX_WRAPPED - NTLMSSP_SIG_SIZE;
+ ads->ldap.out.sig_size = NTLMSSP_SIG_SIZE;
+--
+2.8.1
+
+
+From b020ae88f9024bcc868ed2d85879d14901db32e5 Mon Sep 17 00:00:00 2001
+From: Andrew Bartlett <abartlet(a)samba.org>
+Date: Fri, 5 Sep 2014 17:38:38 +1200
+Subject: [PATCH 3/3] CVE-2016-2112: winbindd: Change value of "ldap sasl
+ wrapping" to sign
+
+This is to disrupt MITM attacks between us and our DC
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11644
+
+Pair-programmed-with: Garming Sam <garming(a)catalyst.net.nz>
+Signed-off-by: Garming Sam <garming(a)catalyst.net.nz>
+Signed-off-by: Andrew Bartlett <abartlet(a)samba.org>
+(backported from commit afe02d12f444ad9a6abf31a61f578320520263a9)
+---
+ docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml | 8 +++-----
+ source3/param/loadparm.c | 2 ++
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml b/docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml
+index a926cec..a7c4395 100644
+--- a/docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml
++++ b/docs-xml/smbdotconf/ldap/clientldapsaslwrapping.xml
+@@ -34,11 +34,9 @@
+ </para>
+
+ <para>
+- The default value is <emphasis>plain</emphasis> which is not irritable
+- to KRB5 clock skew errors. That implies synchronizing the time
+- with the KDC in the case of using <emphasis>sign</emphasis> or
+- <emphasis>seal</emphasis>.
++ The default value is <emphasis>sign</emphasis>. That implies synchronizing the time
++ with the KDC in the case of using <emphasis>Kerberos</emphasis>.
+ </para>
+ </description>
+-<value type="default">plain</value>
++<value type="default">sign</value>
+ </samba:parameter>
+diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
+index 7065cf6..c5249b7 100644
+--- a/source3/param/loadparm.c
++++ b/source3/param/loadparm.c
+@@ -5392,6 +5392,8 @@ static void init_globals(bool reinit_globals)
+ Globals.ldap_debug_level = 0;
+ Globals.ldap_debug_threshold = 10;
+
++ Globals.client_ldap_sasl_wrapping = ADS_AUTH_SASL_SIGN;
++
+ /* This is what we tell the afs client. in reality we set the token
+ * to never expire, though, when this runs out the afs client will
+ * forget the token. Set to 0 to get NEVERDATE.*/
+--
+2.8.1
+
diff --git a/src/patches/samba/CVE-2016-2115-v3-6.patch b/src/patches/samba/CVE-2016-2115-v3-6.patch
new file mode 100644
index 0000000..6167d35
--- /dev/null
+++ b/src/patches/samba/CVE-2016-2115-v3-6.patch
@@ -0,0 +1,359 @@
+From 513bd34e4523e49e742487be32a7239111486a12 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Sat, 27 Feb 2016 03:43:58 +0100
+Subject: [PATCH 1/4] CVE-2016-2115: docs-xml: add "client ipc signing" option
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11756
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Ralph Boehme <slow(a)samba.org>
+---
+ docs-xml/smbdotconf/security/clientipcsigning.xml | 23 +++++++++++++++++++++++
+ docs-xml/smbdotconf/security/clientsigning.xml | 3 +++
+ source3/include/proto.h | 1 +
+ source3/param/loadparm.c | 12 ++++++++++++
+ 4 files changed, 39 insertions(+)
+ create mode 100644 docs-xml/smbdotconf/security/clientipcsigning.xml
+
+diff --git a/docs-xml/smbdotconf/security/clientipcsigning.xml b/docs-xml/smbdotconf/security/clientipcsigning.xml
+new file mode 100644
+index 0000000..1897fc6
+--- /dev/null
++++ b/docs-xml/smbdotconf/security/clientipcsigning.xml
+@@ -0,0 +1,23 @@
++<samba:parameter name="client ipc signing"
++ context="G"
++ type="enum"
++ enumlist="enum_smb_signing_vals"
++ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
++<description>
++ <para>This controls whether the client is allowed or required to use SMB signing for IPC$
++ connections as DCERPC transport inside of winbind. Possible values
++ are <emphasis>auto</emphasis>, <emphasis>mandatory</emphasis>
++ and <emphasis>disabled</emphasis>.
++ </para>
++
++ <para>When set to auto, SMB signing is offered, but not enforced and if set
++ to disabled, SMB signing is not offered either.</para>
++
++ <para>Connections from winbindd to Active Directory Domain Controllers
++ always enforce signing.</para>
++</description>
++
++<related>client signing</related>
++
++<value type="default">mandatory</value>
++</samba:parameter>
+diff --git a/docs-xml/smbdotconf/security/clientsigning.xml b/docs-xml/smbdotconf/security/clientsigning.xml
+index c657e05..189a7ae 100644
+--- a/docs-xml/smbdotconf/security/clientsigning.xml
++++ b/docs-xml/smbdotconf/security/clientsigning.xml
+@@ -12,6 +12,9 @@
+ <para>When set to auto, SMB signing is offered, but not enforced.
+ When set to mandatory, SMB signing is required and if set
+ to disabled, SMB signing is not offered either.
++
++ <para>IPC$ connections for DCERPC e.g. in winbindd, are handled by the
++ <smbconfoption name="client ipc signing"/> option.</para>
+ </para>
+ </description>
+
+diff --git a/source3/include/proto.h b/source3/include/proto.h
+index 43008ea..af950aa 100644
+--- a/source3/include/proto.h
++++ b/source3/include/proto.h
+@@ -1693,6 +1693,7 @@ const char **lp_winbind_nss_info(void);
+ int lp_algorithmic_rid_base(void);
+ int lp_name_cache_timeout(void);
+ int lp_client_signing(void);
++int lp_client_ipc_signing(void);
+ int lp_server_signing(void);
+ int lp_client_ldap_sasl_wrapping(void);
+ char *lp_parm_talloc_string(int snum, const char *type, const char *option, const char *def);
+diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
+index c5249b7..a612e5a3 100644
+--- a/source3/param/loadparm.c
++++ b/source3/param/loadparm.c
+@@ -366,6 +366,7 @@ struct global {
+ int restrict_anonymous;
+ int name_cache_timeout;
+ int client_signing;
++ int client_ipc_signing;
+ int server_signing;
+ int client_ldap_sasl_wrapping;
+ int iUsershareMaxShares;
+@@ -2319,6 +2320,15 @@ static struct parm_struct parm_table[] = {
+ .flags = FLAG_ADVANCED,
+ },
+ {
++ .label = "client ipc signing",
++ .type = P_ENUM,
++ .p_class = P_GLOBAL,
++ .ptr = &Globals.client_ipc_signing,
++ .special = NULL,
++ .enum_list = enum_smb_signing_vals,
++ .flags = FLAG_ADVANCED,
++ },
++ {
+ .label = "server signing",
+ .type = P_ENUM,
+ .p_class = P_GLOBAL,
+@@ -5470,6 +5480,7 @@ static void init_globals(bool reinit_globals)
+ Globals.bClientUseSpnego = True;
+
+ Globals.client_signing = Auto;
++ Globals.client_ipc_signing = Required;
+ Globals.server_signing = False;
+
+ Globals.bDeferSharingViolations = True;
+@@ -6071,6 +6082,7 @@ FN_GLOBAL_LIST(lp_winbind_nss_info, &Globals.szWinbindNssInfo)
+ FN_GLOBAL_INTEGER(lp_algorithmic_rid_base, &Globals.AlgorithmicRidBase)
+ FN_GLOBAL_INTEGER(lp_name_cache_timeout, &Globals.name_cache_timeout)
+ FN_GLOBAL_INTEGER(lp_client_signing, &Globals.client_signing)
++FN_GLOBAL_INTEGER(lp_client_ipc_signing, &Globals.client_ipc_signing)
+ FN_GLOBAL_INTEGER(lp_server_signing, &Globals.server_signing)
+ FN_GLOBAL_INTEGER(lp_client_ldap_sasl_wrapping, &Globals.client_ldap_sasl_wrapping)
+
+--
+2.8.1
+
+
+From 633fcce5f7f488738ef8f45393aa8990e01118f4 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn(a)samba.org>
+Date: Tue, 5 Apr 2016 10:46:53 +0200
+Subject: [PATCH 2/4] CVE-2016-2115: s3: Use lp_client_ipc_signing() if we are
+ not an smb client
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11756
+
+Pair-Programmed-With: Ralph Boehme <slow(a)samba.org>
+Signed-off-by: Andreas Schneider <asn(a)samba.org>
+Signed-off-by: Ralph Boehme <slow(a)samba.org>
+---
+ source3/param/loadparm.c | 14 ++++++++++++++
+ source3/rpc_server/spoolss/srv_spoolss_nt.c | 2 +-
+ 2 files changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
+index a612e5a3..c58f860 100644
+--- a/source3/param/loadparm.c
++++ b/source3/param/loadparm.c
+@@ -9712,6 +9712,20 @@ static bool lp_load_ex(const char *pszFname,
+ lp_do_parameter(GLOBAL_SECTION_SNUM, "wins server", "127.0.0.1");
+ }
+
++ if (!lp_is_in_client()) {
++ switch (lp_client_ipc_signing()) {
++ case Required:
++ lp_set_cmdline("client signing", "mandatory");
++ break;
++ case Auto:
++ lp_set_cmdline("client signing", "auto");
++ break;
++ case False:
++ lp_set_cmdline("client signing", "disabled");
++ break;
++ }
++ }
++
+ init_iconv();
+
+ bAllowIncludeRegistry = true;
+diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c
+index 181a7b5..a0fcf27 100644
+--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
++++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
+@@ -2480,7 +2480,7 @@ static bool spoolss_connect_to_client(struct rpc_pipe_client **pp_pipe,
+ "", /* username */
+ "", /* domain */
+ "", /* password */
+- 0, lp_client_signing());
++ 0, False);
+
+ if ( !NT_STATUS_IS_OK( ret ) ) {
+ DEBUG(2,("spoolss_connect_to_client: connection to [%s] failed!\n",
+--
+2.8.1
+
+
+From e319838866bdd3f5f1602b441516d07a1171ab24 Mon Sep 17 00:00:00 2001
+From: Ralph Boehme <slow(a)samba.org>
+Date: Thu, 31 Mar 2016 11:30:03 +0200
+Subject: [PATCH 3/4] CVE-2016-2115: s3/param: pick up s4 option "winbind
+ sealed pipes"
+
+This will be used in the next commit to prevent mitm attacks on on lsa,
+samr and netlogon in winbindd.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11756
+
+Signed-off-by: Ralph Boehme <slow(a)samba.org>
+Reviewed-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Andreas Schneider <asn(a)samba.org>
+---
+ docs-xml/smbdotconf/winbind/winbindsealedpipes.xml | 15 +++++++++++++++
+ source3/include/proto.h | 1 +
+ source3/param/loadparm.c | 12 ++++++++++++
+ 3 files changed, 28 insertions(+)
+ create mode 100644 docs-xml/smbdotconf/winbind/winbindsealedpipes.xml
+
+diff --git a/docs-xml/smbdotconf/winbind/winbindsealedpipes.xml b/docs-xml/smbdotconf/winbind/winbindsealedpipes.xml
+new file mode 100644
+index 0000000..016ac9b
+--- /dev/null
++++ b/docs-xml/smbdotconf/winbind/winbindsealedpipes.xml
+@@ -0,0 +1,15 @@
++<samba:parameter name="winbind sealed pipes"
++ context="G"
++ type="boolean"
++ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
++<description>
++ <para>This option controls whether any requests from winbindd to domain controllers
++ pipe will be sealed. Disabling sealing can be useful for debugging
++ purposes.</para>
++
++ <para>The behavior can be controlled per netbios domain
++ by using 'winbind sealed pipes:NETBIOSDOMAIN = no' as option.</para>
++</description>
++
++<value type="default">yes</value>
++</samba:parameter>
+diff --git a/source3/include/proto.h b/source3/include/proto.h
+index af950aa..ac1540f 100644
+--- a/source3/include/proto.h
++++ b/source3/include/proto.h
+@@ -1690,6 +1690,7 @@ int lp_winbind_cache_time(void);
+ int lp_winbind_reconnect_delay(void);
+ int lp_winbind_max_clients(void);
+ const char **lp_winbind_nss_info(void);
++bool lp_winbind_sealed_pipes(void);
+ int lp_algorithmic_rid_base(void);
+ int lp_name_cache_timeout(void);
+ int lp_client_signing(void);
+diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
+index c58f860..fdc9407 100644
+--- a/source3/param/loadparm.c
++++ b/source3/param/loadparm.c
+@@ -215,6 +215,7 @@ struct global {
+ int winbind_expand_groups;
+ bool bWinbindRefreshTickets;
+ bool bWinbindOfflineLogon;
++ bool bWinbindSealedPipes;
+ bool bWinbindNormalizeNames;
+ bool bWinbindRpcOnly;
+ bool bCreateKrb5Conf;
+@@ -4775,6 +4776,15 @@ static struct parm_struct parm_table[] = {
+ .flags = FLAG_ADVANCED,
+ },
+ {
++ .label = "winbind sealed pipes",
++ .type = P_BOOL,
++ .p_class = P_GLOBAL,
++ .ptr = &Globals.bWinbindSealedPipes,
++ .special = NULL,
++ .enum_list = NULL,
++ .flags = FLAG_ADVANCED,
++ },
++ {
+ .label = "winbind normalize names",
+ .type = P_BOOL,
+ .p_class = P_GLOBAL,
+@@ -5468,6 +5478,7 @@ static void init_globals(bool reinit_globals)
+ Globals.szWinbindNssInfo = str_list_make_v3(NULL, "template", NULL);
+ Globals.bWinbindRefreshTickets = False;
+ Globals.bWinbindOfflineLogon = False;
++ Globals.bWinbindSealedPipes = True;
+
+ Globals.iIdmapCacheTime = 86400 * 7; /* a week by default */
+ Globals.iIdmapNegativeCacheTime = 120; /* 2 minutes by default */
+@@ -5747,6 +5758,7 @@ FN_GLOBAL_BOOL(lp_winbind_nested_groups, &Globals.bWinbindNestedGroups)
+ FN_GLOBAL_INTEGER(lp_winbind_expand_groups, &Globals.winbind_expand_groups)
+ FN_GLOBAL_BOOL(lp_winbind_refresh_tickets, &Globals.bWinbindRefreshTickets)
+ FN_GLOBAL_BOOL(lp_winbind_offline_logon, &Globals.bWinbindOfflineLogon)
++FN_GLOBAL_BOOL(lp_winbind_sealed_pipes, &Globals.bWinbindSealedPipes)
+ FN_GLOBAL_BOOL(lp_winbind_normalize_names, &Globals.bWinbindNormalizeNames)
+ FN_GLOBAL_BOOL(lp_winbind_rpc_only, &Globals.bWinbindRpcOnly)
+ FN_GLOBAL_BOOL(lp_create_krb5_conf, &Globals.bCreateKrb5Conf)
+--
+2.8.1
+
+
+From b47d8644e6a826f01dae3911fc510a7b2ff60273 Mon Sep 17 00:00:00 2001
+From: Andrew Bartlett <abartlet(a)samba.org>
+Date: Fri, 5 Sep 2014 17:00:31 +1200
+Subject: [PATCH 4/4] CVE-2016-2115: winbindd: Do not make anonymous
+ connections by default
+
+The requirement is that we have "winbind sealed pipes = false" and
+"require strong key = false" before we make anonymous connections.
+These are a security risk as we cannot prevent MITM attacks.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11796
+
+Signed-off-by: Andrew Bartlett <abartlet(a)samba.org>
+Reviewed-by: Stefan Metzmacher <metze(a)samba.org>
+(backported from commit e2cd3257141bd4a88cda1fff5bde9df60b253a97)
+---
+ source3/winbindd/winbindd_cm.c | 32 +++++++++++++++++++++++++++++++-
+ 1 file changed, 31 insertions(+), 1 deletion(-)
+
+diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
+index 8271279..50a341e 100644
+--- a/source3/winbindd/winbindd_cm.c
++++ b/source3/winbindd/winbindd_cm.c
+@@ -2384,6 +2384,15 @@ NTSTATUS cm_connect_sam(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx,
+ TALLOC_FREE(conn->samr_pipe);
+
+ anonymous:
++ if (lp_winbind_sealed_pipes() && (IS_DC || domain->primary)) {
++ status = NT_STATUS_DOWNGRADE_DETECTED;
++ DEBUG(1, ("Unwilling to make SAMR connection to domain %s "
++ "without connection level security, "
++ "must set 'winbind sealed pipes = false' "
++ "to proceed: %s\n",
++ domain->name, nt_errstr(status)));
++ goto done;
++ }
+
+ /* Finally fall back to anonymous. */
+ status = cli_rpc_pipe_open_noauth(conn->cli, &ndr_table_samr.syntax_id,
+@@ -2610,6 +2619,16 @@ NTSTATUS cm_connect_lsa(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx,
+
+ anonymous:
+
++ if (lp_winbind_sealed_pipes() && (IS_DC || domain->primary)) {
++ result = NT_STATUS_DOWNGRADE_DETECTED;
++ DEBUG(1, ("Unwilling to make LSA connection to domain %s "
++ "without connection level security, "
++ "must set 'winbind sealed pipes = false' "
++ "to proceed: %s\n",
++ domain->name, nt_errstr(result)));
++ goto done;
++ }
++
+ result = cli_rpc_pipe_open_noauth(conn->cli,
+ &ndr_table_lsarpc.syntax_id,
+ &conn->lsa_pipe);
+@@ -2749,7 +2768,18 @@ NTSTATUS cm_connect_netlogon(struct winbindd_domain *domain,
+
+ no_schannel:
+ if ((lp_client_schannel() == False) ||
+- ((neg_flags & NETLOGON_NEG_SCHANNEL) == 0)) {
++ ((neg_flags & NETLOGON_NEG_SCHANNEL) == 0)) {
++ if (lp_winbind_sealed_pipes() && (IS_DC || domain->primary)) {
++ result = NT_STATUS_DOWNGRADE_DETECTED;
++ DEBUG(1, ("Unwilling to make connection to domain %s "
++ "without connection level security, "
++ "must set 'winbind sealed pipes = false' "
++ "to proceed: %s\n",
++ domain->name, nt_errstr(result)));
++ TALLOC_FREE(netlogon_pipe);
++ invalidate_cm_connection(conn);
++ return result;
++ }
+ /*
+ * NetSamLogonEx only works for schannel
+ */
+--
+2.8.1
+
diff --git a/src/patches/samba/CVE-2016-2118-v3-6.patch b/src/patches/samba/CVE-2016-2118-v3-6.patch
new file mode 100644
index 0000000..e354155
--- /dev/null
+++ b/src/patches/samba/CVE-2016-2118-v3-6.patch
@@ -0,0 +1,629 @@
+From 9519f8f5123be055a4e845f87badef8b80ab2ee4 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Tue, 15 Dec 2015 14:49:36 +0100
+Subject: [PATCH 01/10] CVE-2016-2118: s3: rpcclient: change the default auth
+ level from DCERPC_AUTH_LEVEL_CONNECT to DCERPC_AUTH_LEVEL_INTEGRITY
+
+ncacn_ip_tcp:server should get the same protection as ncacn_np:server
+if authentication and smb signing is used.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11616
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+
+(cherry picked from commit dab41dee8a4fb27dbf3913b0e44a4cc726e3ac98)
+---
+ source3/rpcclient/rpcclient.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
+index 949e14c..81c5f42 100644
+--- a/source3/rpcclient/rpcclient.c
++++ b/source3/rpcclient/rpcclient.c
+@@ -1062,10 +1062,9 @@ out_free:
+ }
+ }
+ if (pipe_default_auth_type != DCERPC_AUTH_TYPE_NONE) {
+- /* If neither Integrity or Privacy are requested then
+- * Use just Connect level */
++ /* If nothing is requested then default to integrity */
+ if (pipe_default_auth_level == DCERPC_AUTH_LEVEL_NONE) {
+- pipe_default_auth_level = DCERPC_AUTH_LEVEL_CONNECT;
++ pipe_default_auth_level = DCERPC_AUTH_LEVEL_INTEGRITY;
+ }
+ }
+
+--
+2.8.1
+
+
+From 0e00f6da40e6f76d9bd56187e74841c85ea86c55 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Fri, 11 Mar 2016 16:02:25 +0100
+Subject: [PATCH 02/10] CVE-2016-2118: s4:librpc: use integrity by default for
+ authenticated binds
+
+ncacn_ip_tcp:server should get the same protection as ncacn_np:server
+if authentication and smb signing is used.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11616
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+(cherry picked from commit 7847ee85d278adb9ce4fc7da7cf171917227c93f)
+---
+ source4/librpc/rpc/dcerpc_util.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c
+index 2cd9499..a6d0df5 100644
+--- a/source4/librpc/rpc/dcerpc_util.c
++++ b/source4/librpc/rpc/dcerpc_util.c
+@@ -593,15 +593,15 @@ struct composite_context *dcerpc_pipe_auth_send(struct dcerpc_pipe *p,
+
+ /* Perform an authenticated DCE-RPC bind
+ */
+- if (!(conn->flags & (DCERPC_SIGN|DCERPC_SEAL))) {
++ if (!(conn->flags & (DCERPC_CONNECT|DCERPC_SEAL))) {
+ /*
+ we are doing an authenticated connection,
+- but not using sign or seal. We must force
+- the CONNECT dcerpc auth type as a NONE auth
+- type doesn't allow authentication
+- information to be passed.
++ which needs to use [connect], [sign] or [seal].
++ If nothing is specified, we default to [sign] now.
++ This give roughly the same protection as
++ ncacn_np with smb signing.
+ */
+- conn->flags |= DCERPC_CONNECT;
++ conn->flags |= DCERPC_SIGN;
+ }
+
+ if (s->binding->flags & DCERPC_AUTH_SPNEGO) {
+--
+2.8.1
+
+
+From 8d53761dbcbea6439f4bfaef86ff79f42b682b22 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Thu, 10 Mar 2016 17:03:59 +0100
+Subject: [PATCH 03/10] CVE-2016-2118: docs-xml: add "allow dcerpc auth level
+ connect" defaulting to "yes"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We sadly need to allow this for now by default.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11616
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(backported from commit 56baca8619ba9ae1734c3d77524fc705ebcbd8d2)
+---
+ .../security/allowdcerpcauthlevelconnect.xml | 24 ++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+ create mode 100644 docs-xml/smbdotconf/security/allowdcerpcauthlevelconnect.xml
+
+diff --git a/docs-xml/smbdotconf/security/allowdcerpcauthlevelconnect.xml b/docs-xml/smbdotconf/security/allowdcerpcauthlevelconnect.xml
+new file mode 100644
+index 0000000..5552112
+--- /dev/null
++++ b/docs-xml/smbdotconf/security/allowdcerpcauthlevelconnect.xml
+@@ -0,0 +1,24 @@
++<samba:parameter name="allow dcerpc auth level connect"
++ context="G"
++ type="boolean"
++ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
++<description>
++ <para>This option controls whether DCERPC services are allowed to
++ be used with DCERPC_AUTH_LEVEL_CONNECT, which provides authentication,
++ but no per message integrity nor privacy protection.</para>
++
++ <para>The behavior can be controlled per interface name (e.g. lsarpc, netlogon, samr, srvsvc,
++ winreg, wkssvc ...) by using 'allow dcerpc auth level connect:interface = no' as option.</para>
++
++ <para>This option yields precedence to the implentation specific restrictions.
++ E.g. the drsuapi and backupkey protocols require DCERPC_AUTH_LEVEL_PRIVACY.
++ While others like samr and lsarpc have a hardcoded default of <constant>no</constant>.
++ </para>
++
++ <para>Note the default will very likely change to <constant>no</constant> for Samba 4.5.</para>
++</description>
++
++<value type="default">yes</value>
++<value type="example">no</value>
++
++</samba:parameter>
+--
+2.8.1
+
+
+From 9a0e8182314c631681f2dd47da5d790168066279 Mon Sep 17 00:00:00 2001
+From: Ralph Boehme <slow(a)samba.org>
+Date: Fri, 18 Mar 2016 08:45:11 +0100
+Subject: [PATCH 04/10] CVE-2016-2118: param: add "allow dcerpc auth level
+ connect" defaulting to "yes"
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11616
+
+Signed-off-by: Ralph Boehme <slow(a)samba.org>
+Reviewed-by: Stefan Metzmacher <metze(a)samba.org>
+(backported from commit 6e3ada2c36f527077d77a8278bd41bbc030f48cd)
+
+(cherry picked from commit 74172d061597c96f0e733c11daee6cb15f3277dc)
+Signed-off-by: Aurelien Aptel <aaptel(a)suse.com>
+---
+ source3/include/proto.h | 1 +
+ source3/param/loadparm.c | 13 +++++++++++++
+ 2 files changed, 14 insertions(+)
+
+diff --git a/source3/include/proto.h b/source3/include/proto.h
+index ac1540f..2ed6547 100644
+--- a/source3/include/proto.h
++++ b/source3/include/proto.h
+@@ -1821,6 +1821,7 @@ char* lp_perfcount_module(void);
+ void lp_set_passdb_backend(const char *backend);
+ void widelinks_warning(int snum);
+ char *lp_ncalrpc_dir(void);
++bool lp_allow_dcerpc_auth_level_connect(void);
+
+ /* The following definitions come from param/loadparm_server_role.c */
+
+diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
+index fdc9407..87d33c5 100644
+--- a/source3/param/loadparm.c
++++ b/source3/param/loadparm.c
+@@ -355,6 +355,7 @@ struct global {
+ bool bUseMmap;
+ bool bHostnameLookups;
+ bool bUnixExtensions;
++ bool bAllowDcerpcAuthLevelConnect;
+ bool bDisableNetbios;
+ char * szDedicatedKeytabFile;
+ int iKerberosMethod;
+@@ -2303,6 +2304,15 @@ static struct parm_struct parm_table[] = {
+ .flags = FLAG_ADVANCED,
+ },
+ {
++ .label = "allow dcerpc auth level connect",
++ .type = P_BOOL,
++ .p_class = P_GLOBAL,
++ .ptr = &Globals.bAllowDcerpcAuthLevelConnect,
++ .special = NULL,
++ .enum_list = NULL,
++ .flags = FLAG_ADVANCED,
++ },
++ {
+ .label = "use spnego",
+ .type = P_BOOL,
+ .p_class = P_GLOBAL,
+@@ -5371,6 +5381,8 @@ static void init_globals(bool reinit_globals)
+ Globals.bClientNTLMv2Auth = True; /* Client should always use use NTLMv2, as we can't tell that the server supports it, but most modern servers do */
+ /* Note, that we will also use NTLM2 session security (which is different), if it is available */
+
++ Globals.bAllowDcerpcAuthLevelConnect = true; /* we need to allow this for now by default */
++
+ Globals.map_to_guest = 0; /* By Default, "Never" */
+ Globals.oplock_break_wait_time = 0; /* By Default, 0 msecs. */
+ Globals.enhanced_browsing = true;
+@@ -5745,6 +5757,7 @@ FN_GLOBAL_INTEGER(lp_username_map_cache_time, &Globals.iUsernameMapCacheTime)
+
+ FN_GLOBAL_STRING(lp_check_password_script, &Globals.szCheckPasswordScript)
+
++FN_GLOBAL_BOOL(lp_allow_dcerpc_auth_level_connect, &Globals.bAllowDcerpcAuthLevelConnect)
+ FN_GLOBAL_STRING(lp_wins_hook, &Globals.szWINSHook)
+ FN_GLOBAL_CONST_STRING(lp_template_homedir, &Globals.szTemplateHomedir)
+ FN_GLOBAL_CONST_STRING(lp_template_shell, &Globals.szTemplateShell)
+--
+2.8.1
+
+
+From 82a245ff842ea33c050a8fbe415a531497232d3d Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Fri, 18 Mar 2016 04:40:30 +0100
+Subject: [PATCH 05/10] CVE-2016-2118: s3:rpc_server: make use of "allow dcerpc
+ auth level connect"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+With this option turned off we only allow DCERPC_AUTH_LEVEL_{NONE,INTEGRITY,PRIVACY},
+this means the reject any request with AUTH_LEVEL_CONNECT with ACCESS_DENIED.
+
+We sadly need to keep this enabled by default for now.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11616
+
+Pair-Programmed-With: Günther Deschner <gd(a)samba.org>
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Signed-off-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit 1fa0bad3da921fca1d34971062522b4cc3e6db2c)
+(cherry picked from commit 46744bbe5e3616613b2dbee7cf6fdf0d8d5caab3)
+Signed-off-by: Aurelien Aptel <aaptel(a)suse.com>
+---
+ source3/include/ntdomain.h | 4 ++++
+ source3/rpc_server/srv_pipe.c | 49 ++++++++++++++++++++++++++++++++++++++++++-
+ 2 files changed, 52 insertions(+), 1 deletion(-)
+
+diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h
+index 2fbeabc..650f1d0 100644
+--- a/source3/include/ntdomain.h
++++ b/source3/include/ntdomain.h
+@@ -89,6 +89,10 @@ typedef struct pipe_rpc_fns {
+ uint32 context_id;
+ struct ndr_syntax_id syntax;
+
++ /*
++ * shall we allow "connect" auth level for this interface ?
++ */
++ bool allow_connect;
+ } PIPE_RPC_FNS;
+
+ /*
+diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
+index d659705..c462dcf 100644
+--- a/source3/rpc_server/srv_pipe.c
++++ b/source3/rpc_server/srv_pipe.c
+@@ -335,6 +335,7 @@ static bool check_bind_req(struct pipes_struct *p,
+ uint32 context_id)
+ {
+ struct pipe_rpc_fns *context_fns;
++ const char *interface_name = NULL;
+
+ DEBUG(3,("check_bind_req for %s\n",
+ get_pipe_name_from_syntax(talloc_tos(), abstract)));
+@@ -355,12 +356,29 @@ static bool check_bind_req(struct pipes_struct *p,
+ return False;
+ }
+
++ interface_name = get_pipe_name_from_syntax(talloc_tos(),
++ abstract);
++
++ SMB_ASSERT(interface_name != NULL);
++
+ context_fns->next = context_fns->prev = NULL;
+ context_fns->n_cmds = rpc_srv_get_pipe_num_cmds(abstract);
+ context_fns->cmds = rpc_srv_get_pipe_cmds(abstract);
+ context_fns->context_id = context_id;
+ context_fns->syntax = *abstract;
+
++ context_fns->allow_connect = lp_allow_dcerpc_auth_level_connect();
++ /*
++ * every interface can be modified to allow "connect" auth_level by
++ * using a parametric option like:
++ * allow dcerpc auth level connect:<interface>
++ * e.g.
++ * allow dcerpc auth level connect:samr = yes
++ */
++ context_fns->allow_connect = lp_parm_bool(-1,
++ "allow dcerpc auth level connect",
++ interface_name, context_fns->allow_connect);
++
+ /* add to the list of open contexts */
+
+ DLIST_ADD( p->contexts, context_fns );
+@@ -1592,6 +1610,7 @@ static bool api_pipe_request(struct pipes_struct *p,
+ TALLOC_CTX *frame = talloc_stackframe();
+ bool ret = False;
+ PIPE_RPC_FNS *pipe_fns;
++ const char *interface_name = NULL;
+
+ if (!p->pipe_bound) {
+ DEBUG(1, ("Pipe not bound!\n"));
+@@ -1613,8 +1632,36 @@ static bool api_pipe_request(struct pipes_struct *p,
+ return false;
+ }
+
++ interface_name = get_pipe_name_from_syntax(talloc_tos(),
++ &pipe_fns->syntax);
++
++ SMB_ASSERT(interface_name != NULL);
++
+ DEBUG(5, ("Requested \\PIPE\\%s\n",
+- get_pipe_name_from_syntax(talloc_tos(), &pipe_fns->syntax)));
++ interface_name));
++
++ switch (p->auth.auth_level) {
++ case DCERPC_AUTH_LEVEL_NONE:
++ case DCERPC_AUTH_LEVEL_INTEGRITY:
++ case DCERPC_AUTH_LEVEL_PRIVACY:
++ break;
++ default:
++ if (!pipe_fns->allow_connect) {
++ DEBUG(1, ("%s: restrict auth_level_connect access "
++ "to [%s] with auth[type=0x%x,level=0x%x] "
++ "on [%s] from [%s]\n",
++ __func__, interface_name,
++ p->auth.auth_type,
++ p->auth.auth_level,
++ derpc_transport_string_by_transport(p->transport),
++ p->client_id->name));
++
++ setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_ACCESS_DENIED));
++ TALLOC_FREE(frame);
++ return true;
++ }
++ break;
++ }
+
+ if (!srv_pipe_check_verification_trailer(p, pkt, pipe_fns)) {
+ DEBUG(1, ("srv_pipe_check_verification_trailer: failed\n"));
+--
+2.8.1
+
+
+From b68b204307e0b24bc2879ea667a706e11925166d Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Fri, 7 Aug 2015 09:50:30 +0200
+Subject: [PATCH 06/10] CVE-2016-2118: s3:rpc_server/{samr,lsa,netlogon}:
+ reject DCERPC_AUTH_LEVEL_CONNECT by default
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This prevents man in the middle downgrade attacks.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11616
+
+Pair-Programmed-With: Günther Deschner <gd(a)samba.org>
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Signed-off-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit 51dd08951eb4ab9d297678f96cde61f508937721)
+Signed-off-by: Aurelien Aptel <aaptel(a)suse.com>
+
+Conflicts:
+ selftest/knownfail
+ source3/rpc_server/srv_pipe.c
+
+selftest/knownfail is ignored in 3.6
+---
+ source3/rpc_server/srv_pipe.c | 20 ++++++++++++++++++++
+ source3/selftest/knownfail | 1 +
+ source3/selftest/tests.py | 2 ++
+ 3 files changed, 23 insertions(+)
+
+diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
+index c462dcf..3086b9e 100644
+--- a/source3/rpc_server/srv_pipe.c
++++ b/source3/rpc_server/srv_pipe.c
+@@ -43,6 +43,9 @@
+ #include "ntdomain.h"
+ #include "rpc_server/srv_pipe.h"
+ #include "../librpc/ndr/ndr_dcerpc.h"
++#include "../librpc/gen_ndr/ndr_samr.h"
++#include "../librpc/gen_ndr/ndr_lsa.h"
++#include "../librpc/gen_ndr/ndr_netlogon.h"
+
+ #undef DBGC_CLASS
+ #define DBGC_CLASS DBGC_RPC_SRV
+@@ -336,6 +339,7 @@ static bool check_bind_req(struct pipes_struct *p,
+ {
+ struct pipe_rpc_fns *context_fns;
+ const char *interface_name = NULL;
++ bool ok;
+
+ DEBUG(3,("check_bind_req for %s\n",
+ get_pipe_name_from_syntax(talloc_tos(), abstract)));
+@@ -369,6 +373,22 @@ static bool check_bind_req(struct pipes_struct *p,
+
+ context_fns->allow_connect = lp_allow_dcerpc_auth_level_connect();
+ /*
++ * for the samr and the lsarpc interfaces we don't allow "connect"
++ * auth_level by default.
++ */
++ ok = ndr_syntax_id_equal(abstract, &ndr_table_samr.syntax_id);
++ if (ok) {
++ context_fns->allow_connect = false;
++ }
++ ok = ndr_syntax_id_equal(abstract, &ndr_table_lsarpc.syntax_id);
++ if (ok) {
++ context_fns->allow_connect = false;
++ }
++ ok = ndr_syntax_id_equal(abstract, &ndr_table_netlogon.syntax_id);
++ if (ok) {
++ context_fns->allow_connect = false;
++ }
++ /*
+ * every interface can be modified to allow "connect" auth_level by
+ * using a parametric option like:
+ * allow dcerpc auth level connect:<interface>
+diff --git a/source3/selftest/knownfail b/source3/selftest/knownfail
+index bda1fe0..8717a4d 100644
+--- a/source3/selftest/knownfail
++++ b/source3/selftest/knownfail
+@@ -18,3 +18,4 @@ samba3.posix_s3.nbt.dgram.*netlogon2
+ samba3.*rap.sam.*.useradd # Not provided by Samba 3
+ samba3.*rap.sam.*.userdelete # Not provided by Samba 3
+ samba3.*rap.basic.*.netsessiongetinfo # Not provided by Samba 3
++samba3.blackbox.rpcclient.over.ncacn_np.with.*connect.* # we don't allow auth_level_connect anymore
+diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
+index a733f14..8dfbf1e 100755
+--- a/source3/selftest/tests.py
++++ b/source3/selftest/tests.py
+@@ -201,6 +201,8 @@ if sub.returncode == 0:
+ plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmpguest -U$USERNAME%$PASSWORD')
+ elif t == "raw.samba3posixtimedlock":
+ plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmpguest -U$USERNAME%$PASSWORD --option=torture:localdir=$SELFTEST_PREFIX/dc/share')
++ elif t == "rpc.samr.passwords.validate":
++ plansmbtorturetestsuite(t, "s3dc", 'ncacn_np:$SERVER_IP[seal] -U$USERNAME%$PASSWORD', 'over ncacn_np ')
+ else:
+ plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
+
+--
+2.8.1
+
+
+From 720b9f861322c5fe804c53eb74e7d2d6a4d8b876 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn(a)samba.org>
+Date: Tue, 5 Apr 2016 09:54:38 +0200
+Subject: [PATCH 07/10] CVE-2016-2118: s3:selftest: The lsa tests which use
+ connect need to fail
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11616
+
+Signed-off-by: Andreas Schneider <asn(a)samba.org>
+---
+ source3/selftest/knownfail | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/source3/selftest/knownfail b/source3/selftest/knownfail
+index 8717a4d..7d9275e 100644
+--- a/source3/selftest/knownfail
++++ b/source3/selftest/knownfail
+@@ -19,3 +19,4 @@ samba3.*rap.sam.*.useradd # Not provided by Samba 3
+ samba3.*rap.sam.*.userdelete # Not provided by Samba 3
+ samba3.*rap.basic.*.netsessiongetinfo # Not provided by Samba 3
+ samba3.blackbox.rpcclient.over.ncacn_np.with.*connect.* # we don't allow auth_level_connect anymore
++samba3.posix_s3.rpc.lsa.lookupsids.*ncacn_ip_tcp.*connect.* # we don't allow auth_level_connect anymore
+--
+2.8.1
+
+
+From 9b2b563a1f8247f5ec7efde52d70efc666e30f56 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Sat, 26 Mar 2016 08:47:42 +0100
+Subject: [PATCH 08/10] CVE-2016-2118: s3:rpc_server/{epmapper,echo}: allow
+ DCERPC_AUTH_LEVEL_CONNECT by default
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11616
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Alexander Bokovoy <ab(a)samba.org>
+(cherry picked from commit 98f1a85f23d3d2a4f1c665746588688574261d90)
+---
+ source3/rpc_server/srv_pipe.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
+index 3086b9e..964b843 100644
+--- a/source3/rpc_server/srv_pipe.c
++++ b/source3/rpc_server/srv_pipe.c
+@@ -46,6 +46,8 @@
+ #include "../librpc/gen_ndr/ndr_samr.h"
+ #include "../librpc/gen_ndr/ndr_lsa.h"
+ #include "../librpc/gen_ndr/ndr_netlogon.h"
++#include "../librpc/gen_ndr/ndr_epmapper.h"
++#include "../librpc/gen_ndr/ndr_echo.h"
+
+ #undef DBGC_CLASS
+ #define DBGC_CLASS DBGC_RPC_SRV
+@@ -389,6 +391,18 @@ static bool check_bind_req(struct pipes_struct *p,
+ context_fns->allow_connect = false;
+ }
+ /*
++ * for the epmapper and echo interfaces we allow "connect"
++ * auth_level by default.
++ */
++ ok = ndr_syntax_id_equal(abstract, &ndr_table_epmapper.syntax_id);
++ if (ok) {
++ context_fns->allow_connect = true;
++ }
++ ok = ndr_syntax_id_equal(abstract, &ndr_table_rpcecho.syntax_id);
++ if (ok) {
++ context_fns->allow_connect = true;
++ }
++ /*
+ * every interface can be modified to allow "connect" auth_level by
+ * using a parametric option like:
+ * allow dcerpc auth level connect:<interface>
+--
+2.8.1
+
+
+From 21453f6887569b162be44faaf43e1b9a81423210 Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Thu, 10 Mar 2016 17:03:59 +0100
+Subject: [PATCH 09/10] CVE-2016-2118: docs-xml/param: default "allow dcerpc
+ auth level connect" to "no"
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11616
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Alexander Bokovoy <ab(a)samba.org>
+(backported from commit 6469e21af32a2a405dd4f43e7d96a2f87c4a9902)
+
+Conflicts:
+ lib/param/loadparm.c
+ source3/param/loadparm.c
+---
+ docs-xml/smbdotconf/security/allowdcerpcauthlevelconnect.xml | 6 ++----
+ source3/param/loadparm.c | 2 +-
+ 2 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/docs-xml/smbdotconf/security/allowdcerpcauthlevelconnect.xml b/docs-xml/smbdotconf/security/allowdcerpcauthlevelconnect.xml
+index 5552112..c8e9d18 100644
+--- a/docs-xml/smbdotconf/security/allowdcerpcauthlevelconnect.xml
++++ b/docs-xml/smbdotconf/security/allowdcerpcauthlevelconnect.xml
+@@ -14,11 +14,9 @@
+ E.g. the drsuapi and backupkey protocols require DCERPC_AUTH_LEVEL_PRIVACY.
+ While others like samr and lsarpc have a hardcoded default of <constant>no</constant>.
+ </para>
+-
+- <para>Note the default will very likely change to <constant>no</constant> for Samba 4.5.</para>
+ </description>
+
+-<value type="default">yes</value>
+-<value type="example">no</value>
++<value type="default">no</value>
++<value type="example">yes</value>
+
+ </samba:parameter>
+diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
+index 87d33c5..a514727 100644
+--- a/source3/param/loadparm.c
++++ b/source3/param/loadparm.c
+@@ -5381,7 +5381,7 @@ static void init_globals(bool reinit_globals)
+ Globals.bClientNTLMv2Auth = True; /* Client should always use use NTLMv2, as we can't tell that the server supports it, but most modern servers do */
+ /* Note, that we will also use NTLM2 session security (which is different), if it is available */
+
+- Globals.bAllowDcerpcAuthLevelConnect = true; /* we need to allow this for now by default */
++ Globals.bAllowDcerpcAuthLevelConnect = false; /* we don't allow this by default */
+
+ Globals.map_to_guest = 0; /* By Default, "Never" */
+ Globals.oplock_break_wait_time = 0; /* By Default, 0 msecs. */
+--
+2.8.1
+
+
+From a5aebec4ff2f1d3b824dfcc05091da712639220d Mon Sep 17 00:00:00 2001
+From: Stefan Metzmacher <metze(a)samba.org>
+Date: Sun, 28 Feb 2016 22:48:11 +0100
+Subject: [PATCH 10/10] CVE-2016-2118: s3:rpc_server/samr: allow
+ _samr_ValidatePassword only with PRIVACY...
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This requires transport encryption.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11616
+
+Signed-off-by: Stefan Metzmacher <metze(a)samba.org>
+Reviewed-by: Günther Deschner <gd(a)samba.org>
+(cherry picked from commit d7c2f1e12544ee0f80438dcc1586e2d30c23b54a)
+---
+ source3/rpc_server/samr/srv_samr_nt.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/source3/rpc_server/samr/srv_samr_nt.c b/source3/rpc_server/samr/srv_samr_nt.c
+index 0984984..37e2e4f 100644
+--- a/source3/rpc_server/samr/srv_samr_nt.c
++++ b/source3/rpc_server/samr/srv_samr_nt.c
+@@ -6628,6 +6628,11 @@ NTSTATUS _samr_ValidatePassword(struct pipes_struct *p,
+ struct samr_GetDomPwInfo pw;
+ struct samr_PwInfo dom_pw_info;
+
++ if (p->auth.auth_level != DCERPC_AUTH_LEVEL_PRIVACY) {
++ p->fault_state = DCERPC_FAULT_ACCESS_DENIED;
++ return NT_STATUS_ACCESS_DENIED;
++ }
++
+ if (r->in.level < 1 || r->in.level > 3) {
+ return NT_STATUS_INVALID_INFO_CLASS;
+ }
+--
+2.8.1
+
diff --git a/src/patches/samba/CVE-preparation-v3-6.patch b/src/patches/samba/CVE-preparation-v3-6.patch
new file mode 100644
index 0000000..48af30c
--- /dev/null
+++ b/src/patches/samba/CVE-preparation-v3-6.patch
@@ -0,0 +1,6964 @@
+From 39a3fa39967faaf216be8e108ca57d07de1aa95a Mon Sep 17 00:00:00 2001
+From: Vadim Zhukov <persgray(a)gmail.com>
+Date: Sat, 25 May 2013 15:19:24 +0100
+Subject: [PATCH 01/41] pidl: Recent Perl warns about "defined(@var)"
+ constructs.
+
+Signed-off-by: Jelmer Vernooij <jelmer(a)samba.org>
+
+Autobuild-User(master): Jelmer Vernooij <jelmer(a)samba.org>
+Autobuild-Date(master): Sat May 25 18:10:53 CEST 2013 on sn-devel-104
+
+(cherry picked from commit 92254d09e0ee5a7d9d0cd91fe1803f54e64d9a5f)
+---
+ pidl/lib/Parse/Pidl/ODL.pm | 2 +-
+ pidl/pidl | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: samba-3.6.23/pidl/lib/Parse/Pidl/ODL.pm
+===================================================================
+--- samba-3.6.23.orig/pidl/lib/Parse/Pidl/ODL.pm
++++ samba-3.6.23/pidl/lib/Parse/Pidl/ODL.pm
+@@ -70,7 +70,7 @@ sub ODL2IDL
+ next;
+ }
+ my $podl = Parse::Pidl::IDL::parse_file($idl_path, $opt_incdirs);
+- if (defined(@$podl)) {
++ if (defined($podl)) {
+ require Parse::Pidl::Typelist;
+ my $basename = basename($idl_path, ".idl");
+
+Index: samba-3.6.23/pidl/pidl
+===================================================================
+--- samba-3.6.23.orig/pidl/pidl
++++ samba-3.6.23/pidl/pidl
+@@ -605,7 +605,7 @@ sub process_file($)
+ require Parse::Pidl::IDL;
+
+ $pidl = Parse::Pidl::IDL::parse_file($idl_file, \@opt_incdirs);
+- defined @$pidl || die "Failed to parse $idl_file";
++ defined $pidl || die "Failed to parse $idl_file";
+ }
+
+ require Parse::Pidl::Typelist;
+Index: samba-3.6.23/source4/heimdal/cf/make-proto.pl
+===================================================================
+--- samba-3.6.23.orig/source4/heimdal/cf/make-proto.pl
++++ samba-3.6.23/source4/heimdal/cf/make-proto.pl
+@@ -1,8 +1,8 @@
+ # Make prototypes from .c files
+ # $Id$
+
+-##use Getopt::Std;
+-require 'getopts.pl';
++use Getopt::Std;
++#require 'getopts.pl';
+
+ my $comment = 0;
+ my $if_0 = 0;
+@@ -12,7 +12,7 @@ my $debug = 0;
+ my $oproto = 1;
+ my $private_func_re = "^_";
+
+-Getopts('x:m:o:p:dqE:R:P:') || die "foo";
++getopts('x:m:o:p:dqE:R:P:') || die "foo";
+
+ if($opt_d) {
+ $debug = 1;
+Index: samba-3.6.23/source3/Makefile-smbtorture4
+===================================================================
+--- samba-3.6.23.orig/source3/Makefile-smbtorture4
++++ samba-3.6.23/source3/Makefile-smbtorture4
+@@ -6,7 +6,7 @@ SAMBA4_BINARIES="smbtorture,ndrdump"
+ samba4-configure:
+ @(cd .. && \
+ CFLAGS='' $(WAF) reconfigure || \
+- CFLAGS='' $(WAF) configure --enable-socket-wrapper --enable-nss-wrapper --enable-uid-wrapper --nonshared-binary=$(SAMBA4_BINARIES) --enable-auto-reconfigure )
++ CFLAGS='' $(WAF) configure --enable-socket-wrapper --enable-nss-wrapper --enable-uid-wrapper --nonshared-binary=$(SAMBA4_BINARIES) --enable-auto-reconfigure --bundled-libraries=ALL --disable-gnutls )
+
+ .PHONY: samba4-configure
+
+Index: samba-3.6.23/source4/lib/ldb/wscript
+===================================================================
+--- samba-3.6.23.orig/source4/lib/ldb/wscript
++++ samba-3.6.23/source4/lib/ldb/wscript
+@@ -135,9 +135,7 @@ def build(bld):
+ pc_files=ldb_pc_files,
+ vnum=VERSION,
+ private_library=private_library,
+- manpages='man/ldb.3',
+- abi_directory = 'ABI',
+- abi_match = abi_match)
++ manpages='man/ldb.3')
+
+ # generate a include/ldb_version.h
+ t = bld.SAMBA_GENERATOR('ldb_version.h',
+Index: samba-3.6.23/source3/selftest/skip
+===================================================================
+--- samba-3.6.23.orig/source3/selftest/skip
++++ samba-3.6.23/source3/selftest/skip
+@@ -22,3 +22,8 @@ samba3.*raw.ioctl
+ samba3.*raw.qfileinfo
+ samba3.*raw.qfsinfo
+ samba3.*raw.sfileinfo.base
++# skip, don't work for badlock backports
++samba3.posix_s3.raw.eas
++samba3.posix_s3.raw.rename
++samba3.posix_s3.raw.search
++samba3.posix_s3.raw.streams
+Index: samba-3.6.23/librpc/ndr/ndr_ntlmssp.c
+===================================================================
+--- samba-3.6.23.orig/librpc/ndr/ndr_ntlmssp.c
++++ samba-3.6.23/librpc/ndr/ndr_ntlmssp.c
+@@ -176,4 +176,20 @@ _PUBLIC_ void ndr_print_ntlmssp_Version(
+ }
+ }
+
++_PUBLIC_ struct AV_PAIR *ndr_ntlmssp_find_av(const struct AV_PAIR_LIST *av_list,
++ enum ntlmssp_AvId AvId)
++{
++ struct AV_PAIR *res = NULL;
++ uint32_t i = 0;
+
++ for (i = 0; i < av_list->count; i++) {
++ if (av_list->pair[i].AvId != AvId) {
++ continue;
++ }
++
++ res = discard_const_p(struct AV_PAIR, &av_list->pair[i]);
++ break;
++ }
++
++ return res;
++}
+Index: samba-3.6.23/librpc/ndr/ndr_ntlmssp.h
+===================================================================
+--- samba-3.6.23.orig/librpc/ndr/ndr_ntlmssp.h
++++ samba-3.6.23/librpc/ndr/ndr_ntlmssp.h
+@@ -31,3 +31,5 @@ _PUBLIC_ void ndr_print_ntlmssp_lm_respo
+ bool ntlmv2);
+ _PUBLIC_ void ndr_print_ntlmssp_Version(struct ndr_print *ndr, const char *name, const union ntlmssp_Version *r);
+
++_PUBLIC_ struct AV_PAIR *ndr_ntlmssp_find_av(const struct AV_PAIR_LIST *av_list,
++ enum ntlmssp_AvId AvId);
+Index: samba-3.6.23/librpc/ABI/ndr-0.0.2.sigs
+===================================================================
+--- /dev/null
++++ samba-3.6.23/librpc/ABI/ndr-0.0.2.sigs
+@@ -0,0 +1,247 @@
++GUID_all_zero: bool (const struct GUID *)
++GUID_compare: int (const struct GUID *, const struct GUID *)
++GUID_equal: bool (const struct GUID *, const struct GUID *)
++GUID_from_data_blob: NTSTATUS (const DATA_BLOB *, struct GUID *)
++GUID_from_ndr_blob: NTSTATUS (const DATA_BLOB *, struct GUID *)
++GUID_from_string: NTSTATUS (const char *, struct GUID *)
++GUID_hexstring: char *(TALLOC_CTX *, const struct GUID *)
++GUID_random: struct GUID (void)
++GUID_string: char *(TALLOC_CTX *, const struct GUID *)
++GUID_string2: char *(TALLOC_CTX *, const struct GUID *)
++GUID_to_ndr_blob: NTSTATUS (const struct GUID *, TALLOC_CTX *, DATA_BLOB *)
++GUID_zero: struct GUID (void)
++ndr_align_size: size_t (uint32_t, size_t)
++ndr_charset_length: uint32_t (const void *, charset_t)
++ndr_check_array_length: enum ndr_err_code (struct ndr_pull *, void *, uint32_t)
++ndr_check_array_size: enum ndr_err_code (struct ndr_pull *, void *, uint32_t)
++ndr_check_padding: void (struct ndr_pull *, size_t)
++ndr_check_pipe_chunk_trailer: enum ndr_err_code (struct ndr_pull *, int, uint32_t)
++ndr_check_string_terminator: enum ndr_err_code (struct ndr_pull *, uint32_t, uint32_t)
++ndr_get_array_length: uint32_t (struct ndr_pull *, const void *)
++ndr_get_array_size: uint32_t (struct ndr_pull *, const void *)
++ndr_map_error2errno: int (enum ndr_err_code)
++ndr_map_error2ntstatus: NTSTATUS (enum ndr_err_code)
++ndr_map_error2string: const char *(enum ndr_err_code)
++ndr_policy_handle_empty: bool (const struct policy_handle *)
++ndr_policy_handle_equal: bool (const struct policy_handle *, const struct policy_handle *)
++ndr_print_DATA_BLOB: void (struct ndr_print *, const char *, DATA_BLOB)
++ndr_print_GUID: void (struct ndr_print *, const char *, const struct GUID *)
++ndr_print_KRB5_EDATA_NTSTATUS: void (struct ndr_print *, const char *, const struct KRB5_EDATA_NTSTATUS *)
++ndr_print_NTSTATUS: void (struct ndr_print *, const char *, NTSTATUS)
++ndr_print_NTTIME: void (struct ndr_print *, const char *, NTTIME)
++ndr_print_NTTIME_1sec: void (struct ndr_print *, const char *, NTTIME)
++ndr_print_NTTIME_hyper: void (struct ndr_print *, const char *, NTTIME)
++ndr_print_WERROR: void (struct ndr_print *, const char *, WERROR)
++ndr_print_array_uint8: void (struct ndr_print *, const char *, const uint8_t *, uint32_t)
++ndr_print_bad_level: void (struct ndr_print *, const char *, uint16_t)
++ndr_print_bitmap_flag: void (struct ndr_print *, size_t, const char *, uint32_t, uint32_t)
++ndr_print_bool: void (struct ndr_print *, const char *, const bool)
++ndr_print_debug: void (ndr_print_fn_t, const char *, void *)
++ndr_print_debug_helper: void (struct ndr_print *, const char *, ...)
++ndr_print_debugc: void (int, ndr_print_fn_t, const char *, void *)
++ndr_print_debugc_helper: void (struct ndr_print *, const char *, ...)
++ndr_print_dlong: void (struct ndr_print *, const char *, int64_t)
++ndr_print_double: void (struct ndr_print *, const char *, double)
++ndr_print_enum: void (struct ndr_print *, const char *, const char *, const char *, uint32_t)
++ndr_print_function_debug: void (ndr_print_function_t, const char *, int, void *)
++ndr_print_function_string: char *(TALLOC_CTX *, ndr_print_function_t, const char *, int, void *)
++ndr_print_get_switch_value: uint32_t (struct ndr_print *, const void *)
++ndr_print_gid_t: void (struct ndr_print *, const char *, gid_t)
++ndr_print_hyper: void (struct ndr_print *, const char *, uint64_t)
++ndr_print_int16: void (struct ndr_print *, const char *, int16_t)
++ndr_print_int32: void (struct ndr_print *, const char *, int32_t)
++ndr_print_int3264: void (struct ndr_print *, const char *, int32_t)
++ndr_print_int8: void (struct ndr_print *, const char *, int8_t)
++ndr_print_ipv4address: void (struct ndr_print *, const char *, const char *)
++ndr_print_ipv6address: void (struct ndr_print *, const char *, const char *)
++ndr_print_ndr_syntax_id: void (struct ndr_print *, const char *, const struct ndr_syntax_id *)
++ndr_print_netr_SamDatabaseID: void (struct ndr_print *, const char *, enum netr_SamDatabaseID)
++ndr_print_netr_SchannelType: void (struct ndr_print *, const char *, enum netr_SchannelType)
++ndr_print_null: void (struct ndr_print *)
++ndr_print_pointer: void (struct ndr_print *, const char *, void *)
++ndr_print_policy_handle: void (struct ndr_print *, const char *, const struct policy_handle *)
++ndr_print_printf_helper: void (struct ndr_print *, const char *, ...)
++ndr_print_ptr: void (struct ndr_print *, const char *, const void *)
++ndr_print_set_switch_value: enum ndr_err_code (struct ndr_print *, const void *, uint32_t)
++ndr_print_sockaddr_storage: void (struct ndr_print *, const char *, const struct sockaddr_storage *)
++ndr_print_string: void (struct ndr_print *, const char *, const char *)
++ndr_print_string_array: void (struct ndr_print *, const char *, const char **)
++ndr_print_string_helper: void (struct ndr_print *, const char *, ...)
++ndr_print_struct: void (struct ndr_print *, const char *, const char *)
++ndr_print_struct_string: char *(TALLOC_CTX *, ndr_print_fn_t, const char *, void *)
++ndr_print_svcctl_ServerType: void (struct ndr_print *, const char *, uint32_t)
++ndr_print_time_t: void (struct ndr_print *, const char *, time_t)
++ndr_print_timespec: void (struct ndr_print *, const char *, const struct timespec *)
++ndr_print_timeval: void (struct ndr_print *, const char *, const struct timeval *)
++ndr_print_udlong: void (struct ndr_print *, const char *, uint64_t)
++ndr_print_udlongr: void (struct ndr_print *, const char *, uint64_t)
++ndr_print_uid_t: void (struct ndr_print *, const char *, uid_t)
++ndr_print_uint16: void (struct ndr_print *, const char *, uint16_t)
++ndr_print_uint32: void (struct ndr_print *, const char *, uint32_t)
++ndr_print_uint3264: void (struct ndr_print *, const char *, uint32_t)
++ndr_print_uint8: void (struct ndr_print *, const char *, uint8_t)
++ndr_print_union: void (struct ndr_print *, const char *, int, const char *)
++ndr_print_union_debug: void (ndr_print_fn_t, const char *, uint32_t, void *)
++ndr_print_union_string: char *(TALLOC_CTX *, ndr_print_fn_t, const char *, uint32_t, void *)
++ndr_print_winreg_Data: void (struct ndr_print *, const char *, const union winreg_Data *)
++ndr_print_winreg_Type: void (struct ndr_print *, const char *, enum winreg_Type)
++ndr_pull_DATA_BLOB: enum ndr_err_code (struct ndr_pull *, int, DATA_BLOB *)
++ndr_pull_GUID: enum ndr_err_code (struct ndr_pull *, int, struct GUID *)
++ndr_pull_KRB5_EDATA_NTSTATUS: enum ndr_err_code (struct ndr_pull *, int, struct KRB5_EDATA_NTSTATUS *)
++ndr_pull_NTSTATUS: enum ndr_err_code (struct ndr_pull *, int, NTSTATUS *)
++ndr_pull_NTTIME: enum ndr_err_code (struct ndr_pull *, int, NTTIME *)
++ndr_pull_NTTIME_1sec: enum ndr_err_code (struct ndr_pull *, int, NTTIME *)
++ndr_pull_NTTIME_hyper: enum ndr_err_code (struct ndr_pull *, int, NTTIME *)
++ndr_pull_WERROR: enum ndr_err_code (struct ndr_pull *, int, WERROR *)
++ndr_pull_advance: enum ndr_err_code (struct ndr_pull *, uint32_t)
++ndr_pull_align: enum ndr_err_code (struct ndr_pull *, size_t)
++ndr_pull_array_length: enum ndr_err_code (struct ndr_pull *, const void *)
++ndr_pull_array_size: enum ndr_err_code (struct ndr_pull *, const void *)
++ndr_pull_array_uint8: enum ndr_err_code (struct ndr_pull *, int, uint8_t *, uint32_t)
++ndr_pull_bytes: enum ndr_err_code (struct ndr_pull *, uint8_t *, uint32_t)
++ndr_pull_charset: enum ndr_err_code (struct ndr_pull *, int, const char **, uint32_t, uint8_t, charset_t)
++ndr_pull_charset_to_null: enum ndr_err_code (struct ndr_pull *, int, const char **, uint32_t, uint8_t, charset_t)
++ndr_pull_dlong: enum ndr_err_code (struct ndr_pull *, int, int64_t *)
++ndr_pull_double: enum ndr_err_code (struct ndr_pull *, int, double *)
++ndr_pull_enum_uint16: enum ndr_err_code (struct ndr_pull *, int, uint16_t *)
++ndr_pull_enum_uint1632: enum ndr_err_code (struct ndr_pull *, int, uint16_t *)
++ndr_pull_enum_uint32: enum ndr_err_code (struct ndr_pull *, int, uint32_t *)
++ndr_pull_enum_uint8: enum ndr_err_code (struct ndr_pull *, int, uint8_t *)
++ndr_pull_error: enum ndr_err_code (struct ndr_pull *, enum ndr_err_code, const char *, ...)
++ndr_pull_generic_ptr: enum ndr_err_code (struct ndr_pull *, uint32_t *)
++ndr_pull_get_relative_base_offset: uint32_t (struct ndr_pull *)
++ndr_pull_get_switch_value: uint32_t (struct ndr_pull *, const void *)
++ndr_pull_gid_t: enum ndr_err_code (struct ndr_pull *, int, gid_t *)
++ndr_pull_hyper: enum ndr_err_code (struct ndr_pull *, int, uint64_t *)
++ndr_pull_init_blob: struct ndr_pull *(const DATA_BLOB *, TALLOC_CTX *)
++ndr_pull_int16: enum ndr_err_code (struct ndr_pull *, int, int16_t *)
++ndr_pull_int32: enum ndr_err_code (struct ndr_pull *, int, int32_t *)
++ndr_pull_int8: enum ndr_err_code (struct ndr_pull *, int, int8_t *)
++ndr_pull_ipv4address: enum ndr_err_code (struct ndr_pull *, int, const char **)
++ndr_pull_ipv6address: enum ndr_err_code (struct ndr_pull *, int, const char **)
++ndr_pull_ndr_syntax_id: enum ndr_err_code (struct ndr_pull *, int, struct ndr_syntax_id *)
++ndr_pull_netr_SamDatabaseID: enum ndr_err_code (struct ndr_pull *, int, enum netr_SamDatabaseID *)
++ndr_pull_netr_SchannelType: enum ndr_err_code (struct ndr_pull *, int, enum netr_SchannelType *)
++ndr_pull_pointer: enum ndr_err_code (struct ndr_pull *, int, void **)
++ndr_pull_policy_handle: enum ndr_err_code (struct ndr_pull *, int, struct policy_handle *)
++ndr_pull_ref_ptr: enum ndr_err_code (struct ndr_pull *, uint32_t *)
++ndr_pull_relative_ptr1: enum ndr_err_code (struct ndr_pull *, const void *, uint32_t)
++ndr_pull_relative_ptr2: enum ndr_err_code (struct ndr_pull *, const void *)
++ndr_pull_relative_ptr_short: enum ndr_err_code (struct ndr_pull *, uint16_t *)
++ndr_pull_restore_relative_base_offset: void (struct ndr_pull *, uint32_t)
++ndr_pull_set_switch_value: enum ndr_err_code (struct ndr_pull *, const void *, uint32_t)
++ndr_pull_setup_relative_base_offset1: enum ndr_err_code (struct ndr_pull *, const void *, uint32_t)
++ndr_pull_setup_relative_base_offset2: enum ndr_err_code (struct ndr_pull *, const void *)
++ndr_pull_string: enum ndr_err_code (struct ndr_pull *, int, const char **)
++ndr_pull_string_array: enum ndr_err_code (struct ndr_pull *, int, const char ***)
++ndr_pull_struct_blob: enum ndr_err_code (const DATA_BLOB *, TALLOC_CTX *, void *, ndr_pull_flags_fn_t)
++ndr_pull_struct_blob_all: enum ndr_err_code (const DATA_BLOB *, TALLOC_CTX *, void *, ndr_pull_flags_fn_t)
++ndr_pull_subcontext_end: enum ndr_err_code (struct ndr_pull *, struct ndr_pull *, size_t, ssize_t)
++ndr_pull_subcontext_start: enum ndr_err_code (struct ndr_pull *, struct ndr_pull **, size_t, ssize_t)
++ndr_pull_svcctl_ServerType: enum ndr_err_code (struct ndr_pull *, int, uint32_t *)
++ndr_pull_time_t: enum ndr_err_code (struct ndr_pull *, int, time_t *)
++ndr_pull_timespec: enum ndr_err_code (struct ndr_pull *, int, struct timespec *)
++ndr_pull_timeval: enum ndr_err_code (struct ndr_pull *, int, struct timeval *)
++ndr_pull_trailer_align: enum ndr_err_code (struct ndr_pull *, size_t)
++ndr_pull_udlong: enum ndr_err_code (struct ndr_pull *, int, uint64_t *)
++ndr_pull_udlongr: enum ndr_err_code (struct ndr_pull *, int, uint64_t *)
++ndr_pull_uid_t: enum ndr_err_code (struct ndr_pull *, int, uid_t *)
++ndr_pull_uint16: enum ndr_err_code (struct ndr_pull *, int, uint16_t *)
++ndr_pull_uint1632: enum ndr_err_code (struct ndr_pull *, int, uint16_t *)
++ndr_pull_uint32: enum ndr_err_code (struct ndr_pull *, int, uint32_t *)
++ndr_pull_uint3264: enum ndr_err_code (struct ndr_pull *, int, uint32_t *)
++ndr_pull_uint8: enum ndr_err_code (struct ndr_pull *, int, uint8_t *)
++ndr_pull_union_align: enum ndr_err_code (struct ndr_pull *, size_t)
++ndr_pull_union_blob: enum ndr_err_code (const DATA_BLOB *, TALLOC_CTX *, void *, uint32_t, ndr_pull_flags_fn_t)
++ndr_pull_union_blob_all: enum ndr_err_code (const DATA_BLOB *, TALLOC_CTX *, void *, uint32_t, ndr_pull_flags_fn_t)
++ndr_pull_winreg_Data: enum ndr_err_code (struct ndr_pull *, int, union winreg_Data *)
++ndr_pull_winreg_Type: enum ndr_err_code (struct ndr_pull *, int, enum winreg_Type *)
++ndr_push_DATA_BLOB: enum ndr_err_code (struct ndr_push *, int, DATA_BLOB)
++ndr_push_GUID: enum ndr_err_code (struct ndr_push *, int, const struct GUID *)
++ndr_push_KRB5_EDATA_NTSTATUS: enum ndr_err_code (struct ndr_push *, int, const struct KRB5_EDATA_NTSTATUS *)
++ndr_push_NTSTATUS: enum ndr_err_code (struct ndr_push *, int, NTSTATUS)
++ndr_push_NTTIME: enum ndr_err_code (struct ndr_push *, int, NTTIME)
++ndr_push_NTTIME_1sec: enum ndr_err_code (struct ndr_push *, int, NTTIME)
++ndr_push_NTTIME_hyper: enum ndr_err_code (struct ndr_push *, int, NTTIME)
++ndr_push_WERROR: enum ndr_err_code (struct ndr_push *, int, WERROR)
++ndr_push_align: enum ndr_err_code (struct ndr_push *, size_t)
++ndr_push_array_uint8: enum ndr_err_code (struct ndr_push *, int, const uint8_t *, uint32_t)
++ndr_push_blob: DATA_BLOB (struct ndr_push *)
++ndr_push_bytes: enum ndr_err_code (struct ndr_push *, const uint8_t *, uint32_t)
++ndr_push_charset: enum ndr_err_code (struct ndr_push *, int, const char *, uint32_t, uint8_t, charset_t)
++ndr_push_dlong: enum ndr_err_code (struct ndr_push *, int, int64_t)
++ndr_push_double: enum ndr_err_code (struct ndr_push *, int, double)
++ndr_push_enum_uint16: enum ndr_err_code (struct ndr_push *, int, uint16_t)
++ndr_push_enum_uint1632: enum ndr_err_code (struct ndr_push *, int, uint16_t)
++ndr_push_enum_uint32: enum ndr_err_code (struct ndr_push *, int, uint32_t)
++ndr_push_enum_uint8: enum ndr_err_code (struct ndr_push *, int, uint8_t)
++ndr_push_error: enum ndr_err_code (struct ndr_push *, enum ndr_err_code, const char *, ...)
++ndr_push_expand: enum ndr_err_code (struct ndr_push *, uint32_t)
++ndr_push_full_ptr: enum ndr_err_code (struct ndr_push *, const void *)
++ndr_push_get_relative_base_offset: uint32_t (struct ndr_push *)
++ndr_push_get_switch_value: uint32_t (struct ndr_push *, const void *)
++ndr_push_gid_t: enum ndr_err_code (struct ndr_push *, int, gid_t)
++ndr_push_hyper: enum ndr_err_code (struct ndr_push *, int, uint64_t)
++ndr_push_init_ctx: struct ndr_push *(TALLOC_CTX *)
++ndr_push_int16: enum ndr_err_code (struct ndr_push *, int, int16_t)
++ndr_push_int32: enum ndr_err_code (struct ndr_push *, int, int32_t)
++ndr_push_int8: enum ndr_err_code (struct ndr_push *, int, int8_t)
++ndr_push_ipv4address: enum ndr_err_code (struct ndr_push *, int, const char *)
++ndr_push_ipv6address: enum ndr_err_code (struct ndr_push *, int, const char *)
++ndr_push_ndr_syntax_id: enum ndr_err_code (struct ndr_push *, int, const struct ndr_syntax_id *)
++ndr_push_netr_SamDatabaseID: enum ndr_err_code (struct ndr_push *, int, enum netr_SamDatabaseID)
++ndr_push_netr_SchannelType: enum ndr_err_code (struct ndr_push *, int, enum netr_SchannelType)
++ndr_push_pipe_chunk_trailer: enum ndr_err_code (struct ndr_push *, int, uint32_t)
++ndr_push_pointer: enum ndr_err_code (struct ndr_push *, int, void *)
++ndr_push_policy_handle: enum ndr_err_code (struct ndr_push *, int, const struct policy_handle *)
++ndr_push_ref_ptr: enum ndr_err_code (struct ndr_push *)
++ndr_push_relative_ptr1: enum ndr_err_code (struct ndr_push *, const void *)
++ndr_push_relative_ptr2_end: enum ndr_err_code (struct ndr_push *, const void *)
++ndr_push_relative_ptr2_start: enum ndr_err_code (struct ndr_push *, const void *)
++ndr_push_restore_relative_base_offset: void (struct ndr_push *, uint32_t)
++ndr_push_set_switch_value: enum ndr_err_code (struct ndr_push *, const void *, uint32_t)
++ndr_push_setup_relative_base_offset1: enum ndr_err_code (struct ndr_push *, const void *, uint32_t)
++ndr_push_setup_relative_base_offset2: enum ndr_err_code (struct ndr_push *, const void *)
++ndr_push_short_relative_ptr1: enum ndr_err_code (struct ndr_push *, const void *)
++ndr_push_short_relative_ptr2: enum ndr_err_code (struct ndr_push *, const void *)
++ndr_push_string: enum ndr_err_code (struct ndr_push *, int, const char *)
++ndr_push_string_array: enum ndr_err_code (struct ndr_push *, int, const char **)
++ndr_push_struct_blob: enum ndr_err_code (DATA_BLOB *, TALLOC_CTX *, const void *, ndr_push_flags_fn_t)
++ndr_push_subcontext_end: enum ndr_err_code (struct ndr_push *, struct ndr_push *, size_t, ssize_t)
++ndr_push_subcontext_start: enum ndr_err_code (struct ndr_push *, struct ndr_push **, size_t, ssize_t)
++ndr_push_svcctl_ServerType: enum ndr_err_code (struct ndr_push *, int, uint32_t)
++ndr_push_time_t: enum ndr_err_code (struct ndr_push *, int, time_t)
++ndr_push_timespec: enum ndr_err_code (struct ndr_push *, int, const struct timespec *)
++ndr_push_timeval: enum ndr_err_code (struct ndr_push *, int, const struct timeval *)
++ndr_push_trailer_align: enum ndr_err_code (struct ndr_push *, size_t)
++ndr_push_udlong: enum ndr_err_code (struct ndr_push *, int, uint64_t)
++ndr_push_udlongr: enum ndr_err_code (struct ndr_push *, int, uint64_t)
++ndr_push_uid_t: enum ndr_err_code (struct ndr_push *, int, uid_t)
++ndr_push_uint16: enum ndr_err_code (struct ndr_push *, int, uint16_t)
++ndr_push_uint1632: enum ndr_err_code (struct ndr_push *, int, uint16_t)
++ndr_push_uint32: enum ndr_err_code (struct ndr_push *, int, uint32_t)
++ndr_push_uint3264: enum ndr_err_code (struct ndr_push *, int, uint32_t)
++ndr_push_uint8: enum ndr_err_code (struct ndr_push *, int, uint8_t)
++ndr_push_union_align: enum ndr_err_code (struct ndr_push *, size_t)
++ndr_push_union_blob: enum ndr_err_code (DATA_BLOB *, TALLOC_CTX *, void *, uint32_t, ndr_push_flags_fn_t)
++ndr_push_unique_ptr: enum ndr_err_code (struct ndr_push *, const void *)
++ndr_push_winreg_Data: enum ndr_err_code (struct ndr_push *, int, const union winreg_Data *)
++ndr_push_winreg_Type: enum ndr_err_code (struct ndr_push *, int, enum winreg_Type)
++ndr_push_zero: enum ndr_err_code (struct ndr_push *, uint32_t)
++ndr_set_flags: void (uint32_t *, uint32_t)
++ndr_size_DATA_BLOB: uint32_t (int, const DATA_BLOB *, int)
++ndr_size_GUID: size_t (const struct GUID *, int)
++ndr_size_string: uint32_t (int, const char * const *, int)
++ndr_size_string_array: size_t (const char **, uint32_t, int)
++ndr_size_struct: size_t (const void *, int, ndr_push_flags_fn_t)
++ndr_size_union: size_t (const void *, int, uint32_t, ndr_push_flags_fn_t)
++ndr_string_array_size: size_t (struct ndr_push *, const char *)
++ndr_string_length: uint32_t (const void *, uint32_t)
++ndr_syntax_id_equal: bool (const struct ndr_syntax_id *, const struct ndr_syntax_id *)
++ndr_syntax_id_null: uuid = {time_low = 0, time_mid = 0, time_hi_and_version = 0, clock_seq = "\000", node = "\000\000\000\000\000"}, if_version = 0
++ndr_token_peek: uint32_t (struct ndr_token_list **, const void *)
++ndr_token_retrieve: enum ndr_err_code (struct ndr_token_list **, const void *, uint32_t *)
++ndr_token_retrieve_cmp_fn: enum ndr_err_code (struct ndr_token_list **, const void *, uint32_t *, comparison_fn_t, bool)
++ndr_token_store: enum ndr_err_code (TALLOC_CTX *, struct ndr_token_list **, const void *, uint32_t)
++ndr_transfer_syntax_ndr: uuid = {time_low = 2324192516, time_mid = 7403, time_hi_and_version = 4553, clock_seq = "\237\350", node = "\b\000+\020H`"}, if_version = 2
++ndr_transfer_syntax_ndr64: uuid = {time_low = 1903232307, time_mid = 48826, time_hi_and_version = 18743, clock_seq = "\203\031", node = "\265\333\357\234\314\066"}, if_version = 1
+Index: samba-3.6.23/librpc/ndr/libndr.h
+===================================================================
+--- samba-3.6.23.orig/librpc/ndr/libndr.h
++++ samba-3.6.23/librpc/ndr/libndr.h
+@@ -124,6 +124,20 @@ struct ndr_print {
+ #define LIBNDR_FLAG_STR_UTF8 (1<<12)
+ #define LIBNDR_STRING_FLAGS (0x7FFC)
+
++/*
++ * don't debug NDR_ERR_BUFSIZE failures,
++ * as the available buffer might be incomplete.
++ *
++ * return NDR_ERR_INCOMPLETE_BUFFER instead.
++ */
++#define LIBNDR_FLAG_INCOMPLETE_BUFFER (1<<16)
++
++/*
++ * This lets ndr_pull_subcontext_end() return
++ * NDR_ERR_UNREAD_BYTES.
++ */
++#define LIBNDR_FLAG_SUBCONTEXT_NO_UNREAD_BYTES (1<<17)
++
+ /* set if relative pointers should *not* be marshalled in reverse order */
+ #define LIBNDR_FLAG_NO_RELATIVE_REVERSE (1<<18)
+
+@@ -163,6 +177,7 @@ struct ndr_print {
+
+ /* useful macro for debugging */
+ #define NDR_PRINT_DEBUG(type, p) ndr_print_debug((ndr_print_fn_t)ndr_print_ ##type, #p, p)
++#define NDR_PRINT_DEBUGC(dbgc_class, type, p) ndr_print_debugc(dbgc_class, (ndr_print_fn_t)ndr_print_ ##type, #p, p)
+ #define NDR_PRINT_UNION_DEBUG(type, level, p) ndr_print_union_debug((ndr_print_fn_t)ndr_print_ ##type, #p, level, p)
+ #define NDR_PRINT_FUNCTION_DEBUG(type, flags, p) ndr_print_function_debug((ndr_print_function_t)ndr_print_ ##type, #type, flags, p)
+ #define NDR_PRINT_BOTH_DEBUG(type, p) NDR_PRINT_FUNCTION_DEBUG(type, NDR_BOTH, p)
+@@ -199,7 +214,9 @@ enum ndr_err_code {
+ NDR_ERR_IPV6ADDRESS,
+ NDR_ERR_INVALID_POINTER,
+ NDR_ERR_UNREAD_BYTES,
+- NDR_ERR_NDR64
++ NDR_ERR_NDR64,
++ NDR_ERR_FLAGS,
++ NDR_ERR_INCOMPLETE_BUFFER
+ };
+
+ #define NDR_ERR_CODE_IS_SUCCESS(x) (x == NDR_ERR_SUCCESS)
+@@ -217,20 +234,52 @@ enum ndr_compression_alg {
+
+ /*
+ flags passed to control parse flow
++ These are deliberately in a different range to the NDR_IN/NDR_OUT
++ flags to catch mixups
+ */
+-#define NDR_SCALARS 1
+-#define NDR_BUFFERS 2
++#define NDR_SCALARS 0x100
++#define NDR_BUFFERS 0x200
+
+ /*
+- flags passed to ndr_print_*()
++ flags passed to ndr_print_*() and ndr pull/push for functions
++ These are deliberately in a different range to the NDR_SCALARS/NDR_BUFFERS
++ flags to catch mixups
+ */
+-#define NDR_IN 1
+-#define NDR_OUT 2
+-#define NDR_BOTH 3
+-#define NDR_SET_VALUES 4
++#define NDR_IN 0x10
++#define NDR_OUT 0x20
++#define NDR_BOTH 0x30
++#define NDR_SET_VALUES 0x40
++
++
++#define NDR_PULL_CHECK_FLAGS(ndr, ndr_flags) do { \
++ if ((ndr_flags) & ~(NDR_SCALARS|NDR_BUFFERS)) { \
++ return ndr_pull_error(ndr, NDR_ERR_FLAGS, "Invalid pull struct ndr_flags 0x%x", ndr_flags); \
++ } \
++} while (0)
++
++#define NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags) do { \
++ if ((ndr_flags) & ~(NDR_SCALARS|NDR_BUFFERS)) \
++ return ndr_push_error(ndr, NDR_ERR_FLAGS, "Invalid push struct ndr_flags 0x%x", ndr_flags); \
++} while (0)
++
++#define NDR_PULL_CHECK_FN_FLAGS(ndr, flags) do { \
++ if ((flags) & ~(NDR_BOTH|NDR_SET_VALUES)) { \
++ return ndr_pull_error(ndr, NDR_ERR_FLAGS, "Invalid fn pull flags 0x%x", flags); \
++ } \
++} while (0)
++
++#define NDR_PUSH_CHECK_FN_FLAGS(ndr, flags) do { \
++ if ((flags) & ~(NDR_BOTH|NDR_SET_VALUES)) \
++ return ndr_push_error(ndr, NDR_ERR_FLAGS, "Invalid fn push flags 0x%x", flags); \
++} while (0)
+
+ #define NDR_PULL_NEED_BYTES(ndr, n) do { \
+ if (unlikely((n) > ndr->data_size || ndr->offset + (n) > ndr->data_size)) { \
++ if (ndr->flags & LIBNDR_FLAG_INCOMPLETE_BUFFER) { \
++ uint32_t _available = ndr->data_size - ndr->offset; \
++ uint32_t _missing = n - _available; \
++ ndr->relative_highest_offset = _missing; \
++ } \
+ return ndr_pull_error(ndr, NDR_ERR_BUFSIZE, "Pull bytes %u (%s)", (unsigned)n, __location__); \
+ } \
+ } while(0)
+@@ -247,6 +296,10 @@ enum ndr_compression_alg {
+ ndr->offset = (ndr->offset + (n-1)) & ~(n-1); \
+ } \
+ if (unlikely(ndr->offset > ndr->data_size)) { \
++ if (ndr->flags & LIBNDR_FLAG_INCOMPLETE_BUFFER) { \
++ uint32_t _missing = ndr->offset - ndr->data_size; \
++ ndr->relative_highest_offset = _missing; \
++ } \
+ return ndr_pull_error(ndr, NDR_ERR_BUFSIZE, "Pull align %u", (unsigned)n); \
+ } \
+ } while(0)
+@@ -402,6 +455,8 @@ void ndr_print_dom_sid0(struct ndr_print
+ size_t ndr_size_dom_sid0(const struct dom_sid *sid, int flags);
+ void ndr_print_GUID(struct ndr_print *ndr, const char *name, const struct GUID *guid);
+ bool ndr_syntax_id_equal(const struct ndr_syntax_id *i1, const struct ndr_syntax_id *i2);
++char *ndr_syntax_id_to_string(TALLOC_CTX *mem_ctx, const struct ndr_syntax_id *id);
++bool ndr_syntax_id_from_string(const char *s, struct ndr_syntax_id *id);
+ enum ndr_err_code ndr_push_struct_blob(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, const void *p, ndr_push_flags_fn_t fn);
+ enum ndr_err_code ndr_push_union_blob(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, void *p, uint32_t level, ndr_push_flags_fn_t fn);
+ size_t ndr_size_struct(const void *p, int flags, ndr_push_flags_fn_t push);
+@@ -424,14 +479,18 @@ enum ndr_err_code ndr_pull_relative_ptr2
+ enum ndr_err_code ndr_pull_relative_ptr_short(struct ndr_pull *ndr, uint16_t *v);
+ size_t ndr_align_size(uint32_t offset, size_t n);
+ struct ndr_pull *ndr_pull_init_blob(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx);
++enum ndr_err_code ndr_pull_append(struct ndr_pull *ndr, DATA_BLOB *blob);
++enum ndr_err_code ndr_pull_pop(struct ndr_pull *ndr);
+ enum ndr_err_code ndr_pull_advance(struct ndr_pull *ndr, uint32_t size);
+ struct ndr_push *ndr_push_init_ctx(TALLOC_CTX *mem_ctx);
+ DATA_BLOB ndr_push_blob(struct ndr_push *ndr);
+ enum ndr_err_code ndr_push_expand(struct ndr_push *ndr, uint32_t extra_size);
+ void ndr_print_debug_helper(struct ndr_print *ndr, const char *format, ...) PRINTF_ATTRIBUTE(2,3);
++void ndr_print_debugc_helper(struct ndr_print *ndr, const char *format, ...) PRINTF_ATTRIBUTE(2,3);
+ void ndr_print_printf_helper(struct ndr_print *ndr, const char *format, ...) PRINTF_ATTRIBUTE(2,3);
+ void ndr_print_string_helper(struct ndr_print *ndr, const char *format, ...) PRINTF_ATTRIBUTE(2,3);
+ void ndr_print_debug(ndr_print_fn_t fn, const char *name, void *ptr);
++void ndr_print_debugc(int dbgc_class, ndr_print_fn_t fn, const char *name, void *ptr);
+ void ndr_print_union_debug(ndr_print_fn_t fn, const char *name, uint32_t level, void *ptr);
+ void ndr_print_function_debug(ndr_print_function_t fn, const char *name, int flags, void *ptr);
+ char *ndr_print_struct_string(TALLOC_CTX *mem_ctx, ndr_print_fn_t fn, const char *name, void *ptr);
+Index: samba-3.6.23/librpc/ndr/ndr.c
+===================================================================
+--- samba-3.6.23.orig/librpc/ndr/ndr.c
++++ samba-3.6.23/librpc/ndr/ndr.c
+@@ -77,6 +77,111 @@ _PUBLIC_ struct ndr_pull *ndr_pull_init_
+ return ndr;
+ }
+
++_PUBLIC_ enum ndr_err_code ndr_pull_append(struct ndr_pull *ndr, DATA_BLOB *blob)
++{
++ enum ndr_err_code ndr_err;
++ DATA_BLOB b;
++ uint32_t append = 0;
++ bool ok;
++
++ if (blob->length == 0) {
++ return NDR_ERR_SUCCESS;
++ }
++
++ ndr_err = ndr_token_retrieve(&ndr->array_size_list, ndr, &append);
++ if (ndr_err == NDR_ERR_TOKEN) {
++ append = 0;
++ ndr_err = NDR_ERR_SUCCESS;
++ }
++ NDR_CHECK(ndr_err);
++
++ if (ndr->data_size == 0) {
++ ndr->data = NULL;
++ append = UINT32_MAX;
++ }
++
++ if (append == UINT32_MAX) {
++ /*
++ * append == UINT32_MAX means that
++ * ndr->data is either NULL or a valid
++ * talloc child of ndr, which means
++ * we can use data_blob_append() without
++ * data_blob_talloc() of the existing callers data
++ */
++ b = data_blob_const(ndr->data, ndr->data_size);
++ } else {
++ b = data_blob_talloc(ndr, ndr->data, ndr->data_size);
++ if (b.data == NULL) {
++ return ndr_pull_error(ndr, NDR_ERR_ALLOC, "%s", __location__);
++ }
++ }
++
++ ok = data_blob_append(ndr, &b, blob->data, blob->length);
++ if (!ok) {
++ return ndr_pull_error(ndr, NDR_ERR_ALLOC, "%s", __location__);
++ }
++
++ ndr->data = b.data;
++ ndr->data_size = b.length;
++
++ return ndr_token_store(ndr, &ndr->array_size_list, ndr, UINT32_MAX);
++}
++
++_PUBLIC_ enum ndr_err_code ndr_pull_pop(struct ndr_pull *ndr)
++{
++ uint32_t skip = 0;
++ uint32_t append = 0;
++
++ if (ndr->relative_base_offset != 0) {
++ return ndr_pull_error(ndr, NDR_ERR_RELATIVE,
++ "%s", __location__);
++ }
++ if (ndr->relative_highest_offset != 0) {
++ return ndr_pull_error(ndr, NDR_ERR_RELATIVE,
++ "%s", __location__);
++ }
++ if (ndr->relative_list != NULL) {
++ return ndr_pull_error(ndr, NDR_ERR_RELATIVE,
++ "%s", __location__);
++ }
++ if (ndr->relative_base_list != NULL) {
++ return ndr_pull_error(ndr, NDR_ERR_RELATIVE,
++ "%s", __location__);
++ }
++
++ /*
++ * we need to keep up to 7 bytes
++ * in order to get the aligment right.
++ */
++ skip = ndr->offset & 0xFFFFFFF8;
++
++ if (skip == 0) {
++ return NDR_ERR_SUCCESS;
++ }
++
++ ndr->offset -= skip;
++ ndr->data_size -= skip;
++
++ append = ndr_token_peek(&ndr->array_size_list, ndr);
++ if (append != UINT32_MAX) {
++ /*
++ * here we assume, that ndr->data is not a
++ * talloc child of ndr.
++ */
++ ndr->data += skip;
++ return NDR_ERR_SUCCESS;
++ }
++
++ memmove(ndr->data, ndr->data + skip, ndr->data_size);
++
++ ndr->data = talloc_realloc(ndr, ndr->data, uint8_t, ndr->data_size);
++ if (ndr->data_size != 0 && ndr->data == NULL) {
++ return ndr_pull_error(ndr, NDR_ERR_ALLOC, "%s", __location__);
++ }
++
++ return NDR_ERR_SUCCESS;
++}
++
+ /*
+ advance by 'size' bytes
+ */
+@@ -167,6 +272,38 @@ _PUBLIC_ enum ndr_err_code ndr_push_expa
+ return NDR_ERR_SUCCESS;
+ }
+
++_PUBLIC_ void ndr_print_debugc_helper(struct ndr_print *ndr, const char *format, ...)
++{
++ va_list ap;
++ char *s = NULL;
++ uint32_t i;
++ int ret;
++ int dbgc_class;
++
++ va_start(ap, format);
++ ret = vasprintf(&s, format, ap);
++ va_end(ap);
++
++ if (ret == -1) {
++ return;
++ }
++
++ dbgc_class = *(int *)ndr->private_data;
++
++ if (ndr->no_newline) {
++ DEBUGADDC(dbgc_class, 1,("%s", s));
++ free(s);
++ return;
++ }
++
++ for (i=0;i<ndr->depth;i++) {
++ DEBUGADDC(dbgc_class, 1,(" "));
++ }
++
++ DEBUGADDC(dbgc_class, 1,("%s\n", s));
++ free(s);
++}
++
+ _PUBLIC_ void ndr_print_debug_helper(struct ndr_print *ndr, const char *format, ...)
+ {
+ va_list ap;
+@@ -238,6 +375,25 @@ _PUBLIC_ void ndr_print_string_helper(st
+ }
+
+ /*
++ a useful helper function for printing idl structures via DEBUGC()
++*/
++_PUBLIC_ void ndr_print_debugc(int dbgc_class, ndr_print_fn_t fn, const char *name, void *ptr)
++{
++ struct ndr_print *ndr;
++
++ DEBUGC(dbgc_class, 1,(" "));
++
++ ndr = talloc_zero(NULL, struct ndr_print);
++ if (!ndr) return;
++ ndr->private_data = &dbgc_class;
++ ndr->print = ndr_print_debugc_helper;
++ ndr->depth = 1;
++ ndr->flags = 0;
++ fn(ndr, name, ptr);
++ talloc_free(ndr);
++}
++
++/*
+ a useful helper function for printing idl structures via DEBUG()
+ */
+ _PUBLIC_ void ndr_print_debug(ndr_print_fn_t fn, const char *name, void *ptr)
+@@ -403,6 +559,15 @@ _PUBLIC_ enum ndr_err_code ndr_pull_erro
+ va_list ap;
+ int ret;
+
++ if (ndr->flags & LIBNDR_FLAG_INCOMPLETE_BUFFER) {
++ switch (ndr_err) {
++ case NDR_ERR_BUFSIZE:
++ return NDR_ERR_INCOMPLETE_BUFFER;
++ default:
++ break;
++ }
++ }
++
+ va_start(ap, format);
+ ret = vasprintf(&s, format, ap);
+ va_end(ap);
+@@ -557,6 +722,23 @@ _PUBLIC_ enum ndr_err_code ndr_pull_subc
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &reserved));
+ break;
+ }
++ case 0xFFFFFFFF:
++ /*
++ * a shallow copy like subcontext
++ * useful for DCERPC pipe chunks.
++ */
++ subndr = talloc_zero(ndr, struct ndr_pull);
++ NDR_ERR_HAVE_NO_MEMORY(subndr);
++
++ subndr->flags = ndr->flags;
++ subndr->current_mem_ctx = ndr->current_mem_ctx;
++ subndr->data = ndr->data;
++ subndr->offset = ndr->offset;
++ subndr->data_size = ndr->data_size;
++
++ *_subndr = subndr;
++ return NDR_ERR_SUCCESS;
++
+ default:
+ return ndr_pull_error(ndr, NDR_ERR_SUBCONTEXT, "Bad subcontext (PULL) header_size %d",
+ (int)header_size);
+@@ -589,13 +771,35 @@ _PUBLIC_ enum ndr_err_code ndr_pull_subc
+ ssize_t size_is)
+ {
+ uint32_t advance;
+- if (size_is >= 0) {
++ uint32_t highest_ofs;
++
++ if (header_size == 0xFFFFFFFF) {
++ advance = subndr->offset - ndr->offset;
++ } else if (size_is >= 0) {
+ advance = size_is;
+ } else if (header_size > 0) {
+ advance = subndr->data_size;
+ } else {
+ advance = subndr->offset;
+ }
++
++ if (subndr->offset > ndr->relative_highest_offset) {
++ highest_ofs = subndr->offset;
++ } else {
++ highest_ofs = subndr->relative_highest_offset;
++ }
++ if (!(subndr->flags & LIBNDR_FLAG_SUBCONTEXT_NO_UNREAD_BYTES)) {
++ /*
++ * avoid an error unless SUBCONTEXT_NO_UNREAD_BYTES is specified
++ */
++ highest_ofs = advance;
++ }
++ if (highest_ofs < advance) {
++ return ndr_pull_error(subndr, NDR_ERR_UNREAD_BYTES,
++ "not all bytes consumed ofs[%u] advance[%u]",
++ highest_ofs, advance);
++ }
++
+ NDR_CHECK(ndr_pull_advance(ndr, advance));
+ return NDR_ERR_SUCCESS;
+ }
+@@ -1440,6 +1644,7 @@ const static struct {
+ { NDR_ERR_INVALID_POINTER, "Invalid Pointer" },
+ { NDR_ERR_UNREAD_BYTES, "Unread Bytes" },
+ { NDR_ERR_NDR64, "NDR64 assertion error" },
++ { NDR_ERR_INCOMPLETE_BUFFER, "Incomplete Buffer" },
+ { 0, NULL }
+ };
+
+Index: samba-3.6.23/librpc/idl/idl_types.h
+===================================================================
+--- samba-3.6.23.orig/librpc/idl/idl_types.h
++++ samba-3.6.23/librpc/idl/idl_types.h
+@@ -47,3 +47,5 @@
+
+ #define NDR_RELATIVE_REVERSE LIBNDR_FLAG_RELATIVE_REVERSE
+ #define NDR_NO_RELATIVE_REVERSE LIBNDR_FLAG_NO_RELATIVE_REVERSE
++
++#define NDR_SUBCONTEXT_NO_UNREAD_BYTES LIBNDR_FLAG_SUBCONTEXT_NO_UNREAD_BYTES
+Index: samba-3.6.23/librpc/idl/dcerpc.idl
+===================================================================
+--- samba-3.6.23.orig/librpc/idl/dcerpc.idl
++++ samba-3.6.23/librpc/idl/dcerpc.idl
+@@ -10,6 +10,8 @@
+ */
+ import "misc.idl";
+
++cpp_quote("extern const uint8_t DCERPC_SEC_VT_MAGIC[8];")
++
+ interface dcerpc
+ {
+ typedef struct {
+@@ -453,14 +455,21 @@ interface dcerpc
+ } dcerpc_payload;
+
+ /* pfc_flags values */
+- const uint8 DCERPC_PFC_FLAG_FIRST = 0x01; /* First fragment */
+- const uint8 DCERPC_PFC_FLAG_LAST = 0x02; /* Last fragment */
+- const uint8 DCERPC_PFC_FLAG_PENDING_CANCEL = 0x04; /* Cancel was pending at sender */
+- const uint8 DCERPC_PFC_FLAG_SUPPORT_HEADER_SIGN = DCERPC_PFC_FLAG_PENDING_CANCEL; /* depends on the pdu type */
+- const uint8 DCERPC_PFC_FLAG_CONC_MPX = 0x10; /* supports concurrent multiplexing of a single connection. */
+- const uint8 DCERPC_PFC_FLAG_DID_NOT_EXECUTE = 0x20; /* on a fault it means the server hasn't done anything */
+- const uint8 DCERPC_PFC_FLAG_MAYBE = 0x40; /* `maybe' call semantics requested */
+- const uint8 DCERPC_PFC_FLAG_OBJECT_UUID = 0x80; /* on valid guid is in the optional object field */
++ typedef [bitmap8bit] bitmap {
++ DCERPC_PFC_FLAG_FIRST = 0x01, /* First fragment */
++ DCERPC_PFC_FLAG_LAST = 0x02, /* Last fragment */
++ DCERPC_PFC_FLAG_PENDING_CANCEL_OR_HDR_SIGNING = 0x04, /* depends on the pdu type */
++ DCERPC_PFC_FLAG_CONC_MPX = 0x10, /* supports concurrent multiplexing of a single connection. */
++ DCERPC_PFC_FLAG_DID_NOT_EXECUTE = 0x20, /* on a fault it means the server hasn't done anything */
++ DCERPC_PFC_FLAG_MAYBE = 0x40, /* `maybe' call semantics requested */
++ DCERPC_PFC_FLAG_OBJECT_UUID = 0x80 /* on valid guid is in the optional object field */
++ } dcerpc_pfc_flags;
++
++ /* Cancel was pending at sender */
++ const int DCERPC_PFC_FLAG_PENDING_CANCEL =
++ DCERPC_PFC_FLAG_PENDING_CANCEL_OR_HDR_SIGNING;
++ const ist DCERPC_PFC_FLAG_SUPPORT_HEADER_SIGN =
++ DCERPC_PFC_FLAG_PENDING_CANCEL_OR_HDR_SIGNING;
+
+ /* these offsets are needed by the signing code */
+ const uint8 DCERPC_PFC_OFFSET = 3;
+@@ -468,6 +477,7 @@ interface dcerpc
+ const uint8 DCERPC_FRAG_LEN_OFFSET = 8;
+ const uint8 DCERPC_AUTH_LEN_OFFSET = 10;
+ const uint8 DCERPC_CALL_ID_OFFSET = 12;
++ const uint8 DCERPC_NCACN_PAYLOAD_OFFSET = 16;
+
+ /* little-endian flag */
+ const uint8 DCERPC_DREP_LE = 0x10;
+@@ -476,7 +486,7 @@ interface dcerpc
+ uint8 rpc_vers; /* RPC version */
+ uint8 rpc_vers_minor; /* Minor version */
+ dcerpc_pkt_type ptype; /* Packet type */
+- uint8 pfc_flags; /* Fragmentation flags */
++ dcerpc_pfc_flags pfc_flags; /* Fragmentation flags */
+ uint8 drep[4]; /* NDR data representation */
+ uint16 frag_length; /* Total length of fragment */
+ uint16 auth_length; /* authenticator length */
+@@ -506,4 +516,69 @@ interface dcerpc
+ uint8 serial_low;
+ [switch_is(ptype)] dcerpc_payload u;
+ } ncadg_packet;
++
++ typedef [bitmap16bit] bitmap {
++ DCERPC_SEC_VT_COMMAND_ENUM = 0x3FFF,
++ DCERPC_SEC_VT_COMMAND_END = 0x4000,
++ DCERPC_SEC_VT_MUST_PROCESS = 0x8000
++ } dcerpc_sec_vt_command;
++
++ typedef [enum16bit] enum {
++ DCERPC_SEC_VT_COMMAND_BITMASK1 = 0x0001,
++ DCERPC_SEC_VT_COMMAND_PCONTEXT = 0x0002,
++ DCERPC_SEC_VT_COMMAND_HEADER2 = 0x0003
++ } dcerpc_sec_vt_command_enum;
++
++ typedef [bitmap32bit] bitmap {
++ DCERPC_SEC_VT_CLIENT_SUPPORTS_HEADER_SIGNING = 0x00000001
++ } dcerpc_sec_vt_bitmask1;
++
++ typedef struct {
++ ndr_syntax_id abstract_syntax;
++ ndr_syntax_id transfer_syntax;
++ } dcerpc_sec_vt_pcontext;
++
++ typedef struct {
++ dcerpc_pkt_type ptype; /* Packet type */
++ [value(0)] uint8 reserved1;
++ [value(0)] uint16 reserved2;
++ uint8 drep[4]; /* NDR data representation */
++ uint32 call_id; /* Call identifier */
++ uint16 context_id;
++ uint16 opnum;
++ } dcerpc_sec_vt_header2;
++
++ typedef [switch_type(dcerpc_sec_vt_command_enum),nodiscriminant] union {
++ [case(DCERPC_SEC_VT_COMMAND_BITMASK1)] dcerpc_sec_vt_bitmask1 bitmask1;
++ [case(DCERPC_SEC_VT_COMMAND_PCONTEXT)] dcerpc_sec_vt_pcontext pcontext;
++ [case(DCERPC_SEC_VT_COMMAND_HEADER2)] dcerpc_sec_vt_header2 header2;
++ [default,flag(NDR_REMAINING)] DATA_BLOB _unknown;
++ } dcerpc_sec_vt_union;
++
++ typedef struct {
++ dcerpc_sec_vt_command command;
++ [switch_is(command & DCERPC_SEC_VT_COMMAND_ENUM)]
++ [subcontext(2),flag(NDR_SUBCONTEXT_NO_UNREAD_BYTES)]
++ dcerpc_sec_vt_union u;
++ } dcerpc_sec_vt;
++
++ typedef [public,nopush,nopull] struct {
++ uint16 count;
++ } dcerpc_sec_vt_count;
++
++ /*
++ * We assume that the whole verification trailer fits into
++ * the last 1024 bytes after the stub data.
++ *
++ * There're currently only 3 commands defined and each should
++ * only be used once.
++ */
++ const uint16 DCERPC_SEC_VT_MAX_SIZE = 1024;
++
++ typedef [public,flag(NDR_PAHEX)] struct {
++ [flag(NDR_ALIGN4)] DATA_BLOB _pad;
++ [value(DCERPC_SEC_VT_MAGIC)] uint8 magic[8];
++ dcerpc_sec_vt_count count;
++ dcerpc_sec_vt commands[count.count];
++ } dcerpc_sec_verification_trailer;
+ }
+Index: samba-3.6.23/librpc/ndr/ndr_dcerpc.c
+===================================================================
+--- /dev/null
++++ samba-3.6.23/librpc/ndr/ndr_dcerpc.c
+@@ -0,0 +1,187 @@
++/*
++ Unix SMB/CIFS implementation.
++
++ Manually parsed structures found in the DCERPC protocol
++
++ Copyright (C) Stefan Metzmacher 2014
++ Copyright (C) Gregor Beck 2014
++
++ 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/>.
++*/
++
++#include "includes.h"
++#include "librpc/gen_ndr/ndr_dcerpc.h"
++
++#include "librpc/gen_ndr/ndr_misc.h"
++#include "lib/util/bitmap.h"
++
++const uint8_t DCERPC_SEC_VT_MAGIC[] = {0x8a,0xe3,0x13,0x71,0x02,0xf4,0x36,0x71};
++
++_PUBLIC_ enum ndr_err_code ndr_push_dcerpc_sec_vt_count(struct ndr_push *ndr, int ndr_flags, const struct dcerpc_sec_vt_count *r)
++{
++ NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
++ /* nothing */
++ return NDR_ERR_SUCCESS;
++}
++
++_PUBLIC_ enum ndr_err_code ndr_pull_dcerpc_sec_vt_count(struct ndr_pull *ndr, int ndr_flags, struct dcerpc_sec_vt_count *r)
++{
++ uint32_t _saved_ofs = ndr->offset;
++
++ NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
++
++ if (!(ndr_flags & NDR_SCALARS)) {
++ return NDR_ERR_SUCCESS;
++ }
++
++ r->count = 0;
++
++ while (true) {
++ uint16_t command;
++ uint16_t length;
++
++ NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &command));
++ NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &length));
++ NDR_CHECK(ndr_pull_advance(ndr, length));
++
++ r->count += 1;
++
++ if (command & DCERPC_SEC_VT_COMMAND_END) {
++ break;
++ }
++ }
++
++ ndr->offset = _saved_ofs;
++ return NDR_ERR_SUCCESS;
++}
++
++_PUBLIC_ enum ndr_err_code ndr_pop_dcerpc_sec_verification_trailer(
++ struct ndr_pull *ndr, TALLOC_CTX *mem_ctx,
++ struct dcerpc_sec_verification_trailer **_r)
++{
++ enum ndr_err_code ndr_err;
++ uint32_t ofs;
++ uint32_t min_ofs = 0;
++ struct dcerpc_sec_verification_trailer *r;
++ DATA_BLOB sub_blob = data_blob_null;
++ struct ndr_pull *sub_ndr = NULL;
++ uint32_t remaining;
++
++ *_r = NULL;
++
++ r = talloc_zero(mem_ctx, struct dcerpc_sec_verification_trailer);
++ if (r == NULL) {
++ return NDR_ERR_ALLOC;
++ }
++
++ if (ndr->data_size < sizeof(DCERPC_SEC_VT_MAGIC)) {
++ /*
++ * we return with r->count = 0
++ */
++ *_r = r;
++ return NDR_ERR_SUCCESS;
++ }
++
++ ofs = ndr->data_size - sizeof(DCERPC_SEC_VT_MAGIC);
++ /* the magic is 4 byte aligned */
++ ofs &= ~3;
++
++ if (ofs > DCERPC_SEC_VT_MAX_SIZE) {
++ /*
++ * We just scan the last 1024 bytes.
++ */
++ min_ofs = ofs - DCERPC_SEC_VT_MAX_SIZE;
++ } else {
++ min_ofs = 0;
++ }
++
++ while (true) {
++ int ret;
++
++ ret = memcmp(&ndr->data[ofs],
++ DCERPC_SEC_VT_MAGIC,
++ sizeof(DCERPC_SEC_VT_MAGIC));
++ if (ret == 0) {
++ sub_blob = data_blob_const(&ndr->data[ofs],
++ ndr->data_size - ofs);
++ break;
++ }
++
++ if (ofs <= min_ofs) {
++ break;
++ }
++
++ ofs -= 4;
++ }
++
++ if (sub_blob.length == 0) {
++ /*
++ * we return with r->count = 0
++ */
++ *_r = r;
++ return NDR_ERR_SUCCESS;
++ }
++
++ sub_ndr = ndr_pull_init_blob(&sub_blob, r);
++ if (sub_ndr == NULL) {
++ TALLOC_FREE(r);
++ return NDR_ERR_ALLOC;
++ }
++
++ ndr_err = ndr_pull_dcerpc_sec_verification_trailer(sub_ndr,
++ NDR_SCALARS | NDR_BUFFERS,
++ r);
++ if (ndr_err == NDR_ERR_ALLOC) {
++ TALLOC_FREE(r);
++ return NDR_ERR_ALLOC;
++ }
++
++ if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
++ goto ignore_error;
++ }
++
++ remaining = sub_ndr->data_size - sub_ndr->offset;
++ if (remaining > 16) {
++ /*
++ * we expect not more than 16 byte of additional
++ * padding after the verification trailer.
++ */
++ goto ignore_error;
++ }
++
++ /*
++ * We assume that we got a real verification trailer.
++ *
++ * We remove it from the available stub data.
++ */
++ ndr->data_size = ofs;
++
++ TALLOC_FREE(sub_ndr);
++
++ *_r = r;
++ return NDR_ERR_SUCCESS;
++
++ignore_error:
++ TALLOC_FREE(sub_ndr);
++ /*
++ * just ignore the error, it's likely
++ * that the magic we found belongs to
++ * the stub data.
++ *
++ * we return with r->count = 0
++ */
++ ZERO_STRUCTP(r);
++ *_r = r;
++ return NDR_ERR_SUCCESS;
++}
+Index: samba-3.6.23/librpc/wscript_build
+===================================================================
+--- samba-3.6.23.orig/librpc/wscript_build
++++ samba-3.6.23/librpc/wscript_build
+@@ -274,8 +274,9 @@ bld.SAMBA_SUBSYSTEM('NDR_COMPRESSION',
+ )
+
+ bld.SAMBA_SUBSYSTEM('NDR_DCERPC',
+- source='gen_ndr/ndr_dcerpc.c',
++ source='gen_ndr/ndr_dcerpc.c ndr/ndr_dcerpc.c',
+ public_deps='ndr',
++ deps='bitmap',
+ public_headers='gen_ndr/ndr_dcerpc.h gen_ndr/dcerpc.h',
+ header_path= [ ('*gen_ndr*', 'gen_ndr') ],
+ )
+Index: samba-3.6.23/source3/Makefile.in
+===================================================================
+--- samba-3.6.23.orig/source3/Makefile.in
++++ samba-3.6.23/source3/Makefile.in
+@@ -323,7 +323,8 @@ LIBNDR_OBJ = ../librpc/ndr/ndr_basic.o \
+ ../librpc/ndr/uuid.o \
+ librpc/ndr/util.o \
+ librpc/gen_ndr/ndr_server_id.o \
+- librpc/gen_ndr/ndr_dcerpc.o
++ librpc/gen_ndr/ndr_dcerpc.o \
++ ../librpc/ndr/ndr_dcerpc.o
+
+ LIBNDR_GEN_OBJ0 = librpc/gen_ndr/ndr_samr.o \
+ librpc/gen_ndr/ndr_lsa.o
+@@ -454,7 +455,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ
+ lib/username.o \
+ ../libds/common/flag_mapping.o \
+ lib/access.o lib/smbrun.o \
+- lib/bitmap.o lib/dprintf.o $(UTIL_REG_OBJ) \
++ ../lib/util/bitmap.o lib/dprintf.o $(UTIL_REG_OBJ) \
+ lib/wins_srv.o \
+ lib/util_str.o lib/clobber.o lib/util_sid.o \
+ lib/util_unistr.o ../lib/util/charset/codepoints.o lib/util_file.o \
+@@ -988,7 +989,9 @@ SWAT_OBJ = $(SWAT_OBJ1) $(PARAM_OBJ) $(P
+ $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \
+ $(PASSCHANGE_OBJ) $(FNAME_UTIL_OBJ) \
+ $(LIBCLI_SAMR_OBJ) \
+- rpc_client/init_lsa.o
++ $(LIBCLI_NETLOGON_OBJ) \
++ rpc_client/init_lsa.o \
++ rpc_client/init_netlogon.o
+
+ STATUS_OBJ = utils/status.o utils/status_profile.o \
+ $(LOCKING_OBJ) $(PARAM_OBJ) \
+@@ -1004,7 +1007,9 @@ SMBTREE_OBJ = utils/smbtree.o $(PARAM_OB
+ $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
+ $(LIBMSRPC_GEN_OBJ) \
+ $(LIBMSRPC_OBJ) \
+- $(LIBCLI_SRVSVC_OBJ)
++ $(LIBCLI_SRVSVC_OBJ) \
++ $(LIBCLI_NETLOGON_OBJ) \
++ rpc_client/init_netlogon.o
+
+ TESTPARM_OBJ = utils/testparm.o \
+ $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \
+@@ -1026,7 +1031,9 @@ SMBPASSWD_OBJ = utils/smbpasswd.o $(PASS
+ $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) \
+ $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \
+ $(LIBCLI_SAMR_OBJ) \
+- rpc_client/init_lsa.o
++ $(LIBCLI_NETLOGON_OBJ) \
++ rpc_client/init_lsa.o \
++ rpc_client/init_netlogon.o
+
+ PDBEDIT_OBJ = utils/pdbedit.o $(PASSWD_UTIL_OBJ) $(PARAM_OBJ) $(PASSDB_OBJ) \
+ $(LIBSAMBA_OBJ) $(LIBTSOCKET_OBJ) \
+@@ -1099,7 +1106,9 @@ LIBSMBCLIENT_OBJ1 = $(LIBSMBCLIENT_OBJ0)
+ $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
+ $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
+ $(LIBCLI_SRVSVC_OBJ) \
+- $(LIBCLI_LSA_OBJ)
++ $(LIBCLI_LSA_OBJ) \
++ $(LIBCLI_NETLOGON_OBJ) \
++ rpc_client/init_netlogon.o
+
+ LIBSMBCLIENT_OBJ = $(LIBSMBCLIENT_OBJ1)
+
+@@ -1122,7 +1131,9 @@ CLIENT_OBJ = $(CLIENT_OBJ1) $(PARAM_OBJ)
+ $(READLINE_OBJ) $(POPT_LIB_OBJ) \
+ $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
+ $(DISPLAY_SEC_OBJ) \
+- $(LIBCLI_SRVSVC_OBJ)
++ $(LIBCLI_SRVSVC_OBJ) \
++ $(LIBCLI_NETLOGON_OBJ) \
++ rpc_client/init_netlogon.o
+
+ LIBSMBCONF_OBJ = ../lib/smbconf/smbconf.o \
+ ../lib/smbconf/smbconf_util.o \
+@@ -1234,7 +1245,9 @@ SMBTORTURE_OBJ = $(SMBTORTURE_OBJ1) $(PA
+ @LIBWBCLIENT_STATIC@ \
+ torture/wbc_async.o \
+ ../nsswitch/wb_reqtrans.o \
+- $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBCLI_ECHO_OBJ)
++ $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBCLI_ECHO_OBJ) \
++ $(LIBCLI_NETLOGON_OBJ) rpc_client/init_netlogon.o
++
+
+ MASKTEST_OBJ = torture/masktest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
+ $(LIB_NONSMBD_OBJ) \
+@@ -1269,14 +1282,18 @@ SMBCACLS_OBJ = utils/smbcacls.o $(PARAM_
+ $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) \
+ $(PASSDB_OBJ) $(GROUPDB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
+ $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) \
+- $(LIBCLI_LSA_OBJ)
++ $(LIBCLI_LSA_OBJ) \
++ $(LIBCLI_NETLOGON_OBJ) \
++ rpc_client/init_netlogon.o
+
+ SMBCQUOTAS_OBJ = utils/smbcquotas.o $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
+ $(PARAM_OBJ) \
+ $(LIB_NONSMBD_OBJ) \
+ $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(POPT_LIB_OBJ) \
+ $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
+- $(LIBCLI_LSA_OBJ)
++ $(LIBCLI_LSA_OBJ) \
++ $(LIBCLI_NETLOGON_OBJ) \
++ rpc_client/init_netlogon.o
+
+ EVTLOGADM_OBJ0 = utils/eventlogadm.o
+
+Index: samba-3.6.23/librpc/ndr/ndr_basic.c
+===================================================================
+--- samba-3.6.23.orig/librpc/ndr/ndr_basic.c
++++ samba-3.6.23/librpc/ndr/ndr_basic.c
+@@ -61,6 +61,7 @@ _PUBLIC_ void ndr_check_padding(struct n
+ */
+ _PUBLIC_ enum ndr_err_code ndr_pull_int8(struct ndr_pull *ndr, int ndr_flags, int8_t *v)
+ {
++ NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
+ NDR_PULL_NEED_BYTES(ndr, 1);
+ *v = (int8_t)CVAL(ndr->data, ndr->offset);
+ ndr->offset += 1;
+@@ -72,6 +73,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_int8
+ */
+ _PUBLIC_ enum ndr_err_code ndr_pull_uint8(struct ndr_pull *ndr, int ndr_flags, uint8_t *v)
+ {
++ NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
+ NDR_PULL_NEED_BYTES(ndr, 1);
+ *v = CVAL(ndr->data, ndr->offset);
+ ndr->offset += 1;
+@@ -83,6 +85,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_uint
+ */
+ _PUBLIC_ enum ndr_err_code ndr_pull_int16(struct ndr_pull *ndr, int ndr_flags, int16_t *v)
+ {
++ NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
+ NDR_PULL_ALIGN(ndr, 2);
+ NDR_PULL_NEED_BYTES(ndr, 2);
+ *v = (uint16_t)NDR_SVAL(ndr, ndr->offset);
+@@ -95,6 +98,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_int1
+ */
+ _PUBLIC_ enum ndr_err_code ndr_pull_uint16(struct ndr_pull *ndr, int ndr_flags, uint16_t *v)
+ {
++ NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
+ NDR_PULL_ALIGN(ndr, 2);
+ NDR_PULL_NEED_BYTES(ndr, 2);
+ *v = NDR_SVAL(ndr, ndr->offset);
+@@ -107,6 +111,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_uint
+ */
+ _PUBLIC_ enum ndr_err_code ndr_pull_uint1632(struct ndr_pull *ndr, int ndr_flags, uint16_t *v)
+ {
++ NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
+ if (unlikely(ndr->flags & LIBNDR_FLAG_NDR64)) {
+ uint32_t v32 = 0;
+ enum ndr_err_code err = ndr_pull_uint32(ndr, ndr_flags, &v32);
+@@ -125,6 +130,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_uint
+ */
+ _PUBLIC_ enum ndr_err_code ndr_pull_int32(struct ndr_pull *ndr, int ndr_flags, int32_t *v)
+ {
++ NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
+ NDR_PULL_ALIGN(ndr, 4);
+ NDR_PULL_NEED_BYTES(ndr, 4);
+ *v = NDR_IVALS(ndr, ndr->offset);
+@@ -137,6 +143,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_int3
+ */
+ _PUBLIC_ enum ndr_err_code ndr_pull_uint32(struct ndr_pull *ndr, int ndr_flags, uint32_t *v)
+ {
++ NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
+ NDR_PULL_ALIGN(ndr, 4);
+ NDR_PULL_NEED_BYTES(ndr, 4);
+ *v = NDR_IVAL(ndr, ndr->offset);
+@@ -151,6 +158,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_uint
+ {
+ uint64_t v64;
+ enum ndr_err_code err;
++ NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
+ if (likely(!(ndr->flags & LIBNDR_FLAG_NDR64))) {
+ return ndr_pull_uint32(ndr, ndr_flags, v);
+ }
+@@ -169,6 +177,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_uint
+ */
+ _PUBLIC_ enum ndr_err_code ndr_pull_double(struct ndr_pull *ndr, int ndr_flags, double *v)
+ {
++ NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
+ NDR_PULL_ALIGN(ndr, 8);
+ NDR_PULL_NEED_BYTES(ndr, 8);
+ memcpy(v, ndr->data+ndr->offset, 8);
+@@ -217,6 +226,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_ref_
+ */
+ _PUBLIC_ enum ndr_err_code ndr_pull_udlong(struct ndr_pull *ndr, int ndr_flags, uint64_t *v)
+ {
++ NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
+ NDR_PULL_ALIGN(ndr, 4);
+ NDR_PULL_NEED_BYTES(ndr, 8);
+ *v = NDR_IVAL(ndr, ndr->offset);
+@@ -230,6 +240,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_udlo
+ */
+ _PUBLIC_ enum ndr_err_code ndr_pull_udlongr(struct ndr_pull *ndr, int ndr_flags, uint64_t *v)
+ {
++ NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
+ NDR_PULL_ALIGN(ndr, 4);
+ NDR_PULL_NEED_BYTES(ndr, 8);
+ *v = ((uint64_t)NDR_IVAL(ndr, ndr->offset)) << 32;
+@@ -264,6 +275,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_hype
+ _PUBLIC_ enum ndr_err_code ndr_pull_pointer(struct ndr_pull *ndr, int ndr_flags, void* *v)
+ {
+ uintptr_t h;
++ NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
+ NDR_PULL_ALIGN(ndr, sizeof(h));
+ NDR_PULL_NEED_BYTES(ndr, sizeof(h));
+ memcpy(&h, ndr->data+ndr->offset, sizeof(h));
+@@ -278,6 +290,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_poin
+ _PUBLIC_ enum ndr_err_code ndr_pull_NTSTATUS(struct ndr_pull *ndr, int ndr_flags, NTSTATUS *status)
+ {
+ uint32_t v;
++ NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
+ *status = NT_STATUS(v);
+ return NDR_ERR_SUCCESS;
+@@ -302,6 +315,7 @@ _PUBLIC_ void ndr_print_NTSTATUS(struct
+ _PUBLIC_ enum ndr_err_code ndr_pull_WERROR(struct ndr_pull *ndr, int ndr_flags, WERROR *status)
+ {
+ uint32_t v;
++ NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
+ *status = W_ERROR(v);
+ return NDR_ERR_SUCCESS;
+@@ -414,6 +428,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_byte
+ */
+ _PUBLIC_ enum ndr_err_code ndr_pull_array_uint8(struct ndr_pull *ndr, int ndr_flags, uint8_t *data, uint32_t n)
+ {
++ NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
+ if (!(ndr_flags & NDR_SCALARS)) {
+ return NDR_ERR_SUCCESS;
+ }
+@@ -425,6 +440,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_arra
+ */
+ _PUBLIC_ enum ndr_err_code ndr_push_int8(struct ndr_push *ndr, int ndr_flags, int8_t v)
+ {
++ NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
+ NDR_PUSH_NEED_BYTES(ndr, 1);
+ SCVAL(ndr->data, ndr->offset, (uint8_t)v);
+ ndr->offset += 1;
+@@ -436,6 +452,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_int8
+ */
+ _PUBLIC_ enum ndr_err_code ndr_push_uint8(struct ndr_push *ndr, int ndr_flags, uint8_t v)
+ {
++ NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
+ NDR_PUSH_NEED_BYTES(ndr, 1);
+ SCVAL(ndr->data, ndr->offset, v);
+ ndr->offset += 1;
+@@ -447,6 +464,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_uint
+ */
+ _PUBLIC_ enum ndr_err_code ndr_push_int16(struct ndr_push *ndr, int ndr_flags, int16_t v)
+ {
++ NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
+ NDR_PUSH_ALIGN(ndr, 2);
+ NDR_PUSH_NEED_BYTES(ndr, 2);
+ NDR_SSVAL(ndr, ndr->offset, (uint16_t)v);
+@@ -459,6 +477,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_int1
+ */
+ _PUBLIC_ enum ndr_err_code ndr_push_uint16(struct ndr_push *ndr, int ndr_flags, uint16_t v)
+ {
++ NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
+ NDR_PUSH_ALIGN(ndr, 2);
+ NDR_PUSH_NEED_BYTES(ndr, 2);
+ NDR_SSVAL(ndr, ndr->offset, v);
+@@ -482,6 +501,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_uint
+ */
+ _PUBLIC_ enum ndr_err_code ndr_push_int32(struct ndr_push *ndr, int ndr_flags, int32_t v)
+ {
++ NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
+ NDR_PUSH_ALIGN(ndr, 4);
+ NDR_PUSH_NEED_BYTES(ndr, 4);
+ NDR_SIVALS(ndr, ndr->offset, v);
+@@ -494,6 +514,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_int3
+ */
+ _PUBLIC_ enum ndr_err_code ndr_push_uint32(struct ndr_push *ndr, int ndr_flags, uint32_t v)
+ {
++ NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
+ NDR_PUSH_ALIGN(ndr, 4);
+ NDR_PUSH_NEED_BYTES(ndr, 4);
+ NDR_SIVAL(ndr, ndr->offset, v);
+@@ -517,6 +538,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_uint
+ */
+ _PUBLIC_ enum ndr_err_code ndr_push_udlong(struct ndr_push *ndr, int ndr_flags, uint64_t v)
+ {
++ NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
+ NDR_PUSH_ALIGN(ndr, 4);
+ NDR_PUSH_NEED_BYTES(ndr, 8);
+ NDR_SIVAL(ndr, ndr->offset, (v & 0xFFFFFFFF));
+@@ -530,6 +552,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_udlo
+ */
+ _PUBLIC_ enum ndr_err_code ndr_push_udlongr(struct ndr_push *ndr, int ndr_flags, uint64_t v)
+ {
++ NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
+ NDR_PUSH_ALIGN(ndr, 4);
+ NDR_PUSH_NEED_BYTES(ndr, 8);
+ NDR_SIVAL(ndr, ndr->offset, (v>>32));
+@@ -563,6 +586,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_hype
+ */
+ _PUBLIC_ enum ndr_err_code ndr_push_double(struct ndr_push *ndr, int ndr_flags, double v)
+ {
++ NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
+ NDR_PUSH_ALIGN(ndr, 8);
+ NDR_PUSH_NEED_BYTES(ndr, 8);
+ memcpy(ndr->data+ndr->offset, &v, 8);
+@@ -576,6 +600,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_doub
+ _PUBLIC_ enum ndr_err_code ndr_push_pointer(struct ndr_push *ndr, int ndr_flags, void* v)
+ {
+ uintptr_t h = (intptr_t)v;
++ NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
+ NDR_PUSH_ALIGN(ndr, sizeof(h));
+ NDR_PUSH_NEED_BYTES(ndr, sizeof(h));
+ memcpy(ndr->data+ndr->offset, &h, sizeof(h));
+@@ -686,6 +711,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_zero
+ */
+ _PUBLIC_ enum ndr_err_code ndr_push_array_uint8(struct ndr_push *ndr, int ndr_flags, const uint8_t *data, uint32_t n)
+ {
++ NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
+ if (!(ndr_flags & NDR_SCALARS)) {
+ return NDR_ERR_SUCCESS;
+ }
+@@ -738,6 +764,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_ref_
+ */
+ _PUBLIC_ enum ndr_err_code ndr_push_NTTIME(struct ndr_push *ndr, int ndr_flags, NTTIME t)
+ {
++ NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
+ NDR_CHECK(ndr_push_udlong(ndr, ndr_flags, t));
+ return NDR_ERR_SUCCESS;
+ }
+@@ -747,6 +774,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_NTTI
+ */
+ _PUBLIC_ enum ndr_err_code ndr_pull_NTTIME(struct ndr_pull *ndr, int ndr_flags, NTTIME *t)
+ {
++ NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
+ NDR_CHECK(ndr_pull_udlong(ndr, ndr_flags, t));
+ return NDR_ERR_SUCCESS;
+ }
+@@ -756,6 +784,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_NTTI
+ */
+ _PUBLIC_ enum ndr_err_code ndr_push_NTTIME_1sec(struct ndr_push *ndr, int ndr_flags, NTTIME t)
+ {
++ NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
+ t /= 10000000;
+ NDR_CHECK(ndr_push_hyper(ndr, ndr_flags, t));
+ return NDR_ERR_SUCCESS;
+@@ -766,6 +795,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_NTTI
+ */
+ _PUBLIC_ enum ndr_err_code ndr_pull_NTTIME_1sec(struct ndr_pull *ndr, int ndr_flags, NTTIME *t)
+ {
++ NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
+ NDR_CHECK(ndr_pull_hyper(ndr, ndr_flags, t));
+ (*t) *= 10000000;
+ return NDR_ERR_SUCCESS;
+@@ -776,6 +806,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_NTTI
+ */
+ _PUBLIC_ enum ndr_err_code ndr_pull_NTTIME_hyper(struct ndr_pull *ndr, int ndr_flags, NTTIME *t)
+ {
++ NDR_PULL_CHECK_FLAGS(ndr, ndr_flags);
+ NDR_CHECK(ndr_pull_hyper(ndr, ndr_flags, t));
+ return NDR_ERR_SUCCESS;
+ }
+@@ -785,6 +816,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_NTTI
+ */
+ _PUBLIC_ enum ndr_err_code ndr_push_NTTIME_hyper(struct ndr_push *ndr, int ndr_flags, NTTIME t)
+ {
++ NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
+ NDR_CHECK(ndr_push_hyper(ndr, ndr_flags, t));
+ return NDR_ERR_SUCCESS;
+ }
+@@ -814,6 +846,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_time
+ */
+ _PUBLIC_ enum ndr_err_code ndr_push_uid_t(struct ndr_push *ndr, int ndr_flags, uid_t u)
+ {
++ NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
+ return ndr_push_hyper(ndr, NDR_SCALARS, (uint64_t)u);
+ }
+
+@@ -839,6 +872,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_uid_
+ */
+ _PUBLIC_ enum ndr_err_code ndr_push_gid_t(struct ndr_push *ndr, int ndr_flags, gid_t g)
+ {
++ NDR_PUSH_CHECK_FLAGS(ndr, ndr_flags);
+ return ndr_push_hyper(ndr, NDR_SCALARS, (uint64_t)g);
+ }
+
+Index: samba-3.6.23/source3/lib/bitmap.c
+===================================================================
+--- samba-3.6.23.orig/source3/lib/bitmap.c
++++ /dev/null
+@@ -1,136 +0,0 @@
+-/*
+- Unix SMB/CIFS implementation.
+- simple bitmap functions
+- Copyright (C) Andrew Tridgell 1992-1998
+-
+- 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/>.
+-*/
+-
+-#include "includes.h"
+-
+-/* these functions provide a simple way to allocate integers from a
+- pool without repetition */
+-
+-/****************************************************************************
+-talloc a bitmap
+-****************************************************************************/
+-struct bitmap *bitmap_talloc(TALLOC_CTX *mem_ctx, int n)
+-{
+- struct bitmap *bm;
+-
+- bm = TALLOC_P(mem_ctx, struct bitmap);
+-
+- if (!bm) return NULL;
+-
+- bm->n = n;
+- bm->b = TALLOC_ZERO_ARRAY(bm, uint32, (n+31)/32);
+- if (!bm->b) {
+- TALLOC_FREE(bm);
+- return NULL;
+- }
+- return bm;
+-}
+-
+-/****************************************************************************
+-copy as much of the source bitmap as will fit in the destination bitmap.
+-****************************************************************************/
+-
+-int bitmap_copy(struct bitmap * const dst, const struct bitmap * const src)
+-{
+- int count = MIN(dst->n, src->n);
+-
+- SMB_ASSERT(dst->b != src->b);
+- memcpy(dst->b, src->b, sizeof(uint32)*((count+31)/32));
+-
+- return count;
+-}
+-
+-/****************************************************************************
+-set a bit in a bitmap
+-****************************************************************************/
+-bool bitmap_set(struct bitmap *bm, unsigned i)
+-{
+- if (i >= bm->n) {
+- DEBUG(0,("Setting invalid bitmap entry %d (of %d)\n",
+- i, bm->n));
+- return False;
+- }
+- bm->b[i/32] |= (1<<(i%32));
+- return True;
+-}
+-
+-/****************************************************************************
+-clear a bit in a bitmap
+-****************************************************************************/
+-bool bitmap_clear(struct bitmap *bm, unsigned i)
+-{
+- if (i >= bm->n) {
+- DEBUG(0,("clearing invalid bitmap entry %d (of %d)\n",
+- i, bm->n));
+- return False;
+- }
+- bm->b[i/32] &= ~(1<<(i%32));
+- return True;
+-}
+-
+-/****************************************************************************
+-query a bit in a bitmap
+-****************************************************************************/
+-bool bitmap_query(struct bitmap *bm, unsigned i)
+-{
+- if (i >= bm->n) return False;
+- if (bm->b[i/32] & (1<<(i%32))) {
+- return True;
+- }
+- return False;
+-}
+-
+-/****************************************************************************
+-find a zero bit in a bitmap starting at the specified offset, with
+-wraparound
+-****************************************************************************/
+-int bitmap_find(struct bitmap *bm, unsigned ofs)
+-{
+- unsigned int i, j;
+-
+- if (ofs > bm->n) ofs = 0;
+-
+- i = ofs;
+- while (i < bm->n) {
+- if (~(bm->b[i/32])) {
+- j = i;
+- do {
+- if (!bitmap_query(bm, j)) return j;
+- j++;
+- } while (j & 31 && j < bm->n);
+- }
+- i += 32;
+- i &= ~31;
+- }
+-
+- i = 0;
+- while (i < ofs) {
+- if (~(bm->b[i/32])) {
+- j = i;
+- do {
+- if (!bitmap_query(bm, j)) return j;
+- j++;
+- } while (j & 31 && j < bm->n);
+- }
+- i += 32;
+- i &= ~31;
+- }
+-
+- return -1;
+-}
+Index: samba-3.6.23/lib/util/bitmap.c
+===================================================================
+--- /dev/null
++++ samba-3.6.23/lib/util/bitmap.c
+@@ -0,0 +1,137 @@
++/*
++ Unix SMB/CIFS implementation.
++ simple bitmap functions
++ Copyright (C) Andrew Tridgell 1992-1998
++
++ 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/>.
++*/
++
++#include "includes.h"
++#include "lib/util/bitmap.h"
++
++/* these functions provide a simple way to allocate integers from a
++ pool without repetition */
++
++/****************************************************************************
++talloc a bitmap
++****************************************************************************/
++struct bitmap *bitmap_talloc(TALLOC_CTX *mem_ctx, int n)
++{
++ struct bitmap *bm;
++
++ bm = talloc_zero(mem_ctx, struct bitmap);
++
++ if (!bm) return NULL;
++
++ bm->n = n;
++ bm->b = talloc_zero_array(bm, uint32_t, (n+31)/32);
++ if (!bm->b) {
++ TALLOC_FREE(bm);
++ return NULL;
++ }
++ return bm;
++}
++
++/****************************************************************************
++copy as much of the source bitmap as will fit in the destination bitmap.
++****************************************************************************/
++
++int bitmap_copy(struct bitmap * const dst, const struct bitmap * const src)
++{
++ int count = MIN(dst->n, src->n);
++
++ SMB_ASSERT(dst->b != src->b);
++ memcpy(dst->b, src->b, sizeof(uint32_t)*((count+31)/32));
++
++ return count;
++}
++
++/****************************************************************************
++set a bit in a bitmap
++****************************************************************************/
++bool bitmap_set(struct bitmap *bm, unsigned i)
++{
++ if (i >= bm->n) {
++ DEBUG(0,("Setting invalid bitmap entry %d (of %d)\n",
++ i, bm->n));
++ return false;
++ }
++ bm->b[i/32] |= (1<<(i%32));
++ return true;
++}
++
++/****************************************************************************
++clear a bit in a bitmap
++****************************************************************************/
++bool bitmap_clear(struct bitmap *bm, unsigned i)
++{
++ if (i >= bm->n) {
++ DEBUG(0,("clearing invalid bitmap entry %d (of %d)\n",
++ i, bm->n));
++ return false;
++ }
++ bm->b[i/32] &= ~(1<<(i%32));
++ return true;
++}
++
++/****************************************************************************
++query a bit in a bitmap
++****************************************************************************/
++bool bitmap_query(struct bitmap *bm, unsigned i)
++{
++ if (i >= bm->n) return false;
++ if (bm->b[i/32] & (1<<(i%32))) {
++ return true;
++ }
++ return false;
++}
++
++/****************************************************************************
++find a zero bit in a bitmap starting at the specified offset, with
++wraparound
++****************************************************************************/
++int bitmap_find(struct bitmap *bm, unsigned ofs)
++{
++ unsigned int i, j;
++
++ if (ofs > bm->n) ofs = 0;
++
++ i = ofs;
++ while (i < bm->n) {
++ if (~(bm->b[i/32])) {
++ j = i;
++ do {
++ if (!bitmap_query(bm, j)) return j;
++ j++;
++ } while (j & 31 && j < bm->n);
++ }
++ i += 32;
++ i &= ~31;
++ }
++
++ i = 0;
++ while (i < ofs) {
++ if (~(bm->b[i/32])) {
++ j = i;
++ do {
++ if (!bitmap_query(bm, j)) return j;
++ j++;
++ } while (j & 31 && j < bm->n);
++ }
++ i += 32;
++ i &= ~31;
++ }
++
++ return -1;
++}
+Index: samba-3.6.23/lib/util/bitmap.h
+===================================================================
+--- /dev/null
++++ samba-3.6.23/lib/util/bitmap.h
+@@ -0,0 +1,32 @@
++/*
++ Unix SMB/CIFS implementation.
++ simple bitmap functions
++ Copyright (C) Andrew Tridgell 1992-1998
++
++ 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/>.
++*/
++
++/* The following definitions come from lib/bitmap.c */
++
++struct bitmap {
++ uint32_t *b;
++ unsigned int n;
++};
++
++struct bitmap *bitmap_talloc(TALLOC_CTX *mem_ctx, int n);
++int bitmap_copy(struct bitmap * const dst, const struct bitmap * const src);
++bool bitmap_set(struct bitmap *bm, unsigned i);
++bool bitmap_clear(struct bitmap *bm, unsigned i);
++bool bitmap_query(struct bitmap *bm, unsigned i);
++int bitmap_find(struct bitmap *bm, unsigned ofs);
+Index: samba-3.6.23/lib/util/wscript_build
+===================================================================
+--- samba-3.6.23.orig/lib/util/wscript_build
++++ samba-3.6.23/lib/util/wscript_build
+@@ -99,5 +99,11 @@ bld.SAMBA_LIBRARY('tdb-wrap',
+ public_headers='tdb_wrap.h',
+ private_library=True,
+ local_include=False
+- )
++ )
++
++bld.SAMBA_LIBRARY('bitmap',
++ source='bitmap.c',
++ deps='talloc samba-util',
++ local_include=False,
++ private_library=True)
+
+Index: samba-3.6.23/source3/include/proto.h
+===================================================================
+--- samba-3.6.23.orig/source3/include/proto.h
++++ samba-3.6.23/source3/include/proto.h
+@@ -61,15 +61,6 @@ const char *audit_description_str(uint32
+ bool get_audit_category_from_param(const char *param, uint32 *audit_category);
+ const char *audit_policy_str(TALLOC_CTX *mem_ctx, uint32 policy);
+
+-/* The following definitions come from lib/bitmap.c */
+-
+-struct bitmap *bitmap_talloc(TALLOC_CTX *mem_ctx, int n);
+-int bitmap_copy(struct bitmap * const dst, const struct bitmap * const src);
+-bool bitmap_set(struct bitmap *bm, unsigned i);
+-bool bitmap_clear(struct bitmap *bm, unsigned i);
+-bool bitmap_query(struct bitmap *bm, unsigned i);
+-int bitmap_find(struct bitmap *bm, unsigned ofs);
+-
+ /* The following definitions come from lib/charcnv.c */
+
+ char lp_failed_convert_char(void);
+Index: samba-3.6.23/source3/include/smb.h
+===================================================================
+--- samba-3.6.23.orig/source3/include/smb.h
++++ samba-3.6.23/source3/include/smb.h
+@@ -712,7 +712,6 @@ struct connections_data {
+ uint32 unused_compatitibility_field;
+ };
+
+-
+ /* the following are used by loadparm for option lists */
+ typedef enum {
+ P_BOOL,P_BOOLREV,P_CHAR,P_INTEGER,P_OCTAL,P_LIST,
+@@ -759,11 +758,6 @@ struct parm_struct {
+ #define FLAG_META 0x8000 /* A meta directive - not a real parameter */
+ #define FLAG_CMDLINE 0x10000 /* option has been overridden */
+
+-struct bitmap {
+- uint32 *b;
+- unsigned int n;
+-};
+-
+ /* offsets into message for common items */
+ #define smb_com 8
+ #define smb_rcls 9
+Index: samba-3.6.23/source3/modules/vfs_acl_common.c
+===================================================================
+--- samba-3.6.23.orig/source3/modules/vfs_acl_common.c
++++ samba-3.6.23/source3/modules/vfs_acl_common.c
+@@ -23,6 +23,7 @@
+ #include "system/filesys.h"
+ #include "../libcli/security/security.h"
+ #include "../librpc/gen_ndr/ndr_security.h"
++#include "../lib/util/bitmap.h"
+
+ static NTSTATUS create_acl_blob(const struct security_descriptor *psd,
+ DATA_BLOB *pblob,
+Index: samba-3.6.23/source3/modules/vfs_full_audit.c
+===================================================================
+--- samba-3.6.23.orig/source3/modules/vfs_full_audit.c
++++ samba-3.6.23/source3/modules/vfs_full_audit.c
+@@ -64,6 +64,7 @@
+ #include "../librpc/gen_ndr/ndr_netlogon.h"
+ #include "auth.h"
+ #include "ntioctl.h"
++#include "lib/util/bitmap.h"
+
+ static int vfs_full_audit_debug_level = DBGC_VFS;
+
+Index: samba-3.6.23/source3/param/loadparm.c
+===================================================================
+--- samba-3.6.23.orig/source3/param/loadparm.c
++++ samba-3.6.23/source3/param/loadparm.c
+@@ -64,6 +64,7 @@
+ #include "smb_signing.h"
+ #include "dbwrap.h"
+ #include "smbldap.h"
++#include "../lib/util/bitmap.h"
+
+ #ifdef HAVE_SYS_SYSCTL_H
+ #include <sys/sysctl.h>
+Index: samba-3.6.23/source3/passdb/pdb_get_set.c
+===================================================================
+--- samba-3.6.23.orig/source3/passdb/pdb_get_set.c
++++ samba-3.6.23/source3/passdb/pdb_get_set.c
+@@ -25,6 +25,7 @@
+ #include "passdb.h"
+ #include "../libcli/auth/libcli_auth.h"
+ #include "../libcli/security/security.h"
++#include "../lib/util/bitmap.h"
+
+ #undef DBGC_CLASS
+ #define DBGC_CLASS DBGC_PASSDB
+Index: samba-3.6.23/source3/smbd/conn.c
+===================================================================
+--- samba-3.6.23.orig/source3/smbd/conn.c
++++ samba-3.6.23/source3/smbd/conn.c
+@@ -23,6 +23,7 @@
+ #include "smbd/smbd.h"
+ #include "smbd/globals.h"
+ #include "rpc_server/rpc_ncacn_np.h"
++#include "lib/util/bitmap.h"
+
+ /* The connections bitmap is expanded in increments of BITMAP_BLOCK_SZ. The
+ * maximum size of the bitmap is the largest positive integer, but you will hit
+Index: samba-3.6.23/source3/smbd/dir.c
+===================================================================
+--- samba-3.6.23.orig/source3/smbd/dir.c
++++ samba-3.6.23/source3/smbd/dir.c
+@@ -23,6 +23,7 @@
+ #include "smbd/smbd.h"
+ #include "smbd/globals.h"
+ #include "libcli/security/security.h"
++#include "lib/util/bitmap.h"
+
+ /*
+ This module implements directory related functions for Samba.
+Index: samba-3.6.23/source3/smbd/files.c
+===================================================================
+--- samba-3.6.23.orig/source3/smbd/files.c
++++ samba-3.6.23/source3/smbd/files.c
+@@ -22,6 +22,7 @@
+ #include "smbd/globals.h"
+ #include "libcli/security/security.h"
+ #include "util_tdb.h"
++#include "lib/util/bitmap.h"
+
+ #define VALID_FNUM(fnum) (((fnum) >= 0) && ((fnum) < real_max_open_files))
+
+Index: samba-3.6.23/source3/smbd/smb2_server.c
+===================================================================
+--- samba-3.6.23.orig/source3/smbd/smb2_server.c
++++ samba-3.6.23/source3/smbd/smb2_server.c
+@@ -26,6 +26,7 @@
+ #include "../lib/tsocket/tsocket.h"
+ #include "../lib/util/tevent_ntstatus.h"
+ #include "smbprofile.h"
++#include "../lib/util/bitmap.h"
+
+ #define OUTVEC_ALLOC_SIZE (SMB2_HDR_BODY + 9)
+
+Index: samba-3.6.23/source3/rpc_client/cli_pipe.c
+===================================================================
+--- samba-3.6.23.orig/source3/rpc_client/cli_pipe.c
++++ samba-3.6.23/source3/rpc_client/cli_pipe.c
+@@ -28,6 +28,7 @@
+ #include "../libcli/auth/ntlmssp.h"
+ #include "ntlmssp_wrap.h"
+ #include "librpc/gen_ndr/ndr_dcerpc.h"
++#include "librpc/gen_ndr/ndr_netlogon_c.h"
+ #include "librpc/rpc/dcerpc.h"
+ #include "librpc/crypto/gse.h"
+ #include "librpc/crypto/spnego.h"
+@@ -399,6 +400,7 @@ static NTSTATUS cli_pipe_validate_curren
+ struct ncacn_packet *pkt,
+ DATA_BLOB *pdu,
+ uint8_t expected_pkt_type,
++ uint32_t call_id,
+ DATA_BLOB *rdata,
+ DATA_BLOB *reply_pdu)
+ {
+@@ -497,7 +499,7 @@ static NTSTATUS cli_pipe_validate_curren
+ "from %s!\n",
+ (unsigned int)pkt->ptype,
+ rpccli_pipe_txt(talloc_tos(), cli)));
+- return NT_STATUS_INVALID_INFO_CLASS;
++ return NT_STATUS_RPC_PROTOCOL_ERROR;
+ }
+
+ if (pkt->ptype != expected_pkt_type) {
+@@ -505,7 +507,15 @@ static NTSTATUS cli_pipe_validate_curren
+ "RPC packet type - %u, not %u\n",
+ rpccli_pipe_txt(talloc_tos(), cli),
+ pkt->ptype, expected_pkt_type));
+- return NT_STATUS_INVALID_INFO_CLASS;
++ return NT_STATUS_RPC_PROTOCOL_ERROR;
++ }
++
++ if (pkt->call_id != call_id) {
++ DEBUG(3, (__location__ ": Connection to %s got an unexpected "
++ "RPC call_id - %u, not %u\n",
++ rpccli_pipe_txt(talloc_tos(), cli),
++ pkt->call_id, call_id));
++ return NT_STATUS_RPC_PROTOCOL_ERROR;
+ }
+
+ /* Do this just before return - we don't want to modify any rpc header
+@@ -898,6 +908,7 @@ static void rpc_api_pipe_got_pdu(struct
+ state->cli, state->pkt,
+ &state->incoming_frag,
+ state->expected_pkt_type,
++ state->call_id,
+ &rdata,
+ &state->reply_pdu);
+
+@@ -1269,12 +1280,17 @@ struct rpc_api_pipe_req_state {
+ uint32_t call_id;
+ DATA_BLOB *req_data;
+ uint32_t req_data_sent;
++ DATA_BLOB req_trailer;
++ uint32_t req_trailer_sent;
++ bool verify_bitmask1;
++ bool verify_pcontext;
+ DATA_BLOB rpc_out;
+ DATA_BLOB reply_pdu;
+ };
+
+ static void rpc_api_pipe_req_write_done(struct tevent_req *subreq);
+ static void rpc_api_pipe_req_done(struct tevent_req *subreq);
++static NTSTATUS prepare_verification_trailer(struct rpc_api_pipe_req_state *state);
+ static NTSTATUS prepare_next_frag(struct rpc_api_pipe_req_state *state,
+ bool *is_last_frag);
+
+@@ -1310,6 +1326,11 @@ struct tevent_req *rpc_api_pipe_req_send
+ goto post_status;
+ }
+
++ status = prepare_verification_trailer(state);
++ if (!NT_STATUS_IS_OK(status)) {
++ goto post_status;
++ }
++
+ status = prepare_next_frag(state, &is_last_frag);
+ if (!NT_STATUS_IS_OK(status)) {
+ goto post_status;
+@@ -1344,25 +1365,161 @@ struct tevent_req *rpc_api_pipe_req_send
+ return NULL;
+ }
+
++static NTSTATUS prepare_verification_trailer(struct rpc_api_pipe_req_state *state)
++{
++ struct pipe_auth_data *a = state->cli->auth;
++ struct dcerpc_sec_verification_trailer *t;
++ struct dcerpc_sec_vt *c = NULL;
++ struct ndr_push *ndr = NULL;
++ enum ndr_err_code ndr_err;
++ size_t align = 0;
++ size_t pad = 0;
++
++ if (a == NULL) {
++ return NT_STATUS_OK;
++ }
++
++ if (a->auth_level < DCERPC_AUTH_LEVEL_INTEGRITY) {
++ return NT_STATUS_OK;
++ }
++
++ t = talloc_zero(state, struct dcerpc_sec_verification_trailer);
++ if (t == NULL) {
++ return NT_STATUS_NO_MEMORY;
++ }
++
++ if (!a->verified_bitmask1) {
++ t->commands = talloc_realloc(t, t->commands,
++ struct dcerpc_sec_vt,
++ t->count.count + 1);
++ if (t->commands == NULL) {
++ return NT_STATUS_NO_MEMORY;
++ }
++ c = &t->commands[t->count.count++];
++ ZERO_STRUCTP(c);
++
++ c->command = DCERPC_SEC_VT_COMMAND_BITMASK1;
++ state->verify_bitmask1 = true;
++ }
++
++ if (!state->cli->verified_pcontext) {
++ t->commands = talloc_realloc(t, t->commands,
++ struct dcerpc_sec_vt,
++ t->count.count + 1);
++ if (t->commands == NULL) {
++ return NT_STATUS_NO_MEMORY;
++ }
++ c = &t->commands[t->count.count++];
++ ZERO_STRUCTP(c);
++
++ c->command = DCERPC_SEC_VT_COMMAND_PCONTEXT;
++ c->u.pcontext.abstract_syntax = state->cli->abstract_syntax;
++ c->u.pcontext.transfer_syntax = state->cli->transfer_syntax;
++
++ state->verify_pcontext = true;
++ }
++
++ if (true) { /* We do not support header signing */
++ t->commands = talloc_realloc(t, t->commands,
++ struct dcerpc_sec_vt,
++ t->count.count + 1);
++ if (t->commands == NULL) {
++ return NT_STATUS_NO_MEMORY;
++ }
++ c = &t->commands[t->count.count++];
++ ZERO_STRUCTP(c);
++
++ c->command = DCERPC_SEC_VT_COMMAND_HEADER2;
++ c->u.header2.ptype = DCERPC_PKT_REQUEST;
++ c->u.header2.drep[0] = DCERPC_DREP_LE;
++ c->u.header2.drep[1] = 0;
++ c->u.header2.drep[2] = 0;
++ c->u.header2.drep[3] = 0;
++ c->u.header2.call_id = state->call_id;
++ c->u.header2.context_id = 0;
++ c->u.header2.opnum = state->op_num;
++ }
++
++ if (t->count.count == 0) {
++ TALLOC_FREE(t);
++ return NT_STATUS_OK;
++ }
++
++ c = &t->commands[t->count.count - 1];
++ c->command |= DCERPC_SEC_VT_COMMAND_END;
++
++ if (DEBUGLEVEL >= 10) {
++ NDR_PRINT_DEBUG(dcerpc_sec_verification_trailer, t);
++ }
++
++ ndr = ndr_push_init_ctx(state);
++ if (ndr == NULL) {
++ return NT_STATUS_NO_MEMORY;
++ }
++
++ ndr_err = ndr_push_dcerpc_sec_verification_trailer(ndr,
++ NDR_SCALARS | NDR_BUFFERS,
++ t);
++ if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
++ return ndr_map_error2ntstatus(ndr_err);
++ }
++ state->req_trailer = ndr_push_blob(ndr);
++
++ align = state->req_data->length & 0x3;
++ if (align > 0) {
++ pad = 4 - align;
++ }
++ if (pad > 0) {
++ bool ok;
++ uint8_t *p;
++ const uint8_t zeros[4] = { 0, };
++
++ ok = data_blob_append(ndr, &state->req_trailer, zeros, pad);
++ if (!ok) {
++ return NT_STATUS_NO_MEMORY;
++ }
++
++ /* move the padding to the start */
++ p = state->req_trailer.data;
++ memmove(p + pad, p, state->req_trailer.length - pad);
++ memset(p, 0, pad);
++ }
++
++ return NT_STATUS_OK;
++}
++
+ static NTSTATUS prepare_next_frag(struct rpc_api_pipe_req_state *state,
+ bool *is_last_frag)
+ {
+- size_t data_sent_thistime;
+ size_t auth_len;
+ size_t frag_len;
+ uint8_t flags = 0;
+ size_t pad_len;
+ size_t data_left;
++ size_t data_thistime;
++ size_t trailer_left;
++ size_t trailer_thistime = 0;
++ size_t total_left;
++ size_t total_thistime;
+ NTSTATUS status;
++ bool ok;
+ union dcerpc_payload u;
+
+ data_left = state->req_data->length - state->req_data_sent;
++ trailer_left = state->req_trailer.length - state->req_trailer_sent;
++ total_left = data_left + trailer_left;
++ if ((total_left < data_left) || (total_left < trailer_left)) {
++ /*
++ * overflow
++ */
++ return NT_STATUS_INVALID_PARAMETER_MIX;
++ }
+
+ status = dcerpc_guess_sizes(state->cli->auth,
+- DCERPC_REQUEST_LENGTH, data_left,
++ DCERPC_REQUEST_LENGTH, total_left,
+ state->cli->max_xmit_frag,
+ CLIENT_NDR_PADDING_SIZE,
+- &data_sent_thistime,
++ &total_thistime,
+ &frag_len, &auth_len, &pad_len);
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
+@@ -1372,15 +1529,20 @@ static NTSTATUS prepare_next_frag(struct
+ flags = DCERPC_PFC_FLAG_FIRST;
+ }
+
+- if (data_sent_thistime == data_left) {
++ if (total_thistime == total_left) {
+ flags |= DCERPC_PFC_FLAG_LAST;
+ }
+
++ data_thistime = MIN(total_thistime, data_left);
++ if (data_thistime < total_thistime) {
++ trailer_thistime = total_thistime - data_thistime;
++ }
++
+ data_blob_free(&state->rpc_out);
+
+ ZERO_STRUCT(u.request);
+
+- u.request.alloc_hint = state->req_data->length;
++ u.request.alloc_hint = total_left;
+ u.request.context_id = 0;
+ u.request.opnum = state->op_num;
+
+@@ -1400,11 +1562,26 @@ static NTSTATUS prepare_next_frag(struct
+ * at this stage */
+ dcerpc_set_frag_length(&state->rpc_out, frag_len);
+
+- /* Copy in the data. */
+- if (!data_blob_append(NULL, &state->rpc_out,
++ if (data_thistime > 0) {
++ /* Copy in the data. */
++ ok = data_blob_append(NULL, &state->rpc_out,
+ state->req_data->data + state->req_data_sent,
+- data_sent_thistime)) {
+- return NT_STATUS_NO_MEMORY;
++ data_thistime);
++ if (!ok) {
++ return NT_STATUS_NO_MEMORY;
++ }
++ state->req_data_sent += data_thistime;
++ }
++
++ if (trailer_thistime > 0) {
++ /* Copy in the verification trailer. */
++ ok = data_blob_append(NULL, &state->rpc_out,
++ state->req_trailer.data + state->req_trailer_sent,
++ trailer_thistime);
++ if (!ok) {
++ return NT_STATUS_NO_MEMORY;
++ }
++ state->req_trailer_sent += trailer_thistime;
+ }
+
+ switch (state->cli->auth->auth_level) {
+@@ -1424,7 +1601,6 @@ static NTSTATUS prepare_next_frag(struct
+ return NT_STATUS_INVALID_PARAMETER;
+ }
+
+- state->req_data_sent += data_sent_thistime;
+ *is_last_frag = ((flags & DCERPC_PFC_FLAG_LAST) != 0);
+
+ return status;
+@@ -1488,6 +1664,20 @@ static void rpc_api_pipe_req_done(struct
+ tevent_req_nterror(req, status);
+ return;
+ }
++
++ if (state->cli->auth == NULL) {
++ tevent_req_done(req);
++ return;
++ }
++
++ if (state->verify_bitmask1) {
++ state->cli->auth->verified_bitmask1 = true;
++ }
++
++ if (state->verify_pcontext) {
++ state->cli->verified_pcontext = true;
++ }
++
+ tevent_req_done(req);
+ }
+
+@@ -1647,9 +1837,15 @@ struct rpc_pipe_bind_state {
+ DATA_BLOB rpc_out;
+ bool auth3;
+ uint32_t rpc_call_id;
++ struct netr_Authenticator auth;
++ struct netr_Authenticator return_auth;
++ struct netlogon_creds_CredentialState *creds;
++ union netr_Capabilities capabilities;
++ struct netr_LogonGetCapabilities r;
+ };
+
+ static void rpc_pipe_bind_step_one_done(struct tevent_req *subreq);
++static void rpc_pipe_bind_step_two_trigger(struct tevent_req *req);
+ static NTSTATUS rpc_bind_next_send(struct tevent_req *req,
+ struct rpc_pipe_bind_state *state,
+ DATA_BLOB *credentials);
+@@ -1753,11 +1949,14 @@ static void rpc_pipe_bind_step_one_done(
+
+ case DCERPC_AUTH_TYPE_NONE:
+ case DCERPC_AUTH_TYPE_NCALRPC_AS_SYSTEM:
+- case DCERPC_AUTH_TYPE_SCHANNEL:
+ /* Bind complete. */
+ tevent_req_done(req);
+ return;
+
++ case DCERPC_AUTH_TYPE_SCHANNEL:
++ rpc_pipe_bind_step_two_trigger(req);
++ return;
++
+ case DCERPC_AUTH_TYPE_NTLMSSP:
+ case DCERPC_AUTH_TYPE_SPNEGO:
+ case DCERPC_AUTH_TYPE_KRB5:
+@@ -1869,6 +2068,153 @@ err_out:
+ tevent_req_nterror(req, NT_STATUS_INTERNAL_ERROR);
+ }
+
++static void rpc_pipe_bind_step_two_done(struct tevent_req *subreq);
++
++static void rpc_pipe_bind_step_two_trigger(struct tevent_req *req)
++{
++ struct rpc_pipe_bind_state *state =
++ tevent_req_data(req,
++ struct rpc_pipe_bind_state);
++ struct dcerpc_binding_handle *b = state->cli->binding_handle;
++ struct schannel_state *schannel_auth =
++ talloc_get_type_abort(state->cli->auth->auth_ctx,
++ struct schannel_state);
++ struct tevent_req *subreq;
++
++ if (schannel_auth == NULL ||
++ !ndr_syntax_id_equal(&state->cli->abstract_syntax,
++ &ndr_table_netlogon.syntax_id)) {
++ tevent_req_done(req);
++ return;
++ }
++
++ ZERO_STRUCT(state->return_auth);
++
++ state->creds = netlogon_creds_copy(state, schannel_auth->creds);
++ if (state->creds == NULL) {
++ tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
++ return;
++ }
++
++ netlogon_creds_client_authenticator(state->creds, &state->auth);
++
++ state->r.in.server_name = state->cli->srv_name_slash;
++ state->r.in.computer_name = state->creds->computer_name;
++ state->r.in.credential = &state->auth;
++ state->r.in.query_level = 1;
++ state->r.in.return_authenticator = &state->return_auth;
++
++ state->r.out.capabilities = &state->capabilities;
++ state->r.out.return_authenticator = &state->return_auth;
++
++ subreq = dcerpc_netr_LogonGetCapabilities_r_send(talloc_tos(),
++ state->ev,
++ b,
++ &state->r);
++ if (subreq == NULL) {
++ tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
++ return;
++ }
++
++ tevent_req_set_callback(subreq, rpc_pipe_bind_step_two_done, req);
++ return;
++}
++
++static void rpc_pipe_bind_step_two_done(struct tevent_req *subreq)
++{
++ struct tevent_req *req =
++ tevent_req_callback_data(subreq,
++ struct tevent_req);
++ struct rpc_pipe_bind_state *state =
++ tevent_req_data(req,
++ struct rpc_pipe_bind_state);
++ struct schannel_state *schannel_auth =
++ talloc_get_type_abort(state->cli->auth->auth_ctx,
++ struct schannel_state);
++ NTSTATUS status;
++
++ status = dcerpc_netr_LogonGetCapabilities_r_recv(subreq, talloc_tos());
++ TALLOC_FREE(subreq);
++ if (NT_STATUS_EQUAL(status, NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE)) {
++ if (state->cli->dc->negotiate_flags &
++ NETLOGON_NEG_SUPPORTS_AES) {
++ DEBUG(5, ("AES is not supported and the error was %s\n",
++ nt_errstr(status)));
++ tevent_req_nterror(req,
++ NT_STATUS_INVALID_NETWORK_RESPONSE);
++ return;
++ }
++
++ /* This is probably NT */
++ DEBUG(5, ("We are checking against an NT - %s\n",
++ nt_errstr(status)));
++ tevent_req_done(req);
++ return;
++ } else if (!NT_STATUS_IS_OK(status)) {
++ DEBUG(0, ("dcerpc_netr_LogonGetCapabilities_r_recv failed with %s\n",
++ nt_errstr(status)));
++ tevent_req_nterror(req, status);
++ return;
++ }
++
++ if (NT_STATUS_EQUAL(state->r.out.result, NT_STATUS_NOT_IMPLEMENTED)) {
++ if (state->creds->negotiate_flags & NETLOGON_NEG_SUPPORTS_AES) {
++ /* This means AES isn't supported. */
++ DEBUG(5, ("AES is not supported and the error was %s\n",
++ nt_errstr(state->r.out.result)));
++ tevent_req_nterror(req,
++ NT_STATUS_INVALID_NETWORK_RESPONSE);
++ return;
++ }
++
++ /* This is probably an old Samba version */
++ DEBUG(5, ("We are checking against an old Samba version - %s\n",
++ nt_errstr(state->r.out.result)));
++ tevent_req_done(req);
++ return;
++ }
++
++ /* We need to check the credential state here, cause win2k3 and earlier
++ * returns NT_STATUS_NOT_IMPLEMENTED */
++ if (!netlogon_creds_client_check(state->creds,
++ &state->r.out.return_authenticator->cred)) {
++ /*
++ * Server replied with bad credential. Fail.
++ */
++ DEBUG(0,("rpc_pipe_bind_step_two_done: server %s "
++ "replied with bad credential\n",
++ state->cli->desthost));
++ tevent_req_nterror(req, NT_STATUS_UNSUCCESSFUL);
++ return;
++ }
++
++ TALLOC_FREE(schannel_auth->creds);
++ schannel_auth->creds = talloc_steal(state->cli, state->creds);
++
++ if (!NT_STATUS_IS_OK(state->r.out.result)) {
++ DEBUG(0, ("dcerpc_netr_LogonGetCapabilities_r_recv failed with %s\n",
++ nt_errstr(state->r.out.result)));
++ tevent_req_nterror(req, state->r.out.result);
++ return;
++ }
++
++ if (state->creds->negotiate_flags !=
++ state->r.out.capabilities->server_capabilities) {
++ DEBUG(0, ("The client capabilities don't match the server "
++ "capabilities: local[0x%08X] remote[0x%08X]\n",
++ state->creds->negotiate_flags,
++ state->capabilities.server_capabilities));
++ tevent_req_nterror(req,
++ NT_STATUS_INVALID_NETWORK_RESPONSE);
++ return;
++ }
++
++ /* TODO: Add downgrade dectection. */
++
++ tevent_req_done(req);
++ return;
++}
++
+ static NTSTATUS rpc_bind_next_send(struct tevent_req *req,
+ struct rpc_pipe_bind_state *state,
+ DATA_BLOB *auth_token)
+Index: samba-3.6.23/source3/librpc/rpc/dcerpc.h
+===================================================================
+--- samba-3.6.23.orig/source3/librpc/rpc/dcerpc.h
++++ samba-3.6.23/source3/librpc/rpc/dcerpc.h
+@@ -39,6 +39,7 @@ struct NL_AUTH_MESSAGE;
+ struct pipe_auth_data {
+ enum dcerpc_AuthType auth_type;
+ enum dcerpc_AuthLevel auth_level;
++ bool verified_bitmask1;
+
+ void *auth_ctx;
+
+Index: samba-3.6.23/source3/rpc_client/rpc_client.h
+===================================================================
+--- samba-3.6.23.orig/source3/rpc_client/rpc_client.h
++++ samba-3.6.23/source3/rpc_client/rpc_client.h
+@@ -39,6 +39,7 @@ struct rpc_pipe_client {
+
+ struct ndr_syntax_id abstract_syntax;
+ struct ndr_syntax_id transfer_syntax;
++ bool verified_pcontext;
+
+ char *desthost;
+ char *srv_name_slash;
+Index: samba-3.6.23/librpc/ndr/ndr_dcerpc.h
+===================================================================
+--- /dev/null
++++ samba-3.6.23/librpc/ndr/ndr_dcerpc.h
+@@ -0,0 +1,25 @@
++/*
++ Unix SMB/CIFS implementation.
++
++ Manually parsed structures found in the DCERPC protocol
++
++ Copyright (C) Stefan Metzmacher 2014
++ Copyright (C) Gregor Beck 2014
++
++ 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/>.
++*/
++
++enum ndr_err_code ndr_pop_dcerpc_sec_verification_trailer(
++ struct ndr_pull *ndr, TALLOC_CTX *mem_ctx,
++ struct dcerpc_sec_verification_trailer **_r);
+Index: samba-3.6.23/librpc/ABI/ndr-0.0.3.sigs
+===================================================================
+--- /dev/null
++++ samba-3.6.23/librpc/ABI/ndr-0.0.3.sigs
+@@ -0,0 +1,251 @@
++GUID_all_zero: bool (const struct GUID *)
++GUID_compare: int (const struct GUID *, const struct GUID *)
++GUID_equal: bool (const struct GUID *, const struct GUID *)
++GUID_from_data_blob: NTSTATUS (const DATA_BLOB *, struct GUID *)
++GUID_from_ndr_blob: NTSTATUS (const DATA_BLOB *, struct GUID *)
++GUID_from_string: NTSTATUS (const char *, struct GUID *)
++GUID_hexstring: char *(TALLOC_CTX *, const struct GUID *)
++GUID_random: struct GUID (void)
++GUID_string: char *(TALLOC_CTX *, const struct GUID *)
++GUID_string2: char *(TALLOC_CTX *, const struct GUID *)
++GUID_to_ndr_blob: NTSTATUS (const struct GUID *, TALLOC_CTX *, DATA_BLOB *)
++GUID_zero: struct GUID (void)
++ndr_align_size: size_t (uint32_t, size_t)
++ndr_charset_length: uint32_t (const void *, charset_t)
++ndr_check_array_length: enum ndr_err_code (struct ndr_pull *, void *, uint32_t)
++ndr_check_array_size: enum ndr_err_code (struct ndr_pull *, void *, uint32_t)
++ndr_check_padding: void (struct ndr_pull *, size_t)
++ndr_check_pipe_chunk_trailer: enum ndr_err_code (struct ndr_pull *, int, uint32_t)
++ndr_check_string_terminator: enum ndr_err_code (struct ndr_pull *, uint32_t, uint32_t)
++ndr_get_array_length: uint32_t (struct ndr_pull *, const void *)
++ndr_get_array_size: uint32_t (struct ndr_pull *, const void *)
++ndr_map_error2errno: int (enum ndr_err_code)
++ndr_map_error2ntstatus: NTSTATUS (enum ndr_err_code)
++ndr_map_error2string: const char *(enum ndr_err_code)
++ndr_policy_handle_empty: bool (const struct policy_handle *)
++ndr_policy_handle_equal: bool (const struct policy_handle *, const struct policy_handle *)
++ndr_print_DATA_BLOB: void (struct ndr_print *, const char *, DATA_BLOB)
++ndr_print_GUID: void (struct ndr_print *, const char *, const struct GUID *)
++ndr_print_KRB5_EDATA_NTSTATUS: void (struct ndr_print *, const char *, const struct KRB5_EDATA_NTSTATUS *)
++ndr_print_NTSTATUS: void (struct ndr_print *, const char *, NTSTATUS)
++ndr_print_NTTIME: void (struct ndr_print *, const char *, NTTIME)
++ndr_print_NTTIME_1sec: void (struct ndr_print *, const char *, NTTIME)
++ndr_print_NTTIME_hyper: void (struct ndr_print *, const char *, NTTIME)
++ndr_print_WERROR: void (struct ndr_print *, const char *, WERROR)
++ndr_print_array_uint8: void (struct ndr_print *, const char *, const uint8_t *, uint32_t)
++ndr_print_bad_level: void (struct ndr_print *, const char *, uint16_t)
++ndr_print_bitmap_flag: void (struct ndr_print *, size_t, const char *, uint32_t, uint32_t)
++ndr_print_bool: void (struct ndr_print *, const char *, const bool)
++ndr_print_debug: void (ndr_print_fn_t, const char *, void *)
++ndr_print_debug_helper: void (struct ndr_print *, const char *, ...)
++ndr_print_debugc: void (int, ndr_print_fn_t, const char *, void *)
++ndr_print_debugc_helper: void (struct ndr_print *, const char *, ...)
++ndr_print_dlong: void (struct ndr_print *, const char *, int64_t)
++ndr_print_double: void (struct ndr_print *, const char *, double)
++ndr_print_enum: void (struct ndr_print *, const char *, const char *, const char *, uint32_t)
++ndr_print_function_debug: void (ndr_print_function_t, const char *, int, void *)
++ndr_print_function_string: char *(TALLOC_CTX *, ndr_print_function_t, const char *, int, void *)
++ndr_print_get_switch_value: uint32_t (struct ndr_print *, const void *)
++ndr_print_gid_t: void (struct ndr_print *, const char *, gid_t)
++ndr_print_hyper: void (struct ndr_print *, const char *, uint64_t)
++ndr_print_int16: void (struct ndr_print *, const char *, int16_t)
++ndr_print_int32: void (struct ndr_print *, const char *, int32_t)
++ndr_print_int3264: void (struct ndr_print *, const char *, int32_t)
++ndr_print_int8: void (struct ndr_print *, const char *, int8_t)
++ndr_print_ipv4address: void (struct ndr_print *, const char *, const char *)
++ndr_print_ipv6address: void (struct ndr_print *, const char *, const char *)
++ndr_print_ndr_syntax_id: void (struct ndr_print *, const char *, const struct ndr_syntax_id *)
++ndr_print_netr_SamDatabaseID: void (struct ndr_print *, const char *, enum netr_SamDatabaseID)
++ndr_print_netr_SchannelType: void (struct ndr_print *, const char *, enum netr_SchannelType)
++ndr_print_null: void (struct ndr_print *)
++ndr_print_pointer: void (struct ndr_print *, const char *, void *)
++ndr_print_policy_handle: void (struct ndr_print *, const char *, const struct policy_handle *)
++ndr_print_printf_helper: void (struct ndr_print *, const char *, ...)
++ndr_print_ptr: void (struct ndr_print *, const char *, const void *)
++ndr_print_set_switch_value: enum ndr_err_code (struct ndr_print *, const void *, uint32_t)
++ndr_print_sockaddr_storage: void (struct ndr_print *, const char *, const struct sockaddr_storage *)
++ndr_print_string: void (struct ndr_print *, const char *, const char *)
++ndr_print_string_array: void (struct ndr_print *, const char *, const char **)
++ndr_print_string_helper: void (struct ndr_print *, const char *, ...)
++ndr_print_struct: void (struct ndr_print *, const char *, const char *)
++ndr_print_struct_string: char *(TALLOC_CTX *, ndr_print_fn_t, const char *, void *)
++ndr_print_svcctl_ServerType: void (struct ndr_print *, const char *, uint32_t)
++ndr_print_time_t: void (struct ndr_print *, const char *, time_t)
++ndr_print_timespec: void (struct ndr_print *, const char *, const struct timespec *)
++ndr_print_timeval: void (struct ndr_print *, const char *, const struct timeval *)
++ndr_print_udlong: void (struct ndr_print *, const char *, uint64_t)
++ndr_print_udlongr: void (struct ndr_print *, const char *, uint64_t)
++ndr_print_uid_t: void (struct ndr_print *, const char *, uid_t)
++ndr_print_uint16: void (struct ndr_print *, const char *, uint16_t)
++ndr_print_uint32: void (struct ndr_print *, const char *, uint32_t)
++ndr_print_uint3264: void (struct ndr_print *, const char *, uint32_t)
++ndr_print_uint8: void (struct ndr_print *, const char *, uint8_t)
++ndr_print_union: void (struct ndr_print *, const char *, int, const char *)
++ndr_print_union_debug: void (ndr_print_fn_t, const char *, uint32_t, void *)
++ndr_print_union_string: char *(TALLOC_CTX *, ndr_print_fn_t, const char *, uint32_t, void *)
++ndr_print_winreg_Data: void (struct ndr_print *, const char *, const union winreg_Data *)
++ndr_print_winreg_Type: void (struct ndr_print *, const char *, enum winreg_Type)
++ndr_pull_DATA_BLOB: enum ndr_err_code (struct ndr_pull *, int, DATA_BLOB *)
++ndr_pull_GUID: enum ndr_err_code (struct ndr_pull *, int, struct GUID *)
++ndr_pull_KRB5_EDATA_NTSTATUS: enum ndr_err_code (struct ndr_pull *, int, struct KRB5_EDATA_NTSTATUS *)
++ndr_pull_NTSTATUS: enum ndr_err_code (struct ndr_pull *, int, NTSTATUS *)
++ndr_pull_NTTIME: enum ndr_err_code (struct ndr_pull *, int, NTTIME *)
++ndr_pull_NTTIME_1sec: enum ndr_err_code (struct ndr_pull *, int, NTTIME *)
++ndr_pull_NTTIME_hyper: enum ndr_err_code (struct ndr_pull *, int, NTTIME *)
++ndr_pull_WERROR: enum ndr_err_code (struct ndr_pull *, int, WERROR *)
++ndr_pull_advance: enum ndr_err_code (struct ndr_pull *, uint32_t)
++ndr_pull_align: enum ndr_err_code (struct ndr_pull *, size_t)
++ndr_pull_append: enum ndr_err_code (struct ndr_pull *, DATA_BLOB *)
++ndr_pull_array_length: enum ndr_err_code (struct ndr_pull *, const void *)
++ndr_pull_array_size: enum ndr_err_code (struct ndr_pull *, const void *)
++ndr_pull_array_uint8: enum ndr_err_code (struct ndr_pull *, int, uint8_t *, uint32_t)
++ndr_pull_bytes: enum ndr_err_code (struct ndr_pull *, uint8_t *, uint32_t)
++ndr_pull_charset: enum ndr_err_code (struct ndr_pull *, int, const char **, uint32_t, uint8_t, charset_t)
++ndr_pull_charset_to_null: enum ndr_err_code (struct ndr_pull *, int, const char **, uint32_t, uint8_t, charset_t)
++ndr_pull_dlong: enum ndr_err_code (struct ndr_pull *, int, int64_t *)
++ndr_pull_double: enum ndr_err_code (struct ndr_pull *, int, double *)
++ndr_pull_enum_uint16: enum ndr_err_code (struct ndr_pull *, int, uint16_t *)
++ndr_pull_enum_uint1632: enum ndr_err_code (struct ndr_pull *, int, uint16_t *)
++ndr_pull_enum_uint32: enum ndr_err_code (struct ndr_pull *, int, uint32_t *)
++ndr_pull_enum_uint8: enum ndr_err_code (struct ndr_pull *, int, uint8_t *)
++ndr_pull_error: enum ndr_err_code (struct ndr_pull *, enum ndr_err_code, const char *, ...)
++ndr_pull_generic_ptr: enum ndr_err_code (struct ndr_pull *, uint32_t *)
++ndr_pull_get_relative_base_offset: uint32_t (struct ndr_pull *)
++ndr_pull_get_switch_value: uint32_t (struct ndr_pull *, const void *)
++ndr_pull_gid_t: enum ndr_err_code (struct ndr_pull *, int, gid_t *)
++ndr_pull_hyper: enum ndr_err_code (struct ndr_pull *, int, uint64_t *)
++ndr_pull_init_blob: struct ndr_pull *(const DATA_BLOB *, TALLOC_CTX *)
++ndr_pull_int16: enum ndr_err_code (struct ndr_pull *, int, int16_t *)
++ndr_pull_int32: enum ndr_err_code (struct ndr_pull *, int, int32_t *)
++ndr_pull_int8: enum ndr_err_code (struct ndr_pull *, int, int8_t *)
++ndr_pull_ipv4address: enum ndr_err_code (struct ndr_pull *, int, const char **)
++ndr_pull_ipv6address: enum ndr_err_code (struct ndr_pull *, int, const char **)
++ndr_pull_ndr_syntax_id: enum ndr_err_code (struct ndr_pull *, int, struct ndr_syntax_id *)
++ndr_pull_netr_SamDatabaseID: enum ndr_err_code (struct ndr_pull *, int, enum netr_SamDatabaseID *)
++ndr_pull_netr_SchannelType: enum ndr_err_code (struct ndr_pull *, int, enum netr_SchannelType *)
++ndr_pull_pointer: enum ndr_err_code (struct ndr_pull *, int, void **)
++ndr_pull_policy_handle: enum ndr_err_code (struct ndr_pull *, int, struct policy_handle *)
++ndr_pull_pop: enum ndr_err_code (struct ndr_pull *)
++ndr_pull_ref_ptr: enum ndr_err_code (struct ndr_pull *, uint32_t *)
++ndr_pull_relative_ptr1: enum ndr_err_code (struct ndr_pull *, const void *, uint32_t)
++ndr_pull_relative_ptr2: enum ndr_err_code (struct ndr_pull *, const void *)
++ndr_pull_relative_ptr_short: enum ndr_err_code (struct ndr_pull *, uint16_t *)
++ndr_pull_restore_relative_base_offset: void (struct ndr_pull *, uint32_t)
++ndr_pull_set_switch_value: enum ndr_err_code (struct ndr_pull *, const void *, uint32_t)
++ndr_pull_setup_relative_base_offset1: enum ndr_err_code (struct ndr_pull *, const void *, uint32_t)
++ndr_pull_setup_relative_base_offset2: enum ndr_err_code (struct ndr_pull *, const void *)
++ndr_pull_string: enum ndr_err_code (struct ndr_pull *, int, const char **)
++ndr_pull_string_array: enum ndr_err_code (struct ndr_pull *, int, const char ***)
++ndr_pull_struct_blob: enum ndr_err_code (const DATA_BLOB *, TALLOC_CTX *, void *, ndr_pull_flags_fn_t)
++ndr_pull_struct_blob_all: enum ndr_err_code (const DATA_BLOB *, TALLOC_CTX *, void *, ndr_pull_flags_fn_t)
++ndr_pull_subcontext_end: enum ndr_err_code (struct ndr_pull *, struct ndr_pull *, size_t, ssize_t)
++ndr_pull_subcontext_start: enum ndr_err_code (struct ndr_pull *, struct ndr_pull **, size_t, ssize_t)
++ndr_pull_svcctl_ServerType: enum ndr_err_code (struct ndr_pull *, int, uint32_t *)
++ndr_pull_time_t: enum ndr_err_code (struct ndr_pull *, int, time_t *)
++ndr_pull_timespec: enum ndr_err_code (struct ndr_pull *, int, struct timespec *)
++ndr_pull_timeval: enum ndr_err_code (struct ndr_pull *, int, struct timeval *)
++ndr_pull_trailer_align: enum ndr_err_code (struct ndr_pull *, size_t)
++ndr_pull_udlong: enum ndr_err_code (struct ndr_pull *, int, uint64_t *)
++ndr_pull_udlongr: enum ndr_err_code (struct ndr_pull *, int, uint64_t *)
++ndr_pull_uid_t: enum ndr_err_code (struct ndr_pull *, int, uid_t *)
++ndr_pull_uint16: enum ndr_err_code (struct ndr_pull *, int, uint16_t *)
++ndr_pull_uint1632: enum ndr_err_code (struct ndr_pull *, int, uint16_t *)
++ndr_pull_uint32: enum ndr_err_code (struct ndr_pull *, int, uint32_t *)
++ndr_pull_uint3264: enum ndr_err_code (struct ndr_pull *, int, uint32_t *)
++ndr_pull_uint8: enum ndr_err_code (struct ndr_pull *, int, uint8_t *)
++ndr_pull_union_align: enum ndr_err_code (struct ndr_pull *, size_t)
++ndr_pull_union_blob: enum ndr_err_code (const DATA_BLOB *, TALLOC_CTX *, void *, uint32_t, ndr_pull_flags_fn_t)
++ndr_pull_union_blob_all: enum ndr_err_code (const DATA_BLOB *, TALLOC_CTX *, void *, uint32_t, ndr_pull_flags_fn_t)
++ndr_pull_winreg_Data: enum ndr_err_code (struct ndr_pull *, int, union winreg_Data *)
++ndr_pull_winreg_Type: enum ndr_err_code (struct ndr_pull *, int, enum winreg_Type *)
++ndr_push_DATA_BLOB: enum ndr_err_code (struct ndr_push *, int, DATA_BLOB)
++ndr_push_GUID: enum ndr_err_code (struct ndr_push *, int, const struct GUID *)
++ndr_push_KRB5_EDATA_NTSTATUS: enum ndr_err_code (struct ndr_push *, int, const struct KRB5_EDATA_NTSTATUS *)
++ndr_push_NTSTATUS: enum ndr_err_code (struct ndr_push *, int, NTSTATUS)
++ndr_push_NTTIME: enum ndr_err_code (struct ndr_push *, int, NTTIME)
++ndr_push_NTTIME_1sec: enum ndr_err_code (struct ndr_push *, int, NTTIME)
++ndr_push_NTTIME_hyper: enum ndr_err_code (struct ndr_push *, int, NTTIME)
++ndr_push_WERROR: enum ndr_err_code (struct ndr_push *, int, WERROR)
++ndr_push_align: enum ndr_err_code (struct ndr_push *, size_t)
++ndr_push_array_uint8: enum ndr_err_code (struct ndr_push *, int, const uint8_t *, uint32_t)
++ndr_push_blob: DATA_BLOB (struct ndr_push *)
++ndr_push_bytes: enum ndr_err_code (struct ndr_push *, const uint8_t *, uint32_t)
++ndr_push_charset: enum ndr_err_code (struct ndr_push *, int, const char *, uint32_t, uint8_t, charset_t)
++ndr_push_dlong: enum ndr_err_code (struct ndr_push *, int, int64_t)
++ndr_push_double: enum ndr_err_code (struct ndr_push *, int, double)
++ndr_push_enum_uint16: enum ndr_err_code (struct ndr_push *, int, uint16_t)
++ndr_push_enum_uint1632: enum ndr_err_code (struct ndr_push *, int, uint16_t)
++ndr_push_enum_uint32: enum ndr_err_code (struct ndr_push *, int, uint32_t)
++ndr_push_enum_uint8: enum ndr_err_code (struct ndr_push *, int, uint8_t)
++ndr_push_error: enum ndr_err_code (struct ndr_push *, enum ndr_err_code, const char *, ...)
++ndr_push_expand: enum ndr_err_code (struct ndr_push *, uint32_t)
++ndr_push_full_ptr: enum ndr_err_code (struct ndr_push *, const void *)
++ndr_push_get_relative_base_offset: uint32_t (struct ndr_push *)
++ndr_push_get_switch_value: uint32_t (struct ndr_push *, const void *)
++ndr_push_gid_t: enum ndr_err_code (struct ndr_push *, int, gid_t)
++ndr_push_hyper: enum ndr_err_code (struct ndr_push *, int, uint64_t)
++ndr_push_init_ctx: struct ndr_push *(TALLOC_CTX *)
++ndr_push_int16: enum ndr_err_code (struct ndr_push *, int, int16_t)
++ndr_push_int32: enum ndr_err_code (struct ndr_push *, int, int32_t)
++ndr_push_int8: enum ndr_err_code (struct ndr_push *, int, int8_t)
++ndr_push_ipv4address: enum ndr_err_code (struct ndr_push *, int, const char *)
++ndr_push_ipv6address: enum ndr_err_code (struct ndr_push *, int, const char *)
++ndr_push_ndr_syntax_id: enum ndr_err_code (struct ndr_push *, int, const struct ndr_syntax_id *)
++ndr_push_netr_SamDatabaseID: enum ndr_err_code (struct ndr_push *, int, enum netr_SamDatabaseID)
++ndr_push_netr_SchannelType: enum ndr_err_code (struct ndr_push *, int, enum netr_SchannelType)
++ndr_push_pipe_chunk_trailer: enum ndr_err_code (struct ndr_push *, int, uint32_t)
++ndr_push_pointer: enum ndr_err_code (struct ndr_push *, int, void *)
++ndr_push_policy_handle: enum ndr_err_code (struct ndr_push *, int, const struct policy_handle *)
++ndr_push_ref_ptr: enum ndr_err_code (struct ndr_push *)
++ndr_push_relative_ptr1: enum ndr_err_code (struct ndr_push *, const void *)
++ndr_push_relative_ptr2_end: enum ndr_err_code (struct ndr_push *, const void *)
++ndr_push_relative_ptr2_start: enum ndr_err_code (struct ndr_push *, const void *)
++ndr_push_restore_relative_base_offset: void (struct ndr_push *, uint32_t)
++ndr_push_set_switch_value: enum ndr_err_code (struct ndr_push *, const void *, uint32_t)
++ndr_push_setup_relative_base_offset1: enum ndr_err_code (struct ndr_push *, const void *, uint32_t)
++ndr_push_setup_relative_base_offset2: enum ndr_err_code (struct ndr_push *, const void *)
++ndr_push_short_relative_ptr1: enum ndr_err_code (struct ndr_push *, const void *)
++ndr_push_short_relative_ptr2: enum ndr_err_code (struct ndr_push *, const void *)
++ndr_push_string: enum ndr_err_code (struct ndr_push *, int, const char *)
++ndr_push_string_array: enum ndr_err_code (struct ndr_push *, int, const char **)
++ndr_push_struct_blob: enum ndr_err_code (DATA_BLOB *, TALLOC_CTX *, const void *, ndr_push_flags_fn_t)
++ndr_push_subcontext_end: enum ndr_err_code (struct ndr_push *, struct ndr_push *, size_t, ssize_t)
++ndr_push_subcontext_start: enum ndr_err_code (struct ndr_push *, struct ndr_push **, size_t, ssize_t)
++ndr_push_svcctl_ServerType: enum ndr_err_code (struct ndr_push *, int, uint32_t)
++ndr_push_time_t: enum ndr_err_code (struct ndr_push *, int, time_t)
++ndr_push_timespec: enum ndr_err_code (struct ndr_push *, int, const struct timespec *)
++ndr_push_timeval: enum ndr_err_code (struct ndr_push *, int, const struct timeval *)
++ndr_push_trailer_align: enum ndr_err_code (struct ndr_push *, size_t)
++ndr_push_udlong: enum ndr_err_code (struct ndr_push *, int, uint64_t)
++ndr_push_udlongr: enum ndr_err_code (struct ndr_push *, int, uint64_t)
++ndr_push_uid_t: enum ndr_err_code (struct ndr_push *, int, uid_t)
++ndr_push_uint16: enum ndr_err_code (struct ndr_push *, int, uint16_t)
++ndr_push_uint1632: enum ndr_err_code (struct ndr_push *, int, uint16_t)
++ndr_push_uint32: enum ndr_err_code (struct ndr_push *, int, uint32_t)
++ndr_push_uint3264: enum ndr_err_code (struct ndr_push *, int, uint32_t)
++ndr_push_uint8: enum ndr_err_code (struct ndr_push *, int, uint8_t)
++ndr_push_union_align: enum ndr_err_code (struct ndr_push *, size_t)
++ndr_push_union_blob: enum ndr_err_code (DATA_BLOB *, TALLOC_CTX *, void *, uint32_t, ndr_push_flags_fn_t)
++ndr_push_unique_ptr: enum ndr_err_code (struct ndr_push *, const void *)
++ndr_push_winreg_Data: enum ndr_err_code (struct ndr_push *, int, const union winreg_Data *)
++ndr_push_winreg_Type: enum ndr_err_code (struct ndr_push *, int, enum winreg_Type)
++ndr_push_zero: enum ndr_err_code (struct ndr_push *, uint32_t)
++ndr_set_flags: void (uint32_t *, uint32_t)
++ndr_size_DATA_BLOB: uint32_t (int, const DATA_BLOB *, int)
++ndr_size_GUID: size_t (const struct GUID *, int)
++ndr_size_string: uint32_t (int, const char * const *, int)
++ndr_size_string_array: size_t (const char **, uint32_t, int)
++ndr_size_struct: size_t (const void *, int, ndr_push_flags_fn_t)
++ndr_size_union: size_t (const void *, int, uint32_t, ndr_push_flags_fn_t)
++ndr_string_array_size: size_t (struct ndr_push *, const char *)
++ndr_string_length: uint32_t (const void *, uint32_t)
++ndr_syntax_id_equal: bool (const struct ndr_syntax_id *, const struct ndr_syntax_id *)
++ndr_syntax_id_from_string: bool (const char *, struct ndr_syntax_id *)
++ndr_syntax_id_null: uuid = {time_low = 0, time_mid = 0, time_hi_and_version = 0, clock_seq = "\000", node = "\000\000\000\000\000"}, if_version = 0
++ndr_syntax_id_to_string: char *(TALLOC_CTX *, const struct ndr_syntax_id *)
++ndr_token_peek: uint32_t (struct ndr_token_list **, const void *)
++ndr_token_retrieve: enum ndr_err_code (struct ndr_token_list **, const void *, uint32_t *)
++ndr_token_retrieve_cmp_fn: enum ndr_err_code (struct ndr_token_list **, const void *, uint32_t *, comparison_fn_t, bool)
++ndr_token_store: enum ndr_err_code (TALLOC_CTX *, struct ndr_token_list **, const void *, uint32_t)
++ndr_transfer_syntax_ndr: uuid = {time_low = 2324192516, time_mid = 7403, time_hi_and_version = 4553, clock_seq = "\237\350", node = "\b\000+\020H`"}, if_version = 2
++ndr_transfer_syntax_ndr64: uuid = {time_low = 1903232307, time_mid = 48826, time_hi_and_version = 18743, clock_seq = "\203\031", node = "\265\333\357\234\314\066"}, if_version = 1
+Index: samba-3.6.23/librpc/ndr/ndr_misc.c
+===================================================================
+--- samba-3.6.23.orig/librpc/ndr/ndr_misc.c
++++ samba-3.6.23/librpc/ndr/ndr_misc.c
+@@ -35,3 +35,50 @@ bool ndr_syntax_id_equal(const struct nd
+ return GUID_equal(&i1->uuid, &i2->uuid)
+ && (i1->if_version == i2->if_version);
+ }
++
++_PUBLIC_ char *ndr_syntax_id_to_string(TALLOC_CTX *mem_ctx, const struct ndr_syntax_id *id)
++{
++ return talloc_asprintf(mem_ctx,
++ "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x/0x%08x",
++ id->uuid.time_low, id->uuid.time_mid,
++ id->uuid.time_hi_and_version,
++ id->uuid.clock_seq[0],
++ id->uuid.clock_seq[1],
++ id->uuid.node[0], id->uuid.node[1],
++ id->uuid.node[2], id->uuid.node[3],
++ id->uuid.node[4], id->uuid.node[5],
++ (unsigned)id->if_version);
++}
++
++_PUBLIC_ bool ndr_syntax_id_from_string(const char *s, struct ndr_syntax_id *id)
++{
++ int ret;
++ size_t i;
++ uint32_t time_low;
++ uint32_t time_mid, time_hi_and_version;
++ uint32_t clock_seq[2];
++ uint32_t node[6];
++ uint32_t if_version;
++
++ ret = sscanf(s,
++ "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x/0x%08x",
++ &time_low, &time_mid, &time_hi_and_version,
++ &clock_seq[0], &clock_seq[1],
++ &node[0], &node[1], &node[2], &node[3], &node[4], &node[5],
++ &if_version);
++ if (ret != 12) {
++ return false;
++ }
++
++ id->uuid.time_low = time_low;
++ id->uuid.time_mid = time_mid;
++ id->uuid.time_hi_and_version = time_hi_and_version;
++ id->uuid.clock_seq[0] = clock_seq[0];
++ id->uuid.clock_seq[1] = clock_seq[1];
++ for (i=0; i<6; i++) {
++ id->uuid.node[i] = node[i];
++ }
++ id->if_version = if_version;
++
++ return true;
++}
+Index: samba-3.6.23/librpc/rpc/dcerpc_util.c
+===================================================================
+--- samba-3.6.23.orig/librpc/rpc/dcerpc_util.c
++++ samba-3.6.23/librpc/rpc/dcerpc_util.c
+@@ -27,6 +27,7 @@
+ #include "librpc/rpc/dcerpc.h"
+ #include "librpc/gen_ndr/ndr_dcerpc.h"
+ #include "rpc_common.h"
++#include "lib/util/bitmap.h"
+
+ /* we need to be able to get/set the fragment length without doing a full
+ decode */
+@@ -341,3 +342,194 @@ NTSTATUS dcerpc_read_ncacn_packet_recv(s
+ tevent_req_received(req);
+ return NT_STATUS_OK;
+ }
++
++struct dcerpc_sec_vt_header2 dcerpc_sec_vt_header2_from_ncacn_packet(const struct ncacn_packet *pkt)
++{
++ struct dcerpc_sec_vt_header2 ret;
++
++ ZERO_STRUCT(ret);
++ ret.ptype = pkt->ptype;
++ memcpy(&ret.drep, pkt->drep, sizeof(ret.drep));
++ ret.call_id = pkt->call_id;
++
++ switch (pkt->ptype) {
++ case DCERPC_PKT_REQUEST:
++ ret.context_id = pkt->u.request.context_id;
++ ret.opnum = pkt->u.request.opnum;
++ break;
++
++ case DCERPC_PKT_RESPONSE:
++ ret.context_id = pkt->u.response.context_id;
++ break;
++
++ case DCERPC_PKT_FAULT:
++ ret.context_id = pkt->u.fault.context_id;
++ break;
++
++ default:
++ break;
++ }
++
++ return ret;
++}
++
++bool dcerpc_sec_vt_header2_equal(const struct dcerpc_sec_vt_header2 *v1,
++ const struct dcerpc_sec_vt_header2 *v2)
++{
++ if (v1->ptype != v2->ptype) {
++ return false;
++ }
++
++ if (memcmp(v1->drep, v2->drep, sizeof(v1->drep)) != 0) {
++ return false;
++ }
++
++ if (v1->call_id != v2->call_id) {
++ return false;
++ }
++
++ if (v1->context_id != v2->context_id) {
++ return false;
++ }
++
++ if (v1->opnum != v2->opnum) {
++ return false;
++ }
++
++ return true;
++}
++
++static bool dcerpc_sec_vt_is_valid(const struct dcerpc_sec_verification_trailer *r)
++{
++ bool ret = false;
++ TALLOC_CTX *frame = talloc_stackframe();
++ struct bitmap *commands_seen;
++ int i;
++
++ if (r->count.count == 0) {
++ ret = true;
++ goto done;
++ }
++
++ if (memcmp(r->magic, DCERPC_SEC_VT_MAGIC, sizeof(r->magic)) != 0) {
++ goto done;
++ }
++
++ commands_seen = bitmap_talloc(frame, DCERPC_SEC_VT_COMMAND_ENUM + 1);
++ if (commands_seen == NULL) {
++ goto done;
++ }
++
++ for (i=0; i < r->count.count; i++) {
++ enum dcerpc_sec_vt_command_enum cmd =
++ r->commands[i].command & DCERPC_SEC_VT_COMMAND_ENUM;
++
++ if (bitmap_query(commands_seen, cmd)) {
++ /* Each command must appear at most once. */
++ goto done;
++ }
++ bitmap_set(commands_seen, cmd);
++
++ switch (cmd) {
++ case DCERPC_SEC_VT_COMMAND_BITMASK1:
++ case DCERPC_SEC_VT_COMMAND_PCONTEXT:
++ case DCERPC_SEC_VT_COMMAND_HEADER2:
++ break;
++ default:
++ if ((r->commands[i].u._unknown.length % 4) != 0) {
++ goto done;
++ }
++ break;
++ }
++ }
++ ret = true;
++done:
++ TALLOC_FREE(frame);
++ return ret;
++}
++
++#define CHECK(msg, ok) \
++do { \
++ if (!ok) { \
++ DEBUG(10, ("SEC_VT check %s failed\n", msg)); \
++ return false; \
++ } \
++} while(0)
++
++#define CHECK_SYNTAX(msg, s1, s2) \
++do { \
++ if (!ndr_syntax_id_equal(&s1, &s2)) { \
++ TALLOC_CTX *frame = talloc_stackframe(); \
++ DEBUG(10, ("SEC_VT check %s failed: %s vs. %s\n", msg, \
++ ndr_syntax_id_to_string(frame, &s1), \
++ ndr_syntax_id_to_string(frame, &s1))); \
++ TALLOC_FREE(frame); \
++ return false; \
++ } \
++} while(0)
++
++
++bool dcerpc_sec_verification_trailer_check(
++ const struct dcerpc_sec_verification_trailer *vt,
++ const uint32_t *bitmask1,
++ const struct dcerpc_sec_vt_pcontext *pcontext,
++ const struct dcerpc_sec_vt_header2 *header2)
++{
++ size_t i;
++
++ if (!dcerpc_sec_vt_is_valid(vt)) {
++ return false;
++ }
++
++ for (i=0; i < vt->count.count; i++) {
++ struct dcerpc_sec_vt *c = &vt->commands[i];
++
++ switch (c->command & DCERPC_SEC_VT_COMMAND_ENUM) {
++ case DCERPC_SEC_VT_COMMAND_BITMASK1:
++ if (bitmask1 == NULL) {
++ CHECK("Bitmask1 must_process_command",
++ !(c->command & DCERPC_SEC_VT_MUST_PROCESS));
++ break;
++ }
++
++ if (c->u.bitmask1 & DCERPC_SEC_VT_CLIENT_SUPPORTS_HEADER_SIGNING) {
++ CHECK("Bitmask1 client_header_signing",
++ *bitmask1 & DCERPC_SEC_VT_CLIENT_SUPPORTS_HEADER_SIGNING);
++ }
++ break;
++
++ case DCERPC_SEC_VT_COMMAND_PCONTEXT:
++ if (pcontext == NULL) {
++ CHECK("Pcontext must_process_command",
++ !(c->command & DCERPC_SEC_VT_MUST_PROCESS));
++ break;
++ }
++
++ CHECK_SYNTAX("Pcontect abstract_syntax",
++ pcontext->abstract_syntax,
++ c->u.pcontext.abstract_syntax);
++ CHECK_SYNTAX("Pcontext transfer_syntax",
++ pcontext->transfer_syntax,
++ c->u.pcontext.transfer_syntax);
++ break;
++
++ case DCERPC_SEC_VT_COMMAND_HEADER2: {
++ if (header2 == NULL) {
++ CHECK("Header2 must_process_command",
++ !(c->command & DCERPC_SEC_VT_MUST_PROCESS));
++ break;
++ }
++
++ CHECK("Header2", dcerpc_sec_vt_header2_equal(header2, &c->u.header2));
++ break;
++ }
++
++ default:
++ CHECK("Unknown must_process_command",
++ !(c->command & DCERPC_SEC_VT_MUST_PROCESS));
++ break;
++ }
++ }
++
++ return true;
++}
+Index: samba-3.6.23/librpc/rpc/rpc_common.h
+===================================================================
+--- samba-3.6.23.orig/librpc/rpc/rpc_common.h
++++ samba-3.6.23/librpc/rpc/rpc_common.h
+@@ -296,4 +296,45 @@ NTSTATUS dcerpc_binding_handle_call(stru
+ TALLOC_CTX *r_mem,
+ void *r_ptr);
+
++/**
++ * Extract header information from a ncacn_packet
++ * as a dcerpc_sec_vt_header2 as used by the security verification trailer.
++ *
++ * @param[in] pkt a packet
++ *
++ * @return a dcerpc_sec_vt_header2
++ */
++struct dcerpc_sec_vt_header2 dcerpc_sec_vt_header2_from_ncacn_packet(const struct ncacn_packet *pkt);
++
++
++/**
++ * Test if two dcerpc_sec_vt_header2 structures are equal
++ * without consideration of reserved fields.
++ *
++ * @param v1 a pointer to a dcerpc_sec_vt_header2 structure
++ * @param v2 a pointer to a dcerpc_sec_vt_header2 structure
++ *
++ * @retval true if *v1 equals *v2
++ */
++bool dcerpc_sec_vt_header2_equal(const struct dcerpc_sec_vt_header2 *v1,
++ const struct dcerpc_sec_vt_header2 *v2);
++
++/**
++ * Check for consistency of the security verification trailer with the PDU header.
++ * See <a href="http://msdn.microsoft.com/en-us/library/cc243559.aspx">MS-RPCE 2.2.2.13</a>.
++ * A check with an empty trailer succeeds.
++ *
++ * @param[in] vt a pointer to the security verification trailer.
++ * @param[in] bitmask1 which flags were negotiated on the connection.
++ * @param[in] pcontext the syntaxes negotiatied for the presentation context.
++ * @param[in] header2 some fields from the PDU header.
++ *
++ * @retval true on success.
++ */
++bool dcerpc_sec_verification_trailer_check(
++ const struct dcerpc_sec_verification_trailer *vt,
++ const uint32_t *bitmask1,
++ const struct dcerpc_sec_vt_pcontext *pcontext,
++ const struct dcerpc_sec_vt_header2 *header2);
++
+ #endif /* __DEFAULT_LIBRPC_RPCCOMMON_H__ */
+Index: samba-3.6.23/source4/torture/ndr/ndr.c
+===================================================================
+--- samba-3.6.23.orig/source4/torture/ndr/ndr.c
++++ samba-3.6.23/source4/torture/ndr/ndr.c
+@@ -29,40 +29,65 @@ struct ndr_pull_test_data {
+ DATA_BLOB data_context;
+ size_t struct_size;
+ ndr_pull_flags_fn_t pull_fn;
++ ndr_push_flags_fn_t push_fn;
+ int ndr_flags;
++ int flags;
+ };
+
+-static bool wrap_ndr_pull_test(struct torture_context *tctx,
+- struct torture_tcase *tcase,
+- struct torture_test *test)
++static bool wrap_ndr_pullpush_test(struct torture_context *tctx,
++ struct torture_tcase *tcase,
++ struct torture_test *test)
+ {
+ bool (*check_fn) (struct torture_context *ctx, void *data) = test->fn;
+ const struct ndr_pull_test_data *data = (const struct ndr_pull_test_data *)test->data;
+- void *ds = talloc_zero_size(tctx, data->struct_size);
+ struct ndr_pull *ndr = ndr_pull_init_blob(&(data->data), tctx);
++ void *ds = talloc_zero_size(ndr, data->struct_size);
++ bool ret;
++ uint32_t highest_ofs;
++
++ ndr->flags |= data->flags;
+
+ ndr->flags |= LIBNDR_FLAG_REF_ALLOC;
+
+ torture_assert_ndr_success(tctx, data->pull_fn(ndr, data->ndr_flags, ds),
+ "pulling");
+
+- torture_assert(tctx, ndr->offset == ndr->data_size,
++ if (ndr->offset > ndr->relative_highest_offset) {
++ highest_ofs = ndr->offset;
++ } else {
++ highest_ofs = ndr->relative_highest_offset;
++ }
++
++ torture_assert(tctx, highest_ofs == ndr->data_size,
+ talloc_asprintf(tctx,
+- "%d unread bytes", ndr->data_size - ndr->offset));
++ "%d unread bytes", ndr->data_size - highest_ofs));
+
+- if (check_fn != NULL)
+- return check_fn(tctx, ds);
+- else
+- return true;
++ if (check_fn != NULL) {
++ ret = check_fn(tctx, ds);
++ } else {
++ ret = true;
++ }
++
++ if (data->push_fn != NULL) {
++ DATA_BLOB outblob;
++ torture_assert_ndr_success(tctx, ndr_push_struct_blob(&outblob, ndr, ds, data->push_fn), "pushing");
++ torture_assert_data_blob_equal(tctx, outblob, data->data, "ndr push compare");
++ }
++
++ talloc_free(ndr);
++ return ret;
+ }
+
+-_PUBLIC_ struct torture_test *_torture_suite_add_ndr_pull_test(
+- struct torture_suite *suite,
+- const char *name, ndr_pull_flags_fn_t pull_fn,
+- DATA_BLOB db,
+- size_t struct_size,
+- int ndr_flags,
+- bool (*check_fn) (struct torture_context *ctx, void *data))
++_PUBLIC_ struct torture_test *_torture_suite_add_ndr_pullpush_test(
++ struct torture_suite *suite,
++ const char *name,
++ ndr_pull_flags_fn_t pull_fn,
++ ndr_push_flags_fn_t push_fn,
++ DATA_BLOB db,
++ size_t struct_size,
++ int ndr_flags,
++ int flags,
++ bool (*check_fn) (struct torture_context *ctx, void *data))
+ {
+ struct torture_test *test;
+ struct torture_tcase *tcase;
+@@ -74,12 +99,16 @@ _PUBLIC_ struct torture_test *_torture_s
+
+ test->name = talloc_strdup(test, name);
+ test->description = NULL;
+- test->run = wrap_ndr_pull_test;
++ test->run = wrap_ndr_pullpush_test;
++
+ data = talloc(test, struct ndr_pull_test_data);
+ data->data = db;
+ data->ndr_flags = ndr_flags;
++ data->flags = flags;
+ data->struct_size = struct_size;
+ data->pull_fn = pull_fn;
++ data->push_fn = push_fn;
++
+ test->data = data;
+ test->fn = check_fn;
+ test->dangerous = false;
+@@ -89,6 +118,7 @@ _PUBLIC_ struct torture_test *_torture_s
+ return test;
+ }
+
++
+ static bool wrap_ndr_inout_pull_test(struct torture_context *tctx,
+ struct torture_tcase *tcase,
+ struct torture_test *test)
+@@ -97,6 +127,7 @@ static bool wrap_ndr_inout_pull_test(str
+ const struct ndr_pull_test_data *data = (const struct ndr_pull_test_data *)test->data;
+ void *ds = talloc_zero_size(tctx, data->struct_size);
+ struct ndr_pull *ndr;
++ uint32_t highest_ofs;
+
+ /* handle NDR_IN context */
+
+@@ -109,8 +140,14 @@ static bool wrap_ndr_inout_pull_test(str
+ data->pull_fn(ndr, NDR_IN, ds),
+ "ndr pull of context failed");
+
+- torture_assert(tctx, ndr->offset == ndr->data_size,
+- talloc_asprintf(tctx, "%d unread bytes", ndr->data_size - ndr->offset));
++ if (ndr->offset > ndr->relative_highest_offset) {
++ highest_ofs = ndr->offset;
++ } else {
++ highest_ofs = ndr->relative_highest_offset;
++ }
++
++ torture_assert(tctx, highest_ofs == ndr->data_size,
++ talloc_asprintf(tctx, "%d unread bytes", ndr->data_size - highest_ofs));
+
+ talloc_free(ndr);
+
+@@ -125,8 +162,14 @@ static bool wrap_ndr_inout_pull_test(str
+ data->pull_fn(ndr, NDR_OUT, ds),
+ "ndr pull failed");
+
+- torture_assert(tctx, ndr->offset == ndr->data_size,
+- talloc_asprintf(tctx, "%d unread bytes", ndr->data_size - ndr->offset));
++ if (ndr->offset > ndr->relative_highest_offset) {
++ highest_ofs = ndr->offset;
++ } else {
++ highest_ofs = ndr->relative_highest_offset;
++ }
++
++ torture_assert(tctx, highest_ofs == ndr->data_size,
++ talloc_asprintf(tctx, "%d unread bytes", ndr->data_size - highest_ofs));
+
+ talloc_free(ndr);
+
+Index: samba-3.6.23/source4/torture/ndr/ndr.h
+===================================================================
+--- samba-3.6.23.orig/source4/torture/ndr/ndr.h
++++ samba-3.6.23/source4/torture/ndr/ndr.h
+@@ -24,12 +24,15 @@
+ #include "librpc/ndr/libndr.h"
+ #include "libcli/security/security.h"
+
+-_PUBLIC_ struct torture_test *_torture_suite_add_ndr_pull_test(
++_PUBLIC_ struct torture_test *_torture_suite_add_ndr_pullpush_test(
+ struct torture_suite *suite,
+- const char *name, ndr_pull_flags_fn_t fn,
++ const char *name,
++ ndr_pull_flags_fn_t pull_fn,
++ ndr_push_flags_fn_t push_fn,
+ DATA_BLOB db,
+ size_t struct_size,
+ int ndr_flags,
++ int flags,
+ bool (*check_fn) (struct torture_context *, void *data));
+
+ _PUBLIC_ struct torture_test *_torture_suite_add_ndr_pull_inout_test(
+@@ -41,20 +44,32 @@ _PUBLIC_ struct torture_test *_torture_s
+ bool (*check_fn) (struct torture_context *ctx, void *data));
+
+ #define torture_suite_add_ndr_pull_test(suite,name,data,check_fn) \
+- _torture_suite_add_ndr_pull_test(suite, #name, \
+- (ndr_pull_flags_fn_t)ndr_pull_ ## name, data_blob_talloc(suite, data, sizeof(data)), \
+- sizeof(struct name), NDR_SCALARS|NDR_BUFFERS, (bool (*) (struct torture_context *, void *)) check_fn);
++ _torture_suite_add_ndr_pullpush_test(suite, #name, \
++ (ndr_pull_flags_fn_t)ndr_pull_ ## name, NULL, data_blob_const(data, sizeof(data)), \
++ sizeof(struct name), NDR_SCALARS|NDR_BUFFERS, 0, (bool (*) (struct torture_context *, void *)) check_fn);
+
+ #define torture_suite_add_ndr_pull_fn_test(suite,name,data,flags,check_fn) \
+- _torture_suite_add_ndr_pull_test(suite, #name "_" #flags, \
+- (ndr_pull_flags_fn_t)ndr_pull_ ## name, data_blob_talloc(suite, data, sizeof(data)), \
+- sizeof(struct name), flags, (bool (*) (struct torture_context *, void *)) check_fn);
++ _torture_suite_add_ndr_pullpush_test(suite, #name "_" #flags, \
++ (ndr_pull_flags_fn_t)ndr_pull_ ## name, NULL, data_blob_const(data, sizeof(data)), \
++ sizeof(struct name), flags, 0, (bool (*) (struct torture_context *, void *)) check_fn);
++
++#define torture_suite_add_ndr_pull_fn_test_flags(suite,name,data,flags,flags2,check_fn) \
++ _torture_suite_add_ndr_pullpush_test(suite, #name "_" #flags "_" #flags2, \
++ (ndr_pull_flags_fn_t)ndr_pull_ ## name, NULL, data_blob_const(data, sizeof(data)), \
++ sizeof(struct name), flags, flags2, (bool (*) (struct torture_context *, void *)) check_fn);
++
++#define torture_suite_add_ndr_pullpush_test(suite,name,data_blob,check_fn) \
++ _torture_suite_add_ndr_pullpush_test(suite, #name, \
++ (ndr_pull_flags_fn_t)ndr_pull_ ## name, \
++ (ndr_push_flags_fn_t)ndr_push_ ## name, \
++ data_blob, \
++ sizeof(struct name), NDR_SCALARS|NDR_BUFFERS, 0, (bool (*) (struct torture_context *, void *)) check_fn);
+
+ #define torture_suite_add_ndr_pull_io_test(suite,name,data_in,data_out,check_fn_out) \
+ _torture_suite_add_ndr_pull_inout_test(suite, #name "_INOUT", \
+ (ndr_pull_flags_fn_t)ndr_pull_ ## name, \
+- data_blob_talloc(suite, data_in, sizeof(data_in)), \
+- data_blob_talloc(suite, data_out, sizeof(data_out)), \
++ data_blob_const(data_in, sizeof(data_in)), \
++ data_blob_const(data_out, sizeof(data_out)), \
+ sizeof(struct name), \
+ (bool (*) (struct torture_context *, void *)) check_fn_out);
+
+Index: samba-3.6.23/source4/torture/ndr/dfsblob.c
+===================================================================
+--- samba-3.6.23.orig/source4/torture/ndr/dfsblob.c
++++ samba-3.6.23/source4/torture/ndr/dfsblob.c
+@@ -74,11 +74,11 @@ struct torture_suite *ndr_dfsblob_suite(
+ {
+ struct torture_suite *suite = torture_suite_create(ctx, "dfsblob");
+
+- torture_suite_add_ndr_pull_fn_test(suite, dfs_GetDFSReferral_in, dfs_get_ref_in, NDR_IN, NULL);
++ torture_suite_add_ndr_pull_test(suite, dfs_GetDFSReferral_in, dfs_get_ref_in, NULL);
+
+- torture_suite_add_ndr_pull_fn_test(suite, dfs_referral_resp, dfs_get_ref_out2, NDR_BUFFERS|NDR_SCALARS, NULL);
++ torture_suite_add_ndr_pull_test(suite, dfs_referral_resp, dfs_get_ref_out2, NULL);
+
+- torture_suite_add_ndr_pull_fn_test(suite, dfs_referral_resp, dfs_get_ref_out, NDR_BUFFERS|NDR_SCALARS,dfs_referral_out_check);
++ torture_suite_add_ndr_pull_test(suite, dfs_referral_resp, dfs_get_ref_out,dfs_referral_out_check);
+
+ return suite;
+ }
+Index: samba-3.6.23/source4/torture/ndr/nbt.c
+===================================================================
+--- samba-3.6.23.orig/source4/torture/ndr/nbt.c
++++ samba-3.6.23/source4/torture/ndr/nbt.c
+@@ -62,9 +62,9 @@ struct torture_suite *ndr_nbt_suite(TALL
+ {
+ struct torture_suite *suite = torture_suite_create(ctx, "nbt");
+
+- torture_suite_add_ndr_pull_fn_test(suite, nbt_netlogon_packet, netlogon_logon_request_req_data, NDR_IN, netlogon_logon_request_req_check);
++ torture_suite_add_ndr_pull_test(suite, nbt_netlogon_packet, netlogon_logon_request_req_data, netlogon_logon_request_req_check);
+
+- torture_suite_add_ndr_pull_fn_test(suite, nbt_netlogon_response2, netlogon_logon_request_resp_data, NDR_IN, netlogon_logon_request_resp_check);
++ torture_suite_add_ndr_pull_test(suite, nbt_netlogon_response2, netlogon_logon_request_resp_data, netlogon_logon_request_resp_check);
+
+ return suite;
+ }
+Index: samba-3.6.23/source4/torture/ndr/ntlmssp.c
+===================================================================
+--- samba-3.6.23.orig/source4/torture/ndr/ntlmssp.c
++++ samba-3.6.23/source4/torture/ndr/ntlmssp.c
+@@ -111,9 +111,10 @@ struct torture_suite *ndr_ntlmssp_suite(
+ {
+ struct torture_suite *suite = torture_suite_create(ctx, "ntlmssp");
+
+- torture_suite_add_ndr_pull_fn_test(suite, NEGOTIATE_MESSAGE, ntlmssp_NEGOTIATE_MESSAGE_data, NDR_IN, ntlmssp_NEGOTIATE_MESSAGE_check);
+- /* torture_suite_add_ndr_pull_fn_test(suite, CHALLENGE_MESSAGE, ntlmssp_CHALLENGE_MESSAGE_data, NDR_IN, ntlmssp_CHALLENGE_MESSAGE_check);
+- torture_suite_add_ndr_pull_fn_test(suite, AUTHENTICATE_MESSAGE, ntlmssp_AUTHENTICATE_MESSAGE_data, NDR_IN, ntlmssp_AUTHENTICATE_MESSAGE_check); */
+-
++ torture_suite_add_ndr_pull_test(suite, NEGOTIATE_MESSAGE, ntlmssp_NEGOTIATE_MESSAGE_data, ntlmssp_NEGOTIATE_MESSAGE_check);
++#if 0
++ torture_suite_add_ndr_pull_test(suite, CHALLENGE_MESSAGE, ntlmssp_CHALLENGE_MESSAGE_data, ntlmssp_CHALLENGE_MESSAGE_check);
++ torture_suite_add_ndr_pull_test(suite, AUTHENTICATE_MESSAGE, ntlmssp_AUTHENTICATE_MESSAGE_data, ntlmssp_AUTHENTICATE_MESSAGE_check);
++#endif
+ return suite;
+ }
+Index: samba-3.6.23/source4/torture/ndr/drsblobs.c
+===================================================================
+--- samba-3.6.23.orig/source4/torture/ndr/drsblobs.c
++++ samba-3.6.23/source4/torture/ndr/drsblobs.c
+@@ -115,6 +115,34 @@ static const uint8_t trust_domain_passwo
+ 0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00
+ };
+
++/* these are taken from the trust objects of a w2k8r2 forest, with a
++ * trust relationship between the forest parent and a child domain
++ */
++static const char *trustAuthIncoming =
++"AQAAAAwAAAAcAQAASuQ+RXJdzAECAAAAAAEAAMOWL6UVfVKiJOUsGcT03H"
++"jHxr2ACsMMOV5ynM617Tp7idNC+c4egdqk4S9YEpvR2YvHmdZdymL6F7QKm8OkXazYZF2r/gZ/bI+"
++"jkWbsn4O8qyAc3OUKQRZwBbf+lxBW+vM4O3ZpUjz5BSKCcFQgM+MY91yVU8Nji3HNnvGnDquobFAZ"
++"hxjL+S1l5+QZgkfyfv5mQScGRbU1Lar1xg9G3JznUb7S6pvrBO2nwK8g+KZBfJy5UeULigDH4IWo/"
++"JmtaEGkKE2uiKIjdsEQd/uwnkouW26XzRc0ulfJnPFftGnT9KIcShPf7DLj/tstmQAAceRMFHJTY3"
++"PmxoowoK8HUyBK5D5Fcl3MAQIAAAAAAQAAw5YvpRV9UqIk5SwZxPTceMfGvYAKwww5XnKczrXtOnu"
++"J00L5zh6B2qThL1gSm9HZi8eZ1l3KYvoXtAqbw6RdrNhkXav+Bn9sj6ORZuyfg7yrIBzc5QpBFnAF"
++"t/6XEFb68zg7dmlSPPkFIoJwVCAz4xj3XJVTw2OLcc2e8acOq6hsUBmHGMv5LWXn5BmCR/J+/mZBJ"
++"wZFtTUtqvXGD0bcnOdRvtLqm+sE7afAryD4pkF8nLlR5QuKAMfghaj8ma1oQaQoTa6IoiN2wRB3+7"
++"CeSi5bbpfNFzS6V8mc8V+0adP0ohxKE9/sMuP+2y2ZAABx5EwUclNjc+bGijCgrwdTIA==";
++
++static const char *trustAuthOutgoing =
++"AQAAAAwAAAAcAQAASuQ+RXJdzAECAAAAAAEAAMOWL6UVfVKiJOUsGcT03H"
++"jHxr2ACsMMOV5ynM617Tp7idNC+c4egdqk4S9YEpvR2YvHmdZdymL6F7QKm8OkXazYZF2r/gZ/bI+"
++"jkWbsn4O8qyAc3OUKQRZwBbf+lxBW+vM4O3ZpUjz5BSKCcFQgM+MY91yVU8Nji3HNnvGnDquobFAZ"
++"hxjL+S1l5+QZgkfyfv5mQScGRbU1Lar1xg9G3JznUb7S6pvrBO2nwK8g+KZBfJy5UeULigDH4IWo/"
++"JmtaEGkKE2uiKIjdsEQd/uwnkouW26XzRc0ulfJnPFftGnT9KIcShPf7DLj/tstmQAAceRMFHJTY3"
++"PmxoowoK8HUyBK5D5Fcl3MAQIAAAAAAQAAw5YvpRV9UqIk5SwZxPTceMfGvYAKwww5XnKczrXtOnu"
++"J00L5zh6B2qThL1gSm9HZi8eZ1l3KYvoXtAqbw6RdrNhkXav+Bn9sj6ORZuyfg7yrIBzc5QpBFnAF"
++"t/6XEFb68zg7dmlSPPkFIoJwVCAz4xj3XJVTw2OLcc2e8acOq6hsUBmHGMv5LWXn5BmCR/J+/mZBJ"
++"wZFtTUtqvXGD0bcnOdRvtLqm+sE7afAryD4pkF8nLlR5QuKAMfghaj8ma1oQaQoTa6IoiN2wRB3+7"
++"CeSi5bbpfNFzS6V8mc8V+0adP0ohxKE9/sMuP+2y2ZAABx5EwUclNjc+bGijCgrwdTIA==";
++
++
+ static bool trust_domain_passwords_check_in(struct torture_context *tctx,
+ struct trustDomainPasswords *r)
+ {
+@@ -154,8 +182,20 @@ struct torture_suite *ndr_drsblobs_suite
+ {
+ struct torture_suite *suite = torture_suite_create(ctx, "drsblobs");
+
+- torture_suite_add_ndr_pull_fn_test(suite, ForestTrustInfo, forest_trust_info_data_out, NDR_IN, forest_trust_info_check_out);
+- torture_suite_add_ndr_pull_fn_test(suite, trustDomainPasswords, trust_domain_passwords_in, NDR_IN, trust_domain_passwords_check_in);
++ torture_suite_add_ndr_pull_test(suite, ForestTrustInfo, forest_trust_info_data_out, forest_trust_info_check_out);
++ torture_suite_add_ndr_pull_test(suite, trustDomainPasswords, trust_domain_passwords_in, trust_domain_passwords_check_in);
++
++#if 0
++ torture_suite_add_ndr_pullpush_test(suite,
++ trustAuthInOutBlob,
++ base64_decode_data_blob_talloc(suite, trustAuthIncoming),
++ NULL);
++
++ torture_suite_add_ndr_pullpush_test(suite,
++ trustAuthInOutBlob,
++ base64_decode_data_blob_talloc(suite, trustAuthOutgoing),
++ NULL);
++#endif
+
+ return suite;
+ }
+Index: samba-3.6.23/source3/rpcclient/rpcclient.c
+===================================================================
+--- samba-3.6.23.orig/source3/rpcclient/rpcclient.c
++++ samba-3.6.23/source3/rpcclient/rpcclient.c
+@@ -1021,6 +1021,10 @@ out_free:
+ binding->transport = NCACN_NP;
+ }
+
++ if (binding->flags & DCERPC_CONNECT) {
++ pipe_default_auth_level = DCERPC_AUTH_LEVEL_CONNECT;
++ pipe_default_auth_type = DCERPC_AUTH_TYPE_NTLMSSP;
++ }
+ if (binding->flags & DCERPC_SIGN) {
+ pipe_default_auth_level = DCERPC_AUTH_LEVEL_INTEGRITY;
+ pipe_default_auth_type = DCERPC_AUTH_TYPE_NTLMSSP;
+@@ -1034,12 +1038,6 @@ out_free:
+ pipe_default_auth_spnego_type = PIPE_AUTH_TYPE_SPNEGO_NTLMSSP;
+ }
+ if (binding->flags & DCERPC_AUTH_NTLM) {
+- /* If neither Integrity or Privacy are requested then
+- * Use just Connect level */
+- if (pipe_default_auth_level == DCERPC_AUTH_LEVEL_NONE) {
+- pipe_default_auth_level = DCERPC_AUTH_LEVEL_CONNECT;
+- }
+-
+ if (pipe_default_auth_type == DCERPC_AUTH_TYPE_SPNEGO) {
+ pipe_default_auth_spnego_type = PIPE_AUTH_TYPE_SPNEGO_NTLMSSP;
+ } else {
+@@ -1047,18 +1045,19 @@ out_free:
+ }
+ }
+ if (binding->flags & DCERPC_AUTH_KRB5) {
+- /* If neither Integrity or Privacy are requested then
+- * Use just Connect level */
+- if (pipe_default_auth_level == DCERPC_AUTH_LEVEL_NONE) {
+- pipe_default_auth_level = DCERPC_AUTH_LEVEL_CONNECT;
+- }
+-
+ if (pipe_default_auth_type == DCERPC_AUTH_TYPE_SPNEGO) {
+ pipe_default_auth_spnego_type = PIPE_AUTH_TYPE_SPNEGO_KRB5;
+ } else {
+ pipe_default_auth_type = DCERPC_AUTH_TYPE_KRB5;
+ }
+ }
++ if (pipe_default_auth_type != DCERPC_AUTH_TYPE_NONE) {
++ /* If neither Integrity or Privacy are requested then
++ * Use just Connect level */
++ if (pipe_default_auth_level == DCERPC_AUTH_LEVEL_NONE) {
++ pipe_default_auth_level = DCERPC_AUTH_LEVEL_CONNECT;
++ }
++ }
+
+ if (get_cmdline_auth_info_use_kerberos(rpcclient_auth_info)) {
+ flags |= CLI_FULL_CONNECTION_USE_KERBEROS |
+Index: samba-3.6.23/source3/script/tests/test_rpcclient.sh
+===================================================================
+--- /dev/null
++++ samba-3.6.23/source3/script/tests/test_rpcclient.sh
+@@ -0,0 +1,19 @@
++#!/bin/sh
++
++if [ $# -lt 1 ]; then
++cat <<EOF
++Usage: test_rpcclient.sh ccache binding <rpcclient commands>
++EOF
++exit 1;
++fi
++
++KRB5CCNAME=$1
++shift 1
++export KRB5CCNAME
++ADDARGS="$*"
++
++incdir=`dirname $0`/../../../testprogs/blackbox
++. $incdir/subunit.sh
++testit "rpcclient" $VALGRIND $BINDIR/rpcclient -c 'getusername' $ADDARGS || failed=`expr $failed + 1`
++
++testok $0 $failed
+Index: samba-3.6.23/source3/selftest/tests.py
+===================================================================
+--- samba-3.6.23.orig/source3/selftest/tests.py
++++ samba-3.6.23/source3/selftest/tests.py
+@@ -208,7 +208,7 @@ if sub.returncode == 0:
+ plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmpcase -U$USERNAME%$PASSWORD')
+
+ test = 'rpc.lsa.lookupsids'
+- auth_options = ["", "ntlm", "spnego" ]
++ auth_options = ["", "ntlm", "spnego", "spnego,ntlm" ]
+ signseal_options = ["", ",connect", ",sign", ",seal"]
+ smb_options = ["", ",smb2"]
+ endianness_options = ["", ",bigendian"]
+@@ -219,6 +219,9 @@ if sub.returncode == 0:
+ binding_string = "ncacn_np:$SERVER_IP[%s%s%s%s]" % (a, s, z, e)
+ options = binding_string + " -U$USERNAME%$PASSWORD"
+ plansmbtorturetestsuite(test, "s3dc", options, 'over ncacn_np with [%s%s%s%s] ' % (a, s, z, e))
++ plantestsuite("samba3.blackbox.rpcclient over ncacn_np with [%s%s%s%s] " % (a, s, z, e), "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_rpcclient.sh"),
++ "none", options, configuration])
++
+ for e in endianness_options:
+ for a in auth_options:
+ for s in signseal_options:
+Index: samba-3.6.23/source4/torture/rpc/rpc.c
+===================================================================
+--- samba-3.6.23.orig/source4/torture/rpc/rpc.c
++++ samba-3.6.23/source4/torture/rpc/rpc.c
+@@ -501,6 +501,7 @@ NTSTATUS torture_rpc_init(void)
+ torture_suite_add_suite(suite, torture_rpc_samr_passwords_pwdlastset(suite));
+ torture_suite_add_suite(suite, torture_rpc_samr_passwords_badpwdcount(suite));
+ torture_suite_add_suite(suite, torture_rpc_samr_passwords_lockout(suite));
++ torture_suite_add_suite(suite, torture_rpc_samr_passwords_validate(suite));
+ torture_suite_add_suite(suite, torture_rpc_samr_user_privileges(suite));
+ torture_suite_add_suite(suite, torture_rpc_samr_large_dc(suite));
+ torture_suite_add_suite(suite, torture_rpc_epmapper(suite));
+Index: samba-3.6.23/source4/torture/rpc/samr.c
+===================================================================
+--- samba-3.6.23.orig/source4/torture/rpc/samr.c
++++ samba-3.6.23/source4/torture/rpc/samr.c
+@@ -7938,8 +7938,8 @@ static bool test_Connect(struct dcerpc_b
+ }
+
+
+-static bool test_samr_ValidatePassword(struct dcerpc_pipe *p,
+- struct torture_context *tctx)
++static bool test_samr_ValidatePassword(struct torture_context *tctx,
++ struct dcerpc_pipe *p)
+ {
+ struct samr_ValidatePassword r;
+ union samr_ValidatePasswordReq req;
+@@ -7951,6 +7951,10 @@ static bool test_samr_ValidatePassword(s
+
+ torture_comment(tctx, "Testing samr_ValidatePassword\n");
+
++ if (p->conn->transport.transport != NCACN_IP_TCP) {
++ torture_comment(tctx, "samr_ValidatePassword only should succeed over NCACN_IP_TCP!\n");
++ }
++
+ ZERO_STRUCT(r);
+ r.in.level = NetValidatePasswordReset;
+ r.in.req = &req;
+@@ -8074,8 +8078,6 @@ bool torture_rpc_samr_passwords(struct t
+
+ ret &= test_samr_handle_Close(b, torture, &ctx->handle);
+
+- ret &= test_samr_ValidatePassword(p, torture);
+-
+ return ret;
+ }
+
+@@ -8370,4 +8372,15 @@ struct torture_suite *torture_rpc_samr_p
+ return suite;
+ }
+
++struct torture_suite *torture_rpc_samr_passwords_validate(TALLOC_CTX *mem_ctx)
++{
++ struct torture_suite *suite = torture_suite_create(mem_ctx, "samr.passwords.validate");
++ struct torture_rpc_tcase *tcase;
++
++ tcase = torture_suite_add_rpc_iface_tcase(suite, "samr",
++ &ndr_table_samr);
++ torture_rpc_tcase_add_test(tcase, "validate",
++ test_samr_ValidatePassword);
+
++ return suite;
++}
+Index: samba-3.6.23/source3/rpc_server/srv_pipe.c
+===================================================================
+--- samba-3.6.23.orig/source3/rpc_server/srv_pipe.c
++++ samba-3.6.23/source3/rpc_server/srv_pipe.c
+@@ -42,6 +42,7 @@
+ #include "auth.h"
+ #include "ntdomain.h"
+ #include "rpc_server/srv_pipe.h"
++#include "../librpc/ndr/ndr_dcerpc.h"
+
+ #undef DBGC_CLASS
+ #define DBGC_CLASS DBGC_RPC_SRV
+@@ -202,7 +203,7 @@ bool create_next_pdu(struct pipes_struct
+ * the pipe gets closed. JRA.
+ */
+ if (p->fault_state) {
+- setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR));
++ setup_fault_pdu(p, NT_STATUS(p->fault_state));
+ return true;
+ }
+
+@@ -336,7 +337,7 @@ static bool check_bind_req(struct pipes_
+ struct pipe_rpc_fns *context_fns;
+
+ DEBUG(3,("check_bind_req for %s\n",
+- get_pipe_name_from_syntax(talloc_tos(), &p->syntax)));
++ get_pipe_name_from_syntax(talloc_tos(), abstract)));
+
+ /* we have to check all now since win2k introduced a new UUID on the lsaprpc pipe */
+ if (rpc_srv_pipe_exists_by_id(abstract) &&
+@@ -358,6 +359,7 @@ static bool check_bind_req(struct pipes_
+ context_fns->n_cmds = rpc_srv_get_pipe_num_cmds(abstract);
+ context_fns->cmds = rpc_srv_get_pipe_cmds(abstract);
+ context_fns->context_id = context_id;
++ context_fns->syntax = *abstract;
+
+ /* add to the list of open contexts */
+
+@@ -1541,7 +1543,42 @@ static PIPE_RPC_FNS* find_pipe_fns_by_co
+ }
+
+ static bool api_rpcTNP(struct pipes_struct *p, struct ncacn_packet *pkt,
+- const struct api_struct *api_rpc_cmds, int n_cmds);
++ const struct api_struct *api_rpc_cmds, int n_cmds,
++ const struct ndr_syntax_id *syntax);
++
++static bool srv_pipe_check_verification_trailer(struct pipes_struct *p,
++ struct ncacn_packet *pkt,
++ struct pipe_rpc_fns *pipe_fns)
++{
++ TALLOC_CTX *frame = talloc_stackframe();
++ struct dcerpc_sec_verification_trailer *vt = NULL;
++ const uint32_t bitmask1 = 0;
++ const struct dcerpc_sec_vt_pcontext pcontext = {
++ .abstract_syntax = pipe_fns->syntax,
++ .transfer_syntax = ndr_transfer_syntax,
++ };
++ const struct dcerpc_sec_vt_header2 header2 =
++ dcerpc_sec_vt_header2_from_ncacn_packet(pkt);
++ struct ndr_pull *ndr;
++ enum ndr_err_code ndr_err;
++ bool ret = false;
++
++ ndr = ndr_pull_init_blob(&p->in_data.data, frame);
++ if (ndr == NULL) {
++ goto done;
++ }
++
++ ndr_err = ndr_pop_dcerpc_sec_verification_trailer(ndr, frame, &vt);
++ if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
++ goto done;
++ }
++
++ ret = dcerpc_sec_verification_trailer_check(vt, &bitmask1,
++ &pcontext, &header2);
++done:
++ TALLOC_FREE(frame);
++ return ret;
++}
+
+ /****************************************************************************
+ Find the correct RPC function to call for this request.
+@@ -1552,46 +1589,53 @@ static bool api_rpcTNP(struct pipes_stru
+ static bool api_pipe_request(struct pipes_struct *p,
+ struct ncacn_packet *pkt)
+ {
++ TALLOC_CTX *frame = talloc_stackframe();
+ bool ret = False;
+- bool changed_user = False;
+ PIPE_RPC_FNS *pipe_fns;
+
+- if (p->pipe_bound &&
+- ((p->auth.auth_type == DCERPC_AUTH_TYPE_NTLMSSP) ||
+- (p->auth.auth_type == DCERPC_AUTH_TYPE_KRB5) ||
+- (p->auth.auth_type == DCERPC_AUTH_TYPE_SPNEGO))) {
+- if(!become_authenticated_pipe_user(p->session_info)) {
+- data_blob_free(&p->out_data.rdata);
+- return False;
+- }
+- changed_user = True;
++ if (!p->pipe_bound) {
++ DEBUG(1, ("Pipe not bound!\n"));
++ data_blob_free(&p->out_data.rdata);
++ TALLOC_FREE(frame);
++ return false;
+ }
+
+- DEBUG(5, ("Requested \\PIPE\\%s\n",
+- get_pipe_name_from_syntax(talloc_tos(), &p->syntax)));
+-
+ /* get the set of RPC functions for this context */
+
+ pipe_fns = find_pipe_fns_by_context(p->contexts,
+ pkt->u.request.context_id);
+-
+- if ( pipe_fns ) {
+- TALLOC_CTX *frame = talloc_stackframe();
+- ret = api_rpcTNP(p, pkt, pipe_fns->cmds, pipe_fns->n_cmds);
++ if (pipe_fns == NULL) {
++ DEBUG(0, ("No rpc function table associated with context "
++ "[%d]\n",
++ pkt->u.request.context_id));
++ data_blob_free(&p->out_data.rdata);
+ TALLOC_FREE(frame);
++ return false;
+ }
+- else {
+- DEBUG(0, ("No rpc function table associated with context "
+- "[%d] on pipe [%s]\n",
+- pkt->u.request.context_id,
+- get_pipe_name_from_syntax(talloc_tos(),
+- &p->syntax)));
++
++ DEBUG(5, ("Requested \\PIPE\\%s\n",
++ get_pipe_name_from_syntax(talloc_tos(), &pipe_fns->syntax)));
++
++ if (!srv_pipe_check_verification_trailer(p, pkt, pipe_fns)) {
++ DEBUG(1, ("srv_pipe_check_verification_trailer: failed\n"));
++ setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_ACCESS_DENIED));
++ data_blob_free(&p->out_data.rdata);
++ TALLOC_FREE(frame);
++ return true;
+ }
+
+- if (changed_user) {
+- unbecome_authenticated_pipe_user();
++ if (!become_authenticated_pipe_user(p->session_info)) {
++ DEBUG(1, ("Failed to become pipe user!\n"));
++ data_blob_free(&p->out_data.rdata);
++ TALLOC_FREE(frame);
++ return false;
+ }
+
++ ret = api_rpcTNP(p, pkt, pipe_fns->cmds, pipe_fns->n_cmds,
++ &pipe_fns->syntax);
++ unbecome_authenticated_pipe_user();
++
++ TALLOC_FREE(frame);
+ return ret;
+ }
+
+@@ -1600,20 +1644,21 @@ static bool api_pipe_request(struct pipe
+ ********************************************************************/
+
+ static bool api_rpcTNP(struct pipes_struct *p, struct ncacn_packet *pkt,
+- const struct api_struct *api_rpc_cmds, int n_cmds)
++ const struct api_struct *api_rpc_cmds, int n_cmds,
++ const struct ndr_syntax_id *syntax)
+ {
+ int fn_num;
+ uint32_t offset1;
+
+ /* interpret the command */
+ DEBUG(4,("api_rpcTNP: %s op 0x%x - ",
+- get_pipe_name_from_syntax(talloc_tos(), &p->syntax),
++ get_pipe_name_from_syntax(talloc_tos(), syntax),
+ pkt->u.request.opnum));
+
+ if (DEBUGLEVEL >= 50) {
+ fstring name;
+ slprintf(name, sizeof(name)-1, "in_%s",
+- get_pipe_name_from_syntax(talloc_tos(), &p->syntax));
++ get_pipe_name_from_syntax(talloc_tos(), syntax));
+ dump_pdu_region(name, pkt->u.request.opnum,
+ &p->in_data.data, 0,
+ p->in_data.data.length);
+@@ -1646,37 +1691,30 @@ static bool api_rpcTNP(struct pipes_stru
+ /* do the actual command */
+ if(!api_rpc_cmds[fn_num].fn(p)) {
+ DEBUG(0,("api_rpcTNP: %s: %s failed.\n",
+- get_pipe_name_from_syntax(talloc_tos(), &p->syntax),
++ get_pipe_name_from_syntax(talloc_tos(), syntax),
+ api_rpc_cmds[fn_num].name));
+ data_blob_free(&p->out_data.rdata);
+ return False;
+ }
+
+- if (p->bad_handle_fault_state) {
+- DEBUG(4,("api_rpcTNP: bad handle fault return.\n"));
+- p->bad_handle_fault_state = False;
+- setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_CONTEXT_MISMATCH));
+- return True;
+- }
+-
+- if (p->rng_fault_state) {
+- DEBUG(4, ("api_rpcTNP: rng fault return\n"));
+- p->rng_fault_state = False;
+- setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR));
+- return True;
++ if (p->fault_state) {
++ DEBUG(4,("api_rpcTNP: fault(%d) return.\n", p->fault_state));
++ setup_fault_pdu(p, NT_STATUS(p->fault_state));
++ p->fault_state = 0;
++ return true;
+ }
+
+ if (DEBUGLEVEL >= 50) {
+ fstring name;
+ slprintf(name, sizeof(name)-1, "out_%s",
+- get_pipe_name_from_syntax(talloc_tos(), &p->syntax));
++ get_pipe_name_from_syntax(talloc_tos(), syntax));
+ dump_pdu_region(name, pkt->u.request.opnum,
+ &p->out_data.rdata, offset1,
+ p->out_data.rdata.length);
+ }
+
+ DEBUG(5,("api_rpcTNP: called %s successfully\n",
+- get_pipe_name_from_syntax(talloc_tos(), &p->syntax)));
++ get_pipe_name_from_syntax(talloc_tos(), syntax)));
+
+ /* Check for buffer underflow in rpc parsing */
+ if ((DEBUGLEVEL >= 10) &&
+@@ -1718,9 +1756,9 @@ void set_incoming_fault(struct pipes_str
+ data_blob_free(&p->in_data.data);
+ p->in_data.pdu_needed_len = 0;
+ p->in_data.pdu.length = 0;
+- p->fault_state = True;
+- DEBUG(10, ("set_incoming_fault: Setting fault state on pipe %s\n",
+- get_pipe_name_from_syntax(talloc_tos(), &p->syntax)));
++ p->fault_state = DCERPC_FAULT_CANT_PERFORM;
++
++ DEBUG(10, ("Setting fault state\n"));
+ }
+
+ static NTSTATUS dcesrv_auth_request(struct pipe_auth_data *auth,
+Index: samba-3.6.23/source3/include/ntdomain.h
+===================================================================
+--- samba-3.6.23.orig/source3/include/ntdomain.h
++++ samba-3.6.23/source3/include/ntdomain.h
+@@ -87,6 +87,7 @@ typedef struct pipe_rpc_fns {
+ const struct api_struct *cmds;
+ int n_cmds;
+ uint32 context_id;
++ struct ndr_syntax_id syntax;
+
+ } PIPE_RPC_FNS;
+
+@@ -134,22 +135,10 @@ struct pipes_struct {
+ bool pipe_bound;
+
+ /*
+- * Set to true when we should return fault PDU's for everything.
+- */
+-
+- bool fault_state;
+-
+- /*
+- * Set to true when we should return fault PDU's for a bad handle.
+- */
+-
+- bool bad_handle_fault_state;
+-
+- /*
+- * Set to true when the backend does not support a call.
++ * Set the DCERPC_FAULT to return.
+ */
+
+- bool rng_fault_state;
++ int fault_state;
+
+ /*
+ * Set to RPC_BIG_ENDIAN when dealing with big-endian PDU's
+Index: samba-3.6.23/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
+===================================================================
+--- samba-3.6.23.orig/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
++++ samba-3.6.23/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
+@@ -183,7 +183,7 @@ sub ParseFunction($$)
+ );
+
+ pidl "";
+- pidl "if (p->rng_fault_state) {";
++ pidl "if (p->fault_state) {";
+ pidl "\ttalloc_free(r);";
+ pidl "\t/* Return true here, srv_pipe_hnd.c will take care */";
+ pidl "\treturn true;";
+Index: samba-3.6.23/source3/rpc_server/dfs/srv_dfs_nt.c
+===================================================================
+--- samba-3.6.23.orig/source3/rpc_server/dfs/srv_dfs_nt.c
++++ samba-3.6.23/source3/rpc_server/dfs/srv_dfs_nt.c
+@@ -411,125 +411,125 @@ WERROR _dfs_GetInfo(struct pipes_struct
+ WERROR _dfs_SetInfo(struct pipes_struct *p, struct dfs_SetInfo *r)
+ {
+ /* FIXME: Implement your code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _dfs_Rename(struct pipes_struct *p, struct dfs_Rename *r)
+ {
+ /* FIXME: Implement your code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _dfs_Move(struct pipes_struct *p, struct dfs_Move *r)
+ {
+ /* FIXME: Implement your code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _dfs_ManagerGetConfigInfo(struct pipes_struct *p, struct dfs_ManagerGetConfigInfo *r)
+ {
+ /* FIXME: Implement your code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _dfs_ManagerSendSiteInfo(struct pipes_struct *p, struct dfs_ManagerSendSiteInfo *r)
+ {
+ /* FIXME: Implement your code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _dfs_AddFtRoot(struct pipes_struct *p, struct dfs_AddFtRoot *r)
+ {
+ /* FIXME: Implement your code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _dfs_RemoveFtRoot(struct pipes_struct *p, struct dfs_RemoveFtRoot *r)
+ {
+ /* FIXME: Implement your code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _dfs_AddStdRoot(struct pipes_struct *p, struct dfs_AddStdRoot *r)
+ {
+ /* FIXME: Implement your code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _dfs_RemoveStdRoot(struct pipes_struct *p, struct dfs_RemoveStdRoot *r)
+ {
+ /* FIXME: Implement your code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _dfs_ManagerInitialize(struct pipes_struct *p, struct dfs_ManagerInitialize *r)
+ {
+ /* FIXME: Implement your code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _dfs_AddStdRootForced(struct pipes_struct *p, struct dfs_AddStdRootForced *r)
+ {
+ /* FIXME: Implement your code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _dfs_GetDcAddress(struct pipes_struct *p, struct dfs_GetDcAddress *r)
+ {
+ /* FIXME: Implement your code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _dfs_SetDcAddress(struct pipes_struct *p, struct dfs_SetDcAddress *r)
+ {
+ /* FIXME: Implement your code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _dfs_FlushFtTable(struct pipes_struct *p, struct dfs_FlushFtTable *r)
+ {
+ /* FIXME: Implement your code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _dfs_Add2(struct pipes_struct *p, struct dfs_Add2 *r)
+ {
+ /* FIXME: Implement your code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _dfs_Remove2(struct pipes_struct *p, struct dfs_Remove2 *r)
+ {
+ /* FIXME: Implement your code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _dfs_EnumEx(struct pipes_struct *p, struct dfs_EnumEx *r)
+ {
+ /* FIXME: Implement your code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _dfs_SetInfo2(struct pipes_struct *p, struct dfs_SetInfo2 *r)
+ {
+ /* FIXME: Implement your code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+Index: samba-3.6.23/source3/rpc_server/dssetup/srv_dssetup_nt.c
+===================================================================
+--- samba-3.6.23.orig/source3/rpc_server/dssetup/srv_dssetup_nt.c
++++ samba-3.6.23/source3/rpc_server/dssetup/srv_dssetup_nt.c
+@@ -130,7 +130,7 @@ WERROR _dssetup_DsRoleGetPrimaryDomainIn
+ WERROR _dssetup_DsRoleDnsNameToFlatName(struct pipes_struct *p,
+ struct dssetup_DsRoleDnsNameToFlatName *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -140,7 +140,7 @@ WERROR _dssetup_DsRoleDnsNameToFlatName(
+ WERROR _dssetup_DsRoleDcAsDc(struct pipes_struct *p,
+ struct dssetup_DsRoleDcAsDc *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -150,7 +150,7 @@ WERROR _dssetup_DsRoleDcAsDc(struct pipe
+ WERROR _dssetup_DsRoleDcAsReplica(struct pipes_struct *p,
+ struct dssetup_DsRoleDcAsReplica *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -160,7 +160,7 @@ WERROR _dssetup_DsRoleDcAsReplica(struct
+ WERROR _dssetup_DsRoleDemoteDc(struct pipes_struct *p,
+ struct dssetup_DsRoleDemoteDc *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -170,7 +170,7 @@ WERROR _dssetup_DsRoleDemoteDc(struct pi
+ WERROR _dssetup_DsRoleGetDcOperationProgress(struct pipes_struct *p,
+ struct dssetup_DsRoleGetDcOperationProgress *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -180,7 +180,7 @@ WERROR _dssetup_DsRoleGetDcOperationProg
+ WERROR _dssetup_DsRoleGetDcOperationResults(struct pipes_struct *p,
+ struct dssetup_DsRoleGetDcOperationResults *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -190,7 +190,7 @@ WERROR _dssetup_DsRoleGetDcOperationResu
+ WERROR _dssetup_DsRoleCancel(struct pipes_struct *p,
+ struct dssetup_DsRoleCancel *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -200,7 +200,7 @@ WERROR _dssetup_DsRoleCancel(struct pipe
+ WERROR _dssetup_DsRoleServerSaveStateForUpgrade(struct pipes_struct *p,
+ struct dssetup_DsRoleServerSaveStateForUpgrade *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -210,7 +210,7 @@ WERROR _dssetup_DsRoleServerSaveStateFor
+ WERROR _dssetup_DsRoleUpgradeDownlevelServer(struct pipes_struct *p,
+ struct dssetup_DsRoleUpgradeDownlevelServer *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -220,6 +220,6 @@ WERROR _dssetup_DsRoleUpgradeDownlevelSe
+ WERROR _dssetup_DsRoleAbortDownlevelServerUpgrade(struct pipes_struct *p,
+ struct dssetup_DsRoleAbortDownlevelServerUpgrade *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+Index: samba-3.6.23/source3/rpc_server/echo/srv_echo_nt.c
+===================================================================
+--- samba-3.6.23.orig/source3/rpc_server/echo/srv_echo_nt.c
++++ samba-3.6.23/source3/rpc_server/echo/srv_echo_nt.c
+@@ -87,13 +87,13 @@ void _echo_SourceData(struct pipes_struc
+
+ void _echo_TestCall(struct pipes_struct *p, struct echo_TestCall *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return;
+ }
+
+ NTSTATUS _echo_TestCall2(struct pipes_struct *p, struct echo_TestCall2 *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_OK;
+ }
+
+@@ -105,18 +105,18 @@ uint32 _echo_TestSleep(struct pipes_stru
+
+ void _echo_TestEnum(struct pipes_struct *p, struct echo_TestEnum *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return;
+ }
+
+ void _echo_TestSurrounding(struct pipes_struct *p, struct echo_TestSurrounding *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return;
+ }
+
+ uint16 _echo_TestDoublePointer(struct pipes_struct *p, struct echo_TestDoublePointer *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return 0;
+ }
+Index: samba-3.6.23/source3/rpc_server/epmapper/srv_epmapper.c
+===================================================================
+--- samba-3.6.23.orig/source3/rpc_server/epmapper/srv_epmapper.c
++++ samba-3.6.23/source3/rpc_server/epmapper/srv_epmapper.c
+@@ -297,6 +297,7 @@ error_status_t _epm_Insert(struct pipes_
+ /* If this is not a priviledged users, return */
+ if (p->transport != NCALRPC ||
+ !is_priviledged_pipe(p->session_info)) {
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return EPMAPPER_STATUS_CANT_PERFORM_OP;
+ }
+
+@@ -433,6 +434,7 @@ error_status_t _epm_Delete(struct pipes_
+ /* If this is not a priviledged users, return */
+ if (p->transport != NCALRPC ||
+ !is_priviledged_pipe(p->session_info)) {
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return EPMAPPER_STATUS_CANT_PERFORM_OP;
+ }
+
+@@ -1096,7 +1098,7 @@ error_status_t _epm_LookupHandleFree(str
+ error_status_t _epm_InqObject(struct pipes_struct *p,
+ struct epm_InqObject *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return EPMAPPER_STATUS_CANT_PERFORM_OP;
+ }
+
+@@ -1110,7 +1112,7 @@ error_status_t _epm_InqObject(struct pip
+ error_status_t _epm_MgmtDelete(struct pipes_struct *p,
+ struct epm_MgmtDelete *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return EPMAPPER_STATUS_CANT_PERFORM_OP;
+ }
+
+@@ -1121,7 +1123,7 @@ error_status_t _epm_MgmtDelete(struct pi
+ error_status_t _epm_MapAuth(struct pipes_struct *p,
+ struct epm_MapAuth *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return EPMAPPER_STATUS_CANT_PERFORM_OP;
+ }
+
+Index: samba-3.6.23/source3/rpc_server/eventlog/srv_eventlog_nt.c
+===================================================================
+--- samba-3.6.23.orig/source3/rpc_server/eventlog/srv_eventlog_nt.c
++++ samba-3.6.23/source3/rpc_server/eventlog/srv_eventlog_nt.c
+@@ -695,7 +695,7 @@ NTSTATUS _eventlog_GetNumRecords(struct
+
+ NTSTATUS _eventlog_BackupEventLogW(struct pipes_struct *p, struct eventlog_BackupEventLogW *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+@@ -838,104 +838,104 @@ NTSTATUS _eventlog_ReportEventW(struct p
+ NTSTATUS _eventlog_DeregisterEventSource(struct pipes_struct *p,
+ struct eventlog_DeregisterEventSource *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _eventlog_ChangeNotify(struct pipes_struct *p,
+ struct eventlog_ChangeNotify *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _eventlog_RegisterEventSourceW(struct pipes_struct *p,
+ struct eventlog_RegisterEventSourceW *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _eventlog_OpenBackupEventLogW(struct pipes_struct *p,
+ struct eventlog_OpenBackupEventLogW *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _eventlog_ClearEventLogA(struct pipes_struct *p,
+ struct eventlog_ClearEventLogA *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _eventlog_BackupEventLogA(struct pipes_struct *p,
+ struct eventlog_BackupEventLogA *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _eventlog_OpenEventLogA(struct pipes_struct *p,
+ struct eventlog_OpenEventLogA *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _eventlog_RegisterEventSourceA(struct pipes_struct *p,
+ struct eventlog_RegisterEventSourceA *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _eventlog_OpenBackupEventLogA(struct pipes_struct *p,
+ struct eventlog_OpenBackupEventLogA *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _eventlog_ReadEventLogA(struct pipes_struct *p,
+ struct eventlog_ReadEventLogA *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _eventlog_ReportEventA(struct pipes_struct *p,
+ struct eventlog_ReportEventA *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _eventlog_RegisterClusterSvc(struct pipes_struct *p,
+ struct eventlog_RegisterClusterSvc *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _eventlog_DeregisterClusterSvc(struct pipes_struct *p,
+ struct eventlog_DeregisterClusterSvc *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _eventlog_WriteClusterEvents(struct pipes_struct *p,
+ struct eventlog_WriteClusterEvents *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _eventlog_ReportEventAndSourceW(struct pipes_struct *p,
+ struct eventlog_ReportEventAndSourceW *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+Index: samba-3.6.23/source3/rpc_server/lsa/srv_lsa_nt.c
+===================================================================
+--- samba-3.6.23.orig/source3/rpc_server/lsa/srv_lsa_nt.c
++++ samba-3.6.23/source3/rpc_server/lsa/srv_lsa_nt.c
+@@ -817,7 +817,7 @@ NTSTATUS _lsa_QueryInfoPolicy2(struct pi
+ struct lsa_QueryInfoPolicy r;
+
+ if ((pdb_capabilities() & PDB_CAP_ADS) == 0) {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+@@ -3210,88 +3210,88 @@ NTSTATUS _lsa_Delete(struct pipes_struct
+
+ NTSTATUS _lsa_SetSecObj(struct pipes_struct *p, struct lsa_SetSecObj *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _lsa_ChangePassword(struct pipes_struct *p,
+ struct lsa_ChangePassword *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _lsa_SetInfoPolicy(struct pipes_struct *p, struct lsa_SetInfoPolicy *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _lsa_ClearAuditLog(struct pipes_struct *p, struct lsa_ClearAuditLog *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _lsa_GetQuotasForAccount(struct pipes_struct *p,
+ struct lsa_GetQuotasForAccount *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _lsa_SetQuotasForAccount(struct pipes_struct *p,
+ struct lsa_SetQuotasForAccount *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _lsa_SetInformationTrustedDomain(struct pipes_struct *p,
+ struct lsa_SetInformationTrustedDomain *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _lsa_QuerySecret(struct pipes_struct *p, struct lsa_QuerySecret *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _lsa_SetTrustedDomainInfo(struct pipes_struct *p,
+ struct lsa_SetTrustedDomainInfo *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _lsa_StorePrivateData(struct pipes_struct *p,
+ struct lsa_StorePrivateData *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _lsa_RetrievePrivateData(struct pipes_struct *p,
+ struct lsa_RetrievePrivateData *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _lsa_SetInfoPolicy2(struct pipes_struct *p,
+ struct lsa_SetInfoPolicy2 *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _lsa_SetTrustedDomainInfoByName(struct pipes_struct *p,
+ struct lsa_SetTrustedDomainInfoByName *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+@@ -3310,7 +3310,7 @@ NTSTATUS _lsa_EnumTrustedDomainsEx(struc
+ * _lsa_EnumTrustedDomains() afterwards - gd */
+
+ if (!(pdb_capabilities() & PDB_CAP_TRUSTED_DOMAINS_EX)) {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+@@ -3379,107 +3379,107 @@ NTSTATUS _lsa_EnumTrustedDomainsEx(struc
+ NTSTATUS _lsa_QueryDomainInformationPolicy(struct pipes_struct *p,
+ struct lsa_QueryDomainInformationPolicy *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _lsa_SetDomainInformationPolicy(struct pipes_struct *p,
+ struct lsa_SetDomainInformationPolicy *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _lsa_TestCall(struct pipes_struct *p, struct lsa_TestCall *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _lsa_CREDRWRITE(struct pipes_struct *p, struct lsa_CREDRWRITE *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _lsa_CREDRREAD(struct pipes_struct *p, struct lsa_CREDRREAD *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _lsa_CREDRENUMERATE(struct pipes_struct *p, struct lsa_CREDRENUMERATE *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _lsa_CREDRWRITEDOMAINCREDENTIALS(struct pipes_struct *p,
+ struct lsa_CREDRWRITEDOMAINCREDENTIALS *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _lsa_CREDRREADDOMAINCREDENTIALS(struct pipes_struct *p,
+ struct lsa_CREDRREADDOMAINCREDENTIALS *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _lsa_CREDRDELETE(struct pipes_struct *p, struct lsa_CREDRDELETE *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _lsa_CREDRGETTARGETINFO(struct pipes_struct *p,
+ struct lsa_CREDRGETTARGETINFO *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _lsa_CREDRPROFILELOADED(struct pipes_struct *p,
+ struct lsa_CREDRPROFILELOADED *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _lsa_CREDRGETSESSIONTYPES(struct pipes_struct *p,
+ struct lsa_CREDRGETSESSIONTYPES *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _lsa_LSARREGISTERAUDITEVENT(struct pipes_struct *p,
+ struct lsa_LSARREGISTERAUDITEVENT *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _lsa_LSARGENAUDITEVENT(struct pipes_struct *p,
+ struct lsa_LSARGENAUDITEVENT *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _lsa_LSARUNREGISTERAUDITEVENT(struct pipes_struct *p,
+ struct lsa_LSARUNREGISTERAUDITEVENT *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _lsa_lsaRQueryForestTrustInformation(struct pipes_struct *p,
+ struct lsa_lsaRQueryForestTrustInformation *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+@@ -3992,34 +3992,34 @@ NTSTATUS _lsa_lsaRSetForestTrustInformat
+ NTSTATUS _lsa_CREDRRENAME(struct pipes_struct *p,
+ struct lsa_CREDRRENAME *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _lsa_LSAROPENPOLICYSCE(struct pipes_struct *p,
+ struct lsa_LSAROPENPOLICYSCE *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _lsa_LSARADTREGISTERSECURITYEVENTSOURCE(struct pipes_struct *p,
+ struct lsa_LSARADTREGISTERSECURITYEVENTSOURCE *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE(struct pipes_struct *p,
+ struct lsa_LSARADTUNREGISTERSECURITYEVENTSOURCE *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+ NTSTATUS _lsa_LSARADTREPORTSECURITYEVENT(struct pipes_struct *p,
+ struct lsa_LSARADTREPORTSECURITYEVENT *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+Index: samba-3.6.23/source3/rpc_server/netlogon/srv_netlog_nt.c
+===================================================================
+--- samba-3.6.23.orig/source3/rpc_server/netlogon/srv_netlog_nt.c
++++ samba-3.6.23/source3/rpc_server/netlogon/srv_netlog_nt.c
+@@ -1789,7 +1789,7 @@ NTSTATUS _netr_LogonSamLogonEx(struct pi
+ WERROR _netr_LogonUasLogon(struct pipes_struct *p,
+ struct netr_LogonUasLogon *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -1799,7 +1799,7 @@ WERROR _netr_LogonUasLogon(struct pipes_
+ WERROR _netr_LogonUasLogoff(struct pipes_struct *p,
+ struct netr_LogonUasLogoff *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -1809,7 +1809,7 @@ WERROR _netr_LogonUasLogoff(struct pipes
+ NTSTATUS _netr_DatabaseDeltas(struct pipes_struct *p,
+ struct netr_DatabaseDeltas *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+@@ -1819,7 +1819,7 @@ NTSTATUS _netr_DatabaseDeltas(struct pip
+ NTSTATUS _netr_DatabaseSync(struct pipes_struct *p,
+ struct netr_DatabaseSync *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+@@ -1829,7 +1829,7 @@ NTSTATUS _netr_DatabaseSync(struct pipes
+ NTSTATUS _netr_AccountDeltas(struct pipes_struct *p,
+ struct netr_AccountDeltas *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+@@ -1839,7 +1839,7 @@ NTSTATUS _netr_AccountDeltas(struct pipe
+ NTSTATUS _netr_AccountSync(struct pipes_struct *p,
+ struct netr_AccountSync *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+@@ -1980,7 +1980,7 @@ WERROR _netr_GetAnyDCName(struct pipes_s
+ NTSTATUS _netr_DatabaseSync2(struct pipes_struct *p,
+ struct netr_DatabaseSync2 *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+@@ -1990,7 +1990,7 @@ NTSTATUS _netr_DatabaseSync2(struct pipe
+ NTSTATUS _netr_DatabaseRedo(struct pipes_struct *p,
+ struct netr_DatabaseRedo *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+@@ -2000,7 +2000,7 @@ NTSTATUS _netr_DatabaseRedo(struct pipes
+ WERROR _netr_DsRGetDCName(struct pipes_struct *p,
+ struct netr_DsRGetDCName *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -2019,7 +2019,7 @@ NTSTATUS _netr_LogonGetCapabilities(stru
+ WERROR _netr_NETRLOGONSETSERVICEBITS(struct pipes_struct *p,
+ struct netr_NETRLOGONSETSERVICEBITS *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -2029,7 +2029,7 @@ WERROR _netr_NETRLOGONSETSERVICEBITS(str
+ WERROR _netr_LogonGetTrustRid(struct pipes_struct *p,
+ struct netr_LogonGetTrustRid *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -2039,7 +2039,7 @@ WERROR _netr_LogonGetTrustRid(struct pip
+ WERROR _netr_NETRLOGONCOMPUTESERVERDIGEST(struct pipes_struct *p,
+ struct netr_NETRLOGONCOMPUTESERVERDIGEST *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -2049,7 +2049,7 @@ WERROR _netr_NETRLOGONCOMPUTESERVERDIGES
+ WERROR _netr_NETRLOGONCOMPUTECLIENTDIGEST(struct pipes_struct *p,
+ struct netr_NETRLOGONCOMPUTECLIENTDIGEST *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -2059,7 +2059,7 @@ WERROR _netr_NETRLOGONCOMPUTECLIENTDIGES
+ WERROR _netr_DsRGetDCNameEx(struct pipes_struct *p,
+ struct netr_DsRGetDCNameEx *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -2069,7 +2069,7 @@ WERROR _netr_DsRGetDCNameEx(struct pipes
+ WERROR _netr_DsRGetSiteName(struct pipes_struct *p,
+ struct netr_DsRGetSiteName *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -2079,7 +2079,7 @@ WERROR _netr_DsRGetSiteName(struct pipes
+ NTSTATUS _netr_LogonGetDomainInfo(struct pipes_struct *p,
+ struct netr_LogonGetDomainInfo *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+@@ -2089,7 +2089,7 @@ NTSTATUS _netr_LogonGetDomainInfo(struct
+ WERROR _netr_ServerPasswordGet(struct pipes_struct *p,
+ struct netr_ServerPasswordGet *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -2099,7 +2099,7 @@ WERROR _netr_ServerPasswordGet(struct pi
+ WERROR _netr_NETRLOGONSENDTOSAM(struct pipes_struct *p,
+ struct netr_NETRLOGONSENDTOSAM *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -2109,7 +2109,7 @@ WERROR _netr_NETRLOGONSENDTOSAM(struct p
+ WERROR _netr_DsRAddressToSitenamesW(struct pipes_struct *p,
+ struct netr_DsRAddressToSitenamesW *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -2119,7 +2119,7 @@ WERROR _netr_DsRAddressToSitenamesW(stru
+ WERROR _netr_DsRGetDCNameEx2(struct pipes_struct *p,
+ struct netr_DsRGetDCNameEx2 *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -2129,7 +2129,7 @@ WERROR _netr_DsRGetDCNameEx2(struct pipe
+ WERROR _netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN(struct pipes_struct *p,
+ struct netr_NETRLOGONGETTIMESERVICEPARENTDOMAIN *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -2139,7 +2139,7 @@ WERROR _netr_NETRLOGONGETTIMESERVICEPARE
+ WERROR _netr_NetrEnumerateTrustedDomainsEx(struct pipes_struct *p,
+ struct netr_NetrEnumerateTrustedDomainsEx *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -2149,7 +2149,7 @@ WERROR _netr_NetrEnumerateTrustedDomains
+ WERROR _netr_DsRAddressToSitenamesExW(struct pipes_struct *p,
+ struct netr_DsRAddressToSitenamesExW *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -2159,7 +2159,7 @@ WERROR _netr_DsRAddressToSitenamesExW(st
+ WERROR _netr_DsrGetDcSiteCoverageW(struct pipes_struct *p,
+ struct netr_DsrGetDcSiteCoverageW *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -2169,7 +2169,7 @@ WERROR _netr_DsrGetDcSiteCoverageW(struc
+ WERROR _netr_DsrEnumerateDomainTrusts(struct pipes_struct *p,
+ struct netr_DsrEnumerateDomainTrusts *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -2179,7 +2179,7 @@ WERROR _netr_DsrEnumerateDomainTrusts(st
+ WERROR _netr_DsrDeregisterDNSHostRecords(struct pipes_struct *p,
+ struct netr_DsrDeregisterDNSHostRecords *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -2189,7 +2189,7 @@ WERROR _netr_DsrDeregisterDNSHostRecords
+ NTSTATUS _netr_ServerTrustPasswordsGet(struct pipes_struct *p,
+ struct netr_ServerTrustPasswordsGet *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+@@ -2199,7 +2199,7 @@ NTSTATUS _netr_ServerTrustPasswordsGet(s
+ WERROR _netr_DsRGetForestTrustInformation(struct pipes_struct *p,
+ struct netr_DsRGetForestTrustInformation *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -2478,7 +2478,7 @@ NTSTATUS _netr_ServerGetTrustInfo(struct
+ NTSTATUS _netr_Unused47(struct pipes_struct *p,
+ struct netr_Unused47 *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+@@ -2488,6 +2488,6 @@ NTSTATUS _netr_Unused47(struct pipes_str
+ NTSTATUS _netr_DsrUpdateReadOnlyServerDnsRecords(struct pipes_struct *p,
+ struct netr_DsrUpdateReadOnlyServerDnsRecords *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+Index: samba-3.6.23/source3/rpc_server/ntsvcs/srv_ntsvcs_nt.c
+===================================================================
+--- samba-3.6.23.orig/source3/rpc_server/ntsvcs/srv_ntsvcs_nt.c
++++ samba-3.6.23/source3/rpc_server/ntsvcs/srv_ntsvcs_nt.c
+@@ -227,7 +227,7 @@ WERROR _PNP_HwProfFlags(struct pipes_str
+ WERROR _PNP_Disconnect(struct pipes_struct *p,
+ struct PNP_Disconnect *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -237,7 +237,7 @@ WERROR _PNP_Disconnect(struct pipes_stru
+ WERROR _PNP_Connect(struct pipes_struct *p,
+ struct PNP_Connect *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -247,7 +247,7 @@ WERROR _PNP_Connect(struct pipes_struct
+ WERROR _PNP_GetGlobalState(struct pipes_struct *p,
+ struct PNP_GetGlobalState *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -257,7 +257,7 @@ WERROR _PNP_GetGlobalState(struct pipes_
+ WERROR _PNP_InitDetection(struct pipes_struct *p,
+ struct PNP_InitDetection *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -267,7 +267,7 @@ WERROR _PNP_InitDetection(struct pipes_s
+ WERROR _PNP_ReportLogOn(struct pipes_struct *p,
+ struct PNP_ReportLogOn *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -277,7 +277,7 @@ WERROR _PNP_ReportLogOn(struct pipes_str
+ WERROR _PNP_GetRootDeviceInstance(struct pipes_struct *p,
+ struct PNP_GetRootDeviceInstance *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -287,7 +287,7 @@ WERROR _PNP_GetRootDeviceInstance(struct
+ WERROR _PNP_GetRelatedDeviceInstance(struct pipes_struct *p,
+ struct PNP_GetRelatedDeviceInstance *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -297,7 +297,7 @@ WERROR _PNP_GetRelatedDeviceInstance(str
+ WERROR _PNP_EnumerateSubKeys(struct pipes_struct *p,
+ struct PNP_EnumerateSubKeys *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -307,7 +307,7 @@ WERROR _PNP_EnumerateSubKeys(struct pipe
+ WERROR _PNP_GetDepth(struct pipes_struct *p,
+ struct PNP_GetDepth *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -317,7 +317,7 @@ WERROR _PNP_GetDepth(struct pipes_struct
+ WERROR _PNP_SetDeviceRegProp(struct pipes_struct *p,
+ struct PNP_SetDeviceRegProp *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -327,7 +327,7 @@ WERROR _PNP_SetDeviceRegProp(struct pipe
+ WERROR _PNP_GetClassInstance(struct pipes_struct *p,
+ struct PNP_GetClassInstance *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -337,7 +337,7 @@ WERROR _PNP_GetClassInstance(struct pipe
+ WERROR _PNP_CreateKey(struct pipes_struct *p,
+ struct PNP_CreateKey *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -347,7 +347,7 @@ WERROR _PNP_CreateKey(struct pipes_struc
+ WERROR _PNP_DeleteRegistryKey(struct pipes_struct *p,
+ struct PNP_DeleteRegistryKey *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -357,7 +357,7 @@ WERROR _PNP_DeleteRegistryKey(struct pip
+ WERROR _PNP_GetClassCount(struct pipes_struct *p,
+ struct PNP_GetClassCount *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -367,7 +367,7 @@ WERROR _PNP_GetClassCount(struct pipes_s
+ WERROR _PNP_GetClassName(struct pipes_struct *p,
+ struct PNP_GetClassName *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -377,7 +377,7 @@ WERROR _PNP_GetClassName(struct pipes_st
+ WERROR _PNP_DeleteClassKey(struct pipes_struct *p,
+ struct PNP_DeleteClassKey *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -387,7 +387,7 @@ WERROR _PNP_DeleteClassKey(struct pipes_
+ WERROR _PNP_GetInterfaceDeviceAlias(struct pipes_struct *p,
+ struct PNP_GetInterfaceDeviceAlias *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -397,7 +397,7 @@ WERROR _PNP_GetInterfaceDeviceAlias(stru
+ WERROR _PNP_GetInterfaceDeviceList(struct pipes_struct *p,
+ struct PNP_GetInterfaceDeviceList *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -407,7 +407,7 @@ WERROR _PNP_GetInterfaceDeviceList(struc
+ WERROR _PNP_GetInterfaceDeviceListSize(struct pipes_struct *p,
+ struct PNP_GetInterfaceDeviceListSize *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -417,7 +417,7 @@ WERROR _PNP_GetInterfaceDeviceListSize(s
+ WERROR _PNP_RegisterDeviceClassAssociation(struct pipes_struct *p,
+ struct PNP_RegisterDeviceClassAssociation *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -427,7 +427,7 @@ WERROR _PNP_RegisterDeviceClassAssociati
+ WERROR _PNP_UnregisterDeviceClassAssociation(struct pipes_struct *p,
+ struct PNP_UnregisterDeviceClassAssociation *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -437,7 +437,7 @@ WERROR _PNP_UnregisterDeviceClassAssocia
+ WERROR _PNP_GetClassRegProp(struct pipes_struct *p,
+ struct PNP_GetClassRegProp *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -447,7 +447,7 @@ WERROR _PNP_GetClassRegProp(struct pipes
+ WERROR _PNP_SetClassRegProp(struct pipes_struct *p,
+ struct PNP_SetClassRegProp *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -457,7 +457,7 @@ WERROR _PNP_SetClassRegProp(struct pipes
+ WERROR _PNP_CreateDevInst(struct pipes_struct *p,
+ struct PNP_CreateDevInst *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -467,7 +467,7 @@ WERROR _PNP_CreateDevInst(struct pipes_s
+ WERROR _PNP_DeviceInstanceAction(struct pipes_struct *p,
+ struct PNP_DeviceInstanceAction *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -477,7 +477,7 @@ WERROR _PNP_DeviceInstanceAction(struct
+ WERROR _PNP_GetDeviceStatus(struct pipes_struct *p,
+ struct PNP_GetDeviceStatus *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -487,7 +487,7 @@ WERROR _PNP_GetDeviceStatus(struct pipes
+ WERROR _PNP_SetDeviceProblem(struct pipes_struct *p,
+ struct PNP_SetDeviceProblem *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -497,7 +497,7 @@ WERROR _PNP_SetDeviceProblem(struct pipe
+ WERROR _PNP_DisableDevInst(struct pipes_struct *p,
+ struct PNP_DisableDevInst *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -507,7 +507,7 @@ WERROR _PNP_DisableDevInst(struct pipes_
+ WERROR _PNP_UninstallDevInst(struct pipes_struct *p,
+ struct PNP_UninstallDevInst *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -517,7 +517,7 @@ WERROR _PNP_UninstallDevInst(struct pipe
+ WERROR _PNP_AddID(struct pipes_struct *p,
+ struct PNP_AddID *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -527,7 +527,7 @@ WERROR _PNP_AddID(struct pipes_struct *p
+ WERROR _PNP_RegisterDriver(struct pipes_struct *p,
+ struct PNP_RegisterDriver *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -537,7 +537,7 @@ WERROR _PNP_RegisterDriver(struct pipes_
+ WERROR _PNP_QueryRemove(struct pipes_struct *p,
+ struct PNP_QueryRemove *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -547,7 +547,7 @@ WERROR _PNP_QueryRemove(struct pipes_str
+ WERROR _PNP_RequestDeviceEject(struct pipes_struct *p,
+ struct PNP_RequestDeviceEject *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -557,7 +557,7 @@ WERROR _PNP_RequestDeviceEject(struct pi
+ WERROR _PNP_IsDockStationPresent(struct pipes_struct *p,
+ struct PNP_IsDockStationPresent *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -567,7 +567,7 @@ WERROR _PNP_IsDockStationPresent(struct
+ WERROR _PNP_RequestEjectPC(struct pipes_struct *p,
+ struct PNP_RequestEjectPC *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -577,7 +577,7 @@ WERROR _PNP_RequestEjectPC(struct pipes_
+ WERROR _PNP_AddEmptyLogConf(struct pipes_struct *p,
+ struct PNP_AddEmptyLogConf *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -587,7 +587,7 @@ WERROR _PNP_AddEmptyLogConf(struct pipes
+ WERROR _PNP_FreeLogConf(struct pipes_struct *p,
+ struct PNP_FreeLogConf *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -597,7 +597,7 @@ WERROR _PNP_FreeLogConf(struct pipes_str
+ WERROR _PNP_GetFirstLogConf(struct pipes_struct *p,
+ struct PNP_GetFirstLogConf *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -607,7 +607,7 @@ WERROR _PNP_GetFirstLogConf(struct pipes
+ WERROR _PNP_GetNextLogConf(struct pipes_struct *p,
+ struct PNP_GetNextLogConf *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -617,7 +617,7 @@ WERROR _PNP_GetNextLogConf(struct pipes_
+ WERROR _PNP_GetLogConfPriority(struct pipes_struct *p,
+ struct PNP_GetLogConfPriority *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -627,7 +627,7 @@ WERROR _PNP_GetLogConfPriority(struct pi
+ WERROR _PNP_AddResDes(struct pipes_struct *p,
+ struct PNP_AddResDes *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -637,7 +637,7 @@ WERROR _PNP_AddResDes(struct pipes_struc
+ WERROR _PNP_FreeResDes(struct pipes_struct *p,
+ struct PNP_FreeResDes *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -647,7 +647,7 @@ WERROR _PNP_FreeResDes(struct pipes_stru
+ WERROR _PNP_GetNextResDes(struct pipes_struct *p,
+ struct PNP_GetNextResDes *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -657,7 +657,7 @@ WERROR _PNP_GetNextResDes(struct pipes_s
+ WERROR _PNP_GetResDesData(struct pipes_struct *p,
+ struct PNP_GetResDesData *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -667,7 +667,7 @@ WERROR _PNP_GetResDesData(struct pipes_s
+ WERROR _PNP_GetResDesDataSize(struct pipes_struct *p,
+ struct PNP_GetResDesDataSize *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -677,7 +677,7 @@ WERROR _PNP_GetResDesDataSize(struct pip
+ WERROR _PNP_ModifyResDes(struct pipes_struct *p,
+ struct PNP_ModifyResDes *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -687,7 +687,7 @@ WERROR _PNP_ModifyResDes(struct pipes_st
+ WERROR _PNP_DetectResourceLimit(struct pipes_struct *p,
+ struct PNP_DetectResourceLimit *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -697,7 +697,7 @@ WERROR _PNP_DetectResourceLimit(struct p
+ WERROR _PNP_QueryResConfList(struct pipes_struct *p,
+ struct PNP_QueryResConfList *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -707,7 +707,7 @@ WERROR _PNP_QueryResConfList(struct pipe
+ WERROR _PNP_SetHwProf(struct pipes_struct *p,
+ struct PNP_SetHwProf *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -717,7 +717,7 @@ WERROR _PNP_SetHwProf(struct pipes_struc
+ WERROR _PNP_QueryArbitratorFreeData(struct pipes_struct *p,
+ struct PNP_QueryArbitratorFreeData *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -727,7 +727,7 @@ WERROR _PNP_QueryArbitratorFreeData(stru
+ WERROR _PNP_QueryArbitratorFreeSize(struct pipes_struct *p,
+ struct PNP_QueryArbitratorFreeSize *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -737,7 +737,7 @@ WERROR _PNP_QueryArbitratorFreeSize(stru
+ WERROR _PNP_RunDetection(struct pipes_struct *p,
+ struct PNP_RunDetection *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -747,7 +747,7 @@ WERROR _PNP_RunDetection(struct pipes_st
+ WERROR _PNP_RegisterNotification(struct pipes_struct *p,
+ struct PNP_RegisterNotification *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -757,7 +757,7 @@ WERROR _PNP_RegisterNotification(struct
+ WERROR _PNP_UnregisterNotification(struct pipes_struct *p,
+ struct PNP_UnregisterNotification *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -767,7 +767,7 @@ WERROR _PNP_UnregisterNotification(struc
+ WERROR _PNP_GetCustomDevProp(struct pipes_struct *p,
+ struct PNP_GetCustomDevProp *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -777,7 +777,7 @@ WERROR _PNP_GetCustomDevProp(struct pipe
+ WERROR _PNP_GetVersionInternal(struct pipes_struct *p,
+ struct PNP_GetVersionInternal *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -787,7 +787,7 @@ WERROR _PNP_GetVersionInternal(struct pi
+ WERROR _PNP_GetBlockedDriverInfo(struct pipes_struct *p,
+ struct PNP_GetBlockedDriverInfo *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -797,6 +797,6 @@ WERROR _PNP_GetBlockedDriverInfo(struct
+ WERROR _PNP_GetServerSideDeviceInstallFlags(struct pipes_struct *p,
+ struct PNP_GetServerSideDeviceInstallFlags *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+Index: samba-3.6.23/source3/rpc_server/rpc_handles.c
+===================================================================
+--- samba-3.6.23.orig/source3/rpc_server/rpc_handles.c
++++ samba-3.6.23/source3/rpc_server/rpc_handles.c
+@@ -242,7 +242,7 @@ static struct dcesrv_handle *find_policy
+ DEBUG(4,("Policy not found: "));
+ dump_data(4, (uint8_t *)hnd, sizeof(*hnd));
+
+- p->bad_handle_fault_state = true;
++ p->fault_state = DCERPC_FAULT_CONTEXT_MISMATCH;
+
+ return NULL;
+ }
+Index: samba-3.6.23/source3/rpc_server/rpc_ncacn_np.c
+===================================================================
+--- samba-3.6.23.orig/source3/rpc_server/rpc_ncacn_np.c
++++ samba-3.6.23/source3/rpc_server/rpc_ncacn_np.c
+@@ -216,24 +216,13 @@ static NTSTATUS rpcint_dispatch(struct p
+ }
+
+ if (p->fault_state) {
+- p->fault_state = false;
+- data_blob_free(&p->out_data.rdata);
+- talloc_free_children(p->mem_ctx);
+- return NT_STATUS_RPC_CALL_FAILED;
+- }
+-
+- if (p->bad_handle_fault_state) {
+- p->bad_handle_fault_state = false;
+- data_blob_free(&p->out_data.rdata);
+- talloc_free_children(p->mem_ctx);
+- return NT_STATUS_RPC_SS_CONTEXT_MISMATCH;
+- }
++ NTSTATUS status;
+
+- if (p->rng_fault_state) {
+- p->rng_fault_state = false;
++ status = NT_STATUS(p->fault_state);
++ p->fault_state = 0;
+ data_blob_free(&p->out_data.rdata);
+ talloc_free_children(p->mem_ctx);
+- return NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE;
++ return status;
+ }
+
+ *out_data = p->out_data.rdata;
+Index: samba-3.6.23/source3/rpc_server/samr/srv_samr_nt.c
+===================================================================
+--- samba-3.6.23.orig/source3/rpc_server/samr/srv_samr_nt.c
++++ samba-3.6.23/source3/rpc_server/samr/srv_samr_nt.c
+@@ -6682,7 +6682,7 @@ NTSTATUS _samr_ValidatePassword(struct p
+ NTSTATUS _samr_Shutdown(struct pipes_struct *p,
+ struct samr_Shutdown *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+@@ -6692,7 +6692,7 @@ NTSTATUS _samr_Shutdown(struct pipes_str
+ NTSTATUS _samr_SetMemberAttributesOfGroup(struct pipes_struct *p,
+ struct samr_SetMemberAttributesOfGroup *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+@@ -6702,6 +6702,7 @@ NTSTATUS _samr_SetMemberAttributesOfGrou
+ NTSTATUS _samr_TestPrivateFunctionsDomain(struct pipes_struct *p,
+ struct samr_TestPrivateFunctionsDomain *r)
+ {
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+@@ -6711,6 +6712,7 @@ NTSTATUS _samr_TestPrivateFunctionsDomai
+ NTSTATUS _samr_TestPrivateFunctionsUser(struct pipes_struct *p,
+ struct samr_TestPrivateFunctionsUser *r)
+ {
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+@@ -6720,7 +6722,7 @@ NTSTATUS _samr_TestPrivateFunctionsUser(
+ NTSTATUS _samr_AddMultipleMembersToAlias(struct pipes_struct *p,
+ struct samr_AddMultipleMembersToAlias *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+@@ -6730,7 +6732,7 @@ NTSTATUS _samr_AddMultipleMembersToAlias
+ NTSTATUS _samr_RemoveMultipleMembersFromAlias(struct pipes_struct *p,
+ struct samr_RemoveMultipleMembersFromAlias *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+@@ -6740,7 +6742,7 @@ NTSTATUS _samr_RemoveMultipleMembersFrom
+ NTSTATUS _samr_SetBootKeyInformation(struct pipes_struct *p,
+ struct samr_SetBootKeyInformation *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+@@ -6750,7 +6752,7 @@ NTSTATUS _samr_SetBootKeyInformation(str
+ NTSTATUS _samr_GetBootKeyInformation(struct pipes_struct *p,
+ struct samr_GetBootKeyInformation *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+
+@@ -6760,6 +6762,6 @@ NTSTATUS _samr_GetBootKeyInformation(str
+ NTSTATUS _samr_SetDsrmPassword(struct pipes_struct *p,
+ struct samr_SetDsrmPassword *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return NT_STATUS_NOT_IMPLEMENTED;
+ }
+Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
+===================================================================
+--- samba-3.6.23.orig/source3/rpc_server/spoolss/srv_spoolss_nt.c
++++ samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
+@@ -10201,7 +10201,7 @@ WERROR _spoolss_AddPort(struct pipes_str
+ WERROR _spoolss_GetPrinterDriver(struct pipes_struct *p,
+ struct spoolss_GetPrinterDriver *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10212,7 +10212,7 @@ WERROR _spoolss_GetPrinterDriver(struct
+ WERROR _spoolss_ReadPrinter(struct pipes_struct *p,
+ struct spoolss_ReadPrinter *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10223,7 +10223,7 @@ WERROR _spoolss_ReadPrinter(struct pipes
+ WERROR _spoolss_WaitForPrinterChange(struct pipes_struct *p,
+ struct spoolss_WaitForPrinterChange *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10234,7 +10234,7 @@ WERROR _spoolss_WaitForPrinterChange(str
+ WERROR _spoolss_ConfigurePort(struct pipes_struct *p,
+ struct spoolss_ConfigurePort *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10245,7 +10245,7 @@ WERROR _spoolss_ConfigurePort(struct pip
+ WERROR _spoolss_DeletePort(struct pipes_struct *p,
+ struct spoolss_DeletePort *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10256,7 +10256,7 @@ WERROR _spoolss_DeletePort(struct pipes_
+ WERROR _spoolss_CreatePrinterIC(struct pipes_struct *p,
+ struct spoolss_CreatePrinterIC *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10267,7 +10267,7 @@ WERROR _spoolss_CreatePrinterIC(struct p
+ WERROR _spoolss_PlayGDIScriptOnPrinterIC(struct pipes_struct *p,
+ struct spoolss_PlayGDIScriptOnPrinterIC *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10278,7 +10278,7 @@ WERROR _spoolss_PlayGDIScriptOnPrinterIC
+ WERROR _spoolss_DeletePrinterIC(struct pipes_struct *p,
+ struct spoolss_DeletePrinterIC *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10289,7 +10289,7 @@ WERROR _spoolss_DeletePrinterIC(struct p
+ WERROR _spoolss_AddPrinterConnection(struct pipes_struct *p,
+ struct spoolss_AddPrinterConnection *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10300,7 +10300,7 @@ WERROR _spoolss_AddPrinterConnection(str
+ WERROR _spoolss_DeletePrinterConnection(struct pipes_struct *p,
+ struct spoolss_DeletePrinterConnection *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10311,7 +10311,7 @@ WERROR _spoolss_DeletePrinterConnection(
+ WERROR _spoolss_PrinterMessageBox(struct pipes_struct *p,
+ struct spoolss_PrinterMessageBox *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10322,7 +10322,7 @@ WERROR _spoolss_PrinterMessageBox(struct
+ WERROR _spoolss_AddMonitor(struct pipes_struct *p,
+ struct spoolss_AddMonitor *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10333,7 +10333,7 @@ WERROR _spoolss_AddMonitor(struct pipes_
+ WERROR _spoolss_DeleteMonitor(struct pipes_struct *p,
+ struct spoolss_DeleteMonitor *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10344,7 +10344,7 @@ WERROR _spoolss_DeleteMonitor(struct pip
+ WERROR _spoolss_DeletePrintProcessor(struct pipes_struct *p,
+ struct spoolss_DeletePrintProcessor *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10355,7 +10355,7 @@ WERROR _spoolss_DeletePrintProcessor(str
+ WERROR _spoolss_AddPrintProvidor(struct pipes_struct *p,
+ struct spoolss_AddPrintProvidor *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10366,7 +10366,7 @@ WERROR _spoolss_AddPrintProvidor(struct
+ WERROR _spoolss_DeletePrintProvidor(struct pipes_struct *p,
+ struct spoolss_DeletePrintProvidor *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10377,7 +10377,7 @@ WERROR _spoolss_DeletePrintProvidor(stru
+ WERROR _spoolss_FindFirstPrinterChangeNotification(struct pipes_struct *p,
+ struct spoolss_FindFirstPrinterChangeNotification *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10388,7 +10388,7 @@ WERROR _spoolss_FindFirstPrinterChangeNo
+ WERROR _spoolss_FindNextPrinterChangeNotification(struct pipes_struct *p,
+ struct spoolss_FindNextPrinterChangeNotification *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10399,7 +10399,7 @@ WERROR _spoolss_FindNextPrinterChangeNot
+ WERROR _spoolss_RouterFindFirstPrinterChangeNotificationOld(struct pipes_struct *p,
+ struct spoolss_RouterFindFirstPrinterChangeNotificationOld *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10410,7 +10410,7 @@ WERROR _spoolss_RouterFindFirstPrinterCh
+ WERROR _spoolss_ReplyOpenPrinter(struct pipes_struct *p,
+ struct spoolss_ReplyOpenPrinter *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10421,7 +10421,7 @@ WERROR _spoolss_ReplyOpenPrinter(struct
+ WERROR _spoolss_RouterReplyPrinter(struct pipes_struct *p,
+ struct spoolss_RouterReplyPrinter *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10432,7 +10432,7 @@ WERROR _spoolss_RouterReplyPrinter(struc
+ WERROR _spoolss_ReplyClosePrinter(struct pipes_struct *p,
+ struct spoolss_ReplyClosePrinter *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10443,7 +10443,7 @@ WERROR _spoolss_ReplyClosePrinter(struct
+ WERROR _spoolss_AddPortEx(struct pipes_struct *p,
+ struct spoolss_AddPortEx *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10454,7 +10454,7 @@ WERROR _spoolss_AddPortEx(struct pipes_s
+ WERROR _spoolss_RouterFindFirstPrinterChangeNotification(struct pipes_struct *p,
+ struct spoolss_RouterFindFirstPrinterChangeNotification *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10465,7 +10465,7 @@ WERROR _spoolss_RouterFindFirstPrinterCh
+ WERROR _spoolss_SpoolerInit(struct pipes_struct *p,
+ struct spoolss_SpoolerInit *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10476,7 +10476,7 @@ WERROR _spoolss_SpoolerInit(struct pipes
+ WERROR _spoolss_ResetPrinterEx(struct pipes_struct *p,
+ struct spoolss_ResetPrinterEx *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10487,7 +10487,7 @@ WERROR _spoolss_ResetPrinterEx(struct pi
+ WERROR _spoolss_RouterReplyPrinterEx(struct pipes_struct *p,
+ struct spoolss_RouterReplyPrinterEx *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10498,7 +10498,7 @@ WERROR _spoolss_RouterReplyPrinterEx(str
+ WERROR _spoolss_44(struct pipes_struct *p,
+ struct spoolss_44 *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10509,7 +10509,7 @@ WERROR _spoolss_44(struct pipes_struct *
+ WERROR _spoolss_SetPort(struct pipes_struct *p,
+ struct spoolss_SetPort *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10520,7 +10520,7 @@ WERROR _spoolss_SetPort(struct pipes_str
+ WERROR _spoolss_4a(struct pipes_struct *p,
+ struct spoolss_4a *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10531,7 +10531,7 @@ WERROR _spoolss_4a(struct pipes_struct *
+ WERROR _spoolss_4b(struct pipes_struct *p,
+ struct spoolss_4b *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10542,7 +10542,7 @@ WERROR _spoolss_4b(struct pipes_struct *
+ WERROR _spoolss_4c(struct pipes_struct *p,
+ struct spoolss_4c *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10553,7 +10553,7 @@ WERROR _spoolss_4c(struct pipes_struct *
+ WERROR _spoolss_53(struct pipes_struct *p,
+ struct spoolss_53 *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10564,7 +10564,7 @@ WERROR _spoolss_53(struct pipes_struct *
+ WERROR _spoolss_AddPerMachineConnection(struct pipes_struct *p,
+ struct spoolss_AddPerMachineConnection *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10575,7 +10575,7 @@ WERROR _spoolss_AddPerMachineConnection(
+ WERROR _spoolss_DeletePerMachineConnection(struct pipes_struct *p,
+ struct spoolss_DeletePerMachineConnection *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10586,7 +10586,7 @@ WERROR _spoolss_DeletePerMachineConnecti
+ WERROR _spoolss_EnumPerMachineConnections(struct pipes_struct *p,
+ struct spoolss_EnumPerMachineConnections *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10597,7 +10597,7 @@ WERROR _spoolss_EnumPerMachineConnection
+ WERROR _spoolss_5a(struct pipes_struct *p,
+ struct spoolss_5a *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10608,7 +10608,7 @@ WERROR _spoolss_5a(struct pipes_struct *
+ WERROR _spoolss_5b(struct pipes_struct *p,
+ struct spoolss_5b *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10619,7 +10619,7 @@ WERROR _spoolss_5b(struct pipes_struct *
+ WERROR _spoolss_5c(struct pipes_struct *p,
+ struct spoolss_5c *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10630,7 +10630,7 @@ WERROR _spoolss_5c(struct pipes_struct *
+ WERROR _spoolss_5d(struct pipes_struct *p,
+ struct spoolss_5d *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10641,7 +10641,7 @@ WERROR _spoolss_5d(struct pipes_struct *
+ WERROR _spoolss_5e(struct pipes_struct *p,
+ struct spoolss_5e *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10652,7 +10652,7 @@ WERROR _spoolss_5e(struct pipes_struct *
+ WERROR _spoolss_5f(struct pipes_struct *p,
+ struct spoolss_5f *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10663,7 +10663,7 @@ WERROR _spoolss_5f(struct pipes_struct *
+ WERROR _spoolss_60(struct pipes_struct *p,
+ struct spoolss_60 *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10674,7 +10674,7 @@ WERROR _spoolss_60(struct pipes_struct *
+ WERROR _spoolss_61(struct pipes_struct *p,
+ struct spoolss_61 *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10685,7 +10685,7 @@ WERROR _spoolss_61(struct pipes_struct *
+ WERROR _spoolss_62(struct pipes_struct *p,
+ struct spoolss_62 *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10696,7 +10696,7 @@ WERROR _spoolss_62(struct pipes_struct *
+ WERROR _spoolss_63(struct pipes_struct *p,
+ struct spoolss_63 *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10707,7 +10707,7 @@ WERROR _spoolss_63(struct pipes_struct *
+ WERROR _spoolss_64(struct pipes_struct *p,
+ struct spoolss_64 *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10718,7 +10718,7 @@ WERROR _spoolss_64(struct pipes_struct *
+ WERROR _spoolss_65(struct pipes_struct *p,
+ struct spoolss_65 *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10729,7 +10729,7 @@ WERROR _spoolss_65(struct pipes_struct *
+ WERROR _spoolss_GetCorePrinterDrivers(struct pipes_struct *p,
+ struct spoolss_GetCorePrinterDrivers *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10740,7 +10740,7 @@ WERROR _spoolss_GetCorePrinterDrivers(st
+ WERROR _spoolss_67(struct pipes_struct *p,
+ struct spoolss_67 *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10751,7 +10751,7 @@ WERROR _spoolss_67(struct pipes_struct *
+ WERROR _spoolss_GetPrinterDriverPackagePath(struct pipes_struct *p,
+ struct spoolss_GetPrinterDriverPackagePath *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10762,7 +10762,7 @@ WERROR _spoolss_GetPrinterDriverPackageP
+ WERROR _spoolss_69(struct pipes_struct *p,
+ struct spoolss_69 *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10773,7 +10773,7 @@ WERROR _spoolss_69(struct pipes_struct *
+ WERROR _spoolss_6a(struct pipes_struct *p,
+ struct spoolss_6a *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10784,7 +10784,7 @@ WERROR _spoolss_6a(struct pipes_struct *
+ WERROR _spoolss_6b(struct pipes_struct *p,
+ struct spoolss_6b *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10795,7 +10795,7 @@ WERROR _spoolss_6b(struct pipes_struct *
+ WERROR _spoolss_6c(struct pipes_struct *p,
+ struct spoolss_6c *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -10806,6 +10806,6 @@ WERROR _spoolss_6c(struct pipes_struct *
+ WERROR _spoolss_6d(struct pipes_struct *p,
+ struct spoolss_6d *r)
+ {
+- p->rng_fault_state = true;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+Index: samba-3.6.23/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+===================================================================
+--- samba-3.6.23.orig/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
++++ samba-3.6.23/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+@@ -2549,244 +2549,244 @@ WERROR _srvsvc_NetFileClose(struct pipes
+ WERROR _srvsvc_NetCharDevEnum(struct pipes_struct *p,
+ struct srvsvc_NetCharDevEnum *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NetCharDevGetInfo(struct pipes_struct *p,
+ struct srvsvc_NetCharDevGetInfo *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NetCharDevControl(struct pipes_struct *p,
+ struct srvsvc_NetCharDevControl *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NetCharDevQEnum(struct pipes_struct *p,
+ struct srvsvc_NetCharDevQEnum *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NetCharDevQGetInfo(struct pipes_struct *p,
+ struct srvsvc_NetCharDevQGetInfo *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NetCharDevQSetInfo(struct pipes_struct *p,
+ struct srvsvc_NetCharDevQSetInfo *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NetCharDevQPurge(struct pipes_struct *p,
+ struct srvsvc_NetCharDevQPurge *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NetCharDevQPurgeSelf(struct pipes_struct *p,
+ struct srvsvc_NetCharDevQPurgeSelf *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NetFileGetInfo(struct pipes_struct *p,
+ struct srvsvc_NetFileGetInfo *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NetShareCheck(struct pipes_struct *p,
+ struct srvsvc_NetShareCheck *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NetServerStatisticsGet(struct pipes_struct *p,
+ struct srvsvc_NetServerStatisticsGet *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NetTransportAdd(struct pipes_struct *p,
+ struct srvsvc_NetTransportAdd *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NetTransportEnum(struct pipes_struct *p,
+ struct srvsvc_NetTransportEnum *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NetTransportDel(struct pipes_struct *p,
+ struct srvsvc_NetTransportDel *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NetSetServiceBits(struct pipes_struct *p,
+ struct srvsvc_NetSetServiceBits *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NetPathType(struct pipes_struct *p,
+ struct srvsvc_NetPathType *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NetPathCanonicalize(struct pipes_struct *p,
+ struct srvsvc_NetPathCanonicalize *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NetPathCompare(struct pipes_struct *p,
+ struct srvsvc_NetPathCompare *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NETRPRNAMECANONICALIZE(struct pipes_struct *p,
+ struct srvsvc_NETRPRNAMECANONICALIZE *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NetPRNameCompare(struct pipes_struct *p,
+ struct srvsvc_NetPRNameCompare *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NetShareDelStart(struct pipes_struct *p,
+ struct srvsvc_NetShareDelStart *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NetShareDelCommit(struct pipes_struct *p,
+ struct srvsvc_NetShareDelCommit *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NetServerTransportAddEx(struct pipes_struct *p,
+ struct srvsvc_NetServerTransportAddEx *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NetServerSetServiceBitsEx(struct pipes_struct *p,
+ struct srvsvc_NetServerSetServiceBitsEx *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NETRDFSGETVERSION(struct pipes_struct *p,
+ struct srvsvc_NETRDFSGETVERSION *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NETRDFSCREATELOCALPARTITION(struct pipes_struct *p,
+ struct srvsvc_NETRDFSCREATELOCALPARTITION *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NETRDFSDELETELOCALPARTITION(struct pipes_struct *p,
+ struct srvsvc_NETRDFSDELETELOCALPARTITION *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NETRDFSSETLOCALVOLUMESTATE(struct pipes_struct *p,
+ struct srvsvc_NETRDFSSETLOCALVOLUMESTATE *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NETRDFSSETSERVERINFO(struct pipes_struct *p,
+ struct srvsvc_NETRDFSSETSERVERINFO *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NETRDFSCREATEEXITPOINT(struct pipes_struct *p,
+ struct srvsvc_NETRDFSCREATEEXITPOINT *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NETRDFSDELETEEXITPOINT(struct pipes_struct *p,
+ struct srvsvc_NETRDFSDELETEEXITPOINT *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NETRDFSMODIFYPREFIX(struct pipes_struct *p,
+ struct srvsvc_NETRDFSMODIFYPREFIX *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NETRDFSFIXLOCALVOLUME(struct pipes_struct *p,
+ struct srvsvc_NETRDFSFIXLOCALVOLUME *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NETRDFSMANAGERREPORTSITEINFO(struct pipes_struct *p,
+ struct srvsvc_NETRDFSMANAGERREPORTSITEINFO *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _srvsvc_NETRSERVERTRANSPORTDELEX(struct pipes_struct *p,
+ struct srvsvc_NETRSERVERTRANSPORTDELEX *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+Index: samba-3.6.23/source3/rpc_server/svcctl/srv_svcctl_nt.c
+===================================================================
+--- samba-3.6.23.orig/source3/rpc_server/svcctl/srv_svcctl_nt.c
++++ samba-3.6.23/source3/rpc_server/svcctl/srv_svcctl_nt.c
+@@ -1004,195 +1004,195 @@ WERROR _svcctl_SetServiceObjectSecurity(
+ WERROR _svcctl_DeleteService(struct pipes_struct *p,
+ struct svcctl_DeleteService *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _svcctl_SetServiceStatus(struct pipes_struct *p,
+ struct svcctl_SetServiceStatus *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _svcctl_NotifyBootConfigStatus(struct pipes_struct *p,
+ struct svcctl_NotifyBootConfigStatus *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _svcctl_SCSetServiceBitsW(struct pipes_struct *p,
+ struct svcctl_SCSetServiceBitsW *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _svcctl_ChangeServiceConfigW(struct pipes_struct *p,
+ struct svcctl_ChangeServiceConfigW *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _svcctl_CreateServiceW(struct pipes_struct *p,
+ struct svcctl_CreateServiceW *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _svcctl_QueryServiceLockStatusW(struct pipes_struct *p,
+ struct svcctl_QueryServiceLockStatusW *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _svcctl_GetServiceKeyNameW(struct pipes_struct *p,
+ struct svcctl_GetServiceKeyNameW *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _svcctl_SCSetServiceBitsA(struct pipes_struct *p,
+ struct svcctl_SCSetServiceBitsA *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _svcctl_ChangeServiceConfigA(struct pipes_struct *p,
+ struct svcctl_ChangeServiceConfigA *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _svcctl_CreateServiceA(struct pipes_struct *p,
+ struct svcctl_CreateServiceA *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _svcctl_EnumDependentServicesA(struct pipes_struct *p,
+ struct svcctl_EnumDependentServicesA *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _svcctl_EnumServicesStatusA(struct pipes_struct *p,
+ struct svcctl_EnumServicesStatusA *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _svcctl_OpenSCManagerA(struct pipes_struct *p,
+ struct svcctl_OpenSCManagerA *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _svcctl_OpenServiceA(struct pipes_struct *p,
+ struct svcctl_OpenServiceA *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _svcctl_QueryServiceConfigA(struct pipes_struct *p,
+ struct svcctl_QueryServiceConfigA *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _svcctl_QueryServiceLockStatusA(struct pipes_struct *p,
+ struct svcctl_QueryServiceLockStatusA *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _svcctl_StartServiceA(struct pipes_struct *p,
+ struct svcctl_StartServiceA *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _svcctl_GetServiceDisplayNameA(struct pipes_struct *p,
+ struct svcctl_GetServiceDisplayNameA *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _svcctl_GetServiceKeyNameA(struct pipes_struct *p,
+ struct svcctl_GetServiceKeyNameA *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _svcctl_GetCurrentGroupeStateW(struct pipes_struct *p,
+ struct svcctl_GetCurrentGroupeStateW *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _svcctl_EnumServiceGroupW(struct pipes_struct *p,
+ struct svcctl_EnumServiceGroupW *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _svcctl_ChangeServiceConfig2A(struct pipes_struct *p,
+ struct svcctl_ChangeServiceConfig2A *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _svcctl_ChangeServiceConfig2W(struct pipes_struct *p,
+ struct svcctl_ChangeServiceConfig2W *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _svcctl_QueryServiceConfig2A(struct pipes_struct *p,
+ struct svcctl_QueryServiceConfig2A *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _EnumServicesStatusExA(struct pipes_struct *p,
+ struct EnumServicesStatusExA *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _EnumServicesStatusExW(struct pipes_struct *p,
+ struct EnumServicesStatusExW *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+ WERROR _svcctl_SCSendTSMessage(struct pipes_struct *p,
+ struct svcctl_SCSendTSMessage *r)
+ {
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+Index: samba-3.6.23/source3/rpc_server/winreg/srv_winreg_nt.c
+===================================================================
+--- samba-3.6.23.orig/source3/rpc_server/winreg/srv_winreg_nt.c
++++ samba-3.6.23/source3/rpc_server/winreg/srv_winreg_nt.c
+@@ -760,7 +760,7 @@ WERROR _winreg_SaveKeyEx(struct pipes_st
+ /* fill in your code here if you think this call should
+ do anything */
+
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -948,7 +948,7 @@ WERROR _winreg_UnLoadKey(struct pipes_st
+ /* fill in your code here if you think this call should
+ do anything */
+
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -962,7 +962,7 @@ WERROR _winreg_ReplaceKey(struct pipes_s
+ /* fill in your code here if you think this call should
+ do anything */
+
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -976,7 +976,7 @@ WERROR _winreg_LoadKey(struct pipes_stru
+ /* fill in your code here if you think this call should
+ do anything */
+
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -1139,6 +1139,6 @@ WERROR _winreg_DeleteKeyEx(struct pipes_
+ /* fill in your code here if you think this call should
+ do anything */
+
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+Index: samba-3.6.23/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
+===================================================================
+--- samba-3.6.23.orig/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
++++ samba-3.6.23/source3/rpc_server/wkssvc/srv_wkssvc_nt.c
+@@ -405,7 +405,7 @@ WERROR _wkssvc_NetWkstaSetInfo(struct pi
+ struct wkssvc_NetWkstaSetInfo *r)
+ {
+ /* FIXME: Add implementation code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -608,7 +608,7 @@ WERROR _wkssvc_NetrWkstaUserGetInfo(stru
+ struct wkssvc_NetrWkstaUserGetInfo *r)
+ {
+ /* FIXME: Add implementation code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -619,7 +619,7 @@ WERROR _wkssvc_NetrWkstaUserSetInfo(stru
+ struct wkssvc_NetrWkstaUserSetInfo *r)
+ {
+ /* FIXME: Add implementation code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -630,7 +630,7 @@ WERROR _wkssvc_NetWkstaTransportEnum(str
+ struct wkssvc_NetWkstaTransportEnum *r)
+ {
+ /* FIXME: Add implementation code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -641,7 +641,7 @@ WERROR _wkssvc_NetrWkstaTransportAdd(str
+ struct wkssvc_NetrWkstaTransportAdd *r)
+ {
+ /* FIXME: Add implementation code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -652,7 +652,7 @@ WERROR _wkssvc_NetrWkstaTransportDel(str
+ struct wkssvc_NetrWkstaTransportDel *r)
+ {
+ /* FIXME: Add implementation code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -663,7 +663,7 @@ WERROR _wkssvc_NetrUseAdd(struct pipes_s
+ struct wkssvc_NetrUseAdd *r)
+ {
+ /* FIXME: Add implementation code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -674,7 +674,7 @@ WERROR _wkssvc_NetrUseGetInfo(struct pip
+ struct wkssvc_NetrUseGetInfo *r)
+ {
+ /* FIXME: Add implementation code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -685,7 +685,7 @@ WERROR _wkssvc_NetrUseDel(struct pipes_s
+ struct wkssvc_NetrUseDel *r)
+ {
+ /* FIXME: Add implementation code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -696,7 +696,7 @@ WERROR _wkssvc_NetrUseEnum(struct pipes_
+ struct wkssvc_NetrUseEnum *r)
+ {
+ /* FIXME: Add implementation code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -707,7 +707,7 @@ WERROR _wkssvc_NetrMessageBufferSend(str
+ struct wkssvc_NetrMessageBufferSend *r)
+ {
+ /* FIXME: Add implementation code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -718,7 +718,7 @@ WERROR _wkssvc_NetrWorkstationStatistics
+ struct wkssvc_NetrWorkstationStatisticsGet *r)
+ {
+ /* FIXME: Add implementation code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -729,7 +729,7 @@ WERROR _wkssvc_NetrLogonDomainNameAdd(st
+ struct wkssvc_NetrLogonDomainNameAdd *r)
+ {
+ /* FIXME: Add implementation code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -740,7 +740,7 @@ WERROR _wkssvc_NetrLogonDomainNameDel(st
+ struct wkssvc_NetrLogonDomainNameDel *r)
+ {
+ /* FIXME: Add implementation code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -751,7 +751,7 @@ WERROR _wkssvc_NetrJoinDomain(struct pip
+ struct wkssvc_NetrJoinDomain *r)
+ {
+ /* FIXME: Add implementation code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -762,7 +762,7 @@ WERROR _wkssvc_NetrUnjoinDomain(struct p
+ struct wkssvc_NetrUnjoinDomain *r)
+ {
+ /* FIXME: Add implementation code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -773,7 +773,7 @@ WERROR _wkssvc_NetrRenameMachineInDomain
+ struct wkssvc_NetrRenameMachineInDomain *r)
+ {
+ /* FIXME: Add implementation code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -784,7 +784,7 @@ WERROR _wkssvc_NetrValidateName(struct p
+ struct wkssvc_NetrValidateName *r)
+ {
+ /* FIXME: Add implementation code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -795,7 +795,7 @@ WERROR _wkssvc_NetrGetJoinInformation(st
+ struct wkssvc_NetrGetJoinInformation *r)
+ {
+ /* FIXME: Add implementation code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -806,7 +806,7 @@ WERROR _wkssvc_NetrGetJoinableOus(struct
+ struct wkssvc_NetrGetJoinableOus *r)
+ {
+ /* FIXME: Add implementation code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -962,6 +962,7 @@ WERROR _wkssvc_NetrRenameMachineInDomain
+ struct wkssvc_NetrRenameMachineInDomain2 *r)
+ {
+ /* for now just return not supported */
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -972,7 +973,7 @@ WERROR _wkssvc_NetrValidateName2(struct
+ struct wkssvc_NetrValidateName2 *r)
+ {
+ /* FIXME: Add implementation code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -983,7 +984,7 @@ WERROR _wkssvc_NetrGetJoinableOus2(struc
+ struct wkssvc_NetrGetJoinableOus2 *r)
+ {
+ /* FIXME: Add implementation code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -994,7 +995,7 @@ WERROR _wkssvc_NetrAddAlternateComputerN
+ struct wkssvc_NetrAddAlternateComputerName *r)
+ {
+ /* FIXME: Add implementation code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -1005,7 +1006,7 @@ WERROR _wkssvc_NetrRemoveAlternateComput
+ struct wkssvc_NetrRemoveAlternateComputerName *r)
+ {
+ /* FIXME: Add implementation code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -1016,7 +1017,7 @@ WERROR _wkssvc_NetrSetPrimaryComputernam
+ struct wkssvc_NetrSetPrimaryComputername *r)
+ {
+ /* FIXME: Add implementation code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+
+@@ -1027,6 +1028,6 @@ WERROR _wkssvc_NetrEnumerateComputerName
+ struct wkssvc_NetrEnumerateComputerNames *r)
+ {
+ /* FIXME: Add implementation code here */
+- p->rng_fault_state = True;
++ p->fault_state = DCERPC_FAULT_OP_RNG_ERROR;
+ return WERR_NOT_SUPPORTED;
+ }
+Index: samba-3.6.23/libcli/auth/smbencrypt.c
+===================================================================
+--- samba-3.6.23.orig/libcli/auth/smbencrypt.c
++++ samba-3.6.23/libcli/auth/smbencrypt.c
+@@ -355,11 +355,18 @@ DATA_BLOB NTLMv2_generate_names_blob(TAL
+ DATA_BLOB names_blob = data_blob_talloc(mem_ctx, NULL, 0);
+
+ /* Deliberately ignore return here.. */
+- (void)msrpc_gen(mem_ctx, &names_blob,
+- "aaa",
+- MsvAvNbDomainName, domain,
+- MsvAvNbComputerName, hostname,
+- MsvAvEOL, "");
++ if (hostname != NULL) {
++ (void)msrpc_gen(mem_ctx, &names_blob,
++ "aaa",
++ MsvAvNbDomainName, domain,
++ MsvAvNbComputerName, hostname,
++ MsvAvEOL, "");
++ } else {
++ (void)msrpc_gen(mem_ctx, &names_blob,
++ "aa",
++ MsvAvNbDomainName, domain,
++ MsvAvEOL, "");
++ }
+ return names_blob;
+ }
+
diff --git a/src/patches/squid-3.4-13231.patch b/src/patches/squid-3.4-13231.patch
new file mode 100644
index 0000000..045ad70
--- /dev/null
+++ b/src/patches/squid-3.4-13231.patch
@@ -0,0 +1,48 @@
+------------------------------------------------------------
+revno: 13231
+revision-id: squid3(a)treenet.co.nz-20160220150859-3unryicod1rcx9rm
+parent: squid3(a)treenet.co.nz-20160212045316-zwx4r9we4gf27rx3
+fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4323
+author: Francesco Chemolli <kinkie(a)squid-cache.org>
+committer: Amos Jeffries <squid3(a)treenet.co.nz>
+branch nick: 3.4
+timestamp: Sun 2016-02-21 04:08:59 +1300
+message:
+ Bug 4323: Netfilter broken cross-includes with Linux 4.2
+------------------------------------------------------------
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: squid3(a)treenet.co.nz-20160220150859-3unryicod1rcx9rm
+# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
+# testament_sha1: 10fa174d2821207d0bf89ef3013e8f4c3f99f9e3
+# timestamp: 2016-02-20 15:50:56 +0000
+# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
+# base_revision_id: squid3(a)treenet.co.nz-20160212045316-\
+# zwx4r9we4gf27rx3
+#
+# Begin patch
+=== modified file 'compat/os/linux.h'
+--- compat/os/linux.h 2012-08-28 13:00:30 +0000
++++ compat/os/linux.h 2016-02-20 15:08:59 +0000
+@@ -22,6 +22,21 @@
+ #endif
+
+ /*
++ * Netfilter header madness. (see Bug 4323)
++ *
++ * Netfilter have a history of defining their own versions of network protocol
++ * primitives without sufficient protection against the POSIX defines which are
++ * aways present in Linux.
++ *
++ * netinet/in.h must be included before any other sys header in order to properly
++ * activate include guards in <linux/libc-compat.h> the kernel maintainers added
++ * to workaround it.
++ */
++#if HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++
++/*
+ * sys/capability.h is only needed in Linux apparently.
+ *
+ * HACK: LIBCAP_BROKEN Ugly glue to get around linux header madness colliding with glibc
+
diff --git a/src/patches/squid-3.4-13232.patch b/src/patches/squid-3.4-13232.patch
new file mode 100644
index 0000000..442c34b
--- /dev/null
+++ b/src/patches/squid-3.4-13232.patch
@@ -0,0 +1,51 @@
+------------------------------------------------------------
+revno: 13232
+revision-id: squid3(a)treenet.co.nz-20160330141410-t6p2dhzr8ri36fap
+parent: squid3(a)treenet.co.nz-20160220150859-3unryicod1rcx9rm
+author: Yuriy M. Kaminskiy <yumkam(a)gmail.com>
+committer: Amos Jeffries <squid3(a)treenet.co.nz>
+branch nick: 3.4
+timestamp: Thu 2016-03-31 03:14:10 +1300
+message:
+ pinger: Fix buffer overflow in Icmp6::Recv
+------------------------------------------------------------
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: squid3(a)treenet.co.nz-20160330141410-t6p2dhzr8ri36fap
+# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
+# testament_sha1: e404755509c03ec58c0c293552a7f2a579810fd3
+# timestamp: 2016-03-30 14:51:02 +0000
+# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
+# base_revision_id: squid3(a)treenet.co.nz-20160220150859-\
+# 3unryicod1rcx9rm
+#
+# Begin patch
+=== modified file 'src/icmp/Icmp6.cc'
+--- src/icmp/Icmp6.cc 2014-09-15 05:06:14 +0000
++++ src/icmp/Icmp6.cc 2016-03-30 14:14:10 +0000
+@@ -277,7 +277,7 @@
+ #define ip6_hops // HOPS!!! (can it be true??)
+
+ ip = (struct ip6_hdr *) pkt;
+- pkt += sizeof(ip6_hdr);
++ NP: echo size needs to +sizeof(ip6_hdr);
+
+ debugs(42, DBG_CRITICAL, HERE << "ip6_nxt=" << ip->ip6_nxt <<
+ ", ip6_plen=" << ip->ip6_plen <<
+@@ -288,7 +288,6 @@
+ */
+
+ icmp6header = (struct icmp6_hdr *) pkt;
+- pkt += sizeof(icmp6_hdr);
+
+ if (icmp6header->icmp6_type != ICMP6_ECHO_REPLY) {
+
+@@ -313,7 +312,7 @@
+ return;
+ }
+
+- echo = (icmpEchoData *) pkt;
++ echo = (icmpEchoData *) (pkt + sizeof(icmp6_hdr));
+
+ preply.opcode = echo->opcode;
+
+
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 916cf307b19d6d267b3a8737ba9b299284c0f137
by git＠ipfire.org 25 Apr '16
by git＠ipfire.org 25 Apr '16
25 Apr '16
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 916cf307b19d6d267b3a8737ba9b299284c0f137 (commit)
from 875bd87bbd1de44979d1d1a4605a5713d7d07118 (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 916cf307b19d6d267b3a8737ba9b299284c0f137
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Apr 25 21:44:47 2016 +0200
core101: close core update.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/101/update.sh | 2 +-
make.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/101/update.sh b/config/rootfiles/core/101/update.sh
index 0c9fe6d..207b046 100644
--- a/config/rootfiles/core/101/update.sh
+++ b/config/rootfiles/core/101/update.sh
@@ -80,7 +80,7 @@ fi
sync
# This update need a reboot...
-#touch /var/run/need_reboot
+touch /var/run/need_reboot
# Finish
/etc/init.d/fireinfo start
diff --git a/make.sh b/make.sh
index e8def81..960b45d 100755
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.19" # Version number
CORE="101" # Core Level (Filename)
-PAKFIRE_CORE="100" # Core Level (PAKFIRE)
+PAKFIRE_CORE="101" # Core Level (PAKFIRE)
GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 875bd87bbd1de44979d1d1a4605a5713d7d07118
by git＠ipfire.org 25 Apr '16
by git＠ipfire.org 25 Apr '16
25 Apr '16
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 875bd87bbd1de44979d1d1a4605a5713d7d07118 (commit)
from a03527d459e3e6374972698e74f097cf9bff5000 (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 875bd87bbd1de44979d1d1a4605a5713d7d07118
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Apr 25 18:02:53 2016 +0200
backports: ath9k fix ht40 init.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
.../core/101/filelists/armv5tel/ath9k-module | 3 ++
.../rootfiles/core/101/filelists/i586/ath9k-module | 3 ++
.../core/101/filelists/x86_64/ath9k-module | 2 +
lfs/backports | 1 +
...ports-4.2.6-1-ath9k_add_missing_mask_init.patch | 56 ++++++++++++++++++++++
5 files changed, 65 insertions(+)
create mode 100644 config/rootfiles/core/101/filelists/armv5tel/ath9k-module
create mode 100644 config/rootfiles/core/101/filelists/i586/ath9k-module
create mode 100644 config/rootfiles/core/101/filelists/x86_64/ath9k-module
create mode 100644 src/patches/backports-4.2.6-1-ath9k_add_missing_mask_init.patch
Difference in files:
diff --git a/config/rootfiles/core/101/filelists/armv5tel/ath9k-module b/config/rootfiles/core/101/filelists/armv5tel/ath9k-module
new file mode 100644
index 0000000..92f518e
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/armv5tel/ath9k-module
@@ -0,0 +1,3 @@
+lib/modules/KVER-ipfire-multi/kernel/drivers/net/wireless/ath/ath9k
+lib/modules/KVER-ipfire-kirkwood/kernel/drivers/net/wireless/ath/ath9k
+
diff --git a/config/rootfiles/core/101/filelists/i586/ath9k-module b/config/rootfiles/core/101/filelists/i586/ath9k-module
new file mode 100644
index 0000000..2490e61
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/i586/ath9k-module
@@ -0,0 +1,3 @@
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/ath9k
+lib/modules/KVER-ipfire-pae/kernel/drivers/net/wireless/ath/ath9k
+
diff --git a/config/rootfiles/core/101/filelists/x86_64/ath9k-module b/config/rootfiles/core/101/filelists/x86_64/ath9k-module
new file mode 100644
index 0000000..25361ce
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/x86_64/ath9k-module
@@ -0,0 +1,2 @@
+lib/modules/KVER-ipfire/kernel/drivers/net/wireless/ath/ath9k
+
diff --git a/lfs/backports b/lfs/backports
index 12bd83f..3c8e6cd 100644
--- a/lfs/backports
+++ b/lfs/backports
@@ -102,6 +102,7 @@ endif
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-4.2.6-1-mt7601_upstream_fixes.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-3.18.1-1_add_libertas_uap.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-4.2.6-1_ath10k_remove_logspam.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/backports-4.2.6-1-ath9k_add_missing_mask_init.patch
# smsc mac address patch for pandaboard and raspberry pi
ifeq "$(KCFG)" "-multi"
diff --git a/src/patches/backports-4.2.6-1-ath9k_add_missing_mask_init.patch b/src/patches/backports-4.2.6-1-ath9k_add_missing_mask_init.patch
new file mode 100644
index 0000000..01aee6d
--- /dev/null
+++ b/src/patches/backports-4.2.6-1-ath9k_add_missing_mask_init.patch
@@ -0,0 +1,56 @@
+by moving common code to ar5008_hw_cmn_spur_mitigate i forgot to move
+mask_m & mask_p initialisation. This coused a performance regression
+on ar9281.
+
+
+Fixes: f911085ffa88 ("ath9k: split ar5008_hw_spur_mitigate and reuse common
+code in ar9002_hw_spur_mitigate.")
+Reported-by: Gustav Frederiksen <lkml2...(a)openmailbox.org>
+Tested-by: Gustav Frederiksen <lkml2...(a)openmailbox.org>
+Signed-off-by: Oleksij Rempel <li...(a)rempel-privat.de>
+diff -Naur backports-4.2.6-1.org/drivers/net/wireless/ath/ath9k/ar5008_phy.c backports-4.2.6-1/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+--- backports-4.2.6-1.org/drivers/net/wireless/ath/ath9k/ar5008_phy.c 2015-11-15 22:19:39.000000000 +0100
++++ backports-4.2.6-1/drivers/net/wireless/ath/ath9k/ar5008_phy.c 2016-04-25 09:37:58.765112541 +0200
+@@ -274,6 +274,9 @@
+ };
+ static const int inc[4] = { 0, 100, 0, 0 };
+
++ memset(&mask_m, 0, sizeof(int8_t) * 123);
++ memset(&mask_p, 0, sizeof(int8_t) * 123);
++
+ cur_bin = -6000;
+ upper = bin + 100;
+ lower = bin - 100;
+@@ -424,14 +427,9 @@
+ int tmp, new;
+ int i;
+
+- int8_t mask_m[123];
+- int8_t mask_p[123];
+ int cur_bb_spur;
+ bool is2GHz = IS_CHAN_2GHZ(chan);
+
+- memset(&mask_m, 0, sizeof(int8_t) * 123);
+- memset(&mask_p, 0, sizeof(int8_t) * 123);
+-
+ for (i = 0; i < AR_EEPROM_MODAL_SPURS; i++) {
+ cur_bb_spur = ah->eep_ops->get_spur_channel(ah, i, is2GHz);
+ if (AR_NO_SPUR == cur_bb_spur)
+diff -Naur backports-4.2.6-1.org/drivers/net/wireless/ath/ath9k/ar9002_phy.c backports-4.2.6-1/drivers/net/wireless/ath/ath9k/ar9002_phy.c
+--- backports-4.2.6-1.org/drivers/net/wireless/ath/ath9k/ar9002_phy.c 2015-11-15 22:19:39.000000000 +0100
++++ backports-4.2.6-1/drivers/net/wireless/ath/ath9k/ar9002_phy.c 2016-04-25 09:38:57.729109148 +0200
+@@ -178,14 +178,9 @@
+ int i;
+ struct chan_centers centers;
+
+- int8_t mask_m[123];
+- int8_t mask_p[123];
+ int cur_bb_spur;
+ bool is2GHz = IS_CHAN_2GHZ(chan);
+
+- memset(&mask_m, 0, sizeof(int8_t) * 123);
+- memset(&mask_p, 0, sizeof(int8_t) * 123);
+-
+ ath9k_hw_get_channel_centers(ah, chan, ¢ers);
+ freq = centers.synth_center;
+
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. c414ebd58adcea238591577cb6a50eecb69e449a
by git＠ipfire.org 22 Apr '16
by git＠ipfire.org 22 Apr '16
22 Apr '16
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 c414ebd58adcea238591577cb6a50eecb69e449a (commit)
via 063fe32f82356d42a7e84bb0a3c5c1fa1b924cd3 (commit)
via 52e192db7770de6a941681cf4059f06184976e62 (commit)
via 164e2aca68e5f725ae567adf1a051226be4c2f62 (commit)
via aa470f9f2128128d34d21e7985b27ca6e173c111 (commit)
from 2a325066d4b3dc232e42dfce043e4954df4f2a0c (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 c414ebd58adcea238591577cb6a50eecb69e449a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 22 22:26:49 2016 +0100
libvirt: Remove support for Xen
References: #11106
Fixes: #11099
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 063fe32f82356d42a7e84bb0a3c5c1fa1b924cd3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 22 22:22:47 2016 +0100
iasl: Remove package
This was only used by Xen which was removed, too.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 52e192db7770de6a941681cf4059f06184976e62
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 22 22:22:18 2016 +0100
SDL: Remove package
This was only used by Xen which was removed, too.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 164e2aca68e5f725ae567adf1a051226be4c2f62
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 22 22:21:43 2016 +0100
dev86: Remove package
This was only used by Xen which was removed, too.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit aa470f9f2128128d34d21e7985b27ca6e173c111
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 22 22:20:13 2016 +0100
Remove xen
This package is currently not maintained and fails to build.
We do not have too much use for this at the moment, so I will
remove it. See the bug #11106 for more reasons.
Fixes #11106
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
SDL/SDL.nm | 64 -
dev86/dev86-64bit.patch | 20 -
dev86/dev86.nm | 71 -
dev86/patches/01-dev86-pic.patch | 20 -
dev86/patches/02-dev86-0.16.17-fortify.patch | 43 -
dev86/patches/copt.patch | 11 -
dev86/patches/dev86-long.patch | 17 -
dev86/patches/dev86-nostrip.patch | 11 -
iasl/iasl.nm | 61 -
iasl/patches/Werror.patch | 10 -
iasl/patches/iasl-20110922-as-needed.patch | 16 -
iasl/patches/iasl-20110922-locale.patch | 16 -
libvirt/libvirt.nm | 5 +-
xen/patches/01-xen-initscript.patch | 138 -
xen/patches/02-patch.patch0 | 23 -
xen/patches/04-xen-dumpdir.patch | 32 -
.../05-xen-net-disable-iptables-on-bridge.patch | 29 -
xen/patches/10-xen-no-werror.patch | 12 -
xen/patches/18-localgcc45fix.patch | 13 -
xen/patches/20-localgcc451fix.patch | 26 -
xen/patches/23-grub-ext4-support.patch.off | 474 --
xen/patches/26-localgcc46fix.patch | 11 -
xen/patches/28-pygrubfix.patch | 28 -
xen/patches/31-pygrubfix2.patch | 92 -
xen/patches/32-xen-4.1-testing.23190.patch | 64 -
xen/patches/33-xend.empty.xml.patch | 15 -
xen/patches/34-xend.catchbt.patch | 30 -
xen/patches/35-xend-pci-loop.patch | 19 -
xen/patches/36-localgcc47fix.patch | 32 -
...-3cf61880403b4e484539596a95937cc066243388.patch | 43 -
.../50-upstream-23936:cdb34816a40a-rework.patch | 7924 --------------------
xen/patches/51-upstream-23937:5173834e8476.patch | 20 -
.../52-upstream-23938:fa04fbd56521-rework.patch | 321 -
.../53-upstream-23939:51288f69523f-rework.patch | 1509 ----
xen/patches/54-upstream-23940:187d59e32a58.patch | 45 -
xen/patches/99-xen-configure-xend.patch | 37 -
xen/patches/xen-gcc-4.6.0.patch.off | 23 -
xen/patches/xen-ipxe.patch0 | 23 -
xen/xen.nm | 159 -
39 files changed, 2 insertions(+), 11505 deletions(-)
delete mode 100644 SDL/SDL.nm
delete mode 100644 dev86/dev86-64bit.patch
delete mode 100644 dev86/dev86.nm
delete mode 100644 dev86/patches/01-dev86-pic.patch
delete mode 100644 dev86/patches/02-dev86-0.16.17-fortify.patch
delete mode 100644 dev86/patches/copt.patch
delete mode 100644 dev86/patches/dev86-long.patch
delete mode 100644 dev86/patches/dev86-nostrip.patch
delete mode 100644 iasl/iasl.nm
delete mode 100644 iasl/patches/Werror.patch
delete mode 100644 iasl/patches/iasl-20110922-as-needed.patch
delete mode 100644 iasl/patches/iasl-20110922-locale.patch
delete mode 100644 xen/patches/01-xen-initscript.patch
delete mode 100644 xen/patches/02-patch.patch0
delete mode 100644 xen/patches/04-xen-dumpdir.patch
delete mode 100644 xen/patches/05-xen-net-disable-iptables-on-bridge.patch
delete mode 100644 xen/patches/10-xen-no-werror.patch
delete mode 100644 xen/patches/18-localgcc45fix.patch
delete mode 100644 xen/patches/20-localgcc451fix.patch
delete mode 100644 xen/patches/23-grub-ext4-support.patch.off
delete mode 100644 xen/patches/26-localgcc46fix.patch
delete mode 100644 xen/patches/28-pygrubfix.patch
delete mode 100644 xen/patches/31-pygrubfix2.patch
delete mode 100644 xen/patches/32-xen-4.1-testing.23190.patch
delete mode 100644 xen/patches/33-xend.empty.xml.patch
delete mode 100644 xen/patches/34-xend.catchbt.patch
delete mode 100644 xen/patches/35-xend-pci-loop.patch
delete mode 100644 xen/patches/36-localgcc47fix.patch
delete mode 100644 xen/patches/37-qemu-xen-4.1-testing.git-3cf61880403b4e484539596a95937cc066243388.patch
delete mode 100644 xen/patches/50-upstream-23936:cdb34816a40a-rework.patch
delete mode 100644 xen/patches/51-upstream-23937:5173834e8476.patch
delete mode 100644 xen/patches/52-upstream-23938:fa04fbd56521-rework.patch
delete mode 100644 xen/patches/53-upstream-23939:51288f69523f-rework.patch
delete mode 100644 xen/patches/54-upstream-23940:187d59e32a58.patch
delete mode 100644 xen/patches/99-xen-configure-xend.patch
delete mode 100644 xen/patches/xen-gcc-4.6.0.patch.off
delete mode 100644 xen/patches/xen-ipxe.patch0
delete mode 100644 xen/xen.nm
Difference in files:
diff --git a/SDL/SDL.nm b/SDL/SDL.nm
deleted file mode 100644
index 21fd515..0000000
--- a/SDL/SDL.nm
+++ /dev/null
@@ -1,64 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = SDL
-version = 1.2.15
-release = 1
-
-groups = System/Libraries
-url = http://www.libsdl.org/
-license = LGPLv2+
-summary = A cross-platform multimedia library.
-
-description
- Simple DirectMedia Layer (SDL) is a cross-platform multimedia library
- designed to provide fast access to the graphics frame buffer and audio
- device.
-end
-
-source_dl = http://www.libsdl.org/release/
-
-build
- requires
- libusb-compat-devel
- libX11-devel
- libXext-devel
- libXrandr-devel
- libXrender-devel
- mesa-devel
- end
-
- if "%{DISTRO_PLATFORM}" == "x86"
- requires += nasm
- end
-
- configure_options += \
- --disable-video-svga \
- --disable-video-ggi \
- --disable-video-aalib \
- --disable-video-ps3 \
- --enable-sdl-dlopen
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
-
- requires
- libX11-devel
- libXext-devel
- libXrandr-devel
- libXrender-devel
- mesa-devel
- SDL = %{thisver}
- end
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/dev86/dev86-64bit.patch b/dev86/dev86-64bit.patch
deleted file mode 100644
index 01fa549..0000000
--- a/dev86/dev86-64bit.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- dev86-0.16.17/bcc/bcc.c.fix 2005-01-03 23:41:55.000000000 +0100
-+++ dev86-0.16.17/bcc/bcc.c 2006-12-27 16:32:57.000000000 +0100
-@@ -226,12 +226,12 @@
-
- } else {
- /* Relative paths to normal PREFIX directory */
-- default_include = build_libpath("-I", "/lib/bcc/include", "");
-- default_libdir = build_libpath("-L", "/lib/bcc", libdir_suffix);
-- optim_rules = build_libpath("-d", "/lib/bcc", libdir_suffix);
-+ default_include = build_libpath("-I", "/lib64/bcc/include", "");
-+ default_libdir = build_libpath("-L", "/lib64/bcc", libdir_suffix);
-+ optim_rules = build_libpath("-d", "/lib64/bcc", libdir_suffix);
-
-- build_prefix("/lib/bcc", libdir_suffix, "");
-- build_prefix("/lib/bcc", "", "");
-+ build_prefix("/lib64/bcc", libdir_suffix, "");
-+ build_prefix("/lib64/bcc", "", "");
- }
-
- build_prefix("/bin", "", "");
diff --git a/dev86/dev86.nm b/dev86/dev86.nm
deleted file mode 100644
index 7747182..0000000
--- a/dev86/dev86.nm
+++ /dev/null
@@ -1,71 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = dev86
-version = 0.16.18
-release = 5
-sup_arches = i686 x86_64
-
-maintainer = Ben Schweikert <ben.schweikert(a)ipfire.org>
-groups = Development/Languages
-url = http://www.debath.co.uk/dev86/
-license = GPL+
-summary = Cross development C compiler.
-
-description
- This is a cross development C compiler, assembler and linker
- environment for the production of 8086 executables
- (Optionally MSDOS COM)
-end
-
-source_dl = http://www.debath.co.uk/dev86/
-sources = Dev86src-%{version}.tar.gz
-
-build
- requires
- ncurses-devel
- end
-
- prepare_cmds
- if [ "$(uname -m)" = "x86_64" ]; then
- patch -Np1 -i %{DIR_SOURCE}/dev86-64bit.patch
- fi
- end
-
- build
- make bcc86 unproto copt as86 ld86 CFLAGS="%{CFLAGS}"
- make -C cpp CFLAGS="%{CFLAGS}" %{PARALLELISMFLAGS}
- make -C ar CFLAGS="%{CFLAGS}" %{PARALLELISMFLAGS}
- make -C ld CFLAGS="%{CFLAGS}" %{PARALLELISMFLAGS}
-
- # ncc doesn't support gcc optflags and no parallel build
- make
- end
-
- make_install_targets = \
- DIST=%{BUILDROOT} \
- MANDIR=/usr/share/man \
- LIBDIR=%{libdir}/bcc \
- INCLDIR=/usr/include/bcc \
- LOCLAPREFIX=/usr \
- install install-man
-
- install_cmds
- # Remove useless files.
- rm -rf %{BUILDROOT}/usr/share/{applications,pixmaps}
- end
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/dev86/patches/01-dev86-pic.patch b/dev86/patches/01-dev86-pic.patch
deleted file mode 100644
index ec5d706..0000000
--- a/dev86/patches/01-dev86-pic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- dev86-0.16.18/elksemu/elks.c.orig 2005-11-04 01:35:37.000000000 +0100
-+++ dev86-0.16.18/elksemu/elks.c 2005-11-04 01:45:28.000000000 +0100
-@@ -129,8 +129,17 @@
- static inline int vm86_mine(struct vm86_struct* v86)
- {
- int __res;
-+#ifndef __PIC__
- __asm__ __volatile__("int $0x80\n"
- :"=a" (__res):"a" ((int)OLD_SYS_vm86), "b" ((int)v86));
-+#else
-+ __asm__ __volatile__(
-+ "movl %%ebx,%%ecx\n\t"
-+ "movl %2,%%ebx\n\t"
-+ "int $0x80\n\t"
-+ "movl %%ecx,%%ebx\n\t"
-+ :"=a" (__res):"a" ((int)OLD_SYS_vm86), "r" ((int)v86) : "ecx");
-+#endif
- return __res;
- }
- #endif
diff --git a/dev86/patches/02-dev86-0.16.17-fortify.patch b/dev86/patches/02-dev86-0.16.17-fortify.patch
deleted file mode 100644
index 715d0c4..0000000
--- a/dev86/patches/02-dev86-0.16.17-fortify.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- dev86-0.16.17/bcc/bcc.c
-+++ dev86-0.16.17/bcc/bcc.c
-@@ -19,6 +19,7 @@
- #ifdef __STDC__
- #include <stdlib.h>
- #ifndef MSDOS
-+#include <limits.h>
- #include <unistd.h>
- #endif
- #else
-@@ -596,12 +597,17 @@
- }
- }
-
--void
--command_reset()
--{
- #ifndef MAXPATHLEN
-+#ifdef PATH_MAX
-+#define MAXPATHLEN PATH_MAX
-+#else
- #define MAXPATHLEN 1024
- #endif
-+#endif
-+
-+void
-+command_reset()
-+{
- char buf[MAXPATHLEN];
- char ** prefix;
- char * saved_cmd;
-@@ -1308,11 +1314,7 @@
-
- for(d=s=ptr; d && *s; s=d)
- {
--#ifdef MAXPATHLEN
- char buf[MAXPATHLEN];
--#else
-- char buf[1024];
--#endif
-
- free(temp);
- d=strchr(s, ':');
diff --git a/dev86/patches/copt.patch b/dev86/patches/copt.patch
deleted file mode 100644
index 726196f..0000000
--- a/dev86/patches/copt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- linux86-0.16.17/copt/copt.c.orig 2003-10-08 04:46:35.000000000 +0900
-+++ linux86-0.16.17/copt/copt.c 2010-10-12 12:30:25.000000000 +0900
-@@ -174,7 +174,7 @@ static char *readline(FILE *fp)
- /* Delete leading white spaces */
- for (cp = buf; *cp && isspace(*cp); cp++) ;
- if (cp != buf && *cp)
-- strcpy(buf, cp);
-+ memmove(buf, cp, strlen(cp) + 1);
-
- return(buf);
- }
diff --git a/dev86/patches/dev86-long.patch b/dev86/patches/dev86-long.patch
deleted file mode 100644
index 34cde19..0000000
--- a/dev86/patches/dev86-long.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up dev86-0.16.17/ld/x86_aout.h.long dev86-0.16.17/ld/x86_aout.h
---- dev86-0.16.17/ld/x86_aout.h.long 2003-01-28 23:17:14.000000000 +0100
-+++ dev86-0.16.17/ld/x86_aout.h 2009-02-19 11:37:10.000000000 +0100
-@@ -11,10 +11,11 @@
- /* If the host isn't an x86 all bets are off, use chars. */
- #if defined(i386) || defined(__BCC__) || defined(MSDOS)
- typedef long Long;
--#define __OUT_OK 1
- #else
--typedef char Long[4];
-+#include <stdint.h>
-+typedef int32_t Long;
- #endif
-+#define __OUT_OK 1
-
- struct exec { /* a.out header */
- unsigned char a_magic[2]; /* magic number */
diff --git a/dev86/patches/dev86-nostrip.patch b/dev86/patches/dev86-nostrip.patch
deleted file mode 100644
index b26169a..0000000
--- a/dev86/patches/dev86-nostrip.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dev86-0.16.17/makefile.in.nostrip 2007-01-30 14:28:38.000000000 +0100
-+++ dev86-0.16.17/makefile.in 2007-01-30 14:40:56.000000000 +0100
-@@ -78,7 +78,7 @@
-
- # Install files with the userid of the currently running process.
- INDAT=-m 644
--INEXE=-m 755 -s
-+INEXE=-m 755
- INSCR=-m 755
-
- #ifdef __CYGWIN__
diff --git a/iasl/iasl.nm b/iasl/iasl.nm
deleted file mode 100644
index f2c333d..0000000
--- a/iasl/iasl.nm
+++ /dev/null
@@ -1,61 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = iasl
-version = 20111123
-release = 3
-sup_arches = i686 x86_64
-thisapp = acpica-unix-%{version}
-
-maintainer = Ben Schweikert <ben.schweikert(a)ipfire.org>
-groups = Development/Languages
-url = http://www.acpica.org/downloads/
-license = GPL+
-summary = Cross development C compiler.
-
-description
- iasl compiles ASL (ACPI Source Language) into AML (ACPI Machine
- Language), which is suitable for inclusion as a DSDT in system
- firmware. It also can disassemble AML, for debugging purposes.
-end
-
-source_dl = http://www.acpica.org/download/
-
-build
- requires
- ncurses-devel
- bison
- flex
- end
-
- prepare_cmds
- # Remove -Werror from source.
- find . -type f -exec sed -ie 's!-Werror!!g' {} \;
- end
-
- build
- # Only build the compiler.
- cd compiler
-
- # Does not support parallel build.
- make
- end
-
- install
- mkdir -pv %{BUILDROOT}/usr/bin/
-
- # Only install compiler.
- cd compiler
- make install INSTALLDIR=%{BUILDROOT}/usr/bin
- end
-end
-
-packages
- package %{name}
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/iasl/patches/Werror.patch b/iasl/patches/Werror.patch
deleted file mode 100644
index b882d4b..0000000
--- a/iasl/patches/Werror.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/compiler/Makefile 2011-12-04 19:47:42.324530514 +0100
-+++ b/compiler/Makefile 2011-12-04 19:48:00.946530074 +0100
-@@ -227,7 +227,6 @@
- -Wall \
- -Wbad-function-cast \
- -Wdeclaration-after-statement \
-- -Werror \
- -Wformat=2 \
- -Wmissing-declarations \
- -Wmissing-prototypes \
diff --git a/iasl/patches/iasl-20110922-as-needed.patch b/iasl/patches/iasl-20110922-as-needed.patch
deleted file mode 100644
index a507f74..0000000
--- a/iasl/patches/iasl-20110922-as-needed.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- tools/acpiexec/Makefile | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/tools/acpiexec/Makefile b/tools/acpiexec/Makefile
-index ba6b534..8435985 100644
---- a/tools/acpiexec/Makefile
-+++ b/tools/acpiexec/Makefile
-@@ -269,7 +269,7 @@ CWARNINGFLAGS += \
- # Rules
- #
- $(PROG) : $(OBJECTS)
-- $(CC) $(LDFLAGS) $(OBJECTS) -o $(PROG)
-+ $(CC) $(OBJECTS) $(LDFLAGS) -o $(PROG)
- $(COPYPROG)
-
- %.o : %.c $(HEADERS) $(ACPICA_HEADERS)
diff --git a/iasl/patches/iasl-20110922-locale.patch b/iasl/patches/iasl-20110922-locale.patch
deleted file mode 100644
index 920c409..0000000
--- a/iasl/patches/iasl-20110922-locale.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nuar acpica-unix-20110922.orig/compiler/Makefile acpica-unix-20110922/compiler/Makefile
---- acpica-unix-20110922.orig/compiler/Makefile 2011-09-22 15:59:34.000000000 +0000
-+++ acpica-unix-20110922/compiler/Makefile 2011-11-07 03:36:49.103281798 +0000
-@@ -258,10 +258,10 @@
- #
- # Bison/Flex configuration
- #
--YACC= bison
-+YACC= LC_ALL=C bison
- YFLAGS+= -v -d -y
-
--LEX= flex
-+LEX= LC_ALL=C flex
- LFLAGS+= -i -s
-
- #
diff --git a/libvirt/libvirt.nm b/libvirt/libvirt.nm
index 25de9c9..b05dd04 100644
--- a/libvirt/libvirt.nm
+++ b/libvirt/libvirt.nm
@@ -5,7 +5,7 @@
name = libvirt
version = 1.3.3
-release = 1
+release = 2
maintainer = Ben Schweikert <ben.schweikert(a)ipfire.org>
groups = Applications/Virtualization
@@ -43,7 +43,6 @@ build
pkg-config
python-devel
readline-devel
- xen-devel
/bin/mount
/bin/umount
end
@@ -59,7 +58,7 @@ build
--without-polkit \
--without-uml \
--without-vbox \
- --with-xen \
+ --without-xen \
--with-storage-fs \
--with-storage-lvm \
--with-storage-mpath \
diff --git a/xen/patches/01-xen-initscript.patch b/xen/patches/01-xen-initscript.patch
deleted file mode 100644
index e01384e..0000000
--- a/xen/patches/01-xen-initscript.patch
+++ /dev/null
@@ -1,138 +0,0 @@
---- xen-4.1.0/tools/misc/xend.orig 2010-02-02 20:43:01.000000000 +0000
-+++ xen-4.1.0/tools/misc/xend 2010-02-02 21:16:13.000000000 +0000
-@@ -8,103 +8,16 @@
- """Xen management daemon.
- Provides console server and HTTP management api.
-
-- Run:
-- xend start
--
-- Restart:
-- xend restart
--
-- The daemon is stopped with:
-- xend stop
--
- The daemon should reconnect to device control interfaces
- and recover its state when restarted.
-
-- On Solaris, the daemons are SMF managed, and you should not attempt
-- to start xend by hand.
- """
--import fcntl
--import glob
--import os
--import os.path
- import sys
--import socket
--import signal
--import time
--import commands
--
- from xen.xend.server import SrvDaemon
-
--class CheckError(ValueError):
-- pass
--
--def hline():
-- print >>sys.stderr, "*" * 70
--
--def msg(message):
-- print >>sys.stderr, "*" * 3, message
--
--def check_logging():
-- """Check python logging is installed and raise an error if not.
-- Logging is standard from Python 2.3 on.
-- """
-- try:
-- import logging
-- except ImportError:
-- hline()
-- msg("Python logging is not installed.")
-- msg("Use 'make install-logging' at the xen root to install.")
-- msg("")
-- msg("Alternatively download and install from")
-- msg("http://www.red-dove.com/python_logging.html")
-- hline()
-- raise CheckError("logging is not installed")
--
--def check_user():
-- """Check that the effective user id is 0 (root).
-- """
-- if os.geteuid() != 0:
-- hline()
-- msg("Xend must be run as root.")
-- hline()
-- raise CheckError("invalid user")
--
--def start_daemon(daemon, *args):
-- if os.fork() == 0:
-- os.execvp(daemon, (daemon,) + args)
--
--def start_blktapctrl():
-- start_daemon("blktapctrl", "")
--
- def main():
-- try:
-- check_logging()
-- check_user()
-- except CheckError:
-- sys.exit(1)
--
- daemon = SrvDaemon.instance()
-- if not sys.argv[1:]:
-- print 'usage: %s {start|stop|reload|restart}' % sys.argv[0]
-- elif sys.argv[1] == 'start':
-- if os.uname()[0] != "SunOS":
-- start_blktapctrl()
-- return daemon.start()
-- elif sys.argv[1] == 'trace_start':
-- start_blktapctrl()
-- return daemon.start(trace=1)
-- elif sys.argv[1] == 'stop':
-- return daemon.stop()
-- elif sys.argv[1] == 'reload':
-- return daemon.reloadConfig()
-- elif sys.argv[1] == 'restart':
-- start_blktapctrl()
-- return daemon.stop() or daemon.start()
-- elif sys.argv[1] == 'status':
-- return daemon.status()
-- else:
-- print 'not an option:', sys.argv[1]
-- return 1
-+ return daemon.start()
-
- if __name__ == '__main__':
- sys.exit(main())
-diff -up xen-3.4.0/tools/python/xen/xend/osdep.py.fix xen-3.4.0/tools/python/xen/xend/osdep.py
---- xen-3.4.0/tools/python/xen/xend/osdep.py.fix 2009-05-18 13:05:38.000000000 +0200
-+++ xen-3.4.0/tools/python/xen/xend/osdep.py 2009-05-20 15:39:18.000000000 +0200
-@@ -27,7 +27,7 @@ _scripts_dir = {
-
- _xend_autorestart = {
- "NetBSD": True,
-- "Linux": True,
-+ "Linux": False,
- "SunOS": False,
- }
-
-diff -up xen-3.4.0/tools/python/xen/xend/server/SrvDaemon.py.fix xen-3.4.0/tools/python/xen/xend/server/SrvDaemon.py
---- xen-3.4.0/tools/python/xen/xend/server/SrvDaemon.py.fix 2009-05-18 13:05:38.000000000 +0200
-+++ xen-3.4.0/tools/python/xen/xend/server/SrvDaemon.py 2009-05-20 15:39:18.000000000 +0200
-@@ -110,7 +110,14 @@ class Daemon:
- # Fork, this allows the group leader to exit,
- # which means the child can never again regain control of the
- # terminal
-- if os.fork():
-+ child = os.fork()
-+ if child:
-+ if not osdep.xend_autorestart:
-+ pidfile = open(XEND_PID_FILE, 'w')
-+ try:
-+ pidfile.write(str(child))
-+ finally:
-+ pidfile.close()
- os._exit(0)
-
- # Detach from standard file descriptors, and redirect them to
diff --git a/xen/patches/02-patch.patch0 b/xen/patches/02-patch.patch0
deleted file mode 100644
index 75d565d..0000000
--- a/xen/patches/02-patch.patch0
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -duNrH tools/firmware/etherboot/patches~/gentoo-hardened.patch xen-4.1.0/tools/firmware/etherboot/patches/gentoo-hardened.patch
---- tools/firmware/etherboot~/patches/gentoo-hardened.patch 1970-01-01 01:00:00.000000000 +0100
-+++ tools/firmware/etherboot/patches/gentoo-hardened.patch 2011-03-27 17:45:13.929697782 +0200
-@@ -0,0 +1,11 @@
-+--- ipxe/src/Makefile~ 2011-03-27 17:41:52.000000000 +0200
-++++ ipxe/src/Makefile 2011-03-27 17:43:20.869446433 +0200
-+@@ -4,7 +4,7 @@
-+ #
-+
-+ CLEANUP :=
-+-CFLAGS :=
-++CFLAGS := -nopie
-+ ASFLAGS :=
-+ LDFLAGS :=
-+ MAKEDEPS := Makefile
-diff -duNrH tools/firmware/etherboot~/patches/series xen-4.1.0/tools/firmware/etherboot/patches/series
---- tools/firmware/etherboot~/patches/series 2011-03-25 11:42:50.000000000 +0100
-+++ tools/firmware/etherboot/patches/series 2011-03-27 17:45:45.140446216 +0200
-@@ -1,3 +1,4 @@
- boot_prompt_option.patch
- gpxe-git-0edf2405b457
- gpxe-git-a803ef3dfeac
-+gentoo-hardened.patch
diff --git a/xen/patches/04-xen-dumpdir.patch b/xen/patches/04-xen-dumpdir.patch
deleted file mode 100644
index c0e7186..0000000
--- a/xen/patches/04-xen-dumpdir.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -up xen-3.4.0/tools/Makefile.dump xen-3.4.0/tools/Makefile
---- xen-3.4.0/tools/Makefile.dump 2009-05-18 13:05:38.000000000 +0200
-+++ xen-3.4.0/tools/Makefile 2009-05-20 17:03:26.000000000 +0200
-@@ -46,7 +46,7 @@ all: subdirs-all
-
- .PHONY: install
- install: subdirs-install
-- $(INSTALL_DIR) $(DESTDIR)/var/xen/dump
-+ $(INSTALL_DIR) $(DESTDIR)/var/lib/xen/dump
- $(INSTALL_DIR) $(DESTDIR)/var/log/xen
- $(INSTALL_DIR) $(DESTDIR)/var/lib/xen
- $(INSTALL_DIR) $(DESTDIR)/var/lock/subsys
---- xen-4.0.0/tools/python/xen/xend/XendDomainInfo.py.orig 2010-02-02 20:43:01.000000000 +0000
-+++ xen-4.0.0/tools/python/xen/xend/XendDomainInfo.py 2010-02-02 21:36:57.000000000 +0000
-@@ -2287,7 +2287,7 @@
- # To prohibit directory traversal
- based_name = os.path.basename(self.info['name_label'])
-
-- coredir = "/var/xen/dump/%s" % (based_name)
-+ coredir = "/var/lib/xen/dump/%s" % (based_name)
- if not os.path.exists(coredir):
- try:
- mkdir.parents(coredir, stat.S_IRWXU)
-@@ -2296,7 +2296,7 @@
-
- if not os.path.isdir(coredir):
- # Use former directory to dump core
-- coredir = '/var/xen/dump'
-+ coredir = '/var/lib/xen/dump'
-
- this_time = time.strftime("%Y-%m%d-%H%M.%S", time.localtime())
- corefile = "%s/%s-%s.%s.core" % (coredir, this_time,
diff --git a/xen/patches/05-xen-net-disable-iptables-on-bridge.patch b/xen/patches/05-xen-net-disable-iptables-on-bridge.patch
deleted file mode 100644
index e7a8930..0000000
--- a/xen/patches/05-xen-net-disable-iptables-on-bridge.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- xen-4.1.0-orig/tools/hotplug/Linux/vif-bridge 2008-08-22 10:49:07.000000000 +0100
-+++ xen-4.1.0-new/tools/hotplug/Linux/vif-bridge 2008-08-29 11:29:38.000000000 +0100
-@@ -96,10 +96,6 @@ case "$command" in
- ;;
- esac
-
--if [ "$type_if" = vif ]; then
-- handle_iptable
--fi
--
- log debug "Successful vif-bridge $command for $dev, bridge $bridge."
- if [ "$type_if" = vif -a "$command" = "online" ]
- then
---- xen-3.3.0-orig/tools/hotplug/Linux/xen-network-common.sh 2008-08-22 10:49:07.000000000 +0100
-+++ xen-3.3.0-new/tools/hotplug/Linux/xen-network-common.sh 2008-08-29 11:29:38.000000000 +0100
-@@ -99,6 +99,13 @@ create_bridge () {
- brctl addbr ${bridge}
- brctl stp ${bridge} off
- brctl setfd ${bridge} 0
-+ # Setting these to zero stops guest<->LAN traffic
-+ # traversing the bridge from hitting the *tables
-+ # rulesets. guest<->host traffic still gets processed
-+ # by the host's iptables rules so this isn't a hole
-+ sysctl -q -w "net.bridge.bridge-nf-call-arptables=0"
-+ sysctl -q -w "net.bridge.bridge-nf-call-ip6tables=0"
-+ sysctl -q -w "net.bridge.bridge-nf-call-iptables=0"
- fi
- }
-
diff --git a/xen/patches/10-xen-no-werror.patch b/xen/patches/10-xen-no-werror.patch
deleted file mode 100644
index ccf281e..0000000
--- a/xen/patches/10-xen-no-werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up xen-3.4.0/tools/libxc/Makefile.werror xen-3.4.0/tools/libxc/Makefile
---- xen-3.4.0/tools/libxc/Makefile.werror 2009-08-05 13:40:32.000000000 +0200
-+++ xen-3.4.0/tools/libxc/Makefile 2009-08-05 13:40:52.000000000 +0200
-@@ -52,7 +52,7 @@ GUEST_SRCS-$(CONFIG_IA64) += xc_dom_i
-
- -include $(XEN_TARGET_ARCH)/Makefile
-
--CFLAGS += -Werror -Wmissing-prototypes
-+CFLAGS += -Wmissing-prototypes
- CFLAGS += $(INCLUDES) -I. -I../xenstore -I../include
-
- # Needed for posix_fadvise64() in xc_linux.c
diff --git a/xen/patches/18-localgcc45fix.patch b/xen/patches/18-localgcc45fix.patch
deleted file mode 100644
index 153fd65..0000000
--- a/xen/patches/18-localgcc45fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-xen-4.0.1/extras/mini-os/lib/math.c generates the warning
-'tmp.ul[1]' may be used uninitialized in this function
-under gcc 4.5 which I think is incorrect
---- xen-4.0.1/extras/mini-os/minios.mk.orig 2010-02-02 20:43:00.000000000 +0000
-+++ xen-4.0.1/extras/mini-os/minios.mk 2010-07-24 22:56:27.000000000 +0100
-@@ -10,6 +10,7 @@
- DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
- DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline)
- DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline
-+DEF_CFLAGS += -Wno-uninitialized
- DEF_CPPFLAGS += -D__XEN_INTERFACE_VERSION__=$(XEN_INTERFACE_VERSION)
-
- DEF_ASFLAGS += -D__ASSEMBLY__
diff --git a/xen/patches/20-localgcc451fix.patch b/xen/patches/20-localgcc451fix.patch
deleted file mode 100644
index 9b5bc16..0000000
--- a/xen/patches/20-localgcc451fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- xen-4.0.1/tools/blktap/lib/blktaplib.h.orig 2010-08-25 11:22:07.000000000 +0100
-+++ xen-4.0.1/tools/blktap/lib/blktaplib.h 2010-08-29 20:57:11.000000000 +0100
-@@ -195,8 +195,10 @@
- pid_t pid;
- } msg_pid_t;
-
-+#ifndef READ
- #define READ 0
- #define WRITE 1
-+#endif
-
- /*Control Messages between manager and tapdev*/
- #define CTLMSG_PARAMS 1
---- xen-4.0.1/tools/blktap2/include/blktaplib.h.orig 2010-08-25 11:22:07.000000000 +0100
-+++ xen-4.0.1/tools/blktap2/include/blktaplib.h 2010-08-29 21:50:50.000000000 +0100
-@@ -197,8 +197,10 @@
- int uuid_len;
- } msg_lock_t;
-
-+#ifndef READ
- #define READ 0
- #define WRITE 1
-+#endif
-
- /*Control Messages between manager and tapdev*/
- #define CTLMSG_PARAMS 1
diff --git a/xen/patches/23-grub-ext4-support.patch.off b/xen/patches/23-grub-ext4-support.patch.off
deleted file mode 100644
index c71cfe1..0000000
--- a/xen/patches/23-grub-ext4-support.patch.off
+++ /dev/null
@@ -1,474 +0,0 @@
-Index: grub-0.97/stage2/fsys_ext2fs.c
-===================================================================
---- grub-0.97.orig/stage2/fsys_ext2fs.c
-+++ grub-0.97/stage2/fsys_ext2fs.c
-@@ -41,6 +41,7 @@ typedef __signed__ short __s16;
- typedef unsigned short __u16;
- typedef __signed__ int __s32;
- typedef unsigned int __u32;
-+typedef unsigned long long __u64;
-
- /*
- * Constants relative to the data blocks, from ext2_fs.h
-@@ -51,7 +52,7 @@ typedef unsigned int __u32;
- #define EXT2_TIND_BLOCK (EXT2_DIND_BLOCK + 1)
- #define EXT2_N_BLOCKS (EXT2_TIND_BLOCK + 1)
-
--/* include/linux/ext2_fs.h */
-+/* lib/ext2fs/ext2_fs.h from e2fsprogs */
- struct ext2_super_block
- {
- __u32 s_inodes_count; /* Inodes count */
-@@ -61,9 +62,9 @@ struct ext2_super_block
- __u32 s_free_inodes_count; /* Free inodes count */
- __u32 s_first_data_block; /* First Data Block */
- __u32 s_log_block_size; /* Block size */
-- __s32 s_log_frag_size; /* Fragment size */
-+ __s32 s_obso_log_frag_size; /* Obsoleted Fragment size */
- __u32 s_blocks_per_group; /* # Blocks per group */
-- __u32 s_frags_per_group; /* # Fragments per group */
-+ __u32 s_obso_frags_per_group; /* Obsoleted Fragments per group */
- __u32 s_inodes_per_group; /* # Inodes per group */
- __u32 s_mtime; /* Mount time */
- __u32 s_wtime; /* Write time */
-@@ -72,7 +73,7 @@ struct ext2_super_block
- __u16 s_magic; /* Magic signature */
- __u16 s_state; /* File system state */
- __u16 s_errors; /* Behaviour when detecting errors */
-- __u16 s_pad;
-+ __u16 s_minor_rev_level; /* minor revision level */
- __u32 s_lastcheck; /* time of last check */
- __u32 s_checkinterval; /* max. time between checks */
- __u32 s_creator_os; /* OS */
-@@ -119,15 +120,29 @@ struct ext2_super_block
- __u32 s_hash_seed[4]; /* HTREE hash seed */
- __u8 s_def_hash_version; /* Default hash version to use */
- __u8 s_jnl_backup_type; /* Default type of journal backup */
-- __u16 s_reserved_word_pad;
-+ __u16 s_desc_size; /* size of group descriptor */
- __u32 s_default_mount_opts;
- __u32 s_first_meta_bg; /* First metablock group */
- __u32 s_mkfs_time; /* When the filesystem was created */
- __u32 s_jnl_blocks[17]; /* Backup of the journal inode */
-- __u32 s_reserved[172]; /* Padding to the end of the block */
-- };
-+ /* 64bit desc support valid if EXT4_FEATURE_INCOMPAT_64BIT */
-+ __u32 s_blocks_count_hi; /* Blocks count */
-+ __u32 s_r_blocks_count_hi; /* Reserved blocks count */
-+ __u32 s_free_blocks_count_hi; /* Free blocks count */
-+ __u16 s_min_extra_isize; /* All inodes have at least # bytes */
-+ __u16 s_max_extra_isize; /* New inodes should reverve # bytes */
-+ __u32 s_flags; /* Miscellaneous flags */
-+ __u16 s_raid_stride; /* Raid stride */
-+ __u16 s_mmp_interval; /* # seconds to wait MMP checking */
-+ __u64 s_mmp_block; /* Block for multi-mount protection */
-+ __u32 s_raid_stripe_width; /* Blocks on all data disks (N*stride)*/
-+ __u8 s_log_groups_per_flex;/* FLEX_BG group size*/
-+ __u8 s_reserved_char_pad;
-+ __u16 s_reserved_pad;
-+ __u32 s_reserved[162]; /* Padding to the end of the block */
-+};
-
--struct ext2_group_desc
-+struct ext4_group_desc
- {
- __u32 bg_block_bitmap; /* Blocks bitmap block */
- __u32 bg_inode_bitmap; /* Inodes bitmap block */
-@@ -135,8 +150,18 @@ struct ext2_group_desc
- __u16 bg_free_blocks_count; /* Free blocks count */
- __u16 bg_free_inodes_count; /* Free inodes count */
- __u16 bg_used_dirs_count; /* Directories count */
-- __u16 bg_pad;
-- __u32 bg_reserved[3];
-+ __u16 bg_flags; /* EXT4_BG_flags (INODE_UNINIT, etc) */
-+ __u32 bg_reserved[2]; /* Likely block/inode bitmap checksum */
-+ __u16 bg_itable_unused; /* Unused inodes count */
-+ __u16 bg_checksum; /* crc16(sb_uuid+group+desc) */
-+ __u32 bg_block_bitmap_hi; /* Blocks bitmap block MSB */
-+ __u32 bg_inode_bitmap_hi; /* Inodes bitmap block MSB */
-+ __u32 bg_inode_table_hi; /* Inodes table block MSB */
-+ __u16 bg_free_blocks_count_hi;/* Free blocks count MSB */
-+ __u16 bg_free_inodes_count_hi;/* Free inodes count MSB */
-+ __u16 bg_used_dirs_count_hi; /* Directories count MSB */
-+ __u16 bg_itable_unused_hi; /* Unused inodes count MSB */
-+ __u32 bg_reserved2[3];
- };
-
- struct ext2_inode
-@@ -174,22 +199,22 @@ struct ext2_inode
- __u32 i_block[EXT2_N_BLOCKS]; /* 40: Pointers to blocks */
- __u32 i_version; /* File version (for NFS) */
- __u32 i_file_acl; /* File ACL */
-- __u32 i_dir_acl; /* Directory ACL */
-- __u32 i_faddr; /* Fragment address */
-+ __u32 i_size_high;
-+ __u32 i_obso_faddr; /* Obsoleted fragment address */
- union
- {
- struct
- {
-- __u8 l_i_frag; /* Fragment number */
-- __u8 l_i_fsize; /* Fragment size */
-- __u16 i_pad1;
-- __u32 l_i_reserved2[2];
-+ __u16 l_i_blocks_high; /* were l_i_reserved1 */
-+ __u16 l_i_file_acl_high;
-+ __u16 l_i_uid_high; /* these 2 fields */
-+ __u16 l_i_gid_high; /* were reserved2[0] */
-+ __u32 l_i_reserved2;
- }
- linux2;
- struct
- {
-- __u8 h_i_frag; /* Fragment number */
-- __u8 h_i_fsize; /* Fragment size */
-+ __u16 h_i_reserved1; /* Obsoleted fragment number/size which are removed in ext4 */
- __u16 h_i_mode_high;
- __u16 h_i_uid_high;
- __u16 h_i_gid_high;
-@@ -198,16 +223,36 @@ struct ext2_inode
- hurd2;
- struct
- {
-- __u8 m_i_frag; /* Fragment number */
-- __u8 m_i_fsize; /* Fragment size */
-- __u16 m_pad1;
-+ __u16 h_i_reserved1; /* Obsoleted fragment number/size which are removed in ext4 */
-+ __u16 m_i_file_acl_high;
- __u32 m_i_reserved2[2];
- }
- masix2;
- }
- osd2; /* OS dependent 2 */
-+ __u16 i_extra_isize;
-+ __u16 i_pad1;
-+ __u32 i_ctime_extra; /* extra Change time (nsec << 2 | epoch) */
-+ __u32 i_mtime_extra; /* extra Modification time(nsec << 2 | epoch) */
-+ __u32 i_atime_extra; /* extra Access time (nsec << 2 | epoch) */
-+ __u32 i_crtime; /* File Creation time */
-+ __u32 i_crtime_extra; /* extra FileCreationtime (nsec << 2 | epoch) */
-+ __u32 i_version_hi; /* high 32 bits for 64-bit version */
- };
-
-+#define EXT4_FEATURE_INCOMPAT_EXTENTS 0x0040 /* extents support */
-+#define EXT4_FEATURE_INCOMPAT_64BIT 0x0080 /* grub not supported*/
-+#define EXT4_FEATURE_INCOMPAT_MMP 0x0100
-+#define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200
-+
-+#define EXT4_HAS_INCOMPAT_FEATURE(sb,mask) \
-+ ( sb->s_feature_incompat & mask )
-+
-+#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
-+#define EXT4_HUGE_FILE_FL 0x00040000 /* Set to each huge file */
-+
-+#define EXT4_MIN_DESC_SIZE 32
-+
- /* linux/limits.h */
- #define NAME_MAX 255 /* # chars in a file name */
-
-@@ -225,6 +270,57 @@ struct ext2_dir_entry
- char name[EXT2_NAME_LEN]; /* File name */
- };
-
-+/* linux/ext4_fs_extents.h */
-+/* This is the extent on-disk structure.
-+ * It's used at the bottom of the tree.
-+ */
-+struct ext4_extent
-+ {
-+ __u32 ee_block; /* first logical block extent covers */
-+ __u16 ee_len; /* number of blocks covered by extent */
-+ __u16 ee_start_hi; /* high 16 bits of physical block */
-+ __u32 ee_start_lo; /* low 32 bits of physical block */
-+ };
-+
-+/*
-+ * This is index on-disk structure.
-+ * It's used at all the levels except the bottom.
-+ */
-+struct ext4_extent_idx
-+ {
-+ __u32 ei_block; /* index covers logical blocks from 'block' */
-+ __u32 ei_leaf_lo; /* pointer to the physical block of the next *
-+ * level. leaf or next index could be there */
-+ __u16 ei_leaf_hi; /* high 16 bits of physical block */
-+ __u16 ei_unused;
-+ };
-+
-+/*
-+ * Each block (leaves and indexes), even inode-stored has header.
-+ */
-+struct ext4_extent_header
-+ {
-+ __u16 eh_magic; /* probably will support different formats */
-+ __u16 eh_entries; /* number of valid entries */
-+ __u16 eh_max; /* capacity of store in entries */
-+ __u16 eh_depth; /* has tree real underlying blocks? */
-+ __u32 eh_generation; /* generation of the tree */
-+ };
-+
-+#define EXT4_EXT_MAGIC (0xf30a)
-+#define EXT_FIRST_EXTENT(__hdr__) \
-+ ((struct ext4_extent *) (((char *) (__hdr__)) + \
-+ sizeof(struct ext4_extent_header)))
-+#define EXT_FIRST_INDEX(__hdr__) \
-+ ((struct ext4_extent_idx *) (((char *) (__hdr__)) + \
-+ sizeof(struct ext4_extent_header)))
-+#define EXT_LAST_EXTENT(__hdr__) \
-+ (EXT_FIRST_EXTENT((__hdr__)) + (__u16)((__hdr__)->eh_entries) - 1)
-+#define EXT_LAST_INDEX(__hdr__) \
-+ (EXT_FIRST_INDEX((__hdr__)) + (__u16)((__hdr__)->eh_entries) - 1)
-+
-+
-+
- /* linux/ext2fs.h */
- /*
- * EXT2_DIR_PAD defines the directory entries boundaries
-@@ -271,8 +367,17 @@ struct ext2_dir_entry
- /* kind of from ext2/super.c */
- #define EXT2_BLOCK_SIZE(s) (1 << EXT2_BLOCK_SIZE_BITS(s))
- /* linux/ext2fs.h */
-+/* sizeof(struct ext2_group_desc) is changed in ext4
-+ * in kernel code, ext2/3 uses sizeof(struct ext2_group_desc) to calculate
-+ * number of desc per block, while ext4 uses superblock->s_desc_size in stead
-+ * superblock->s_desc_size is not available in ext2/3
-+ * */
-+#define EXT2_DESC_SIZE(s) \
-+ (EXT4_HAS_INCOMPAT_FEATURE(s,EXT4_FEATURE_INCOMPAT_64BIT)? \
-+ s->s_desc_size : EXT4_MIN_DESC_SIZE)
- #define EXT2_DESC_PER_BLOCK(s) \
-- (EXT2_BLOCK_SIZE(s) / sizeof (struct ext2_group_desc))
-+ (EXT2_BLOCK_SIZE(s) / EXT2_DESC_SIZE(s))
-+
- /* linux/stat.h */
- #define S_IFMT 00170000
- #define S_IFLNK 0120000
-@@ -434,6 +539,122 @@ ext2fs_block_map (int logical_block)
- [logical_block & (EXT2_ADDR_PER_BLOCK (SUPERBLOCK) - 1)];
- }
-
-+/* extent binary search index
-+ * find closest index in the current level extent tree
-+ * kind of from ext4_ext_binsearch_idx in ext4/extents.c
-+ */
-+static struct ext4_extent_idx*
-+ext4_ext_binsearch_idx(struct ext4_extent_header* eh, int logical_block)
-+{
-+ struct ext4_extent_idx *r, *l, *m;
-+ l = EXT_FIRST_INDEX(eh) + 1;
-+ r = EXT_LAST_INDEX(eh);
-+ while (l <= r)
-+ {
-+ m = l + (r - l) / 2;
-+ if (logical_block < m->ei_block)
-+ r = m - 1;
-+ else
-+ l = m + 1;
-+ }
-+ return (struct ext4_extent_idx*)(l - 1);
-+}
-+
-+/* extent binary search
-+ * find closest extent in the leaf level
-+ * kind of from ext4_ext_binsearch in ext4/extents.c
-+ */
-+static struct ext4_extent*
-+ext4_ext_binsearch(struct ext4_extent_header* eh, int logical_block)
-+{
-+ struct ext4_extent *r, *l, *m;
-+ l = EXT_FIRST_EXTENT(eh) + 1;
-+ r = EXT_LAST_EXTENT(eh);
-+ while (l <= r)
-+ {
-+ m = l + (r - l) / 2;
-+ if (logical_block < m->ee_block)
-+ r = m - 1;
-+ else
-+ l = m + 1;
-+ }
-+ return (struct ext4_extent*)(l - 1);
-+}
-+
-+/* Maps extents enabled logical block into physical block via an inode.
-+ * EXT4_HUGE_FILE_FL should be checked before calling this.
-+ */
-+static int
-+ext4fs_block_map (int logical_block)
-+{
-+ struct ext4_extent_header *eh;
-+ struct ext4_extent *ex, *extent;
-+ struct ext4_extent_idx *ei, *index;
-+ int depth;
-+ int i;
-+
-+#ifdef E2DEBUG
-+ unsigned char *i;
-+ for (i = (unsigned char *) INODE;
-+ i < ((unsigned char *) INODE + sizeof (struct ext2_inode));
-+ i++)
-+ {
-+ printf ("%c", "0123456789abcdef"[*i >> 4]);
-+ printf ("%c", "0123456789abcdef"[*i % 16]);
-+ if (!((i + 1 - (unsigned char *) INODE) % 16))
-+ {
-+ printf ("\n");
-+ }
-+ else
-+ {
-+ printf (" ");
-+ }
-+ }
-+ printf ("logical block %d\n", logical_block);
-+#endif /* E2DEBUG */
-+ eh = (struct ext4_extent_header*)INODE->i_block;
-+ if (eh->eh_magic != EXT4_EXT_MAGIC)
-+ {
-+ errnum = ERR_FSYS_CORRUPT;
-+ return -1;
-+ }
-+ while((depth = eh->eh_depth) != 0)
-+ { /* extent index */
-+ if (eh->eh_magic != EXT4_EXT_MAGIC)
-+ {
-+ errnum = ERR_FSYS_CORRUPT;
-+ return -1;
-+ }
-+ ei = ext4_ext_binsearch_idx(eh, logical_block);
-+ if (ei->ei_leaf_hi)
-+ {/* 64bit physical block number not supported */
-+ errnum = ERR_FILELENGTH;
-+ return -1;
-+ }
-+ if (!ext2_rdfsb(ei->ei_leaf_lo, DATABLOCK1))
-+ {
-+ errnum = ERR_FSYS_CORRUPT;
-+ return -1;
-+ }
-+ eh = (struct ext4_extent_header*)DATABLOCK1;
-+ }
-+
-+ /* depth==0, we come to the leaf */
-+ ex = ext4_ext_binsearch(eh, logical_block);
-+ if (ex->ee_start_hi)
-+ {/* 64bit physical block number not supported */
-+ errnum = ERR_FILELENGTH;
-+ return -1;
-+ }
-+ if ((ex->ee_block + ex->ee_len) < logical_block)
-+ {
-+ errnum = ERR_FSYS_CORRUPT;
-+ return -1;
-+ }
-+ return ex->ee_start_lo + logical_block - ex->ee_block;
-+
-+}
-+
- /* preconditions: all preconds of ext2fs_block_map */
- int
- ext2fs_read (char *buf, int len)
-@@ -468,6 +689,11 @@ ext2fs_read (char *buf, int len)
- /* find the (logical) block component of our location */
- logical_block = filepos >> EXT2_BLOCK_SIZE_BITS (SUPERBLOCK);
- offset = filepos & (EXT2_BLOCK_SIZE (SUPERBLOCK) - 1);
-+ /* map extents enabled logical block number to physical fs on-disk block number */
-+ if (EXT4_HAS_INCOMPAT_FEATURE(SUPERBLOCK,EXT4_FEATURE_INCOMPAT_EXTENTS)
-+ && INODE->i_flags & EXT4_EXTENTS_FL)
-+ map = ext4fs_block_map (logical_block);
-+ else
- map = ext2fs_block_map (logical_block);
- #ifdef E2DEBUG
- printf ("map=%d\n", map);
-@@ -552,7 +778,7 @@ ext2fs_dir (char *dirname)
- int desc; /* index within that group */
- int ino_blk; /* fs pointer of the inode's information */
- int str_chk = 0; /* used to hold the results of a string compare */
-- struct ext2_group_desc *gdp;
-+ struct ext4_group_desc *ext4_gdp;
- struct ext2_inode *raw_inode; /* inode info corresponding to current_ino */
-
- char linkbuf[PATH_MAX]; /* buffer for following symbolic links */
-@@ -598,8 +824,15 @@ ext2fs_dir (char *dirname)
- {
- return 0;
- }
-- gdp = GROUP_DESC;
-- ino_blk = gdp[desc].bg_inode_table +
-+ ext4_gdp = (struct ext4_group_desc *)( (__u8*)GROUP_DESC +
-+ desc * EXT2_DESC_SIZE(SUPERBLOCK));
-+ if (EXT4_HAS_INCOMPAT_FEATURE(SUPERBLOCK, EXT4_FEATURE_INCOMPAT_64BIT)
-+ && (! ext4_gdp->bg_inode_table_hi))
-+ {/* 64bit itable not supported */
-+ errnum = ERR_FILELENGTH;
-+ return -1;
-+ }
-+ ino_blk = ext4_gdp->bg_inode_table +
- (((current_ino - 1) % (SUPERBLOCK->s_inodes_per_group))
- >> log2 (EXT2_INODES_PER_BLOCK (SUPERBLOCK)));
- #ifdef E2DEBUG
-@@ -676,7 +909,10 @@ ext2fs_dir (char *dirname)
- }
- linkbuf[filemax + len] = '\0';
-
-- /* Read the symlink data. */
-+ /* Read the symlink data.
-+ * Slow symlink is extents enabled
-+ * But since grub_read invokes ext2fs_read, nothing to change here
-+ */
- if (! ext2_is_fast_symlink ())
- {
- /* Read the necessary blocks, and reset the file pointer. */
-@@ -687,7 +923,9 @@ ext2fs_dir (char *dirname)
- }
- else
- {
-- /* Copy the data directly from the inode. */
-+ /* Copy the data directly from the inode.
-+ * Fast symlink is not extents enabled
-+ */
- len = filemax;
- memmove (linkbuf, (char *) INODE->i_block, len);
- }
-@@ -721,6 +959,13 @@ ext2fs_dir (char *dirname)
- errnum = ERR_BAD_FILETYPE;
- return 0;
- }
-+ /* if file is too large, just stop and report an error*/
-+ if ( (INODE->i_flags & EXT4_HUGE_FILE_FL) && !(INODE->i_size_high))
-+ {
-+ /* file too large, stop reading */
-+ errnum = ERR_FILELENGTH;
-+ return 0;
-+ }
-
- filemax = (INODE->i_size);
- return 1;
-@@ -775,17 +1020,28 @@ ext2fs_dir (char *dirname)
- }
-
- /* else, find the (logical) block component of our location */
-+ /* ext4 logical block number the same as ext2/3 */
- blk = loc >> EXT2_BLOCK_SIZE_BITS (SUPERBLOCK);
-
- /* we know which logical block of the directory entry we are looking
- for, now we have to translate that to the physical (fs) block on
- the disk */
-+ /* map extents enabled logical block number to physical fs on-disk block number */
-+ if (EXT4_HAS_INCOMPAT_FEATURE(SUPERBLOCK,EXT4_FEATURE_INCOMPAT_EXTENTS)
-+ && INODE->i_flags & EXT4_EXTENTS_FL)
-+ map = ext4fs_block_map (blk);
-+ else
- map = ext2fs_block_map (blk);
- #ifdef E2DEBUG
- printf ("fs block=%d\n", map);
- #endif /* E2DEBUG */
- mapblock2 = -1;
-- if ((map < 0) || !ext2_rdfsb (map, DATABLOCK2))
-+ if (map < 0)
-+ {
-+ *rest = ch;
-+ return 0;
-+ }
-+ if (!ext2_rdfsb (map, DATABLOCK2))
- {
- errnum = ERR_FSYS_CORRUPT;
- *rest = ch;
diff --git a/xen/patches/26-localgcc46fix.patch b/xen/patches/26-localgcc46fix.patch
deleted file mode 100644
index e485c3b..0000000
--- a/xen/patches/26-localgcc46fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xen-4.0.1/Config.mk.orig 2010-08-25 11:22:44.000000000 +0100
-+++ xen-4.0.1/Config.mk 2011-01-29 17:40:43.000000000 +0000
-@@ -135,6 +135,8 @@
-
- LDFLAGS += $(foreach i, $(EXTRA_LIB), -L$(i))
- CFLAGS += $(foreach i, $(EXTRA_INCLUDES), -I$(i))
-+# temporary compile fix for rawhide
-+CFLAGS += -Wunused-but-set-variable -Wno-error=unused-but-set-variable -Wuninitialized -Wno-error=uninitialized
-
- EMBEDDED_EXTRA_CFLAGS := -nopie -fno-stack-protector -fno-stack-protector-all
- EMBEDDED_EXTRA_CFLAGS += -fno-exceptions
diff --git a/xen/patches/28-pygrubfix.patch b/xen/patches/28-pygrubfix.patch
deleted file mode 100644
index e039369..0000000
--- a/xen/patches/28-pygrubfix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- xen-4.1.0/tools/pygrub/src/pygrub.orig 2010-12-31 15:24:11.000000000 +0000
-+++ xen-4.1.0/tools/pygrub/src/pygrub 2011-01-30 18:58:17.000000000 +0000
-@@ -96,6 +96,7 @@
-
- fd = os.open(file, os.O_RDONLY)
- buf = os.read(fd, 512)
-+ offzerocount = 0
- for poff in (446, 462, 478, 494): # partition offsets
-
- # MBR contains a 16 byte descriptor per partition
-@@ -105,6 +106,7 @@
-
- # offset == 0 implies this partition is not enabled
- if offset == 0:
-+ offzerocount += 1
- continue
-
- if type == FDISK_PART_SOLARIS or type == FDISK_PART_SOLARIS_OLD:
-@@ -123,6 +125,9 @@
- else:
- part_offs.append(offset)
-
-+ if offzerocount == 4:
-+ # Might be a grub boot sector pretending to be an MBR
-+ part_offs.append(0)
- return part_offs
-
- class GrubLineEditor(curses.textpad.Textbox):
diff --git a/xen/patches/31-pygrubfix2.patch b/xen/patches/31-pygrubfix2.patch
deleted file mode 100644
index 7f308c6..0000000
--- a/xen/patches/31-pygrubfix2.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- xen-4.1.2/tools/pygrub/src/pygrub.orig 2011-10-13 18:56:41.000000000 +0100
-+++ xen-4.1.2/tools/pygrub/src/pygrub 2011-10-13 20:46:58.000000000 +0100
-@@ -78,9 +78,17 @@
- def get_fs_offset_gpt(file):
- fd = os.open(file, os.O_RDONLY)
- # assume the first partition is an EFI system partition.
-- os.lseek(fd, SECTOR_SIZE * 2, 0)
-+ os.lseek(fd, SECTOR_SIZE, 0)
- buf = os.read(fd, 512)
-- return struct.unpack("<Q", buf[32:40])[0] * SECTOR_SIZE
-+ partcount = struct.unpack("<L", buf[80:84])[0]
-+ partsize = struct.unpack("<L", buf[84:88])[0]
-+ i = partcount
-+ offsets = []
-+ while i>0:
-+ buf = os.read(fd, partsize)
-+ offsets.append(struct.unpack("<Q", buf[32:40])[0] * SECTOR_SIZE)
-+ i -= 1
-+ return offsets
-
- FDISK_PART_SOLARIS=0xbf
- FDISK_PART_SOLARIS_OLD=0x82
-@@ -116,7 +124,9 @@
- continue # no solaris magic at that offset, ignore partition
-
- if type == FDISK_PART_GPT:
-- offset = get_fs_offset_gpt(file)
-+ for offset in get_fs_offset_gpt(file):
-+ part_offs.append(offset)
-+ break
-
- # Active partition has 0x80 as the first byte.
- # If active, prepend to front of list, otherwise append to back.
-@@ -394,7 +404,8 @@
- ["/boot/grub/menu.lst", "/boot/grub/grub.conf",
- "/grub/menu.lst", "/grub/grub.conf"]) + \
- map(lambda x: (x,grub.GrubConf.Grub2ConfigFile),
-- ["/boot/grub/grub.cfg", "/grub/grub.cfg"]) + \
-+ ["/boot/grub/grub.cfg", "/grub/grub.cfg",
-+ "/boot/grub2/grub.cfg", "/grub2/grub.cfg"]) + \
- map(lambda x: (x,grub.ExtLinuxConf.ExtLinuxConfigFile),
- ["/boot/isolinux/isolinux.cfg",
- "/boot/extlinux.conf"])
---- xen-4.1.2/tools/pygrub/src/GrubConf.py.orig 2011-10-08 19:42:10.000000000 +0100
-+++ xen-4.1.2/tools/pygrub/src/GrubConf.py 2011-10-14 21:08:44.000000000 +0100
-@@ -79,6 +79,8 @@
- val = val.replace("(", "").replace(")", "")
- if val[:5] == "msdos":
- val = val[5:]
-+ if val[:3] == "gpt":
-+ val = val[3:]
- self._part = int(val)
- part = property(get_part, set_part)
-
-@@ -368,6 +370,7 @@
- in_function = False
- img = None
- title = ""
-+ menu_level=0
- for l in lines:
- l = l.strip()
- # skip blank lines
-@@ -394,10 +397,18 @@
- img = []
- title = title_match.group(1)
- continue
--
-+
-+ if l.startswith("submenu"):
-+ menu_level += 1
-+ continue
-+
- if l.startswith("}"):
- if img is None:
-- raise RuntimeError, "syntax error: closing brace without menuentry"
-+ if menu_level > 0:
-+ menu_level -= 1
-+ continue
-+ else:
-+ raise RuntimeError, "syntax error: closing brace without menuentry"
-
- self.add_image(Grub2Image(title, img))
- img = None
-@@ -414,6 +425,8 @@
-
- if self.commands.has_key(com):
- if self.commands[com] is not None:
-+ if arg.strip() == "${saved_entry}":
-+ arg = "0"
- setattr(self, self.commands[com], arg.strip())
- else:
- logging.info("Ignored directive %s" %(com,))
diff --git a/xen/patches/32-xen-4.1-testing.23190.patch b/xen/patches/32-xen-4.1-testing.23190.patch
deleted file mode 100644
index 2c51bc8..0000000
--- a/xen/patches/32-xen-4.1-testing.23190.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-
-# HG changeset patch
-# User Stefano Stabellini <stefano.stabellini(a)eu.citrix.com>
-# Date 1321623485 0
-# Node ID 5a00ccfc63915650b8e1a262c2cad8e8d8670612
-# Parent e73ada19a69daf821aa7d80323f1bd76239b9bae
-x86: re-inject emulated level pirqs in PV on HVM guests if still asserted
-
-PV on HVM guests can loose level interrupts coming from emulated
-devices if they have been remapped onto event channels. The reason is
-that we are missing the code to inject a pirq again in the guest when
-the guest EOIs it, if it corresponds to an emulated level interrupt
-and the interrupt is still asserted.
-
-Fix this issue and also return error when the guest tries to get the
-irq_status of a non-existing pirq.
-
-
-Changes in this backport:
- - move the spinlock afterward to cover the new code only.
-
-Signed-off-by: Stefano Stabellini <stefano.stabellini(a)eu.citrix.com>
-Committed-by: Keir Fraser <keir(a)xen.org>
-xen-unstable changeset: 24007:0526644ad2a6
-xen-unstable date: Thu Oct 27 16:07:18 2011 +0100
-
-diff -r e73ada19a69d -r 5a00ccfc6391 xen/arch/x86/physdev.c
---- a/xen/arch/x86/physdev.c Thu Nov 17 09:13:25 2011 +0000
-+++ b/xen/arch/x86/physdev.c Fri Nov 18 13:38:05 2011 +0000
-@@ -268,6 +268,20 @@
- ret = pirq_guest_eoi(v->domain, eoi.irq);
- else
- ret = 0;
-+ spin_lock(&v->domain->event_lock);
-+ if ( is_hvm_domain(v->domain) &&
-+ domain_pirq_to_emuirq(v->domain, eoi.irq) > 0 )
-+ {
-+ struct hvm_irq *hvm_irq = &v->domain->arch.hvm_domain.irq;
-+ int gsi = domain_pirq_to_emuirq(v->domain, eoi.irq);
-+
-+ /* if this is a level irq and count > 0, send another
-+ * notification */
-+ if ( gsi >= NR_ISAIRQS /* ISA irqs are edge triggered */
-+ && hvm_irq->gsi_assert_count[gsi] )
-+ send_guest_pirq(v->domain, eoi.irq);
-+ }
-+ spin_unlock(&v->domain->event_lock);
- break;
- }
-
-@@ -323,9 +337,10 @@
- break;
- irq_status_query.flags = 0;
- if ( is_hvm_domain(v->domain) &&
-- domain_pirq_to_irq(v->domain, irq) <= 0 )
-+ domain_pirq_to_irq(v->domain, irq) <= 0 &&
-+ domain_pirq_to_emuirq(v->domain, irq) == IRQ_UNBOUND )
- {
-- ret = copy_to_guest(arg, &irq_status_query, 1) ? -EFAULT : 0;
-+ ret = -EINVAL;
- break;
- }
-
-
diff --git a/xen/patches/33-xend.empty.xml.patch b/xen/patches/33-xend.empty.xml.patch
deleted file mode 100644
index e3f29d3..0000000
--- a/xen/patches/33-xend.empty.xml.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://lists.xensource.com/archives/html/xen-devel/2011-11/msg00218.html
-
-diff -r 54a5e994a241 -r 76391f599433 tools/python/xen/xend/XendStateStore.py
---- a/tools/python/xen/xend/XendStateStore.py Wed Nov 02 17:09:09 2011 +0000
-+++ b/tools/python/xen/xend/XendStateStore.py Thu Nov 03 12:02:44 2011 -0400
-@@ -101,6 +101,9 @@ class XendStateStore:
- if not os.path.exists(xml_path):
- return {}
-
-+ if not os.path.getsize(xml_path) == 0:
-+ return {}
-+
- dom = minidom.parse(xml_path)
- root = dom.documentElement
- state = {}
diff --git a/xen/patches/34-xend.catchbt.patch b/xen/patches/34-xend.catchbt.patch
deleted file mode 100644
index 95eac54..0000000
--- a/xen/patches/34-xend.catchbt.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- xen-4.1.2/tools/python/xen/xend/image.py.orig 2011-10-20 18:05:44.000000000 +0100
-+++ xen-4.1.2/tools/python/xen/xend/image.py 2011-11-20 20:41:10.730905790 +0000
-@@ -43,7 +43,11 @@
- from xen.util import utils
- from xen.xend import osdep
-
--xc = xen.lowlevel.xc.xc()
-+try:
-+ xc = xen.lowlevel.xc.xc()
-+except Exception:
-+ print >>sys.stderr, ('xend/image.py: Error connecting to hypervisor')
-+ os._exit(1)
-
- MAX_GUEST_CMDLINE = 1024
-
---- xen-4.1.2/tools/python/xen/xend/XendLogging.py.orig 2011-10-20 18:05:44.000000000 +0100
-+++ xen-4.1.2/tools/python/xen/xend/XendLogging.py 2012-01-10 21:27:57.304916048 +0000
-@@ -132,7 +132,11 @@
- fileHandler = openFileHandler(filename)
- logfilename = filename
- except IOError:
-- logfilename = tempfile.mkstemp("-xend.log")[1]
-+ try:
-+ logfilename = tempfile.mkstemp("-xend.log")[1]
-+ except IOError:
-+ print >>sys.stderr, ('xend/XendLogging.py: Unable to open standard or temporary log file for xend')
-+ os._exit(1)
- fileHandler = openFileHandler(logfilename)
-
- fileHandler.setFormatter(logging.Formatter(LOGFILE_FORMAT, DATE_FORMAT))
diff --git a/xen/patches/35-xend-pci-loop.patch b/xen/patches/35-xend-pci-loop.patch
deleted file mode 100644
index 5c4118a..0000000
--- a/xen/patches/35-xend-pci-loop.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# Don't crash due to weird PCI cards (Bug 767742)
-
-diff -r fb8dd4c67778 tools/python/xen/util/pci.py
---- a/tools/python/xen/util/pci.py Tue Dec 13 14:16:20 2011 -0500
-+++ b/tools/python/xen/util/pci.py Wed Dec 14 15:46:56 2011 -0500
-@@ -1268,7 +1268,12 @@ class PciDevice:
- pass
-
- def get_info_from_sysfs(self):
-- self.find_capability(0x11)
-+ try:
-+ self.find_capability(0x11)
-+ except PciDeviceParseError, err:
-+ log.error("Caught '%s'" % err)
-+ return False
-+
- sysfs_mnt = find_sysfs_mnt()
- if sysfs_mnt == None:
- return False
diff --git a/xen/patches/36-localgcc47fix.patch b/xen/patches/36-localgcc47fix.patch
deleted file mode 100644
index d959df9..0000000
--- a/xen/patches/36-localgcc47fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- xen-4.1.2/xen/arch/x86/i8259.c.orig 2011-10-20 18:05:48.000000000 +0100
-+++ xen-4.1.2/xen/arch/x86/i8259.c 2012-01-15 00:37:08.583827754 +0000
-@@ -62,7 +62,7 @@
- IRQ(x,8), IRQ(x,9), IRQ(x,a), IRQ(x,b), \
- IRQ(x,c), IRQ(x,d), IRQ(x,e), IRQ(x,f)
-
-- static void (*interrupt[])(void) = {
-+ static void (asmlinkage *interrupt[])(void) = {
- IRQLIST_16(0x0), IRQLIST_16(0x1), IRQLIST_16(0x2), IRQLIST_16(0x3),
- IRQLIST_16(0x4), IRQLIST_16(0x5), IRQLIST_16(0x6), IRQLIST_16(0x7),
- IRQLIST_16(0x8), IRQLIST_16(0x9), IRQLIST_16(0xa), IRQLIST_16(0xb),
---- xen-4.1.2/xen/include/asm-x86/hvm/svm/intr.h.orig 2011-10-20 18:05:50.000000000 +0100
-+++ xen-4.1.2/xen/include/asm-x86/hvm/svm/intr.h 2012-01-15 16:38:13.199784658 +0000
-@@ -21,6 +21,6 @@
- #ifndef __ASM_X86_HVM_SVM_INTR_H__
- #define __ASM_X86_HVM_SVM_INTR_H__
-
--void svm_intr_assist(void);
-+asmlinkage void svm_intr_assist(void);
-
- #endif /* __ASM_X86_HVM_SVM_INTR_H__ */
---- xen-4.1.2/xen/include/asm-x86/hvm/vmx/vmx.h.orig 2011-10-20 18:05:50.000000000 +0100
-+++ xen-4.1.2/xen/include/asm-x86/hvm/vmx/vmx.h 2012-01-15 17:06:07.495853077 +0000
-@@ -63,7 +63,7 @@
-
- void vmx_asm_vmexit_handler(struct cpu_user_regs);
- void vmx_asm_do_vmentry(void);
--void vmx_intr_assist(void);
-+asmlinkage void vmx_intr_assist(void);
- void vmx_do_resume(struct vcpu *);
- void vmx_vlapic_msr_changed(struct vcpu *v);
- void vmx_realmode(struct cpu_user_regs *regs);
diff --git a/xen/patches/37-qemu-xen-4.1-testing.git-3cf61880403b4e484539596a95937cc066243388.patch b/xen/patches/37-qemu-xen-4.1-testing.git-3cf61880403b4e484539596a95937cc066243388.patch
deleted file mode 100644
index 3b9933a..0000000
--- a/xen/patches/37-qemu-xen-4.1-testing.git-3cf61880403b4e484539596a95937cc066243388.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 3cf61880403b4e484539596a95937cc066243388 Mon Sep 17 00:00:00 2001
-From: Ian Campbell <Ian.Campbell(a)citrix.com>
-Date: Thu, 2 Feb 2012 13:47:06 +0000
-Subject: [PATCH] e1000: bounds packet size against buffer size
-
-Otherwise we can write beyond the buffer and corrupt memory. This is tracked
-as CVE-2012-0029.
-
-Signed-off-by: Anthony Liguori <aliguori(a)us.ibm.com>
-
-(Backported from qemu upstream 65f82df0d7a71ce1b10cd4c5ab08888d176ac840
- by Ian Campbell.)
-
-Signed-off-by: Ian Campbell <Ian.Campbell(a)citrix.com>
-(cherry picked from commit ebe37b2a3f844bad02dcc30d081f39eda06118f8)
----
- hw/e1000.c | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/tools/ioemu-qemu-xen/hw/e1000.c b/tools/ioemu-qemu-xen/hw/e1000.c
-index bb3689e..97104ed 100644
---- a/tools/ioemu-qemu-xen/hw/e1000.c
-+++ b/tools/ioemu-qemu-xen/hw/e1000.c
-@@ -444,6 +444,8 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
- bytes = split_size;
- if (tp->size + bytes > msh)
- bytes = msh - tp->size;
-+
-+ bytes = MIN(sizeof(tp->data) - tp->size, bytes);
- cpu_physical_memory_read(addr, tp->data + tp->size, bytes);
- if ((sz = tp->size + bytes) >= hdr && tp->size < hdr)
- memmove(tp->header, tp->data, hdr);
-@@ -459,6 +461,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
- // context descriptor TSE is not set, while data descriptor TSE is set
- DBGOUT(TXERR, "TCP segmentaion Error\n");
- } else {
-+ split_size = MIN(sizeof(tp->data) - tp->size, split_size);
- cpu_physical_memory_read(addr, tp->data + tp->size, split_size);
- tp->size += split_size;
- }
---
-1.7.2.5
-
diff --git a/xen/patches/50-upstream-23936:cdb34816a40a-rework.patch b/xen/patches/50-upstream-23936:cdb34816a40a-rework.patch
deleted file mode 100644
index b7bc317..0000000
--- a/xen/patches/50-upstream-23936:cdb34816a40a-rework.patch
+++ /dev/null
@@ -1,7924 +0,0 @@
-# HG changeset patch
-# User Jon Ludlam <jonathan.ludlam(a)eu.citrix.com>
-# Date 1317293932 -3600
-# Node ID ba4cba41f5550684719bc95a25f8f51b92fb604f
-# Parent 7998217630e236639825d4db174c852cfa18e709
-[OCAML] Rename the ocamlfind packages
-
-This patch has the same effect as xen-unstable.hg
-c/s 23936:cdb34816a40a.
-
-ocamlfind does not support namespaces, so to avoid
-name clashes the ocamlfind package names have been
-changed. Note that this does not change the names
-of the actual modules themselves.
-
-xb becomes xenbus, xc becomes xenctrl, xl becomes xenlight,
-xs becomes xenstore, eventchn becomes xeneventchn.
-
-Signed-off-by: Jon Ludlam <jonathan.ludlam(a)eu.citrix.com>
-
---- a/tools/ocaml/libs/eventchn/META.in
-+++ b/tools/ocaml/libs/eventchn/META.in
-@@ -1,5 +1,5 @@
- version = "@VERSION@"
- description = "Eventchn interface extension"
- requires = "unix"
--archive(byte) = "eventchn.cma"
--archive(native) = "eventchn.cmxa"
-+archive(byte) = "xeneventchn.cma"
-+archive(native) = "xeneventchn.cmxa"
---- a/tools/ocaml/libs/eventchn/Makefile
-+++ b/tools/ocaml/libs/eventchn/Makefile
-@@ -2,9 +2,11 @@
- XEN_ROOT=$(TOPLEVEL)/../..
- include $(TOPLEVEL)/common.make
-
--OBJS = eventchn
-+OBJS = xeneventchn
- INTF = $(foreach obj, $(OBJS),$(obj).cmi)
--LIBS = eventchn.cma eventchn.cmxa
-+LIBS = xeneventchn.cma xeneventchn.cmxa
-+
-+LIBS_xeneventchn = $(LDLIBS_libxenctrl)
-
- all: $(INTF) $(LIBS) $(PROGRAMS)
-
-@@ -12,20 +14,20 @@
-
- libs: $(LIBS)
-
--eventchn_OBJS = $(OBJS)
--eventchn_C_OBJS = eventchn_stubs
-+xeneventchn_OBJS = $(OBJS)
-+xeneventchn_C_OBJS = xeneventchn_stubs
-
--OCAML_LIBRARY = eventchn
-+OCAML_LIBRARY = xeneventchn
-
- .PHONY: install
- install: $(LIBS) META
- mkdir -p $(OCAMLDESTDIR)
-- ocamlfind remove -destdir $(OCAMLDESTDIR) eventchn
-- ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore eventchn META $(INTF) $(LIBS) *.a *.so *.cmx
-+ ocamlfind remove -destdir $(OCAMLDESTDIR) xeneventchn
-+ ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xeneventchn META $(INTF) $(LIBS) *.a *.so *.cmx
-
- .PHONY: uninstall
- uninstall:
-- ocamlfind remove -destdir $(OCAMLDESTDIR) eventchn
-+ ocamlfind remove -destdir $(OCAMLDESTDIR) xeneventchn
-
- include $(TOPLEVEL)/Makefile.rules
-
---- a/tools/ocaml/libs/eventchn/eventchn.ml
-+++ /dev/null
-@@ -1,30 +0,0 @@
--(*
-- * Copyright (C) 2006-2007 XenSource Ltd.
-- * Copyright (C) 2008 Citrix Ltd.
-- * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License as published
-- * by the Free Software Foundation; version 2.1 only. with the special
-- * exception on linking described in file LICENSE.
-- *
-- * 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 Lesser General Public License for more details.
-- *)
--
--exception Error of string
--
--type handle
--
--external init: unit -> handle = "stub_eventchn_init"
--external fd: handle -> Unix.file_descr = "stub_eventchn_fd"
--external notify: handle -> int -> unit = "stub_eventchn_notify"
--external bind_interdomain: handle -> int -> int -> int = "stub_eventchn_bind_interdomain"
--external bind_dom_exc_virq: handle -> int = "stub_eventchn_bind_dom_exc_virq"
--external unbind: handle -> int -> unit = "stub_eventchn_unbind"
--external pending: handle -> int = "stub_eventchn_pending"
--external unmask: handle -> int -> unit = "stub_eventchn_unmask"
--
--let _ = Callback.register_exception "eventchn.error" (Error "register_callback")
---- a/tools/ocaml/libs/eventchn/eventchn.mli
-+++ /dev/null
-@@ -1,31 +0,0 @@
--(*
-- * Copyright (C) 2006-2007 XenSource Ltd.
-- * Copyright (C) 2008 Citrix Ltd.
-- * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License as published
-- * by the Free Software Foundation; version 2.1 only. with the special
-- * exception on linking described in file LICENSE.
-- *
-- * 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 Lesser General Public License for more details.
-- *)
--
--exception Error of string
--
--type handle
--
--external init : unit -> handle = "stub_eventchn_init"
--external fd: handle -> Unix.file_descr = "stub_eventchn_fd"
--
--external notify : handle -> int -> unit = "stub_eventchn_notify"
--external bind_interdomain : handle -> int -> int -> int
-- = "stub_eventchn_bind_interdomain"
--external bind_dom_exc_virq : handle -> int = "stub_eventchn_bind_dom_exc_virq"
--external unbind : handle -> int -> unit = "stub_eventchn_unbind"
--external pending : handle -> int = "stub_eventchn_pending"
--external unmask : handle -> int -> unit
-- = "stub_eventchn_unmask"
---- a/tools/ocaml/libs/eventchn/eventchn_stubs.c
-+++ /dev/null
-@@ -1,143 +0,0 @@
--/*
-- * Copyright (C) 2006-2007 XenSource Ltd.
-- * Copyright (C) 2008 Citrix Ltd.
-- * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License as published
-- * by the Free Software Foundation; version 2.1 only. with the special
-- * exception on linking described in file LICENSE.
-- *
-- * 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 Lesser General Public License for more details.
-- */
--
--#include <sys/types.h>
--#include <sys/stat.h>
--#include <fcntl.h>
--#include <unistd.h>
--#include <errno.h>
--#include <stdint.h>
--#include <sys/ioctl.h>
--#include <xen/sysctl.h>
--#include <xen/xen.h>
--#include <xen/sys/evtchn.h>
--#include <xenctrl.h>
--
--#define CAML_NAME_SPACE
--#include <caml/mlvalues.h>
--#include <caml/memory.h>
--#include <caml/alloc.h>
--#include <caml/custom.h>
--#include <caml/callback.h>
--#include <caml/fail.h>
--
--#define _H(__h) ((xc_interface *)(__h))
--
--CAMLprim value stub_eventchn_init(void)
--{
-- CAMLparam0();
-- CAMLlocal1(result);
--
-- xc_interface *xce = xc_evtchn_open(NULL, XC_OPENFLAG_NON_REENTRANT);
-- if (xce == NULL)
-- caml_failwith("open failed");
--
-- result = (value)xce;
-- CAMLreturn(result);
--}
--
--CAMLprim value stub_eventchn_fd(value xce)
--{
-- CAMLparam1(xce);
-- CAMLlocal1(result);
-- int fd;
--
-- fd = xc_evtchn_fd(_H(xce));
-- if (fd == -1)
-- caml_failwith("evtchn fd failed");
--
-- result = Val_int(fd);
--
-- CAMLreturn(result);
--}
--
--CAMLprim value stub_eventchn_notify(value xce, value port)
--{
-- CAMLparam2(xce, port);
-- int rc;
--
-- rc = xc_evtchn_notify(_H(xce), Int_val(port));
-- if (rc == -1)
-- caml_failwith("evtchn notify failed");
--
-- CAMLreturn(Val_unit);
--}
--
--CAMLprim value stub_eventchn_bind_interdomain(value xce, value domid,
-- value remote_port)
--{
-- CAMLparam3(xce, domid, remote_port);
-- CAMLlocal1(port);
-- evtchn_port_or_error_t rc;
--
-- rc = xc_evtchn_bind_interdomain(_H(xce), Int_val(domid), Int_val(remote_port));
-- if (rc == -1)
-- caml_failwith("evtchn bind_interdomain failed");
-- port = Val_int(rc);
--
-- CAMLreturn(port);
--}
--
--CAMLprim value stub_eventchn_bind_dom_exc_virq(value xce)
--{
-- CAMLparam1(xce);
-- CAMLlocal1(port);
-- evtchn_port_or_error_t rc;
--
-- rc = xc_evtchn_bind_virq(_H(xce), VIRQ_DOM_EXC);
-- if (rc == -1)
-- caml_failwith("evtchn bind_dom_exc_virq failed");
-- port = Val_int(rc);
--
-- CAMLreturn(port);
--}
--
--CAMLprim value stub_eventchn_unbind(value xce, value port)
--{
-- CAMLparam2(xce, port);
-- int rc;
--
-- rc = xc_evtchn_unbind(_H(xce), Int_val(port));
-- if (rc == -1)
-- caml_failwith("evtchn unbind failed");
--
-- CAMLreturn(Val_unit);
--}
--
--CAMLprim value stub_eventchn_pending(value xce)
--{
-- CAMLparam1(xce);
-- CAMLlocal1(result);
-- evtchn_port_or_error_t port;
--
-- port = xc_evtchn_pending(_H(xce));
-- if (port == -1)
-- caml_failwith("evtchn pending failed");
-- result = Val_int(port);
--
-- CAMLreturn(result);
--}
--
--CAMLprim value stub_eventchn_unmask(value xce, value _port)
--{
-- CAMLparam2(xce, _port);
-- evtchn_port_t port;
--
-- port = Int_val(_port);
-- if (xc_evtchn_unmask(_H(xce), port))
-- caml_failwith("evtchn unmask failed");
-- CAMLreturn(Val_unit);
--}
---- /dev/null
-+++ b/tools/ocaml/libs/eventchn/xeneventchn.ml
-@@ -0,0 +1,30 @@
-+(*
-+ * Copyright (C) 2006-2007 XenSource Ltd.
-+ * Copyright (C) 2008 Citrix Ltd.
-+ * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License as published
-+ * by the Free Software Foundation; version 2.1 only. with the special
-+ * exception on linking described in file LICENSE.
-+ *
-+ * 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 Lesser General Public License for more details.
-+ *)
-+
-+exception Error of string
-+
-+type handle
-+
-+external init: unit -> handle = "stub_eventchn_init"
-+external fd: handle -> Unix.file_descr = "stub_eventchn_fd"
-+external notify: handle -> int -> unit = "stub_eventchn_notify"
-+external bind_interdomain: handle -> int -> int -> int = "stub_eventchn_bind_interdomain"
-+external bind_dom_exc_virq: handle -> int = "stub_eventchn_bind_dom_exc_virq"
-+external unbind: handle -> int -> unit = "stub_eventchn_unbind"
-+external pending: handle -> int = "stub_eventchn_pending"
-+external unmask: handle -> int -> unit = "stub_eventchn_unmask"
-+
-+let _ = Callback.register_exception "eventchn.error" (Error "register_callback")
---- /dev/null
-+++ b/tools/ocaml/libs/eventchn/xeneventchn.mli
-@@ -0,0 +1,31 @@
-+(*
-+ * Copyright (C) 2006-2007 XenSource Ltd.
-+ * Copyright (C) 2008 Citrix Ltd.
-+ * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License as published
-+ * by the Free Software Foundation; version 2.1 only. with the special
-+ * exception on linking described in file LICENSE.
-+ *
-+ * 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 Lesser General Public License for more details.
-+ *)
-+
-+exception Error of string
-+
-+type handle
-+
-+external init : unit -> handle = "stub_eventchn_init"
-+external fd: handle -> Unix.file_descr = "stub_eventchn_fd"
-+
-+external notify : handle -> int -> unit = "stub_eventchn_notify"
-+external bind_interdomain : handle -> int -> int -> int
-+ = "stub_eventchn_bind_interdomain"
-+external bind_dom_exc_virq : handle -> int = "stub_eventchn_bind_dom_exc_virq"
-+external unbind : handle -> int -> unit = "stub_eventchn_unbind"
-+external pending : handle -> int = "stub_eventchn_pending"
-+external unmask : handle -> int -> unit
-+ = "stub_eventchn_unmask"
---- /dev/null
-+++ b/tools/ocaml/libs/eventchn/xeneventchn_stubs.c
-@@ -0,0 +1,143 @@
-+/*
-+ * Copyright (C) 2006-2007 XenSource Ltd.
-+ * Copyright (C) 2008 Citrix Ltd.
-+ * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License as published
-+ * by the Free Software Foundation; version 2.1 only. with the special
-+ * exception on linking described in file LICENSE.
-+ *
-+ * 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 Lesser General Public License for more details.
-+ */
-+
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include <errno.h>
-+#include <stdint.h>
-+#include <sys/ioctl.h>
-+#include <xen/sysctl.h>
-+#include <xen/xen.h>
-+#include <xen/sys/evtchn.h>
-+#include <xenctrl.h>
-+
-+#define CAML_NAME_SPACE
-+#include <caml/mlvalues.h>
-+#include <caml/memory.h>
-+#include <caml/alloc.h>
-+#include <caml/custom.h>
-+#include <caml/callback.h>
-+#include <caml/fail.h>
-+
-+#define _H(__h) ((xc_interface *)(__h))
-+
-+CAMLprim value stub_eventchn_init(void)
-+{
-+ CAMLparam0();
-+ CAMLlocal1(result);
-+
-+ xc_interface *xce = xc_evtchn_open(NULL, XC_OPENFLAG_NON_REENTRANT);
-+ if (xce == NULL)
-+ caml_failwith("open failed");
-+
-+ result = (value)xce;
-+ CAMLreturn(result);
-+}
-+
-+CAMLprim value stub_eventchn_fd(value xce)
-+{
-+ CAMLparam1(xce);
-+ CAMLlocal1(result);
-+ int fd;
-+
-+ fd = xc_evtchn_fd(_H(xce));
-+ if (fd == -1)
-+ caml_failwith("evtchn fd failed");
-+
-+ result = Val_int(fd);
-+
-+ CAMLreturn(result);
-+}
-+
-+CAMLprim value stub_eventchn_notify(value xce, value port)
-+{
-+ CAMLparam2(xce, port);
-+ int rc;
-+
-+ rc = xc_evtchn_notify(_H(xce), Int_val(port));
-+ if (rc == -1)
-+ caml_failwith("evtchn notify failed");
-+
-+ CAMLreturn(Val_unit);
-+}
-+
-+CAMLprim value stub_eventchn_bind_interdomain(value xce, value domid,
-+ value remote_port)
-+{
-+ CAMLparam3(xce, domid, remote_port);
-+ CAMLlocal1(port);
-+ evtchn_port_or_error_t rc;
-+
-+ rc = xc_evtchn_bind_interdomain(_H(xce), Int_val(domid), Int_val(remote_port));
-+ if (rc == -1)
-+ caml_failwith("evtchn bind_interdomain failed");
-+ port = Val_int(rc);
-+
-+ CAMLreturn(port);
-+}
-+
-+CAMLprim value stub_eventchn_bind_dom_exc_virq(value xce)
-+{
-+ CAMLparam1(xce);
-+ CAMLlocal1(port);
-+ evtchn_port_or_error_t rc;
-+
-+ rc = xc_evtchn_bind_virq(_H(xce), VIRQ_DOM_EXC);
-+ if (rc == -1)
-+ caml_failwith("evtchn bind_dom_exc_virq failed");
-+ port = Val_int(rc);
-+
-+ CAMLreturn(port);
-+}
-+
-+CAMLprim value stub_eventchn_unbind(value xce, value port)
-+{
-+ CAMLparam2(xce, port);
-+ int rc;
-+
-+ rc = xc_evtchn_unbind(_H(xce), Int_val(port));
-+ if (rc == -1)
-+ caml_failwith("evtchn unbind failed");
-+
-+ CAMLreturn(Val_unit);
-+}
-+
-+CAMLprim value stub_eventchn_pending(value xce)
-+{
-+ CAMLparam1(xce);
-+ CAMLlocal1(result);
-+ evtchn_port_or_error_t port;
-+
-+ port = xc_evtchn_pending(_H(xce));
-+ if (port == -1)
-+ caml_failwith("evtchn pending failed");
-+ result = Val_int(port);
-+
-+ CAMLreturn(result);
-+}
-+
-+CAMLprim value stub_eventchn_unmask(value xce, value _port)
-+{
-+ CAMLparam2(xce, _port);
-+ evtchn_port_t port;
-+
-+ port = Int_val(_port);
-+ if (xc_evtchn_unmask(_H(xce), port))
-+ caml_failwith("evtchn unmask failed");
-+ CAMLreturn(Val_unit);
-+}
---- a/tools/ocaml/libs/mmap/META.in
-+++ b/tools/ocaml/libs/mmap/META.in
-@@ -1,4 +1,4 @@
- version = "@VERSION@"
- description = "Mmap interface extension"
--archive(byte) = "mmap.cma"
--archive(native) = "mmap.cmxa"
-+archive(byte) = "xenmmap.cma"
-+archive(native) = "xenmmap.cmxa"
---- a/tools/ocaml/libs/mmap/Makefile
-+++ b/tools/ocaml/libs/mmap/Makefile
-@@ -2,9 +2,9 @@
- XEN_ROOT=$(TOPLEVEL)/../..
- include $(TOPLEVEL)/common.make
-
--OBJS = mmap
-+OBJS = xenmmap
- INTF = $(foreach obj, $(OBJS),$(obj).cmi)
--LIBS = mmap.cma mmap.cmxa
-+LIBS = xenmmap.cma xenmmap.cmxa
-
- all: $(INTF) $(LIBS) $(PROGRAMS)
-
-@@ -12,19 +12,19 @@
-
- libs: $(LIBS)
-
--mmap_OBJS = $(OBJS)
--mmap_C_OBJS = mmap_stubs
--OCAML_LIBRARY = mmap
-+xenmmap_OBJS = $(OBJS)
-+xenmmap_C_OBJS = xenmmap_stubs
-+OCAML_LIBRARY = xenmmap
-
- .PHONY: install
- install: $(LIBS) META
- mkdir -p $(OCAMLDESTDIR)
-- ocamlfind remove -destdir $(OCAMLDESTDIR) mmap
-- ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore mmap META $(INTF) $(LIBS) *.a *.so *.cmx
-+ ocamlfind remove -destdir $(OCAMLDESTDIR) xenmmap
-+ ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xenmmap META $(INTF) $(LIBS) *.a *.so *.cmx
-
- .PHONY: uninstall
- uninstall:
-- ocamlfind remove -destdir $(OCAMLDESTDIR) mmap
-+ ocamlfind remove -destdir $(OCAMLDESTDIR) xenmmap
-
- include $(TOPLEVEL)/Makefile.rules
-
---- a/tools/ocaml/libs/mmap/mmap.ml
-+++ /dev/null
-@@ -1,31 +0,0 @@
--(*
-- * Copyright (C) 2006-2007 XenSource Ltd.
-- * Copyright (C) 2008 Citrix Ltd.
-- * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License as published
-- * by the Free Software Foundation; version 2.1 only. with the special
-- * exception on linking described in file LICENSE.
-- *
-- * 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 Lesser General Public License for more details.
-- *)
--
--type mmap_interface
--
--type mmap_prot_flag = RDONLY | WRONLY | RDWR
--type mmap_map_flag = SHARED | PRIVATE
--
--(* mmap: fd -> prot_flag -> map_flag -> length -> offset -> interface *)
--external mmap: Unix.file_descr -> mmap_prot_flag -> mmap_map_flag
-- -> int -> int -> mmap_interface = "stub_mmap_init"
--external unmap: mmap_interface -> unit = "stub_mmap_final"
--(* read: interface -> start -> length -> data *)
--external read: mmap_interface -> int -> int -> string = "stub_mmap_read"
--(* write: interface -> data -> start -> length -> unit *)
--external write: mmap_interface -> string -> int -> int -> unit = "stub_mmap_write"
--(* getpagesize: unit -> size of page *)
--external getpagesize: unit -> int = "stub_mmap_getpagesize"
---- a/tools/ocaml/libs/mmap/mmap.mli
-+++ /dev/null
-@@ -1,28 +0,0 @@
--(*
-- * Copyright (C) 2006-2007 XenSource Ltd.
-- * Copyright (C) 2008 Citrix Ltd.
-- * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License as published
-- * by the Free Software Foundation; version 2.1 only. with the special
-- * exception on linking described in file LICENSE.
-- *
-- * 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 Lesser General Public License for more details.
-- *)
--
--type mmap_interface
--type mmap_prot_flag = RDONLY | WRONLY | RDWR
--type mmap_map_flag = SHARED | PRIVATE
--
--external mmap : Unix.file_descr -> mmap_prot_flag -> mmap_map_flag -> int -> int
-- -> mmap_interface = "stub_mmap_init"
--external unmap : mmap_interface -> unit = "stub_mmap_final"
--external read : mmap_interface -> int -> int -> string = "stub_mmap_read"
--external write : mmap_interface -> string -> int -> int -> unit
-- = "stub_mmap_write"
--
--external getpagesize : unit -> int = "stub_mmap_getpagesize"
---- a/tools/ocaml/libs/mmap/mmap_stubs.c
-+++ /dev/null
-@@ -1,136 +0,0 @@
--/*
-- * Copyright (C) 2006-2007 XenSource Ltd.
-- * Copyright (C) 2008 Citrix Ltd.
-- * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License as published
-- * by the Free Software Foundation; version 2.1 only. with the special
-- * exception on linking described in file LICENSE.
-- *
-- * 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 Lesser General Public License for more details.
-- */
--
--#include <unistd.h>
--#include <stdlib.h>
--#include <sys/mman.h>
--#include <string.h>
--#include <errno.h>
--#include "mmap_stubs.h"
--
--#include <caml/mlvalues.h>
--#include <caml/memory.h>
--#include <caml/alloc.h>
--#include <caml/custom.h>
--#include <caml/fail.h>
--#include <caml/callback.h>
--
--#define GET_C_STRUCT(a) ((struct mmap_interface *) a)
--
--static int mmap_interface_init(struct mmap_interface *intf,
-- int fd, int pflag, int mflag,
-- int len, int offset)
--{
-- intf->len = len;
-- intf->addr = mmap(NULL, len, pflag, mflag, fd, offset);
-- return (intf->addr == MAP_FAILED) ? errno : 0;
--}
--
--CAMLprim value stub_mmap_init(value fd, value pflag, value mflag,
-- value len, value offset)
--{
-- CAMLparam5(fd, pflag, mflag, len, offset);
-- CAMLlocal1(result);
-- int c_pflag, c_mflag;
--
-- switch (Int_val(pflag)) {
-- case 0: c_pflag = PROT_READ; break;
-- case 1: c_pflag = PROT_WRITE; break;
-- case 2: c_pflag = PROT_READ|PROT_WRITE; break;
-- default: caml_invalid_argument("protectiontype");
-- }
--
-- switch (Int_val(mflag)) {
-- case 0: c_mflag = MAP_SHARED; break;
-- case 1: c_mflag = MAP_PRIVATE; break;
-- default: caml_invalid_argument("maptype");
-- }
--
-- result = caml_alloc(sizeof(struct mmap_interface), Abstract_tag);
--
-- if (mmap_interface_init(GET_C_STRUCT(result), Int_val(fd),
-- c_pflag, c_mflag,
-- Int_val(len), Int_val(offset)))
-- caml_failwith("mmap");
-- CAMLreturn(result);
--}
--
--CAMLprim value stub_mmap_final(value interface)
--{
-- CAMLparam1(interface);
-- struct mmap_interface *intf;
--
-- intf = GET_C_STRUCT(interface);
-- if (intf->addr != MAP_FAILED)
-- munmap(intf->addr, intf->len);
-- intf->addr = MAP_FAILED;
--
-- CAMLreturn(Val_unit);
--}
--
--CAMLprim value stub_mmap_read(value interface, value start, value len)
--{
-- CAMLparam3(interface, start, len);
-- CAMLlocal1(data);
-- struct mmap_interface *intf;
-- int c_start;
-- int c_len;
--
-- c_start = Int_val(start);
-- c_len = Int_val(len);
-- intf = GET_C_STRUCT(interface);
--
-- if (c_start > intf->len)
-- caml_invalid_argument("start invalid");
-- if (c_start + c_len > intf->len)
-- caml_invalid_argument("len invalid");
--
-- data = caml_alloc_string(c_len);
-- memcpy((char *) data, intf->addr + c_start, c_len);
--
-- CAMLreturn(data);
--}
--
--CAMLprim value stub_mmap_write(value interface, value data,
-- value start, value len)
--{
-- CAMLparam4(interface, data, start, len);
-- struct mmap_interface *intf;
-- int c_start;
-- int c_len;
--
-- c_start = Int_val(start);
-- c_len = Int_val(len);
-- intf = GET_C_STRUCT(interface);
--
-- if (c_start > intf->len)
-- caml_invalid_argument("start invalid");
-- if (c_start + c_len > intf->len)
-- caml_invalid_argument("len invalid");
--
-- memcpy(intf->addr + c_start, (char *) data, c_len);
--
-- CAMLreturn(Val_unit);
--}
--
--CAMLprim value stub_mmap_getpagesize(value unit)
--{
-- CAMLparam1(unit);
-- CAMLlocal1(data);
--
-- data = Val_int(getpagesize());
-- CAMLreturn(data);
--}
---- /dev/null
-+++ b/tools/ocaml/libs/mmap/xenmmap.ml
-@@ -0,0 +1,31 @@
-+(*
-+ * Copyright (C) 2006-2007 XenSource Ltd.
-+ * Copyright (C) 2008 Citrix Ltd.
-+ * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License as published
-+ * by the Free Software Foundation; version 2.1 only. with the special
-+ * exception on linking described in file LICENSE.
-+ *
-+ * 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 Lesser General Public License for more details.
-+ *)
-+
-+type mmap_interface
-+
-+type mmap_prot_flag = RDONLY | WRONLY | RDWR
-+type mmap_map_flag = SHARED | PRIVATE
-+
-+(* mmap: fd -> prot_flag -> map_flag -> length -> offset -> interface *)
-+external mmap: Unix.file_descr -> mmap_prot_flag -> mmap_map_flag
-+ -> int -> int -> mmap_interface = "stub_mmap_init"
-+external unmap: mmap_interface -> unit = "stub_mmap_final"
-+(* read: interface -> start -> length -> data *)
-+external read: mmap_interface -> int -> int -> string = "stub_mmap_read"
-+(* write: interface -> data -> start -> length -> unit *)
-+external write: mmap_interface -> string -> int -> int -> unit = "stub_mmap_write"
-+(* getpagesize: unit -> size of page *)
-+external getpagesize: unit -> int = "stub_mmap_getpagesize"
---- /dev/null
-+++ b/tools/ocaml/libs/mmap/xenmmap.mli
-@@ -0,0 +1,28 @@
-+(*
-+ * Copyright (C) 2006-2007 XenSource Ltd.
-+ * Copyright (C) 2008 Citrix Ltd.
-+ * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License as published
-+ * by the Free Software Foundation; version 2.1 only. with the special
-+ * exception on linking described in file LICENSE.
-+ *
-+ * 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 Lesser General Public License for more details.
-+ *)
-+
-+type mmap_interface
-+type mmap_prot_flag = RDONLY | WRONLY | RDWR
-+type mmap_map_flag = SHARED | PRIVATE
-+
-+external mmap : Unix.file_descr -> mmap_prot_flag -> mmap_map_flag -> int -> int
-+ -> mmap_interface = "stub_mmap_init"
-+external unmap : mmap_interface -> unit = "stub_mmap_final"
-+external read : mmap_interface -> int -> int -> string = "stub_mmap_read"
-+external write : mmap_interface -> string -> int -> int -> unit
-+ = "stub_mmap_write"
-+
-+external getpagesize : unit -> int = "stub_mmap_getpagesize"
---- /dev/null
-+++ b/tools/ocaml/libs/mmap/xenmmap_stubs.c
-@@ -0,0 +1,136 @@
-+/*
-+ * Copyright (C) 2006-2007 XenSource Ltd.
-+ * Copyright (C) 2008 Citrix Ltd.
-+ * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License as published
-+ * by the Free Software Foundation; version 2.1 only. with the special
-+ * exception on linking described in file LICENSE.
-+ *
-+ * 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 Lesser General Public License for more details.
-+ */
-+
-+#include <unistd.h>
-+#include <stdlib.h>
-+#include <sys/mman.h>
-+#include <string.h>
-+#include <errno.h>
-+#include "mmap_stubs.h"
-+
-+#include <caml/mlvalues.h>
-+#include <caml/memory.h>
-+#include <caml/alloc.h>
-+#include <caml/custom.h>
-+#include <caml/fail.h>
-+#include <caml/callback.h>
-+
-+#define GET_C_STRUCT(a) ((struct mmap_interface *) a)
-+
-+static int mmap_interface_init(struct mmap_interface *intf,
-+ int fd, int pflag, int mflag,
-+ int len, int offset)
-+{
-+ intf->len = len;
-+ intf->addr = mmap(NULL, len, pflag, mflag, fd, offset);
-+ return (intf->addr == MAP_FAILED) ? errno : 0;
-+}
-+
-+CAMLprim value stub_mmap_init(value fd, value pflag, value mflag,
-+ value len, value offset)
-+{
-+ CAMLparam5(fd, pflag, mflag, len, offset);
-+ CAMLlocal1(result);
-+ int c_pflag, c_mflag;
-+
-+ switch (Int_val(pflag)) {
-+ case 0: c_pflag = PROT_READ; break;
-+ case 1: c_pflag = PROT_WRITE; break;
-+ case 2: c_pflag = PROT_READ|PROT_WRITE; break;
-+ default: caml_invalid_argument("protectiontype");
-+ }
-+
-+ switch (Int_val(mflag)) {
-+ case 0: c_mflag = MAP_SHARED; break;
-+ case 1: c_mflag = MAP_PRIVATE; break;
-+ default: caml_invalid_argument("maptype");
-+ }
-+
-+ result = caml_alloc(sizeof(struct mmap_interface), Abstract_tag);
-+
-+ if (mmap_interface_init(GET_C_STRUCT(result), Int_val(fd),
-+ c_pflag, c_mflag,
-+ Int_val(len), Int_val(offset)))
-+ caml_failwith("mmap");
-+ CAMLreturn(result);
-+}
-+
-+CAMLprim value stub_mmap_final(value interface)
-+{
-+ CAMLparam1(interface);
-+ struct mmap_interface *intf;
-+
-+ intf = GET_C_STRUCT(interface);
-+ if (intf->addr != MAP_FAILED)
-+ munmap(intf->addr, intf->len);
-+ intf->addr = MAP_FAILED;
-+
-+ CAMLreturn(Val_unit);
-+}
-+
-+CAMLprim value stub_mmap_read(value interface, value start, value len)
-+{
-+ CAMLparam3(interface, start, len);
-+ CAMLlocal1(data);
-+ struct mmap_interface *intf;
-+ int c_start;
-+ int c_len;
-+
-+ c_start = Int_val(start);
-+ c_len = Int_val(len);
-+ intf = GET_C_STRUCT(interface);
-+
-+ if (c_start > intf->len)
-+ caml_invalid_argument("start invalid");
-+ if (c_start + c_len > intf->len)
-+ caml_invalid_argument("len invalid");
-+
-+ data = caml_alloc_string(c_len);
-+ memcpy((char *) data, intf->addr + c_start, c_len);
-+
-+ CAMLreturn(data);
-+}
-+
-+CAMLprim value stub_mmap_write(value interface, value data,
-+ value start, value len)
-+{
-+ CAMLparam4(interface, data, start, len);
-+ struct mmap_interface *intf;
-+ int c_start;
-+ int c_len;
-+
-+ c_start = Int_val(start);
-+ c_len = Int_val(len);
-+ intf = GET_C_STRUCT(interface);
-+
-+ if (c_start > intf->len)
-+ caml_invalid_argument("start invalid");
-+ if (c_start + c_len > intf->len)
-+ caml_invalid_argument("len invalid");
-+
-+ memcpy(intf->addr + c_start, (char *) data, c_len);
-+
-+ CAMLreturn(Val_unit);
-+}
-+
-+CAMLprim value stub_mmap_getpagesize(value unit)
-+{
-+ CAMLparam1(unit);
-+ CAMLlocal1(data);
-+
-+ data = Val_int(getpagesize());
-+ CAMLreturn(data);
-+}
---- a/tools/ocaml/libs/xb/META.in
-+++ b/tools/ocaml/libs/xb/META.in
-@@ -1,5 +1,5 @@
- version = "@VERSION@"
- description = "XenBus Interface"
--requires = "unix,mmap"
--archive(byte) = "xb.cma"
--archive(native) = "xb.cmxa"
-+requires = "unix,xenmmap"
-+archive(byte) = "xenbus.cma"
-+archive(native) = "xenbus.cmxa"
---- a/tools/ocaml/libs/xb/Makefile
-+++ b/tools/ocaml/libs/xb/Makefile
-@@ -4,6 +4,7 @@
-
- CFLAGS += -I../mmap
- OCAMLINCLUDE += -I ../mmap
-+OCAMLOPTFLAGS += -for-pack Xenbus
-
- .NOTPARALLEL:
- # Ocaml is such a PITA!
-@@ -13,7 +14,7 @@
- PRELIBS = $(foreach obj, $(PREOBJS),$(obj).cmo) $(foreach obj,$(PREOJBS),$(obj).cmx)
- OBJS = op partial packet xs_ring xb
- INTF = op.cmi packet.cmi xb.cmi
--LIBS = xb.cma xb.cmxa
-+LIBS = xenbus.cma xenbus.cmxa
-
- ALL_OCAML_OBJS = $(OBJS) $(PREOJBS)
-
-@@ -23,22 +24,30 @@
-
- libs: $(LIBS)
-
--xb_OBJS = $(OBJS)
--xb_C_OBJS = xs_ring_stubs xb_stubs
--OCAML_LIBRARY = xb
-+xenbus_OBJS = xenbus
-+xenbus_C_OBJS = xs_ring_stubs xenbus_stubs
-+OCAML_LIBRARY = xenbus
-+
-+xenbus.cmx : $(foreach obj, $(OBJS), $(obj).cmx)
-+ $(E) " CMX $@"
-+ $(OCAMLOPT) -pack -o $@ $^
-+
-+xenbus.cmo : $(foreach obj, $(OBJS), $(obj).cmo)
-+ $(E) " CMO $@"
-+ $(OCAMLC) -pack -o $@ $^
-
- %.mli: %.ml
- $(E) " MLI $@"
-- $(Q)$(OCAMLC) -i $< $o
-+ $(Q)$(OCAMLC) $(OCAMLINCLUDE) -i $< $o
-
- .PHONY: install
- install: $(LIBS) META
- mkdir -p $(OCAMLDESTDIR)
-- ocamlfind remove -destdir $(OCAMLDESTDIR) xb
-- ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xb META $(INTF) $(LIBS) *.a *.so *.cmx
-+ ocamlfind remove -destdir $(OCAMLDESTDIR) xenbus
-+ ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xenbus META $(LIBS) xenbus.cmi xenbus.cmx *.a *.so
-
- .PHONY: uninstall
- uninstall:
-- ocamlfind remove -destdir $(OCAMLDESTDIR) xb
-+ ocamlfind remove -destdir $(OCAMLDESTDIR) xenbus
-
- include $(TOPLEVEL)/Makefile.rules
---- a/tools/ocaml/libs/xb/xb.ml
-+++ b/tools/ocaml/libs/xb/xb.ml
-@@ -24,7 +24,7 @@
-
- type backend_mmap =
- {
-- mmap: Mmap.mmap_interface; (* mmaped interface = xs_ring *)
-+ mmap: Xenmmap.mmap_interface; (* mmaped interface = xs_ring *)
- eventchn_notify: unit -> unit; (* function to notify through eventchn *)
- mutable work_again: bool;
- }
-@@ -34,7 +34,7 @@
- fd: Unix.file_descr;
- }
-
--type backend = Fd of backend_fd | Mmap of backend_mmap
-+type backend = Fd of backend_fd | Xenmmap of backend_mmap
-
- type partial_buf = HaveHdr of Partial.pkt | NoHdr of int * string
-
-@@ -68,7 +68,7 @@
- let read con s len =
- match con.backend with
- | Fd backfd -> read_fd backfd con s len
-- | Mmap backmmap -> read_mmap backmmap con s len
-+ | Xenmmap backmmap -> read_mmap backmmap con s len
-
- let write_fd back con s len =
- Unix.write back.fd s 0 len
-@@ -82,7 +82,7 @@
- let write con s len =
- match con.backend with
- | Fd backfd -> write_fd backfd con s len
-- | Mmap backmmap -> write_mmap backmmap con s len
-+ | Xenmmap backmmap -> write_mmap backmmap con s len
-
- let output con =
- (* get the output string from a string_of(packet) or partial_out *)
-@@ -145,7 +145,7 @@
- let open_fd fd = newcon (Fd { fd = fd; })
-
- let open_mmap mmap notifyfct =
-- newcon (Mmap {
-+ newcon (Xenmmap {
- mmap = mmap;
- eventchn_notify = notifyfct;
- work_again = false; })
-@@ -153,12 +153,12 @@
- let close con =
- match con.backend with
- | Fd backend -> Unix.close backend.fd
-- | Mmap backend -> Mmap.unmap backend.mmap
-+ | Xenmmap backend -> Xenmmap.unmap backend.mmap
-
- let is_fd con =
- match con.backend with
- | Fd _ -> true
-- | Mmap _ -> false
-+ | Xenmmap _ -> false
-
- let is_mmap con = not (is_fd con)
-
-@@ -176,14 +176,14 @@
- let has_more_input con =
- match con.backend with
- | Fd _ -> false
-- | Mmap backend -> backend.work_again
-+ | Xenmmap backend -> backend.work_again
-
- let is_selectable con =
- match con.backend with
- | Fd _ -> true
-- | Mmap _ -> false
-+ | Xenmmap _ -> false
-
- let get_fd con =
- match con.backend with
- | Fd backend -> backend.fd
-- | Mmap _ -> raise (Failure "get_fd")
-+ | Xenmmap _ -> raise (Failure "get_fd")
---- a/tools/ocaml/libs/xb/xb.mli
-+++ b/tools/ocaml/libs/xb/xb.mli
-@@ -1,83 +1,103 @@
--module Op:
--sig
-- type operation = Op.operation =
-- | Debug
-- | Directory
-- | Read
-- | Getperms
-- | Watch
-- | Unwatch
-- | Transaction_start
-- | Transaction_end
-- | Introduce
-- | Release
-- | Getdomainpath
-- | Write
-- | Mkdir
-- | Rm
-- | Setperms
-- | Watchevent
-- | Error
-- | Isintroduced
-- | Resume
-- | Set_target
-- | Restrict
-- val to_string : operation -> string
--end
--
--module Packet:
--sig
-- type t
--
-- exception Error of string
-- exception DataError of string
--
-- val create : int -> int -> Op.operation -> string -> t
-- val unpack : t -> int * int * Op.operation * string
--
-- val get_tid : t -> int
-- val get_ty : t -> Op.operation
-- val get_data : t -> string
-- val get_rid: t -> int
--end
--
-+module Op :
-+ sig
-+ type operation =
-+ Op.operation =
-+ Debug
-+ | Directory
-+ | Read
-+ | Getperms
-+ | Watch
-+ | Unwatch
-+ | Transaction_start
-+ | Transaction_end
-+ | Introduce
-+ | Release
-+ | Getdomainpath
-+ | Write
-+ | Mkdir
-+ | Rm
-+ | Setperms
-+ | Watchevent
-+ | Error
-+ | Isintroduced
-+ | Resume
-+ | Set_target
-+ | Restrict
-+ val operation_c_mapping : operation array
-+ val size : int
-+ val offset_pq : int
-+ val operation_c_mapping_pq : 'a array
-+ val size_pq : int
-+ val array_search : 'a -> 'a array -> int
-+ val of_cval : int -> operation
-+ val to_cval : operation -> int
-+ val to_string : operation -> string
-+ end
-+module Packet :
-+ sig
-+ type t =
-+ Packet.t = {
-+ tid : int;
-+ rid : int;
-+ ty : Op.operation;
-+ data : string;
-+ }
-+ exception Error of string
-+ exception DataError of string
-+ external string_of_header : int -> int -> int -> int -> string
-+ = "stub_string_of_header"
-+ val create : int -> int -> Op.operation -> string -> t
-+ val of_partialpkt : Partial.pkt -> t
-+ val to_string : t -> string
-+ val unpack : t -> int * int * Op.operation * string
-+ val get_tid : t -> int
-+ val get_ty : t -> Op.operation
-+ val get_data : t -> string
-+ val get_rid : t -> int
-+ end
- exception End_of_file
- exception Eagain
- exception Noent
- exception Invalid
--
--type t
--
--(** queue a packet into the output queue for later sending *)
-+type backend_mmap = {
-+ mmap : Xenmmap.mmap_interface;
-+ eventchn_notify : unit -> unit;
-+ mutable work_again : bool;
-+}
-+type backend_fd = { fd : Unix.file_descr; }
-+type backend = Fd of backend_fd | Xenmmap of backend_mmap
-+type partial_buf = HaveHdr of Partial.pkt | NoHdr of int * string
-+type t = {
-+ backend : backend;
-+ pkt_in : Packet.t Queue.t;
-+ pkt_out : Packet.t Queue.t;
-+ mutable partial_in : partial_buf;
-+ mutable partial_out : string;
-+}
-+val init_partial_in : unit -> partial_buf
- val queue : t -> Packet.t -> unit
--
--(** process the output queue, return if a packet has been totally sent *)
-+val read_fd : backend_fd -> 'a -> string -> int -> int
-+val read_mmap : backend_mmap -> 'a -> string -> int -> int
-+val read : t -> string -> int -> int
-+val write_fd : backend_fd -> 'a -> string -> int -> int
-+val write_mmap : backend_mmap -> 'a -> string -> int -> int
-+val write : t -> string -> int -> int
- val output : t -> bool
--
--(** process the input queue, return if a packet has been totally received *)
- val input : t -> bool
--
--(** create new connection using a fd interface *)
-+val newcon : backend -> t
- val open_fd : Unix.file_descr -> t
--(** create new connection using a mmap intf and a function to notify eventchn *)
--val open_mmap : Mmap.mmap_interface -> (unit -> unit) -> t
--
--(* close a connection *)
-+val open_mmap : Xenmmap.mmap_interface -> (unit -> unit) -> t
- val close : t -> unit
--
- val is_fd : t -> bool
- val is_mmap : t -> bool
--
- val output_len : t -> int
- val has_new_output : t -> bool
- val has_old_output : t -> bool
- val has_output : t -> bool
- val peek_output : t -> Packet.t
--
- val input_len : t -> int
- val has_in_packet : t -> bool
- val get_in_packet : t -> Packet.t
- val has_more_input : t -> bool
--
- val is_selectable : t -> bool
- val get_fd : t -> Unix.file_descr
---- a/tools/ocaml/libs/xb/xb_stubs.c
-+++ /dev/null
-@@ -1,71 +0,0 @@
--/*
-- * Copyright (C) 2006-2007 XenSource Ltd.
-- * Copyright (C) 2008 Citrix Ltd.
-- * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License as published
-- * by the Free Software Foundation; version 2.1 only. with the special
-- * exception on linking described in file LICENSE.
-- *
-- * 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 Lesser General Public License for more details.
-- */
--
--#include <unistd.h>
--#include <stdlib.h>
--#include <sys/mman.h>
--#include <string.h>
--#include <errno.h>
--
--#include <caml/mlvalues.h>
--#include <caml/memory.h>
--#include <caml/alloc.h>
--#include <caml/custom.h>
--#include <caml/fail.h>
--#include <caml/callback.h>
--
--#include <xenctrl.h>
--#include <xen/io/xs_wire.h>
--
--CAMLprim value stub_header_size(void)
--{
-- CAMLparam0();
-- CAMLreturn(Val_int(sizeof(struct xsd_sockmsg)));
--}
--
--CAMLprim value stub_header_of_string(value s)
--{
-- CAMLparam1(s);
-- CAMLlocal1(ret);
-- struct xsd_sockmsg *hdr;
--
-- if (caml_string_length(s) != sizeof(struct xsd_sockmsg))
-- caml_failwith("xb header incomplete");
-- ret = caml_alloc_tuple(4);
-- hdr = (struct xsd_sockmsg *) String_val(s);
-- Store_field(ret, 0, Val_int(hdr->tx_id));
-- Store_field(ret, 1, Val_int(hdr->req_id));
-- Store_field(ret, 2, Val_int(hdr->type));
-- Store_field(ret, 3, Val_int(hdr->len));
-- CAMLreturn(ret);
--}
--
--CAMLprim value stub_string_of_header(value tid, value rid, value ty, value len)
--{
-- CAMLparam4(tid, rid, ty, len);
-- CAMLlocal1(ret);
-- struct xsd_sockmsg xsd = {
-- .type = Int_val(ty),
-- .tx_id = Int_val(tid),
-- .req_id = Int_val(rid),
-- .len = Int_val(len),
-- };
--
-- ret = caml_alloc_string(sizeof(struct xsd_sockmsg));
-- memcpy(String_val(ret), &xsd, sizeof(struct xsd_sockmsg));
--
-- CAMLreturn(ret);
--}
---- /dev/null
-+++ b/tools/ocaml/libs/xb/xenbus_stubs.c
-@@ -0,0 +1,71 @@
-+/*
-+ * Copyright (C) 2006-2007 XenSource Ltd.
-+ * Copyright (C) 2008 Citrix Ltd.
-+ * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License as published
-+ * by the Free Software Foundation; version 2.1 only. with the special
-+ * exception on linking described in file LICENSE.
-+ *
-+ * 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 Lesser General Public License for more details.
-+ */
-+
-+#include <unistd.h>
-+#include <stdlib.h>
-+#include <sys/mman.h>
-+#include <string.h>
-+#include <errno.h>
-+
-+#include <caml/mlvalues.h>
-+#include <caml/memory.h>
-+#include <caml/alloc.h>
-+#include <caml/custom.h>
-+#include <caml/fail.h>
-+#include <caml/callback.h>
-+
-+#include <xenctrl.h>
-+#include <xen/io/xs_wire.h>
-+
-+CAMLprim value stub_header_size(void)
-+{
-+ CAMLparam0();
-+ CAMLreturn(Val_int(sizeof(struct xsd_sockmsg)));
-+}
-+
-+CAMLprim value stub_header_of_string(value s)
-+{
-+ CAMLparam1(s);
-+ CAMLlocal1(ret);
-+ struct xsd_sockmsg *hdr;
-+
-+ if (caml_string_length(s) != sizeof(struct xsd_sockmsg))
-+ caml_failwith("xb header incomplete");
-+ ret = caml_alloc_tuple(4);
-+ hdr = (struct xsd_sockmsg *) String_val(s);
-+ Store_field(ret, 0, Val_int(hdr->tx_id));
-+ Store_field(ret, 1, Val_int(hdr->req_id));
-+ Store_field(ret, 2, Val_int(hdr->type));
-+ Store_field(ret, 3, Val_int(hdr->len));
-+ CAMLreturn(ret);
-+}
-+
-+CAMLprim value stub_string_of_header(value tid, value rid, value ty, value len)
-+{
-+ CAMLparam4(tid, rid, ty, len);
-+ CAMLlocal1(ret);
-+ struct xsd_sockmsg xsd = {
-+ .type = Int_val(ty),
-+ .tx_id = Int_val(tid),
-+ .req_id = Int_val(rid),
-+ .len = Int_val(len),
-+ };
-+
-+ ret = caml_alloc_string(sizeof(struct xsd_sockmsg));
-+ memcpy(String_val(ret), &xsd, sizeof(struct xsd_sockmsg));
-+
-+ CAMLreturn(ret);
-+}
---- a/tools/ocaml/libs/xb/xs_ring.ml
-+++ b/tools/ocaml/libs/xb/xs_ring.ml
-@@ -14,5 +14,5 @@
- * GNU Lesser General Public License for more details.
- *)
-
--external read: Mmap.mmap_interface -> string -> int -> int = "ml_interface_read"
--external write: Mmap.mmap_interface -> string -> int -> int = "ml_interface_write"
-+external read: Xenmmap.mmap_interface -> string -> int -> int = "ml_interface_read"
-+external write: Xenmmap.mmap_interface -> string -> int -> int = "ml_interface_write"
---- a/tools/ocaml/libs/xc/META.in
-+++ b/tools/ocaml/libs/xc/META.in
-@@ -1,5 +1,5 @@
- version = "@VERSION@"
- description = "Xen Control Interface"
--requires = "mmap,uuid"
--archive(byte) = "xc.cma"
--archive(native) = "xc.cmxa"
-+requires = "xenmmap,uuid"
-+archive(byte) = "xenctrl.cma"
-+archive(native) = "xenctrl.cmxa"
---- a/tools/ocaml/libs/xc/Makefile
-+++ b/tools/ocaml/libs/xc/Makefile
-@@ -5,16 +5,16 @@
- CFLAGS += -I../mmap -I./ -I$(XEN_ROOT)/tools/libxc
- OCAMLINCLUDE += -I ../mmap -I ../uuid -I $(XEN_ROOT)/tools/libxc
-
--OBJS = xc
--INTF = xc.cmi
--LIBS = xc.cma xc.cmxa
-+OBJS = xenctrl
-+INTF = xenctrl.cmi
-+LIBS = xenctrl.cma xenctrl.cmxa
-
--LIBS_xc = -L$(XEN_ROOT)/tools/libxc -lxenctrl -lxenguest
-+LIBS_xenctrl = -L$(XEN_ROOT)/tools/libxc -lxenctrl -lxenguest
-
--xc_OBJS = $(OBJS)
--xc_C_OBJS = xc_stubs
-+xenctrl_OBJS = $(OBJS)
-+xenctrl_C_OBJS = xenctrl_stubs
-
--OCAML_LIBRARY = xc
-+OCAML_LIBRARY = xenctrl
-
- all: $(INTF) $(LIBS)
-
-@@ -23,11 +23,11 @@
- .PHONY: install
- install: $(LIBS) META
- mkdir -p $(OCAMLDESTDIR)
-- ocamlfind remove -destdir $(OCAMLDESTDIR) xc
-- ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xc META $(INTF) $(LIBS) *.a *.so *.cmx
-+ ocamlfind remove -destdir $(OCAMLDESTDIR) xenctrl
-+ ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xenctrl META $(INTF) $(LIBS) *.a *.so *.cmx
-
- .PHONY: uninstall
- uninstall:
-- ocamlfind remove -destdir $(OCAMLDESTDIR) xc
-+ ocamlfind remove -destdir $(OCAMLDESTDIR) xenctrl
-
- include $(TOPLEVEL)/Makefile.rules
---- a/tools/ocaml/libs/xc/xc.ml
-+++ /dev/null
-@@ -1,326 +0,0 @@
--(*
-- * Copyright (C) 2006-2007 XenSource Ltd.
-- * Copyright (C) 2008 Citrix Ltd.
-- * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License as published
-- * by the Free Software Foundation; version 2.1 only. with the special
-- * exception on linking described in file LICENSE.
-- *
-- * 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 Lesser General Public License for more details.
-- *)
--
--(** *)
--type domid = int
--
--(* ** xenctrl.h ** *)
--
--type vcpuinfo =
--{
-- online: bool;
-- blocked: bool;
-- running: bool;
-- cputime: int64;
-- cpumap: int32;
--}
--
--type domaininfo =
--{
-- domid : domid;
-- dying : bool;
-- shutdown : bool;
-- paused : bool;
-- blocked : bool;
-- running : bool;
-- hvm_guest : bool;
-- shutdown_code : int;
-- total_memory_pages: nativeint;
-- max_memory_pages : nativeint;
-- shared_info_frame : int64;
-- cpu_time : int64;
-- nr_online_vcpus : int;
-- max_vcpu_id : int;
-- ssidref : int32;
-- handle : int array;
--}
--
--type sched_control =
--{
-- weight : int;
-- cap : int;
--}
--
--type physinfo_cap_flag =
-- | CAP_HVM
-- | CAP_DirectIO
--
--type physinfo =
--{
-- threads_per_core : int;
-- cores_per_socket : int;
-- nr_cpus : int;
-- max_node_id : int;
-- cpu_khz : int;
-- total_pages : nativeint;
-- free_pages : nativeint;
-- scrub_pages : nativeint;
-- (* XXX hw_cap *)
-- capabilities : physinfo_cap_flag list;
--}
--
--type version =
--{
-- major : int;
-- minor : int;
-- extra : string;
--}
--
--
--type compile_info =
--{
-- compiler : string;
-- compile_by : string;
-- compile_domain : string;
-- compile_date : string;
--}
--
--type shutdown_reason = Poweroff | Reboot | Suspend | Crash | Halt
--
--type domain_create_flag = CDF_HVM | CDF_HAP
--
--exception Error of string
--
--type handle
--
--(* this is only use by coredumping *)
--external sizeof_core_header: unit -> int
-- = "stub_sizeof_core_header"
--external sizeof_vcpu_guest_context: unit -> int
-- = "stub_sizeof_vcpu_guest_context"
--external sizeof_xen_pfn: unit -> int = "stub_sizeof_xen_pfn"
--(* end of use *)
--
--external interface_open: unit -> handle = "stub_xc_interface_open"
--external interface_close: handle -> unit = "stub_xc_interface_close"
--
--external is_fake: unit -> bool = "stub_xc_interface_is_fake"
--
--let with_intf f =
-- let xc = interface_open () in
-- let r = try f xc with exn -> interface_close xc; raise exn in
-- interface_close xc;
-- r
--
--external _domain_create: handle -> int32 -> domain_create_flag list -> int array -> domid
-- = "stub_xc_domain_create"
--
--let domain_create handle n flags uuid =
-- _domain_create handle n flags (Uuid.int_array_of_uuid uuid)
--
--external _domain_sethandle: handle -> domid -> int array -> unit
-- = "stub_xc_domain_sethandle"
--
--let domain_sethandle handle n uuid =
-- _domain_sethandle handle n (Uuid.int_array_of_uuid uuid)
--
--external domain_max_vcpus: handle -> domid -> int -> unit
-- = "stub_xc_domain_max_vcpus"
--
--external domain_pause: handle -> domid -> unit = "stub_xc_domain_pause"
--external domain_unpause: handle -> domid -> unit = "stub_xc_domain_unpause"
--external domain_resume_fast: handle -> domid -> unit = "stub_xc_domain_resume_fast"
--external domain_destroy: handle -> domid -> unit = "stub_xc_domain_destroy"
--
--external domain_shutdown: handle -> domid -> shutdown_reason -> unit
-- = "stub_xc_domain_shutdown"
--
--external _domain_getinfolist: handle -> domid -> int -> domaininfo list
-- = "stub_xc_domain_getinfolist"
--
--let domain_getinfolist handle first_domain =
-- let nb = 2 in
-- let last_domid l = (List.hd l).domid + 1 in
-- let rec __getlist from =
-- let l = _domain_getinfolist handle from nb in
-- (if List.length l = nb then __getlist (last_domid l) else []) @ l
-- in
-- List.rev (__getlist first_domain)
--
--external domain_getinfo: handle -> domid -> domaininfo= "stub_xc_domain_getinfo"
--
--external domain_get_vcpuinfo: handle -> int -> int -> vcpuinfo
-- = "stub_xc_vcpu_getinfo"
--
--external domain_ioport_permission: handle -> domid -> int -> int -> bool -> unit
-- = "stub_xc_domain_ioport_permission"
--external domain_iomem_permission: handle -> domid -> nativeint -> nativeint -> bool -> unit
-- = "stub_xc_domain_iomem_permission"
--external domain_irq_permission: handle -> domid -> int -> bool -> unit
-- = "stub_xc_domain_irq_permission"
--
--external vcpu_affinity_set: handle -> domid -> int -> bool array -> unit
-- = "stub_xc_vcpu_setaffinity"
--external vcpu_affinity_get: handle -> domid -> int -> bool array
-- = "stub_xc_vcpu_getaffinity"
--
--external vcpu_context_get: handle -> domid -> int -> string
-- = "stub_xc_vcpu_context_get"
--
--external sched_id: handle -> int = "stub_xc_sched_id"
--
--external sched_credit_domain_set: handle -> domid -> sched_control -> unit
-- = "stub_sched_credit_domain_set"
--external sched_credit_domain_get: handle -> domid -> sched_control
-- = "stub_sched_credit_domain_get"
--
--external shadow_allocation_set: handle -> domid -> int -> unit
-- = "stub_shadow_allocation_set"
--external shadow_allocation_get: handle -> domid -> int
-- = "stub_shadow_allocation_get"
--
--external evtchn_alloc_unbound: handle -> domid -> domid -> int
-- = "stub_xc_evtchn_alloc_unbound"
--external evtchn_reset: handle -> domid -> unit = "stub_xc_evtchn_reset"
--
--external readconsolering: handle -> string = "stub_xc_readconsolering"
--
--external send_debug_keys: handle -> string -> unit = "stub_xc_send_debug_keys"
--external physinfo: handle -> physinfo = "stub_xc_physinfo"
--external pcpu_info: handle -> int -> int64 array = "stub_xc_pcpu_info"
--
--external domain_setmaxmem: handle -> domid -> int64 -> unit
-- = "stub_xc_domain_setmaxmem"
--external domain_set_memmap_limit: handle -> domid -> int64 -> unit
-- = "stub_xc_domain_set_memmap_limit"
--external domain_memory_increase_reservation: handle -> domid -> int64 -> unit
-- = "stub_xc_domain_memory_increase_reservation"
--
--external domain_set_machine_address_size: handle -> domid -> int -> unit
-- = "stub_xc_domain_set_machine_address_size"
--external domain_get_machine_address_size: handle -> domid -> int
-- = "stub_xc_domain_get_machine_address_size"
--
--external domain_cpuid_set: handle -> domid -> (int64 * (int64 option))
-- -> string option array
-- -> string option array
-- = "stub_xc_domain_cpuid_set"
--external domain_cpuid_apply_policy: handle -> domid -> unit
-- = "stub_xc_domain_cpuid_apply_policy"
--external cpuid_check: handle -> (int64 * (int64 option)) -> string option array -> (bool * string option array)
-- = "stub_xc_cpuid_check"
--
--external map_foreign_range: handle -> domid -> int
-- -> nativeint -> Mmap.mmap_interface
-- = "stub_map_foreign_range"
--
--external domain_get_pfn_list: handle -> domid -> nativeint -> nativeint array
-- = "stub_xc_domain_get_pfn_list"
--
--external domain_assign_device: handle -> domid -> (int * int * int * int) -> unit
-- = "stub_xc_domain_assign_device"
--external domain_deassign_device: handle -> domid -> (int * int * int * int) -> unit
-- = "stub_xc_domain_deassign_device"
--external domain_test_assign_device: handle -> domid -> (int * int * int * int) -> bool
-- = "stub_xc_domain_test_assign_device"
--
--external version: handle -> version = "stub_xc_version_version"
--external version_compile_info: handle -> compile_info
-- = "stub_xc_version_compile_info"
--external version_changeset: handle -> string = "stub_xc_version_changeset"
--external version_capabilities: handle -> string =
-- "stub_xc_version_capabilities"
--
--external watchdog : handle -> int -> int32 -> int
-- = "stub_xc_watchdog"
--
--(* core dump structure *)
--type core_magic = Magic_hvm | Magic_pv
--
--type core_header = {
-- xch_magic: core_magic;
-- xch_nr_vcpus: int;
-- xch_nr_pages: nativeint;
-- xch_index_offset: int64;
-- xch_ctxt_offset: int64;
-- xch_pages_offset: int64;
--}
--
--external marshall_core_header: core_header -> string = "stub_marshall_core_header"
--
--(* coredump *)
--let coredump xch domid fd =
-- let dump s =
-- let wd = Unix.write fd s 0 (String.length s) in
-- if wd <> String.length s then
-- failwith "error while writing";
-- in
--
-- let info = domain_getinfo xch domid in
--
-- let nrpages = info.total_memory_pages in
-- let ctxt = Array.make info.max_vcpu_id None in
-- let nr_vcpus = ref 0 in
-- for i = 0 to info.max_vcpu_id - 1
-- do
-- ctxt.(i) <- try
-- let v = vcpu_context_get xch domid i in
-- incr nr_vcpus;
-- Some v
-- with _ -> None
-- done;
--
-- (* FIXME page offset if not rounded to sup *)
-- let page_offset =
-- Int64.add
-- (Int64.of_int (sizeof_core_header () +
-- (sizeof_vcpu_guest_context () * !nr_vcpus)))
-- (Int64.of_nativeint (
-- Nativeint.mul
-- (Nativeint.of_int (sizeof_xen_pfn ()))
-- nrpages)
-- )
-- in
--
-- let header = {
-- xch_magic = if info.hvm_guest then Magic_hvm else Magic_pv;
-- xch_nr_vcpus = !nr_vcpus;
-- xch_nr_pages = nrpages;
-- xch_ctxt_offset = Int64.of_int (sizeof_core_header ());
-- xch_index_offset = Int64.of_int (sizeof_core_header ()
-- + sizeof_vcpu_guest_context ());
-- xch_pages_offset = page_offset;
-- } in
--
-- dump (marshall_core_header header);
-- for i = 0 to info.max_vcpu_id - 1
-- do
-- match ctxt.(i) with
-- | None -> ()
-- | Some ctxt_i -> dump ctxt_i
-- done;
-- let pfns = domain_get_pfn_list xch domid nrpages in
-- if Array.length pfns <> Nativeint.to_int nrpages then
-- failwith "could not get the page frame list";
--
-- let page_size = Mmap.getpagesize () in
-- for i = 0 to Nativeint.to_int nrpages - 1
-- do
-- let page = map_foreign_range xch domid page_size pfns.(i) in
-- let data = Mmap.read page 0 page_size in
-- Mmap.unmap page;
-- dump data
-- done
--
--(* ** Misc ** *)
--
--(**
-- Convert the given number of pages to an amount in KiB, rounded up.
-- *)
--external pages_to_kib : int64 -> int64 = "stub_pages_to_kib"
--let pages_to_mib pages = Int64.div (pages_to_kib pages) 1024L
--
--let _ = Callback.register_exception "xc.error" (Error "register_callback")
---- a/tools/ocaml/libs/xc/xc.mli
-+++ /dev/null
-@@ -1,184 +0,0 @@
--(*
-- * Copyright (C) 2006-2007 XenSource Ltd.
-- * Copyright (C) 2008 Citrix Ltd.
-- * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License as published
-- * by the Free Software Foundation; version 2.1 only. with the special
-- * exception on linking described in file LICENSE.
-- *
-- * 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 Lesser General Public License for more details.
-- *)
--
--type domid = int
--type vcpuinfo = {
-- online : bool;
-- blocked : bool;
-- running : bool;
-- cputime : int64;
-- cpumap : int32;
--}
--type domaininfo = {
-- domid : domid;
-- dying : bool;
-- shutdown : bool;
-- paused : bool;
-- blocked : bool;
-- running : bool;
-- hvm_guest : bool;
-- shutdown_code : int;
-- total_memory_pages : nativeint;
-- max_memory_pages : nativeint;
-- shared_info_frame : int64;
-- cpu_time : int64;
-- nr_online_vcpus : int;
-- max_vcpu_id : int;
-- ssidref : int32;
-- handle : int array;
--}
--type sched_control = { weight : int; cap : int; }
--type physinfo_cap_flag = CAP_HVM | CAP_DirectIO
--type physinfo = {
-- threads_per_core : int;
-- cores_per_socket : int;
-- nr_cpus : int;
-- max_node_id : int;
-- cpu_khz : int;
-- total_pages : nativeint;
-- free_pages : nativeint;
-- scrub_pages : nativeint;
-- capabilities : physinfo_cap_flag list;
--}
--type version = { major : int; minor : int; extra : string; }
--type compile_info = {
-- compiler : string;
-- compile_by : string;
-- compile_domain : string;
-- compile_date : string;
--}
--type shutdown_reason = Poweroff | Reboot | Suspend | Crash | Halt
--
--type domain_create_flag = CDF_HVM | CDF_HAP
--
--exception Error of string
--type handle
--external sizeof_core_header : unit -> int = "stub_sizeof_core_header"
--external sizeof_vcpu_guest_context : unit -> int
-- = "stub_sizeof_vcpu_guest_context"
--external sizeof_xen_pfn : unit -> int = "stub_sizeof_xen_pfn"
--external interface_open : unit -> handle = "stub_xc_interface_open"
--external is_fake : unit -> bool = "stub_xc_interface_is_fake"
--external interface_close : handle -> unit = "stub_xc_interface_close"
--val with_intf : (handle -> 'a) -> 'a
--external _domain_create : handle -> int32 -> domain_create_flag list -> int array -> domid
-- = "stub_xc_domain_create"
--val domain_create : handle -> int32 -> domain_create_flag list -> 'a Uuid.t -> domid
--external _domain_sethandle : handle -> domid -> int array -> unit
-- = "stub_xc_domain_sethandle"
--val domain_sethandle : handle -> domid -> 'a Uuid.t -> unit
--external domain_max_vcpus : handle -> domid -> int -> unit
-- = "stub_xc_domain_max_vcpus"
--external domain_pause : handle -> domid -> unit = "stub_xc_domain_pause"
--external domain_unpause : handle -> domid -> unit = "stub_xc_domain_unpause"
--external domain_resume_fast : handle -> domid -> unit
-- = "stub_xc_domain_resume_fast"
--external domain_destroy : handle -> domid -> unit = "stub_xc_domain_destroy"
--external domain_shutdown : handle -> domid -> shutdown_reason -> unit
-- = "stub_xc_domain_shutdown"
--external _domain_getinfolist : handle -> domid -> int -> domaininfo list
-- = "stub_xc_domain_getinfolist"
--val domain_getinfolist : handle -> domid -> domaininfo list
--external domain_getinfo : handle -> domid -> domaininfo
-- = "stub_xc_domain_getinfo"
--external domain_get_vcpuinfo : handle -> int -> int -> vcpuinfo
-- = "stub_xc_vcpu_getinfo"
--external domain_ioport_permission: handle -> domid -> int -> int -> bool -> unit
-- = "stub_xc_domain_ioport_permission"
--external domain_iomem_permission: handle -> domid -> nativeint -> nativeint -> bool -> unit
-- = "stub_xc_domain_iomem_permission"
--external domain_irq_permission: handle -> domid -> int -> bool -> unit
-- = "stub_xc_domain_irq_permission"
--external vcpu_affinity_set : handle -> domid -> int -> bool array -> unit
-- = "stub_xc_vcpu_setaffinity"
--external vcpu_affinity_get : handle -> domid -> int -> bool array
-- = "stub_xc_vcpu_getaffinity"
--external vcpu_context_get : handle -> domid -> int -> string
-- = "stub_xc_vcpu_context_get"
--external sched_id : handle -> int = "stub_xc_sched_id"
--external sched_credit_domain_set : handle -> domid -> sched_control -> unit
-- = "stub_sched_credit_domain_set"
--external sched_credit_domain_get : handle -> domid -> sched_control
-- = "stub_sched_credit_domain_get"
--external shadow_allocation_set : handle -> domid -> int -> unit
-- = "stub_shadow_allocation_set"
--external shadow_allocation_get : handle -> domid -> int
-- = "stub_shadow_allocation_get"
--external evtchn_alloc_unbound : handle -> domid -> domid -> int
-- = "stub_xc_evtchn_alloc_unbound"
--external evtchn_reset : handle -> domid -> unit = "stub_xc_evtchn_reset"
--external readconsolering : handle -> string = "stub_xc_readconsolering"
--external send_debug_keys : handle -> string -> unit = "stub_xc_send_debug_keys"
--external physinfo : handle -> physinfo = "stub_xc_physinfo"
--external pcpu_info: handle -> int -> int64 array = "stub_xc_pcpu_info"
--external domain_setmaxmem : handle -> domid -> int64 -> unit
-- = "stub_xc_domain_setmaxmem"
--external domain_set_memmap_limit : handle -> domid -> int64 -> unit
-- = "stub_xc_domain_set_memmap_limit"
--external domain_memory_increase_reservation :
-- handle -> domid -> int64 -> unit
-- = "stub_xc_domain_memory_increase_reservation"
--external map_foreign_range :
-- handle -> domid -> int -> nativeint -> Mmap.mmap_interface
-- = "stub_map_foreign_range"
--external domain_get_pfn_list :
-- handle -> domid -> nativeint -> nativeint array
-- = "stub_xc_domain_get_pfn_list"
--
--external domain_assign_device: handle -> domid -> (int * int * int * int) -> unit
-- = "stub_xc_domain_assign_device"
--external domain_deassign_device: handle -> domid -> (int * int * int * int) -> unit
-- = "stub_xc_domain_deassign_device"
--external domain_test_assign_device: handle -> domid -> (int * int * int * int) -> bool
-- = "stub_xc_domain_test_assign_device"
--
--external version : handle -> version = "stub_xc_version_version"
--external version_compile_info : handle -> compile_info
-- = "stub_xc_version_compile_info"
--external version_changeset : handle -> string = "stub_xc_version_changeset"
--external version_capabilities : handle -> string
-- = "stub_xc_version_capabilities"
--type core_magic = Magic_hvm | Magic_pv
--type core_header = {
-- xch_magic : core_magic;
-- xch_nr_vcpus : int;
-- xch_nr_pages : nativeint;
-- xch_index_offset : int64;
-- xch_ctxt_offset : int64;
-- xch_pages_offset : int64;
--}
--external marshall_core_header : core_header -> string
-- = "stub_marshall_core_header"
--val coredump : handle -> domid -> Unix.file_descr -> unit
--external pages_to_kib : int64 -> int64 = "stub_pages_to_kib"
--val pages_to_mib : int64 -> int64
--external watchdog : handle -> int -> int32 -> int
-- = "stub_xc_watchdog"
--
--external domain_set_machine_address_size: handle -> domid -> int -> unit
-- = "stub_xc_domain_set_machine_address_size"
--external domain_get_machine_address_size: handle -> domid -> int
-- = "stub_xc_domain_get_machine_address_size"
--
--external domain_cpuid_set: handle -> domid -> (int64 * (int64 option))
-- -> string option array
-- -> string option array
-- = "stub_xc_domain_cpuid_set"
--external domain_cpuid_apply_policy: handle -> domid -> unit
-- = "stub_xc_domain_cpuid_apply_policy"
--external cpuid_check: handle -> (int64 * (int64 option)) -> string option array -> (bool * string option array)
-- = "stub_xc_cpuid_check"
--
---- a/tools/ocaml/libs/xc/xc_stubs.c
-+++ /dev/null
-@@ -1,1161 +0,0 @@
--/*
-- * Copyright (C) 2006-2007 XenSource Ltd.
-- * Copyright (C) 2008 Citrix Ltd.
-- * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License as published
-- * by the Free Software Foundation; version 2.1 only. with the special
-- * exception on linking described in file LICENSE.
-- *
-- * 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 Lesser General Public License for more details.
-- */
--
--#define _XOPEN_SOURCE 600
--#include <stdlib.h>
--#include <errno.h>
--
--#define CAML_NAME_SPACE
--#include <caml/alloc.h>
--#include <caml/memory.h>
--#include <caml/signals.h>
--#include <caml/fail.h>
--#include <caml/callback.h>
--
--#include <sys/mman.h>
--#include <stdint.h>
--#include <string.h>
--
--#include <xenctrl.h>
--
--#include "mmap_stubs.h"
--
--#define PAGE_SHIFT 12
--#define PAGE_SIZE (1UL << PAGE_SHIFT)
--#define PAGE_MASK (~(PAGE_SIZE-1))
--
--#define _H(__h) ((xc_interface *)(__h))
--#define _D(__d) ((uint32_t)Int_val(__d))
--
--#define Val_none (Val_int(0))
--
--#define string_of_option_array(array, index) \
-- ((Field(array, index) == Val_none) ? NULL : String_val(Field(Field(array, index), 0)))
--
--/* maybe here we should check the range of the input instead of blindly
-- * casting it to uint32 */
--#define cpuid_input_of_val(i1, i2, input) \
-- i1 = (uint32_t) Int64_val(Field(input, 0)); \
-- i2 = ((Field(input, 1) == Val_none) ? 0xffffffff : (uint32_t) Int64_val(Field(Field(input, 1), 0)));
--
--#define ERROR_STRLEN 1024
--void failwith_xc(xc_interface *xch)
--{
-- static char error_str[ERROR_STRLEN];
-- if (xch) {
-- const xc_error *error = xc_get_last_error(xch);
-- if (error->code == XC_ERROR_NONE)
-- snprintf(error_str, ERROR_STRLEN, "%d: %s", errno, strerror(errno));
-- else
-- snprintf(error_str, ERROR_STRLEN, "%d: %s: %s",
-- error->code,
-- xc_error_code_to_desc(error->code),
-- error->message);
-- } else {
-- snprintf(error_str, ERROR_STRLEN, "Unable to open XC interface");
-- }
-- caml_raise_with_string(*caml_named_value("xc.error"), error_str);
--}
--
--CAMLprim value stub_sizeof_core_header(value unit)
--{
-- CAMLparam1(unit);
-- CAMLreturn(Val_int(sizeof(struct xc_core_header)));
--}
--
--CAMLprim value stub_sizeof_vcpu_guest_context(value unit)
--{
-- CAMLparam1(unit);
-- CAMLreturn(Val_int(sizeof(struct vcpu_guest_context)));
--}
--
--CAMLprim value stub_sizeof_xen_pfn(value unit)
--{
-- CAMLparam1(unit);
-- CAMLreturn(Val_int(sizeof(xen_pfn_t)));
--}
--
--#define XC_CORE_MAGIC 0xF00FEBED
--#define XC_CORE_MAGIC_HVM 0xF00FEBEE
--
--CAMLprim value stub_marshall_core_header(value header)
--{
-- CAMLparam1(header);
-- CAMLlocal1(s);
-- struct xc_core_header c_header;
--
-- c_header.xch_magic = (Field(header, 0))
-- ? XC_CORE_MAGIC
-- : XC_CORE_MAGIC_HVM;
-- c_header.xch_nr_vcpus = Int_val(Field(header, 1));
-- c_header.xch_nr_pages = Nativeint_val(Field(header, 2));
-- c_header.xch_ctxt_offset = Int64_val(Field(header, 3));
-- c_header.xch_index_offset = Int64_val(Field(header, 4));
-- c_header.xch_pages_offset = Int64_val(Field(header, 5));
--
-- s = caml_alloc_string(sizeof(c_header));
-- memcpy(String_val(s), (char *) &c_header, sizeof(c_header));
-- CAMLreturn(s);
--}
--
--CAMLprim value stub_xc_interface_open(void)
--{
-- CAMLparam0();
-- xc_interface *xch;
-- xch = xc_interface_open(NULL, NULL, XC_OPENFLAG_NON_REENTRANT);
-- if (xch == NULL)
-- failwith_xc(NULL);
-- CAMLreturn((value)xch);
--}
--
--
--CAMLprim value stub_xc_interface_is_fake(void)
--{
-- CAMLparam0();
-- int is_fake = xc_interface_is_fake();
-- CAMLreturn(Val_int(is_fake));
--}
--
--CAMLprim value stub_xc_interface_close(value xch)
--{
-- CAMLparam1(xch);
--
-- // caml_enter_blocking_section();
-- xc_interface_close(_H(xch));
-- // caml_leave_blocking_section();
--
-- CAMLreturn(Val_unit);
--}
--
--static int domain_create_flag_table[] = {
-- XEN_DOMCTL_CDF_hvm_guest,
-- XEN_DOMCTL_CDF_hap,
--};
--
--CAMLprim value stub_xc_domain_create(value xch, value ssidref,
-- value flags, value handle)
--{
-- CAMLparam4(xch, ssidref, flags, handle);
--
-- uint32_t domid = 0;
-- xen_domain_handle_t h = { 0 };
-- int result;
-- int i;
-- uint32_t c_ssidref = Int32_val(ssidref);
-- unsigned int c_flags = 0;
-- value l;
--
-- if (Wosize_val(handle) != 16)
-- caml_invalid_argument("Handle not a 16-integer array");
--
-- for (i = 0; i < sizeof(h); i++) {
-- h[i] = Int_val(Field(handle, i)) & 0xff;
-- }
--
-- for (l = flags; l != Val_none; l = Field(l, 1)) {
-- int v = Int_val(Field(l, 0));
-- c_flags |= domain_create_flag_table[v];
-- }
--
-- // caml_enter_blocking_section();
-- result = xc_domain_create(_H(xch), c_ssidref, h, c_flags, &domid);
-- // caml_leave_blocking_section();
--
-- if (result < 0)
-- failwith_xc(_H(xch));
--
-- CAMLreturn(Val_int(domid));
--}
--
--CAMLprim value stub_xc_domain_max_vcpus(value xch, value domid,
-- value max_vcpus)
--{
-- CAMLparam3(xch, domid, max_vcpus);
-- int r;
--
-- r = xc_domain_max_vcpus(_H(xch), _D(domid), Int_val(max_vcpus));
-- if (r)
-- failwith_xc(_H(xch));
--
-- CAMLreturn(Val_unit);
--}
--
--
--value stub_xc_domain_sethandle(value xch, value domid, value handle)
--{
-- CAMLparam3(xch, domid, handle);
-- xen_domain_handle_t h = { 0 };
-- int i;
--
-- if (Wosize_val(handle) != 16)
-- caml_invalid_argument("Handle not a 16-integer array");
--
-- for (i = 0; i < sizeof(h); i++) {
-- h[i] = Int_val(Field(handle, i)) & 0xff;
-- }
--
-- i = xc_domain_sethandle(_H(xch), _D(domid), h);
-- if (i)
-- failwith_xc(_H(xch));
--
-- CAMLreturn(Val_unit);
--}
--
--static value dom_op(value xch, value domid, int (*fn)(xc_interface *, uint32_t))
--{
-- CAMLparam2(xch, domid);
--
-- uint32_t c_domid = _D(domid);
--
-- // caml_enter_blocking_section();
-- int result = fn(_H(xch), c_domid);
-- // caml_leave_blocking_section();
-- if (result)
-- failwith_xc(_H(xch));
-- CAMLreturn(Val_unit);
--}
--
--CAMLprim value stub_xc_domain_pause(value xch, value domid)
--{
-- return dom_op(xch, domid, xc_domain_pause);
--}
--
--
--CAMLprim value stub_xc_domain_unpause(value xch, value domid)
--{
-- return dom_op(xch, domid, xc_domain_unpause);
--}
--
--CAMLprim value stub_xc_domain_destroy(value xch, value domid)
--{
-- return dom_op(xch, domid, xc_domain_destroy);
--}
--
--CAMLprim value stub_xc_domain_resume_fast(value xch, value domid)
--{
-- CAMLparam2(xch, domid);
--
-- uint32_t c_domid = _D(domid);
--
-- // caml_enter_blocking_section();
-- int result = xc_domain_resume(_H(xch), c_domid, 1);
-- // caml_leave_blocking_section();
-- if (result)
-- failwith_xc(_H(xch));
-- CAMLreturn(Val_unit);
--}
--
--CAMLprim value stub_xc_domain_shutdown(value xch, value domid, value reason)
--{
-- CAMLparam3(xch, domid, reason);
-- int ret;
--
-- ret = xc_domain_shutdown(_H(xch), _D(domid), Int_val(reason));
-- if (ret < 0)
-- failwith_xc(_H(xch));
--
-- CAMLreturn(Val_unit);
--}
--
--static value alloc_domaininfo(xc_domaininfo_t * info)
--{
-- CAMLparam0();
-- CAMLlocal2(result, tmp);
-- int i;
--
-- result = caml_alloc_tuple(16);
--
-- Store_field(result, 0, Val_int(info->domain));
-- Store_field(result, 1, Val_bool(info->flags & XEN_DOMINF_dying));
-- Store_field(result, 2, Val_bool(info->flags & XEN_DOMINF_shutdown));
-- Store_field(result, 3, Val_bool(info->flags & XEN_DOMINF_paused));
-- Store_field(result, 4, Val_bool(info->flags & XEN_DOMINF_blocked));
-- Store_field(result, 5, Val_bool(info->flags & XEN_DOMINF_running));
-- Store_field(result, 6, Val_bool(info->flags & XEN_DOMINF_hvm_guest));
-- Store_field(result, 7, Val_int((info->flags >> XEN_DOMINF_shutdownshift)
-- & XEN_DOMINF_shutdownmask));
-- Store_field(result, 8, caml_copy_nativeint(info->tot_pages));
-- Store_field(result, 9, caml_copy_nativeint(info->max_pages));
-- Store_field(result, 10, caml_copy_int64(info->shared_info_frame));
-- Store_field(result, 11, caml_copy_int64(info->cpu_time));
-- Store_field(result, 12, Val_int(info->nr_online_vcpus));
-- Store_field(result, 13, Val_int(info->max_vcpu_id));
-- Store_field(result, 14, caml_copy_int32(info->ssidref));
--
-- tmp = caml_alloc_small(16, 0);
-- for (i = 0; i < 16; i++) {
-- Field(tmp, i) = Val_int(info->handle[i]);
-- }
--
-- Store_field(result, 15, tmp);
--
-- CAMLreturn(result);
--}
--
--CAMLprim value stub_xc_domain_getinfolist(value xch, value first_domain, value nb)
--{
-- CAMLparam3(xch, first_domain, nb);
-- CAMLlocal2(result, temp);
-- xc_domaininfo_t * info;
-- int i, ret, toalloc, retval;
-- unsigned int c_max_domains;
-- uint32_t c_first_domain;
--
-- /* get the minimum number of allocate byte we need and bump it up to page boundary */
-- toalloc = (sizeof(xc_domaininfo_t) * Int_val(nb)) | 0xfff;
-- ret = posix_memalign((void **) ((void *) &info), 4096, toalloc);
-- if (ret)
-- caml_raise_out_of_memory();
--
-- result = temp = Val_emptylist;
--
-- c_first_domain = _D(first_domain);
-- c_max_domains = Int_val(nb);
-- // caml_enter_blocking_section();
-- retval = xc_domain_getinfolist(_H(xch), c_first_domain,
-- c_max_domains, info);
-- // caml_leave_blocking_section();
--
-- if (retval < 0) {
-- free(info);
-- failwith_xc(_H(xch));
-- }
-- for (i = 0; i < retval; i++) {
-- result = caml_alloc_small(2, Tag_cons);
-- Field(result, 0) = Val_int(0);
-- Field(result, 1) = temp;
-- temp = result;
--
-- Store_field(result, 0, alloc_domaininfo(info + i));
-- }
--
-- free(info);
-- CAMLreturn(result);
--}
--
--CAMLprim value stub_xc_domain_getinfo(value xch, value domid)
--{
-- CAMLparam2(xch, domid);
-- CAMLlocal1(result);
-- xc_domaininfo_t info;
-- int ret;
--
-- ret = xc_domain_getinfolist(_H(xch), _D(domid), 1, &info);
-- if (ret != 1)
-- failwith_xc(_H(xch));
-- if (info.domain != _D(domid))
-- failwith_xc(_H(xch));
--
-- result = alloc_domaininfo(&info);
-- CAMLreturn(result);
--}
--
--CAMLprim value stub_xc_vcpu_getinfo(value xch, value domid, value vcpu)
--{
-- CAMLparam3(xch, domid, vcpu);
-- CAMLlocal1(result);
-- xc_vcpuinfo_t info;
-- int retval;
--
-- uint32_t c_domid = _D(domid);
-- uint32_t c_vcpu = Int_val(vcpu);
-- // caml_enter_blocking_section();
-- retval = xc_vcpu_getinfo(_H(xch), c_domid,
-- c_vcpu, &info);
-- // caml_leave_blocking_section();
-- if (retval < 0)
-- failwith_xc(_H(xch));
--
-- result = caml_alloc_tuple(5);
-- Store_field(result, 0, Val_bool(info.online));
-- Store_field(result, 1, Val_bool(info.blocked));
-- Store_field(result, 2, Val_bool(info.running));
-- Store_field(result, 3, caml_copy_int64(info.cpu_time));
-- Store_field(result, 4, caml_copy_int32(info.cpu));
--
-- CAMLreturn(result);
--}
--
--CAMLprim value stub_xc_vcpu_context_get(value xch, value domid,
-- value cpu)
--{
-- CAMLparam3(xch, domid, cpu);
-- CAMLlocal1(context);
-- int ret;
-- vcpu_guest_context_any_t ctxt;
--
-- ret = xc_vcpu_getcontext(_H(xch), _D(domid), Int_val(cpu), &ctxt);
--
-- context = caml_alloc_string(sizeof(ctxt));
-- memcpy(String_val(context), (char *) &ctxt.c, sizeof(ctxt.c));
--
-- CAMLreturn(context);
--}
--
--static int get_cpumap_len(value xch, value cpumap)
--{
-- int ml_len = Wosize_val(cpumap);
-- int xc_len = xc_get_max_cpus(_H(xch));
--
-- if (ml_len < xc_len)
-- return ml_len;
-- else
-- return xc_len;
--}
--
--CAMLprim value stub_xc_vcpu_setaffinity(value xch, value domid,
-- value vcpu, value cpumap)
--{
-- CAMLparam4(xch, domid, vcpu, cpumap);
-- int i, len = get_cpumap_len(xch, cpumap);
-- xc_cpumap_t c_cpumap;
-- int retval;
--
-- c_cpumap = xc_cpumap_alloc(_H(xch));
-- if (c_cpumap == NULL)
-- failwith_xc(_H(xch));
--
-- for (i=0; i<len; i++) {
-- if (Bool_val(Field(cpumap, i)))
-- c_cpumap[i/8] |= i << (i&7);
-- }
-- retval = xc_vcpu_setaffinity(_H(xch), _D(domid),
-- Int_val(vcpu), c_cpumap);
-- free(c_cpumap);
--
-- if (retval < 0)
-- failwith_xc(_H(xch));
-- CAMLreturn(Val_unit);
--}
--
--CAMLprim value stub_xc_vcpu_getaffinity(value xch, value domid,
-- value vcpu)
--{
-- CAMLparam3(xch, domid, vcpu);
-- CAMLlocal1(ret);
-- xc_cpumap_t c_cpumap;
-- int i, len = xc_get_max_cpus(_H(xch));
-- int retval;
--
-- c_cpumap = xc_cpumap_alloc(_H(xch));
-- if (c_cpumap == NULL)
-- failwith_xc(_H(xch));
--
-- retval = xc_vcpu_getaffinity(_H(xch), _D(domid),
-- Int_val(vcpu), c_cpumap);
-- free(c_cpumap);
--
-- if (retval < 0) {
-- free(c_cpumap);
-- failwith_xc(_H(xch));
-- }
--
-- ret = caml_alloc(len, 0);
--
-- for (i=0; i<len; i++) {
-- if (c_cpumap[i%8] & 1 << (i&7))
-- Store_field(ret, i, Val_true);
-- else
-- Store_field(ret, i, Val_false);
-- }
--
-- free(c_cpumap);
--
-- CAMLreturn(ret);
--}
--
--CAMLprim value stub_xc_sched_id(value xch)
--{
-- CAMLparam1(xch);
-- int sched_id;
--
-- if (xc_sched_id(_H(xch), &sched_id))
-- failwith_xc(_H(xch));
-- CAMLreturn(Val_int(sched_id));
--}
--
--CAMLprim value stub_xc_evtchn_alloc_unbound(value xch,
-- value local_domid,
-- value remote_domid)
--{
-- CAMLparam3(xch, local_domid, remote_domid);
--
-- uint32_t c_local_domid = _D(local_domid);
-- uint32_t c_remote_domid = _D(remote_domid);
--
-- // caml_enter_blocking_section();
-- int result = xc_evtchn_alloc_unbound(_H(xch), c_local_domid,
-- c_remote_domid);
-- // caml_leave_blocking_section();
--
-- if (result < 0)
-- failwith_xc(_H(xch));
-- CAMLreturn(Val_int(result));
--}
--
--CAMLprim value stub_xc_evtchn_reset(value xch, value domid)
--{
-- CAMLparam2(xch, domid);
-- int r;
--
-- r = xc_evtchn_reset(_H(xch), _D(domid));
-- if (r < 0)
-- failwith_xc(_H(xch));
-- CAMLreturn(Val_unit);
--}
--
--
--#define RING_SIZE 32768
--static char ring[RING_SIZE];
--
--CAMLprim value stub_xc_readconsolering(value xch)
--{
-- unsigned int size = RING_SIZE;
-- char *ring_ptr = ring;
--
-- CAMLparam1(xch);
--
-- // caml_enter_blocking_section();
-- int retval = xc_readconsolering(_H(xch), ring_ptr, &size, 0, 0, NULL);
-- // caml_leave_blocking_section();
--
-- if (retval)
-- failwith_xc(_H(xch));
-- ring[size] = '\0';
-- CAMLreturn(caml_copy_string(ring));
--}
--
--CAMLprim value stub_xc_send_debug_keys(value xch, value keys)
--{
-- CAMLparam2(xch, keys);
-- int r;
--
-- r = xc_send_debug_keys(_H(xch), String_val(keys));
-- if (r)
-- failwith_xc(_H(xch));
-- CAMLreturn(Val_unit);
--}
--
--CAMLprim value stub_xc_physinfo(value xch)
--{
-- CAMLparam1(xch);
-- CAMLlocal3(physinfo, cap_list, tmp);
-- xc_physinfo_t c_physinfo;
-- int r;
--
-- // caml_enter_blocking_section();
-- r = xc_physinfo(_H(xch), &c_physinfo);
-- // caml_leave_blocking_section();
--
-- if (r)
-- failwith_xc(_H(xch));
--
-- tmp = cap_list = Val_emptylist;
-- for (r = 0; r < 2; r++) {
-- if ((c_physinfo.capabilities >> r) & 1) {
-- tmp = caml_alloc_small(2, Tag_cons);
-- Field(tmp, 0) = Val_int(r);
-- Field(tmp, 1) = cap_list;
-- cap_list = tmp;
-- }
-- }
--
-- physinfo = caml_alloc_tuple(9);
-- Store_field(physinfo, 0, Val_int(c_physinfo.threads_per_core));
-- Store_field(physinfo, 1, Val_int(c_physinfo.cores_per_socket));
-- Store_field(physinfo, 2, Val_int(c_physinfo.nr_cpus));
-- Store_field(physinfo, 3, Val_int(c_physinfo.max_node_id));
-- Store_field(physinfo, 4, Val_int(c_physinfo.cpu_khz));
-- Store_field(physinfo, 5, caml_copy_nativeint(c_physinfo.total_pages));
-- Store_field(physinfo, 6, caml_copy_nativeint(c_physinfo.free_pages));
-- Store_field(physinfo, 7, caml_copy_nativeint(c_physinfo.scrub_pages));
-- Store_field(physinfo, 8, cap_list);
--
-- CAMLreturn(physinfo);
--}
--
--CAMLprim value stub_xc_pcpu_info(value xch, value nr_cpus)
--{
-- CAMLparam2(xch, nr_cpus);
-- CAMLlocal2(pcpus, v);
-- xc_cpuinfo_t *info;
-- int r, size;
--
-- if (Int_val(nr_cpus) < 1)
-- caml_invalid_argument("nr_cpus");
--
-- info = calloc(Int_val(nr_cpus) + 1, sizeof(*info));
-- if (!info)
-- caml_raise_out_of_memory();
--
-- // caml_enter_blocking_section();
-- r = xc_getcpuinfo(_H(xch), Int_val(nr_cpus), info, &size);
-- // caml_leave_blocking_section();
--
-- if (r) {
-- free(info);
-- failwith_xc(_H(xch));
-- }
--
-- if (size > 0) {
-- int i;
-- pcpus = caml_alloc(size, 0);
-- for (i = 0; i < size; i++) {
-- v = caml_copy_int64(info[i].idletime);
-- caml_modify(&Field(pcpus, i), v);
-- }
-- } else
-- pcpus = Atom(0);
-- free(info);
-- CAMLreturn(pcpus);
--}
--
--CAMLprim value stub_xc_domain_setmaxmem(value xch, value domid,
-- value max_memkb)
--{
-- CAMLparam3(xch, domid, max_memkb);
--
-- uint32_t c_domid = _D(domid);
-- unsigned int c_max_memkb = Int64_val(max_memkb);
-- // caml_enter_blocking_section();
-- int retval = xc_domain_setmaxmem(_H(xch), c_domid,
-- c_max_memkb);
-- // caml_leave_blocking_section();
-- if (retval)
-- failwith_xc(_H(xch));
-- CAMLreturn(Val_unit);
--}
--
--CAMLprim value stub_xc_domain_set_memmap_limit(value xch, value domid,
-- value map_limitkb)
--{
-- CAMLparam3(xch, domid, map_limitkb);
-- unsigned long v;
-- int retval;
--
-- v = Int64_val(map_limitkb);
-- retval = xc_domain_set_memmap_limit(_H(xch), _D(domid), v);
-- if (retval)
-- failwith_xc(_H(xch));
--
-- CAMLreturn(Val_unit);
--}
--
--CAMLprim value stub_xc_domain_memory_increase_reservation(value xch,
-- value domid,
-- value mem_kb)
--{
-- CAMLparam3(xch, domid, mem_kb);
--
-- unsigned long nr_extents = ((unsigned long)(Int64_val(mem_kb))) >> (PAGE_SHIFT - 10);
--
-- uint32_t c_domid = _D(domid);
-- // caml_enter_blocking_section();
-- int retval = xc_domain_increase_reservation_exact(_H(xch), c_domid,
-- nr_extents, 0, 0, NULL);
-- // caml_leave_blocking_section();
--
-- if (retval)
-- failwith_xc(_H(xch));
-- CAMLreturn(Val_unit);
--}
--
--CAMLprim value stub_xc_domain_set_machine_address_size(value xch,
-- value domid,
-- value width)
--{
-- CAMLparam3(xch, domid, width);
-- uint32_t c_domid = _D(domid);
-- int c_width = Int_val(width);
--
-- int retval = xc_domain_set_machine_address_size(_H(xch), c_domid, c_width);
-- if (retval)
-- failwith_xc(_H(xch));
-- CAMLreturn(Val_unit);
--}
--
--CAMLprim value stub_xc_domain_get_machine_address_size(value xch,
-- value domid)
--{
-- CAMLparam2(xch, domid);
-- int retval;
--
-- retval = xc_domain_get_machine_address_size(_H(xch), _D(domid));
-- if (retval < 0)
-- failwith_xc(_H(xch));
-- CAMLreturn(Val_int(retval));
--}
--
--CAMLprim value stub_xc_domain_cpuid_set(value xch, value domid,
-- value input,
-- value config)
--{
-- CAMLparam4(xch, domid, input, config);
-- CAMLlocal2(array, tmp);
-- int r;
-- unsigned int c_input[2];
-- char *c_config[4], *out_config[4];
--
-- c_config[0] = string_of_option_array(config, 0);
-- c_config[1] = string_of_option_array(config, 1);
-- c_config[2] = string_of_option_array(config, 2);
-- c_config[3] = string_of_option_array(config, 3);
--
-- cpuid_input_of_val(c_input[0], c_input[1], input);
--
-- array = caml_alloc(4, 0);
-- for (r = 0; r < 4; r++) {
-- tmp = Val_none;
-- if (c_config[r]) {
-- tmp = caml_alloc_small(1, 0);
-- Field(tmp, 0) = caml_alloc_string(32);
-- }
-- Store_field(array, r, tmp);
-- }
--
-- for (r = 0; r < 4; r++)
-- out_config[r] = (c_config[r]) ? String_val(Field(Field(array, r), 0)) : NULL;
--
-- r = xc_cpuid_set(_H(xch), _D(domid),
-- c_input, (const char **)c_config, out_config);
-- if (r < 0)
-- failwith_xc(_H(xch));
-- CAMLreturn(array);
--}
--
--CAMLprim value stub_xc_domain_cpuid_apply_policy(value xch, value domid)
--{
-- CAMLparam2(xch, domid);
-- int r;
--
-- r = xc_cpuid_apply_policy(_H(xch), _D(domid));
-- if (r < 0)
-- failwith_xc(_H(xch));
-- CAMLreturn(Val_unit);
--}
--
--CAMLprim value stub_xc_cpuid_check(value xch, value input, value config)
--{
-- CAMLparam3(xch, input, config);
-- CAMLlocal3(ret, array, tmp);
-- int r;
-- unsigned int c_input[2];
-- char *c_config[4], *out_config[4];
--
-- c_config[0] = string_of_option_array(config, 0);
-- c_config[1] = string_of_option_array(config, 1);
-- c_config[2] = string_of_option_array(config, 2);
-- c_config[3] = string_of_option_array(config, 3);
--
-- cpuid_input_of_val(c_input[0], c_input[1], input);
--
-- array = caml_alloc(4, 0);
-- for (r = 0; r < 4; r++) {
-- tmp = Val_none;
-- if (c_config[r]) {
-- tmp = caml_alloc_small(1, 0);
-- Field(tmp, 0) = caml_alloc_string(32);
-- }
-- Store_field(array, r, tmp);
-- }
--
-- for (r = 0; r < 4; r++)
-- out_config[r] = (c_config[r]) ? String_val(Field(Field(array, r), 0)) : NULL;
--
-- r = xc_cpuid_check(_H(xch), c_input, (const char **)c_config, out_config);
-- if (r < 0)
-- failwith_xc(_H(xch));
--
-- ret = caml_alloc_tuple(2);
-- Store_field(ret, 0, Val_bool(r));
-- Store_field(ret, 1, array);
--
-- CAMLreturn(ret);
--}
--
--CAMLprim value stub_xc_version_version(value xch)
--{
-- CAMLparam1(xch);
-- CAMLlocal1(result);
-- xen_extraversion_t extra;
-- long packed;
-- int retval;
--
-- // caml_enter_blocking_section();
-- packed = xc_version(_H(xch), XENVER_version, NULL);
-- retval = xc_version(_H(xch), XENVER_extraversion, &extra);
-- // caml_leave_blocking_section();
--
-- if (retval)
-- failwith_xc(_H(xch));
--
-- result = caml_alloc_tuple(3);
--
-- Store_field(result, 0, Val_int(packed >> 16));
-- Store_field(result, 1, Val_int(packed & 0xffff));
-- Store_field(result, 2, caml_copy_string(extra));
--
-- CAMLreturn(result);
--}
--
--
--CAMLprim value stub_xc_version_compile_info(value xch)
--{
-- CAMLparam1(xch);
-- CAMLlocal1(result);
-- xen_compile_info_t ci;
-- int retval;
--
-- // caml_enter_blocking_section();
-- retval = xc_version(_H(xch), XENVER_compile_info, &ci);
-- // caml_leave_blocking_section();
--
-- if (retval)
-- failwith_xc(_H(xch));
--
-- result = caml_alloc_tuple(4);
--
-- Store_field(result, 0, caml_copy_string(ci.compiler));
-- Store_field(result, 1, caml_copy_string(ci.compile_by));
-- Store_field(result, 2, caml_copy_string(ci.compile_domain));
-- Store_field(result, 3, caml_copy_string(ci.compile_date));
--
-- CAMLreturn(result);
--}
--
--
--static value xc_version_single_string(value xch, int code, void *info)
--{
-- CAMLparam1(xch);
-- int retval;
--
-- // caml_enter_blocking_section();
-- retval = xc_version(_H(xch), code, info);
-- // caml_leave_blocking_section();
--
-- if (retval)
-- failwith_xc(_H(xch));
--
-- CAMLreturn(caml_copy_string((char *)info));
--}
--
--
--CAMLprim value stub_xc_version_changeset(value xch)
--{
-- xen_changeset_info_t ci;
--
-- return xc_version_single_string(xch, XENVER_changeset, &ci);
--}
--
--
--CAMLprim value stub_xc_version_capabilities(value xch)
--{
-- xen_capabilities_info_t ci;
--
-- return xc_version_single_string(xch, XENVER_capabilities, &ci);
--}
--
--
--CAMLprim value stub_pages_to_kib(value pages)
--{
-- CAMLparam1(pages);
--
-- CAMLreturn(caml_copy_int64(Int64_val(pages) << (PAGE_SHIFT - 10)));
--}
--
--
--CAMLprim value stub_map_foreign_range(value xch, value dom,
-- value size, value mfn)
--{
-- CAMLparam4(xch, dom, size, mfn);
-- CAMLlocal1(result);
-- struct mmap_interface *intf;
-- uint32_t c_dom;
-- unsigned long c_mfn;
--
-- result = caml_alloc(sizeof(struct mmap_interface), Abstract_tag);
-- intf = (struct mmap_interface *) result;
--
-- intf->len = Int_val(size);
--
-- c_dom = _D(dom);
-- c_mfn = Nativeint_val(mfn);
-- // caml_enter_blocking_section();
-- intf->addr = xc_map_foreign_range(_H(xch), c_dom,
-- intf->len, PROT_READ|PROT_WRITE,
-- c_mfn);
-- // caml_leave_blocking_section();
-- if (!intf->addr)
-- caml_failwith("xc_map_foreign_range error");
-- CAMLreturn(result);
--}
--
--CAMLprim value stub_sched_credit_domain_get(value xch, value domid)
--{
-- CAMLparam2(xch, domid);
-- CAMLlocal1(sdom);
-- struct xen_domctl_sched_credit c_sdom;
-- int ret;
--
-- // caml_enter_blocking_section();
-- ret = xc_sched_credit_domain_get(_H(xch), _D(domid), &c_sdom);
-- // caml_leave_blocking_section();
-- if (ret != 0)
-- failwith_xc(_H(xch));
--
-- sdom = caml_alloc_tuple(2);
-- Store_field(sdom, 0, Val_int(c_sdom.weight));
-- Store_field(sdom, 1, Val_int(c_sdom.cap));
--
-- CAMLreturn(sdom);
--}
--
--CAMLprim value stub_sched_credit_domain_set(value xch, value domid,
-- value sdom)
--{
-- CAMLparam3(xch, domid, sdom);
-- struct xen_domctl_sched_credit c_sdom;
-- int ret;
--
-- c_sdom.weight = Int_val(Field(sdom, 0));
-- c_sdom.cap = Int_val(Field(sdom, 1));
-- // caml_enter_blocking_section();
-- ret = xc_sched_credit_domain_set(_H(xch), _D(domid), &c_sdom);
-- // caml_leave_blocking_section();
-- if (ret != 0)
-- failwith_xc(_H(xch));
--
-- CAMLreturn(Val_unit);
--}
--
--CAMLprim value stub_shadow_allocation_get(value xch, value domid)
--{
-- CAMLparam2(xch, domid);
-- CAMLlocal1(mb);
-- unsigned long c_mb;
-- int ret;
--
-- // caml_enter_blocking_section();
-- ret = xc_shadow_control(_H(xch), _D(domid),
-- XEN_DOMCTL_SHADOW_OP_GET_ALLOCATION,
-- NULL, 0, &c_mb, 0, NULL);
-- // caml_leave_blocking_section();
-- if (ret != 0)
-- failwith_xc(_H(xch));
--
-- mb = Val_int(c_mb);
-- CAMLreturn(mb);
--}
--
--CAMLprim value stub_shadow_allocation_set(value xch, value domid,
-- value mb)
--{
-- CAMLparam3(xch, domid, mb);
-- unsigned long c_mb;
-- int ret;
--
-- c_mb = Int_val(mb);
-- // caml_enter_blocking_section();
-- ret = xc_shadow_control(_H(xch), _D(domid),
-- XEN_DOMCTL_SHADOW_OP_SET_ALLOCATION,
-- NULL, 0, &c_mb, 0, NULL);
-- // caml_leave_blocking_section();
-- if (ret != 0)
-- failwith_xc(_H(xch));
--
-- CAMLreturn(Val_unit);
--}
--
--CAMLprim value stub_xc_domain_get_pfn_list(value xch, value domid,
-- value nr_pfns)
--{
-- CAMLparam3(xch, domid, nr_pfns);
-- CAMLlocal2(array, v);
-- unsigned long c_nr_pfns;
-- long ret, i;
-- uint64_t *c_array;
--
-- c_nr_pfns = Nativeint_val(nr_pfns);
--
-- c_array = malloc(sizeof(uint64_t) * c_nr_pfns);
-- if (!c_array)
-- caml_raise_out_of_memory();
--
-- ret = xc_get_pfn_list(_H(xch), _D(domid),
-- c_array, c_nr_pfns);
-- if (ret < 0) {
-- free(c_array);
-- failwith_xc(_H(xch));
-- }
--
-- array = caml_alloc(ret, 0);
-- for (i = 0; i < ret; i++) {
-- v = caml_copy_nativeint(c_array[i]);
-- Store_field(array, i, v);
-- }
-- free(c_array);
--
-- CAMLreturn(array);
--}
--
--CAMLprim value stub_xc_domain_ioport_permission(value xch, value domid,
-- value start_port, value nr_ports,
-- value allow)
--{
-- CAMLparam5(xch, domid, start_port, nr_ports, allow);
-- uint32_t c_start_port, c_nr_ports;
-- uint8_t c_allow;
-- int ret;
--
-- c_start_port = Int_val(start_port);
-- c_nr_ports = Int_val(nr_ports);
-- c_allow = Bool_val(allow);
--
-- ret = xc_domain_ioport_permission(_H(xch), _D(domid),
-- c_start_port, c_nr_ports, c_allow);
-- if (ret < 0)
-- failwith_xc(_H(xch));
--
-- CAMLreturn(Val_unit);
--}
--
--CAMLprim value stub_xc_domain_iomem_permission(value xch, value domid,
-- value start_pfn, value nr_pfns,
-- value allow)
--{
-- CAMLparam5(xch, domid, start_pfn, nr_pfns, allow);
-- unsigned long c_start_pfn, c_nr_pfns;
-- uint8_t c_allow;
-- int ret;
--
-- c_start_pfn = Nativeint_val(start_pfn);
-- c_nr_pfns = Nativeint_val(nr_pfns);
-- c_allow = Bool_val(allow);
--
-- ret = xc_domain_iomem_permission(_H(xch), _D(domid),
-- c_start_pfn, c_nr_pfns, c_allow);
-- if (ret < 0)
-- failwith_xc(_H(xch));
--
-- CAMLreturn(Val_unit);
--}
--
--CAMLprim value stub_xc_domain_irq_permission(value xch, value domid,
-- value pirq, value allow)
--{
-- CAMLparam4(xch, domid, pirq, allow);
-- uint8_t c_pirq;
-- uint8_t c_allow;
-- int ret;
--
-- c_pirq = Int_val(pirq);
-- c_allow = Bool_val(allow);
--
-- ret = xc_domain_irq_permission(_H(xch), _D(domid),
-- c_pirq, c_allow);
-- if (ret < 0)
-- failwith_xc(_H(xch));
--
-- CAMLreturn(Val_unit);
--}
--
--static uint32_t pci_dev_to_bdf(int domain, int bus, int slot, int func)
--{
-- uint32_t bdf = 0;
-- bdf |= (bus & 0xff) << 16;
-- bdf |= (slot & 0x1f) << 11;
-- bdf |= (func & 0x7) << 8;
-- return bdf;
--}
--
--CAMLprim value stub_xc_domain_test_assign_device(value xch, value domid, value desc)
--{
-- CAMLparam3(xch, domid, desc);
-- int ret;
-- int domain, bus, slot, func;
-- uint32_t bdf;
--
-- domain = Int_val(Field(desc, 0));
-- bus = Int_val(Field(desc, 1));
-- slot = Int_val(Field(desc, 2));
-- func = Int_val(Field(desc, 3));
-- bdf = pci_dev_to_bdf(domain, bus, slot, func);
--
-- ret = xc_test_assign_device(_H(xch), _D(domid), bdf);
--
-- CAMLreturn(Val_bool(ret == 0));
--}
--
--CAMLprim value stub_xc_domain_assign_device(value xch, value domid, value desc)
--{
-- CAMLparam3(xch, domid, desc);
-- int ret;
-- int domain, bus, slot, func;
-- uint32_t bdf;
--
-- domain = Int_val(Field(desc, 0));
-- bus = Int_val(Field(desc, 1));
-- slot = Int_val(Field(desc, 2));
-- func = Int_val(Field(desc, 3));
-- bdf = pci_dev_to_bdf(domain, bus, slot, func);
--
-- ret = xc_assign_device(_H(xch), _D(domid), bdf);
--
-- if (ret < 0)
-- failwith_xc(_H(xch));
-- CAMLreturn(Val_unit);
--}
--
--CAMLprim value stub_xc_domain_deassign_device(value xch, value domid, value desc)
--{
-- CAMLparam3(xch, domid, desc);
-- int ret;
-- int domain, bus, slot, func;
-- uint32_t bdf;
--
-- domain = Int_val(Field(desc, 0));
-- bus = Int_val(Field(desc, 1));
-- slot = Int_val(Field(desc, 2));
-- func = Int_val(Field(desc, 3));
-- bdf = pci_dev_to_bdf(domain, bus, slot, func);
--
-- ret = xc_deassign_device(_H(xch), _D(domid), bdf);
--
-- if (ret < 0)
-- failwith_xc(_H(xch));
-- CAMLreturn(Val_unit);
--}
--
--CAMLprim value stub_xc_watchdog(value xch, value domid, value timeout)
--{
-- CAMLparam3(xch, domid, timeout);
-- int ret;
-- unsigned int c_timeout = Int32_val(timeout);
--
-- ret = xc_watchdog(_H(xch), _D(domid), c_timeout);
-- if (ret < 0)
-- failwith_xc(_H(xch));
--
-- CAMLreturn(Val_int(ret));
--}
--
--/*
-- * Local variables:
-- * indent-tabs-mode: t
-- * c-basic-offset: 8
-- * tab-width: 8
-- * End:
-- */
---- /dev/null
-+++ b/tools/ocaml/libs/xc/xenctrl.ml
-@@ -0,0 +1,326 @@
-+(*
-+ * Copyright (C) 2006-2007 XenSource Ltd.
-+ * Copyright (C) 2008 Citrix Ltd.
-+ * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License as published
-+ * by the Free Software Foundation; version 2.1 only. with the special
-+ * exception on linking described in file LICENSE.
-+ *
-+ * 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 Lesser General Public License for more details.
-+ *)
-+
-+(** *)
-+type domid = int
-+
-+(* ** xenctrl.h ** *)
-+
-+type vcpuinfo =
-+{
-+ online: bool;
-+ blocked: bool;
-+ running: bool;
-+ cputime: int64;
-+ cpumap: int32;
-+}
-+
-+type domaininfo =
-+{
-+ domid : domid;
-+ dying : bool;
-+ shutdown : bool;
-+ paused : bool;
-+ blocked : bool;
-+ running : bool;
-+ hvm_guest : bool;
-+ shutdown_code : int;
-+ total_memory_pages: nativeint;
-+ max_memory_pages : nativeint;
-+ shared_info_frame : int64;
-+ cpu_time : int64;
-+ nr_online_vcpus : int;
-+ max_vcpu_id : int;
-+ ssidref : int32;
-+ handle : int array;
-+}
-+
-+type sched_control =
-+{
-+ weight : int;
-+ cap : int;
-+}
-+
-+type physinfo_cap_flag =
-+ | CAP_HVM
-+ | CAP_DirectIO
-+
-+type physinfo =
-+{
-+ threads_per_core : int;
-+ cores_per_socket : int;
-+ nr_cpus : int;
-+ max_node_id : int;
-+ cpu_khz : int;
-+ total_pages : nativeint;
-+ free_pages : nativeint;
-+ scrub_pages : nativeint;
-+ (* XXX hw_cap *)
-+ capabilities : physinfo_cap_flag list;
-+}
-+
-+type version =
-+{
-+ major : int;
-+ minor : int;
-+ extra : string;
-+}
-+
-+
-+type compile_info =
-+{
-+ compiler : string;
-+ compile_by : string;
-+ compile_domain : string;
-+ compile_date : string;
-+}
-+
-+type shutdown_reason = Poweroff | Reboot | Suspend | Crash | Halt
-+
-+type domain_create_flag = CDF_HVM | CDF_HAP
-+
-+exception Error of string
-+
-+type handle
-+
-+(* this is only use by coredumping *)
-+external sizeof_core_header: unit -> int
-+ = "stub_sizeof_core_header"
-+external sizeof_vcpu_guest_context: unit -> int
-+ = "stub_sizeof_vcpu_guest_context"
-+external sizeof_xen_pfn: unit -> int = "stub_sizeof_xen_pfn"
-+(* end of use *)
-+
-+external interface_open: unit -> handle = "stub_xc_interface_open"
-+external interface_close: handle -> unit = "stub_xc_interface_close"
-+
-+external is_fake: unit -> bool = "stub_xc_interface_is_fake"
-+
-+let with_intf f =
-+ let xc = interface_open () in
-+ let r = try f xc with exn -> interface_close xc; raise exn in
-+ interface_close xc;
-+ r
-+
-+external _domain_create: handle -> int32 -> domain_create_flag list -> int array -> domid
-+ = "stub_xc_domain_create"
-+
-+let domain_create handle n flags uuid =
-+ _domain_create handle n flags (Uuid.int_array_of_uuid uuid)
-+
-+external _domain_sethandle: handle -> domid -> int array -> unit
-+ = "stub_xc_domain_sethandle"
-+
-+let domain_sethandle handle n uuid =
-+ _domain_sethandle handle n (Uuid.int_array_of_uuid uuid)
-+
-+external domain_max_vcpus: handle -> domid -> int -> unit
-+ = "stub_xc_domain_max_vcpus"
-+
-+external domain_pause: handle -> domid -> unit = "stub_xc_domain_pause"
-+external domain_unpause: handle -> domid -> unit = "stub_xc_domain_unpause"
-+external domain_resume_fast: handle -> domid -> unit = "stub_xc_domain_resume_fast"
-+external domain_destroy: handle -> domid -> unit = "stub_xc_domain_destroy"
-+
-+external domain_shutdown: handle -> domid -> shutdown_reason -> unit
-+ = "stub_xc_domain_shutdown"
-+
-+external _domain_getinfolist: handle -> domid -> int -> domaininfo list
-+ = "stub_xc_domain_getinfolist"
-+
-+let domain_getinfolist handle first_domain =
-+ let nb = 2 in
-+ let last_domid l = (List.hd l).domid + 1 in
-+ let rec __getlist from =
-+ let l = _domain_getinfolist handle from nb in
-+ (if List.length l = nb then __getlist (last_domid l) else []) @ l
-+ in
-+ List.rev (__getlist first_domain)
-+
-+external domain_getinfo: handle -> domid -> domaininfo= "stub_xc_domain_getinfo"
-+
-+external domain_get_vcpuinfo: handle -> int -> int -> vcpuinfo
-+ = "stub_xc_vcpu_getinfo"
-+
-+external domain_ioport_permission: handle -> domid -> int -> int -> bool -> unit
-+ = "stub_xc_domain_ioport_permission"
-+external domain_iomem_permission: handle -> domid -> nativeint -> nativeint -> bool -> unit
-+ = "stub_xc_domain_iomem_permission"
-+external domain_irq_permission: handle -> domid -> int -> bool -> unit
-+ = "stub_xc_domain_irq_permission"
-+
-+external vcpu_affinity_set: handle -> domid -> int -> bool array -> unit
-+ = "stub_xc_vcpu_setaffinity"
-+external vcpu_affinity_get: handle -> domid -> int -> bool array
-+ = "stub_xc_vcpu_getaffinity"
-+
-+external vcpu_context_get: handle -> domid -> int -> string
-+ = "stub_xc_vcpu_context_get"
-+
-+external sched_id: handle -> int = "stub_xc_sched_id"
-+
-+external sched_credit_domain_set: handle -> domid -> sched_control -> unit
-+ = "stub_sched_credit_domain_set"
-+external sched_credit_domain_get: handle -> domid -> sched_control
-+ = "stub_sched_credit_domain_get"
-+
-+external shadow_allocation_set: handle -> domid -> int -> unit
-+ = "stub_shadow_allocation_set"
-+external shadow_allocation_get: handle -> domid -> int
-+ = "stub_shadow_allocation_get"
-+
-+external evtchn_alloc_unbound: handle -> domid -> domid -> int
-+ = "stub_xc_evtchn_alloc_unbound"
-+external evtchn_reset: handle -> domid -> unit = "stub_xc_evtchn_reset"
-+
-+external readconsolering: handle -> string = "stub_xc_readconsolering"
-+
-+external send_debug_keys: handle -> string -> unit = "stub_xc_send_debug_keys"
-+external physinfo: handle -> physinfo = "stub_xc_physinfo"
-+external pcpu_info: handle -> int -> int64 array = "stub_xc_pcpu_info"
-+
-+external domain_setmaxmem: handle -> domid -> int64 -> unit
-+ = "stub_xc_domain_setmaxmem"
-+external domain_set_memmap_limit: handle -> domid -> int64 -> unit
-+ = "stub_xc_domain_set_memmap_limit"
-+external domain_memory_increase_reservation: handle -> domid -> int64 -> unit
-+ = "stub_xc_domain_memory_increase_reservation"
-+
-+external domain_set_machine_address_size: handle -> domid -> int -> unit
-+ = "stub_xc_domain_set_machine_address_size"
-+external domain_get_machine_address_size: handle -> domid -> int
-+ = "stub_xc_domain_get_machine_address_size"
-+
-+external domain_cpuid_set: handle -> domid -> (int64 * (int64 option))
-+ -> string option array
-+ -> string option array
-+ = "stub_xc_domain_cpuid_set"
-+external domain_cpuid_apply_policy: handle -> domid -> unit
-+ = "stub_xc_domain_cpuid_apply_policy"
-+external cpuid_check: handle -> (int64 * (int64 option)) -> string option array -> (bool * string option array)
-+ = "stub_xc_cpuid_check"
-+
-+external map_foreign_range: handle -> domid -> int
-+ -> nativeint -> Xenmmap.mmap_interface
-+ = "stub_map_foreign_range"
-+
-+external domain_get_pfn_list: handle -> domid -> nativeint -> nativeint array
-+ = "stub_xc_domain_get_pfn_list"
-+
-+external domain_assign_device: handle -> domid -> (int * int * int * int) -> unit
-+ = "stub_xc_domain_assign_device"
-+external domain_deassign_device: handle -> domid -> (int * int * int * int) -> unit
-+ = "stub_xc_domain_deassign_device"
-+external domain_test_assign_device: handle -> domid -> (int * int * int * int) -> bool
-+ = "stub_xc_domain_test_assign_device"
-+
-+external version: handle -> version = "stub_xc_version_version"
-+external version_compile_info: handle -> compile_info
-+ = "stub_xc_version_compile_info"
-+external version_changeset: handle -> string = "stub_xc_version_changeset"
-+external version_capabilities: handle -> string =
-+ "stub_xc_version_capabilities"
-+
-+external watchdog : handle -> int -> int32 -> int
-+ = "stub_xc_watchdog"
-+
-+(* core dump structure *)
-+type core_magic = Magic_hvm | Magic_pv
-+
-+type core_header = {
-+ xch_magic: core_magic;
-+ xch_nr_vcpus: int;
-+ xch_nr_pages: nativeint;
-+ xch_index_offset: int64;
-+ xch_ctxt_offset: int64;
-+ xch_pages_offset: int64;
-+}
-+
-+external marshall_core_header: core_header -> string = "stub_marshall_core_header"
-+
-+(* coredump *)
-+let coredump xch domid fd =
-+ let dump s =
-+ let wd = Unix.write fd s 0 (String.length s) in
-+ if wd <> String.length s then
-+ failwith "error while writing";
-+ in
-+
-+ let info = domain_getinfo xch domid in
-+
-+ let nrpages = info.total_memory_pages in
-+ let ctxt = Array.make info.max_vcpu_id None in
-+ let nr_vcpus = ref 0 in
-+ for i = 0 to info.max_vcpu_id - 1
-+ do
-+ ctxt.(i) <- try
-+ let v = vcpu_context_get xch domid i in
-+ incr nr_vcpus;
-+ Some v
-+ with _ -> None
-+ done;
-+
-+ (* FIXME page offset if not rounded to sup *)
-+ let page_offset =
-+ Int64.add
-+ (Int64.of_int (sizeof_core_header () +
-+ (sizeof_vcpu_guest_context () * !nr_vcpus)))
-+ (Int64.of_nativeint (
-+ Nativeint.mul
-+ (Nativeint.of_int (sizeof_xen_pfn ()))
-+ nrpages)
-+ )
-+ in
-+
-+ let header = {
-+ xch_magic = if info.hvm_guest then Magic_hvm else Magic_pv;
-+ xch_nr_vcpus = !nr_vcpus;
-+ xch_nr_pages = nrpages;
-+ xch_ctxt_offset = Int64.of_int (sizeof_core_header ());
-+ xch_index_offset = Int64.of_int (sizeof_core_header ()
-+ + sizeof_vcpu_guest_context ());
-+ xch_pages_offset = page_offset;
-+ } in
-+
-+ dump (marshall_core_header header);
-+ for i = 0 to info.max_vcpu_id - 1
-+ do
-+ match ctxt.(i) with
-+ | None -> ()
-+ | Some ctxt_i -> dump ctxt_i
-+ done;
-+ let pfns = domain_get_pfn_list xch domid nrpages in
-+ if Array.length pfns <> Nativeint.to_int nrpages then
-+ failwith "could not get the page frame list";
-+
-+ let page_size = Xenmmap.getpagesize () in
-+ for i = 0 to Nativeint.to_int nrpages - 1
-+ do
-+ let page = map_foreign_range xch domid page_size pfns.(i) in
-+ let data = Xenmmap.read page 0 page_size in
-+ Xenmmap.unmap page;
-+ dump data
-+ done
-+
-+(* ** Misc ** *)
-+
-+(**
-+ Convert the given number of pages to an amount in KiB, rounded up.
-+ *)
-+external pages_to_kib : int64 -> int64 = "stub_pages_to_kib"
-+let pages_to_mib pages = Int64.div (pages_to_kib pages) 1024L
-+
-+let _ = Callback.register_exception "xc.error" (Error "register_callback")
---- /dev/null
-+++ b/tools/ocaml/libs/xc/xenctrl.mli
-@@ -0,0 +1,184 @@
-+(*
-+ * Copyright (C) 2006-2007 XenSource Ltd.
-+ * Copyright (C) 2008 Citrix Ltd.
-+ * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License as published
-+ * by the Free Software Foundation; version 2.1 only. with the special
-+ * exception on linking described in file LICENSE.
-+ *
-+ * 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 Lesser General Public License for more details.
-+ *)
-+
-+type domid = int
-+type vcpuinfo = {
-+ online : bool;
-+ blocked : bool;
-+ running : bool;
-+ cputime : int64;
-+ cpumap : int32;
-+}
-+type domaininfo = {
-+ domid : domid;
-+ dying : bool;
-+ shutdown : bool;
-+ paused : bool;
-+ blocked : bool;
-+ running : bool;
-+ hvm_guest : bool;
-+ shutdown_code : int;
-+ total_memory_pages : nativeint;
-+ max_memory_pages : nativeint;
-+ shared_info_frame : int64;
-+ cpu_time : int64;
-+ nr_online_vcpus : int;
-+ max_vcpu_id : int;
-+ ssidref : int32;
-+ handle : int array;
-+}
-+type sched_control = { weight : int; cap : int; }
-+type physinfo_cap_flag = CAP_HVM | CAP_DirectIO
-+type physinfo = {
-+ threads_per_core : int;
-+ cores_per_socket : int;
-+ nr_cpus : int;
-+ max_node_id : int;
-+ cpu_khz : int;
-+ total_pages : nativeint;
-+ free_pages : nativeint;
-+ scrub_pages : nativeint;
-+ capabilities : physinfo_cap_flag list;
-+}
-+type version = { major : int; minor : int; extra : string; }
-+type compile_info = {
-+ compiler : string;
-+ compile_by : string;
-+ compile_domain : string;
-+ compile_date : string;
-+}
-+type shutdown_reason = Poweroff | Reboot | Suspend | Crash | Halt
-+
-+type domain_create_flag = CDF_HVM | CDF_HAP
-+
-+exception Error of string
-+type handle
-+external sizeof_core_header : unit -> int = "stub_sizeof_core_header"
-+external sizeof_vcpu_guest_context : unit -> int
-+ = "stub_sizeof_vcpu_guest_context"
-+external sizeof_xen_pfn : unit -> int = "stub_sizeof_xen_pfn"
-+external interface_open : unit -> handle = "stub_xc_interface_open"
-+external is_fake : unit -> bool = "stub_xc_interface_is_fake"
-+external interface_close : handle -> unit = "stub_xc_interface_close"
-+val with_intf : (handle -> 'a) -> 'a
-+external _domain_create : handle -> int32 -> domain_create_flag list -> int array -> domid
-+ = "stub_xc_domain_create"
-+val domain_create : handle -> int32 -> domain_create_flag list -> 'a Uuid.t -> domid
-+external _domain_sethandle : handle -> domid -> int array -> unit
-+ = "stub_xc_domain_sethandle"
-+val domain_sethandle : handle -> domid -> 'a Uuid.t -> unit
-+external domain_max_vcpus : handle -> domid -> int -> unit
-+ = "stub_xc_domain_max_vcpus"
-+external domain_pause : handle -> domid -> unit = "stub_xc_domain_pause"
-+external domain_unpause : handle -> domid -> unit = "stub_xc_domain_unpause"
-+external domain_resume_fast : handle -> domid -> unit
-+ = "stub_xc_domain_resume_fast"
-+external domain_destroy : handle -> domid -> unit = "stub_xc_domain_destroy"
-+external domain_shutdown : handle -> domid -> shutdown_reason -> unit
-+ = "stub_xc_domain_shutdown"
-+external _domain_getinfolist : handle -> domid -> int -> domaininfo list
-+ = "stub_xc_domain_getinfolist"
-+val domain_getinfolist : handle -> domid -> domaininfo list
-+external domain_getinfo : handle -> domid -> domaininfo
-+ = "stub_xc_domain_getinfo"
-+external domain_get_vcpuinfo : handle -> int -> int -> vcpuinfo
-+ = "stub_xc_vcpu_getinfo"
-+external domain_ioport_permission: handle -> domid -> int -> int -> bool -> unit
-+ = "stub_xc_domain_ioport_permission"
-+external domain_iomem_permission: handle -> domid -> nativeint -> nativeint -> bool -> unit
-+ = "stub_xc_domain_iomem_permission"
-+external domain_irq_permission: handle -> domid -> int -> bool -> unit
-+ = "stub_xc_domain_irq_permission"
-+external vcpu_affinity_set : handle -> domid -> int -> bool array -> unit
-+ = "stub_xc_vcpu_setaffinity"
-+external vcpu_affinity_get : handle -> domid -> int -> bool array
-+ = "stub_xc_vcpu_getaffinity"
-+external vcpu_context_get : handle -> domid -> int -> string
-+ = "stub_xc_vcpu_context_get"
-+external sched_id : handle -> int = "stub_xc_sched_id"
-+external sched_credit_domain_set : handle -> domid -> sched_control -> unit
-+ = "stub_sched_credit_domain_set"
-+external sched_credit_domain_get : handle -> domid -> sched_control
-+ = "stub_sched_credit_domain_get"
-+external shadow_allocation_set : handle -> domid -> int -> unit
-+ = "stub_shadow_allocation_set"
-+external shadow_allocation_get : handle -> domid -> int
-+ = "stub_shadow_allocation_get"
-+external evtchn_alloc_unbound : handle -> domid -> domid -> int
-+ = "stub_xc_evtchn_alloc_unbound"
-+external evtchn_reset : handle -> domid -> unit = "stub_xc_evtchn_reset"
-+external readconsolering : handle -> string = "stub_xc_readconsolering"
-+external send_debug_keys : handle -> string -> unit = "stub_xc_send_debug_keys"
-+external physinfo : handle -> physinfo = "stub_xc_physinfo"
-+external pcpu_info: handle -> int -> int64 array = "stub_xc_pcpu_info"
-+external domain_setmaxmem : handle -> domid -> int64 -> unit
-+ = "stub_xc_domain_setmaxmem"
-+external domain_set_memmap_limit : handle -> domid -> int64 -> unit
-+ = "stub_xc_domain_set_memmap_limit"
-+external domain_memory_increase_reservation :
-+ handle -> domid -> int64 -> unit
-+ = "stub_xc_domain_memory_increase_reservation"
-+external map_foreign_range :
-+ handle -> domid -> int -> nativeint -> Xenmmap.mmap_interface
-+ = "stub_map_foreign_range"
-+external domain_get_pfn_list :
-+ handle -> domid -> nativeint -> nativeint array
-+ = "stub_xc_domain_get_pfn_list"
-+
-+external domain_assign_device: handle -> domid -> (int * int * int * int) -> unit
-+ = "stub_xc_domain_assign_device"
-+external domain_deassign_device: handle -> domid -> (int * int * int * int) -> unit
-+ = "stub_xc_domain_deassign_device"
-+external domain_test_assign_device: handle -> domid -> (int * int * int * int) -> bool
-+ = "stub_xc_domain_test_assign_device"
-+
-+external version : handle -> version = "stub_xc_version_version"
-+external version_compile_info : handle -> compile_info
-+ = "stub_xc_version_compile_info"
-+external version_changeset : handle -> string = "stub_xc_version_changeset"
-+external version_capabilities : handle -> string
-+ = "stub_xc_version_capabilities"
-+type core_magic = Magic_hvm | Magic_pv
-+type core_header = {
-+ xch_magic : core_magic;
-+ xch_nr_vcpus : int;
-+ xch_nr_pages : nativeint;
-+ xch_index_offset : int64;
-+ xch_ctxt_offset : int64;
-+ xch_pages_offset : int64;
-+}
-+external marshall_core_header : core_header -> string
-+ = "stub_marshall_core_header"
-+val coredump : handle -> domid -> Unix.file_descr -> unit
-+external pages_to_kib : int64 -> int64 = "stub_pages_to_kib"
-+val pages_to_mib : int64 -> int64
-+external watchdog : handle -> int -> int32 -> int
-+ = "stub_xc_watchdog"
-+
-+external domain_set_machine_address_size: handle -> domid -> int -> unit
-+ = "stub_xc_domain_set_machine_address_size"
-+external domain_get_machine_address_size: handle -> domid -> int
-+ = "stub_xc_domain_get_machine_address_size"
-+
-+external domain_cpuid_set: handle -> domid -> (int64 * (int64 option))
-+ -> string option array
-+ -> string option array
-+ = "stub_xc_domain_cpuid_set"
-+external domain_cpuid_apply_policy: handle -> domid -> unit
-+ = "stub_xc_domain_cpuid_apply_policy"
-+external cpuid_check: handle -> (int64 * (int64 option)) -> string option array -> (bool * string option array)
-+ = "stub_xc_cpuid_check"
-+
---- /dev/null
-+++ b/tools/ocaml/libs/xc/xenctrl_stubs.c
-@@ -0,0 +1,1161 @@
-+/*
-+ * Copyright (C) 2006-2007 XenSource Ltd.
-+ * Copyright (C) 2008 Citrix Ltd.
-+ * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License as published
-+ * by the Free Software Foundation; version 2.1 only. with the special
-+ * exception on linking described in file LICENSE.
-+ *
-+ * 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 Lesser General Public License for more details.
-+ */
-+
-+#define _XOPEN_SOURCE 600
-+#include <stdlib.h>
-+#include <errno.h>
-+
-+#define CAML_NAME_SPACE
-+#include <caml/alloc.h>
-+#include <caml/memory.h>
-+#include <caml/signals.h>
-+#include <caml/fail.h>
-+#include <caml/callback.h>
-+
-+#include <sys/mman.h>
-+#include <stdint.h>
-+#include <string.h>
-+
-+#include <xenctrl.h>
-+
-+#include "mmap_stubs.h"
-+
-+#define PAGE_SHIFT 12
-+#define PAGE_SIZE (1UL << PAGE_SHIFT)
-+#define PAGE_MASK (~(PAGE_SIZE-1))
-+
-+#define _H(__h) ((xc_interface *)(__h))
-+#define _D(__d) ((uint32_t)Int_val(__d))
-+
-+#define Val_none (Val_int(0))
-+
-+#define string_of_option_array(array, index) \
-+ ((Field(array, index) == Val_none) ? NULL : String_val(Field(Field(array, index), 0)))
-+
-+/* maybe here we should check the range of the input instead of blindly
-+ * casting it to uint32 */
-+#define cpuid_input_of_val(i1, i2, input) \
-+ i1 = (uint32_t) Int64_val(Field(input, 0)); \
-+ i2 = ((Field(input, 1) == Val_none) ? 0xffffffff : (uint32_t) Int64_val(Field(Field(input, 1), 0)));
-+
-+#define ERROR_STRLEN 1024
-+void failwith_xc(xc_interface *xch)
-+{
-+ static char error_str[ERROR_STRLEN];
-+ if (xch) {
-+ const xc_error *error = xc_get_last_error(xch);
-+ if (error->code == XC_ERROR_NONE)
-+ snprintf(error_str, ERROR_STRLEN, "%d: %s", errno, strerror(errno));
-+ else
-+ snprintf(error_str, ERROR_STRLEN, "%d: %s: %s",
-+ error->code,
-+ xc_error_code_to_desc(error->code),
-+ error->message);
-+ } else {
-+ snprintf(error_str, ERROR_STRLEN, "Unable to open XC interface");
-+ }
-+ caml_raise_with_string(*caml_named_value("xc.error"), error_str);
-+}
-+
-+CAMLprim value stub_sizeof_core_header(value unit)
-+{
-+ CAMLparam1(unit);
-+ CAMLreturn(Val_int(sizeof(struct xc_core_header)));
-+}
-+
-+CAMLprim value stub_sizeof_vcpu_guest_context(value unit)
-+{
-+ CAMLparam1(unit);
-+ CAMLreturn(Val_int(sizeof(struct vcpu_guest_context)));
-+}
-+
-+CAMLprim value stub_sizeof_xen_pfn(value unit)
-+{
-+ CAMLparam1(unit);
-+ CAMLreturn(Val_int(sizeof(xen_pfn_t)));
-+}
-+
-+#define XC_CORE_MAGIC 0xF00FEBED
-+#define XC_CORE_MAGIC_HVM 0xF00FEBEE
-+
-+CAMLprim value stub_marshall_core_header(value header)
-+{
-+ CAMLparam1(header);
-+ CAMLlocal1(s);
-+ struct xc_core_header c_header;
-+
-+ c_header.xch_magic = (Field(header, 0))
-+ ? XC_CORE_MAGIC
-+ : XC_CORE_MAGIC_HVM;
-+ c_header.xch_nr_vcpus = Int_val(Field(header, 1));
-+ c_header.xch_nr_pages = Nativeint_val(Field(header, 2));
-+ c_header.xch_ctxt_offset = Int64_val(Field(header, 3));
-+ c_header.xch_index_offset = Int64_val(Field(header, 4));
-+ c_header.xch_pages_offset = Int64_val(Field(header, 5));
-+
-+ s = caml_alloc_string(sizeof(c_header));
-+ memcpy(String_val(s), (char *) &c_header, sizeof(c_header));
-+ CAMLreturn(s);
-+}
-+
-+CAMLprim value stub_xc_interface_open(void)
-+{
-+ CAMLparam0();
-+ xc_interface *xch;
-+ xch = xc_interface_open(NULL, NULL, XC_OPENFLAG_NON_REENTRANT);
-+ if (xch == NULL)
-+ failwith_xc(NULL);
-+ CAMLreturn((value)xch);
-+}
-+
-+
-+CAMLprim value stub_xc_interface_is_fake(void)
-+{
-+ CAMLparam0();
-+ int is_fake = xc_interface_is_fake();
-+ CAMLreturn(Val_int(is_fake));
-+}
-+
-+CAMLprim value stub_xc_interface_close(value xch)
-+{
-+ CAMLparam1(xch);
-+
-+ // caml_enter_blocking_section();
-+ xc_interface_close(_H(xch));
-+ // caml_leave_blocking_section();
-+
-+ CAMLreturn(Val_unit);
-+}
-+
-+static int domain_create_flag_table[] = {
-+ XEN_DOMCTL_CDF_hvm_guest,
-+ XEN_DOMCTL_CDF_hap,
-+};
-+
-+CAMLprim value stub_xc_domain_create(value xch, value ssidref,
-+ value flags, value handle)
-+{
-+ CAMLparam4(xch, ssidref, flags, handle);
-+
-+ uint32_t domid = 0;
-+ xen_domain_handle_t h = { 0 };
-+ int result;
-+ int i;
-+ uint32_t c_ssidref = Int32_val(ssidref);
-+ unsigned int c_flags = 0;
-+ value l;
-+
-+ if (Wosize_val(handle) != 16)
-+ caml_invalid_argument("Handle not a 16-integer array");
-+
-+ for (i = 0; i < sizeof(h); i++) {
-+ h[i] = Int_val(Field(handle, i)) & 0xff;
-+ }
-+
-+ for (l = flags; l != Val_none; l = Field(l, 1)) {
-+ int v = Int_val(Field(l, 0));
-+ c_flags |= domain_create_flag_table[v];
-+ }
-+
-+ // caml_enter_blocking_section();
-+ result = xc_domain_create(_H(xch), c_ssidref, h, c_flags, &domid);
-+ // caml_leave_blocking_section();
-+
-+ if (result < 0)
-+ failwith_xc(_H(xch));
-+
-+ CAMLreturn(Val_int(domid));
-+}
-+
-+CAMLprim value stub_xc_domain_max_vcpus(value xch, value domid,
-+ value max_vcpus)
-+{
-+ CAMLparam3(xch, domid, max_vcpus);
-+ int r;
-+
-+ r = xc_domain_max_vcpus(_H(xch), _D(domid), Int_val(max_vcpus));
-+ if (r)
-+ failwith_xc(_H(xch));
-+
-+ CAMLreturn(Val_unit);
-+}
-+
-+
-+value stub_xc_domain_sethandle(value xch, value domid, value handle)
-+{
-+ CAMLparam3(xch, domid, handle);
-+ xen_domain_handle_t h = { 0 };
-+ int i;
-+
-+ if (Wosize_val(handle) != 16)
-+ caml_invalid_argument("Handle not a 16-integer array");
-+
-+ for (i = 0; i < sizeof(h); i++) {
-+ h[i] = Int_val(Field(handle, i)) & 0xff;
-+ }
-+
-+ i = xc_domain_sethandle(_H(xch), _D(domid), h);
-+ if (i)
-+ failwith_xc(_H(xch));
-+
-+ CAMLreturn(Val_unit);
-+}
-+
-+static value dom_op(value xch, value domid, int (*fn)(xc_interface *, uint32_t))
-+{
-+ CAMLparam2(xch, domid);
-+
-+ uint32_t c_domid = _D(domid);
-+
-+ // caml_enter_blocking_section();
-+ int result = fn(_H(xch), c_domid);
-+ // caml_leave_blocking_section();
-+ if (result)
-+ failwith_xc(_H(xch));
-+ CAMLreturn(Val_unit);
-+}
-+
-+CAMLprim value stub_xc_domain_pause(value xch, value domid)
-+{
-+ return dom_op(xch, domid, xc_domain_pause);
-+}
-+
-+
-+CAMLprim value stub_xc_domain_unpause(value xch, value domid)
-+{
-+ return dom_op(xch, domid, xc_domain_unpause);
-+}
-+
-+CAMLprim value stub_xc_domain_destroy(value xch, value domid)
-+{
-+ return dom_op(xch, domid, xc_domain_destroy);
-+}
-+
-+CAMLprim value stub_xc_domain_resume_fast(value xch, value domid)
-+{
-+ CAMLparam2(xch, domid);
-+
-+ uint32_t c_domid = _D(domid);
-+
-+ // caml_enter_blocking_section();
-+ int result = xc_domain_resume(_H(xch), c_domid, 1);
-+ // caml_leave_blocking_section();
-+ if (result)
-+ failwith_xc(_H(xch));
-+ CAMLreturn(Val_unit);
-+}
-+
-+CAMLprim value stub_xc_domain_shutdown(value xch, value domid, value reason)
-+{
-+ CAMLparam3(xch, domid, reason);
-+ int ret;
-+
-+ ret = xc_domain_shutdown(_H(xch), _D(domid), Int_val(reason));
-+ if (ret < 0)
-+ failwith_xc(_H(xch));
-+
-+ CAMLreturn(Val_unit);
-+}
-+
-+static value alloc_domaininfo(xc_domaininfo_t * info)
-+{
-+ CAMLparam0();
-+ CAMLlocal2(result, tmp);
-+ int i;
-+
-+ result = caml_alloc_tuple(16);
-+
-+ Store_field(result, 0, Val_int(info->domain));
-+ Store_field(result, 1, Val_bool(info->flags & XEN_DOMINF_dying));
-+ Store_field(result, 2, Val_bool(info->flags & XEN_DOMINF_shutdown));
-+ Store_field(result, 3, Val_bool(info->flags & XEN_DOMINF_paused));
-+ Store_field(result, 4, Val_bool(info->flags & XEN_DOMINF_blocked));
-+ Store_field(result, 5, Val_bool(info->flags & XEN_DOMINF_running));
-+ Store_field(result, 6, Val_bool(info->flags & XEN_DOMINF_hvm_guest));
-+ Store_field(result, 7, Val_int((info->flags >> XEN_DOMINF_shutdownshift)
-+ & XEN_DOMINF_shutdownmask));
-+ Store_field(result, 8, caml_copy_nativeint(info->tot_pages));
-+ Store_field(result, 9, caml_copy_nativeint(info->max_pages));
-+ Store_field(result, 10, caml_copy_int64(info->shared_info_frame));
-+ Store_field(result, 11, caml_copy_int64(info->cpu_time));
-+ Store_field(result, 12, Val_int(info->nr_online_vcpus));
-+ Store_field(result, 13, Val_int(info->max_vcpu_id));
-+ Store_field(result, 14, caml_copy_int32(info->ssidref));
-+
-+ tmp = caml_alloc_small(16, 0);
-+ for (i = 0; i < 16; i++) {
-+ Field(tmp, i) = Val_int(info->handle[i]);
-+ }
-+
-+ Store_field(result, 15, tmp);
-+
-+ CAMLreturn(result);
-+}
-+
-+CAMLprim value stub_xc_domain_getinfolist(value xch, value first_domain, value nb)
-+{
-+ CAMLparam3(xch, first_domain, nb);
-+ CAMLlocal2(result, temp);
-+ xc_domaininfo_t * info;
-+ int i, ret, toalloc, retval;
-+ unsigned int c_max_domains;
-+ uint32_t c_first_domain;
-+
-+ /* get the minimum number of allocate byte we need and bump it up to page boundary */
-+ toalloc = (sizeof(xc_domaininfo_t) * Int_val(nb)) | 0xfff;
-+ ret = posix_memalign((void **) ((void *) &info), 4096, toalloc);
-+ if (ret)
-+ caml_raise_out_of_memory();
-+
-+ result = temp = Val_emptylist;
-+
-+ c_first_domain = _D(first_domain);
-+ c_max_domains = Int_val(nb);
-+ // caml_enter_blocking_section();
-+ retval = xc_domain_getinfolist(_H(xch), c_first_domain,
-+ c_max_domains, info);
-+ // caml_leave_blocking_section();
-+
-+ if (retval < 0) {
-+ free(info);
-+ failwith_xc(_H(xch));
-+ }
-+ for (i = 0; i < retval; i++) {
-+ result = caml_alloc_small(2, Tag_cons);
-+ Field(result, 0) = Val_int(0);
-+ Field(result, 1) = temp;
-+ temp = result;
-+
-+ Store_field(result, 0, alloc_domaininfo(info + i));
-+ }
-+
-+ free(info);
-+ CAMLreturn(result);
-+}
-+
-+CAMLprim value stub_xc_domain_getinfo(value xch, value domid)
-+{
-+ CAMLparam2(xch, domid);
-+ CAMLlocal1(result);
-+ xc_domaininfo_t info;
-+ int ret;
-+
-+ ret = xc_domain_getinfolist(_H(xch), _D(domid), 1, &info);
-+ if (ret != 1)
-+ failwith_xc(_H(xch));
-+ if (info.domain != _D(domid))
-+ failwith_xc(_H(xch));
-+
-+ result = alloc_domaininfo(&info);
-+ CAMLreturn(result);
-+}
-+
-+CAMLprim value stub_xc_vcpu_getinfo(value xch, value domid, value vcpu)
-+{
-+ CAMLparam3(xch, domid, vcpu);
-+ CAMLlocal1(result);
-+ xc_vcpuinfo_t info;
-+ int retval;
-+
-+ uint32_t c_domid = _D(domid);
-+ uint32_t c_vcpu = Int_val(vcpu);
-+ // caml_enter_blocking_section();
-+ retval = xc_vcpu_getinfo(_H(xch), c_domid,
-+ c_vcpu, &info);
-+ // caml_leave_blocking_section();
-+ if (retval < 0)
-+ failwith_xc(_H(xch));
-+
-+ result = caml_alloc_tuple(5);
-+ Store_field(result, 0, Val_bool(info.online));
-+ Store_field(result, 1, Val_bool(info.blocked));
-+ Store_field(result, 2, Val_bool(info.running));
-+ Store_field(result, 3, caml_copy_int64(info.cpu_time));
-+ Store_field(result, 4, caml_copy_int32(info.cpu));
-+
-+ CAMLreturn(result);
-+}
-+
-+CAMLprim value stub_xc_vcpu_context_get(value xch, value domid,
-+ value cpu)
-+{
-+ CAMLparam3(xch, domid, cpu);
-+ CAMLlocal1(context);
-+ int ret;
-+ vcpu_guest_context_any_t ctxt;
-+
-+ ret = xc_vcpu_getcontext(_H(xch), _D(domid), Int_val(cpu), &ctxt);
-+
-+ context = caml_alloc_string(sizeof(ctxt));
-+ memcpy(String_val(context), (char *) &ctxt.c, sizeof(ctxt.c));
-+
-+ CAMLreturn(context);
-+}
-+
-+static int get_cpumap_len(value xch, value cpumap)
-+{
-+ int ml_len = Wosize_val(cpumap);
-+ int xc_len = xc_get_max_cpus(_H(xch));
-+
-+ if (ml_len < xc_len)
-+ return ml_len;
-+ else
-+ return xc_len;
-+}
-+
-+CAMLprim value stub_xc_vcpu_setaffinity(value xch, value domid,
-+ value vcpu, value cpumap)
-+{
-+ CAMLparam4(xch, domid, vcpu, cpumap);
-+ int i, len = get_cpumap_len(xch, cpumap);
-+ xc_cpumap_t c_cpumap;
-+ int retval;
-+
-+ c_cpumap = xc_cpumap_alloc(_H(xch));
-+ if (c_cpumap == NULL)
-+ failwith_xc(_H(xch));
-+
-+ for (i=0; i<len; i++) {
-+ if (Bool_val(Field(cpumap, i)))
-+ c_cpumap[i/8] |= i << (i&7);
-+ }
-+ retval = xc_vcpu_setaffinity(_H(xch), _D(domid),
-+ Int_val(vcpu), c_cpumap);
-+ free(c_cpumap);
-+
-+ if (retval < 0)
-+ failwith_xc(_H(xch));
-+ CAMLreturn(Val_unit);
-+}
-+
-+CAMLprim value stub_xc_vcpu_getaffinity(value xch, value domid,
-+ value vcpu)
-+{
-+ CAMLparam3(xch, domid, vcpu);
-+ CAMLlocal1(ret);
-+ xc_cpumap_t c_cpumap;
-+ int i, len = xc_get_max_cpus(_H(xch));
-+ int retval;
-+
-+ c_cpumap = xc_cpumap_alloc(_H(xch));
-+ if (c_cpumap == NULL)
-+ failwith_xc(_H(xch));
-+
-+ retval = xc_vcpu_getaffinity(_H(xch), _D(domid),
-+ Int_val(vcpu), c_cpumap);
-+ free(c_cpumap);
-+
-+ if (retval < 0) {
-+ free(c_cpumap);
-+ failwith_xc(_H(xch));
-+ }
-+
-+ ret = caml_alloc(len, 0);
-+
-+ for (i=0; i<len; i++) {
-+ if (c_cpumap[i%8] & 1 << (i&7))
-+ Store_field(ret, i, Val_true);
-+ else
-+ Store_field(ret, i, Val_false);
-+ }
-+
-+ free(c_cpumap);
-+
-+ CAMLreturn(ret);
-+}
-+
-+CAMLprim value stub_xc_sched_id(value xch)
-+{
-+ CAMLparam1(xch);
-+ int sched_id;
-+
-+ if (xc_sched_id(_H(xch), &sched_id))
-+ failwith_xc(_H(xch));
-+ CAMLreturn(Val_int(sched_id));
-+}
-+
-+CAMLprim value stub_xc_evtchn_alloc_unbound(value xch,
-+ value local_domid,
-+ value remote_domid)
-+{
-+ CAMLparam3(xch, local_domid, remote_domid);
-+
-+ uint32_t c_local_domid = _D(local_domid);
-+ uint32_t c_remote_domid = _D(remote_domid);
-+
-+ // caml_enter_blocking_section();
-+ int result = xc_evtchn_alloc_unbound(_H(xch), c_local_domid,
-+ c_remote_domid);
-+ // caml_leave_blocking_section();
-+
-+ if (result < 0)
-+ failwith_xc(_H(xch));
-+ CAMLreturn(Val_int(result));
-+}
-+
-+CAMLprim value stub_xc_evtchn_reset(value xch, value domid)
-+{
-+ CAMLparam2(xch, domid);
-+ int r;
-+
-+ r = xc_evtchn_reset(_H(xch), _D(domid));
-+ if (r < 0)
-+ failwith_xc(_H(xch));
-+ CAMLreturn(Val_unit);
-+}
-+
-+
-+#define RING_SIZE 32768
-+static char ring[RING_SIZE];
-+
-+CAMLprim value stub_xc_readconsolering(value xch)
-+{
-+ unsigned int size = RING_SIZE;
-+ char *ring_ptr = ring;
-+
-+ CAMLparam1(xch);
-+
-+ // caml_enter_blocking_section();
-+ int retval = xc_readconsolering(_H(xch), ring_ptr, &size, 0, 0, NULL);
-+ // caml_leave_blocking_section();
-+
-+ if (retval)
-+ failwith_xc(_H(xch));
-+ ring[size] = '\0';
-+ CAMLreturn(caml_copy_string(ring));
-+}
-+
-+CAMLprim value stub_xc_send_debug_keys(value xch, value keys)
-+{
-+ CAMLparam2(xch, keys);
-+ int r;
-+
-+ r = xc_send_debug_keys(_H(xch), String_val(keys));
-+ if (r)
-+ failwith_xc(_H(xch));
-+ CAMLreturn(Val_unit);
-+}
-+
-+CAMLprim value stub_xc_physinfo(value xch)
-+{
-+ CAMLparam1(xch);
-+ CAMLlocal3(physinfo, cap_list, tmp);
-+ xc_physinfo_t c_physinfo;
-+ int r;
-+
-+ // caml_enter_blocking_section();
-+ r = xc_physinfo(_H(xch), &c_physinfo);
-+ // caml_leave_blocking_section();
-+
-+ if (r)
-+ failwith_xc(_H(xch));
-+
-+ tmp = cap_list = Val_emptylist;
-+ for (r = 0; r < 2; r++) {
-+ if ((c_physinfo.capabilities >> r) & 1) {
-+ tmp = caml_alloc_small(2, Tag_cons);
-+ Field(tmp, 0) = Val_int(r);
-+ Field(tmp, 1) = cap_list;
-+ cap_list = tmp;
-+ }
-+ }
-+
-+ physinfo = caml_alloc_tuple(9);
-+ Store_field(physinfo, 0, Val_int(c_physinfo.threads_per_core));
-+ Store_field(physinfo, 1, Val_int(c_physinfo.cores_per_socket));
-+ Store_field(physinfo, 2, Val_int(c_physinfo.nr_cpus));
-+ Store_field(physinfo, 3, Val_int(c_physinfo.max_node_id));
-+ Store_field(physinfo, 4, Val_int(c_physinfo.cpu_khz));
-+ Store_field(physinfo, 5, caml_copy_nativeint(c_physinfo.total_pages));
-+ Store_field(physinfo, 6, caml_copy_nativeint(c_physinfo.free_pages));
-+ Store_field(physinfo, 7, caml_copy_nativeint(c_physinfo.scrub_pages));
-+ Store_field(physinfo, 8, cap_list);
-+
-+ CAMLreturn(physinfo);
-+}
-+
-+CAMLprim value stub_xc_pcpu_info(value xch, value nr_cpus)
-+{
-+ CAMLparam2(xch, nr_cpus);
-+ CAMLlocal2(pcpus, v);
-+ xc_cpuinfo_t *info;
-+ int r, size;
-+
-+ if (Int_val(nr_cpus) < 1)
-+ caml_invalid_argument("nr_cpus");
-+
-+ info = calloc(Int_val(nr_cpus) + 1, sizeof(*info));
-+ if (!info)
-+ caml_raise_out_of_memory();
-+
-+ // caml_enter_blocking_section();
-+ r = xc_getcpuinfo(_H(xch), Int_val(nr_cpus), info, &size);
-+ // caml_leave_blocking_section();
-+
-+ if (r) {
-+ free(info);
-+ failwith_xc(_H(xch));
-+ }
-+
-+ if (size > 0) {
-+ int i;
-+ pcpus = caml_alloc(size, 0);
-+ for (i = 0; i < size; i++) {
-+ v = caml_copy_int64(info[i].idletime);
-+ caml_modify(&Field(pcpus, i), v);
-+ }
-+ } else
-+ pcpus = Atom(0);
-+ free(info);
-+ CAMLreturn(pcpus);
-+}
-+
-+CAMLprim value stub_xc_domain_setmaxmem(value xch, value domid,
-+ value max_memkb)
-+{
-+ CAMLparam3(xch, domid, max_memkb);
-+
-+ uint32_t c_domid = _D(domid);
-+ unsigned int c_max_memkb = Int64_val(max_memkb);
-+ // caml_enter_blocking_section();
-+ int retval = xc_domain_setmaxmem(_H(xch), c_domid,
-+ c_max_memkb);
-+ // caml_leave_blocking_section();
-+ if (retval)
-+ failwith_xc(_H(xch));
-+ CAMLreturn(Val_unit);
-+}
-+
-+CAMLprim value stub_xc_domain_set_memmap_limit(value xch, value domid,
-+ value map_limitkb)
-+{
-+ CAMLparam3(xch, domid, map_limitkb);
-+ unsigned long v;
-+ int retval;
-+
-+ v = Int64_val(map_limitkb);
-+ retval = xc_domain_set_memmap_limit(_H(xch), _D(domid), v);
-+ if (retval)
-+ failwith_xc(_H(xch));
-+
-+ CAMLreturn(Val_unit);
-+}
-+
-+CAMLprim value stub_xc_domain_memory_increase_reservation(value xch,
-+ value domid,
-+ value mem_kb)
-+{
-+ CAMLparam3(xch, domid, mem_kb);
-+
-+ unsigned long nr_extents = ((unsigned long)(Int64_val(mem_kb))) >> (PAGE_SHIFT - 10);
-+
-+ uint32_t c_domid = _D(domid);
-+ // caml_enter_blocking_section();
-+ int retval = xc_domain_increase_reservation_exact(_H(xch), c_domid,
-+ nr_extents, 0, 0, NULL);
-+ // caml_leave_blocking_section();
-+
-+ if (retval)
-+ failwith_xc(_H(xch));
-+ CAMLreturn(Val_unit);
-+}
-+
-+CAMLprim value stub_xc_domain_set_machine_address_size(value xch,
-+ value domid,
-+ value width)
-+{
-+ CAMLparam3(xch, domid, width);
-+ uint32_t c_domid = _D(domid);
-+ int c_width = Int_val(width);
-+
-+ int retval = xc_domain_set_machine_address_size(_H(xch), c_domid, c_width);
-+ if (retval)
-+ failwith_xc(_H(xch));
-+ CAMLreturn(Val_unit);
-+}
-+
-+CAMLprim value stub_xc_domain_get_machine_address_size(value xch,
-+ value domid)
-+{
-+ CAMLparam2(xch, domid);
-+ int retval;
-+
-+ retval = xc_domain_get_machine_address_size(_H(xch), _D(domid));
-+ if (retval < 0)
-+ failwith_xc(_H(xch));
-+ CAMLreturn(Val_int(retval));
-+}
-+
-+CAMLprim value stub_xc_domain_cpuid_set(value xch, value domid,
-+ value input,
-+ value config)
-+{
-+ CAMLparam4(xch, domid, input, config);
-+ CAMLlocal2(array, tmp);
-+ int r;
-+ unsigned int c_input[2];
-+ char *c_config[4], *out_config[4];
-+
-+ c_config[0] = string_of_option_array(config, 0);
-+ c_config[1] = string_of_option_array(config, 1);
-+ c_config[2] = string_of_option_array(config, 2);
-+ c_config[3] = string_of_option_array(config, 3);
-+
-+ cpuid_input_of_val(c_input[0], c_input[1], input);
-+
-+ array = caml_alloc(4, 0);
-+ for (r = 0; r < 4; r++) {
-+ tmp = Val_none;
-+ if (c_config[r]) {
-+ tmp = caml_alloc_small(1, 0);
-+ Field(tmp, 0) = caml_alloc_string(32);
-+ }
-+ Store_field(array, r, tmp);
-+ }
-+
-+ for (r = 0; r < 4; r++)
-+ out_config[r] = (c_config[r]) ? String_val(Field(Field(array, r), 0)) : NULL;
-+
-+ r = xc_cpuid_set(_H(xch), _D(domid),
-+ c_input, (const char **)c_config, out_config);
-+ if (r < 0)
-+ failwith_xc(_H(xch));
-+ CAMLreturn(array);
-+}
-+
-+CAMLprim value stub_xc_domain_cpuid_apply_policy(value xch, value domid)
-+{
-+ CAMLparam2(xch, domid);
-+ int r;
-+
-+ r = xc_cpuid_apply_policy(_H(xch), _D(domid));
-+ if (r < 0)
-+ failwith_xc(_H(xch));
-+ CAMLreturn(Val_unit);
-+}
-+
-+CAMLprim value stub_xc_cpuid_check(value xch, value input, value config)
-+{
-+ CAMLparam3(xch, input, config);
-+ CAMLlocal3(ret, array, tmp);
-+ int r;
-+ unsigned int c_input[2];
-+ char *c_config[4], *out_config[4];
-+
-+ c_config[0] = string_of_option_array(config, 0);
-+ c_config[1] = string_of_option_array(config, 1);
-+ c_config[2] = string_of_option_array(config, 2);
-+ c_config[3] = string_of_option_array(config, 3);
-+
-+ cpuid_input_of_val(c_input[0], c_input[1], input);
-+
-+ array = caml_alloc(4, 0);
-+ for (r = 0; r < 4; r++) {
-+ tmp = Val_none;
-+ if (c_config[r]) {
-+ tmp = caml_alloc_small(1, 0);
-+ Field(tmp, 0) = caml_alloc_string(32);
-+ }
-+ Store_field(array, r, tmp);
-+ }
-+
-+ for (r = 0; r < 4; r++)
-+ out_config[r] = (c_config[r]) ? String_val(Field(Field(array, r), 0)) : NULL;
-+
-+ r = xc_cpuid_check(_H(xch), c_input, (const char **)c_config, out_config);
-+ if (r < 0)
-+ failwith_xc(_H(xch));
-+
-+ ret = caml_alloc_tuple(2);
-+ Store_field(ret, 0, Val_bool(r));
-+ Store_field(ret, 1, array);
-+
-+ CAMLreturn(ret);
-+}
-+
-+CAMLprim value stub_xc_version_version(value xch)
-+{
-+ CAMLparam1(xch);
-+ CAMLlocal1(result);
-+ xen_extraversion_t extra;
-+ long packed;
-+ int retval;
-+
-+ // caml_enter_blocking_section();
-+ packed = xc_version(_H(xch), XENVER_version, NULL);
-+ retval = xc_version(_H(xch), XENVER_extraversion, &extra);
-+ // caml_leave_blocking_section();
-+
-+ if (retval)
-+ failwith_xc(_H(xch));
-+
-+ result = caml_alloc_tuple(3);
-+
-+ Store_field(result, 0, Val_int(packed >> 16));
-+ Store_field(result, 1, Val_int(packed & 0xffff));
-+ Store_field(result, 2, caml_copy_string(extra));
-+
-+ CAMLreturn(result);
-+}
-+
-+
-+CAMLprim value stub_xc_version_compile_info(value xch)
-+{
-+ CAMLparam1(xch);
-+ CAMLlocal1(result);
-+ xen_compile_info_t ci;
-+ int retval;
-+
-+ // caml_enter_blocking_section();
-+ retval = xc_version(_H(xch), XENVER_compile_info, &ci);
-+ // caml_leave_blocking_section();
-+
-+ if (retval)
-+ failwith_xc(_H(xch));
-+
-+ result = caml_alloc_tuple(4);
-+
-+ Store_field(result, 0, caml_copy_string(ci.compiler));
-+ Store_field(result, 1, caml_copy_string(ci.compile_by));
-+ Store_field(result, 2, caml_copy_string(ci.compile_domain));
-+ Store_field(result, 3, caml_copy_string(ci.compile_date));
-+
-+ CAMLreturn(result);
-+}
-+
-+
-+static value xc_version_single_string(value xch, int code, void *info)
-+{
-+ CAMLparam1(xch);
-+ int retval;
-+
-+ // caml_enter_blocking_section();
-+ retval = xc_version(_H(xch), code, info);
-+ // caml_leave_blocking_section();
-+
-+ if (retval)
-+ failwith_xc(_H(xch));
-+
-+ CAMLreturn(caml_copy_string((char *)info));
-+}
-+
-+
-+CAMLprim value stub_xc_version_changeset(value xch)
-+{
-+ xen_changeset_info_t ci;
-+
-+ return xc_version_single_string(xch, XENVER_changeset, &ci);
-+}
-+
-+
-+CAMLprim value stub_xc_version_capabilities(value xch)
-+{
-+ xen_capabilities_info_t ci;
-+
-+ return xc_version_single_string(xch, XENVER_capabilities, &ci);
-+}
-+
-+
-+CAMLprim value stub_pages_to_kib(value pages)
-+{
-+ CAMLparam1(pages);
-+
-+ CAMLreturn(caml_copy_int64(Int64_val(pages) << (PAGE_SHIFT - 10)));
-+}
-+
-+
-+CAMLprim value stub_map_foreign_range(value xch, value dom,
-+ value size, value mfn)
-+{
-+ CAMLparam4(xch, dom, size, mfn);
-+ CAMLlocal1(result);
-+ struct mmap_interface *intf;
-+ uint32_t c_dom;
-+ unsigned long c_mfn;
-+
-+ result = caml_alloc(sizeof(struct mmap_interface), Abstract_tag);
-+ intf = (struct mmap_interface *) result;
-+
-+ intf->len = Int_val(size);
-+
-+ c_dom = _D(dom);
-+ c_mfn = Nativeint_val(mfn);
-+ // caml_enter_blocking_section();
-+ intf->addr = xc_map_foreign_range(_H(xch), c_dom,
-+ intf->len, PROT_READ|PROT_WRITE,
-+ c_mfn);
-+ // caml_leave_blocking_section();
-+ if (!intf->addr)
-+ caml_failwith("xc_map_foreign_range error");
-+ CAMLreturn(result);
-+}
-+
-+CAMLprim value stub_sched_credit_domain_get(value xch, value domid)
-+{
-+ CAMLparam2(xch, domid);
-+ CAMLlocal1(sdom);
-+ struct xen_domctl_sched_credit c_sdom;
-+ int ret;
-+
-+ // caml_enter_blocking_section();
-+ ret = xc_sched_credit_domain_get(_H(xch), _D(domid), &c_sdom);
-+ // caml_leave_blocking_section();
-+ if (ret != 0)
-+ failwith_xc(_H(xch));
-+
-+ sdom = caml_alloc_tuple(2);
-+ Store_field(sdom, 0, Val_int(c_sdom.weight));
-+ Store_field(sdom, 1, Val_int(c_sdom.cap));
-+
-+ CAMLreturn(sdom);
-+}
-+
-+CAMLprim value stub_sched_credit_domain_set(value xch, value domid,
-+ value sdom)
-+{
-+ CAMLparam3(xch, domid, sdom);
-+ struct xen_domctl_sched_credit c_sdom;
-+ int ret;
-+
-+ c_sdom.weight = Int_val(Field(sdom, 0));
-+ c_sdom.cap = Int_val(Field(sdom, 1));
-+ // caml_enter_blocking_section();
-+ ret = xc_sched_credit_domain_set(_H(xch), _D(domid), &c_sdom);
-+ // caml_leave_blocking_section();
-+ if (ret != 0)
-+ failwith_xc(_H(xch));
-+
-+ CAMLreturn(Val_unit);
-+}
-+
-+CAMLprim value stub_shadow_allocation_get(value xch, value domid)
-+{
-+ CAMLparam2(xch, domid);
-+ CAMLlocal1(mb);
-+ unsigned long c_mb;
-+ int ret;
-+
-+ // caml_enter_blocking_section();
-+ ret = xc_shadow_control(_H(xch), _D(domid),
-+ XEN_DOMCTL_SHADOW_OP_GET_ALLOCATION,
-+ NULL, 0, &c_mb, 0, NULL);
-+ // caml_leave_blocking_section();
-+ if (ret != 0)
-+ failwith_xc(_H(xch));
-+
-+ mb = Val_int(c_mb);
-+ CAMLreturn(mb);
-+}
-+
-+CAMLprim value stub_shadow_allocation_set(value xch, value domid,
-+ value mb)
-+{
-+ CAMLparam3(xch, domid, mb);
-+ unsigned long c_mb;
-+ int ret;
-+
-+ c_mb = Int_val(mb);
-+ // caml_enter_blocking_section();
-+ ret = xc_shadow_control(_H(xch), _D(domid),
-+ XEN_DOMCTL_SHADOW_OP_SET_ALLOCATION,
-+ NULL, 0, &c_mb, 0, NULL);
-+ // caml_leave_blocking_section();
-+ if (ret != 0)
-+ failwith_xc(_H(xch));
-+
-+ CAMLreturn(Val_unit);
-+}
-+
-+CAMLprim value stub_xc_domain_get_pfn_list(value xch, value domid,
-+ value nr_pfns)
-+{
-+ CAMLparam3(xch, domid, nr_pfns);
-+ CAMLlocal2(array, v);
-+ unsigned long c_nr_pfns;
-+ long ret, i;
-+ uint64_t *c_array;
-+
-+ c_nr_pfns = Nativeint_val(nr_pfns);
-+
-+ c_array = malloc(sizeof(uint64_t) * c_nr_pfns);
-+ if (!c_array)
-+ caml_raise_out_of_memory();
-+
-+ ret = xc_get_pfn_list(_H(xch), _D(domid),
-+ c_array, c_nr_pfns);
-+ if (ret < 0) {
-+ free(c_array);
-+ failwith_xc(_H(xch));
-+ }
-+
-+ array = caml_alloc(ret, 0);
-+ for (i = 0; i < ret; i++) {
-+ v = caml_copy_nativeint(c_array[i]);
-+ Store_field(array, i, v);
-+ }
-+ free(c_array);
-+
-+ CAMLreturn(array);
-+}
-+
-+CAMLprim value stub_xc_domain_ioport_permission(value xch, value domid,
-+ value start_port, value nr_ports,
-+ value allow)
-+{
-+ CAMLparam5(xch, domid, start_port, nr_ports, allow);
-+ uint32_t c_start_port, c_nr_ports;
-+ uint8_t c_allow;
-+ int ret;
-+
-+ c_start_port = Int_val(start_port);
-+ c_nr_ports = Int_val(nr_ports);
-+ c_allow = Bool_val(allow);
-+
-+ ret = xc_domain_ioport_permission(_H(xch), _D(domid),
-+ c_start_port, c_nr_ports, c_allow);
-+ if (ret < 0)
-+ failwith_xc(_H(xch));
-+
-+ CAMLreturn(Val_unit);
-+}
-+
-+CAMLprim value stub_xc_domain_iomem_permission(value xch, value domid,
-+ value start_pfn, value nr_pfns,
-+ value allow)
-+{
-+ CAMLparam5(xch, domid, start_pfn, nr_pfns, allow);
-+ unsigned long c_start_pfn, c_nr_pfns;
-+ uint8_t c_allow;
-+ int ret;
-+
-+ c_start_pfn = Nativeint_val(start_pfn);
-+ c_nr_pfns = Nativeint_val(nr_pfns);
-+ c_allow = Bool_val(allow);
-+
-+ ret = xc_domain_iomem_permission(_H(xch), _D(domid),
-+ c_start_pfn, c_nr_pfns, c_allow);
-+ if (ret < 0)
-+ failwith_xc(_H(xch));
-+
-+ CAMLreturn(Val_unit);
-+}
-+
-+CAMLprim value stub_xc_domain_irq_permission(value xch, value domid,
-+ value pirq, value allow)
-+{
-+ CAMLparam4(xch, domid, pirq, allow);
-+ uint8_t c_pirq;
-+ uint8_t c_allow;
-+ int ret;
-+
-+ c_pirq = Int_val(pirq);
-+ c_allow = Bool_val(allow);
-+
-+ ret = xc_domain_irq_permission(_H(xch), _D(domid),
-+ c_pirq, c_allow);
-+ if (ret < 0)
-+ failwith_xc(_H(xch));
-+
-+ CAMLreturn(Val_unit);
-+}
-+
-+static uint32_t pci_dev_to_bdf(int domain, int bus, int slot, int func)
-+{
-+ uint32_t bdf = 0;
-+ bdf |= (bus & 0xff) << 16;
-+ bdf |= (slot & 0x1f) << 11;
-+ bdf |= (func & 0x7) << 8;
-+ return bdf;
-+}
-+
-+CAMLprim value stub_xc_domain_test_assign_device(value xch, value domid, value desc)
-+{
-+ CAMLparam3(xch, domid, desc);
-+ int ret;
-+ int domain, bus, slot, func;
-+ uint32_t bdf;
-+
-+ domain = Int_val(Field(desc, 0));
-+ bus = Int_val(Field(desc, 1));
-+ slot = Int_val(Field(desc, 2));
-+ func = Int_val(Field(desc, 3));
-+ bdf = pci_dev_to_bdf(domain, bus, slot, func);
-+
-+ ret = xc_test_assign_device(_H(xch), _D(domid), bdf);
-+
-+ CAMLreturn(Val_bool(ret == 0));
-+}
-+
-+CAMLprim value stub_xc_domain_assign_device(value xch, value domid, value desc)
-+{
-+ CAMLparam3(xch, domid, desc);
-+ int ret;
-+ int domain, bus, slot, func;
-+ uint32_t bdf;
-+
-+ domain = Int_val(Field(desc, 0));
-+ bus = Int_val(Field(desc, 1));
-+ slot = Int_val(Field(desc, 2));
-+ func = Int_val(Field(desc, 3));
-+ bdf = pci_dev_to_bdf(domain, bus, slot, func);
-+
-+ ret = xc_assign_device(_H(xch), _D(domid), bdf);
-+
-+ if (ret < 0)
-+ failwith_xc(_H(xch));
-+ CAMLreturn(Val_unit);
-+}
-+
-+CAMLprim value stub_xc_domain_deassign_device(value xch, value domid, value desc)
-+{
-+ CAMLparam3(xch, domid, desc);
-+ int ret;
-+ int domain, bus, slot, func;
-+ uint32_t bdf;
-+
-+ domain = Int_val(Field(desc, 0));
-+ bus = Int_val(Field(desc, 1));
-+ slot = Int_val(Field(desc, 2));
-+ func = Int_val(Field(desc, 3));
-+ bdf = pci_dev_to_bdf(domain, bus, slot, func);
-+
-+ ret = xc_deassign_device(_H(xch), _D(domid), bdf);
-+
-+ if (ret < 0)
-+ failwith_xc(_H(xch));
-+ CAMLreturn(Val_unit);
-+}
-+
-+CAMLprim value stub_xc_watchdog(value xch, value domid, value timeout)
-+{
-+ CAMLparam3(xch, domid, timeout);
-+ int ret;
-+ unsigned int c_timeout = Int32_val(timeout);
-+
-+ ret = xc_watchdog(_H(xch), _D(domid), c_timeout);
-+ if (ret < 0)
-+ failwith_xc(_H(xch));
-+
-+ CAMLreturn(Val_int(ret));
-+}
-+
-+/*
-+ * Local variables:
-+ * indent-tabs-mode: t
-+ * c-basic-offset: 8
-+ * tab-width: 8
-+ * End:
-+ */
---- a/tools/ocaml/libs/xl/Makefile
-+++ b/tools/ocaml/libs/xl/Makefile
-@@ -2,14 +2,14 @@
- XEN_ROOT=$(TOPLEVEL)/../..
- include $(TOPLEVEL)/common.make
-
--OBJS = xl
--INTF = xl.cmi
--LIBS = xl.cma xl.cmxa
-+OBJS = xenlight
-+INTF = xenlight.cmi
-+LIBS = xenlight.cma xenlight.cmxa
-
--xl_OBJS = $(OBJS)
--xl_C_OBJS = xl_stubs
-+xenlight_OBJS = $(OBJS)
-+xenlight_C_OBJS = xenlight_stubs
-
--OCAML_LIBRARY = xl
-+OCAML_LIBRARY = xenlight
-
- all: $(INTF) $(LIBS)
-
-@@ -18,11 +18,11 @@
- .PHONY: install
- install: $(LIBS) META
- mkdir -p $(OCAMLDESTDIR)
-- ocamlfind remove -destdir $(OCAMLDESTDIR) xl
-- ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xl META $(INTF) $(LIBS) *.a *.so *.cmx
-+ ocamlfind remove -destdir $(OCAMLDESTDIR) xenlight
-+ ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xenlight META $(INTF) $(LIBS) *.a *.so *.cmx
-
- .PHONY: uninstall
- uninstall:
-- ocamlfind remove -destdir $(OCAMLDESTDIR) xl
-+ ocamlfind remove -destdir $(OCAMLDESTDIR) xenlight
-
- include $(TOPLEVEL)/Makefile.rules
---- /dev/null
-+++ b/tools/ocaml/libs/xl/xenlight_stubs.c
-@@ -0,0 +1,729 @@
-+/*
-+ * Copyright (C) 2009-2010 Citrix Ltd.
-+ * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License as published
-+ * by the Free Software Foundation; version 2.1 only. with the special
-+ * exception on linking described in file LICENSE.
-+ *
-+ * 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 Lesser General Public License for more details.
-+ */
-+
-+#include <stdlib.h>
-+
-+#define CAML_NAME_SPACE
-+#include <caml/alloc.h>
-+#include <caml/memory.h>
-+#include <caml/signals.h>
-+#include <caml/fail.h>
-+#include <caml/callback.h>
-+
-+#include <sys/mman.h>
-+#include <stdint.h>
-+#include <string.h>
-+
-+#include "libxl.h"
-+
-+struct caml_logger {
-+ struct xentoollog_logger logger;
-+ int log_offset;
-+ char log_buf[2048];
-+};
-+
-+typedef struct caml_gc {
-+ int offset;
-+ void *ptrs[64];
-+} caml_gc;
-+
-+void log_vmessage(struct xentoollog_logger *logger, xentoollog_level level,
-+ int errnoval, const char *context, const char *format, va_list al)
-+{
-+ struct caml_logger *ologger = (struct caml_logger *) logger;
-+
-+ ologger->log_offset += vsnprintf(ologger->log_buf + ologger->log_offset,
-+ 2048 - ologger->log_offset, format, al);
-+}
-+
-+void log_destroy(struct xentoollog_logger *logger)
-+{
-+}
-+
-+#define INIT_STRUCT() libxl_ctx ctx; struct caml_logger lg; struct caml_gc gc; gc.offset = 0;
-+
-+#define INIT_CTX() \
-+ lg.logger.vmessage = log_vmessage; \
-+ lg.logger.destroy = log_destroy; \
-+ lg.logger.progress = NULL; \
-+ caml_enter_blocking_section(); \
-+ ret = libxl_ctx_init(&ctx, LIBXL_VERSION, (struct xentoollog_logger *) &lg); \
-+ if (ret != 0) \
-+ failwith_xl("cannot init context", &lg);
-+
-+#define FREE_CTX() \
-+ gc_free(&gc); \
-+ caml_leave_blocking_section(); \
-+ libxl_ctx_free(&ctx)
-+
-+static char * dup_String_val(caml_gc *gc, value s)
-+{
-+ int len;
-+ char *c;
-+ len = caml_string_length(s);
-+ c = calloc(len + 1, sizeof(char));
-+ if (!c)
-+ caml_raise_out_of_memory();
-+ gc->ptrs[gc->offset++] = c;
-+ memcpy(c, String_val(s), len);
-+ return c;
-+}
-+
-+static void gc_free(caml_gc *gc)
-+{
-+ int i;
-+ for (i = 0; i < gc->offset; i++) {
-+ free(gc->ptrs[i]);
-+ }
-+}
-+
-+void failwith_xl(char *fname, struct caml_logger *lg)
-+{
-+ char *s;
-+ s = (lg) ? lg->log_buf : fname;
-+ caml_raise_with_string(*caml_named_value("xl.error"), s);
-+}
-+
-+#if 0 /* TODO: wrap libxl_domain_create(), these functions will be needed then */
-+static void * gc_calloc(caml_gc *gc, size_t nmemb, size_t size)
-+{
-+ void *ptr;
-+ ptr = calloc(nmemb, size);
-+ if (!ptr)
-+ caml_raise_out_of_memory();
-+ gc->ptrs[gc->offset++] = ptr;
-+ return ptr;
-+}
-+
-+static int string_string_tuple_array_val (caml_gc *gc, char ***c_val, value v)
-+{
-+ CAMLparam1(v);
-+ CAMLlocal1(a);
-+ int i;
-+ char **array;
-+
-+ for (i = 0, a = Field(v, 5); a != Val_emptylist; a = Field(a, 1)) { i++; }
-+
-+ array = gc_calloc(gc, (i + 1) * 2, sizeof(char *));
-+ if (!array)
-+ return 1;
-+ for (i = 0, a = Field(v, 5); a != Val_emptylist; a = Field(a, 1), i++) {
-+ value b = Field(a, 0);
-+ array[i * 2] = dup_String_val(gc, Field(b, 0));
-+ array[i * 2 + 1] = dup_String_val(gc, Field(b, 1));
-+ }
-+ *c_val = array;
-+ CAMLreturn(0);
-+}
-+
-+static int domain_create_info_val (caml_gc *gc, libxl_domain_create_info *c_val, value v)
-+{
-+ CAMLparam1(v);
-+ CAMLlocal1(a);
-+ uint8_t *uuid = libxl_uuid_bytearray(&c_val->uuid);
-+ int i;
-+
-+ c_val->hvm = Bool_val(Field(v, 0));
-+ c_val->hap = Bool_val(Field(v, 1));
-+ c_val->oos = Bool_val(Field(v, 2));
-+ c_val->ssidref = Int32_val(Field(v, 3));
-+ c_val->name = dup_String_val(gc, Field(v, 4));
-+ a = Field(v, 5);
-+ for (i = 0; i < 16; i++)
-+ uuid[i] = Int_val(Field(a, i));
-+ string_string_tuple_array_val(gc, &(c_val->xsdata), Field(v, 6));
-+ string_string_tuple_array_val(gc, &(c_val->platformdata), Field(v, 7));
-+
-+ c_val->poolid = Int32_val(Field(v, 8));
-+ c_val->poolname = dup_String_val(gc, Field(v, 9));
-+
-+ CAMLreturn(0);
-+}
-+
-+static int domain_build_info_val (caml_gc *gc, libxl_domain_build_info *c_val, value v)
-+{
-+ CAMLparam1(v);
-+ CAMLlocal1(infopriv);
-+
-+ c_val->max_vcpus = Int_val(Field(v, 0));
-+ c_val->cur_vcpus = Int_val(Field(v, 1));
-+ c_val->max_memkb = Int64_val(Field(v, 2));
-+ c_val->target_memkb = Int64_val(Field(v, 3));
-+ c_val->video_memkb = Int64_val(Field(v, 4));
-+ c_val->shadow_memkb = Int64_val(Field(v, 5));
-+ c_val->kernel.path = dup_String_val(gc, Field(v, 6));
-+ c_val->is_hvm = Tag_val(Field(v, 7)) == 0;
-+ infopriv = Field(Field(v, 7), 0);
-+ if (c_val->hvm) {
-+ c_val->u.hvm.pae = Bool_val(Field(infopriv, 0));
-+ c_val->u.hvm.apic = Bool_val(Field(infopriv, 1));
-+ c_val->u.hvm.acpi = Bool_val(Field(infopriv, 2));
-+ c_val->u.hvm.nx = Bool_val(Field(infopriv, 3));
-+ c_val->u.hvm.viridian = Bool_val(Field(infopriv, 4));
-+ c_val->u.hvm.timeoffset = dup_String_val(gc, Field(infopriv, 5));
-+ c_val->u.hvm.timer_mode = Int_val(Field(infopriv, 6));
-+ c_val->u.hvm.hpet = Int_val(Field(infopriv, 7));
-+ c_val->u.hvm.vpt_align = Int_val(Field(infopriv, 8));
-+ } else {
-+ c_val->u.pv.slack_memkb = Int64_val(Field(infopriv, 0));
-+ c_val->u.pv.cmdline = dup_String_val(gc, Field(infopriv, 1));
-+ c_val->u.pv.ramdisk.path = dup_String_val(gc, Field(infopriv, 2));
-+ c_val->u.pv.features = dup_String_val(gc, Field(infopriv, 3));
-+ }
-+
-+ CAMLreturn(0);
-+}
-+#endif
-+
-+static int device_disk_val(caml_gc *gc, libxl_device_disk *c_val, value v)
-+{
-+ CAMLparam1(v);
-+
-+ c_val->backend_domid = Int_val(Field(v, 0));
-+ c_val->pdev_path = dup_String_val(gc, Field(v, 1));
-+ c_val->vdev = dup_String_val(gc, Field(v, 2));
-+ c_val->backend = (Int_val(Field(v, 3)));
-+ c_val->format = (Int_val(Field(v, 4)));
-+ c_val->unpluggable = Bool_val(Field(v, 5));
-+ c_val->readwrite = Bool_val(Field(v, 6));
-+ c_val->is_cdrom = Bool_val(Field(v, 7));
-+
-+ CAMLreturn(0);
-+}
-+
-+static int device_nic_val(caml_gc *gc, libxl_device_nic *c_val, value v)
-+{
-+ CAMLparam1(v);
-+ int i;
-+ int ret = 0;
-+ c_val->backend_domid = Int_val(Field(v, 0));
-+ c_val->devid = Int_val(Field(v, 1));
-+ c_val->mtu = Int_val(Field(v, 2));
-+ c_val->model = dup_String_val(gc, Field(v, 3));
-+
-+ if (Wosize_val(Field(v, 4)) != 6) {
-+ ret = 1;
-+ goto out;
-+ }
-+ for (i = 0; i < 6; i++)
-+ c_val->mac[i] = Int_val(Field(Field(v, 4), i));
-+
-+ /* not handling c_val->ip */
-+ c_val->bridge = dup_String_val(gc, Field(v, 5));
-+ c_val->ifname = dup_String_val(gc, Field(v, 6));
-+ c_val->script = dup_String_val(gc, Field(v, 7));
-+ c_val->nictype = (Int_val(Field(v, 8))) + NICTYPE_IOEMU;
-+
-+out:
-+ CAMLreturn(ret);
-+}
-+
-+static int device_console_val(caml_gc *gc, libxl_device_console *c_val, value v)
-+{
-+ CAMLparam1(v);
-+
-+ c_val->backend_domid = Int_val(Field(v, 0));
-+ c_val->devid = Int_val(Field(v, 1));
-+ c_val->consback = (Int_val(Field(v, 2))) + LIBXL_CONSBACK_XENCONSOLED;
-+
-+ CAMLreturn(0);
-+}
-+
-+static int device_vkb_val(caml_gc *gc, libxl_device_vkb *c_val, value v)
-+{
-+ CAMLparam1(v);
-+
-+ c_val->backend_domid = Int_val(Field(v, 0));
-+ c_val->devid = Int_val(Field(v, 1));
-+
-+ CAMLreturn(0);
-+}
-+
-+static int device_vfb_val(caml_gc *gc, libxl_device_vfb *c_val, value v)
-+{
-+ CAMLparam1(v);
-+
-+ c_val->backend_domid = Int_val(Field(v, 0));
-+ c_val->devid = Int_val(Field(v, 1));
-+ c_val->vnc = Bool_val(Field(v, 2));
-+ c_val->vnclisten = dup_String_val(gc, Field(v, 3));
-+ c_val->vncpasswd = dup_String_val(gc, Field(v, 4));
-+ c_val->vncdisplay = Int_val(Field(v, 5));
-+ c_val->keymap = dup_String_val(gc, Field(v, 6));
-+ c_val->sdl = Bool_val(Field(v, 7));
-+ c_val->opengl = Bool_val(Field(v, 8));
-+ c_val->display = dup_String_val(gc, Field(v, 9));
-+ c_val->xauthority = dup_String_val(gc, Field(v, 10));
-+
-+ CAMLreturn(0);
-+}
-+
-+static int device_pci_val(caml_gc *gc, libxl_device_pci *c_val, value v)
-+{
-+ union {
-+ unsigned int value;
-+ struct {
-+ unsigned int reserved1:2;
-+ unsigned int reg:6;
-+ unsigned int func:3;
-+ unsigned int dev:5;
-+ unsigned int bus:8;
-+ unsigned int reserved2:7;
-+ unsigned int enable:1;
-+ }fields;
-+ }u;
-+ CAMLparam1(v);
-+
-+ /* FIXME: propagate API change to ocaml */
-+ u.value = Int_val(Field(v, 0));
-+ c_val->reg = u.fields.reg;
-+ c_val->func = u.fields.func;
-+ c_val->dev = u.fields.dev;
-+ c_val->bus = u.fields.bus;
-+ c_val->enable = u.fields.enable;
-+
-+ c_val->domain = Int_val(Field(v, 1));
-+ c_val->vdevfn = Int_val(Field(v, 2));
-+ c_val->msitranslate = Bool_val(Field(v, 3));
-+ c_val->power_mgmt = Bool_val(Field(v, 4));
-+
-+ CAMLreturn(0);
-+}
-+
-+static int sched_credit_val(caml_gc *gc, libxl_sched_credit *c_val, value v)
-+{
-+ CAMLparam1(v);
-+ c_val->weight = Int_val(Field(v, 0));
-+ c_val->cap = Int_val(Field(v, 1));
-+ CAMLreturn(0);
-+}
-+
-+static int domain_build_state_val(caml_gc *gc, libxl_domain_build_state *c_val, value v)
-+{
-+ CAMLparam1(v);
-+
-+ c_val->store_port = Int_val(Field(v, 0));
-+ c_val->store_mfn = Int64_val(Field(v, 1));
-+ c_val->console_port = Int_val(Field(v, 2));
-+ c_val->console_mfn = Int64_val(Field(v, 3));
-+
-+ CAMLreturn(0);
-+}
-+
-+static value Val_sched_credit(libxl_sched_credit *c_val)
-+{
-+ CAMLparam0();
-+ CAMLlocal1(v);
-+
-+ v = caml_alloc_tuple(2);
-+
-+ Store_field(v, 0, Val_int(c_val->weight));
-+ Store_field(v, 1, Val_int(c_val->cap));
-+
-+ CAMLreturn(v);
-+}
-+
-+static value Val_physinfo(libxl_physinfo *c_val)
-+{
-+ CAMLparam0();
-+ CAMLlocal2(v, hwcap);
-+ int i;
-+
-+ hwcap = caml_alloc_tuple(8);
-+ for (i = 0; i < 8; i++)
-+ Store_field(hwcap, i, caml_copy_int32(c_val->hw_cap[i]));
-+
-+ v = caml_alloc_tuple(11);
-+ Store_field(v, 0, Val_int(c_val->threads_per_core));
-+ Store_field(v, 1, Val_int(c_val->cores_per_socket));
-+ Store_field(v, 2, Val_int(c_val->max_cpu_id));
-+ Store_field(v, 3, Val_int(c_val->nr_cpus));
-+ Store_field(v, 4, Val_int(c_val->cpu_khz));
-+ Store_field(v, 5, caml_copy_int64(c_val->total_pages));
-+ Store_field(v, 6, caml_copy_int64(c_val->free_pages));
-+ Store_field(v, 7, caml_copy_int64(c_val->scrub_pages));
-+ Store_field(v, 8, Val_int(c_val->nr_nodes));
-+ Store_field(v, 9, hwcap);
-+ Store_field(v, 10, caml_copy_int32(c_val->phys_cap));
-+
-+ CAMLreturn(v);
-+}
-+
-+value stub_xl_disk_add(value info, value domid)
-+{
-+ CAMLparam2(info, domid);
-+ libxl_device_disk c_info;
-+ int ret;
-+ INIT_STRUCT();
-+
-+ device_disk_val(&gc, &c_info, info);
-+ c_info.domid = Int_val(domid);
-+
-+ INIT_CTX();
-+ ret = libxl_device_disk_add(&ctx, Int_val(domid), &c_info);
-+ if (ret != 0)
-+ failwith_xl("disk_add", &lg);
-+ FREE_CTX();
-+ CAMLreturn(Val_unit);
-+}
-+
-+value stub_xl_disk_remove(value info, value domid)
-+{
-+ CAMLparam2(info, domid);
-+ libxl_device_disk c_info;
-+ int ret;
-+ INIT_STRUCT();
-+
-+ device_disk_val(&gc, &c_info, info);
-+ c_info.domid = Int_val(domid);
-+
-+ INIT_CTX();
-+ ret = libxl_device_disk_del(&ctx, &c_info, 0);
-+ if (ret != 0)
-+ failwith_xl("disk_remove", &lg);
-+ FREE_CTX();
-+ CAMLreturn(Val_unit);
-+}
-+
-+value stub_xl_nic_add(value info, value domid)
-+{
-+ CAMLparam2(info, domid);
-+ libxl_device_nic c_info;
-+ int ret;
-+ INIT_STRUCT();
-+
-+ device_nic_val(&gc, &c_info, info);
-+ c_info.domid = Int_val(domid);
-+
-+ INIT_CTX();
-+ ret = libxl_device_nic_add(&ctx, Int_val(domid), &c_info);
-+ if (ret != 0)
-+ failwith_xl("nic_add", &lg);
-+ FREE_CTX();
-+ CAMLreturn(Val_unit);
-+}
-+
-+value stub_xl_nic_remove(value info, value domid)
-+{
-+ CAMLparam2(info, domid);
-+ libxl_device_nic c_info;
-+ int ret;
-+ INIT_STRUCT();
-+
-+ device_nic_val(&gc, &c_info, info);
-+ c_info.domid = Int_val(domid);
-+
-+ INIT_CTX();
-+ ret = libxl_device_nic_del(&ctx, &c_info, 0);
-+ if (ret != 0)
-+ failwith_xl("nic_remove", &lg);
-+ FREE_CTX();
-+ CAMLreturn(Val_unit);
-+}
-+
-+value stub_xl_console_add(value info, value state, value domid)
-+{
-+ CAMLparam3(info, state, domid);
-+ libxl_device_console c_info;
-+ libxl_domain_build_state c_state;
-+ int ret;
-+ INIT_STRUCT();
-+
-+ device_console_val(&gc, &c_info, info);
-+ domain_build_state_val(&gc, &c_state, state);
-+ c_info.domid = Int_val(domid);
-+ c_info.build_state = &c_state;
-+
-+ INIT_CTX();
-+ ret = libxl_device_console_add(&ctx, Int_val(domid), &c_info);
-+ if (ret != 0)
-+ failwith_xl("console_add", &lg);
-+ FREE_CTX();
-+ CAMLreturn(Val_unit);
-+}
-+
-+value stub_xl_vkb_add(value info, value domid)
-+{
-+ CAMLparam2(info, domid);
-+ libxl_device_vkb c_info;
-+ int ret;
-+ INIT_STRUCT();
-+
-+ device_vkb_val(&gc, &c_info, info);
-+ c_info.domid = Int_val(domid);
-+
-+ INIT_CTX();
-+ ret = libxl_device_vkb_add(&ctx, Int_val(domid), &c_info);
-+ if (ret != 0)
-+ failwith_xl("vkb_add", &lg);
-+ FREE_CTX();
-+
-+ CAMLreturn(Val_unit);
-+}
-+
-+value stub_xl_vkb_clean_shutdown(value domid)
-+{
-+ CAMLparam1(domid);
-+ int ret;
-+ INIT_STRUCT();
-+
-+ INIT_CTX();
-+ ret = libxl_device_vkb_clean_shutdown(&ctx, Int_val(domid));
-+ if (ret != 0)
-+ failwith_xl("vkb_clean_shutdown", &lg);
-+ FREE_CTX();
-+
-+ CAMLreturn(Val_unit);
-+}
-+
-+value stub_xl_vkb_hard_shutdown(value domid)
-+{
-+ CAMLparam1(domid);
-+ int ret;
-+ INIT_STRUCT();
-+
-+ INIT_CTX();
-+ ret = libxl_device_vkb_hard_shutdown(&ctx, Int_val(domid));
-+ if (ret != 0)
-+ failwith_xl("vkb_hard_shutdown", &lg);
-+ FREE_CTX();
-+
-+ CAMLreturn(Val_unit);
-+}
-+
-+value stub_xl_vfb_add(value info, value domid)
-+{
-+ CAMLparam2(info, domid);
-+ libxl_device_vfb c_info;
-+ int ret;
-+ INIT_STRUCT();
-+
-+ device_vfb_val(&gc, &c_info, info);
-+ c_info.domid = Int_val(domid);
-+
-+ INIT_CTX();
-+ ret = libxl_device_vfb_add(&ctx, Int_val(domid), &c_info);
-+ if (ret != 0)
-+ failwith_xl("vfb_add", &lg);
-+ FREE_CTX();
-+
-+ CAMLreturn(Val_unit);
-+}
-+
-+value stub_xl_vfb_clean_shutdown(value domid)
-+{
-+ CAMLparam1(domid);
-+ int ret;
-+ INIT_STRUCT();
-+
-+ INIT_CTX();
-+ ret = libxl_device_vfb_clean_shutdown(&ctx, Int_val(domid));
-+ if (ret != 0)
-+ failwith_xl("vfb_clean_shutdown", &lg);
-+ FREE_CTX();
-+
-+ CAMLreturn(Val_unit);
-+}
-+
-+value stub_xl_vfb_hard_shutdown(value domid)
-+{
-+ CAMLparam1(domid);
-+ int ret;
-+ INIT_STRUCT();
-+
-+ INIT_CTX();
-+ ret = libxl_device_vfb_hard_shutdown(&ctx, Int_val(domid));
-+ if (ret != 0)
-+ failwith_xl("vfb_hard_shutdown", &lg);
-+ FREE_CTX();
-+
-+ CAMLreturn(Val_unit);
-+}
-+
-+value stub_xl_pci_add(value info, value domid)
-+{
-+ CAMLparam2(info, domid);
-+ libxl_device_pci c_info;
-+ int ret;
-+ INIT_STRUCT();
-+
-+ device_pci_val(&gc, &c_info, info);
-+
-+ INIT_CTX();
-+ ret = libxl_device_pci_add(&ctx, Int_val(domid), &c_info);
-+ if (ret != 0)
-+ failwith_xl("pci_add", &lg);
-+ FREE_CTX();
-+
-+ CAMLreturn(Val_unit);
-+}
-+
-+value stub_xl_pci_remove(value info, value domid)
-+{
-+ CAMLparam2(info, domid);
-+ libxl_device_pci c_info;
-+ int ret;
-+ INIT_STRUCT();
-+
-+ device_pci_val(&gc, &c_info, info);
-+
-+ INIT_CTX();
-+ ret = libxl_device_pci_remove(&ctx, Int_val(domid), &c_info, 0);
-+ if (ret != 0)
-+ failwith_xl("pci_remove", &lg);
-+ FREE_CTX();
-+
-+ CAMLreturn(Val_unit);
-+}
-+
-+value stub_xl_pci_shutdown(value domid)
-+{
-+ CAMLparam1(domid);
-+ int ret;
-+ INIT_STRUCT();
-+
-+ INIT_CTX();
-+ ret = libxl_device_pci_shutdown(&ctx, Int_val(domid));
-+ if (ret != 0)
-+ failwith_xl("pci_shutdown", &lg);
-+ FREE_CTX();
-+
-+ CAMLreturn(Val_unit);
-+}
-+
-+value stub_xl_button_press(value domid, value button)
-+{
-+ CAMLparam2(domid, button);
-+ int ret;
-+ INIT_STRUCT();
-+
-+ INIT_CTX();
-+ ret = libxl_button_press(&ctx, Int_val(domid), Int_val(button) + POWER_BUTTON);
-+ if (ret != 0)
-+ failwith_xl("button_press", &lg);
-+ FREE_CTX();
-+
-+ CAMLreturn(Val_unit);
-+}
-+
-+value stub_xl_physinfo(value unit)
-+{
-+ CAMLparam1(unit);
-+ CAMLlocal1(physinfo);
-+ libxl_physinfo c_physinfo;
-+ int ret;
-+ INIT_STRUCT();
-+
-+ INIT_CTX();
-+ ret = libxl_get_physinfo(&ctx, &c_physinfo);
-+ if (ret != 0)
-+ failwith_xl("physinfo", &lg);
-+ FREE_CTX();
-+
-+ physinfo = Val_physinfo(&c_physinfo);
-+ CAMLreturn(physinfo);
-+}
-+
-+value stub_xl_sched_credit_domain_get(value domid)
-+{
-+ CAMLparam1(domid);
-+ CAMLlocal1(scinfo);
-+ libxl_sched_credit c_scinfo;
-+ int ret;
-+ INIT_STRUCT();
-+
-+ INIT_CTX();
-+ ret = libxl_sched_credit_domain_get(&ctx, Int_val(domid), &c_scinfo);
-+ if (ret != 0)
-+ failwith_xl("sched_credit_domain_get", &lg);
-+ FREE_CTX();
-+
-+ scinfo = Val_sched_credit(&c_scinfo);
-+ CAMLreturn(scinfo);
-+}
-+
-+value stub_xl_sched_credit_domain_set(value domid, value scinfo)
-+{
-+ CAMLparam2(domid, scinfo);
-+ libxl_sched_credit c_scinfo;
-+ int ret;
-+ INIT_STRUCT();
-+
-+ sched_credit_val(&gc, &c_scinfo, scinfo);
-+
-+ INIT_CTX();
-+ ret = libxl_sched_credit_domain_set(&ctx, Int_val(domid), &c_scinfo);
-+ if (ret != 0)
-+ failwith_xl("sched_credit_domain_set", &lg);
-+ FREE_CTX();
-+
-+ CAMLreturn(Val_unit);
-+}
-+
-+value stub_xl_send_trigger(value domid, value trigger, value vcpuid)
-+{
-+ CAMLparam3(domid, trigger, vcpuid);
-+ int ret;
-+ char *c_trigger;
-+ INIT_STRUCT();
-+
-+ c_trigger = dup_String_val(&gc, trigger);
-+
-+ INIT_CTX();
-+ ret = libxl_send_trigger(&ctx, Int_val(domid), c_trigger, Int_val(vcpuid));
-+ if (ret != 0)
-+ failwith_xl("send_trigger", &lg);
-+ FREE_CTX();
-+ CAMLreturn(Val_unit);
-+}
-+
-+value stub_xl_send_sysrq(value domid, value sysrq)
-+{
-+ CAMLparam2(domid, sysrq);
-+ int ret;
-+ INIT_STRUCT();
-+
-+ INIT_CTX();
-+ ret = libxl_send_sysrq(&ctx, Int_val(domid), Int_val(sysrq));
-+ if (ret != 0)
-+ failwith_xl("send_sysrq", &lg);
-+ FREE_CTX();
-+ CAMLreturn(Val_unit);
-+}
-+
-+value stub_xl_send_debug_keys(value keys)
-+{
-+ CAMLparam1(keys);
-+ int ret;
-+ char *c_keys;
-+ INIT_STRUCT();
-+
-+ c_keys = dup_String_val(&gc, keys);
-+
-+ INIT_CTX();
-+ ret = libxl_send_debug_keys(&ctx, c_keys);
-+ if (ret != 0)
-+ failwith_xl("send_debug_keys", &lg);
-+ FREE_CTX();
-+ CAMLreturn(Val_unit);
-+}
-+
-+/*
-+ * Local variables:
-+ * indent-tabs-mode: t
-+ * c-basic-offset: 8
-+ * tab-width: 8
-+ * End:
-+ */
---- a/tools/ocaml/libs/xl/xl_stubs.c
-+++ /dev/null
-@@ -1,729 +0,0 @@
--/*
-- * Copyright (C) 2009-2010 Citrix Ltd.
-- * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License as published
-- * by the Free Software Foundation; version 2.1 only. with the special
-- * exception on linking described in file LICENSE.
-- *
-- * 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 Lesser General Public License for more details.
-- */
--
--#include <stdlib.h>
--
--#define CAML_NAME_SPACE
--#include <caml/alloc.h>
--#include <caml/memory.h>
--#include <caml/signals.h>
--#include <caml/fail.h>
--#include <caml/callback.h>
--
--#include <sys/mman.h>
--#include <stdint.h>
--#include <string.h>
--
--#include "libxl.h"
--
--struct caml_logger {
-- struct xentoollog_logger logger;
-- int log_offset;
-- char log_buf[2048];
--};
--
--typedef struct caml_gc {
-- int offset;
-- void *ptrs[64];
--} caml_gc;
--
--void log_vmessage(struct xentoollog_logger *logger, xentoollog_level level,
-- int errnoval, const char *context, const char *format, va_list al)
--{
-- struct caml_logger *ologger = (struct caml_logger *) logger;
--
-- ologger->log_offset += vsnprintf(ologger->log_buf + ologger->log_offset,
-- 2048 - ologger->log_offset, format, al);
--}
--
--void log_destroy(struct xentoollog_logger *logger)
--{
--}
--
--#define INIT_STRUCT() libxl_ctx ctx; struct caml_logger lg; struct caml_gc gc; gc.offset = 0;
--
--#define INIT_CTX() \
-- lg.logger.vmessage = log_vmessage; \
-- lg.logger.destroy = log_destroy; \
-- lg.logger.progress = NULL; \
-- caml_enter_blocking_section(); \
-- ret = libxl_ctx_init(&ctx, LIBXL_VERSION, (struct xentoollog_logger *) &lg); \
-- if (ret != 0) \
-- failwith_xl("cannot init context", &lg);
--
--#define FREE_CTX() \
-- gc_free(&gc); \
-- caml_leave_blocking_section(); \
-- libxl_ctx_free(&ctx)
--
--static char * dup_String_val(caml_gc *gc, value s)
--{
-- int len;
-- char *c;
-- len = caml_string_length(s);
-- c = calloc(len + 1, sizeof(char));
-- if (!c)
-- caml_raise_out_of_memory();
-- gc->ptrs[gc->offset++] = c;
-- memcpy(c, String_val(s), len);
-- return c;
--}
--
--static void gc_free(caml_gc *gc)
--{
-- int i;
-- for (i = 0; i < gc->offset; i++) {
-- free(gc->ptrs[i]);
-- }
--}
--
--void failwith_xl(char *fname, struct caml_logger *lg)
--{
-- char *s;
-- s = (lg) ? lg->log_buf : fname;
-- caml_raise_with_string(*caml_named_value("xl.error"), s);
--}
--
--#if 0 /* TODO: wrap libxl_domain_create(), these functions will be needed then */
--static void * gc_calloc(caml_gc *gc, size_t nmemb, size_t size)
--{
-- void *ptr;
-- ptr = calloc(nmemb, size);
-- if (!ptr)
-- caml_raise_out_of_memory();
-- gc->ptrs[gc->offset++] = ptr;
-- return ptr;
--}
--
--static int string_string_tuple_array_val (caml_gc *gc, char ***c_val, value v)
--{
-- CAMLparam1(v);
-- CAMLlocal1(a);
-- int i;
-- char **array;
--
-- for (i = 0, a = Field(v, 5); a != Val_emptylist; a = Field(a, 1)) { i++; }
--
-- array = gc_calloc(gc, (i + 1) * 2, sizeof(char *));
-- if (!array)
-- return 1;
-- for (i = 0, a = Field(v, 5); a != Val_emptylist; a = Field(a, 1), i++) {
-- value b = Field(a, 0);
-- array[i * 2] = dup_String_val(gc, Field(b, 0));
-- array[i * 2 + 1] = dup_String_val(gc, Field(b, 1));
-- }
-- *c_val = array;
-- CAMLreturn(0);
--}
--
--static int domain_create_info_val (caml_gc *gc, libxl_domain_create_info *c_val, value v)
--{
-- CAMLparam1(v);
-- CAMLlocal1(a);
-- uint8_t *uuid = libxl_uuid_bytearray(&c_val->uuid);
-- int i;
--
-- c_val->hvm = Bool_val(Field(v, 0));
-- c_val->hap = Bool_val(Field(v, 1));
-- c_val->oos = Bool_val(Field(v, 2));
-- c_val->ssidref = Int32_val(Field(v, 3));
-- c_val->name = dup_String_val(gc, Field(v, 4));
-- a = Field(v, 5);
-- for (i = 0; i < 16; i++)
-- uuid[i] = Int_val(Field(a, i));
-- string_string_tuple_array_val(gc, &(c_val->xsdata), Field(v, 6));
-- string_string_tuple_array_val(gc, &(c_val->platformdata), Field(v, 7));
--
-- c_val->poolid = Int32_val(Field(v, 8));
-- c_val->poolname = dup_String_val(gc, Field(v, 9));
--
-- CAMLreturn(0);
--}
--
--static int domain_build_info_val (caml_gc *gc, libxl_domain_build_info *c_val, value v)
--{
-- CAMLparam1(v);
-- CAMLlocal1(infopriv);
--
-- c_val->max_vcpus = Int_val(Field(v, 0));
-- c_val->cur_vcpus = Int_val(Field(v, 1));
-- c_val->max_memkb = Int64_val(Field(v, 2));
-- c_val->target_memkb = Int64_val(Field(v, 3));
-- c_val->video_memkb = Int64_val(Field(v, 4));
-- c_val->shadow_memkb = Int64_val(Field(v, 5));
-- c_val->kernel.path = dup_String_val(gc, Field(v, 6));
-- c_val->is_hvm = Tag_val(Field(v, 7)) == 0;
-- infopriv = Field(Field(v, 7), 0);
-- if (c_val->hvm) {
-- c_val->u.hvm.pae = Bool_val(Field(infopriv, 0));
-- c_val->u.hvm.apic = Bool_val(Field(infopriv, 1));
-- c_val->u.hvm.acpi = Bool_val(Field(infopriv, 2));
-- c_val->u.hvm.nx = Bool_val(Field(infopriv, 3));
-- c_val->u.hvm.viridian = Bool_val(Field(infopriv, 4));
-- c_val->u.hvm.timeoffset = dup_String_val(gc, Field(infopriv, 5));
-- c_val->u.hvm.timer_mode = Int_val(Field(infopriv, 6));
-- c_val->u.hvm.hpet = Int_val(Field(infopriv, 7));
-- c_val->u.hvm.vpt_align = Int_val(Field(infopriv, 8));
-- } else {
-- c_val->u.pv.slack_memkb = Int64_val(Field(infopriv, 0));
-- c_val->u.pv.cmdline = dup_String_val(gc, Field(infopriv, 1));
-- c_val->u.pv.ramdisk.path = dup_String_val(gc, Field(infopriv, 2));
-- c_val->u.pv.features = dup_String_val(gc, Field(infopriv, 3));
-- }
--
-- CAMLreturn(0);
--}
--#endif
--
--static int device_disk_val(caml_gc *gc, libxl_device_disk *c_val, value v)
--{
-- CAMLparam1(v);
--
-- c_val->backend_domid = Int_val(Field(v, 0));
-- c_val->pdev_path = dup_String_val(gc, Field(v, 1));
-- c_val->vdev = dup_String_val(gc, Field(v, 2));
-- c_val->backend = (Int_val(Field(v, 3)));
-- c_val->format = (Int_val(Field(v, 4)));
-- c_val->unpluggable = Bool_val(Field(v, 5));
-- c_val->readwrite = Bool_val(Field(v, 6));
-- c_val->is_cdrom = Bool_val(Field(v, 7));
--
-- CAMLreturn(0);
--}
--
--static int device_nic_val(caml_gc *gc, libxl_device_nic *c_val, value v)
--{
-- CAMLparam1(v);
-- int i;
-- int ret = 0;
-- c_val->backend_domid = Int_val(Field(v, 0));
-- c_val->devid = Int_val(Field(v, 1));
-- c_val->mtu = Int_val(Field(v, 2));
-- c_val->model = dup_String_val(gc, Field(v, 3));
--
-- if (Wosize_val(Field(v, 4)) != 6) {
-- ret = 1;
-- goto out;
-- }
-- for (i = 0; i < 6; i++)
-- c_val->mac[i] = Int_val(Field(Field(v, 4), i));
--
-- /* not handling c_val->ip */
-- c_val->bridge = dup_String_val(gc, Field(v, 5));
-- c_val->ifname = dup_String_val(gc, Field(v, 6));
-- c_val->script = dup_String_val(gc, Field(v, 7));
-- c_val->nictype = (Int_val(Field(v, 8))) + NICTYPE_IOEMU;
--
--out:
-- CAMLreturn(ret);
--}
--
--static int device_console_val(caml_gc *gc, libxl_device_console *c_val, value v)
--{
-- CAMLparam1(v);
--
-- c_val->backend_domid = Int_val(Field(v, 0));
-- c_val->devid = Int_val(Field(v, 1));
-- c_val->consback = (Int_val(Field(v, 2))) + LIBXL_CONSBACK_XENCONSOLED;
--
-- CAMLreturn(0);
--}
--
--static int device_vkb_val(caml_gc *gc, libxl_device_vkb *c_val, value v)
--{
-- CAMLparam1(v);
--
-- c_val->backend_domid = Int_val(Field(v, 0));
-- c_val->devid = Int_val(Field(v, 1));
--
-- CAMLreturn(0);
--}
--
--static int device_vfb_val(caml_gc *gc, libxl_device_vfb *c_val, value v)
--{
-- CAMLparam1(v);
--
-- c_val->backend_domid = Int_val(Field(v, 0));
-- c_val->devid = Int_val(Field(v, 1));
-- c_val->vnc = Bool_val(Field(v, 2));
-- c_val->vnclisten = dup_String_val(gc, Field(v, 3));
-- c_val->vncpasswd = dup_String_val(gc, Field(v, 4));
-- c_val->vncdisplay = Int_val(Field(v, 5));
-- c_val->keymap = dup_String_val(gc, Field(v, 6));
-- c_val->sdl = Bool_val(Field(v, 7));
-- c_val->opengl = Bool_val(Field(v, 8));
-- c_val->display = dup_String_val(gc, Field(v, 9));
-- c_val->xauthority = dup_String_val(gc, Field(v, 10));
--
-- CAMLreturn(0);
--}
--
--static int device_pci_val(caml_gc *gc, libxl_device_pci *c_val, value v)
--{
-- union {
-- unsigned int value;
-- struct {
-- unsigned int reserved1:2;
-- unsigned int reg:6;
-- unsigned int func:3;
-- unsigned int dev:5;
-- unsigned int bus:8;
-- unsigned int reserved2:7;
-- unsigned int enable:1;
-- }fields;
-- }u;
-- CAMLparam1(v);
--
-- /* FIXME: propagate API change to ocaml */
-- u.value = Int_val(Field(v, 0));
-- c_val->reg = u.fields.reg;
-- c_val->func = u.fields.func;
-- c_val->dev = u.fields.dev;
-- c_val->bus = u.fields.bus;
-- c_val->enable = u.fields.enable;
--
-- c_val->domain = Int_val(Field(v, 1));
-- c_val->vdevfn = Int_val(Field(v, 2));
-- c_val->msitranslate = Bool_val(Field(v, 3));
-- c_val->power_mgmt = Bool_val(Field(v, 4));
--
-- CAMLreturn(0);
--}
--
--static int sched_credit_val(caml_gc *gc, libxl_sched_credit *c_val, value v)
--{
-- CAMLparam1(v);
-- c_val->weight = Int_val(Field(v, 0));
-- c_val->cap = Int_val(Field(v, 1));
-- CAMLreturn(0);
--}
--
--static int domain_build_state_val(caml_gc *gc, libxl_domain_build_state *c_val, value v)
--{
-- CAMLparam1(v);
--
-- c_val->store_port = Int_val(Field(v, 0));
-- c_val->store_mfn = Int64_val(Field(v, 1));
-- c_val->console_port = Int_val(Field(v, 2));
-- c_val->console_mfn = Int64_val(Field(v, 3));
--
-- CAMLreturn(0);
--}
--
--static value Val_sched_credit(libxl_sched_credit *c_val)
--{
-- CAMLparam0();
-- CAMLlocal1(v);
--
-- v = caml_alloc_tuple(2);
--
-- Store_field(v, 0, Val_int(c_val->weight));
-- Store_field(v, 1, Val_int(c_val->cap));
--
-- CAMLreturn(v);
--}
--
--static value Val_physinfo(libxl_physinfo *c_val)
--{
-- CAMLparam0();
-- CAMLlocal2(v, hwcap);
-- int i;
--
-- hwcap = caml_alloc_tuple(8);
-- for (i = 0; i < 8; i++)
-- Store_field(hwcap, i, caml_copy_int32(c_val->hw_cap[i]));
--
-- v = caml_alloc_tuple(11);
-- Store_field(v, 0, Val_int(c_val->threads_per_core));
-- Store_field(v, 1, Val_int(c_val->cores_per_socket));
-- Store_field(v, 2, Val_int(c_val->max_cpu_id));
-- Store_field(v, 3, Val_int(c_val->nr_cpus));
-- Store_field(v, 4, Val_int(c_val->cpu_khz));
-- Store_field(v, 5, caml_copy_int64(c_val->total_pages));
-- Store_field(v, 6, caml_copy_int64(c_val->free_pages));
-- Store_field(v, 7, caml_copy_int64(c_val->scrub_pages));
-- Store_field(v, 8, Val_int(c_val->nr_nodes));
-- Store_field(v, 9, hwcap);
-- Store_field(v, 10, caml_copy_int32(c_val->phys_cap));
--
-- CAMLreturn(v);
--}
--
--value stub_xl_disk_add(value info, value domid)
--{
-- CAMLparam2(info, domid);
-- libxl_device_disk c_info;
-- int ret;
-- INIT_STRUCT();
--
-- device_disk_val(&gc, &c_info, info);
-- c_info.domid = Int_val(domid);
--
-- INIT_CTX();
-- ret = libxl_device_disk_add(&ctx, Int_val(domid), &c_info);
-- if (ret != 0)
-- failwith_xl("disk_add", &lg);
-- FREE_CTX();
-- CAMLreturn(Val_unit);
--}
--
--value stub_xl_disk_remove(value info, value domid)
--{
-- CAMLparam2(info, domid);
-- libxl_device_disk c_info;
-- int ret;
-- INIT_STRUCT();
--
-- device_disk_val(&gc, &c_info, info);
-- c_info.domid = Int_val(domid);
--
-- INIT_CTX();
-- ret = libxl_device_disk_del(&ctx, &c_info, 0);
-- if (ret != 0)
-- failwith_xl("disk_remove", &lg);
-- FREE_CTX();
-- CAMLreturn(Val_unit);
--}
--
--value stub_xl_nic_add(value info, value domid)
--{
-- CAMLparam2(info, domid);
-- libxl_device_nic c_info;
-- int ret;
-- INIT_STRUCT();
--
-- device_nic_val(&gc, &c_info, info);
-- c_info.domid = Int_val(domid);
--
-- INIT_CTX();
-- ret = libxl_device_nic_add(&ctx, Int_val(domid), &c_info);
-- if (ret != 0)
-- failwith_xl("nic_add", &lg);
-- FREE_CTX();
-- CAMLreturn(Val_unit);
--}
--
--value stub_xl_nic_remove(value info, value domid)
--{
-- CAMLparam2(info, domid);
-- libxl_device_nic c_info;
-- int ret;
-- INIT_STRUCT();
--
-- device_nic_val(&gc, &c_info, info);
-- c_info.domid = Int_val(domid);
--
-- INIT_CTX();
-- ret = libxl_device_nic_del(&ctx, &c_info, 0);
-- if (ret != 0)
-- failwith_xl("nic_remove", &lg);
-- FREE_CTX();
-- CAMLreturn(Val_unit);
--}
--
--value stub_xl_console_add(value info, value state, value domid)
--{
-- CAMLparam3(info, state, domid);
-- libxl_device_console c_info;
-- libxl_domain_build_state c_state;
-- int ret;
-- INIT_STRUCT();
--
-- device_console_val(&gc, &c_info, info);
-- domain_build_state_val(&gc, &c_state, state);
-- c_info.domid = Int_val(domid);
-- c_info.build_state = &c_state;
--
-- INIT_CTX();
-- ret = libxl_device_console_add(&ctx, Int_val(domid), &c_info);
-- if (ret != 0)
-- failwith_xl("console_add", &lg);
-- FREE_CTX();
-- CAMLreturn(Val_unit);
--}
--
--value stub_xl_vkb_add(value info, value domid)
--{
-- CAMLparam2(info, domid);
-- libxl_device_vkb c_info;
-- int ret;
-- INIT_STRUCT();
--
-- device_vkb_val(&gc, &c_info, info);
-- c_info.domid = Int_val(domid);
--
-- INIT_CTX();
-- ret = libxl_device_vkb_add(&ctx, Int_val(domid), &c_info);
-- if (ret != 0)
-- failwith_xl("vkb_add", &lg);
-- FREE_CTX();
--
-- CAMLreturn(Val_unit);
--}
--
--value stub_xl_vkb_clean_shutdown(value domid)
--{
-- CAMLparam1(domid);
-- int ret;
-- INIT_STRUCT();
--
-- INIT_CTX();
-- ret = libxl_device_vkb_clean_shutdown(&ctx, Int_val(domid));
-- if (ret != 0)
-- failwith_xl("vkb_clean_shutdown", &lg);
-- FREE_CTX();
--
-- CAMLreturn(Val_unit);
--}
--
--value stub_xl_vkb_hard_shutdown(value domid)
--{
-- CAMLparam1(domid);
-- int ret;
-- INIT_STRUCT();
--
-- INIT_CTX();
-- ret = libxl_device_vkb_hard_shutdown(&ctx, Int_val(domid));
-- if (ret != 0)
-- failwith_xl("vkb_hard_shutdown", &lg);
-- FREE_CTX();
--
-- CAMLreturn(Val_unit);
--}
--
--value stub_xl_vfb_add(value info, value domid)
--{
-- CAMLparam2(info, domid);
-- libxl_device_vfb c_info;
-- int ret;
-- INIT_STRUCT();
--
-- device_vfb_val(&gc, &c_info, info);
-- c_info.domid = Int_val(domid);
--
-- INIT_CTX();
-- ret = libxl_device_vfb_add(&ctx, Int_val(domid), &c_info);
-- if (ret != 0)
-- failwith_xl("vfb_add", &lg);
-- FREE_CTX();
--
-- CAMLreturn(Val_unit);
--}
--
--value stub_xl_vfb_clean_shutdown(value domid)
--{
-- CAMLparam1(domid);
-- int ret;
-- INIT_STRUCT();
--
-- INIT_CTX();
-- ret = libxl_device_vfb_clean_shutdown(&ctx, Int_val(domid));
-- if (ret != 0)
-- failwith_xl("vfb_clean_shutdown", &lg);
-- FREE_CTX();
--
-- CAMLreturn(Val_unit);
--}
--
--value stub_xl_vfb_hard_shutdown(value domid)
--{
-- CAMLparam1(domid);
-- int ret;
-- INIT_STRUCT();
--
-- INIT_CTX();
-- ret = libxl_device_vfb_hard_shutdown(&ctx, Int_val(domid));
-- if (ret != 0)
-- failwith_xl("vfb_hard_shutdown", &lg);
-- FREE_CTX();
--
-- CAMLreturn(Val_unit);
--}
--
--value stub_xl_pci_add(value info, value domid)
--{
-- CAMLparam2(info, domid);
-- libxl_device_pci c_info;
-- int ret;
-- INIT_STRUCT();
--
-- device_pci_val(&gc, &c_info, info);
--
-- INIT_CTX();
-- ret = libxl_device_pci_add(&ctx, Int_val(domid), &c_info);
-- if (ret != 0)
-- failwith_xl("pci_add", &lg);
-- FREE_CTX();
--
-- CAMLreturn(Val_unit);
--}
--
--value stub_xl_pci_remove(value info, value domid)
--{
-- CAMLparam2(info, domid);
-- libxl_device_pci c_info;
-- int ret;
-- INIT_STRUCT();
--
-- device_pci_val(&gc, &c_info, info);
--
-- INIT_CTX();
-- ret = libxl_device_pci_remove(&ctx, Int_val(domid), &c_info, 0);
-- if (ret != 0)
-- failwith_xl("pci_remove", &lg);
-- FREE_CTX();
--
-- CAMLreturn(Val_unit);
--}
--
--value stub_xl_pci_shutdown(value domid)
--{
-- CAMLparam1(domid);
-- int ret;
-- INIT_STRUCT();
--
-- INIT_CTX();
-- ret = libxl_device_pci_shutdown(&ctx, Int_val(domid));
-- if (ret != 0)
-- failwith_xl("pci_shutdown", &lg);
-- FREE_CTX();
--
-- CAMLreturn(Val_unit);
--}
--
--value stub_xl_button_press(value domid, value button)
--{
-- CAMLparam2(domid, button);
-- int ret;
-- INIT_STRUCT();
--
-- INIT_CTX();
-- ret = libxl_button_press(&ctx, Int_val(domid), Int_val(button) + POWER_BUTTON);
-- if (ret != 0)
-- failwith_xl("button_press", &lg);
-- FREE_CTX();
--
-- CAMLreturn(Val_unit);
--}
--
--value stub_xl_physinfo(value unit)
--{
-- CAMLparam1(unit);
-- CAMLlocal1(physinfo);
-- libxl_physinfo c_physinfo;
-- int ret;
-- INIT_STRUCT();
--
-- INIT_CTX();
-- ret = libxl_get_physinfo(&ctx, &c_physinfo);
-- if (ret != 0)
-- failwith_xl("physinfo", &lg);
-- FREE_CTX();
--
-- physinfo = Val_physinfo(&c_physinfo);
-- CAMLreturn(physinfo);
--}
--
--value stub_xl_sched_credit_domain_get(value domid)
--{
-- CAMLparam1(domid);
-- CAMLlocal1(scinfo);
-- libxl_sched_credit c_scinfo;
-- int ret;
-- INIT_STRUCT();
--
-- INIT_CTX();
-- ret = libxl_sched_credit_domain_get(&ctx, Int_val(domid), &c_scinfo);
-- if (ret != 0)
-- failwith_xl("sched_credit_domain_get", &lg);
-- FREE_CTX();
--
-- scinfo = Val_sched_credit(&c_scinfo);
-- CAMLreturn(scinfo);
--}
--
--value stub_xl_sched_credit_domain_set(value domid, value scinfo)
--{
-- CAMLparam2(domid, scinfo);
-- libxl_sched_credit c_scinfo;
-- int ret;
-- INIT_STRUCT();
--
-- sched_credit_val(&gc, &c_scinfo, scinfo);
--
-- INIT_CTX();
-- ret = libxl_sched_credit_domain_set(&ctx, Int_val(domid), &c_scinfo);
-- if (ret != 0)
-- failwith_xl("sched_credit_domain_set", &lg);
-- FREE_CTX();
--
-- CAMLreturn(Val_unit);
--}
--
--value stub_xl_send_trigger(value domid, value trigger, value vcpuid)
--{
-- CAMLparam3(domid, trigger, vcpuid);
-- int ret;
-- char *c_trigger;
-- INIT_STRUCT();
--
-- c_trigger = dup_String_val(&gc, trigger);
--
-- INIT_CTX();
-- ret = libxl_send_trigger(&ctx, Int_val(domid), c_trigger, Int_val(vcpuid));
-- if (ret != 0)
-- failwith_xl("send_trigger", &lg);
-- FREE_CTX();
-- CAMLreturn(Val_unit);
--}
--
--value stub_xl_send_sysrq(value domid, value sysrq)
--{
-- CAMLparam2(domid, sysrq);
-- int ret;
-- INIT_STRUCT();
--
-- INIT_CTX();
-- ret = libxl_send_sysrq(&ctx, Int_val(domid), Int_val(sysrq));
-- if (ret != 0)
-- failwith_xl("send_sysrq", &lg);
-- FREE_CTX();
-- CAMLreturn(Val_unit);
--}
--
--value stub_xl_send_debug_keys(value keys)
--{
-- CAMLparam1(keys);
-- int ret;
-- char *c_keys;
-- INIT_STRUCT();
--
-- c_keys = dup_String_val(&gc, keys);
--
-- INIT_CTX();
-- ret = libxl_send_debug_keys(&ctx, c_keys);
-- if (ret != 0)
-- failwith_xl("send_debug_keys", &lg);
-- FREE_CTX();
-- CAMLreturn(Val_unit);
--}
--
--/*
-- * Local variables:
-- * indent-tabs-mode: t
-- * c-basic-offset: 8
-- * tab-width: 8
-- * End:
-- */
---- a/tools/ocaml/libs/xs/META.in
-+++ b/tools/ocaml/libs/xs/META.in
-@@ -1,5 +1,5 @@
- version = "@VERSION@"
- description = "XenStore Interface"
--requires = "unix,xb"
--archive(byte) = "xs.cma"
--archive(native) = "xs.cmxa"
-+requires = "unix,xenbus"
-+archive(byte) = "xenstore.cma"
-+archive(native) = "xenstore.cmxa"
---- a/tools/ocaml/libs/xs/Makefile
-+++ b/tools/ocaml/libs/xs/Makefile
-@@ -3,6 +3,7 @@
- include $(TOPLEVEL)/common.make
-
- OCAMLINCLUDE += -I ../xb/
-+OCAMLOPTFLAGS += -for-pack Xenstore
-
- .NOTPARALLEL:
- # Ocaml is such a PITA!
-@@ -12,7 +13,7 @@
- PRELIBS = $(foreach obj, $(PREOBJS),$(obj).cmo) $(foreach obj,$(PREOJBS),$(obj).cmx)
- OBJS = queueop xsraw xst xs
- INTF = xsraw.cmi xst.cmi xs.cmi
--LIBS = xs.cma xs.cmxa
-+LIBS = xenstore.cma xenstore.cmxa
-
- all: $(PREINTF) $(PRELIBS) $(INTF) $(LIBS) $(PROGRAMS)
-
-@@ -20,26 +21,26 @@
-
- libs: $(LIBS)
-
--xs_OBJS = $(OBJS)
--OCAML_NOC_LIBRARY = xs
-+xenstore_OBJS = xenstore
-+OCAML_NOC_LIBRARY = xenstore
-
--#xs.cmxa: $(foreach obj,$(OBJS),$(obj).cmx)
--# $(E) " MLLIB $@"
--# $(Q)$(OCAMLOPT) $(OCAMLOPTFLAGS) -a -o $@ $(foreach obj,$(OBJS),$(obj).cmx)
--#
--#xs.cma: $(foreach obj,$(OBJS),$(obj).cmo)
--# $(E) " MLLIB $@"
--# $(Q)$(OCAMLC) -a -o $@ $(foreach obj,$(OBJS),$(obj).cmo)
-+xenstore.cmx : $(foreach obj, $(OBJS), $(obj).cmx)
-+ $(E) " CMX $@"
-+ $(Q)$(OCAMLOPT) -pack -o $@ $^
-+
-+xenstore.cmo : $(foreach obj, $(OBJS), $(obj).cmo)
-+ $(E) " CMO $@"
-+ $(Q)$(OCAMLC) -pack -o $@ $^
-
- .PHONY: install
- install: $(LIBS) META
- mkdir -p $(OCAMLDESTDIR)
-- ocamlfind remove -destdir $(OCAMLDESTDIR) xs
-- ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xs META $(INTF) xs.mli xst.mli xsraw.mli $(LIBS) *.a *.cmx
-+ ocamlfind remove -destdir $(OCAMLDESTDIR) xenstore
-+ ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xenstore META $(LIBS) xenstore.cmx xenstore.cmi *.a
-
- .PHONY: uninstall
- uninstall:
-- ocamlfind remove -destdir $(OCAMLDESTDIR) xs
-+ ocamlfind remove -destdir $(OCAMLDESTDIR) xenstore
-
- include $(TOPLEVEL)/Makefile.rules
-
---- a/tools/ocaml/libs/xs/queueop.ml
-+++ b/tools/ocaml/libs/xs/queueop.ml
-@@ -13,6 +13,7 @@
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *)
-+open Xenbus
-
- let data_concat ls = (String.concat "\000" ls) ^ "\000"
- let queue_path ty (tid: int) (path: string) con =
---- a/tools/ocaml/libs/xs/xs.ml
-+++ b/tools/ocaml/libs/xs/xs.ml
-@@ -69,7 +69,7 @@
- let read_watchevent xsh = Xsraw.read_watchevent xsh.con
-
- let make fd = get_operations (Xsraw.open_fd fd)
--let get_fd xsh = Xb.get_fd xsh.con.Xsraw.xb
-+let get_fd xsh = Xenbus.Xb.get_fd xsh.con.Xsraw.xb
-
- exception Timeout
-
---- a/tools/ocaml/libs/xs/xsraw.ml
-+++ b/tools/ocaml/libs/xs/xsraw.ml
-@@ -14,6 +14,8 @@
- * GNU Lesser General Public License for more details.
- *)
-
-+open Xenbus
-+
- exception Partial_not_empty
- exception Unexpected_packet of string
-
-@@ -27,7 +29,7 @@
- raise (Unexpected_packet s)
-
- type con = {
-- xb: Xb.t;
-+ xb: Xenbus.Xb.t;
- watchevents: (string * string) Queue.t;
- }
-
---- a/tools/ocaml/libs/xs/xsraw.mli
-+++ b/tools/ocaml/libs/xs/xsraw.mli
-@@ -16,8 +16,8 @@
- exception Partial_not_empty
- exception Unexpected_packet of string
- exception Invalid_path of string
--val unexpected_packet : Xb.Op.operation -> Xb.Op.operation -> 'a
--type con = { xb : Xb.t; watchevents : (string * string) Queue.t; }
-+val unexpected_packet : Xenbus.Xb.Op.operation -> Xenbus.Xb.Op.operation -> 'a
-+type con = { xb : Xenbus.Xb.t; watchevents : (string * string) Queue.t; }
- val close : con -> unit
- val open_fd : Unix.file_descr -> con
- val split_string : ?limit:int -> char -> string -> string list
-@@ -26,14 +26,14 @@
- val string_of_perms : int * perm * (int * perm) list -> string
- val perms_of_string : string -> int * perm * (int * perm) list
- val pkt_send : con -> unit
--val pkt_recv : con -> Xb.Packet.t
--val pkt_recv_timeout : con -> float -> bool * Xb.Packet.t option
-+val pkt_recv : con -> Xenbus.Xb.Packet.t
-+val pkt_recv_timeout : con -> float -> bool * Xenbus.Xb.Packet.t option
- val queue_watchevent : con -> string -> unit
- val has_watchevents : con -> bool
- val get_watchevent : con -> string * string
- val read_watchevent : con -> string * string
--val sync_recv : Xb.Op.operation -> con -> string
--val sync : (Xb.t -> 'a) -> con -> string
-+val sync_recv : Xenbus.Xb.Op.operation -> con -> string
-+val sync : (Xenbus.Xb.t -> 'a) -> con -> string
- val ack : string -> unit
- val validate_path : string -> unit
- val validate_watch_path : string -> unit
---- a/tools/ocaml/xenstored/Makefile
-+++ b/tools/ocaml/xenstored/Makefile
-@@ -35,11 +35,11 @@
- XENSTOREDLIBS = \
- unix.cmxa \
- $(OCAML_TOPLEVEL)/libs/uuid/uuid.cmxa \
-- -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/mmap $(OCAML_TOPLEVEL)/libs/mmap/mmap.cmxa \
-+ -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/mmap $(OCAML_TOPLEVEL)/libs/mmap/xenmmap.cmxa \
- -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/log $(OCAML_TOPLEVEL)/libs/log/log.cmxa \
-- -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/eventchn $(OCAML_TOPLEVEL)/libs/eventchn/eventchn.cmxa \
-- -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/xc $(OCAML_TOPLEVEL)/libs/xc/xc.cmxa \
-- -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/xb $(OCAML_TOPLEVEL)/libs/xb/xb.cmxa \
-+ -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/eventchn $(OCAML_TOPLEVEL)/libs/eventchn/xeneventchn.cmxa \
-+ -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/xc $(OCAML_TOPLEVEL)/libs/xc/xenctrl.cmxa \
-+ -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/xb $(OCAML_TOPLEVEL)/libs/xb/xenbus.cmxa \
- -ccopt -L -ccopt $(XEN_ROOT)/tools/libxc
-
- PROGRAMS = oxenstored
---- a/tools/ocaml/xenstored/connection.ml
-+++ b/tools/ocaml/xenstored/connection.ml
-@@ -27,7 +27,7 @@
- }
-
- and t = {
-- xb: Xb.t;
-+ xb: Xenbus.Xb.t;
- dom: Domain.t option;
- transactions: (int, Transaction.t) Hashtbl.t;
- mutable next_tid: int;
-@@ -93,10 +93,10 @@
- Logging.new_connection ~tid:Transaction.none ~con:(get_domstr con);
- con
-
--let get_fd con = Xb.get_fd con.xb
-+let get_fd con = Xenbus.Xb.get_fd con.xb
- let close con =
- Logging.end_connection ~tid:Transaction.none ~con:(get_domstr con);
-- Xb.close con.xb
-+ Xenbus.Xb.close con.xb
-
- let get_perm con =
- con.perm
-@@ -108,9 +108,9 @@
- con.perm <- Perms.Connection.set_target (get_perm con) ~perms:[Perms.READ; Perms.WRITE] target_domid
-
- let send_reply con tid rid ty data =
-- Xb.queue con.xb (Xb.Packet.create tid rid ty data)
-+ Xenbus.Xb.queue con.xb (Xenbus.Xb.Packet.create tid rid ty data)
-
--let send_error con tid rid err = send_reply con tid rid Xb.Op.Error (err ^ "\000")
-+let send_error con tid rid err = send_reply con tid rid Xenbus.Xb.Op.Error (err ^ "\000")
- let send_ack con tid rid ty = send_reply con tid rid ty "OK\000"
-
- let get_watch_path con path =
-@@ -166,7 +166,7 @@
-
- let fire_single_watch watch =
- let data = Utils.join_by_null [watch.path; watch.token; ""] in
-- send_reply watch.con Transaction.none 0 Xb.Op.Watchevent data
-+ send_reply watch.con Transaction.none 0 Xenbus.Xb.Op.Watchevent data
-
- let fire_watch watch path =
- let new_path =
-@@ -179,7 +179,7 @@
- path
- in
- let data = Utils.join_by_null [ new_path; watch.token; "" ] in
-- send_reply watch.con Transaction.none 0 Xb.Op.Watchevent data
-+ send_reply watch.con Transaction.none 0 Xenbus.Xb.Op.Watchevent data
-
- let find_next_tid con =
- let ret = con.next_tid in con.next_tid <- con.next_tid + 1; ret
-@@ -203,15 +203,15 @@
- let get_transaction con tid =
- Hashtbl.find con.transactions tid
-
--let do_input con = Xb.input con.xb
--let has_input con = Xb.has_in_packet con.xb
--let pop_in con = Xb.get_in_packet con.xb
--let has_more_input con = Xb.has_more_input con.xb
--
--let has_output con = Xb.has_output con.xb
--let has_new_output con = Xb.has_new_output con.xb
--let peek_output con = Xb.peek_output con.xb
--let do_output con = Xb.output con.xb
-+let do_input con = Xenbus.Xb.input con.xb
-+let has_input con = Xenbus.Xb.has_in_packet con.xb
-+let pop_in con = Xenbus.Xb.get_in_packet con.xb
-+let has_more_input con = Xenbus.Xb.has_more_input con.xb
-+
-+let has_output con = Xenbus.Xb.has_output con.xb
-+let has_new_output con = Xenbus.Xb.has_new_output con.xb
-+let peek_output con = Xenbus.Xb.peek_output con.xb
-+let do_output con = Xenbus.Xb.output con.xb
-
- let incr_ops con = con.stat_nb_ops <- con.stat_nb_ops + 1
-
---- a/tools/ocaml/xenstored/connections.ml
-+++ b/tools/ocaml/xenstored/connections.ml
-@@ -26,12 +26,12 @@
- let create () = { anonymous = []; domains = Hashtbl.create 8; watches = Trie.create () }
-
- let add_anonymous cons fd can_write =
-- let xbcon = Xb.open_fd fd in
-+ let xbcon = Xenbus.Xb.open_fd fd in
- let con = Connection.create xbcon None in
- cons.anonymous <- con :: cons.anonymous
-
- let add_domain cons dom =
-- let xbcon = Xb.open_mmap (Domain.get_interface dom) (fun () -> Domain.notify dom) in
-+ let xbcon = Xenbus.Xb.open_mmap (Domain.get_interface dom) (fun () -> Domain.notify dom) in
- let con = Connection.create xbcon (Some dom) in
- Hashtbl.add cons.domains (Domain.get_id dom) con
-
---- a/tools/ocaml/xenstored/domain.ml
-+++ b/tools/ocaml/xenstored/domain.ml
-@@ -20,10 +20,10 @@
-
- type t =
- {
-- id: Xc.domid;
-+ id: Xenctrl.domid;
- mfn: nativeint;
- remote_port: int;
-- interface: Mmap.mmap_interface;
-+ interface: Xenmmap.mmap_interface;
- eventchn: Event.t;
- mutable port: int;
- }
-@@ -47,7 +47,7 @@
- let close dom =
- debug "domain %d unbound port %d" dom.id dom.port;
- Event.unbind dom.eventchn dom.port;
-- Mmap.unmap dom.interface;
-+ Xenmmap.unmap dom.interface;
- ()
-
- let make id mfn remote_port interface eventchn = {
---- a/tools/ocaml/xenstored/domains.ml
-+++ b/tools/ocaml/xenstored/domains.ml
-@@ -16,7 +16,7 @@
-
- type domains = {
- eventchn: Event.t;
-- table: (Xc.domid, Domain.t) Hashtbl.t;
-+ table: (Xenctrl.domid, Domain.t) Hashtbl.t;
- }
-
- let init eventchn =
-@@ -33,16 +33,16 @@
-
- Hashtbl.iter (fun id _ -> if id <> 0 then
- try
-- let info = Xc.domain_getinfo xc id in
-- if info.Xc.shutdown || info.Xc.dying then (
-+ let info = Xenctrl.domain_getinfo xc id in
-+ if info.Xenctrl.shutdown || info.Xenctrl.dying then (
- Logs.debug "general" "Domain %u died (dying=%b, shutdown %b -- code %d)"
-- id info.Xc.dying info.Xc.shutdown info.Xc.shutdown_code;
-- if info.Xc.dying then
-+ id info.Xenctrl.dying info.Xenctrl.shutdown info.Xenctrl.shutdown_code;
-+ if info.Xenctrl.dying then
- dead_dom := id :: !dead_dom
- else
- notify := true;
- )
-- with Xc.Error _ ->
-+ with Xenctrl.Error _ ->
- Logs.debug "general" "Domain %u died -- no domain info" id;
- dead_dom := id :: !dead_dom;
- ) doms.table;
-@@ -57,7 +57,7 @@
- ()
-
- let create xc doms domid mfn port =
-- let interface = Xc.map_foreign_range xc domid (Mmap.getpagesize()) mfn in
-+ let interface = Xenctrl.map_foreign_range xc domid (Xenmmap.getpagesize()) mfn in
- let dom = Domain.make domid mfn port interface doms.eventchn in
- Hashtbl.add doms.table domid dom;
- Domain.bind_interdomain dom;
-@@ -66,13 +66,13 @@
- let create0 fake doms =
- let port, interface =
- if fake then (
-- 0, Xc.with_intf (fun xc -> Xc.map_foreign_range xc 0 (Mmap.getpagesize()) 0n)
-+ 0, Xenctrl.with_intf (fun xc -> Xenctrl.map_foreign_range xc 0 (Xenmmap.getpagesize()) 0n)
- ) else (
- let port = Utils.read_file_single_integer Define.xenstored_proc_port
- and fd = Unix.openfile Define.xenstored_proc_kva
- [ Unix.O_RDWR ] 0o600 in
-- let interface = Mmap.mmap fd Mmap.RDWR Mmap.SHARED
-- (Mmap.getpagesize()) 0 in
-+ let interface = Xenmmap.mmap fd Xenmmap.RDWR Xenmmap.SHARED
-+ (Xenmmap.getpagesize()) 0 in
- Unix.close fd;
- port, interface
- )
---- a/tools/ocaml/xenstored/event.ml
-+++ b/tools/ocaml/xenstored/event.ml
-@@ -16,15 +16,15 @@
-
- (**************** high level binding ****************)
- type t = {
-- handle: Eventchn.handle;
-+ handle: Xeneventchn.handle;
- mutable virq_port: int;
- }
-
--let init () = { handle = Eventchn.init (); virq_port = -1; }
--let fd eventchn = Eventchn.fd eventchn.handle
--let bind_dom_exc_virq eventchn = eventchn.virq_port <- Eventchn.bind_dom_exc_virq eventchn.handle
--let bind_interdomain eventchn domid port = Eventchn.bind_interdomain eventchn.handle domid port
--let unbind eventchn port = Eventchn.unbind eventchn.handle port
--let notify eventchn port = Eventchn.notify eventchn.handle port
--let pending eventchn = Eventchn.pending eventchn.handle
--let unmask eventchn port = Eventchn.unmask eventchn.handle port
-+let init () = { handle = Xeneventchn.init (); virq_port = -1; }
-+let fd eventchn = Xeneventchn.fd eventchn.handle
-+let bind_dom_exc_virq eventchn = eventchn.virq_port <- Xeneventchn.bind_dom_exc_virq eventchn.handle
-+let bind_interdomain eventchn domid port = Xeneventchn.bind_interdomain eventchn.handle domid port
-+let unbind eventchn port = Xeneventchn.unbind eventchn.handle port
-+let notify eventchn port = Xeneventchn.notify eventchn.handle port
-+let pending eventchn = Xeneventchn.pending eventchn.handle
-+let unmask eventchn port = Xeneventchn.unmask eventchn.handle port
---- a/tools/ocaml/xenstored/logging.ml
-+++ b/tools/ocaml/xenstored/logging.ml
-@@ -39,7 +39,7 @@
- | Commit
- | Newconn
- | Endconn
-- | XbOp of Xb.Op.operation
-+ | XbOp of Xenbus.Xb.Op.operation
-
- type access =
- {
-@@ -82,35 +82,35 @@
- | Endconn -> "endconn "
-
- | XbOp op -> match op with
-- | Xb.Op.Debug -> "debug "
-+ | Xenbus.Xb.Op.Debug -> "debug "
-
-- | Xb.Op.Directory -> "directory"
-- | Xb.Op.Read -> "read "
-- | Xb.Op.Getperms -> "getperms "
--
-- | Xb.Op.Watch -> "watch "
-- | Xb.Op.Unwatch -> "unwatch "
--
-- | Xb.Op.Transaction_start -> "t start "
-- | Xb.Op.Transaction_end -> "t end "
--
-- | Xb.Op.Introduce -> "introduce"
-- | Xb.Op.Release -> "release "
-- | Xb.Op.Getdomainpath -> "getdomain"
-- | Xb.Op.Isintroduced -> "is introduced"
-- | Xb.Op.Resume -> "resume "
-+ | Xenbus.Xb.Op.Directory -> "directory"
-+ | Xenbus.Xb.Op.Read -> "read "
-+ | Xenbus.Xb.Op.Getperms -> "getperms "
-+
-+ | Xenbus.Xb.Op.Watch -> "watch "
-+ | Xenbus.Xb.Op.Unwatch -> "unwatch "
-+
-+ | Xenbus.Xb.Op.Transaction_start -> "t start "
-+ | Xenbus.Xb.Op.Transaction_end -> "t end "
-+
-+ | Xenbus.Xb.Op.Introduce -> "introduce"
-+ | Xenbus.Xb.Op.Release -> "release "
-+ | Xenbus.Xb.Op.Getdomainpath -> "getdomain"
-+ | Xenbus.Xb.Op.Isintroduced -> "is introduced"
-+ | Xenbus.Xb.Op.Resume -> "resume "
-
-- | Xb.Op.Write -> "write "
-- | Xb.Op.Mkdir -> "mkdir "
-- | Xb.Op.Rm -> "rm "
-- | Xb.Op.Setperms -> "setperms "
-- | Xb.Op.Restrict -> "restrict "
-- | Xb.Op.Set_target -> "settarget"
-+ | Xenbus.Xb.Op.Write -> "write "
-+ | Xenbus.Xb.Op.Mkdir -> "mkdir "
-+ | Xenbus.Xb.Op.Rm -> "rm "
-+ | Xenbus.Xb.Op.Setperms -> "setperms "
-+ | Xenbus.Xb.Op.Restrict -> "restrict "
-+ | Xenbus.Xb.Op.Set_target -> "settarget"
-
-- | Xb.Op.Error -> "error "
-- | Xb.Op.Watchevent -> "w event "
-+ | Xenbus.Xb.Op.Error -> "error "
-+ | Xenbus.Xb.Op.Watchevent -> "w event "
-
-- | x -> Xb.Op.to_string x
-+ | x -> Xenbus.Xb.Op.to_string x
-
- let file_exists file =
- try
-@@ -210,10 +210,10 @@
- let xb_op ~tid ~con ~ty data =
- let print =
- match ty with
-- | Xb.Op.Read | Xb.Op.Directory | Xb.Op.Getperms -> !log_read_ops
-- | Xb.Op.Transaction_start | Xb.Op.Transaction_end ->
-+ | Xenbus.Xb.Op.Read | Xenbus.Xb.Op.Directory | Xenbus.Xb.Op.Getperms -> !log_read_ops
-+ | Xenbus.Xb.Op.Transaction_start | Xenbus.Xb.Op.Transaction_end ->
- false (* transactions are managed below *)
-- | Xb.Op.Introduce | Xb.Op.Release | Xb.Op.Getdomainpath | Xb.Op.Isintroduced | Xb.Op.Resume ->
-+ | Xenbus.Xb.Op.Introduce | Xenbus.Xb.Op.Release | Xenbus.Xb.Op.Getdomainpath | Xenbus.Xb.Op.Isintroduced | Xenbus.Xb.Op.Resume ->
- !log_special_ops
- | _ -> true
- in
-@@ -222,17 +222,17 @@
-
- let start_transaction ~tid ~con =
- if !log_transaction_ops && tid <> 0
-- then write_access_log ~tid ~con (XbOp Xb.Op.Transaction_start)
-+ then write_access_log ~tid ~con (XbOp Xenbus.Xb.Op.Transaction_start)
-
- let end_transaction ~tid ~con =
- if !log_transaction_ops && tid <> 0
-- then write_access_log ~tid ~con (XbOp Xb.Op.Transaction_end)
-+ then write_access_log ~tid ~con (XbOp Xenbus.Xb.Op.Transaction_end)
-
- let xb_answer ~tid ~con ~ty data =
- let print = match ty with
-- | Xb.Op.Error when data="ENOENT " -> !log_read_ops
-- | Xb.Op.Error -> !log_special_ops
-- | Xb.Op.Watchevent -> true
-+ | Xenbus.Xb.Op.Error when data="ENOENT " -> !log_read_ops
-+ | Xenbus.Xb.Op.Error -> !log_special_ops
-+ | Xenbus.Xb.Op.Watchevent -> true
- | _ -> false
- in
- if print
---- a/tools/ocaml/xenstored/perms.ml
-+++ b/tools/ocaml/xenstored/perms.ml
-@@ -43,9 +43,9 @@
-
- type t =
- {
-- owner: Xc.domid;
-+ owner: Xenctrl.domid;
- other: permty;
-- acl: (Xc.domid * permty) list;
-+ acl: (Xenctrl.domid * permty) list;
- }
-
- let create owner other acl =
-@@ -88,7 +88,7 @@
- module Connection =
- struct
-
--type elt = Xc.domid * (permty list)
-+type elt = Xenctrl.domid * (permty list)
- type t =
- { main: elt;
- target: elt option; }
---- a/tools/ocaml/xenstored/process.ml
-+++ b/tools/ocaml/xenstored/process.ml
-@@ -54,10 +54,10 @@
- let process_watch ops cons =
- let do_op_watch op cons =
- let recurse = match (fst op) with
-- | Xb.Op.Write -> false
-- | Xb.Op.Mkdir -> false
-- | Xb.Op.Rm -> true
-- | Xb.Op.Setperms -> false
-+ | Xenbus.Xb.Op.Write -> false
-+ | Xenbus.Xb.Op.Mkdir -> false
-+ | Xenbus.Xb.Op.Rm -> true
-+ | Xenbus.Xb.Op.Setperms -> false
- | _ -> raise (Failure "huh ?") in
- Connections.fire_watches cons (snd op) recurse in
- List.iter (fun op -> do_op_watch op cons) ops
-@@ -83,7 +83,7 @@
- then None
- else try match split None '\000' data with
- | "print" :: msg :: _ ->
-- Logging.xb_op ~tid:0 ~ty:Xb.Op.Debug ~con:"=======>" msg;
-+ Logging.xb_op ~tid:0 ~ty:Xenbus.Xb.Op.Debug ~con:"=======>" msg;
- None
- | "quota" :: domid :: _ ->
- let domid = int_of_string domid in
-@@ -120,7 +120,7 @@
- | _ -> raise Invalid_Cmd_Args
- in
- let watch = Connections.add_watch cons con node token in
-- Connection.send_ack con (Transaction.get_id t) rid Xb.Op.Watch;
-+ Connection.send_ack con (Transaction.get_id t) rid Xenbus.Xb.Op.Watch;
- Connection.fire_single_watch watch
-
- let do_unwatch con t domains cons data =
-@@ -165,7 +165,7 @@
- if Domains.exist domains domid then
- Domains.find domains domid
- else try
-- let ndom = Xc.with_intf (fun xc ->
-+ let ndom = Xenctrl.with_intf (fun xc ->
- Domains.create xc domains domid mfn port) in
- Connections.add_domain cons ndom;
- Connections.fire_spec_watches cons "@introduceDomain";
-@@ -299,25 +299,25 @@
-
- let function_of_type ty =
- match ty with
-- | Xb.Op.Debug -> reply_data_or_ack do_debug
-- | Xb.Op.Directory -> reply_data do_directory
-- | Xb.Op.Read -> reply_data do_read
-- | Xb.Op.Getperms -> reply_data do_getperms
-- | Xb.Op.Watch -> reply_none do_watch
-- | Xb.Op.Unwatch -> reply_ack do_unwatch
-- | Xb.Op.Transaction_start -> reply_data do_transaction_start
-- | Xb.Op.Transaction_end -> reply_ack do_transaction_end
-- | Xb.Op.Introduce -> reply_ack do_introduce
-- | Xb.Op.Release -> reply_ack do_release
-- | Xb.Op.Getdomainpath -> reply_data do_getdomainpath
-- | Xb.Op.Write -> reply_ack do_write
-- | Xb.Op.Mkdir -> reply_ack do_mkdir
-- | Xb.Op.Rm -> reply_ack do_rm
-- | Xb.Op.Setperms -> reply_ack do_setperms
-- | Xb.Op.Isintroduced -> reply_data do_isintroduced
-- | Xb.Op.Resume -> reply_ack do_resume
-- | Xb.Op.Set_target -> reply_ack do_set_target
-- | Xb.Op.Restrict -> reply_ack do_restrict
-+ | Xenbus.Xb.Op.Debug -> reply_data_or_ack do_debug
-+ | Xenbus.Xb.Op.Directory -> reply_data do_directory
-+ | Xenbus.Xb.Op.Read -> reply_data do_read
-+ | Xenbus.Xb.Op.Getperms -> reply_data do_getperms
-+ | Xenbus.Xb.Op.Watch -> reply_none do_watch
-+ | Xenbus.Xb.Op.Unwatch -> reply_ack do_unwatch
-+ | Xenbus.Xb.Op.Transaction_start -> reply_data do_transaction_start
-+ | Xenbus.Xb.Op.Transaction_end -> reply_ack do_transaction_end
-+ | Xenbus.Xb.Op.Introduce -> reply_ack do_introduce
-+ | Xenbus.Xb.Op.Release -> reply_ack do_release
-+ | Xenbus.Xb.Op.Getdomainpath -> reply_data do_getdomainpath
-+ | Xenbus.Xb.Op.Write -> reply_ack do_write
-+ | Xenbus.Xb.Op.Mkdir -> reply_ack do_mkdir
-+ | Xenbus.Xb.Op.Rm -> reply_ack do_rm
-+ | Xenbus.Xb.Op.Setperms -> reply_ack do_setperms
-+ | Xenbus.Xb.Op.Isintroduced -> reply_data do_isintroduced
-+ | Xenbus.Xb.Op.Resume -> reply_ack do_resume
-+ | Xenbus.Xb.Op.Set_target -> reply_ack do_set_target
-+ | Xenbus.Xb.Op.Restrict -> reply_ack do_restrict
- | _ -> reply_ack do_error
-
- let input_handle_error ~cons ~doms ~fct ~ty ~con ~t ~rid ~data =
-@@ -370,11 +370,11 @@
- let do_input store cons doms con =
- if Connection.do_input con then (
- let packet = Connection.pop_in con in
-- let tid, rid, ty, data = Xb.Packet.unpack packet in
-+ let tid, rid, ty, data = Xenbus.Xb.Packet.unpack packet in
- (* As we don't log IO, do not call an unnecessary sanitize_data
- Logs.info "io" "[%s] -> [%d] %s \"%s\""
- (Connection.get_domstr con) tid
-- (Xb.Op.to_string ty) (sanitize_data data); *)
-+ (Xenbus.Xb.Op.to_string ty) (sanitize_data data); *)
- process_packet ~store ~cons ~doms ~con ~tid ~rid ~ty ~data;
- write_access_log ~ty ~tid ~con ~data;
- Connection.incr_ops con;
-@@ -384,11 +384,11 @@
- if Connection.has_output con then (
- if Connection.has_new_output con then (
- let packet = Connection.peek_output con in
-- let tid, rid, ty, data = Xb.Packet.unpack packet in
-+ let tid, rid, ty, data = Xenbus.Xb.Packet.unpack packet in
- (* As we don't log IO, do not call an unnecessary sanitize_data
- Logs.info "io" "[%s] <- %s \"%s\""
- (Connection.get_domstr con)
-- (Xb.Op.to_string ty) (sanitize_data data);*)
-+ (Xenbus.Xb.Op.to_string ty) (sanitize_data data);*)
- write_answer_log ~ty ~tid ~con ~data;
- );
- ignore (Connection.do_output con)
---- a/tools/ocaml/xenstored/quota.ml
-+++ b/tools/ocaml/xenstored/quota.ml
-@@ -26,7 +26,7 @@
- type t = {
- maxent: int; (* max entities per domU *)
- maxsize: int; (* max size of data store in one node *)
-- cur: (Xc.domid, int) Hashtbl.t; (* current domains quota *)
-+ cur: (Xenctrl.domid, int) Hashtbl.t; (* current domains quota *)
- }
-
- let to_string quota domid =
---- a/tools/ocaml/xenstored/transaction.ml
-+++ b/tools/ocaml/xenstored/transaction.ml
-@@ -74,7 +74,7 @@
- type t = {
- ty: ty;
- store: Store.t;
-- mutable ops: (Xb.Op.operation * Store.Path.t) list;
-+ mutable ops: (Xenbus.Xb.Op.operation * Store.Path.t) list;
- mutable read_lowpath: Store.Path.t option;
- mutable write_lowpath: Store.Path.t option;
- }
-@@ -105,23 +105,23 @@
- if path_exists
- then set_write_lowpath t path
- else set_write_lowpath t (Store.Path.get_parent path);
-- add_wop t Xb.Op.Write path
-+ add_wop t Xenbus.Xb.Op.Write path
-
- let mkdir ?(with_watch=true) t perm path =
- Store.mkdir t.store perm path;
- set_write_lowpath t path;
- if with_watch then
-- add_wop t Xb.Op.Mkdir path
-+ add_wop t Xenbus.Xb.Op.Mkdir path
-
- let setperms t perm path perms =
- Store.setperms t.store perm path perms;
- set_write_lowpath t path;
-- add_wop t Xb.Op.Setperms path
-+ add_wop t Xenbus.Xb.Op.Setperms path
-
- let rm t perm path =
- Store.rm t.store perm path;
- set_write_lowpath t (Store.Path.get_parent path);
-- add_wop t Xb.Op.Rm path
-+ add_wop t Xenbus.Xb.Op.Rm path
-
- let ls t perm path =
- let r = Store.ls t.store perm path in
---- a/tools/ocaml/xenstored/xenstored.ml
-+++ b/tools/ocaml/xenstored/xenstored.ml
-@@ -35,7 +35,7 @@
- if err <> Unix.ECONNRESET then
- error "closing socket connection: read error: %s"
- (Unix.error_message err)
-- | Xb.End_of_file ->
-+ | Xenbus.Xb.End_of_file ->
- Connections.del_anonymous cons c;
- debug "closing socket connection"
- in
-@@ -170,7 +170,7 @@
- let from_channel store cons doms chan =
- (* don't let the permission get on our way, full perm ! *)
- let op = Store.get_ops store Perms.Connection.full_rights in
-- let xc = Xc.interface_open () in
-+ let xc = Xenctrl.interface_open () in
-
- let domain_f domid mfn port =
- let ndom =
-@@ -190,7 +190,7 @@
- op.Store.setperms path perms
- in
- finally (fun () -> from_channel_f chan domain_f watch_f store_f)
-- (fun () -> Xc.interface_close xc)
-+ (fun () -> Xenctrl.interface_close xc)
-
- let from_file store cons doms file =
- let channel = open_in file in
-@@ -282,7 +282,7 @@
- Store.mkdir store (Perms.Connection.create 0) localpath;
-
- if cf.domain_init then (
-- let usingxiu = Xc.is_fake () in
-+ let usingxiu = Xenctrl.is_fake () in
- Connections.add_domain cons (Domains.create0 usingxiu domains);
- Event.bind_dom_exc_virq eventchn
- );
-@@ -301,7 +301,7 @@
- (if cf.domain_init then [ Event.fd eventchn ] else [])
- in
-
-- let xc = Xc.interface_open () in
-+ let xc = Xenctrl.interface_open () in
-
- let process_special_fds rset =
- let accept_connection can_write fd =
---- a/tools/ocaml/libs/xl/xl.ml
-+++ /dev/null
-@@ -1,213 +0,0 @@
--(*
-- * Copyright (C) 2009-2010 Citrix Ltd.
-- * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License as published
-- * by the Free Software Foundation; version 2.1 only. with the special
-- * exception on linking described in file LICENSE.
-- *
-- * 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 Lesser General Public License for more details.
-- *)
--
--exception Error of string
--
--type create_info =
--{
-- hvm : bool;
-- hap : bool;
-- oos : bool;
-- ssidref : int32;
-- name : string;
-- uuid : int array;
-- xsdata : (string * string) list;
-- platformdata : (string * string) list;
-- poolid : int32;
-- poolname : string;
--}
--
--type build_pv_info =
--{
-- slack_memkb : int64;
-- cmdline : string;
-- ramdisk : string;
-- features : string;
--}
--
--type build_hvm_info =
--{
-- pae : bool;
-- apic : bool;
-- acpi : bool;
-- nx : bool;
-- viridian : bool;
-- timeoffset : string;
-- timer_mode : int;
-- hpet : int;
-- vpt_align : int;
--}
--
--type build_spec = BuildHVM of build_hvm_info | BuildPV of build_pv_info
--
--type build_info =
--{
-- max_vcpus : int;
-- cur_vcpus : int;
-- max_memkb : int64;
-- target_memkb : int64;
-- video_memkb : int64;
-- shadow_memkb : int64;
-- kernel : string;
-- priv: build_spec;
--}
--
--type build_state =
--{
-- store_port : int;
-- store_mfn : int64;
-- console_port : int;
-- console_mfn : int64;
--}
--
--type domid = int
--
--type disk_phystype =
-- | PHYSTYPE_QCOW
-- | PHYSTYPE_QCOW2
-- | PHYSTYPE_VHD
-- | PHYSTYPE_AIO
-- | PHYSTYPE_FILE
-- | PHYSTYPE_PHY
--
--type disk_info =
--{
-- backend_domid : domid;
-- physpath : string;
-- phystype : disk_phystype;
-- virtpath : string;
-- unpluggable : bool;
-- readwrite : bool;
-- is_cdrom : bool;
--}
--
--type nic_type =
-- | NICTYPE_IOEMU
-- | NICTYPE_VIF
--
--type nic_info =
--{
-- backend_domid : domid;
-- devid : int;
-- mtu : int;
-- model : string;
-- mac : int array;
-- bridge : string;
-- ifname : string;
-- script : string;
-- nictype : nic_type;
--}
--
--type console_type =
-- | CONSOLETYPE_XENCONSOLED
-- | CONSOLETYPE_IOEMU
--
--type console_info =
--{
-- backend_domid : domid;
-- devid : int;
-- consoletype : console_type;
--}
--
--type vkb_info =
--{
-- backend_domid : domid;
-- devid : int;
--}
--
--type vfb_info =
--{
-- backend_domid : domid;
-- devid : int;
-- vnc : bool;
-- vnclisten : string;
-- vncpasswd : string;
-- vncdisplay : int;
-- vncunused : bool;
-- keymap : string;
-- sdl : bool;
-- opengl : bool;
-- display : string;
-- xauthority : string;
--}
--
--type pci_info =
--{
-- v : int; (* domain * bus * dev * func multiplexed *)
-- domain : int;
-- vdevfn : int;
-- msitranslate : bool;
-- power_mgmt : bool;
--}
--
--type physinfo =
--{
-- threads_per_core: int;
-- cores_per_socket: int;
-- max_cpu_id: int;
-- nr_cpus: int;
-- cpu_khz: int;
-- total_pages: int64;
-- free_pages: int64;
-- scrub_pages: int64;
-- nr_nodes: int;
-- hwcap: int32 array;
-- physcap: int32;
--}
--
--type sched_credit =
--{
-- weight: int;
-- cap: int;
--}
--
--external domain_make : create_info -> domid = "stub_xl_domain_make"
--external domain_build : build_info -> domid -> build_state = "stub_xl_domain_build"
--
--external disk_add : disk_info -> domid -> unit = "stub_xl_disk_add"
--external disk_remove : disk_info -> domid -> unit = "stub_xl_disk_remove"
--
--external nic_add : nic_info -> domid -> unit = "stub_xl_nic_add"
--external nic_remove : disk_info -> domid -> unit = "stub_xl_nic_remove"
--
--external console_add : console_info -> build_state -> domid -> unit = "stub_xl_console_add"
--
--external vkb_add : vkb_info -> domid -> unit = "stub_xl_vkb_add"
--external vkb_clean_shutdown : domid -> unit = "stub_vkb_clean_shutdown"
--external vkb_hard_shutdown : domid -> unit = "stub_vkb_hard_shutdown"
--
--external vfb_add : vfb_info -> domid -> unit = "stub_xl_vfb_add"
--external vfb_clean_shutdown : domid -> unit = "stub_vfb_clean_shutdown"
--external vfb_hard_shutdown : domid -> unit = "stub_vfb_hard_shutdown"
--
--external pci_add : pci_info -> domid -> unit = "stub_xl_pci_add"
--external pci_remove : pci_info -> domid -> unit = "stub_xl_pci_remove"
--external pci_shutdown : domid -> unit = "stub_xl_pci_shutdown"
--
--type button =
-- | Button_Power
-- | Button_Sleep
--
--external button_press : domid -> button -> unit = "stub_xl_button_press"
--external physinfo : unit -> physinfo = "stub_xl_physinfo"
--
--external domain_sched_credit_get : domid -> sched_credit = "stub_xl_sched_credit_domain_get"
--external domain_sched_credit_set : domid -> sched_credit -> unit = "stub_xl_sched_credit_domain_set"
--
--external send_trigger : domid -> string -> int -> unit = "stub_xl_send_trigger"
--external send_sysrq : domid -> char -> unit = "stub_xl_send_sysrq"
--external send_debug_keys : domid -> string -> unit = "stub_xl_send_debug_keys"
--
--let _ = Callback.register_exception "xl.error" (Error "register_callback")
---- a/tools/ocaml/libs/xl/xl.mli
-+++ /dev/null
-@@ -1,211 +0,0 @@
--(*
-- * Copyright (C) 2009-2010 Citrix Ltd.
-- * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License as published
-- * by the Free Software Foundation; version 2.1 only. with the special
-- * exception on linking described in file LICENSE.
-- *
-- * 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 Lesser General Public License for more details.
-- *)
--
--exception Error of string
--
--type create_info =
--{
-- hvm : bool;
-- hap : bool;
-- oos : bool;
-- ssidref : int32;
-- name : string;
-- uuid : int array;
-- xsdata : (string * string) list;
-- platformdata : (string * string) list;
-- poolid : int32;
-- poolname : string;
--}
--
--type build_pv_info =
--{
-- slack_memkb : int64;
-- cmdline : string;
-- ramdisk : string;
-- features : string;
--}
--
--type build_hvm_info =
--{
-- pae : bool;
-- apic : bool;
-- acpi : bool;
-- nx : bool;
-- viridian : bool;
-- timeoffset : string;
-- timer_mode : int;
-- hpet : int;
-- vpt_align : int;
--}
--
--type build_spec = BuildHVM of build_hvm_info | BuildPV of build_pv_info
--
--type build_info =
--{
-- max_vcpus : int;
-- cur_vcpus : int;
-- max_memkb : int64;
-- target_memkb : int64;
-- video_memkb : int64;
-- shadow_memkb : int64;
-- kernel : string;
-- priv: build_spec;
--}
--
--type build_state =
--{
-- store_port : int;
-- store_mfn : int64;
-- console_port : int;
-- console_mfn : int64;
--}
--
--type domid = int
--
--type disk_phystype =
-- | PHYSTYPE_QCOW
-- | PHYSTYPE_QCOW2
-- | PHYSTYPE_VHD
-- | PHYSTYPE_AIO
-- | PHYSTYPE_FILE
-- | PHYSTYPE_PHY
--
--type disk_info =
--{
-- backend_domid : domid;
-- physpath : string;
-- phystype : disk_phystype;
-- virtpath : string;
-- unpluggable : bool;
-- readwrite : bool;
-- is_cdrom : bool;
--}
--
--type nic_type =
-- | NICTYPE_IOEMU
-- | NICTYPE_VIF
--
--type nic_info =
--{
-- backend_domid : domid;
-- devid : int;
-- mtu : int;
-- model : string;
-- mac : int array;
-- bridge : string;
-- ifname : string;
-- script : string;
-- nictype : nic_type;
--}
--
--type console_type =
-- | CONSOLETYPE_XENCONSOLED
-- | CONSOLETYPE_IOEMU
--
--type console_info =
--{
-- backend_domid : domid;
-- devid : int;
-- consoletype : console_type;
--}
--
--type vkb_info =
--{
-- backend_domid : domid;
-- devid : int;
--}
--
--type vfb_info =
--{
-- backend_domid : domid;
-- devid : int;
-- vnc : bool;
-- vnclisten : string;
-- vncpasswd : string;
-- vncdisplay : int;
-- vncunused : bool;
-- keymap : string;
-- sdl : bool;
-- opengl : bool;
-- display : string;
-- xauthority : string;
--}
--
--type pci_info =
--{
-- v : int; (* domain * bus * dev * func multiplexed *)
-- domain : int;
-- vdevfn : int;
-- msitranslate : bool;
-- power_mgmt : bool;
--}
--
--type physinfo =
--{
-- threads_per_core: int;
-- cores_per_socket: int;
-- max_cpu_id: int;
-- nr_cpus: int;
-- cpu_khz: int;
-- total_pages: int64;
-- free_pages: int64;
-- scrub_pages: int64;
-- nr_nodes: int;
-- hwcap: int32 array;
-- physcap: int32;
--}
--
--type sched_credit =
--{
-- weight: int;
-- cap: int;
--}
--
--external domain_make : create_info -> domid = "stub_xl_domain_make"
--external domain_build : build_info -> domid -> build_state = "stub_xl_domain_build"
--
--external disk_add : disk_info -> domid -> unit = "stub_xl_disk_add"
--external disk_remove : disk_info -> domid -> unit = "stub_xl_disk_remove"
--
--external nic_add : nic_info -> domid -> unit = "stub_xl_nic_add"
--external nic_remove : disk_info -> domid -> unit = "stub_xl_nic_remove"
--
--external console_add : console_info -> build_state -> domid -> unit = "stub_xl_console_add"
--
--external vkb_add : vkb_info -> domid -> unit = "stub_xl_vkb_add"
--external vkb_clean_shutdown : domid -> unit = "stub_vkb_clean_shutdown"
--external vkb_hard_shutdown : domid -> unit = "stub_vkb_hard_shutdown"
--
--external vfb_add : vfb_info -> domid -> unit = "stub_xl_vfb_add"
--external vfb_clean_shutdown : domid -> unit = "stub_vfb_clean_shutdown"
--external vfb_hard_shutdown : domid -> unit = "stub_vfb_hard_shutdown"
--
--external pci_add : pci_info -> domid -> unit = "stub_xl_pci_add"
--external pci_remove : pci_info -> domid -> unit = "stub_xl_pci_remove"
--external pci_shutdown : domid -> unit = "stub_xl_pci_shutdown"
--
--type button =
-- | Button_Power
-- | Button_Sleep
--
--external button_press : domid -> button -> unit = "stub_xl_button_press"
--external physinfo : unit -> physinfo = "stub_xl_physinfo"
--
--external domain_sched_credit_get : domid -> sched_credit = "stub_xl_sched_credit_domain_get"
--external domain_sched_credit_set : domid -> sched_credit -> unit = "stub_xl_sched_credit_domain_set"
--
--external send_trigger : domid -> string -> int -> unit = "stub_xl_send_trigger"
--external send_sysrq : domid -> char -> unit = "stub_xl_send_sysrq"
--external send_debug_keys : domid -> string -> unit = "stub_xl_send_debug_keys"
---- /dev/null
-+++ b/tools/ocaml/libs/xl/xenlight.ml
-@@ -0,0 +1,213 @@
-+(*
-+ * Copyright (C) 2009-2010 Citrix Ltd.
-+ * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License as published
-+ * by the Free Software Foundation; version 2.1 only. with the special
-+ * exception on linking described in file LICENSE.
-+ *
-+ * 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 Lesser General Public License for more details.
-+ *)
-+
-+exception Error of string
-+
-+type create_info =
-+{
-+ hvm : bool;
-+ hap : bool;
-+ oos : bool;
-+ ssidref : int32;
-+ name : string;
-+ uuid : int array;
-+ xsdata : (string * string) list;
-+ platformdata : (string * string) list;
-+ poolid : int32;
-+ poolname : string;
-+}
-+
-+type build_pv_info =
-+{
-+ slack_memkb : int64;
-+ cmdline : string;
-+ ramdisk : string;
-+ features : string;
-+}
-+
-+type build_hvm_info =
-+{
-+ pae : bool;
-+ apic : bool;
-+ acpi : bool;
-+ nx : bool;
-+ viridian : bool;
-+ timeoffset : string;
-+ timer_mode : int;
-+ hpet : int;
-+ vpt_align : int;
-+}
-+
-+type build_spec = BuildHVM of build_hvm_info | BuildPV of build_pv_info
-+
-+type build_info =
-+{
-+ max_vcpus : int;
-+ cur_vcpus : int;
-+ max_memkb : int64;
-+ target_memkb : int64;
-+ video_memkb : int64;
-+ shadow_memkb : int64;
-+ kernel : string;
-+ priv: build_spec;
-+}
-+
-+type build_state =
-+{
-+ store_port : int;
-+ store_mfn : int64;
-+ console_port : int;
-+ console_mfn : int64;
-+}
-+
-+type domid = int
-+
-+type disk_phystype =
-+ | PHYSTYPE_QCOW
-+ | PHYSTYPE_QCOW2
-+ | PHYSTYPE_VHD
-+ | PHYSTYPE_AIO
-+ | PHYSTYPE_FILE
-+ | PHYSTYPE_PHY
-+
-+type disk_info =
-+{
-+ backend_domid : domid;
-+ physpath : string;
-+ phystype : disk_phystype;
-+ virtpath : string;
-+ unpluggable : bool;
-+ readwrite : bool;
-+ is_cdrom : bool;
-+}
-+
-+type nic_type =
-+ | NICTYPE_IOEMU
-+ | NICTYPE_VIF
-+
-+type nic_info =
-+{
-+ backend_domid : domid;
-+ devid : int;
-+ mtu : int;
-+ model : string;
-+ mac : int array;
-+ bridge : string;
-+ ifname : string;
-+ script : string;
-+ nictype : nic_type;
-+}
-+
-+type console_type =
-+ | CONSOLETYPE_XENCONSOLED
-+ | CONSOLETYPE_IOEMU
-+
-+type console_info =
-+{
-+ backend_domid : domid;
-+ devid : int;
-+ consoletype : console_type;
-+}
-+
-+type vkb_info =
-+{
-+ backend_domid : domid;
-+ devid : int;
-+}
-+
-+type vfb_info =
-+{
-+ backend_domid : domid;
-+ devid : int;
-+ vnc : bool;
-+ vnclisten : string;
-+ vncpasswd : string;
-+ vncdisplay : int;
-+ vncunused : bool;
-+ keymap : string;
-+ sdl : bool;
-+ opengl : bool;
-+ display : string;
-+ xauthority : string;
-+}
-+
-+type pci_info =
-+{
-+ v : int; (* domain * bus * dev * func multiplexed *)
-+ domain : int;
-+ vdevfn : int;
-+ msitranslate : bool;
-+ power_mgmt : bool;
-+}
-+
-+type physinfo =
-+{
-+ threads_per_core: int;
-+ cores_per_socket: int;
-+ max_cpu_id: int;
-+ nr_cpus: int;
-+ cpu_khz: int;
-+ total_pages: int64;
-+ free_pages: int64;
-+ scrub_pages: int64;
-+ nr_nodes: int;
-+ hwcap: int32 array;
-+ physcap: int32;
-+}
-+
-+type sched_credit =
-+{
-+ weight: int;
-+ cap: int;
-+}
-+
-+external domain_make : create_info -> domid = "stub_xl_domain_make"
-+external domain_build : build_info -> domid -> build_state = "stub_xl_domain_build"
-+
-+external disk_add : disk_info -> domid -> unit = "stub_xl_disk_add"
-+external disk_remove : disk_info -> domid -> unit = "stub_xl_disk_remove"
-+
-+external nic_add : nic_info -> domid -> unit = "stub_xl_nic_add"
-+external nic_remove : disk_info -> domid -> unit = "stub_xl_nic_remove"
-+
-+external console_add : console_info -> build_state -> domid -> unit = "stub_xl_console_add"
-+
-+external vkb_add : vkb_info -> domid -> unit = "stub_xl_vkb_add"
-+external vkb_clean_shutdown : domid -> unit = "stub_vkb_clean_shutdown"
-+external vkb_hard_shutdown : domid -> unit = "stub_vkb_hard_shutdown"
-+
-+external vfb_add : vfb_info -> domid -> unit = "stub_xl_vfb_add"
-+external vfb_clean_shutdown : domid -> unit = "stub_vfb_clean_shutdown"
-+external vfb_hard_shutdown : domid -> unit = "stub_vfb_hard_shutdown"
-+
-+external pci_add : pci_info -> domid -> unit = "stub_xl_pci_add"
-+external pci_remove : pci_info -> domid -> unit = "stub_xl_pci_remove"
-+external pci_shutdown : domid -> unit = "stub_xl_pci_shutdown"
-+
-+type button =
-+ | Button_Power
-+ | Button_Sleep
-+
-+external button_press : domid -> button -> unit = "stub_xl_button_press"
-+external physinfo : unit -> physinfo = "stub_xl_physinfo"
-+
-+external domain_sched_credit_get : domid -> sched_credit = "stub_xl_sched_credit_domain_get"
-+external domain_sched_credit_set : domid -> sched_credit -> unit = "stub_xl_sched_credit_domain_set"
-+
-+external send_trigger : domid -> string -> int -> unit = "stub_xl_send_trigger"
-+external send_sysrq : domid -> char -> unit = "stub_xl_send_sysrq"
-+external send_debug_keys : domid -> string -> unit = "stub_xl_send_debug_keys"
-+
-+let _ = Callback.register_exception "xl.error" (Error "register_callback")
---- /dev/null
-+++ b/tools/ocaml/libs/xl/xenlight.mli
-@@ -0,0 +1,211 @@
-+(*
-+ * Copyright (C) 2009-2010 Citrix Ltd.
-+ * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License as published
-+ * by the Free Software Foundation; version 2.1 only. with the special
-+ * exception on linking described in file LICENSE.
-+ *
-+ * 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 Lesser General Public License for more details.
-+ *)
-+
-+exception Error of string
-+
-+type create_info =
-+{
-+ hvm : bool;
-+ hap : bool;
-+ oos : bool;
-+ ssidref : int32;
-+ name : string;
-+ uuid : int array;
-+ xsdata : (string * string) list;
-+ platformdata : (string * string) list;
-+ poolid : int32;
-+ poolname : string;
-+}
-+
-+type build_pv_info =
-+{
-+ slack_memkb : int64;
-+ cmdline : string;
-+ ramdisk : string;
-+ features : string;
-+}
-+
-+type build_hvm_info =
-+{
-+ pae : bool;
-+ apic : bool;
-+ acpi : bool;
-+ nx : bool;
-+ viridian : bool;
-+ timeoffset : string;
-+ timer_mode : int;
-+ hpet : int;
-+ vpt_align : int;
-+}
-+
-+type build_spec = BuildHVM of build_hvm_info | BuildPV of build_pv_info
-+
-+type build_info =
-+{
-+ max_vcpus : int;
-+ cur_vcpus : int;
-+ max_memkb : int64;
-+ target_memkb : int64;
-+ video_memkb : int64;
-+ shadow_memkb : int64;
-+ kernel : string;
-+ priv: build_spec;
-+}
-+
-+type build_state =
-+{
-+ store_port : int;
-+ store_mfn : int64;
-+ console_port : int;
-+ console_mfn : int64;
-+}
-+
-+type domid = int
-+
-+type disk_phystype =
-+ | PHYSTYPE_QCOW
-+ | PHYSTYPE_QCOW2
-+ | PHYSTYPE_VHD
-+ | PHYSTYPE_AIO
-+ | PHYSTYPE_FILE
-+ | PHYSTYPE_PHY
-+
-+type disk_info =
-+{
-+ backend_domid : domid;
-+ physpath : string;
-+ phystype : disk_phystype;
-+ virtpath : string;
-+ unpluggable : bool;
-+ readwrite : bool;
-+ is_cdrom : bool;
-+}
-+
-+type nic_type =
-+ | NICTYPE_IOEMU
-+ | NICTYPE_VIF
-+
-+type nic_info =
-+{
-+ backend_domid : domid;
-+ devid : int;
-+ mtu : int;
-+ model : string;
-+ mac : int array;
-+ bridge : string;
-+ ifname : string;
-+ script : string;
-+ nictype : nic_type;
-+}
-+
-+type console_type =
-+ | CONSOLETYPE_XENCONSOLED
-+ | CONSOLETYPE_IOEMU
-+
-+type console_info =
-+{
-+ backend_domid : domid;
-+ devid : int;
-+ consoletype : console_type;
-+}
-+
-+type vkb_info =
-+{
-+ backend_domid : domid;
-+ devid : int;
-+}
-+
-+type vfb_info =
-+{
-+ backend_domid : domid;
-+ devid : int;
-+ vnc : bool;
-+ vnclisten : string;
-+ vncpasswd : string;
-+ vncdisplay : int;
-+ vncunused : bool;
-+ keymap : string;
-+ sdl : bool;
-+ opengl : bool;
-+ display : string;
-+ xauthority : string;
-+}
-+
-+type pci_info =
-+{
-+ v : int; (* domain * bus * dev * func multiplexed *)
-+ domain : int;
-+ vdevfn : int;
-+ msitranslate : bool;
-+ power_mgmt : bool;
-+}
-+
-+type physinfo =
-+{
-+ threads_per_core: int;
-+ cores_per_socket: int;
-+ max_cpu_id: int;
-+ nr_cpus: int;
-+ cpu_khz: int;
-+ total_pages: int64;
-+ free_pages: int64;
-+ scrub_pages: int64;
-+ nr_nodes: int;
-+ hwcap: int32 array;
-+ physcap: int32;
-+}
-+
-+type sched_credit =
-+{
-+ weight: int;
-+ cap: int;
-+}
-+
-+external domain_make : create_info -> domid = "stub_xl_domain_make"
-+external domain_build : build_info -> domid -> build_state = "stub_xl_domain_build"
-+
-+external disk_add : disk_info -> domid -> unit = "stub_xl_disk_add"
-+external disk_remove : disk_info -> domid -> unit = "stub_xl_disk_remove"
-+
-+external nic_add : nic_info -> domid -> unit = "stub_xl_nic_add"
-+external nic_remove : disk_info -> domid -> unit = "stub_xl_nic_remove"
-+
-+external console_add : console_info -> build_state -> domid -> unit = "stub_xl_console_add"
-+
-+external vkb_add : vkb_info -> domid -> unit = "stub_xl_vkb_add"
-+external vkb_clean_shutdown : domid -> unit = "stub_vkb_clean_shutdown"
-+external vkb_hard_shutdown : domid -> unit = "stub_vkb_hard_shutdown"
-+
-+external vfb_add : vfb_info -> domid -> unit = "stub_xl_vfb_add"
-+external vfb_clean_shutdown : domid -> unit = "stub_vfb_clean_shutdown"
-+external vfb_hard_shutdown : domid -> unit = "stub_vfb_hard_shutdown"
-+
-+external pci_add : pci_info -> domid -> unit = "stub_xl_pci_add"
-+external pci_remove : pci_info -> domid -> unit = "stub_xl_pci_remove"
-+external pci_shutdown : domid -> unit = "stub_xl_pci_shutdown"
-+
-+type button =
-+ | Button_Power
-+ | Button_Sleep
-+
-+external button_press : domid -> button -> unit = "stub_xl_button_press"
-+external physinfo : unit -> physinfo = "stub_xl_physinfo"
-+
-+external domain_sched_credit_get : domid -> sched_credit = "stub_xl_sched_credit_domain_get"
-+external domain_sched_credit_set : domid -> sched_credit -> unit = "stub_xl_sched_credit_domain_set"
-+
-+external send_trigger : domid -> string -> int -> unit = "stub_xl_send_trigger"
-+external send_sysrq : domid -> char -> unit = "stub_xl_send_sysrq"
-+external send_debug_keys : domid -> string -> unit = "stub_xl_send_debug_keys"
---- a/tools/ocaml/libs/xl/META.in
-+++ b/tools/ocaml/libs/xl/META.in
-@@ -1,4 +1,4 @@
- version = "@VERSION@"
- description = "Xen Toolstack Library"
--archive(byte) = "xl.cma"
--archive(native) = "xl.cmxa"
-+archive(byte) = "xenlight.cma"
-+archive(native) = "xenlight.cmxa"
diff --git a/xen/patches/51-upstream-23937:5173834e8476.patch b/xen/patches/51-upstream-23937:5173834e8476.patch
deleted file mode 100644
index f91dbaf..0000000
--- a/xen/patches/51-upstream-23937:5173834e8476.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# HG changeset patch
-# User Jon Ludlam <jonathan.ludlam(a)eu.citrix.com>
-# Date 1318261088 -3600
-# Node ID 5173834e8476074afceb5c0124126e74a3954e97
-# Parent cdb34816a40a2dd3aaf324f7dcba83a122cf9146
-tools/ocaml: Add a missing dependency to the xenctrl ocaml package
-
-Signed-off-by: Jon Ludlam <jonathan.ludlam(a)eu.citrix.com>
-Acked-by: Ian Campbell <ian.campbell.com>
-Committed-by: Ian Jackson <ian.jackson.citrix.com>
-
---- a/tools/ocaml/libs/xc/META.in
-+++ b/tools/ocaml/libs/xc/META.in
-@@ -1,5 +1,5 @@
- version = "@VERSION@"
- description = "Xen Control Interface"
--requires = "xenmmap,uuid"
-+requires = "unix,xenmmap,uuid"
- archive(byte) = "xenctrl.cma"
- archive(native) = "xenctrl.cmxa"
diff --git a/xen/patches/52-upstream-23938:fa04fbd56521-rework.patch b/xen/patches/52-upstream-23938:fa04fbd56521-rework.patch
deleted file mode 100644
index 72f0e64..0000000
--- a/xen/patches/52-upstream-23938:fa04fbd56521-rework.patch
+++ /dev/null
@@ -1,321 +0,0 @@
-# HG changeset patch
-# User Jon Ludlam <jonathan.ludlam(a)eu.citrix.com>
-# Date 1317295879 -3600
-# Node ID 6c87e9dc5331096e8bfbad60a4f560cae05c4034
-# Parent c5df5f625ee2a0339b2a6785f99a5a0f9727f836
-[OCAML] Remove the uuid library
-
-This patch has the same effect as xen-unstable.hg c/s
-23938:fa04fbd56521
-
-The library was only minimally used, and was really rather redundant.
-
-Signed-off-by: Zheng Li <zheng.li(a)eu.citrix.com>
-Acked-by: Jon Ludlam <jonathan.ludlam(a)eu.citrix.com>
-
---- a/tools/ocaml/libs/Makefile
-+++ b/tools/ocaml/libs/Makefile
-@@ -2,7 +2,7 @@
- include $(XEN_ROOT)/tools/Rules.mk
-
- SUBDIRS= \
-- uuid mmap \
-+ mmap \
- log xc eventchn \
- xb xs xl
-
---- a/tools/ocaml/libs/uuid/META.in
-+++ /dev/null
-@@ -1,4 +0,0 @@
--version = "@VERSION@"
--description = "Uuid - universal identifer"
--archive(byte) = "uuid.cma"
--archive(native) = "uuid.cmxa"
---- a/tools/ocaml/libs/uuid/uuid.ml
-+++ /dev/null
-@@ -1,100 +0,0 @@
--(*
-- * Copyright (C) 2006-2010 Citrix Systems Inc.
-- * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License as published
-- * by the Free Software Foundation; version 2.1 only. with the special
-- * exception on linking described in file LICENSE.
-- *
-- * 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 Lesser General Public License for more details.
-- *)
--
--(* Internally, a UUID is simply a string. *)
--type 'a t = string
--
--type cookie = string
--
--let of_string s = s
--let to_string s = s
--
--let null = ""
--
--(* deprecated: we don't need to duplicate the uuid prefix/suffix *)
--let uuid_of_string = of_string
--let string_of_uuid = to_string
--
--let string_of_cookie s = s
--
--let cookie_of_string s = s
--
--let dev_random = "/dev/random"
--let dev_urandom = "/dev/urandom"
--
--let rnd_array n =
-- let fstbyte i = 0xff land i in
-- let sndbyte i = fstbyte (i lsr 8) in
-- let thdbyte i = sndbyte (i lsr 8) in
-- let rec rnd_list n acc = match n with
-- | 0 -> acc
-- | 1 ->
-- let b = fstbyte (Random.bits ()) in
-- b :: acc
-- | 2 ->
-- let r = Random.bits () in
-- let b1 = fstbyte r in
-- let b2 = sndbyte r in
-- b1 :: b2 :: acc
-- | n ->
-- let r = Random.bits () in
-- let b1 = fstbyte r in
-- let b2 = sndbyte r in
-- let b3 = thdbyte r in
-- rnd_list (n - 3) (b1 :: b2 :: b3 :: acc)
-- in
-- Array.of_list (rnd_list n [])
--
--let read_array dev n =
-- let ic = open_in_bin dev in
-- try
-- let result = Array.init n (fun _ -> input_byte ic) in
-- close_in ic;
-- result
-- with e ->
-- close_in ic;
-- raise e
--
--let uuid_of_int_array uuid =
-- Printf.sprintf "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x"
-- uuid.(0) uuid.(1) uuid.(2) uuid.(3) uuid.(4) uuid.(5)
-- uuid.(6) uuid.(7) uuid.(8) uuid.(9) uuid.(10) uuid.(11)
-- uuid.(12) uuid.(13) uuid.(14) uuid.(15)
--
--let make_uuid_prng () = uuid_of_int_array (rnd_array 16)
--let make_uuid_urnd () = uuid_of_int_array (read_array dev_urandom 16)
--let make_uuid_rnd () = uuid_of_int_array (read_array dev_random 16)
--let make_uuid = make_uuid_urnd
--
--let make_cookie() =
-- let bytes = Array.to_list (read_array dev_urandom 64) in
-- String.concat "" (List.map (Printf.sprintf "%1x") bytes)
--
--let int_array_of_uuid s =
-- try
-- let l = ref [] in
-- Scanf.sscanf s "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x"
-- (fun a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 ->
-- l := [ a0; a1; a2; a3; a4; a5; a6; a7; a8; a9;
-- a10; a11; a12; a13; a14; a15; ]);
-- Array.of_list !l
-- with _ -> invalid_arg "Uuid.int_array_of_uuid"
--
--let is_uuid str =
-- try
-- Scanf.sscanf str
-- "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x"
-- (fun _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ -> true)
-- with _ -> false
---- a/tools/ocaml/libs/uuid/uuid.mli
-+++ /dev/null
-@@ -1,67 +0,0 @@
--(*
-- * Copyright (C) 2006-2010 Citrix Systems Inc.
-- * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License as published
-- * by the Free Software Foundation; version 2.1 only. with the special
-- * exception on linking described in file LICENSE.
-- *
-- * 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 Lesser General Public License for more details.
-- *)
--(** Type-safe UUIDs.
-- Probably need to refactor this; UUIDs are used in two places:
-- + to uniquely name things across the cluster
-- + as secure session IDs
--
-- There is the additional constraint that current Xen tools use
-- a particular format of UUID (the 16 byte variety generated by fresh ())
--
-- Also, cookies aren't UUIDs and should be put somewhere else.
--*)
--
--(** A 128-bit UUID. Using phantom types ('a) to achieve the requires type-safety. *)
--type 'a t
--
--(** Create a fresh UUID *)
--val make_uuid : unit -> 'a t
--val make_uuid_prng : unit -> 'a t
--val make_uuid_urnd : unit -> 'a t
--val make_uuid_rnd : unit -> 'a t
--
--(** Create a UUID from a string. *)
--val of_string : string -> 'a t
--
--(** Marshal a UUID to a string. *)
--val to_string : 'a t -> string
--
--(** A null UUID, as if such a thing actually existed. It turns out to be
-- * useful though. *)
--val null : 'a t
--
--(** Deprecated alias for {! Uuid.of_string} *)
--val uuid_of_string : string -> 'a t
--
--(** Deprecated alias for {! Uuid.to_string} *)
--val string_of_uuid : 'a t -> string
--
--(** Convert an array to a UUID. *)
--val uuid_of_int_array : int array -> 'a t
--
--(** Convert a UUID to an array. *)
--val int_array_of_uuid : 'a t -> int array
--
--(** Check whether a string is a UUID. *)
--val is_uuid : string -> bool
--
--(** A 512-bit cookie. *)
--type cookie
--
--val make_cookie : unit -> cookie
--
--val cookie_of_string : string -> cookie
--
--val string_of_cookie : cookie -> string
---- a/tools/ocaml/libs/xc/META.in
-+++ b/tools/ocaml/libs/xc/META.in
-@@ -1,5 +1,5 @@
- version = "@VERSION@"
- description = "Xen Control Interface"
--requires = "unix,xenmmap,uuid"
-+requires = "unix,xenmmap"
- archive(byte) = "xenctrl.cma"
- archive(native) = "xenctrl.cmxa"
---- a/tools/ocaml/libs/xc/Makefile
-+++ b/tools/ocaml/libs/xc/Makefile
-@@ -3,7 +3,7 @@
- include $(TOPLEVEL)/common.make
-
- CFLAGS += -I../mmap -I./ -I$(XEN_ROOT)/tools/libxc
--OCAMLINCLUDE += -I ../mmap -I ../uuid -I $(XEN_ROOT)/tools/libxc
-+OCAMLINCLUDE += -I ../mmap -I $(XEN_ROOT)/tools/libxc
-
- OBJS = xenctrl
- INTF = xenctrl.cmi
---- a/tools/ocaml/libs/xc/xenctrl.ml
-+++ b/tools/ocaml/libs/xc/xenctrl.ml
-@@ -118,14 +118,23 @@
- external _domain_create: handle -> int32 -> domain_create_flag list -> int array -> domid
- = "stub_xc_domain_create"
-
-+let int_array_of_uuid_string s =
-+ try
-+ Scanf.sscanf s
-+ "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x"
-+ (fun a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 a10 a11 a12 a13 a14 a15 ->
-+ [| a0; a1; a2; a3; a4; a5; a6; a7;
-+ a8; a9; a10; a11; a12; a13; a14; a15 |])
-+ with _ -> invalid_arg ("Xc.int_array_of_uuid_string: " ^ s)
-+
- let domain_create handle n flags uuid =
-- _domain_create handle n flags (Uuid.int_array_of_uuid uuid)
-+ _domain_create handle n flags (int_array_of_uuid_string uuid)
-
- external _domain_sethandle: handle -> domid -> int array -> unit
- = "stub_xc_domain_sethandle"
-
- let domain_sethandle handle n uuid =
-- _domain_sethandle handle n (Uuid.int_array_of_uuid uuid)
-+ _domain_sethandle handle n (int_array_of_uuid_string uuid)
-
- external domain_max_vcpus: handle -> domid -> int -> unit
- = "stub_xc_domain_max_vcpus"
---- a/tools/ocaml/libs/xc/xenctrl.mli
-+++ b/tools/ocaml/libs/xc/xenctrl.mli
-@@ -74,12 +74,8 @@
- external is_fake : unit -> bool = "stub_xc_interface_is_fake"
- external interface_close : handle -> unit = "stub_xc_interface_close"
- val with_intf : (handle -> 'a) -> 'a
--external _domain_create : handle -> int32 -> domain_create_flag list -> int array -> domid
-- = "stub_xc_domain_create"
--val domain_create : handle -> int32 -> domain_create_flag list -> 'a Uuid.t -> domid
--external _domain_sethandle : handle -> domid -> int array -> unit
-- = "stub_xc_domain_sethandle"
--val domain_sethandle : handle -> domid -> 'a Uuid.t -> unit
-+val domain_create : handle -> int32 -> domain_create_flag list -> string -> domid
-+val domain_sethandle : handle -> domid -> string -> unit
- external domain_max_vcpus : handle -> domid -> int -> unit
- = "stub_xc_domain_max_vcpus"
- external domain_pause : handle -> domid -> unit = "stub_xc_domain_pause"
---- a/tools/ocaml/xenstored/Makefile
-+++ b/tools/ocaml/xenstored/Makefile
-@@ -5,7 +5,6 @@
- OCAMLINCLUDE += \
- -I $(OCAML_TOPLEVEL)/libs/log \
- -I $(OCAML_TOPLEVEL)/libs/xb \
-- -I $(OCAML_TOPLEVEL)/libs/uuid \
- -I $(OCAML_TOPLEVEL)/libs/mmap \
- -I $(OCAML_TOPLEVEL)/libs/xc \
- -I $(OCAML_TOPLEVEL)/libs/eventchn
-@@ -34,7 +33,6 @@
- INTF = symbol.cmi trie.cmi
- XENSTOREDLIBS = \
- unix.cmxa \
-- $(OCAML_TOPLEVEL)/libs/uuid/uuid.cmxa \
- -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/mmap $(OCAML_TOPLEVEL)/libs/mmap/xenmmap.cmxa \
- -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/log $(OCAML_TOPLEVEL)/libs/log/log.cmxa \
- -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/eventchn $(OCAML_TOPLEVEL)/libs/eventchn/xeneventchn.cmxa \
---- a/tools/ocaml/libs/uuid/Makefile
-+++ /dev/null
-@@ -1,29 +0,0 @@
--TOPLEVEL=$(CURDIR)/../..
--XEN_ROOT=$(TOPLEVEL)/../..
--include $(TOPLEVEL)/common.make
--
--OBJS = uuid
--INTF = $(foreach obj, $(OBJS),$(obj).cmi)
--LIBS = uuid.cma uuid.cmxa
--
--all: $(INTF) $(LIBS) $(PROGRAMS)
--
--bins: $(PROGRAMS)
--
--libs: $(LIBS)
--
--uuid_OBJS = $(OBJS)
--OCAML_NOC_LIBRARY = uuid
--
--.PHONY: install
--install: $(LIBS) META
-- mkdir -p $(OCAMLDESTDIR)
-- ocamlfind remove -destdir $(OCAMLDESTDIR) uuid
-- ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore uuid META $(INTF) $(LIBS) *.a *.cmx
--
--.PHONY: uninstall
--uninstall:
-- ocamlfind remove -destdir $(OCAMLDESTDIR) uuid
--
--include $(TOPLEVEL)/Makefile.rules
--
diff --git a/xen/patches/53-upstream-23939:51288f69523f-rework.patch b/xen/patches/53-upstream-23939:51288f69523f-rework.patch
deleted file mode 100644
index 30fcb1c..0000000
--- a/xen/patches/53-upstream-23939:51288f69523f-rework.patch
+++ /dev/null
@@ -1,1509 +0,0 @@
-# HG changeset patch
-# User Jon Ludlam <jonathan.ludlam(a)eu.citrix.com>
-# Date 1317300078 -3600
-# Node ID f628a2174cd0289400e2fe476cc3177fbcba3c8d
-# Parent 42cdb34ec175602fa2d8f0f65e44c4eb3a086496
-[OCAML] Remove log library from tools/ocaml/libs
-
-This patch has the same effect as xen-unstable.hg c/s 23939:51288f69523f
-
-The only user was oxenstored, which has had the relevant bits
-merged in.
-
-Signed-off-by: Zheng Li <zheng.li(a)eu.citrix.com>
-Acked-by: Jon Ludlam <jonathan.ludlam(a)eu.citrix.com>
-
---- a/tools/ocaml/libs/Makefile
-+++ b/tools/ocaml/libs/Makefile
-@@ -3,7 +3,7 @@
-
- SUBDIRS= \
- mmap \
-- log xc eventchn \
-+ xc eventchn \
- xb xs xl
-
- .PHONY: all
---- a/tools/ocaml/libs/log/META.in
-+++ /dev/null
-@@ -1,5 +0,0 @@
--version = "@VERSION@"
--description = "Log - logging library"
--requires = "unix"
--archive(byte) = "log.cma"
--archive(native) = "log.cmxa"
---- a/tools/ocaml/libs/log/log.ml
-+++ /dev/null
-@@ -1,258 +0,0 @@
--(*
-- * Copyright (C) 2006-2007 XenSource Ltd.
-- * Copyright (C) 2008 Citrix Ltd.
-- * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License as published
-- * by the Free Software Foundation; version 2.1 only. with the special
-- * exception on linking described in file LICENSE.
-- *
-- * 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 Lesser General Public License for more details.
-- *)
--
--open Printf
--
--exception Unknown_level of string
--
--type stream_type = Stderr | Stdout | File of string
--
--type stream_log = {
-- ty : stream_type;
-- channel : out_channel option ref;
--}
--
--type level = Debug | Info | Warn | Error
--
--type output =
-- | Stream of stream_log
-- | String of string list ref
-- | Syslog of string
-- | Nil
--
--let int_of_level l =
-- match l with Debug -> 0 | Info -> 1 | Warn -> 2 | Error -> 3
--
--let string_of_level l =
-- match l with Debug -> "debug" | Info -> "info"
-- | Warn -> "warn" | Error -> "error"
--
--let level_of_string s =
-- match s with
-- | "debug" -> Debug
-- | "info" -> Info
-- | "warn" -> Warn
-- | "error" -> Error
-- | _ -> raise (Unknown_level s)
--
--let mkdir_safe dir perm =
-- try Unix.mkdir dir perm with _ -> ()
--
--let mkdir_rec dir perm =
-- let rec p_mkdir dir =
-- let p_name = Filename.dirname dir in
-- if p_name = "/" || p_name = "." then
-- ()
-- else (
-- p_mkdir p_name;
-- mkdir_safe dir perm
-- ) in
-- p_mkdir dir
--
--type t = { output: output; mutable level: level; }
--
--let make output level = { output = output; level = level; }
--
--let make_stream ty channel =
-- Stream {ty=ty; channel=ref channel; }
--
--(** open a syslog logger *)
--let opensyslog k level =
-- make (Syslog k) level
--
--(** open a stderr logger *)
--let openerr level =
-- if (Unix.stat "/dev/stderr").Unix.st_kind <> Unix.S_CHR then
-- failwith "/dev/stderr is not a valid character device";
-- make (make_stream Stderr (Some (open_out "/dev/stderr"))) level
--
--let openout level =
-- if (Unix.stat "/dev/stdout").Unix.st_kind <> Unix.S_CHR then
-- failwith "/dev/stdout is not a valid character device";
-- make (make_stream Stdout (Some (open_out "/dev/stdout"))) level
--
--
--(** open a stream logger - returning the channel. *)
--(* This needs to be separated from 'openfile' so we can reopen later *)
--let doopenfile filename =
-- if Filename.is_relative filename then
-- None
-- else (
-- try
-- mkdir_rec (Filename.dirname filename) 0o700;
-- Some (open_out_gen [ Open_append; Open_creat ] 0o600 filename)
-- with _ -> None
-- )
--
--(** open a stream logger - returning the output type *)
--let openfile filename level =
-- make (make_stream (File filename) (doopenfile filename)) level
--
--(** open a nil logger *)
--let opennil () =
-- make Nil Error
--
--(** open a string logger *)
--let openstring level =
-- make (String (ref [""])) level
--
--(** try to reopen a logger *)
--let reopen t =
-- match t.output with
-- | Nil -> t
-- | Syslog k -> Syslog.close (); opensyslog k t.level
-- | Stream s -> (
-- match (s.ty,!(s.channel)) with
-- | (File filename, Some c) -> close_out c; s.channel := (try doopenfile filename with _ -> None); t
-- | _ -> t)
-- | String _ -> t
--
--(** close a logger *)
--let close t =
-- match t.output with
-- | Nil -> ()
-- | Syslog k -> Syslog.close ();
-- | Stream s -> (
-- match !(s.channel) with
-- | Some c -> close_out c; s.channel := None
-- | None -> ())
-- | String _ -> ()
--
--(** create a string representating the parameters of the logger *)
--let string_of_logger t =
-- match t.output with
-- | Nil -> "nil"
-- | Syslog k -> sprintf "syslog:%s" k
-- | String _ -> "string"
-- | Stream s ->
-- begin
-- match s.ty with
-- | File f -> sprintf "file:%s" f
-- | Stderr -> "stderr"
-- | Stdout -> "stdout"
-- end
--
--(** parse a string to a logger *)
--let logger_of_string s : t =
-- match s with
-- | "nil" -> opennil ()
-- | "stderr" -> openerr Debug
-- | "stdout" -> openout Debug
-- | "string" -> openstring Debug
-- | _ ->
-- let split_in_2 s =
-- try
-- let i = String.index s ':' in
-- String.sub s 0 (i),
-- String.sub s (i + 1) (String.length s - i - 1)
-- with _ ->
-- failwith "logger format error: expecting string:string"
-- in
-- let k, s = split_in_2 s in
-- match k with
-- | "syslog" -> opensyslog s Debug
-- | "file" -> openfile s Debug
-- | _ -> failwith "unknown logger type"
--
--let validate s =
-- match s with
-- | "nil" -> ()
-- | "stderr" -> ()
-- | "stdout" -> ()
-- | "string" -> ()
-- | _ ->
-- let split_in_2 s =
-- try
-- let i = String.index s ':' in
-- String.sub s 0 (i),
-- String.sub s (i + 1) (String.length s - i - 1)
-- with _ ->
-- failwith "logger format error: expecting string:string"
-- in
-- let k, s = split_in_2 s in
-- match k with
-- | "syslog" -> ()
-- | "file" -> (
-- try
-- let st = Unix.stat s in
-- if st.Unix.st_kind <> Unix.S_REG then
-- failwith "logger file is a directory";
-- ()
-- with Unix.Unix_error (Unix.ENOENT, _, _) -> ()
-- )
-- | _ -> failwith "unknown logger"
--
--(** change a logger level to level *)
--let set t level = t.level <- level
--
--let gettimestring () =
-- let time = Unix.gettimeofday () in
-- let tm = Unix.localtime time in
-- let msec = time -. (floor time) in
-- sprintf "%d%.2d%.2d %.2d:%.2d:%.2d.%.3d|" (1900 + tm.Unix.tm_year)
-- (tm.Unix.tm_mon + 1) tm.Unix.tm_mday
-- tm.Unix.tm_hour tm.Unix.tm_min tm.Unix.tm_sec
-- (int_of_float (1000.0 *. msec))
--
--(*let extra_hook = ref (fun x -> x)*)
--
--let output t ?(key="") ?(extra="") priority (message: string) =
-- let construct_string withtime =
-- (*let key = if key = "" then [] else [ key ] in
-- let extra = if extra = "" then [] else [ extra ] in
-- let items =
-- (if withtime then [ gettimestring () ] else [])
-- @ [ sprintf "%5s" (string_of_level priority) ] @ extra @ key @ [ message ] in
--(* let items = !extra_hook items in*)
-- String.concat " " items*)
-- Printf.sprintf "[%s%s|%s] %s"
-- (if withtime then gettimestring () else "") (string_of_level priority) extra message
-- in
-- (* Keep track of how much we write out to streams, so that we can *)
-- (* log-rotate at appropriate times *)
-- let write_to_stream stream =
-- let string = (construct_string true) in
-- try
-- fprintf stream "%s\n%!" string
-- with _ -> () (* Trap exception when we fail to write log *)
-- in
--
-- if String.length message > 0 then
-- match t.output with
-- | Syslog k ->
-- let sys_prio = match priority with
-- | Debug -> Syslog.Debug
-- | Info -> Syslog.Info
-- | Warn -> Syslog.Warning
-- | Error -> Syslog.Err in
-- Syslog.log Syslog.Daemon sys_prio ((construct_string false) ^ "\n")
-- | Stream s -> (
-- match !(s.channel) with
-- | Some c -> write_to_stream c
-- | None -> ())
-- | Nil -> ()
-- | String s -> (s := (construct_string true)::!s)
--
--let log t level (fmt: ('a, unit, string, unit) format4): 'a =
-- let b = (int_of_level t.level) <= (int_of_level level) in
-- (* ksprintf is the preferred name for kprintf, but the former
-- * is not available in OCaml 3.08.3 *)
-- Printf.kprintf (if b then output t level else (fun _ -> ())) fmt
--
--let debug t (fmt: ('a , unit, string, unit) format4) = log t Debug fmt
--let info t (fmt: ('a , unit, string, unit) format4) = log t Info fmt
--let warn t (fmt: ('a , unit, string, unit) format4) = log t Warn fmt
--let error t (fmt: ('a , unit, string, unit) format4) = log t Error fmt
---- a/tools/ocaml/libs/log/log.mli
-+++ /dev/null
-@@ -1,55 +0,0 @@
--(*
-- * Copyright (C) 2006-2007 XenSource Ltd.
-- * Copyright (C) 2008 Citrix Ltd.
-- * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License as published
-- * by the Free Software Foundation; version 2.1 only. with the special
-- * exception on linking described in file LICENSE.
-- *
-- * 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 Lesser General Public License for more details.
-- *)
--
--exception Unknown_level of string
--type level = Debug | Info | Warn | Error
--
--type stream_type = Stderr | Stdout | File of string
--type stream_log = {
-- ty : stream_type;
-- channel : out_channel option ref;
--}
--type output =
-- Stream of stream_log
-- | String of string list ref
-- | Syslog of string
-- | Nil
--val int_of_level : level -> int
--val string_of_level : level -> string
--val level_of_string : string -> level
--val mkdir_safe : string -> Unix.file_perm -> unit
--val mkdir_rec : string -> Unix.file_perm -> unit
--type t = { output : output; mutable level : level; }
--val make : output -> level -> t
--val opensyslog : string -> level -> t
--val openerr : level -> t
--val openout : level -> t
--val openfile : string -> level -> t
--val opennil : unit -> t
--val openstring : level -> t
--val reopen : t -> t
--val close : t -> unit
--val string_of_logger : t -> string
--val logger_of_string : string -> t
--val validate : string -> unit
--val set : t -> level -> unit
--val gettimestring : unit -> string
--val output : t -> ?key:string -> ?extra:string -> level -> string -> unit
--val log : t -> level -> ('a, unit, string, unit) format4 -> 'a
--val debug : t -> ('a, unit, string, unit) format4 -> 'a
--val info : t -> ('a, unit, string, unit) format4 -> 'a
--val warn : t -> ('a, unit, string, unit) format4 -> 'a
--val error : t -> ('a, unit, string, unit) format4 -> 'a
---- a/tools/ocaml/libs/log/logs.ml
-+++ /dev/null
-@@ -1,197 +0,0 @@
--(*
-- * Copyright (C) 2006-2007 XenSource Ltd.
-- * Copyright (C) 2008 Citrix Ltd.
-- * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License as published
-- * by the Free Software Foundation; version 2.1 only. with the special
-- * exception on linking described in file LICENSE.
-- *
-- * 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 Lesser General Public License for more details.
-- *)
--
--type keylogger =
--{
-- mutable debug: string list;
-- mutable info: string list;
-- mutable warn: string list;
-- mutable error: string list;
-- no_default: bool;
--}
--
--(* map all logger strings into a logger *)
--let __all_loggers = Hashtbl.create 10
--
--(* default logger that everything that doesn't have a key in __lop_mapping get send *)
--let __default_logger = { debug = []; info = []; warn = []; error = []; no_default = false }
--
--(*
-- * This describe the mapping between a name to a keylogger.
-- * a keylogger contains a list of logger string per level of debugging.
-- * Example: "xenops", debug -> [ "stderr"; "/var/log/xensource.log" ]
-- * "xapi", error -> []
-- * "xapi", debug -> [ "/var/log/xensource.log" ]
-- * "xenops", info -> [ "syslog" ]
-- *)
--let __log_mapping = Hashtbl.create 32
--
--let get_or_open logstring =
-- if Hashtbl.mem __all_loggers logstring then
-- Hashtbl.find __all_loggers logstring
-- else
-- let t = Log.logger_of_string logstring in
-- Hashtbl.add __all_loggers logstring t;
-- t
--
--(** create a mapping entry for the key "name".
-- * all log level of key "name" default to "logger" logger.
-- * a sensible default is put "nil" as a logger and reopen a specific level to
-- * the logger you want to.
-- *)
--let add key logger =
-- let kl = {
-- debug = logger;
-- info = logger;
-- warn = logger;
-- error = logger;
-- no_default = false;
-- } in
-- Hashtbl.add __log_mapping key kl
--
--let get_by_level keylog level =
-- match level with
-- | Log.Debug -> keylog.debug
-- | Log.Info -> keylog.info
-- | Log.Warn -> keylog.warn
-- | Log.Error -> keylog.error
--
--let set_by_level keylog level logger =
-- match level with
-- | Log.Debug -> keylog.debug <- logger
-- | Log.Info -> keylog.info <- logger
-- | Log.Warn -> keylog.warn <- logger
-- | Log.Error -> keylog.error <- logger
--
--(** set a specific key|level to the logger "logger" *)
--let set key level logger =
-- if not (Hashtbl.mem __log_mapping key) then
-- add key [];
--
-- let keylog = Hashtbl.find __log_mapping key in
-- set_by_level keylog level logger
--
--(** set default logger *)
--let set_default level logger =
-- set_by_level __default_logger level logger
--
--(** append a logger to the list *)
--let append key level logger =
-- if not (Hashtbl.mem __log_mapping key) then
-- add key [];
-- let keylog = Hashtbl.find __log_mapping key in
-- let loggers = get_by_level keylog level in
-- set_by_level keylog level (loggers @ [ logger ])
--
--(** append a logger to the default list *)
--let append_default level logger =
-- let loggers = get_by_level __default_logger level in
-- set_by_level __default_logger level (loggers @ [ logger ])
--
--(** reopen all logger open *)
--let reopen () =
-- Hashtbl.iter (fun k v ->
-- Hashtbl.replace __all_loggers k (Log.reopen v)) __all_loggers
--
--(** reclaim close all logger open that are not use by any other keys *)
--let reclaim () =
-- let list_sort_uniq l =
-- let oldprev = ref "" and prev = ref "" in
-- List.fold_left (fun a k ->
-- oldprev := !prev;
-- prev := k;
-- if k = !oldprev then a else k :: a) []
-- (List.sort compare l)
-- in
-- let flatten_keylogger v =
-- list_sort_uniq (v.debug @ v.info @ v.warn @ v.error) in
-- let oldkeys = Hashtbl.fold (fun k v a -> k :: a) __all_loggers [] in
-- let usedkeys = Hashtbl.fold (fun k v a ->
-- (flatten_keylogger v) @ a)
-- __log_mapping (flatten_keylogger __default_logger) in
-- let usedkeys = list_sort_uniq usedkeys in
--
-- List.iter (fun k ->
-- if not (List.mem k usedkeys) then (
-- begin try
-- Log.close (Hashtbl.find __all_loggers k)
-- with
-- Not_found -> ()
-- end;
-- Hashtbl.remove __all_loggers k
-- )) oldkeys
--
--(** clear a specific key|level *)
--let clear key level =
-- try
-- let keylog = Hashtbl.find __log_mapping key in
-- set_by_level keylog level [];
-- reclaim ()
-- with Not_found ->
-- ()
--
--(** clear a specific default level *)
--let clear_default level =
-- set_default level [];
-- reclaim ()
--
--(** reset all the loggers to the specified logger *)
--let reset_all logger =
-- Hashtbl.clear __log_mapping;
-- set_default Log.Debug logger;
-- set_default Log.Warn logger;
-- set_default Log.Error logger;
-- set_default Log.Info logger;
-- reclaim ()
--
--(** log a fmt message to the key|level logger specified in the log mapping.
-- * if the logger doesn't exist, assume nil logger.
-- *)
--let log key level ?(extra="") (fmt: ('a, unit, string, unit) format4): 'a =
-- let keylog =
-- if Hashtbl.mem __log_mapping key then
-- let keylog = Hashtbl.find __log_mapping key in
-- if keylog.no_default = false &&
-- get_by_level keylog level = [] then
-- __default_logger
-- else
-- keylog
-- else
-- __default_logger in
-- let loggers = get_by_level keylog level in
-- match loggers with
-- | [] -> Printf.kprintf ignore fmt
-- | _ ->
-- let l = List.fold_left (fun acc logger ->
-- try get_or_open logger :: acc
-- with _ -> acc
-- ) [] loggers in
-- let l = List.rev l in
--
-- (* ksprintf is the preferred name for kprintf, but the former
-- * is not available in OCaml 3.08.3 *)
-- Printf.kprintf (fun s ->
-- List.iter (fun t -> Log.output t ~key ~extra level s) l) fmt
--
--(* define some convenience functions *)
--let debug t ?extra (fmt: ('a , unit, string, unit) format4) =
-- log t Log.Debug ?extra fmt
--let info t ?extra (fmt: ('a , unit, string, unit) format4) =
-- log t Log.Info ?extra fmt
--let warn t ?extra (fmt: ('a , unit, string, unit) format4) =
-- log t Log.Warn ?extra fmt
--let error t ?extra (fmt: ('a , unit, string, unit) format4) =
-- log t Log.Error ?extra fmt
---- a/tools/ocaml/libs/log/logs.mli
-+++ /dev/null
-@@ -1,46 +0,0 @@
--(*
-- * Copyright (C) 2006-2007 XenSource Ltd.
-- * Copyright (C) 2008 Citrix Ltd.
-- * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License as published
-- * by the Free Software Foundation; version 2.1 only. with the special
-- * exception on linking described in file LICENSE.
-- *
-- * 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 Lesser General Public License for more details.
-- *)
--
--type keylogger = {
-- mutable debug : string list;
-- mutable info : string list;
-- mutable warn : string list;
-- mutable error : string list;
-- no_default : bool;
--}
--val __all_loggers : (string, Log.t) Hashtbl.t
--val __default_logger : keylogger
--val __log_mapping : (string, keylogger) Hashtbl.t
--val get_or_open : string -> Log.t
--val add : string -> string list -> unit
--val get_by_level : keylogger -> Log.level -> string list
--val set_by_level : keylogger -> Log.level -> string list -> unit
--val set : string -> Log.level -> string list -> unit
--val set_default : Log.level -> string list -> unit
--val append : string -> Log.level -> string -> unit
--val append_default : Log.level -> string -> unit
--val reopen : unit -> unit
--val reclaim : unit -> unit
--val clear : string -> Log.level -> unit
--val clear_default : Log.level -> unit
--val reset_all : string list -> unit
--val log :
-- string ->
-- Log.level -> ?extra:string -> ('a, unit, string, unit) format4 -> 'a
--val debug : string -> ?extra:string -> ('a, unit, string, unit) format4 -> 'a
--val info : string -> ?extra:string -> ('a, unit, string, unit) format4 -> 'a
--val warn : string -> ?extra:string -> ('a, unit, string, unit) format4 -> 'a
--val error : string -> ?extra:string -> ('a, unit, string, unit) format4 -> 'a
---- a/tools/ocaml/libs/log/syslog.ml
-+++ /dev/null
-@@ -1,26 +0,0 @@
--(*
-- * Copyright (C) 2006-2007 XenSource Ltd.
-- * Copyright (C) 2008 Citrix Ltd.
-- * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License as published
-- * by the Free Software Foundation; version 2.1 only. with the special
-- * exception on linking described in file LICENSE.
-- *
-- * 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 Lesser General Public License for more details.
-- *)
--
--type level = Emerg | Alert | Crit | Err | Warning | Notice | Info | Debug
--type options = Cons | Ndelay | Nowait | Odelay | Perror | Pid
--type facility = Auth | Authpriv | Cron | Daemon | Ftp | Kern
-- | Local0 | Local1 | Local2 | Local3
-- | Local4 | Local5 | Local6 | Local7
-- | Lpr | Mail | News | Syslog | User | Uucp
--
--(* external init : string -> options list -> facility -> unit = "stub_openlog" *)
--external log : facility -> level -> string -> unit = "stub_syslog"
--external close : unit -> unit = "stub_closelog"
---- a/tools/ocaml/libs/log/syslog_stubs.c
-+++ /dev/null
-@@ -1,75 +0,0 @@
--/*
-- * Copyright (C) 2006-2007 XenSource Ltd.
-- * Copyright (C) 2008 Citrix Ltd.
-- * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License as published
-- * by the Free Software Foundation; version 2.1 only. with the special
-- * exception on linking described in file LICENSE.
-- *
-- * 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 Lesser General Public License for more details.
-- */
--
--#include <syslog.h>
--#include <caml/mlvalues.h>
--#include <caml/memory.h>
--#include <caml/alloc.h>
--#include <caml/custom.h>
--
--static int __syslog_level_table[] = {
-- LOG_EMERG, LOG_ALERT, LOG_CRIT, LOG_ERR, LOG_WARNING,
-- LOG_NOTICE, LOG_INFO, LOG_DEBUG
--};
--
--/*
--static int __syslog_options_table[] = {
-- LOG_CONS, LOG_NDELAY, LOG_NOWAIT, LOG_ODELAY, LOG_PERROR, LOG_PID
--};
--*/
--
--static int __syslog_facility_table[] = {
-- LOG_AUTH, LOG_AUTHPRIV, LOG_CRON, LOG_DAEMON, LOG_FTP, LOG_KERN,
-- LOG_LOCAL0, LOG_LOCAL1, LOG_LOCAL2, LOG_LOCAL3,
-- LOG_LOCAL4, LOG_LOCAL5, LOG_LOCAL6, LOG_LOCAL7,
-- LOG_LPR | LOG_MAIL | LOG_NEWS | LOG_SYSLOG | LOG_USER | LOG_UUCP
--};
--
--/* According to the openlog manpage the 'openlog' call may take a reference
-- to the 'ident' string and keep it long-term. This means we cannot just pass in
-- an ocaml string which is under the control of the GC. Since we aren't actually
-- calling this function we can just comment it out for the time-being. */
--/*
--value stub_openlog(value ident, value option, value facility)
--{
-- CAMLparam3(ident, option, facility);
-- int c_option;
-- int c_facility;
--
-- c_option = caml_convert_flag_list(option, __syslog_options_table);
-- c_facility = __syslog_facility_table[Int_val(facility)];
-- openlog(String_val(ident), c_option, c_facility);
-- CAMLreturn(Val_unit);
--}
--*/
--
--value stub_syslog(value facility, value level, value msg)
--{
-- CAMLparam3(facility, level, msg);
-- int c_facility;
--
-- c_facility = __syslog_facility_table[Int_val(facility)]
-- | __syslog_level_table[Int_val(level)];
-- syslog(c_facility, "%s", String_val(msg));
-- CAMLreturn(Val_unit);
--}
--
--value stub_closelog(value unit)
--{
-- CAMLparam1(unit);
-- closelog();
-- CAMLreturn(Val_unit);
--}
---- a/tools/ocaml/xenstored/Makefile
-+++ b/tools/ocaml/xenstored/Makefile
-@@ -3,7 +3,6 @@
- include $(OCAML_TOPLEVEL)/common.make
-
- OCAMLINCLUDE += \
-- -I $(OCAML_TOPLEVEL)/libs/log \
- -I $(OCAML_TOPLEVEL)/libs/xb \
- -I $(OCAML_TOPLEVEL)/libs/mmap \
- -I $(OCAML_TOPLEVEL)/libs/xc \
-@@ -34,7 +33,6 @@
- XENSTOREDLIBS = \
- unix.cmxa \
- -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/mmap $(OCAML_TOPLEVEL)/libs/mmap/xenmmap.cmxa \
-- -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/log $(OCAML_TOPLEVEL)/libs/log/log.cmxa \
- -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/eventchn $(OCAML_TOPLEVEL)/libs/eventchn/xeneventchn.cmxa \
- -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/xc $(OCAML_TOPLEVEL)/libs/xc/xenctrl.cmxa \
- -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/xb $(OCAML_TOPLEVEL)/libs/xb/xenbus.cmxa \
---- a/tools/ocaml/xenstored/connection.ml
-+++ b/tools/ocaml/xenstored/connection.ml
-@@ -232,3 +232,8 @@
- Printf.fprintf chan "watch,%d,%s,%s\n" domid (Utils.hexify path) (Utils.hexify token)
- ) (list_watches con);
- | None -> ()
-+
-+let debug con =
-+ let domid = get_domstr con in
-+ let watches = List.map (fun (path, token) -> Printf.sprintf "watch %s: %s %s\n" domid path token) (list_watches con) in
-+ String.concat "" watches
---- a/tools/ocaml/xenstored/connections.ml
-+++ b/tools/ocaml/xenstored/connections.ml
-@@ -15,7 +15,7 @@
- * GNU Lesser General Public License for more details.
- *)
-
--let debug fmt = Logs.debug "general" fmt
-+let debug fmt = Logging.debug "connections" fmt
-
- type t = {
- mutable anonymous: Connection.t list;
-@@ -165,3 +165,8 @@
- );
- (List.length cons.anonymous, !nb_ops_anon, !nb_watchs_anon,
- Hashtbl.length cons.domains, !nb_ops_dom, !nb_watchs_dom)
-+
-+let debug cons =
-+ let anonymous = List.map Connection.debug cons.anonymous in
-+ let domains = Hashtbl.fold (fun _ con accu -> Connection.debug con :: accu) cons.domains [] in
-+ String.concat "" (domains @ anonymous)
---- a/tools/ocaml/xenstored/disk.ml
-+++ b/tools/ocaml/xenstored/disk.ml
-@@ -17,7 +17,7 @@
- let enable = ref false
- let xs_daemon_database = "/var/run/xenstored/db"
-
--let error = Logs.error "general"
-+let error fmt = Logging.error "disk" fmt
-
- (* unescape utils *)
- exception Bad_escape
---- a/tools/ocaml/xenstored/domain.ml
-+++ b/tools/ocaml/xenstored/domain.ml
-@@ -16,7 +16,7 @@
-
- open Printf
-
--let debug fmt = Logs.debug "general" fmt
-+let debug fmt = Logging.debug "domain" fmt
-
- type t =
- {
---- a/tools/ocaml/xenstored/domains.ml
-+++ b/tools/ocaml/xenstored/domains.ml
-@@ -14,6 +14,8 @@
- * GNU Lesser General Public License for more details.
- *)
-
-+let debug fmt = Logging.debug "domains" fmt
-+
- type domains = {
- eventchn: Event.t;
- table: (Xenctrl.domid, Domain.t) Hashtbl.t;
-@@ -35,7 +37,7 @@
- try
- let info = Xenctrl.domain_getinfo xc id in
- if info.Xenctrl.shutdown || info.Xenctrl.dying then (
-- Logs.debug "general" "Domain %u died (dying=%b, shutdown %b -- code %d)"
-+ debug "Domain %u died (dying=%b, shutdown %b -- code %d)"
- id info.Xenctrl.dying info.Xenctrl.shutdown info.Xenctrl.shutdown_code;
- if info.Xenctrl.dying then
- dead_dom := id :: !dead_dom
-@@ -43,7 +45,7 @@
- notify := true;
- )
- with Xenctrl.Error _ ->
-- Logs.debug "general" "Domain %u died -- no domain info" id;
-+ debug "Domain %u died -- no domain info" id;
- dead_dom := id :: !dead_dom;
- ) doms.table;
- List.iter (fun id ->
---- a/tools/ocaml/xenstored/logging.ml
-+++ b/tools/ocaml/xenstored/logging.ml
-@@ -17,21 +17,122 @@
- open Stdext
- open Printf
-
--let error fmt = Logs.error "general" fmt
--let info fmt = Logs.info "general" fmt
--let debug fmt = Logs.debug "general" fmt
-
--let access_log_file = ref "/var/log/xenstored-access.log"
--let access_log_nb_files = ref 20
--let access_log_nb_lines = ref 13215
--let activate_access_log = ref true
-+(* Logger common *)
-+
-+type logger =
-+ { stop: unit -> unit;
-+ restart: unit -> unit;
-+ rotate: unit -> unit;
-+ write: 'a. ('a, unit, string, unit) format4 -> 'a }
-+
-+let truncate_line nb_chars line =
-+ if String.length line > nb_chars - 1 then
-+ let len = max (nb_chars - 1) 2 in
-+ let dst_line = String.create len in
-+ String.blit line 0 dst_line 0 (len - 2);
-+ dst_line.[len-2] <- '.';
-+ dst_line.[len-1] <- '.';
-+ dst_line
-+ else line
-+
-+let log_rotate ref_ch log_file log_nb_files =
-+ let file n = sprintf "%s.%i" log_file n in
-+ let log_files =
-+ let rec aux accu n =
-+ if n >= log_nb_files then accu
-+ else
-+ if n = 1 && Sys.file_exists log_file
-+ then aux [log_file,1] 2
-+ else
-+ let file = file (n-1) in
-+ if Sys.file_exists file then
-+ aux ((file, n) :: accu) (n+1)
-+ else accu in
-+ aux [] 1 in
-+ List.iter (fun (f, n) -> Unix.rename f (file n)) log_files;
-+ close_out !ref_ch;
-+ ref_ch := open_out log_file
-+
-+let make_logger log_file log_nb_files log_nb_lines log_nb_chars post_rotate =
-+ let channel = ref (open_out_gen [Open_append; Open_creat] 0o644 log_file) in
-+ let counter = ref 0 in
-+ let stop() =
-+ try flush !channel; close_out !channel
-+ with _ -> () in
-+ let restart() =
-+ stop();
-+ channel := open_out_gen [Open_append; Open_creat] 0o644 log_file in
-+ let rotate() =
-+ log_rotate channel log_file log_nb_files;
-+ (post_rotate (): unit);
-+ counter := 0 in
-+ let output s =
-+ let s = if log_nb_chars > 0 then truncate_line log_nb_chars s else s in
-+ let s = s ^ "\n" in
-+ output_string !channel s;
-+ flush !channel;
-+ incr counter;
-+ if !counter > log_nb_lines then rotate() in
-+ { stop=stop; restart=restart; rotate=rotate; write = fun fmt -> Printf.ksprintf output fmt }
-+
-+
-+(* Xenstored logger *)
-+
-+exception Unknown_level of string
-+
-+type level = Debug | Info | Warn | Error | Null
-+
-+let int_of_level = function
-+ | Debug -> 0 | Info -> 1 | Warn -> 2
-+ | Error -> 3 | Null -> max_int
-+
-+let string_of_level = function
-+ | Debug -> "debug" | Info -> "info" | Warn -> "warn"
-+ | Error -> "error" | Null -> "null"
-+
-+let level_of_string = function
-+ | "debug" -> Debug | "info" -> Info | "warn" -> Warn
-+ | "error" -> Error | "null" -> Null | s -> raise (Unknown_level s)
-+
-+let string_of_date () =
-+ let time = Unix.gettimeofday () in
-+ let tm = Unix.gmtime time in
-+ let msec = time -. (floor time) in
-+ sprintf "%d%.2d%.2dT%.2d:%.2d:%.2d.%.3dZ"
-+ (1900 + tm.Unix.tm_year) (tm.Unix.tm_mon + 1) tm.Unix.tm_mday
-+ tm.Unix.tm_hour tm.Unix.tm_min tm.Unix.tm_sec
-+ (int_of_float (1000.0 *. msec))
-
--(* maximal size of the lines in xenstore-acces.log file *)
--let line_size = 180
-+let xenstored_log_file = ref "/var/log/xenstored.log"
-+let xenstored_log_level = ref Null
-+let xenstored_log_nb_files = ref 10
-+let xenstored_log_nb_lines = ref 13215
-+let xenstored_log_nb_chars = ref (-1)
-+let xenstored_logger = ref (None: logger option)
-+
-+let init_xenstored_log () =
-+ if !xenstored_log_level <> Null && !xenstored_log_nb_files > 0 then
-+ let logger =
-+ make_logger
-+ !xenstored_log_file !xenstored_log_nb_files !xenstored_log_nb_lines
-+ !xenstored_log_nb_chars ignore in
-+ xenstored_logger := Some logger
-+
-+let xenstored_logging level key (fmt: (_,_,_,_) format4) =
-+ match !xenstored_logger with
-+ | Some logger when int_of_level level >= int_of_level !xenstored_log_level ->
-+ let date = string_of_date() in
-+ let level = string_of_level level in
-+ logger.write ("[%s|%5s|%s] " ^^ fmt) date level key
-+ | _ -> Printf.ksprintf ignore fmt
-+
-+let debug key = xenstored_logging Debug key
-+let info key = xenstored_logging Info key
-+let warn key = xenstored_logging Warn key
-+let error key = xenstored_logging Error key
-
--let log_read_ops = ref false
--let log_transaction_ops = ref false
--let log_special_ops = ref false
-+(* Access logger *)
-
- type access_type =
- | Coalesce
-@@ -41,38 +142,10 @@
- | Endconn
- | XbOp of Xenbus.Xb.Op.operation
-
--type access =
-- {
-- fd: out_channel ref;
-- counter: int ref;
-- write: tid:int -> con:string -> ?data:string -> access_type -> unit;
-- }
--
--let string_of_date () =
-- let time = Unix.gettimeofday () in
-- let tm = Unix.localtime time in
-- let msec = time -. (floor time) in
-- sprintf "%d%.2d%.2d %.2d:%.2d:%.2d.%.3d" (1900 + tm.Unix.tm_year)
-- (tm.Unix.tm_mon + 1)
-- tm.Unix.tm_mday
-- tm.Unix.tm_hour
-- tm.Unix.tm_min
-- tm.Unix.tm_sec
-- (int_of_float (1000.0 *. msec))
--
--let fill_with_space n s =
-- if String.length s < n
-- then
-- let r = String.make n ' ' in
-- String.blit s 0 r 0 (String.length s);
-- r
-- else
-- s
--
- let string_of_tid ~con tid =
- if tid = 0
-- then fill_with_space 12 (sprintf "%s" con)
-- else fill_with_space 12 (sprintf "%s.%i" con tid)
-+ then sprintf "%-12s" con
-+ else sprintf "%-12s" (sprintf "%s.%i" con tid)
-
- let string_of_access_type = function
- | Coalesce -> "coalesce "
-@@ -109,41 +182,9 @@
-
- | Xenbus.Xb.Op.Error -> "error "
- | Xenbus.Xb.Op.Watchevent -> "w event "
--
-+ (*
- | x -> Xenbus.Xb.Op.to_string x
--
--let file_exists file =
-- try
-- Unix.close (Unix.openfile file [Unix.O_RDONLY] 0o644);
-- true
-- with _ ->
-- false
--
--let log_rotate fd =
-- let file n = sprintf "%s.%i" !access_log_file n in
-- let log_files =
-- let rec aux accu n =
-- if n >= !access_log_nb_files
-- then accu
-- else if n = 1 && file_exists !access_log_file
-- then aux [!access_log_file,1] 2
-- else
-- let file = file (n-1) in
-- if file_exists file
-- then aux ((file,n) :: accu) (n+1)
-- else accu
-- in
-- aux [] 1
-- in
-- let rec rename = function
-- | (f,n) :: t when n < !access_log_nb_files ->
-- Unix.rename f (file n);
-- rename t
-- | _ -> ()
-- in
-- rename log_files;
-- close_out !fd;
-- fd := open_out !access_log_file
-+ *)
-
- let sanitize_data data =
- let data = String.copy data in
-@@ -154,86 +195,68 @@
- done;
- String.escaped data
-
--let make save_to_disk =
-- let fd = ref (open_out_gen [Open_append; Open_creat] 0o644 !access_log_file) in
-- let counter = ref 0 in
-- {
-- fd = fd;
-- counter = counter;
-- write =
-- if not !activate_access_log || !access_log_nb_files = 0
-- then begin fun ~tid ~con ?data _ -> () end
-- else fun ~tid ~con ?(data="") access_type ->
-- let s = Printf.sprintf "[%s] %s %s %s\n" (string_of_date()) (string_of_tid ~con tid)
-- (string_of_access_type access_type) (sanitize_data data) in
-- let s =
-- if String.length s > line_size
-- then begin
-- let s = String.sub s 0 line_size in
-- s.[line_size-3] <- '.';
-- s.[line_size-2] <- '.';
-- s.[line_size-1] <- '\n';
-- s
-- end else
-- s
-- in
-- incr counter;
-- output_string !fd s;
-- flush !fd;
-- if !counter > !access_log_nb_lines
-- then begin
-- log_rotate fd;
-- save_to_disk ();
-- counter := 0;
-- end
-- }
--
--let access : (access option) ref = ref None
--let init aal save_to_disk =
-- activate_access_log := aal;
-- access := Some (make save_to_disk)
--
--let write_access_log ~con ~tid ?data access_type =
-+let activate_access_log = ref true
-+let access_log_file = ref "/var/log/xenstored-access.log"
-+let access_log_nb_files = ref 20
-+let access_log_nb_lines = ref 13215
-+let access_log_nb_chars = ref 180
-+let access_log_read_ops = ref false
-+let access_log_transaction_ops = ref false
-+let access_log_special_ops = ref false
-+let access_logger = ref None
-+
-+let init_access_log post_rotate =
-+ if !access_log_nb_files > 0 then
-+ let logger =
-+ make_logger
-+ !access_log_file !access_log_nb_files !access_log_nb_lines
-+ !access_log_nb_chars post_rotate in
-+ access_logger := Some logger
-+
-+let access_logging ~con ~tid ?(data="") access_type =
- try
-- maybe (fun a -> a.write access_type ~con ~tid ?data) !access
-+ maybe
-+ (fun logger ->
-+ let date = string_of_date() in
-+ let tid = string_of_tid ~con tid in
-+ let access_type = string_of_access_type access_type in
-+ let data = sanitize_data data in
-+ logger.write "[%s] %s %s %s" date tid access_type data)
-+ !access_logger
- with _ -> ()
-
--let new_connection = write_access_log Newconn
--let end_connection = write_access_log Endconn
-+let new_connection = access_logging Newconn
-+let end_connection = access_logging Endconn
- let read_coalesce ~tid ~con data =
-- if !log_read_ops
-- then write_access_log Coalesce ~tid ~con ~data:("read "^data)
--let write_coalesce data = write_access_log Coalesce ~data:("write "^data)
--let conflict = write_access_log Conflict
--let commit = write_access_log Commit
-+ if !access_log_read_ops
-+ then access_logging Coalesce ~tid ~con ~data:("read "^data)
-+let write_coalesce data = access_logging Coalesce ~data:("write "^data)
-+let conflict = access_logging Conflict
-+let commit = access_logging Commit
-
- let xb_op ~tid ~con ~ty data =
-- let print =
-- match ty with
-- | Xenbus.Xb.Op.Read | Xenbus.Xb.Op.Directory | Xenbus.Xb.Op.Getperms -> !log_read_ops
-+ let print = match ty with
-+ | Xenbus.Xb.Op.Read | Xenbus.Xb.Op.Directory | Xenbus.Xb.Op.Getperms -> !access_log_read_ops
- | Xenbus.Xb.Op.Transaction_start | Xenbus.Xb.Op.Transaction_end ->
- false (* transactions are managed below *)
- | Xenbus.Xb.Op.Introduce | Xenbus.Xb.Op.Release | Xenbus.Xb.Op.Getdomainpath | Xenbus.Xb.Op.Isintroduced | Xenbus.Xb.Op.Resume ->
-- !log_special_ops
-- | _ -> true
-- in
-- if print
-- then write_access_log ~tid ~con ~data (XbOp ty)
-+ !access_log_special_ops
-+ | _ -> true in
-+ if print then access_logging ~tid ~con ~data (XbOp ty)
-
- let start_transaction ~tid ~con =
-- if !log_transaction_ops && tid <> 0
-- then write_access_log ~tid ~con (XbOp Xenbus.Xb.Op.Transaction_start)
-+ if !access_log_transaction_ops && tid <> 0
-+ then access_logging ~tid ~con (XbOp Xenbus.Xb.Op.Transaction_start)
-
- let end_transaction ~tid ~con =
-- if !log_transaction_ops && tid <> 0
-- then write_access_log ~tid ~con (XbOp Xenbus.Xb.Op.Transaction_end)
-+ if !access_log_transaction_ops && tid <> 0
-+ then access_logging ~tid ~con (XbOp Xenbus.Xb.Op.Transaction_end)
-
- let xb_answer ~tid ~con ~ty data =
- let print = match ty with
-- | Xenbus.Xb.Op.Error when data="ENOENT " -> !log_read_ops
-- | Xenbus.Xb.Op.Error -> !log_special_ops
-+ | Xenbus.Xb.Op.Error when String.startswith "ENOENT " data -> !access_log_read_ops
-+ | Xenbus.Xb.Op.Error -> true
- | Xenbus.Xb.Op.Watchevent -> true
- | _ -> false
- in
-- if print
-- then write_access_log ~tid ~con ~data (XbOp ty)
-+ if print then access_logging ~tid ~con ~data (XbOp ty)
---- a/tools/ocaml/xenstored/perms.ml
-+++ b/tools/ocaml/xenstored/perms.ml
-@@ -15,6 +15,8 @@
- * GNU Lesser General Public License for more details.
- *)
-
-+let info fmt = Logging.info "perms" fmt
-+
- open Stdext
-
- let activate = ref true
-@@ -145,16 +147,16 @@
- in
- match perm, request with
- | NONE, _ ->
-- Logs.info "io" "Permission denied: Domain %d has no permission" domainid;
-+ info "Permission denied: Domain %d has no permission" domainid;
- false
- | RDWR, _ -> true
- | READ, READ -> true
- | WRITE, WRITE -> true
- | READ, _ ->
-- Logs.info "io" "Permission denied: Domain %d has read only access" domainid;
-+ info "Permission denied: Domain %d has read only access" domainid;
- false
- | WRITE, _ ->
-- Logs.info "io" "Permission denied: Domain %d has write only access" domainid;
-+ info "Permission denied: Domain %d has write only access" domainid;
- false
- in
- if !activate
---- a/tools/ocaml/xenstored/process.ml
-+++ b/tools/ocaml/xenstored/process.ml
-@@ -14,6 +14,9 @@
- * GNU Lesser General Public License for more details.
- *)
-
-+let error fmt = Logging.error "process" fmt
-+let info fmt = Logging.info "process" fmt
-+
- open Printf
- open Stdext
-
-@@ -79,7 +82,7 @@
-
- (* packets *)
- let do_debug con t domains cons data =
-- if not !allow_debug
-+ if not (Connection.is_dom0 con) && not !allow_debug
- then None
- else try match split None '\000' data with
- | "print" :: msg :: _ ->
-@@ -89,6 +92,9 @@
- let domid = int_of_string domid in
- let quota = (Store.get_quota t.Transaction.store) in
- Some (Quota.to_string quota domid ^ "\000")
-+ | "watches" :: _ ->
-+ let watches = Connections.debug cons in
-+ Some (watches ^ "\000")
- | "mfn" :: domid :: _ ->
- let domid = int_of_string domid in
- let con = Connections.find_domain cons domid in
-@@ -357,8 +363,7 @@
- in
- input_handle_error ~cons ~doms ~fct ~ty ~con ~t ~rid ~data;
- with exn ->
-- Logs.error "general" "process packet: %s"
-- (Printexc.to_string exn);
-+ error "process packet: %s" (Printexc.to_string exn);
- Connection.send_error con tid rid "EIO"
-
- let write_access_log ~ty ~tid ~con ~data =
-@@ -372,7 +377,7 @@
- let packet = Connection.pop_in con in
- let tid, rid, ty, data = Xenbus.Xb.Packet.unpack packet in
- (* As we don't log IO, do not call an unnecessary sanitize_data
-- Logs.info "io" "[%s] -> [%d] %s \"%s\""
-+ info "[%s] -> [%d] %s \"%s\""
- (Connection.get_domstr con) tid
- (Xenbus.Xb.Op.to_string ty) (sanitize_data data); *)
- process_packet ~store ~cons ~doms ~con ~tid ~rid ~ty ~data;
-@@ -386,7 +391,7 @@
- let packet = Connection.peek_output con in
- let tid, rid, ty, data = Xenbus.Xb.Packet.unpack packet in
- (* As we don't log IO, do not call an unnecessary sanitize_data
-- Logs.info "io" "[%s] <- %s \"%s\""
-+ info "[%s] <- %s \"%s\""
- (Connection.get_domstr con)
- (Xenbus.Xb.Op.to_string ty) (sanitize_data data);*)
- write_answer_log ~ty ~tid ~con ~data;
---- a/tools/ocaml/xenstored/quota.ml
-+++ b/tools/ocaml/xenstored/quota.ml
-@@ -18,7 +18,7 @@
- exception Data_too_big
- exception Transaction_opened
-
--let warn fmt = Logs.warn "general" fmt
-+let warn fmt = Logging.warn "quota" fmt
- let activate = ref true
- let maxent = ref (10000)
- let maxsize = ref (4096)
---- a/tools/ocaml/xenstored/store.ml
-+++ b/tools/ocaml/xenstored/store.ml
-@@ -83,7 +83,7 @@
- let check_owner node connection =
- if not (Perms.check_owner connection node.perms)
- then begin
-- Logs.info "io" "Permission denied: Domain %d not owner" (get_owner node);
-+ Logging.info "store|node" "Permission denied: Domain %d not owner" (get_owner node);
- raise Define.Permission_denied;
- end
-
---- a/tools/ocaml/xenstored/xenstored.conf
-+++ b/tools/ocaml/xenstored/xenstored.conf
-@@ -22,9 +22,14 @@
- # Activate filed base backend
- persistant = false
-
--# Logs
--log = error;general;file:/var/log/xenstored.log
--log = warn;general;file:/var/log/xenstored.log
--log = info;general;file:/var/log/xenstored.log
-+# Xenstored logs
-+# xenstored-log-file = /var/log/xenstored.log
-+# xenstored-log-level = null
-+# xenstored-log-nb-files = 10
-+
-+# Xenstored access logs
-+# access-log-file = /var/log/xenstored-access.log
-+# access-log-nb-lines = 13215
-+# acesss-log-nb-chars = 180
-+# access-log-special-ops = false
-
--# log = debug;io;file:/var/log/xenstored-io.log
---- a/tools/ocaml/xenstored/xenstored.ml
-+++ b/tools/ocaml/xenstored/xenstored.ml
-@@ -18,7 +18,10 @@
- open Printf
- open Parse_arg
- open Stdext
--open Logging
-+
-+let error fmt = Logging.error "xenstored" fmt
-+let debug fmt = Logging.debug "xenstored" fmt
-+let info fmt = Logging.info "xenstored" fmt
-
- (*------------ event klass processors --------------*)
- let process_connection_fds store cons domains rset wset =
-@@ -64,7 +67,8 @@
- ()
-
- let sighup_handler _ =
-- try Logs.reopen (); info "Log re-opened" with _ -> ()
-+ maybe (fun logger -> logger.Logging.restart()) !Logging.xenstored_logger;
-+ maybe (fun logger -> logger.Logging.restart()) !Logging.access_logger
-
- let config_filename cf =
- match cf.config_file with
-@@ -75,26 +79,6 @@
-
- let parse_config filename =
- let pidfile = ref default_pidfile in
-- let set_log s =
-- let ls = String.split ~limit:3 ';' s in
-- let level, key, logger = match ls with
-- | [ level; key; logger ] -> level, key, logger
-- | _ -> failwith "format mismatch: expecting 3 arguments" in
--
-- let loglevel = match level with
-- | "debug" -> Log.Debug
-- | "info" -> Log.Info
-- | "warn" -> Log.Warn
-- | "error" -> Log.Error
-- | s -> failwith (sprintf "Unknown log level: %s" s) in
--
-- (* if key is empty, append to the default logger *)
-- let append =
-- if key = "" then
-- Logs.append_default
-- else
-- Logs.append key in
-- append loglevel logger in
- let options = [
- ("merge-activate", Config.Set_bool Transaction.do_coalesce);
- ("perms-activate", Config.Set_bool Perms.activate);
-@@ -104,14 +88,20 @@
- ("quota-maxentity", Config.Set_int Quota.maxent);
- ("quota-maxsize", Config.Set_int Quota.maxsize);
- ("test-eagain", Config.Set_bool Transaction.test_eagain);
-- ("log", Config.String set_log);
- ("persistant", Config.Set_bool Disk.enable);
-+ ("xenstored-log-file", Config.Set_string Logging.xenstored_log_file);
-+ ("xenstored-log-level", Config.String
-+ (fun s -> Logging.xenstored_log_level := Logging.level_of_string s));
-+ ("xenstored-log-nb-files", Config.Set_int Logging.xenstored_log_nb_files);
-+ ("xenstored-log-nb-lines", Config.Set_int Logging.xenstored_log_nb_lines);
-+ ("xenstored-log-nb-chars", Config.Set_int Logging.xenstored_log_nb_chars);
- ("access-log-file", Config.Set_string Logging.access_log_file);
- ("access-log-nb-files", Config.Set_int Logging.access_log_nb_files);
- ("access-log-nb-lines", Config.Set_int Logging.access_log_nb_lines);
-- ("access-log-read-ops", Config.Set_bool Logging.log_read_ops);
-- ("access-log-transactions-ops", Config.Set_bool Logging.log_transaction_ops);
-- ("access-log-special-ops", Config.Set_bool Logging.log_special_ops);
-+ ("access-log-nb-chars", Config.Set_int Logging.access_log_nb_chars);
-+ ("access-log-read-ops", Config.Set_bool Logging.access_log_read_ops);
-+ ("access-log-transactions-ops", Config.Set_bool Logging.access_log_transaction_ops);
-+ ("access-log-special-ops", Config.Set_bool Logging.access_log_special_ops);
- ("allow-debug", Config.Set_bool Process.allow_debug);
- ("pid-file", Config.Set_string pidfile); ] in
- begin try Config.read filename options (fun _ _ -> raise Not_found)
-@@ -223,9 +213,6 @@
- end
-
- let _ =
-- printf "Xen Storage Daemon, version %d.%d\n%!"
-- Define.xenstored_major Define.xenstored_minor;
--
- let cf = do_argv in
- let pidfile =
- if Sys.file_exists (config_filename cf) then
-@@ -249,13 +236,13 @@
- in
-
- if cf.daemonize then
-- Unixext.daemonize ();
-+ Unixext.daemonize ()
-+ else
-+ printf "Xen Storage Daemon, version %d.%d\n%!"
-+ Define.xenstored_major Define.xenstored_minor;
-
- (try Unixext.pidfile_write pidfile with _ -> ());
-
-- info "Xen Storage Daemon, version %d.%d"
-- Define.xenstored_major Define.xenstored_minor;
--
- (* for compatilibity with old xenstored *)
- begin match cf.pidfile with
- | Some pidfile -> Unixext.pidfile_write pidfile
-@@ -293,7 +280,14 @@
- Sys.set_signal Sys.sigusr1 (Sys.Signal_handle (fun i -> sigusr1_handler store));
- Sys.set_signal Sys.sigpipe Sys.Signal_ignore;
-
-- Logging.init cf.activate_access_log (fun () -> DB.to_file store cons "/var/run/xenstored/db");
-+ Logging.init_xenstored_log();
-+ if cf.activate_access_log then begin
-+ let post_rotate () = DB.to_file store cons "/var/run/xenstored/db" in
-+ Logging.init_access_log post_rotate
-+ end;
-+
-+ info "Xen Storage Daemon, version %d.%d"
-+ Define.xenstored_major Define.xenstored_minor;
-
- let spec_fds =
- (match rw_sock with None -> [] | Some x -> [ x ]) @
---- a/tools/ocaml/libs/log/syslog.mli
-+++ /dev/null
-@@ -1,41 +0,0 @@
--(*
-- * Copyright (C) 2006-2007 XenSource Ltd.
-- * Copyright (C) 2008 Citrix Ltd.
-- * Author Vincent Hanquez <vincent.hanquez(a)eu.citrix.com>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License as published
-- * by the Free Software Foundation; version 2.1 only. with the special
-- * exception on linking described in file LICENSE.
-- *
-- * 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 Lesser General Public License for more details.
-- *)
--
--type level = Emerg | Alert | Crit | Err | Warning | Notice | Info | Debug
--type options = Cons | Ndelay | Nowait | Odelay | Perror | Pid
--type facility =
-- Auth
-- | Authpriv
-- | Cron
-- | Daemon
-- | Ftp
-- | Kern
-- | Local0
-- | Local1
-- | Local2
-- | Local3
-- | Local4
-- | Local5
-- | Local6
-- | Local7
-- | Lpr
-- | Mail
-- | News
-- | Syslog
-- | User
-- | Uucp
--external log : facility -> level -> string -> unit = "stub_syslog"
--external close : unit -> unit = "stub_closelog"
---- a/tools/ocaml/libs/log/Makefile
-+++ /dev/null
-@@ -1,44 +0,0 @@
--TOPLEVEL=$(CURDIR)/../..
--XEN_ROOT=$(TOPLEVEL)/../..
--include $(TOPLEVEL)/common.make
--
--OBJS = syslog log logs
--INTF = log.cmi logs.cmi syslog.cmi
--LIBS = log.cma log.cmxa
--
--all: $(INTF) $(LIBS) $(PROGRAMS)
--
--bins: $(PROGRAMS)
--
--libs: $(LIBS)
--
--log.cmxa: libsyslog_stubs.a $(foreach obj,$(OBJS),$(obj).cmx)
-- $(call mk-caml-lib-native, $@, -cclib -lsyslog_stubs, $(foreach obj,$(OBJS),$(obj).cmx))
--
--log.cma: $(foreach obj,$(OBJS),$(obj).cmo)
-- $(call mk-caml-lib-bytecode, $@, -dllib dllsyslog_stubs.so -cclib -lsyslog_stubs, $(foreach obj,$(OBJS),$(obj).cmo))
--
--syslog_stubs.a: syslog_stubs.o
-- $(call mk-caml-stubs, $@, $+)
--
--libsyslog_stubs.a: syslog_stubs.o
-- $(call mk-caml-lib-stubs, $@, $+)
--
--logs.mli : logs.ml
-- $(OCAMLC) -i $(OCAMLCFLAGS) $< > $@
--
--syslog.mli : syslog.ml
-- $(OCAMLC) -i $< > $@
--
--.PHONY: install
--install: $(LIBS) META
-- mkdir -p $(OCAMLDESTDIR)
-- ocamlfind remove -destdir $(OCAMLDESTDIR) log
-- ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore log META $(INTF) $(LIBS) *.a *.so *.cmx
--
--.PHONY: uninstall
--uninstall:
-- ocamlfind remove -destdir $(OCAMLDESTDIR) log
--
--include $(TOPLEVEL)/Makefile.rules
--
diff --git a/xen/patches/54-upstream-23940:187d59e32a58.patch b/xen/patches/54-upstream-23940:187d59e32a58.patch
deleted file mode 100644
index 2c7521a..0000000
--- a/xen/patches/54-upstream-23940:187d59e32a58.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-# HG changeset patch
-# User Jon Ludlam <jonathan.ludlam(a)eu.citrix.com>
-# Date 1318261276 -3600
-# Node ID 187d59e32a586d65697ed46bef106b52e3fb5ab9
-# Parent 51288f69523fcbbefa12cea5a761a6e957410151
-tools/ocaml: Fix 2 bit-twiddling bugs and an off-by-one
-
-The bit bugs are in ocaml vcpu affinity calls, and the off-by-one
-error is in the ocaml console ring code
-
-Signed-off-by: Zheng Li <zheng.li(a)eu.citrix.com>
-Acked-by: Ian Campbell <ian.campbell.com>
-Committed-by: Ian Jackson <ian.jackson.citrix.com>
-Acked-by: Jon Ludlam <jonathan.ludlam(a)eu.citrix.com>
-
-diff -r 51288f69523f -r 187d59e32a58 tools/ocaml/libs/xc/xenctrl_stubs.c
---- a/tools/ocaml/libs/xc/xenctrl_stubs.c Mon Oct 10 16:41:16 2011 +0100
-+++ b/tools/ocaml/libs/xc/xenctrl_stubs.c Mon Oct 10 16:41:16 2011 +0100
-@@ -430,7 +430,7 @@
-
- for (i=0; i<len; i++) {
- if (Bool_val(Field(cpumap, i)))
-- c_cpumap[i/8] |= i << (i&7);
-+ c_cpumap[i/8] |= 1 << (i&7);
- }
- retval = xc_vcpu_setaffinity(_H(xch), _D(domid),
- Int_val(vcpu), c_cpumap);
-@@ -466,7 +466,7 @@
- ret = caml_alloc(len, 0);
-
- for (i=0; i<len; i++) {
-- if (c_cpumap[i%8] & 1 << (i&7))
-+ if (c_cpumap[i/8] & 1 << (i&7))
- Store_field(ret, i, Val_true);
- else
- Store_field(ret, i, Val_false);
-@@ -523,7 +523,7 @@
-
- CAMLprim value stub_xc_readconsolering(value xch)
- {
-- unsigned int size = RING_SIZE;
-+ unsigned int size = RING_SIZE - 1;
- char *ring_ptr = ring;
-
- CAMLparam1(xch);
diff --git a/xen/patches/99-xen-configure-xend.patch b/xen/patches/99-xen-configure-xend.patch
deleted file mode 100644
index 0bdc932..0000000
--- a/xen/patches/99-xen-configure-xend.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -up xen-3.4.0/tools/examples/xend-config.sxp.config xen-3.4.0/tools/examples/xend-config.sxp
---- xen-3.4.0/tools/examples/xend-config.sxp.config 2009-05-20 17:12:50.000000000 +0200
-+++ xen-3.4.0/tools/examples/xend-config.sxp 2009-05-20 17:15:35.000000000 +0200
-@@ -58,11 +58,11 @@
-
-
- #(xend-http-server no)
--#(xend-unix-server no)
-+(xend-unix-server yes)
- #(xend-tcp-xmlrpc-server no)
- #(xend-unix-xmlrpc-server yes)
--#(xend-relocation-server no)
--(xend-relocation-server yes)
-+(xend-relocation-server no)
-+#(xend-relocation-server yes)
- #(xend-relocation-ssl-server no)
- #(xend-udev-event-server no)
-
-@@ -154,7 +154,8 @@
- # two fake interfaces per guest domain. To do things like this, write
- # yourself a wrapper script, and call network-bridge from it, as appropriate.
- #
--(network-script network-bridge)
-+#(network-script network-bridge)
-+(network-script /bin/true)
-
- # The script used to control virtual interfaces. This can be overridden on a
- # per-vif basis when creating a domain or a configuring a new vif. The
-@@ -186,7 +187,7 @@
- # dom0-min-mem is the lowest permissible memory level (in MB) for dom0.
- # This is a minimum both for auto-ballooning (as enabled by
- # enable-dom0-ballooning below) and for xm mem-set when applied to dom0.
--(dom0-min-mem 196)
-+(dom0-min-mem 256)
-
- # Whether to enable auto-ballooning of dom0 to allow domUs to be created.
- # If enable-dom0-ballooning = no, dom0 will never balloon out.
diff --git a/xen/patches/xen-gcc-4.6.0.patch.off b/xen/patches/xen-gcc-4.6.0.patch.off
deleted file mode 100644
index 2ed8c26..0000000
--- a/xen/patches/xen-gcc-4.6.0.patch.off
+++ /dev/null
@@ -1,23 +0,0 @@
---- xen-4.1.0.orig/Config.mk 2010-08-25 12:22:44.000000000 +0200
-+++ xen-4.1.0/Config.mk 2010-11-02 23:38:11.575000000 +0100
-@@ -187,4 +187,4 @@
- CONFIG_MINITERM ?= n
- CONFIG_LOMOUNT ?= n
-
---include $(XEN_ROOT)/.config
-+#-include $(XEN_ROOT)/.config
-
---- xen-4.1.0/Config.mk.orig 2010-08-25 11:22:44.000000000 +0100
-+++ xen-4.1.0/Config.mk 2011-01-29 17:40:43.000000000 +0000
-@@ -135,6 +135,8 @@
-
- LDFLAGS += $(foreach i, $(EXTRA_LIB), -L$(i))
- CFLAGS += $(foreach i, $(EXTRA_INCLUDES), -I$(i))
-+# temporary compile fix for rawhide
-+CFLAGS += -Wunused-but-set-variable -Wno-error=unused-but-set-variable -Wuninitialized -Wno-error=uninitialized
-
- EMBEDDED_EXTRA_CFLAGS := -nopie -fno-stack-protector -fno-stack-protector-all
- EMBEDDED_EXTRA_CFLAGS += -fno-exceptions
-
- # Enable XSM security module. Enabling XSM requires selection of an
-
diff --git a/xen/patches/xen-ipxe.patch0 b/xen/patches/xen-ipxe.patch0
deleted file mode 100644
index d544c78..0000000
--- a/xen/patches/xen-ipxe.patch0
+++ /dev/null
@@ -1,23 +0,0 @@
---- tools/firmware/etherboot/Makefile 2011-12-11 16:57:04.609076813 +0100
-+++ tools/firmware/etherboot/Makefile 2011-12-11 16:54:16.211074495 +0100
-@@ -35,13 +35,13 @@
- mv -f $@.new $@
-
- $T:
-- if ! wget -O _$T $(IPXE_TARBALL_URL); then \
-- $(GIT) clone $(IPXE_GIT_URL) $D.git; \
-- (cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \
-- $(IPXE_GIT_TAG) | gzip >../_$T); \
-- rm -rf $D.git; \
-- fi
-- mv _$T $T
-+# if ! wget -O _$T $(IPXE_TARBALL_URL); then \
-+# $(GIT) clone $(IPXE_GIT_URL) $D.git; \
-+# (cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \
-+# $(IPXE_GIT_TAG) | gzip >../_$T); \
-+# rm -rf $D.git; \
-+# fi
-+# mv _$T $T
-
- $D/src/arch/i386/Makefile: $T Config
- rm -rf $D
diff --git a/xen/xen.nm b/xen/xen.nm
deleted file mode 100644
index 0ef8178..0000000
--- a/xen/xen.nm
+++ /dev/null
@@ -1,159 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = xen
-version = 4.1.2
-release = 6
-sup_arches = i686 x86_64
-
-maintainer = Ben Schweikert <ben.schweikert(a)ipfire.org>
-groups = Applications/Virtualization
-url = http://www.xen.org/
-license = GPLv2+
-summary = The Xen tools.
-
-description
- The Xen hypervisor, the powerful open source industry standard
- for virtualization, offers a powerful, efficient, and secure
- feature set for virtualization.
- It is possible to use a i686 host, but it is not supported.
-end
-
-source_dl = http://bits.xensource.com/oss-xen/release/%{version}/
-sources = %{thisapp}.tar.gz xen-utils-0.2.tar.bz2
-
-build
- requires
- chrpath
- dev86
- gettext
- iasl
- libuuid-devel
- ncurses-devel
- openssl-devel
- pciutils-devel
- perl
- python-devel
- SDL-devel
- texinfo
- xorg-x11-proto-devel
- wget
- zlib-devel
- end
-
- prepare_cmds
- mv ../xen-utils/ipxe.tar.gz tools/firmware/etherboot/
- mv ../xen-utils/newlib-1.16.0.tar.gz stubdom/
- mv ../xen-utils/grub-0.97.tar.gz stubdom/
- mv ../xen-utils/lwip-1.3.0.tar.gz stubdom/
- mv ../xen-utils/pciutils-2.2.9.tar.bz2 stubdom/
- mv ../xen-utils/zlib-1.2.3.tar.gz stubdom/
- rm -f Config.mk~
-
- if [ "${DISTRO_ARCH}" = "x86_64" ]; then
- # Dirty ugly workaround for stub-32.h error (is missing).
- ln -s /usr/include/gnu/stubs-64.h /usr/include/gnu/stubs-32.h
- fi
- end
-
- build
- # Have to build it this way, else parts of the xen stubdom \
- # would get build too.
- make dist-xen %{PARALLELISMFLAGS}
- make dist-tools %{PARALLELISMFLAGS}
- end
-
- # Only install xen and tools
- make_install_targets = \
- DESTDIR=%{BUILDROOT} \
- prefix=/usr \
- install-xen \
- install-tools
-
- install_cmds
- # Remove unneeded files:
- # hypervisor symlinks
- rm -Rf %{BUILDROOT}/boot/xen-syms*
- rm -Rf %{BUILDROOT}/boot/xen-4.1.gz
- rm -Rf %{BUILDROOT}/boot/xen-4.gz
- # init.d file
- rm -Rf %{BUILDROOT}/etc/init.d
- chrpath --delete %{BUILDROOT}/usr/lib/xen/bin/qemu-dm
- # silly doc dir fun
- rm -Rf %{BUILDROOT}/usr/share/doc/xen
- rm -Rf %{BUILDROOT}/usr/share/doc/qemu
- # Pointless helper
- rm -Rf %{BUILDROOT}/usr/sbin/xen-python-path
- # qemu stuff (unused or available from upstream)
- rm -Rf %{BUILDROOT}/usr/share/xen/man
-
- # create dirs in /var
- mkdir -p %{BUILDROOT}/var/lib/xen/xend-db/domain
- mkdir -p %{BUILDROOT}/var/lib/xen/xend-db/vnet
- mkdir -p %{BUILDROOT}/var/lib/xen/xend-db/migrate
- mkdir -p %{BUILDROOT}/var/lib/xen/images
- mkdir -p %{BUILDROOT}/var/log/xen/console
- end
-end
-
-quality-agent
- whitelist_execstack
- /boot/*
- end
-end
-
-packages
- package %{name}
-
- package %{name}-libs
- template LIBS
-
- description
- This package contains the libraries needed to
- run applications which manage Xen virtual machines
- end
-
- files += %{libdir}/fs
- end
-
- package %{name}-hypervisor
- summary = The Xen hypervisor.
- description
- This package contains the Xen hypervisor.
- end
-
- files
- /boot/*
- end
- end
-
- package %{name}-runtime
- summary = Runtime programms and daemons for Xen environments.
- description
- This package contains the runtime programs
- and daemons which form the core Xen userspace environment.
- end
-
- files
- /usr/bin/*
- /usr/sbin/*
- end
- end
-
- package %{name}-devel
- template DEVEL
-
- description
- This package contains what's needed to
- develop applications which manage Xen virtual machines.
- end
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
-
-
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 2a325066d4b3dc232e42dfce043e4954df4f2a0c
by git＠ipfire.org 22 Apr '16
by git＠ipfire.org 22 Apr '16
22 Apr '16
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 2a325066d4b3dc232e42dfce043e4954df4f2a0c (commit)
via a9b2df01241334e65d308223da4f63c8a18d1f70 (commit)
via f0c126f284ce75426debd853c04fbf24378b0ef3 (commit)
via 0e4f8ad068d1d919fdfa737e24f0e681f4d65380 (commit)
via 8dd4ce221b39b8c7baeda97bddda2c7416588dec (commit)
via f7bfe44b25aae50ca6328ef534cea2c72ea10701 (commit)
via 0fced0eb776d490cd6eed0997b8acdd8a711f026 (commit)
via 8c6b7669b220df0fae6f2644b9c9f04452ea9b78 (commit)
via 296b6d1dc94721e88315abdde3b71d54a3ad001a (commit)
via cbe7d7b562ef8abd10a86d3a2254ba1cce7b03a7 (commit)
from 899e58342f3fc8b3b532f593768d90be04f7c48a (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 2a325066d4b3dc232e42dfce043e4954df4f2a0c
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date: Mon Apr 18 09:05:34 2016 +0200
lzip: Update to 1.17
this is an Update release
Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a9b2df01241334e65d308223da4f63c8a18d1f70
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date: Mon Apr 18 09:07:48 2016 +0200
lzo: Update to 2.09
Changes in 2.09 (04 Feb 2015)
* Work around gcc bug #64516 that could affect architectures like
armv4, armv5 and sparc.
Changes in 2.08 (29 Jun 2014)
* Updated the Autoconf scripts to fix some reported build problems.
* Added CMake build support.
* Fixed lzo_init() on big-endian architectures like Sparc.
Changes in 2.07 (25 Jun 2014)
* Fixed a potential integer overflow condition in the "safe" decompressor
variants which could result in a possible buffer overrun when
processing maliciously crafted compressed input data.
Fortunately this issue only affects 32-bit systems and also can only happen
if you use uncommonly huge buffer sizes where you have to decompress more
than 16 MiB (> 2^24 bytes) untrusted compressed bytes within a single
function call, so the practical implications are limited.
POTENTIAL SECURITY ISSUE. CVE-2014-4607.
* Removed support for ancient configurations like 16-bit "huge" pointers -
LZO now requires a flat 32-bit or 64-bit memory model.
* Assorted cleanups.
Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f0c126f284ce75426debd853c04fbf24378b0ef3
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date: Mon Apr 18 09:09:48 2016 +0200
mailcap: Update to 2.1.45
- mime.types: Sync with IANA as of 2015-09-25.
- Generate and install mime.types for use with nginx.
Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0e4f8ad068d1d919fdfa737e24f0e681f4d65380
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date: Mon Apr 18 09:13:03 2016 +0200
mc: Update to: 4.8.16
Version 4.8.16
- Core
* Support for ash + bugfixes for bash, fish (#2742)
* Find file: empty file name matches any file name (#3593)
* Find file: empty value of "Content" is used instead of "Search for content" checkbox to disable search for content (#3594)
* Listbox: don't wraparound on mouse scroll (#3554)
* Internals:
* Listbox: various fixups (#3569: #3562, #3563, #3565, #3161)
* Split MSG_ACTION into MSG_ACTION and MSG_NOTIFY (#3566)
- VFS
* Support lzip compression format (#2673, #1541)
* Support lz4 compression format (#3523)
* patchfs: support xz compression (#3443)
* Update uc1541 version (#3527)
* Add mc.ext patterns for initramfs / initrd (#3115)
- Editor
* Add golang syntax (MidnightCommander/mc#84)
* Update Puppet syntax (MidnightCommander/mc#86)
- Misc
* Code cleanup (#3555, #3547, #3587)
* Better subshell documentation (#3556)
* Fixes to the English man pages by Denys Vlasenko
- Fixes
* Insufficient quoting in `mc.menu` (#2947)
* Broken ./configure --without-internal-edit (#3601)
* Memory leaks (#3547, #3561, #3567, #3572)
* No preallocation if appending during file copy (#3577)
* Cannot set mini-format for "brief" listing type (#3588)
* Info panel: incorrect inode information in some cases (#3214)
* Info panel: wrong device name with symbolic link (#3412)
* Info panel: buffer overflow (#3582)
* Regression: match filename, not full path in mc.ext (#3578)
* Broken case insensitive search in non-unicode locale (#3491)
* Error message prefixed with no sense "0:" (#3269)
* mcedit: buffer overflow (#3579)
* mcedit: "Lower case selection" command in User Menu (#3586)
* mcedit: close on ctrl-g (#3557)
* mcview: "Not found" result isn't reported in some cases (#3543)
* VFS: isofs doesn't show .dotfiles (#3537)
* VFS: isofs: cannot copy file from iso when Joliet without RockRidge is used (#2851)
* VFS: extfs/unzip: enter into zip file fails with "inconsistent extfs archive" (#3433)
* VFS: SFTP: various bugs (#3581)
* VFS: FISH: provide major/minor info for block/char devices (#3599)
* Bashism in gitfs+ extfs helper (#3379)
* Non-portable invocation of man (#3509)
* mc-wrapper leaves MC_USER set (#3550)
* Broken silent opening of files in background (#3574)
* Run `identify` on JPEGs even if `exif` is not installed (#3568)
Version 4.8.15
- Core
* Minimal version of GLib is 2.26.0
* Use the PATH environment variable to search for the executable when opening pipe (#3444)
* Support more than 2 (up to 9) columns in file panel in brief mode (#3212)
* Clarify file sorting in "Unsorted" mode (#3496)
* WGroupbox: respect dialog's colors (#3468)
* Highlight find file's result in internal viewer (#3530)
- VFS
* s3 extfs vfs: bugfixes and improvements (#3470, #3502)
- Editor
* Add hidden option to choose full or base file name in the status line (#3445)
* Improvements of syntax highlighting:
- Lua (#3471)
- PKGBUILD (#3484)
- Misc
* Text alignment in Info panel (#3155)
* Select of menu file edit: change default button to "User" (#3493)
* Recognize .gmo files as well as .mo ones (#3422)
* Fix mc.pot comment tripping up Transifex and unportable inplace sed (#3479)
* A lot of code clean up (#3420, #3424, #3426, #3427, #3428, #3429, #3430, #3431, #3434, #3435, #3437, #3463, #3464, #3465, #3466, #3467, #3494, #3495, #3539)
* Documentation updates:
- Spanish man and help: Diff Viewer section and minor fixes (#3477)
- VFS garbage collection (#3472)
- Fixes
* Various memory leaks (#3438, #3439, #3440, #3457, #3458, #3459, #3460, #3461, #3462, #3475, #3520, #3521, #3522)
* Linux kernel-specific segfault on startup (#3441)
* Lost of Panelize contents in some cases (#3032, #3489, #3498, #3507)
* Wrong highlight of search result in case of "Regular expression" and "Whole words" (#3524)
* "Whole words" search works only in Normal mode (#3525)
* View find results doesn't jump to match line if file is too short to scroll page (#3530)
* SFTP VFS: segfault (#3456)
* Segfault in "Find file" due to invalid UTF-8 sequences (#3449)
* Bash variable 'PROMPT_COMMAND' in pantheon-terminal (#3534)
Version 4.8.14
- Core
* Minimal version of GLib is 2.14.0
* Add new panel binding "!SelectExt" to select/unselect files with the same extension as the current file (#3228)
* Speed up of directory size calculation (#3247)
* Support of italic text (#3065)
- Editor
* New syntax highlighting support:
- puppet (#3266)
- Viewer
* Rewrite mcview's rendering and scrolling (#3250, #3256)
- no more partial lines at the top and failure to scroll when Up or Down is pressed;
- better handling of CJK characters;
- handle combining accents;
- improved nroff support;
- more conventional scrolling behavior at the end of the file.
* Use VIEW_SELECTED_COLOR in plain mode (#3405)
* In !QuickView panel, don't pass any chars to command line to avoid unexpected command execution (#3253)
- Misc
* Code cleanup (#3265, #3262)
* Bind poedit to Edit action for .po files (#3287)
* Better grammar mcedit user menu (#3246)
- Fixes
* Fail to build against musl libc (#3267)
* Error compiling with glib 2.20.3 (#3333)
* Overwrite of the PROMPT_COMMAND bash variable (#2027)
* contrib/*.?sh are not recreated after rerun of configure (#3181)
* File rename handles zero-length substitutions incorrectly (#2952)
* Lose files on "Skip" when "Cannot preallocate space for target file" (#3297)
* Info panel can't obtain file system statistics on Solaris (#3277)
* "Shell patterns" broken beyond repair (#2309)
* File selection by patterns uses bytes instead of unicode characters (#2743)
* Copy files dosn't work as expected, when copying to a directory with the special symbol in its name (#3235)
* Wrong order of old_colors table items (#3404)
* Input line: Alt+Backspace on one-letter word erases too much (#3390)
* "Directory scanning" window is too narrow (#3162)
* No Help for User Menu (#3409)
* mcedit: paste from clipboard does not work (#3339)
* mcviewer: hang when viewing broken man page (#2966)
* mcview hex: incorrect highlight when search string not found (#3263)
* mcview hex edit: UTF-8 chars are not updated (#3259)
* mcview hex edit: can't enter certain UTF-8 characters (#3260)
* mcview hex edit: CJK overflow (#3261)
* mcedit: status line doesn't show full path to file (#3285)
* Freeze when copying from one FTP location to another (#358)
Version 4.8.13
- Core
* New engine of user-friendly interruption of long-time operations (#2136)
- Editor
* Improvements of syntax highlighting:
* CMake (#3216)
* PHP (#3230)
* Translate language names in the spelling assistant dialogue (#3233)
- Viewer
* Add separate normal(default) colour pair for viewer (#3204)
* Dealing with utf-8 man pages in view/open (#1539)
* "Goto line" is 1-based now (#3245)
- Misc
* Code cleanup (#3189, #3223, #3242)
* Add new skins: gray-green-purple256 and gray-orange-blue256 (#3190)
- Fixes
* First Backspace/Delete is ignored after mouse click in an input widget (#3225)
* Recursive find file doesn't work on Samba share (#3097)
* Recursive find file doesn't work on Windows NFS share (#3202)
* Incorrect file counter in move operation (#3196, #3209)
* "Directory scanning" window is too narrow (#3162)
* Colon is not recognized inside escape seq in prompt (#3241)
* Quick view doesn't grab focus on mouse click (#3251)
* fish subshell: overridden prompt (#3232, #3237)
* mcviewer: broken switch between raw and parse modes (#3219)
* mcviewer: incorrect percentage in mcview hex mode (#3258)
* RAR VFS incorrectly recognizes UnRAR version (#3240)
* viewbold and viewselected are missing from some skins (#3244)
* Incorrect enconding name for manual page (#3239)
* "User menu -> View manual page" doesn't do coloring (#3243)
Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8dd4ce221b39b8c7baeda97bddda2c7416588dec
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date: Mon Apr 18 09:19:24 2016 +0200
mdadm: Update to 3.4
This is an Update release
Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f7bfe44b25aae50ca6328ef534cea2c72ea10701
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date: Mon Apr 18 09:24:16 2016 +0200
minicom: Update to 2.7
This is an Update release
Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0fced0eb776d490cd6eed0997b8acdd8a711f026
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date: Mon Apr 18 09:26:53 2016 +0200
mtr: Update to 0.85
This is an Update release
Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8c6b7669b220df0fae6f2644b9c9f04452ea9b78
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date: Mon Apr 18 09:31:23 2016 +0200
nasm: Update to 2.12.01
This is an Update release
Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 296b6d1dc94721e88315abdde3b71d54a3ad001a
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date: Tue Apr 19 14:16:47 2016 +0200
tzdata: Update to 2016d
This is an Update-release
Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit cbe7d7b562ef8abd10a86d3a2254ba1cce7b03a7
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Apr 15 08:52:12 2016 +0200
] boost: Update to 1.60.0.
This is a major update to the latest available version of boost.
Fixes #11018.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
boost/boost.nm | 21 +--
boost/patches/boost-1.48.0-add-bjam-man-page.patch | 150 +++++++++++++++++++++
.../patches/boost-1.50.0-fix-non-utf8-files.patch | 22 +++
.../boost-1.51.0-context-no-exec-stack.patch | 28 ----
...1.55.0-python-test-PyImport_AppendInittab.patch | 98 ++++++++++++++
boost/patches/boost-1.57.0-build-optflags.patch | 48 +++++++
boost/patches/boost-1.57.0-mpl-print.patch | 31 +++++
.../patches/boost-1.57.0-python-abi_letters.patch | 62 +++++++++
.../boost-1.57.0-python-libpython_dep.patch | 13 ++
.../boost-1.57.0-spirit-unused_typedef.patch | 19 +++
boost/patches/boost-1.58.0-pool-test_linking.patch | 31 +++++
boost/patches/boost-1.58.0-pool.patch0 | 120 +++++++++++++++++
boost/patches/boost-1.59-test-fenv.patch2 | 32 +++++
lzip/lzip.nm | 2 +-
lzo/lzo.nm | 2 +-
mailcap/mailcap.nm | 6 +-
mc/mc.nm | 2 +-
mdadm/mdadm.nm | 2 +-
minicom/minicom.nm | 4 +-
mtr/mtr.nm | 3 +-
nasm/nasm.nm | 4 +-
tzdata/tzdata.nm | 4 +-
22 files changed, 653 insertions(+), 51 deletions(-)
create mode 100644 boost/patches/boost-1.48.0-add-bjam-man-page.patch
create mode 100644 boost/patches/boost-1.50.0-fix-non-utf8-files.patch
delete mode 100644 boost/patches/boost-1.51.0-context-no-exec-stack.patch
create mode 100644 boost/patches/boost-1.55.0-python-test-PyImport_AppendInittab.patch
create mode 100644 boost/patches/boost-1.57.0-build-optflags.patch
create mode 100644 boost/patches/boost-1.57.0-mpl-print.patch
create mode 100644 boost/patches/boost-1.57.0-python-abi_letters.patch
create mode 100644 boost/patches/boost-1.57.0-python-libpython_dep.patch
create mode 100644 boost/patches/boost-1.57.0-spirit-unused_typedef.patch
create mode 100644 boost/patches/boost-1.58.0-pool-test_linking.patch
create mode 100644 boost/patches/boost-1.58.0-pool.patch0
create mode 100644 boost/patches/boost-1.59-test-fenv.patch2
Difference in files:
diff --git a/boost/boost.nm b/boost/boost.nm
index 889b316..0a6af33 100644
--- a/boost/boost.nm
+++ b/boost/boost.nm
@@ -5,10 +5,10 @@
name = boost
ver_major = 1
-ver_minor = 51
+ver_minor = 60
ver_plevel = 0
version = %{ver_major}.%{ver_minor}.%{ver_plevel}
-release = 2
+release = 1
groups = System/Libraries
url = http://www.boost.org/
@@ -31,6 +31,7 @@ build
requires
bzip2-devel
gcc-c++
+ icu-devel
python-devel
python3-devel
zlib-devel
@@ -39,12 +40,13 @@ build
CFLAGS += -fno-strict-aliasing
CXXFLAGS += -fno-strict-aliasing
- # Don't build in parallel on ARM.
+ # Obtain python3 abiflags.
+ python3_abiflags = %(python3-config --abiflags)
+
+ # Don't build in parallel on any architecture.
# The C++ compiles consumes too much memory, so
# we cannot run multiple instances at once.
- if "%{DISTRO_PLATFORM}" == "arm"
- PARALLELISMFLAGS = -j2
- end
+ PARALLELISMFLAGS = -j2
configure_options = \
--layout=tagged \
@@ -68,11 +70,12 @@ build
mkdir -pv %{DIR_APP}/serial
# Bootstrap build environment.
- ./bootstrap.sh --with-toolset=gcc
+ ./bootstrap.sh --with-toolset=gcc --with-icu
# Enable boost lib for python3.
- cat >> ./tools/build/v2/user-config.jam << EOF
- using python : %{python3_version} : %{python3} : %{includedir}/python%{python3_version}%{python3_abiflags} : %{libdir}/python%{python3_version} ;
+ cat >> ./tools/build/src/user-config.jam << EOF
+ using python : %{python_version} : %{python2} : %{includedir}/python%{python_version} : : : : ;
+ using python : %{python3_version} : %{python3} : %{includedir}/python%{python3_version}%{python3_abiflags} : : : : %{python3_abiflags} ;
EOF
end
diff --git a/boost/patches/boost-1.48.0-add-bjam-man-page.patch b/boost/patches/boost-1.48.0-add-bjam-man-page.patch
new file mode 100644
index 0000000..ea3f19f
--- /dev/null
+++ b/boost/patches/boost-1.48.0-add-bjam-man-page.patch
@@ -0,0 +1,150 @@
+diff --git a/tools/build/v2/doc/bjam.1 b/tools/build/v2/doc/bjam.1
+new file mode 100644
+index 0000000..8a44af6
+--- /dev/null
++++ b/tools/build/v2/doc/bjam.1
+@@ -0,0 +1,144 @@
++.TH "bjam" 1 "Sat Nov 19 2011" "Doxygen" \" -*- nroff -*-
++.ad l
++.nh
++.SH NAME
++bjam \- Command-line utility to build Boost-related C++ projects with Boost\&.Build
++.SH "SYNOPSIS"
++.PP
++\fBbjam\fP \fC[-a] [-dx] [-fx] [-jx] [-lx] [-n] [-ox] [-px] [-q] [-sx=y] [-tx] [-v] [--x]\fP
++.PP
++\fIbjam\fP accepts the following options:
++.PP
++\fB-a\fP
++.br
++ Build all targets, even if they are current
++.PP
++\fB-dx\fP
++.br
++ Set the debug level to x (0-9)
++.PP
++\fB-fx\fP
++.br
++ Read x instead of Jambase
++.PP
++\fB-jx\fP
++.br
++ Run up to x shell commands concurrently
++.PP
++\fB-lx\fP
++.br
++ Limit actions to x number of seconds after which they are stopped
++.PP
++\fB-n\fP
++.br
++ Don't actually execute the updating actions
++.PP
++\fB-ox\fP
++.br
++ Write the updating actions to file x
++.PP
++\fB-px\fP
++.br
++ x=0, pipes action stdout and stderr merged into action output
++.PP
++\fB-q\fP
++.br
++ Quit quickly as soon as a target fails
++.PP
++\fB-sx=y\fP
++.br
++ Set variable x=y, overriding environment
++.PP
++\fB-tx\fP
++.br
++ Rebuild x, even if it is up-to-date
++.PP
++\fB-v\fP
++.br
++ Print the version of jam and exit
++.PP
++\fB--x\fP
++.br
++ Option is ignored
++.SH "DESCRIPTION"
++.PP
++This section provides the information necessary to create your own projects using \fIBoost\&.Build\fP The information provided here is relatively high-level, and Chapter 6, Reference as well as the on-line help system must be used to obtain low-level documentation (see --help)
++.PP
++\fIBoost\&.Build\fP actually consists of two parts - \fIBoost\&.Jam\fP, a build engine with its own interpreted language, and \fIBoost\&.Build\fP itself, implemented in \fIBoost\&.Jam's\fP language\&. The chain of events when you type bjam on the command line is as follows:
++.IP "\(bu" 2
++\fIBoost\&.Jam\fP tries to find \fIBoost\&.Build\fP and loads the top-level module\&. The exact process is described in the section called âInitializationâ
++.PP
++.PP
++.IP "\(bu" 2
++The top-level module loads user-defined configuration files, \fIuser-config\&.jam\fP and \fIsite-config\&.jam\fP, which define available toolsets
++.PP
++.PP
++.IP "\(bu" 2
++The \fIJamfile\fP in the current directory is read That in turn might cause reading of further Jamfiles\&. As a result, a tree of projects is created, with targets inside projects
++.PP
++.PP
++.IP "\(bu" 2
++Finally, using the build request specified on the command line, \fIBoost\&.Build\fP decides which targets should be built and how\&. That information is passed back to \fIBoost\&.Jam\fP, which takes care of actually running the scheduled build action commands
++.PP
++.PP
++So, to be able to successfully use \fIBoost\&.Build\fP, you need to know only four things:
++.IP "\(bu" 2
++How to configure \fIBoost\&.Build\fP (http://www.boost.org/boost-build2/doc/html/bbv2/overview/configuration.html)
++.IP "\(bu" 2
++How to declare targets in Jamfiles (http://www.boost.org/boost-build2/doc/html/bbv2/overview/targets.html)
++.IP "\(bu" 2
++How the build process works (http://www.boost.org/boost-build2/doc/html/bbv2/overview/build_process.html)
++.PP
++.PP
++Some Basics about the \fIBoost\&.Jam\fP language\&. See the section called âBoost\&.Jam Languageâ (http://www.boost.org/boost-build2/doc/html/bbv2/overview/jam_language.html)
++.SH "CONCEPTS"
++.PP
++\fIBoost\&.Build\fP has a few unique concepts that are introduced in this section\&. The best way to explain the concepts is by comparison with more classical build tools
++.PP
++When using any flavour of make, you directly specify targets and commands that are used to create them from other target\&. The below example creates a\&.o from a\&.c using a hardcoded compiler invocation command
++.PP
++a\&.o: a\&.c
++.br
++ g++ -o a\&.o -g a\&.c
++.PP
++This is rather low-level description mechanism and it is hard to adjust commands, options, and sets of created targets depending on the used compiler and operating system\&.
++.PP
++To improve portability, most modern build system provide a set of higher-level functions that can be used in build description files\&. Consider this example:
++.PP
++add_program ('a', 'a\&.c')
++.br
++.PP
++This is a function call that creates targets necessary to create executable file from source file a\&.c\&. Depending on configured properties, different commands line may be used\&. However, \fIadd_program\fP is higher-level, but rather thin level All targets are created immediately when build description is parsed, which makes it impossible to perform multi-variant builds\&. Often, change in any build property requires complete reconfiguration of the build tree
++.PP
++In order to support true multivariant builds, Boost\&.Build introduces the concept of metatargetâobject that is created when build description is parsed and can be later called with specific build properties to generate actual targets
++.PP
++Consider an example:
++.PP
++exe a : a\&.cpp ;
++.br
++.PP
++When this declaration is parsed, \fIBoost\&.Build\fP creates a metatarget, but does not yet decides what files must be created, or what commands must be used\&. After all build files are parsed, Boost\&.Build considers properties requested on the command line\&. Supposed you have invoked \fIBoost\&.Build\fP with:
++.PP
++\fIbjam\fP toolset=gcc toolset=msvc
++.br
++.PP
++In that case, the metatarget will be called twice, once with toolset=gcc and once with toolset=msvc\&. Both invocations will produce concrete targets, that will have different extensions and use different command lines\&. Another key concept is build property\&. Build property is a variable that affects the build process\&. It can be specified on the command line, and is passed when calling a metatarget
++.PP
++While all build tools have a similar mechanism, \fIBoost\&.Build\fP differs by requiring that all build properties are declared in advance, and providing a large set of properties with portable semantics
++.PP
++The final concept is property propagation\&. Boost\&.Build does not require that every metatarget is called with the same properties\&. Instead, the 'top-level' metatargets are called with the properties specified on the command line Each metatarget can elect to augment or override some properties (in particular, using the requirements mechanism, see the section called âRequirementsâ: http://www.boost.org/boost-build2/doc/html/bbv2/overview/targets.html#bbv2.…) Then, the dependency metatargets are called with modified properties and produce concrete targets that are then used in build process Of course, dependency metatargets maybe in turn modify build properties and have dependencies of their own\&.
++.PP
++For more in-depth treatment of the requirements and concepts, you may refer to SYRCoSE 2009 Boost\&.Build article (http://syrcose.ispras.ru/2009/files/04_paper.pdf)\&.
++.SH "SEE ALSO"
++.PP
++\fBboost-libraries\fP(3)
++.SH "SUPPORT"
++.PP
++Please report any bugs to https://svn.boost.org/trac/boost/
++.SH "COPYRIGHT"
++.PP
++Boost Software License - Version 1\&.0 - August 17th, 2003
++.PP
++See the LICENSE_1_0\&.txt file for more information on that license, or directly on Internet:
++.br
++ http://www.boost.org/LICENSE_1_0.txt
diff --git a/boost/patches/boost-1.50.0-fix-non-utf8-files.patch b/boost/patches/boost-1.50.0-fix-non-utf8-files.patch
new file mode 100644
index 0000000..b60a3ac
--- /dev/null
+++ b/boost/patches/boost-1.50.0-fix-non-utf8-files.patch
@@ -0,0 +1,22 @@
+diff --git a/libs/units/example/autoprefixes.cpp b/libs/units/example/autoprefixes.cpp
+index 8b2bc43..d04f2fe 100644
+--- a/libs/units/example/autoprefixes.cpp
++++ b/libs/units/example/autoprefixes.cpp
+@@ -67,7 +67,7 @@ struct thing_base_unit : boost::units::base_unit<thing_base_unit, boost::units::
+ struct euro_base_unit : boost::units::base_unit<euro_base_unit, boost::units::dimensionless_type, 5>
+ {
+ static const char* name() { return("EUR"); }
+- static const char* symbol() { return(""); }
++ static const char* symbol() { return("â¬"); }
+ };
+
+ int main()
+@@ -140,7 +140,7 @@ int main()
+
+ quantity<euro_base_unit::unit_type> ce = 2048. * euro_base_unit::unit_type();
+ cout << name_format << engineering_prefix << ce << endl; // 2.048 kiloEUR
+- cout << symbol_format << engineering_prefix << ce << endl; // 2.048 k
++ cout << symbol_format << engineering_prefix << ce << endl; // 2.048 kâ¬
+
+
+ return 0;
diff --git a/boost/patches/boost-1.51.0-context-no-exec-stack.patch b/boost/patches/boost-1.51.0-context-no-exec-stack.patch
deleted file mode 100644
index dee44ad..0000000
--- a/boost/patches/boost-1.51.0-context-no-exec-stack.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nur a/libs/context/src/asm/fcontext_arm_aapcs_elf_gas.S b/libs/context/src/asm/fcontext_arm_aapcs_elf_gas.S
---- a/libs/context/src/asm/fcontext_arm_aapcs_elf_gas.S 2012-07-03 21:12:31.000000000 +0200
-+++ b/libs/context/src/asm/fcontext_arm_aapcs_elf_gas.S 2012-10-27 19:25:08.016850683 +0200
-@@ -45,6 +45,10 @@
- * *
- * *****************************************************************/
-
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-+
- .text
- .globl jump_fcontext
- .align 2
-diff -Nur a/libs/context/src/asm/fcontext_i386_sysv_elf_gas.S b/libs/context/src/asm/fcontext_i386_sysv_elf_gas.S
---- a/libs/context/src/asm/fcontext_i386_sysv_elf_gas.S 2012-07-03 21:12:31.000000000 +0200
-+++ b/libs/context/src/asm/fcontext_i386_sysv_elf_gas.S 2012-10-27 19:24:34.166680913 +0200
-@@ -31,6 +31,10 @@
- * *
- * *****************************************************************/
-
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-+
- .text
- .globl jump_fcontext
- .align 2
diff --git a/boost/patches/boost-1.55.0-python-test-PyImport_AppendInittab.patch b/boost/patches/boost-1.55.0-python-test-PyImport_AppendInittab.patch
new file mode 100644
index 0000000..1d2ee5c
--- /dev/null
+++ b/boost/patches/boost-1.55.0-python-test-PyImport_AppendInittab.patch
@@ -0,0 +1,98 @@
+diff -up boost_1_55_0/libs/python/test/exec.cpp\~ boost_1_55_0/libs/python/test/exec.cpp
+--- boost_1_55_0/libs/python/test/exec.cpp~ 2010-07-05 00:38:38.000000000 +0200
++++ boost_1_55_0/libs/python/test/exec.cpp 2015-01-09 21:31:12.903218280 +0100
+@@ -56,6 +56,20 @@ void eval_test()
+ BOOST_TEST(value == "ABCDEFG");
+ }
+
++struct PyCtx
++{
++ PyCtx() {
++ Py_Initialize();
++ }
++
++ ~PyCtx() {
++ // N.B. certain problems may arise when Py_Finalize is called when
++ // using Boost.Python. However in this test suite it all seems to
++ // work fine.
++ Py_Finalize();
++ }
++};
++
+ void exec_test()
+ {
+ // Register the module with the interpreter
+@@ -68,6 +82,8 @@ void exec_test()
+ ) == -1)
+ throw std::runtime_error("Failed to add embedded_hello to the interpreter's "
+ "builtin modules");
++
++ PyCtx ctx;
+ // Retrieve the main module
+ python::object main = python::import("__main__");
+
+@@ -148,41 +164,43 @@ void check_pyerr(bool pyerr_expected=fal
+ }
+ }
+
++template <class Cb>
++bool
++run_and_handle_exception(Cb cb, bool pyerr_expected = false)
++{
++ PyCtx ctx;
++ if (python::handle_exception(cb)) {
++ check_pyerr(pyerr_expected);
++ return true;
++ } else {
++ return false;
++ }
++}
++
+ int main(int argc, char **argv)
+ {
+ BOOST_TEST(argc == 2 || argc == 3);
+ std::string script = argv[1];
+- // Initialize the interpreter
+- Py_Initialize();
+
+- if (python::handle_exception(eval_test)) {
+- check_pyerr();
+- }
+- else if(python::handle_exception(exec_test)) {
+- check_pyerr();
+- }
+- else if (python::handle_exception(boost::bind(exec_file_test, script))) {
++ // N.B. exec_test mustn't be called through run_and_handle_exception
++ // as it needs to handles the python context by itself.
++ if (run_and_handle_exception(eval_test)
++ || python::handle_exception(exec_test))
+ check_pyerr();
+- }
+-
+- if (python::handle_exception(exec_test_error))
+- {
+- check_pyerr(/*pyerr_expected*/ true);
+- }
+ else
+- {
++ run_and_handle_exception(boost::bind(exec_file_test, script));
++
++ if (!run_and_handle_exception(exec_test_error, true))
+ BOOST_ERROR("Python exception expected, but not seen.");
+- }
+
+ if (argc > 2) {
++ PyCtx ctx;
+ // The main purpose is to test compilation. Since this test generates
+ // a file and I (rwgk) am uncertain about the side-effects, run it only
+ // if explicitly requested.
+ exercise_embedding_html();
+ }
+
+- // Boost.Python doesn't support Py_Finalize yet.
+- // Py_Finalize();
+ return boost::report_errors();
+ }
+
+
+Diff finished. Fri Jan 9 21:31:13 2015
diff --git a/boost/patches/boost-1.57.0-build-optflags.patch b/boost/patches/boost-1.57.0-build-optflags.patch
new file mode 100644
index 0000000..d0b925f
--- /dev/null
+++ b/boost/patches/boost-1.57.0-build-optflags.patch
@@ -0,0 +1,48 @@
+diff -up ./tools/build/src/tools/gcc.jam~ ./tools/build/src/tools/gcc.jam
+--- ./tools/build/src/tools/gcc.jam~ 2015-02-09 15:01:04.850331626 +0100
++++ ./tools/build/src/tools/gcc.jam 2015-02-09 15:44:29.122307134 +0100
+@@ -366,17 +366,17 @@ generators.override gcc.compile.c++.pch
+ toolset.flags gcc.compile PCH_FILE <pch>on : <pch-file> ;
+
+ # Declare flags and action for compilation.
+-toolset.flags gcc.compile OPTIONS <optimization>off : -O0 ;
+-toolset.flags gcc.compile OPTIONS <optimization>speed : -O3 ;
+-toolset.flags gcc.compile OPTIONS <optimization>space : -Os ;
++toolset.flags gcc.compile OPTIONS <optimization>off : ;
++toolset.flags gcc.compile OPTIONS <optimization>speed : ;
++toolset.flags gcc.compile OPTIONS <optimization>space : ;
+
+-toolset.flags gcc.compile OPTIONS <inlining>off : -fno-inline ;
+-toolset.flags gcc.compile OPTIONS <inlining>on : -Wno-inline ;
+-toolset.flags gcc.compile OPTIONS <inlining>full : -finline-functions -Wno-inline ;
++toolset.flags gcc.compile OPTIONS <inlining>off : ;
++toolset.flags gcc.compile OPTIONS <inlining>on : ;
++toolset.flags gcc.compile OPTIONS <inlining>full : ;
+
+-toolset.flags gcc.compile OPTIONS <warnings>off : -w ;
+-toolset.flags gcc.compile OPTIONS <warnings>on : -Wall ;
+-toolset.flags gcc.compile OPTIONS <warnings>all : -Wall -pedantic ;
++toolset.flags gcc.compile OPTIONS <warnings>off : ;
++toolset.flags gcc.compile OPTIONS <warnings>on : ;
++toolset.flags gcc.compile OPTIONS <warnings>all : ;
+ toolset.flags gcc.compile OPTIONS <warnings-as-errors>on : -Werror ;
+
+ toolset.flags gcc.compile OPTIONS <debug-symbols>on : -g ;
+@@ -603,7 +603,7 @@ rule compile.fortran ( targets * : sourc
+
+ actions compile.c++ bind PCH_FILE
+ {
+- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" -c -o "$(<:W)" "$(>:W)"
++ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" -c -o "$(<:W)" "$(>:W)"
+ }
+
+ actions compile.c bind PCH_FILE
+@@ -613,7 +613,7 @@ actions compile.c bind PCH_FILE
+
+ actions compile.c++.preprocess bind PCH_FILE
+ {
+- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" "$(>:W)" -E >"$(<:W)"
++ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" "$(>:W)" -E >"$(<:W)"
+ }
+
+ actions compile.c.preprocess bind PCH_FILE
diff --git a/boost/patches/boost-1.57.0-mpl-print.patch b/boost/patches/boost-1.57.0-mpl-print.patch
new file mode 100644
index 0000000..561cef1
--- /dev/null
+++ b/boost/patches/boost-1.57.0-mpl-print.patch
@@ -0,0 +1,31 @@
+diff -up boost_1_57_0/boost/mpl/print.hpp\~ boost_1_57_0/boost/mpl/print.hpp
+--- boost_1_57_0/boost/mpl/print.hpp~ 2014-07-09 23:12:31.000000000 +0200
++++ boost_1_57_0/boost/mpl/print.hpp 2015-01-20 12:44:59.621400948 +0100
+@@ -52,16 +52,15 @@ struct print
+ enum { n = sizeof(T) + -1 };
+ #elif defined(__MWERKS__)
+ void f(int);
+-#else
+- enum {
+- n =
+-# if defined(__EDG_VERSION__)
+- aux::dependent_unsigned<T>::value > -1
+-# else
+- sizeof(T) > -1
+-# endif
+- };
+-#endif
++#elif defined(__EDG_VERSION__)
++ enum { n = aux::dependent_unsigned<T>::value > -1 };
++#elif defined(BOOST_GCC)
++ enum { n1 };
++ enum { n2 };
++ enum { n = n1 != n2 };
++#else
++ enum { n = sizeof(T) > -1 };
++#endif
+ };
+
+ #if defined(BOOST_MSVC)
+
+Diff finished. Tue Jan 20 12:45:03 2015
diff --git a/boost/patches/boost-1.57.0-python-abi_letters.patch b/boost/patches/boost-1.57.0-python-abi_letters.patch
new file mode 100644
index 0000000..7df3ee7
--- /dev/null
+++ b/boost/patches/boost-1.57.0-python-abi_letters.patch
@@ -0,0 +1,62 @@
+--- boost_1_57_0/tools/build/src/tools/python.jam 2013-05-21 06:14:18.000000000 +0200
++++ boost_1_55_0/tools/build/src/tools/python.jam 2014-05-29 19:09:12.115413877 +0200
+@@ -94,7 +94,7 @@ feature.feature pythonpath : : free opti
+ # using python : 2.3 : /usr/local/bin/python ;
+ #
+ rule init ( version ? : cmd-or-prefix ? : includes * : libraries ?
+- : condition * : extension-suffix ? )
++ : condition * : extension-suffix ? : abi-letters ? )
+ {
+ project.push-current $(.project) ;
+
+@@ -107,7 +107,7 @@ rule init ( version ? : cmd-or-prefix ?
+ }
+ }
+
+- configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) ;
++ configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) : $(abi-letters) ;
+
+ project.pop-current ;
+ }
+@@ -653,7 +653,7 @@ local rule system-library-dependencies (
+
+ # Declare a target to represent Python's library.
+ #
+-local rule declare-libpython-target ( version ? : requirements * )
++local rule declare-libpython-target ( version ? : requirements * : abi-letters ? )
+ {
+ # Compute the representation of Python version in the name of Python's
+ # library file.
+@@ -677,13 +677,13 @@ local rule declare-libpython-target ( ve
+ }
+
+ # Declare it.
+- lib python.lib : : <name>python$(lib-version) $(requirements) ;
++ lib python.lib : : <name>python$(lib-version)$(abi-letters) $(requirements) ;
+ }
+
+
+ # Implementation of init.
+ local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? :
+- condition * : extension-suffix ? )
++ condition * : extension-suffix ? : abi-letters ? )
+ {
+ local prefix ;
+ local exec-prefix ;
+@@ -699,6 +699,7 @@ local rule configure ( version ? : cmd-o
+ extension-suffix ?= _d ;
+ }
+ extension-suffix ?= "" ;
++ abi-letters ?= "" ;
+
+ # Normalize and dissect any version number.
+ local major-minor ;
+@@ -922,7 +923,7 @@ local rule configure ( version ? : cmd-o
+ }
+ else
+ {
+- declare-libpython-target $(version) : $(target-requirements) ;
++ declare-libpython-target $(version) : $(target-requirements) : $(abi-letters) ;
+
+ # This is an evil hack. On, Windows, when Python is embedded, nothing
+ # seems to set up sys.path to include Python's standard library
diff --git a/boost/patches/boost-1.57.0-python-libpython_dep.patch b/boost/patches/boost-1.57.0-python-libpython_dep.patch
new file mode 100644
index 0000000..57bfc26
--- /dev/null
+++ b/boost/patches/boost-1.57.0-python-libpython_dep.patch
@@ -0,0 +1,13 @@
+Index: boost_1_57_0/tools/build/src/tools/python.jam
+===================================================================
+--- boost_1_57_0/tools/build/src/tools/python.jam (revision 50406)
++++ boost_1_57_0/tools/build/src/tools/python.jam (working copy)
+@@ -994,7 +994,7 @@
+ else
+ {
+ alias python_for_extensions
+- :
++ : python
+ : $(target-requirements)
+ :
+ : $(usage-requirements)
diff --git a/boost/patches/boost-1.57.0-spirit-unused_typedef.patch b/boost/patches/boost-1.57.0-spirit-unused_typedef.patch
new file mode 100644
index 0000000..2829629
--- /dev/null
+++ b/boost/patches/boost-1.57.0-spirit-unused_typedef.patch
@@ -0,0 +1,19 @@
+diff -up boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp\~ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp
+--- boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp~ 2014-10-13 12:21:40.000000000 +0200
++++ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp 2015-01-20 13:25:50.069710766 +0100
+@@ -282,12 +282,12 @@ struct grammar_definition
+ #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE)
+ typedef impl::grammar_helper_base<GrammarT> helper_base_t;
+ typedef grammar_helper_list<GrammarT> helper_list_t;
+- typedef typename helper_list_t::vector_t::reverse_iterator iterator_t;
+
+ helper_list_t& helpers =
+ grammartract_helper_list::do_(self);
+
+ # if defined(BOOST_INTEL_CXX_VERSION)
++ typedef typename helper_list_t::vector_t::reverse_iterator iterator_t;
+ for (iterator_t i = helpers.rbegin(); i != helpers.rend(); ++i)
+ (*i)->undefine(self);
+ # else
+
+Diff finished. Tue Jan 20 13:25:53 2015
diff --git a/boost/patches/boost-1.58.0-pool-test_linking.patch b/boost/patches/boost-1.58.0-pool-test_linking.patch
new file mode 100644
index 0000000..a381370
--- /dev/null
+++ b/boost/patches/boost-1.58.0-pool-test_linking.patch
@@ -0,0 +1,31 @@
+diff -up boost_1_58_0/libs/pool/test/Jamfile.v2\~ boost_1_58_0/libs/pool/test/Jamfile.v2
+--- boost_1_57_0/libs/pool/test/Jamfile.v2~ 2015-07-17 11:36:16.362519826 +0100
++++ boost_1_57_0/libs/pool/test/Jamfile.v2 2015-07-17 11:37:38.858847388 +0100
+@@ -28,17 +28,17 @@
+ local Werr = <toolset>gcc:<warnings-as-errors>on <toolset>msvc:<warnings-as-errors>on ;
+
+ test-suite pool :
+- [ run test_simple_seg_storage.cpp : : : $(Werr) <toolset>msvc:<cxxflags>-wd4267 ]
+- [ run test_pool_alloc.cpp : : : $(Werr) ]
+- [ run pool_msvc_compiler_bug_test.cpp : : : $(Werr) <toolset>msvc:<cxxflags>-wd4512 ]
+- [ run test_msvc_mem_leak_detect.cpp : : : $(Werr) ]
+- [ run test_bug_3349.cpp : : : $(Werr) ]
+- [ run test_bug_4960.cpp : : : $(Werr) ]
+- [ run test_bug_1252.cpp : : : $(Werr) ]
+- [ run test_bug_2696.cpp : : : $(Werr) ]
+- [ run test_bug_5526.cpp : : : $(Werr) ]
++ [ run test_simple_seg_storage.cpp : : : $(Werr) <toolset>msvc:<cxxflags>-wd4267 <library>/boost/system//boost_system ]
++ [ run test_pool_alloc.cpp : : : $(Werr) <library>/boost/system//boost_system ]
++ [ run pool_msvc_compiler_bug_test.cpp : : : $(Werr) <toolset>msvc:<cxxflags>-wd4512 <library>/boost/system//boost_system ]
++ [ run test_msvc_mem_leak_detect.cpp : : : $(Werr) <library>/boost/system//boost_system ]
++ [ run test_bug_3349.cpp : : : $(Werr) <library>/boost/system//boost_system ]
++ [ run test_bug_4960.cpp : : : $(Werr) <library>/boost/system//boost_system ]
++ [ run test_bug_1252.cpp : : : $(Werr) <library>/boost/system//boost_system ]
++ [ run test_bug_2696.cpp : : : $(Werr) <library>/boost/system//boost_system ]
++ [ run test_bug_5526.cpp : : : $(Werr) <library>/boost/system//boost_system ]
+ [ run test_threading.cpp : : : <threading>multi <library>/boost/thread//boost_thread ]
+- [ run ../example/time_pool_alloc.cpp : : : $(Werr) ]
++ [ run ../example/time_pool_alloc.cpp : : : $(Werr) <library>/boost/system//boost_system ]
+ [ compile test_poisoned_macros.cpp : $(Werr) ]
+
+ #
diff --git a/boost/patches/boost-1.58.0-pool.patch0 b/boost/patches/boost-1.58.0-pool.patch0
new file mode 100644
index 0000000..ed8449e
--- /dev/null
+++ b/boost/patches/boost-1.58.0-pool.patch0
@@ -0,0 +1,120 @@
+Index: boost/pool/pool.hpp
+===================================================================
+--- boost/pool/pool.hpp (revision 78317)
++++ boost/pool/pool.hpp (revision 78326)
+@@ -27,4 +27,6 @@
+ #include <boost/pool/poolfwd.hpp>
+
++// std::numeric_limits
++#include <boost/limits.hpp>
+ // boost::integer::static_lcm
+ #include <boost/integer/common_factor_ct.hpp>
+@@ -358,4 +360,11 @@
+ }
+
++ size_type max_chunks() const
++ { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool.
++ size_type partition_size = alloc_size();
++ size_type POD_size = integer::static_lcm<sizeof(size_type), sizeof(void *)>::value + sizeof(size_type);
++ return (std::numeric_limits<size_type>::max() - POD_size) / alloc_size();
++ }
++
+ static void * & nextof(void * const ptr)
+ { //! \returns Pointer dereferenced.
+@@ -377,5 +388,7 @@
+ //! the first time that object needs to allocate system memory.
+ //! The default is 32. This parameter may not be 0.
+- //! \param nmax_size is the maximum number of chunks to allocate in one block.
++ //! \param nmax_size is the maximum number of chunks to allocate in one block.
++ set_next_size(nnext_size);
++ set_max_size(nmax_size);
+ }
+
+@@ -400,7 +413,7 @@
+ }
+ void set_next_size(const size_type nnext_size)
+- { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0.
+- //! \returns nnext_size.
+- next_size = start_size = nnext_size;
++ { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0.
++ BOOST_USING_STD_MIN();
++ next_size = start_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nnext_size, max_chunks());
+ }
+ size_type get_max_size() const
+@@ -410,5 +423,6 @@
+ void set_max_size(const size_type nmax_size)
+ { //! Set max_size.
+- max_size = nmax_size;
++ BOOST_USING_STD_MIN();
++ max_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nmax_size, max_chunks());
+ }
+ size_type get_requested_size() const
+@@ -713,7 +727,7 @@
+ BOOST_USING_STD_MIN();
+ if(!max_size)
+- next_size <<= 1;
++ set_next_size(next_size << 1);
+ else if( next_size*partition_size/requested_size < max_size)
+- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);
++ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
+
+ // initialize it,
+@@ -753,7 +767,7 @@
+ BOOST_USING_STD_MIN();
+ if(!max_size)
+- next_size <<= 1;
++ set_next_size(next_size << 1);
+ else if( next_size*partition_size/requested_size < max_size)
+- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);
++ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
+
+ // initialize it,
+@@ -797,4 +811,6 @@
+ //! \returns Address of chunk n if allocated ok.
+ //! \returns 0 if not enough memory for n chunks.
++ if (n > max_chunks())
++ return 0;
+
+ const size_type partition_size = alloc_size();
+@@ -845,7 +861,7 @@
+ BOOST_USING_STD_MIN();
+ if(!max_size)
+- next_size <<= 1;
++ set_next_size(next_size << 1);
+ else if( next_size*partition_size/requested_size < max_size)
+- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);
++ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
+
+ // insert it into the list,
+Index: libs/pool/test/test_bug_6701.cpp
+===================================================================
+--- libs/pool/test/test_bug_6701.cpp (revision 78326)
++++ libs/pool/test/test_bug_6701.cpp (revision 78326)
+@@ -0,0 +1,27 @@
++/* Copyright (C) 2012 Ãtienne Dupuis
++*
++* Use, modification and distribution is subject to the
++* Boost Software License, Version 1.0. (See accompanying
++* file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
++*/
++
++// Test of bug #6701 (https://svn.boost.org/trac/boost/ticket/6701)
++
++#include <boost/pool/object_pool.hpp>
++#include <boost/limits.hpp>
++
++int main()
++{
++ boost::pool<> p(1024, std::numeric_limits<size_t>::max() / 768);
++
++ void *x = p.malloc();
++ BOOST_ASSERT(!x);
++
++ BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_next_size());
++ BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_max_size());
++
++ void *y = p.ordered_malloc(std::numeric_limits<size_t>::max() / 768);
++ BOOST_ASSERT(!y);
++
++ return 0;
++}
diff --git a/boost/patches/boost-1.59-test-fenv.patch2 b/boost/patches/boost-1.59-test-fenv.patch2
new file mode 100644
index 0000000..df87f56
--- /dev/null
+++ b/boost/patches/boost-1.59-test-fenv.patch2
@@ -0,0 +1,32 @@
+commit 2f3b98e640c25fe45ae691a5aa950745380b983e
+Author: Jonathan Wakely <jwakely(a)redhat.com>
+Date: Mon Sep 14 15:05:24 2015 +0100
+
+ Do not qualify <fenv.h> names that might be macros.
+
+diff --git a/include/boost/test/impl/execution_monitor.ipp b/include/boost/test/impl/execution_monitor.ipp
+index 3a9e779..8b319df 100644
+--- a/include/boost/test/impl/execution_monitor.ipp
++++ b/include/boost/test/impl/execution_monitor.ipp
+@@ -1380,8 +1380,8 @@ enable( unsigned mask )
+
+ return ~old_cw & BOOST_FPE_ALL;
+ #elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG) && !defined(BOOST_NO_FENV_H)
+- ::feclearexcept(BOOST_FPE_ALL);
+- int res = ::feenableexcept( mask );
++ feclearexcept(BOOST_FPE_ALL);
++ int res = feenableexcept( mask );
+ return res == -1 ? (unsigned)BOOST_FPE_INV : (unsigned)res;
+ #else
+ /* Not Implemented */
+@@ -1417,8 +1417,8 @@ disable( unsigned mask )
+
+ return ~old_cw & BOOST_FPE_ALL;
+ #elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG) && !defined(BOOST_NO_FENV_H)
+- ::feclearexcept(BOOST_FPE_ALL);
+- int res = ::fedisableexcept( mask );
++ feclearexcept(BOOST_FPE_ALL);
++ int res = fedisableexcept( mask );
+ return res == -1 ? (unsigned)BOOST_FPE_INV : (unsigned)res;
+ #else
+ /* Not Implemented */
diff --git a/lzip/lzip.nm b/lzip/lzip.nm
index 432a298..1a70c06 100644
--- a/lzip/lzip.nm
+++ b/lzip/lzip.nm
@@ -4,7 +4,7 @@
###############################################################################
name = lzip
-version = 1.16
+version = 1.17
release = 1
groups = Application/File
diff --git a/lzo/lzo.nm b/lzo/lzo.nm
index 71696af..7bd25af 100644
--- a/lzo/lzo.nm
+++ b/lzo/lzo.nm
@@ -4,7 +4,7 @@
###############################################################################
name = lzo
-version = 2.06
+version = 2.09
release = 1
groups = Applications/Compression
diff --git a/mailcap/mailcap.nm b/mailcap/mailcap.nm
index be52d0d..40ac572 100644
--- a/mailcap/mailcap.nm
+++ b/mailcap/mailcap.nm
@@ -4,8 +4,8 @@
###############################################################################
name = mailcap
-version = 2.1.36
-release = 2
+version = 2.1.45
+release = 1
arch = noarch
groups = System/Base
@@ -22,7 +22,7 @@ description
certain programs to be able to handle non-text files.
end
-source_dl =
+source_dl = https://fedorahosted.org/released/mailcap/
sources = %{thisapp}.tar.xz
build
diff --git a/mc/mc.nm b/mc/mc.nm
index e0978f7..e919854 100644
--- a/mc/mc.nm
+++ b/mc/mc.nm
@@ -4,7 +4,7 @@
###############################################################################
name = mc
-version = 4.8.12
+version = 4.8.16
release = 1
epoch = 1
diff --git a/mdadm/mdadm.nm b/mdadm/mdadm.nm
index 28d7213..533795d 100644
--- a/mdadm/mdadm.nm
+++ b/mdadm/mdadm.nm
@@ -4,7 +4,7 @@
###############################################################################
name = mdadm
-version = 3.3
+version = 3.4
release = 1
groups = System/Base
diff --git a/minicom/minicom.nm b/minicom/minicom.nm
index a8add8b..699b94a 100644
--- a/minicom/minicom.nm
+++ b/minicom/minicom.nm
@@ -4,7 +4,7 @@
###############################################################################
name = minicom
-version = 2.5
+version = 2.7
release = 1
groups = Applications/System
@@ -19,7 +19,7 @@ description
language, and other features.
end
-source_dl = http://alioth.debian.org/frs/download.php/3487/
+source_dl = https://alioth.debian.org/frs/download.php/file/3977/
build
requires
diff --git a/mtr/mtr.nm b/mtr/mtr.nm
index 4d978be..0af23d8 100644
--- a/mtr/mtr.nm
+++ b/mtr/mtr.nm
@@ -4,7 +4,7 @@
###############################################################################
name = mtr
-version = 0.82
+version = 0.85
release = 1
groups = Applications/Internet
@@ -22,6 +22,7 @@ source_dl = ftp://ftp.bitwizard.nl/mtr/
build
requires
ncurses-devel
+ glib2-devel
end
configure_options += \
diff --git a/nasm/nasm.nm b/nasm/nasm.nm
index 9244b0a..f6e6032 100644
--- a/nasm/nasm.nm
+++ b/nasm/nasm.nm
@@ -4,7 +4,7 @@
###############################################################################
name = nasm
-version = 2.08.01
+version = 2.12.01
release = 1
groups = Development/Languages
@@ -18,7 +18,7 @@ description
Intel instruction mnemonics and syntax.
end
-source_dl =
+source_dl = http://www.nasm.us/pub/nasm/releasebuilds/2.12.01/
sources = %{thisapp}.tar.bz2
build
diff --git a/tzdata/tzdata.nm b/tzdata/tzdata.nm
index 0482afc..4f2ed96 100644
--- a/tzdata/tzdata.nm
+++ b/tzdata/tzdata.nm
@@ -3,8 +3,8 @@
# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
###############################################################################
-tzdata_version = 2016b
-tzcode_version = 2016b
+tzdata_version = 2016d
+tzcode_version = 2016d
name = tzdata
version = %{tzdata_version}
hooks/post-receive
--
IPFire 3.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a03527d459e3e6374972698e74f097cf9bff5000
by git＠ipfire.org 21 Apr '16
by git＠ipfire.org 21 Apr '16
21 Apr '16
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 a03527d459e3e6374972698e74f097cf9bff5000 (commit)
via fc9ea3bc4bb5d58fe3fa952cbe658206d3ce88e9 (commit)
from bb28d8913a53b0c854d88bff34b4b63c7383da58 (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 a03527d459e3e6374972698e74f097cf9bff5000
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Apr 21 17:58:07 2016 +0200
core101: remove old rpi kernel modules.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit fc9ea3bc4bb5d58fe3fa952cbe658206d3ce88e9
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Apr 21 17:53:08 2016 +0200
core101: add changed packages to updater.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/{oldcore/82 => core/101}/filelists/armv5tel/gmp | 0
config/rootfiles/{oldcore/94 => core/101}/filelists/bind | 0
config/rootfiles/{oldcore/77 => core/101}/filelists/e2fsprogs | 0
config/rootfiles/{oldcore/89 => core/101}/filelists/grep | 0
config/rootfiles/{oldcore/82 => core/101}/filelists/i586/gmp | 0
config/rootfiles/{oldcore/91 => core/101}/filelists/libxml2 | 0
config/rootfiles/{oldcore/82 => core/101}/filelists/mpfr | 0
config/rootfiles/{oldcore/93 => core/101}/filelists/nettle | 0
config/rootfiles/{oldcore/87 => core/101}/filelists/patch | 0
config/rootfiles/{oldcore/77 => core/101}/filelists/paxctl | 0
config/rootfiles/{oldcore/66 => core/101}/filelists/pciutils | 0
config/rootfiles/core/101/filelists/perl-Apache-Htpasswd | 1 +
config/rootfiles/core/101/filelists/x86_64/gmp | 1 +
config/rootfiles/core/101/update.sh | 3 +++
14 files changed, 5 insertions(+)
copy config/rootfiles/{oldcore/82 => core/101}/filelists/armv5tel/gmp (100%)
copy config/rootfiles/{oldcore/94 => core/101}/filelists/bind (100%)
copy config/rootfiles/{oldcore/77 => core/101}/filelists/e2fsprogs (100%)
copy config/rootfiles/{oldcore/89 => core/101}/filelists/grep (100%)
copy config/rootfiles/{oldcore/82 => core/101}/filelists/i586/gmp (100%)
copy config/rootfiles/{oldcore/91 => core/101}/filelists/libxml2 (100%)
copy config/rootfiles/{oldcore/82 => core/101}/filelists/mpfr (100%)
copy config/rootfiles/{oldcore/93 => core/101}/filelists/nettle (100%)
copy config/rootfiles/{oldcore/87 => core/101}/filelists/patch (100%)
copy config/rootfiles/{oldcore/77 => core/101}/filelists/paxctl (100%)
copy config/rootfiles/{oldcore/66 => core/101}/filelists/pciutils (100%)
create mode 120000 config/rootfiles/core/101/filelists/perl-Apache-Htpasswd
create mode 120000 config/rootfiles/core/101/filelists/x86_64/gmp
Difference in files:
diff --git a/config/rootfiles/core/101/filelists/armv5tel/gmp b/config/rootfiles/core/101/filelists/armv5tel/gmp
new file mode 120000
index 0000000..2bdf30d
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/armv5tel/gmp
@@ -0,0 +1 @@
+../../../../common/armv5tel/gmp
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/bind b/config/rootfiles/core/101/filelists/bind
new file mode 120000
index 0000000..48a0eba
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/bind
@@ -0,0 +1 @@
+../../../common/bind
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/e2fsprogs b/config/rootfiles/core/101/filelists/e2fsprogs
new file mode 120000
index 0000000..37b55de
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/e2fsprogs
@@ -0,0 +1 @@
+../../../common/e2fsprogs
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/grep b/config/rootfiles/core/101/filelists/grep
new file mode 120000
index 0000000..ab5ef8b
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/grep
@@ -0,0 +1 @@
+../../../common/grep
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/i586/gmp b/config/rootfiles/core/101/filelists/i586/gmp
new file mode 120000
index 0000000..52a09cd
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/i586/gmp
@@ -0,0 +1 @@
+../../../../common/i586/gmp
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/libxml2 b/config/rootfiles/core/101/filelists/libxml2
new file mode 120000
index 0000000..242e69f
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/libxml2
@@ -0,0 +1 @@
+../../../common/libxml2
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/mpfr b/config/rootfiles/core/101/filelists/mpfr
new file mode 120000
index 0000000..c8468bf
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/mpfr
@@ -0,0 +1 @@
+../../../common/mpfr
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/nettle b/config/rootfiles/core/101/filelists/nettle
new file mode 120000
index 0000000..f0dba7a
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/nettle
@@ -0,0 +1 @@
+../../../common/nettle
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/patch b/config/rootfiles/core/101/filelists/patch
new file mode 120000
index 0000000..27a3825
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/patch
@@ -0,0 +1 @@
+../../../common/patch
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/paxctl b/config/rootfiles/core/101/filelists/paxctl
new file mode 120000
index 0000000..dda8d9f
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/paxctl
@@ -0,0 +1 @@
+../../../common/paxctl
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/pciutils b/config/rootfiles/core/101/filelists/pciutils
new file mode 120000
index 0000000..aeb45e7
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/pciutils
@@ -0,0 +1 @@
+../../../common/pciutils
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/perl-Apache-Htpasswd b/config/rootfiles/core/101/filelists/perl-Apache-Htpasswd
new file mode 120000
index 0000000..c7d2c8d
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/perl-Apache-Htpasswd
@@ -0,0 +1 @@
+../../../common/perl-Apache-Htpasswd
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/x86_64/gmp b/config/rootfiles/core/101/filelists/x86_64/gmp
new file mode 120000
index 0000000..7c59c60
--- /dev/null
+++ b/config/rootfiles/core/101/filelists/x86_64/gmp
@@ -0,0 +1 @@
+../../../../common/x86_64/gmp
\ No newline at end of file
diff --git a/config/rootfiles/core/101/update.sh b/config/rootfiles/core/101/update.sh
index eb81d61..0c9fe6d 100644
--- a/config/rootfiles/core/101/update.sh
+++ b/config/rootfiles/core/101/update.sh
@@ -44,6 +44,9 @@ done
# Stop services
/etc/init.d/squid stop
+# Remove old raspberrypi modules
+rm -rf /lib/modules/3.14.65-ipfire-rpi
+
# Extract files
extract_files
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. bb28d8913a53b0c854d88bff34b4b63c7383da58
by git＠ipfire.org 20 Apr '16
by git＠ipfire.org 20 Apr '16
20 Apr '16
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 bb28d8913a53b0c854d88bff34b4b63c7383da58 (commit)
via 23bb6839024fd112c4a394c6f72e7707a110226c (commit)
from 9fcba2b5df715041e4a9057e749de2faee46e508 (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 bb28d8913a53b0c854d88bff34b4b63c7383da58
Merge: 23bb683 9fcba2b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Apr 20 17:45:49 2016 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit 23bb6839024fd112c4a394c6f72e7707a110226c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Apr 20 10:19:46 2016 +0200
firewall: fix nat module load for application layer gateways
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
src/initscripts/init.d/firewall | 7 +++++++
1 file changed, 7 insertions(+)
Difference in files:
diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index 1d6309c..7bdb292 100644
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -98,6 +98,7 @@ iptables_init() {
# SIP
if [ "${CONNTRACK_SIP}" = "on" ]; then
+ modprobe nf_nat_sip
iptables -A CONNTRACK -m conntrack --ctstate RELATED \
-m helper --helper sip -j ACCEPT
for proto in udp tcp; do
@@ -107,6 +108,7 @@ iptables_init() {
# H.323
if [ "${CONNTRACK_H323}" = "on" ]; then
+ modprobe nf_nat_h323
iptables -A CONNTRACK -m conntrack --ctstate RELATED \
-m helper --helper h323 -j ACCEPT
@@ -119,6 +121,7 @@ iptables_init() {
# FTP
if [ "${CONNTRACK_FTP}" = "on" ]; then
+ modprobe nf_nat_ftp
iptables -A CONNTRACK -m conntrack --ctstate RELATED \
-m helper --helper ftp -p tcp --dport 1024: -j ACCEPT
iptables -t raw -A CONNTRACK -p tcp --dport 21 -j CT --helper ftp
@@ -126,6 +129,7 @@ iptables_init() {
# PPTP
if [ "${CONNTRACK_PPTP}" = "on" ]; then
+ modprobe nf_nat_pptp
iptables -A CONNTRACK -m conntrack --ctstate RELATED \
-m helper --helper pptp -j ACCEPT
iptables -t raw -A CONNTRACK -p tcp --dport 1723 -j CT --helper pptp
@@ -133,6 +137,7 @@ iptables_init() {
# TFTP
if [ "${CONNTRACK_TFTP}" = "on" ]; then
+ modprobe nf_nat_tftp
iptables -A CONNTRACK -m conntrack --ctstate RELATED \
-m helper --helper tftp -j ACCEPT
iptables -t raw -A CONNTRACK -p udp --dport 69 -j CT --helper tftp
@@ -140,6 +145,7 @@ iptables_init() {
# IRC
if [ "${CONNTRACK_IRC}" = "on" ]; then
+ modprobe nf_nat_irc
iptables -A CONNTRACK -m conntrack --ctstate RELATED \
-m helper --helper irc -j ACCEPT
iptables -t raw -A CONNTRACK -p tcp --dport 6667 -j CT --helper irc
@@ -147,6 +153,7 @@ iptables_init() {
# Amanda
if [ "${CONNTRACK_AMANDA}" = "on" ]; then
+ modprobe nf_nat_amanda
iptables -A CONNTRACK -m conntrack --ctstate RELATED \
-m helper --helper amanda -j ACCEPT
iptables -t raw -A CONNTRACK -p tcp -j CT --helper amanda
hooks/post-receive
--
IPFire 2.x development tree
1
0