From nobody@FreeBSD.org Tue May 25 10:26:04 2010 Return-Path: Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9F9BC1065677 for ; Tue, 25 May 2010 10:26:04 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 8F49A8FC16 for ; Tue, 25 May 2010 10:26:04 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o4PAQ3s4001866 for ; Tue, 25 May 2010 10:26:03 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o4PAQ3AT001865; Tue, 25 May 2010 10:26:03 GMT (envelope-from nobody) Message-Id: <201005251026.o4PAQ3AT001865@www.freebsd.org> Date: Tue, 25 May 2010 10:26:03 GMT From: "Eugene M. Zheganin" To: freebsd-gnats-submit@FreeBSD.org Subject: New port: net/asterisk162 X-Send-Pr-Version: www-3.1 X-GNATS-Notify: >Number: 146964 >Category: ports >Synopsis: New port: net/asterisk162 >Confidential: no >Severity: non-critical >Priority: low >Responsible: tota >State: closed >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue May 25 10:30:01 UTC 2010 >Closed-Date: Wed Sep 29 14:17:06 UTC 2010 >Last-Modified: Wed Sep 29 14:17:06 UTC 2010 >Originator: Eugene M. Zheganin >Release: 8.0-RELEASE-p2 >Organization: Norma JSC. >Environment: FreeBSD elm.hq.norma.perm.ru 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #0: Sat Feb 27 15:34:41 YEKT 2010 emz@ns.hq.norma.perm.ru:/usr/obj/usr/src/sys/GENERIC i386 >Description: As Digium stated that asterisk 1.6.0.x and 1.6.1.x branches are moving to security-fixes-only support model, and the 1.4.x branch remains in long-term-support 'til the end of 2010, the new 1.6.2.x port should be added to obtain new bugfixes and probably new features. This shar adds the asterisk162 port with version 1.6.2.7, made from pr ports/144065, with one additional patch that fixes redundant console logging when working with Realtime/pgsql. Along with this new port, I supposed that asterisk12 support should be suspended from FreeBSD ports, and the net portstree should be modified as: asterisk12 -> suspended asterisk -> asterisk14 asterisk16 -> asterisk160 asterisk162 (this port) -> asterisk Port is tested on FreeBSD 7.2/8.0, port is working in production for one month. As the attach is too long for gnats, I stored the port on the URL in 'known fixes'. >How-To-Repeat: >Fix: http://zhegan.in/files/asterisk162.txt >Release-Note: >Audit-Trail: Responsible-Changed-From-To: freebsd-bugs->freebsd-ports-bugs Responsible-Changed-By: linimon Responsible-Changed-When: Tue May 25 15:18:32 UTC 2010 Responsible-Changed-Why: ports PR. http://www.freebsd.org/cgi/query-pr.cgi?pr=146964 From: "Eugene M. Zheganin" To: bug-followup@FreeBSD.org, emz@norma.perm.ru Cc: Subject: Re: ports/146964: New port: net/asterisk162 Date: Thu, 15 Jul 2010 15:37:47 +0600 I've updated the port to 1.6.2.9, it can be found at http://zhegan.in/files/asterisk162-1.6.2.9.txt From: "Eugene M. Zheganin" To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/146964: New port: net/asterisk162 Date: Tue, 24 Aug 2010 12:50:56 +0600 I've updated the port to 1.6.2.11, it can be found at http://zhegan.in/files/asterisk162-1.6.2.11.txt Responsible-Changed-From-To: freebsd-ports-bugs->sobomax Responsible-Changed-By: pgollucci Responsible-Changed-When: Tue Sep 14 06:37:47 UTC 2010 Responsible-Changed-Why: Over to maintainer http://www.freebsd.org/cgi/query-pr.cgi?pr=146964 Responsible-Changed-From-To: sobomax->freebsd-ports-bugs Responsible-Changed-By: linimon Responsible-Changed-When: Tue Sep 14 22:03:22 UTC 2010 Responsible-Changed-Why: Allow someone else to take a look at this. Hat: portmgr http://www.freebsd.org/cgi/query-pr.cgi?pr=146964 From: Andrei Kolu To: bug-followup@freebsd.org, emz@norma.perm.ru Cc: Subject: Re: ports/146964: New port: net/asterisk162 Date: Wed, 15 Sep 2010 13:41:23 +0300 --0015175ca866bdea4d049049f9f8 Content-Type: text/plain; charset=ISO-8859-1 ----------------------------------------------------------- ===> Returning to build of asterisk-1.6.2.11 Error: shared library "netsnmp.16" does not exist *** Error code 1 Stop in /usr/ports/net/asterisk162. *** Error code 1 Stop in /usr/ports/net/asterisk162. ----------------------------------------------------------- net-snmp-5.5_4 = up-to-date with port Was able to compile and install only with SNMP disabled in config. --0015175ca866bdea4d049049f9f8 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable -----------------------------------------------------------
=3D=3D=3D>= ;=A0=A0 Returning to build of asterisk-1.6.2.11
Error: shared library &q= uot;netsnmp.16" does not exist
*** Error code 1

Stop in /usr= /ports/net/asterisk162.
*** Error code 1

Stop in /usr/ports/net/asterisk162.
------------= -----------------------------------------------
net-snmp-5.5_4=A0=A0=A0= =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 =3D=A0=A0 up-to-date= with port


Was able to compile and install only with SNMP disabl= ed in config.
--0015175ca866bdea4d049049f9f8-- From: "Eugene M. Zheganin" To: bug-followup@FreeBSD.org Cc: Andrei Kolu Subject: Re: ports/146964: New port: net/asterisk162 Date: Mon, 20 Sep 2010 14:28:01 +0600 I've updated the port to 1.6.2.13, it can be found at http://zhegan.in/files/asterisk162-1.6.2.13.txt I've also fixed the net-snmp dependency, by removing the exact required library version, leaving out the libnetsnmp itself - 'cause it seems like this port is building with any net-mgmt/net-snmp port version along past 3 years (at least for me). From: Florian Smeets To: bug-followup@FreeBSD.org, emz@norma.perm.ru Cc: TAKATSU Tomonari Subject: Re: ports/146964: New port: net/asterisk162 Date: Tue, 21 Sep 2010 20:57:22 +0200 This is a multi-part message in MIME format. --------------030302080308090603070000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hi, i have adapted the patch to update net/asterisk16 to 1.6.2.13 and tweaked a couple of other things. Cheers, Florian --------------030302080308090603070000 Content-Type: text/plain; x-mac-type="0"; x-mac-creator="0"; name="asterisk16-1.6.2.13.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="asterisk16-1.6.2.13.diff" diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/Makefile /usr/ports/net/asterisk16/Makefile --- /usr/ports/net/asterisk16.orig/Makefile 2010-09-21 07:42:50.000000000 +0200 +++ /usr/ports/net/asterisk16/Makefile 2010-09-21 20:13:01.000000000 +0200 @@ -2,16 +2,15 @@ # Date created: 17 October 2003 # Whom: Maxim Sobolev # -# $FreeBSD: ports/net/asterisk16/Makefile,v 1.136 2010/09/17 08:32:54 linimon Exp $ +# $FreeBSD: ports/net/asterisk16/Makefile,v 1.132 2010/04/03 10:44:26 roam Exp $ # PORTNAME= asterisk -PORTVERSION= 1.6.0.21 -PORTREVISION= 4 -PKGNAMESUFFIX= 16 +PORTVERSION= 1.6.2.13 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ +PKGNAMESUFFIX= 16 MAINTAINER= flo@kasimir.com COMMENT= An Open Source PBX and telephony toolkit @@ -19,6 +18,9 @@ LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \ newt.52:${PORTSDIR}/devel/newt \ execinfo:${PORTSDIR}/devel/libexecinfo + +USE_GNOME= libxml2 + RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 amd64 @@ -26,7 +28,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --with-gsm=${LOCALBASE} +CONFIGURE_ARGS= --with-gsm=${LOCALBASE} --localstatedir=/var CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 USE_GMAKE= yes USE_BISON= build @@ -55,15 +57,12 @@ GSM "Enable GSM codec" on \ CURL "Enable CURL support" on \ ILBC "Enable iLBC codec" off \ - SPANDSP "Enable Spandsp faxing support" off \ -# CODEC_PATCH "Apply codec negotiation patch" off \ -# MISC_PATCHES "Apply additional patches" off + SPANDSP "Enable Spandsp faxing support" off .include .if ${ARCH} == "i386" || ${ARCH} == "amd64" OPTIONS+= DAHDI "Enable DAHDI support" on - # Include this since we have altered OPTIONS. .include "$(PORTSDIR)/Mk/bsd.port.options.mk" .endif @@ -95,12 +94,12 @@ # similarly .if !defined(WITH_ODBC) PLIST_SUB+= WITH_ODBC="@comment " -CONFIGURE_ARGS+= --without-odbc +CONFIGURE_ARGS+= --without-unixodbc .else PLIST_SUB+= WITH_ODBC="" -CONFIGURE_ARGS+= --with-odbc --with-ltdl -LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC \ - ltdl.7:${PORTSDIR}/devel/libltdl22 +CONFIGURE_ARGS+= --with-unixodbc --with-ltdl +LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC +USE_AUTOTOOLS= libltdl .endif .if !defined(WITH_FREETDS) @@ -145,7 +144,7 @@ .else PLIST_SUB+= WITH_SNMP="" CONFIGURE_ARGS+= --with-netsnmp -LIB_DEPENDS+= netsnmp.20:${PORTSDIR}/net-mgmt/net-snmp +LIB_DEPENDS+= netsnmp:${PORTSDIR}/net-mgmt/net-snmp .endif .if !defined(WITH_JABBER) @@ -186,12 +185,10 @@ .if !defined(WITH_CURL) PLIST_SUB+= WITH_CURL="@comment " -CONFIGURE_ARGS+= --with-curl=no \ - --with-libcurl=no +CONFIGURE_ARGS+= --with-libcurl=no .else PLIST_SUB+= WITH_CURL="" -CONFIGURE_ARGS+= --with-curl \ - --with-libcurl +CONFIGURE_ARGS+= --with-libcurl LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl .endif @@ -204,14 +201,6 @@ LIB_DEPENDS+= spandsp.2:${PORTSDIR}/comms/spandsp-devel .endif -.if defined(WITH_CODEC_PATCH) -PATCHFILES= asterisk-1.4.22-codec-negotiation-20081110.diff.gz -PATCH_SITES= http://b2bua.org/chrome/site/ -EXTRA_PATCHES+= ${PATCHDIR}/codecnego-patch-Makefile -.else -EXTRA_PATCHES+= ${PATCHDIR}/nocodecnego-patch-Makefile -.endif - .if defined(WITH_MISC_PATCHES) EXTRA_PATCHES+= ${PATCHDIR}/dtmf_debug.diff EXTRA_PATCHES+= ${PATCHDIR}/feature_disconnect.diff diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/distinfo /usr/ports/net/asterisk16/distinfo --- /usr/ports/net/asterisk16.orig/distinfo 2010-09-21 07:42:50.000000000 +0200 +++ /usr/ports/net/asterisk16/distinfo 2010-09-21 07:43:15.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (asterisk-1.6.0.21.tar.gz) = a172fb030adab50bdff6ae3b5e765283 -SHA256 (asterisk-1.6.0.21.tar.gz) = 0d41a9033934640992da29ee03ae96a208eb3ff8a46440e388920d471ecbbaff -SIZE (asterisk-1.6.0.21.tar.gz) = 23145584 +MD5 (asterisk-1.6.2.13.tar.gz) = 1e184a4d9301e2e4b9de3bc98b507d4f +SHA256 (asterisk-1.6.2.13.tar.gz) = 28bb18e988d22557ee77220cb33209212af1e618348c3d42666f785da517c01e +SIZE (asterisk-1.6.2.13.tar.gz) = 23679304 diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/files/asterisk.sh.in /usr/ports/net/asterisk16/files/asterisk.sh.in --- /usr/ports/net/asterisk16.orig/files/asterisk.sh.in 2010-09-21 07:42:50.000000000 +0200 +++ /usr/ports/net/asterisk16/files/asterisk.sh.in 2010-09-21 13:18:06.000000000 +0200 @@ -11,10 +11,10 @@ . /etc/rc.subr -stop_precmd=asterisk_shutdown -sig_stop=KILL +stop_cmd=asterisk_shutdown asterisk_shutdown () { - %%PREFIX%%/sbin/asterisk -qrx 'stop now' + echo 'Stopping asterisk' + %%PREFIX%%/sbin/asterisk -qrx 'core stop now' sleep 1 return 0 } diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/files/codecnego-patch-Makefile /usr/ports/net/asterisk16/files/codecnego-patch-Makefile --- /usr/ports/net/asterisk16.orig/files/codecnego-patch-Makefile 2010-09-21 07:42:50.000000000 +0200 +++ /usr/ports/net/asterisk16/files/codecnego-patch-Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,210 +0,0 @@ ---- Makefile.orig 2008-10-16 17:36:35.000000000 +0300 -+++ Makefile 2008-10-16 17:36:36.000000000 +0300 -@@ -129,7 +129,7 @@ - ASTMANDIR=$(mandir) - ifneq ($(findstring BSD,$(OSARCH)),) - ASTVARLIBDIR=$(prefix)/share/asterisk -- ASTVARRUNDIR=$(localstatedir)/run/asterisk -+ ASTVARRUNDIR=$(localstatedir)/run - else - ASTVARLIBDIR=$(localstatedir)/lib/asterisk - endif -@@ -214,9 +214,11 @@ - ASTLDFLAGS+=-L/usr/local/lib - endif - -+ifneq ($(OSARCH),FreeBSD) - ifneq ($(PROC),ultrasparc) - ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) - endif -+endif - - ifeq ($(PROC),ppc) - ASTCFLAGS+=-fsigned-char -@@ -224,7 +226,7 @@ - - ifeq ($(OSARCH),FreeBSD) - # -V is understood by BSD Make, not by GNU make. -- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) -+ BSDVERSION=$(OSVERSION) - ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) - AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) - endif -@@ -401,15 +403,15 @@ - # Should static HTTP be installed during make samples or even with its own target ala - # webvoicemail? There are portions here that *could* be customized but might also be - # improved a lot. I'll put it here for now. -- mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/static-http - for x in static-http/*; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \ - done -- mkdir -p $(DESTDIR)$(ASTDATADIR)/images -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/images - for x in images/*.jpg; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/images ; \ - done -- mkdir -p $(DESTDIR)$(AGI_DIR) -+ $(MKDIR) $(DESTDIR)$(AGI_DIR) - $(MAKE) -C sounds install - - update: -@@ -430,47 +432,47 @@ - OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h))) - - installdirs: -- mkdir -p $(DESTDIR)$(MODULES_DIR) -- mkdir -p $(DESTDIR)$(ASTSBINDIR) -- mkdir -p $(DESTDIR)$(ASTETCDIR) -- mkdir -p $(DESTDIR)$(ASTBINDIR) -- mkdir -p $(DESTDIR)$(ASTVARRUNDIR) -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor -+ $(MKDIR) $(DESTDIR)$(MODULES_DIR) -+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR) -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor - - bininstall: _all installdirs $(SUBDIRS_INSTALL) -- $(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_PROGRAM) main/asterisk $(DESTDIR)$(ASTSBINDIR)/ - $(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk -- $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -- $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ - if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \ -- cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ -- chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\ -+ cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/scripts/safe_asterisk.out;\ -+ ${BSD_INSTALL_SCRIPT} contrib/scripts/safe_asterisk.out $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ - fi -- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR) -- $(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir) -- $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) -+ $(MKDIR) $(DESTDIR)$(ASTHEADERDIR) -+ $(BSD_INSTALL_DATA) include/asterisk.h $(DESTDIR)$(includedir) -+ $(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) - if [ -n "$(OLDHEADERS)" ]; then \ - rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\ - fi -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom -- mkdir -p $(DESTDIR)$(ASTDATADIR)/keys -- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware -- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax -- mkdir -p $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys -- $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys -- $(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/keys -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware/iax -+ $(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys -+ $(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys -+ $(BSD_INSTALL_MAN) doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_MAN) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_MAN) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_MAN) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 - if [ -f contrib/firmware/iax/iaxy.bin ] ; then \ -- $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \ -+ $(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \ - fi - - $(SUBDIRS_INSTALL): -@@ -506,7 +508,7 @@ - @exit 1 - endif - --install: badshell datafiles bininstall -+install: badshell datafiles bininstall samples - @if [ -x /usr/sbin/asterisk-post-install ]; then \ - /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ - fi -@@ -544,31 +546,23 @@ - upgrade: bininstall - - adsi: -- mkdir -p $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) - for x in configs/*.adsi; do \ - if [ ! -f $(DESTDIR)$(ASTETCDIR)/$$x ]; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \ - fi ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist ; \ - done - - samples: adsi -- mkdir -p $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) - for x in configs/*.sample; do \ -- if [ -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \ -- if [ "$(OVERWRITE)" = "y" ]; then \ -- if cmp -s $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $$x ; then \ -- echo "Config file $$x is unchanged"; \ -- continue; \ -- fi ; \ -- mv -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.old ; \ -- else \ -- echo "Skipping config file $$x"; \ -- continue; \ -- fi ;\ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ;\ -+ if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`;\ - fi ; \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ;\ - done -- if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ -+ if true; then \ - ( \ - echo "[directories]" ; \ - echo "astetcdir => $(ASTETCDIR)" ; \ -@@ -655,20 +649,23 @@ - echo "; Default: strict"; \ - echo ";"; \ - echo ";translation_algorithm = strict"; \ -- ) > $(DESTDIR)$(ASTCONFPATH) ; \ -+ ) > $(DESTDIR)$(ASTCONFPATH)-dist ; \ -+ if [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ -+ cp $(DESTDIR)$(ASTCONFPATH)-dist $(DESTDIR)$(ASTCONFPATH); \ -+ fi; \ - else \ - echo "Skipping asterisk.conf creation"; \ - fi -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX - build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR) - - webvmail: - @[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 ) - @[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 ) - $(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi -- mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk -+ $(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk - for x in images/*.gif; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \ - done - @echo " +--------- Asterisk Web Voicemail ----------+" - @echo " + +" diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/files/nocodecnego-patch-Makefile /usr/ports/net/asterisk16/files/nocodecnego-patch-Makefile --- /usr/ports/net/asterisk16.orig/files/nocodecnego-patch-Makefile 2010-09-21 07:42:50.000000000 +0200 +++ /usr/ports/net/asterisk16/files/nocodecnego-patch-Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,243 +0,0 @@ ---- Makefile.orig 2009-11-03 12:00:27.000000000 -0800 -+++ Makefile 2009-11-20 13:13:06.000000000 -0800 -@@ -118,7 +118,7 @@ - OVERWRITE=y - - # Include debug and macro symbols in the executables (-g) and profiling info (-pg) --DEBUG=-g3 -+#DEBUG=-g3 - - - # Define standard directories for various platforms -@@ -148,7 +148,7 @@ - ASTMANDIR=$(mandir) - ifneq ($(findstring BSD,$(OSARCH)),) - ASTVARLIBDIR=$(prefix)/share/asterisk -- ASTVARRUNDIR=$(localstatedir)/run/asterisk -+ ASTVARRUNDIR=$(localstatedir)/run - ASTDBDIR=$(localstatedir)/db/asterisk - else - ASTVARLIBDIR=$(localstatedir)/lib/asterisk -@@ -248,9 +248,11 @@ - _ASTCFLAGS+=-isystem /usr/local/include - endif - -+ifneq ($(OSARCH),FreeBSD) - ifneq ($(PROC),ultrasparc) - _ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) - endif -+endif - - ifeq ($(PROC),ppc) - _ASTCFLAGS+=-fsigned-char -@@ -258,7 +260,7 @@ - - ifeq ($(OSARCH),FreeBSD) - # -V is understood by BSD Make, not by GNU make. -- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) -+ BSDVERSION=$(OSVERSION) - _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) - endif - -@@ -467,21 +469,21 @@ - # Should static HTTP be installed during make samples or even with its own target ala - # webvoicemail? There are portions here that *could* be customized but might also be - # improved a lot. I'll put it here for now. -- mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/static-http - for x in static-http/*; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \ - done - if [ -d doc/tex/asterisk ] ; then \ -- mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http/docs ; \ -+ $(MKDIR) $(DESTDIR)$(DOCSDIR) ; \ - for n in doc/tex/asterisk/* ; do \ -- $(INSTALL) -m 644 $$n $(DESTDIR)$(ASTDATADIR)/static-http/docs ; \ -+ $(BSD_INSTALL_DATA) $$n $(DESTDIR)$(DOCSDIR) ; \ - done \ - fi -- mkdir -p $(DESTDIR)$(ASTDATADIR)/images -+ $(MKDIR) $(DESTDIR)$(DOCSDIR)/images - for x in images/*.jpg; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(DOCSDIR)/images ; \ - done -- mkdir -p $(DESTDIR)$(AGI_DIR) -+ $(MKDIR) $(DESTDIR)$(AGI_DIR) - $(MAKE) -C sounds install - - update: -@@ -505,47 +507,47 @@ - OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h))) - - installdirs: -- mkdir -p $(DESTDIR)$(MODULES_DIR) -- mkdir -p $(DESTDIR)$(ASTSBINDIR) -- mkdir -p $(DESTDIR)$(ASTETCDIR) -- mkdir -p $(DESTDIR)$(ASTBINDIR) -- mkdir -p $(DESTDIR)$(ASTVARRUNDIR) -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor -+ $(MKDIR) $(DESTDIR)$(MODULES_DIR) -+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR) -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor - - bininstall: _all installdirs $(SUBDIRS_INSTALL) -- $(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_PROGRAM) main/asterisk $(DESTDIR)$(ASTSBINDIR)/ - $(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk -- $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -- $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ - if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \ -- cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ -- chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\ -+ cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/scripts/safe_asterisk.out;\ -+ ${BSD_INSTALL_SCRIPT} contrib/scripts/safe_asterisk.out $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\ - fi -- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR) -- $(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir) -- $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) -+ $(MKDIR) $(DESTDIR)$(ASTHEADERDIR) -+ $(BSD_INSTALL_DATA) include/asterisk.h $(DESTDIR)$(includedir) -+ $(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) - if [ -n "$(OLDHEADERS)" ]; then \ - rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\ - fi -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom -- mkdir -p $(DESTDIR)$(ASTDATADIR)/keys -- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware -- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax -- mkdir -p $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys -- $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys -- $(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/keys -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware -+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware/iax -+ $(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys -+ $(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys -+ $(BSD_INSTALL_MAN) doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_MAN) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_MAN) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_MAN) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 - if [ -f contrib/firmware/iax/iaxy.bin ] ; then \ -- $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \ -+ $(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \ - fi - - $(SUBDIRS_INSTALL): -@@ -579,7 +581,7 @@ - @exit 1 - endif - --install: badshell datafiles bininstall -+install: badshell datafiles bininstall samples - @if [ -x /usr/sbin/asterisk-post-install ]; then \ - /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ - fi -@@ -611,38 +613,25 @@ - # XXX why *.adsi is installed first ? - adsi: - @echo Installing adsi config files... -- @mkdir -p $(DESTDIR)$(ASTETCDIR) -+ @$(MKDIR) $(DESTDIR)$(ASTETCDIR) - @for x in configs/*.adsi; do \ - dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \ - if [ -f $${dst} ] ; then \ -- echo "Overwriting $$x" ; \ -- else \ -- echo "Installing $$x" ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \ - fi ; \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist ; \ - done - - samples: adsi - @echo Installing other config files... -- @mkdir -p $(DESTDIR)$(ASTETCDIR) -+ @$(MKDIR) $(DESTDIR)$(ASTETCDIR) - @for x in configs/*.sample; do \ -- dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ; \ -- if [ -f $${dst} ]; then \ -- if [ "$(OVERWRITE)" = "y" ]; then \ -- if cmp -s $${dst} $$x ; then \ -- echo "Config file $$x is unchanged"; \ -- continue; \ -- fi ; \ -- mv -f $${dst} $${dst}.old ; \ -- else \ -- echo "Skipping config file $$x"; \ -- continue; \ -- fi ;\ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ;\ -+ if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`;\ - fi ; \ -- echo "Installing file $$x"; \ -- $(INSTALL) -m 644 $$x $${dst} ;\ - done -- @if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ -+ @if true; then \ - echo "Creating asterisk.conf"; \ - ( \ - echo "[directories](!) ; remove the (!) to enable this" ; \ -@@ -698,13 +687,16 @@ - echo "pbx_realtime=1.6" ; \ - echo "res_agi=1.6" ; \ - echo "app_set=1.6" ; \ -- ) > $(DESTDIR)$(ASTCONFPATH) ; \ -+ ) > $(DESTDIR)$(ASTCONFPATH)-dist ; \ -+ if [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ -+ $(BSD_INSTALL_DATA) $(DESTDIR)$(ASTCONFPATH)-dist $(DESTDIR)$(ASTCONFPATH); \ -+ fi; \ - else \ - echo "Skipping asterisk.conf creation"; \ - fi -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX - build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR) -- @mkdir -p $(DESTDIR)$(ASTDATADIR)/phoneprov -+ @$(MKDIR) $(DESTDIR)$(ASTDATADIR)/phoneprov - @for x in phoneprov/*; do \ - dst="$(DESTDIR)$(ASTDATADIR)/$$x" ; \ - if [ -f $${dst} ]; then \ -@@ -720,14 +712,14 @@ - fi ;\ - fi ; \ - echo "Installing file $$x"; \ -- $(INSTALL) -m 644 $$x $${dst} ;\ -+ $(BSD_INSTALL_DATA) $$x $${dst} ;\ - done - - webvmail: - @[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 ) - @[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 ) - $(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi -- mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk -+ $(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk - for x in images/*.gif; do \ - $(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \ - done diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/files/patch-Makefile /usr/ports/net/asterisk16/files/patch-Makefile --- /usr/ports/net/asterisk16.orig/files/patch-Makefile 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/net/asterisk16/files/patch-Makefile 2010-09-21 13:18:29.000000000 +0200 @@ -0,0 +1,257 @@ +--- Makefile.orig 2010-06-10 22:35:06.000000000 +0200 ++++ Makefile 2010-09-21 13:17:37.000000000 +0200 +@@ -121,7 +121,7 @@ + OVERWRITE=y + + # Include debug and macro symbols in the executables (-g) and profiling info (-pg) +-DEBUG=-g3 ++#DEBUG=-g3 + + + # Define standard directories for various platforms +@@ -149,7 +149,7 @@ + ASTMANDIR=$(mandir) + ifneq ($(findstring BSD,$(OSARCH)),) + ASTVARLIBDIR=$(prefix)/share/asterisk +- ASTVARRUNDIR=$(localstatedir)/run/asterisk ++ ASTVARRUNDIR=$(localstatedir)/run + ASTDBDIR=$(localstatedir)/db/asterisk + else + ASTVARLIBDIR=$(localstatedir)/lib/asterisk +@@ -248,12 +248,13 @@ + ifneq ($(findstring BSD,$(OSARCH)),) + _ASTCFLAGS+=-isystem /usr/local/include + endif +- ++ifneq ($(OSARCH),FreeBSD) + ifeq ($(findstring -march,$(_ASTCFLAGS) $(ASTCFLAGS)),) + ifneq ($(PROC),ultrasparc) + _ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) + endif + endif ++endif + + ifeq ($(PROC),ppc) + _ASTCFLAGS+=-fsigned-char +@@ -261,7 +262,7 @@ + + ifeq ($(OSARCH),FreeBSD) + # -V is understood by BSD Make, not by GNU make. +- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) ++ BSDVERSION=$(OSVERSION) + _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) + endif + +@@ -478,21 +479,23 @@ + # Should static HTTP be installed during make samples or even with its own target ala + # webvoicemail? There are portions here that *could* be customized but might also be + # improved a lot. I'll put it here for now. +- mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http ++ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/static-http + for x in static-http/*; do \ +- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \ ++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \ + done + if [ -d doc/tex/asterisk ] ; then \ +- mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http/docs ; \ ++ $(MKDIR) $(DESTDIR)$(DOCSDIR) ; \ + for n in doc/tex/asterisk/* ; do \ +- $(INSTALL) -m 644 $$n $(DESTDIR)$(ASTDATADIR)/static-http/docs ; \ ++ $(BSD_INSTALL_DATA) $$n $(DESTDIR)$(DOCSDIR) ; \ + done \ + fi +- mkdir -p $(DESTDIR)$(ASTDATADIR)/images ++ if [ ! -d $(DESTDIR)$(DOCSDIR)/images ]; then \ ++ $(MKDIR) $(DESTDIR)$(DOCSDIR)/images; \ ++ fi + for x in images/*.jpg; do \ +- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \ ++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(DOCSDIR)/images ; \ + done +- mkdir -p $(DESTDIR)$(AGI_DIR) ++ $(MKDIR) $(DESTDIR)$(AGI_DIR) + $(MAKE) -C sounds install + + doc/core-en_US.xml: $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null)) +@@ -539,50 +542,51 @@ + OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h))) + + installdirs: +- mkdir -p $(DESTDIR)$(MODULES_DIR) +- mkdir -p $(DESTDIR)$(ASTSBINDIR) +- mkdir -p $(DESTDIR)$(ASTETCDIR) +- mkdir -p $(DESTDIR)$(ASTVARRUNDIR) +- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail +- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate +- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system +- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp +- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme +- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor ++ $(MKDIR) $(DESTDIR)$(MODULES_DIR) ++ $(MKDIR) $(DESTDIR)$(ASTSBINDIR) ++ $(MKDIR) $(DESTDIR)$(ASTETCDIR) ++ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR) ++ $(MKDIR) $(DESTDIR)$(ASTDBDIR) ++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail ++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate ++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system ++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp ++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme ++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor + + bininstall: _all installdirs $(SUBDIRS_INSTALL) +- $(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/ ++ $(BSD_INSTALL_PROGRAM) main/asterisk $(DESTDIR)$(ASTSBINDIR)/ + $(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk +- $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ +- $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ ++ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ ++ $(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ + if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \ +- cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ +- chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\ ++ cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/scripts/safe_asterisk.out;\ ++ ${BSD_INSTALL_SCRIPT} contrib/scripts/safe_asterisk.out $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\ + fi +- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR) +- $(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir) +- $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) ++ $(MKDIR) $(DESTDIR)$(ASTHEADERDIR) ++ $(BSD_INSTALL_DATA) include/asterisk.h $(DESTDIR)$(includedir) ++ $(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) + if [ -n "$(OLDHEADERS)" ]; then \ + rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\ + fi +- mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation +- mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation/thirdparty +- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv +- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom +- mkdir -p $(DESTDIR)$(ASTDATADIR)/keys +- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware +- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax +- mkdir -p $(DESTDIR)$(ASTMANDIR)/man8 +- $(INSTALL) -m 644 doc/core-*.xml $(DESTDIR)$(ASTDATADIR)/documentation +- $(INSTALL) -m 644 doc/appdocsxml.dtd $(DESTDIR)$(ASTDATADIR)/documentation +- $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys +- $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys +- $(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 +- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 +- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 +- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 ++ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/documentation ++ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/documentation/thirdparty ++ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv ++ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom ++ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/keys ++ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware ++ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware/iax ++ $(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8 ++ $(BSD_INSTALL_DATA) doc/core-*.xml $(DESTDIR)$(ASTDATADIR)/documentation ++ $(BSD_INSTALL_DATA) doc/appdocsxml.dtd $(DESTDIR)$(ASTDATADIR)/documentation ++ $(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys ++ $(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys ++ $(BSD_INSTALL_MAN) doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 ++ $(BSD_INSTALL_MAN) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 ++ $(BSD_INSTALL_MAN) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 ++ $(BSD_INSTALL_MAN) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 + if [ -f contrib/firmware/iax/iaxy.bin ] ; then \ +- $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \ ++ $(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \ + fi + + $(SUBDIRS_INSTALL): +@@ -616,7 +620,7 @@ + @exit 1 + endif + +-install: badshell datafiles bininstall ++install: badshell datafiles bininstall samples + @if [ -x /usr/sbin/asterisk-post-install ]; then \ + /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ + fi +@@ -650,38 +654,25 @@ + # XXX why *.adsi is installed first ? + adsi: + @echo Installing adsi config files... +- @mkdir -p $(DESTDIR)$(ASTETCDIR) ++ @$(MKDIR) $(DESTDIR)$(ASTETCDIR) + @for x in configs/*.adsi; do \ + dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \ + if [ -f $${dst} ] ; then \ +- echo "Overwriting $$x" ; \ +- else \ +- echo "Installing $$x" ; \ ++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \ + fi ; \ +- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \ ++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist ; \ + done + + samples: adsi + @echo Installing other config files... +- @mkdir -p $(DESTDIR)$(ASTETCDIR) ++ @$(MKDIR) $(DESTDIR)$(ASTETCDIR) + @for x in configs/*.sample; do \ +- dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ; \ +- if [ -f $${dst} ]; then \ +- if [ "$(OVERWRITE)" = "y" ]; then \ +- if cmp -s $${dst} $$x ; then \ +- echo "Config file $$x is unchanged"; \ +- continue; \ +- fi ; \ +- mv -f $${dst} $${dst}.old ; \ +- else \ +- echo "Skipping config file $$x"; \ +- continue; \ +- fi ;\ ++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ; \ ++ if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \ ++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`; \ + fi ; \ +- echo "Installing file $$x"; \ +- $(INSTALL) -m 644 $$x $${dst} ;\ + done +- @if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ ++ @if true; then \ + echo "Creating asterisk.conf"; \ + ( \ + echo "[directories](!) ; remove the (!) to enable this" ; \ +@@ -745,14 +736,17 @@ + echo "pbx_realtime=1.6" ; \ + echo "res_agi=1.6" ; \ + echo "app_set=1.6" ; \ +- ) > $(DESTDIR)$(ASTCONFPATH) ; \ ++ ) > $(DESTDIR)$(ASTCONFPATH)-dist ; \ ++ if [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ ++ $(BSD_INSTALL_DATA) $(DESTDIR)$(ASTCONFPATH)-dist $(DESTDIR)$(ASTCONFPATH); \ ++ fi; \ + else \ + echo "Skipping asterisk.conf creation"; \ + fi +- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX ++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX + build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR) +- @mkdir -p $(DESTDIR)$(ASTDATADIR)/phoneprov +- @for x in phoneprov/*; do \ ++ @$(MKDIR) $(DESTDIR)$(ASTDATADIR)/phoneprov ++ for x in phoneprov/*; do \ + dst="$(DESTDIR)$(ASTDATADIR)/$$x" ; \ + if [ -f $${dst} ]; then \ + if [ "$(OVERWRITE)" = "y" ]; then \ +@@ -767,14 +761,14 @@ + fi ;\ + fi ; \ + echo "Installing file $$x"; \ +- $(INSTALL) -m 644 $$x $${dst} ;\ ++ $(BSD_INSTALL_DATA) $$x $${dst} ;\ + done + + webvmail: + @[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 ) + @[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 ) + $(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi +- mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk ++ $(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk + for x in images/*.gif; do \ + $(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \ + done diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/files/patch-Makefile.rules /usr/ports/net/asterisk16/files/patch-Makefile.rules --- /usr/ports/net/asterisk16.orig/files/patch-Makefile.rules 2010-09-21 07:42:50.000000000 +0200 +++ /usr/ports/net/asterisk16/files/patch-Makefile.rules 2010-09-21 13:18:06.000000000 +0200 @@ -1,15 +1,13 @@ - -$FreeBSD: ports/net/asterisk16/files/patch-Makefile.rules,v 1.3 2009/08/02 19:34:55 mezz Exp $ - ---- Makefile.rules -+++ Makefile.rules -@@ -35,7 +35,9 @@ - CMD_PREFIX= +--- Makefile.rules.orig 2010-05-05 15:59:28.000000000 +0600 ++++ Makefile.rules 2010-05-05 15:26:04.000000000 +0600 +@@ -43,6 +43,10 @@ + endif endif +ifneq ($(OSARCH),FreeBSD) - OPTIMIZE?=-O6 ++ OPTIMIZE?=-O6 +endif - ++ ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),) - # More GSM codec optimization + _ASTCFLAGS+=$(OPTIMIZE) + else diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/files/patch-Makefile.rules.orig /usr/ports/net/asterisk16/files/patch-Makefile.rules.orig --- /usr/ports/net/asterisk16.orig/files/patch-Makefile.rules.orig 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/net/asterisk16/files/patch-Makefile.rules.orig 2010-09-21 13:18:06.000000000 +0200 @@ -0,0 +1,15 @@ + +$FreeBSD: ports/net/asterisk16/files/patch-Makefile.rules,v 1.3 2009/08/02 19:34:55 mezz Exp $ + +--- Makefile.rules ++++ Makefile.rules +@@ -35,7 +35,9 @@ + CMD_PREFIX= + endif + ++ifneq ($(OSARCH),FreeBSD) + OPTIMIZE?=-O6 ++endif + + ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),) + # More GSM codec optimization diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/files/patch-agi::Makefile.orig /usr/ports/net/asterisk16/files/patch-agi::Makefile.orig --- /usr/ports/net/asterisk16.orig/files/patch-agi::Makefile.orig 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/net/asterisk16/files/patch-agi::Makefile.orig 2010-09-21 13:18:06.000000000 +0200 @@ -0,0 +1,28 @@ + +$FreeBSD: ports/net/asterisk16/files/patch-agi::Makefile,v 1.10 2009/08/02 19:34:55 mezz Exp $ + +--- agi/Makefile ++++ agi/Makefile +@@ -13,7 +13,9 @@ + + .PHONY: clean all uninstall + +-AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi ++AGIS_BIN=eagi-test eagi-sphinx-test ++AGIS_SCR=agi-test.agi jukebox.agi ++AGIS=$(AGIS_SCR) $(AGIS_BIN) + + ifeq ($(OSARCH),SunOS) + LIBS+=-lsocket -lnsl +@@ -40,8 +42,9 @@ + eagi-sphinx-test: eagi-sphinx-test.o + + install: all +- mkdir -p $(DESTDIR)$(AGI_DIR) +- for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done ++ $(MKDIR) -p $(DESTDIR)$(AGI_DIR) ++ for x in $(AGIS_BIN); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(AGI_DIR) ; done ++ for x in $(AGIS_SCR); do $(BSD_INSTALL_SCRIPT) $$x $(DESTDIR)$(AGI_DIR) ; done + + uninstall: + for x in $(AGIS); do rm -f $(DESTDIR)$(AGI_DIR)/$$x ; done diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/files/patch-channels-chan_dahdi.c /usr/ports/net/asterisk16/files/patch-channels-chan_dahdi.c --- /usr/ports/net/asterisk16.orig/files/patch-channels-chan_dahdi.c 2010-09-21 07:42:50.000000000 +0200 +++ /usr/ports/net/asterisk16/files/patch-channels-chan_dahdi.c 2010-09-21 13:18:06.000000000 +0200 @@ -1,6 +1,6 @@ ---- channels/chan_dahdi.c.orig 2009-10-22 17:19:21.568250985 +0000 -+++ channels/chan_dahdi.c 2009-10-22 17:26:26.261584076 +0000 -@@ -1997,13 +1997,17 @@ +--- channels/chan_dahdi.c.orig 2010-05-05 17:50:15.000000000 +0600 ++++ channels/chan_dahdi.c 2010-05-05 17:50:09.000000000 +0600 +@@ -2672,13 +2672,17 @@ return; } if (p->echocancel.head.tap_length) { @@ -13,13 +13,13 @@ ast_log(LOG_WARNING, "Unable to enable audio mode on channel %d (%s)\n", p->channel, strerror(errno)); } - res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &p->echocancel); -+ ++ + pecp = &p->echocancel.head; + res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &pecp); - if (res) { + if (res) { ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(errno)); } else { -@@ -2037,8 +2041,9 @@ +@@ -2712,8 +2716,9 @@ if (p->echocanon) { struct dahdi_echocanparams ecp = { .tap_length = 0 }; diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/files/patch-channels::Makefile /usr/ports/net/asterisk16/files/patch-channels::Makefile --- /usr/ports/net/asterisk16.orig/files/patch-channels::Makefile 2010-09-21 07:42:50.000000000 +0200 +++ /usr/ports/net/asterisk16/files/patch-channels::Makefile 2010-09-21 13:18:06.000000000 +0200 @@ -1,8 +1,5 @@ - -$FreeBSD: ports/net/asterisk16/files/patch-channels::Makefile,v 1.18 2009/09/10 09:25:25 sobomax Exp $ - ---- channels/Makefile.orig -+++ channels/Makefile +--- channels/Makefile.orig 2010-05-05 17:57:22.000000000 +0600 ++++ channels/Makefile 2010-05-05 18:01:58.000000000 +0600 @@ -27,9 +27,10 @@ endif @@ -21,9 +18,9 @@ chan_h323.so: chan_h323.o h323/libchanh323.a $(ECHO_PREFIX) echo " [LD] $^ -> $@" +ifeq ($(OSARCH),FreeBSD) -+ $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -L$(PREFIX)/lib $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CHANH323LIB) ++ $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -L$(LOCALBASE)/lib $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CHANH323LIB) +else - $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat + $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat endif endif +endif diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/files/patch-channels::Makefile.orig /usr/ports/net/asterisk16/files/patch-channels::Makefile.orig --- /usr/ports/net/asterisk16.orig/files/patch-channels::Makefile.orig 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/net/asterisk16/files/patch-channels::Makefile.orig 2010-09-21 13:18:06.000000000 +0200 @@ -0,0 +1,32 @@ + +$FreeBSD: ports/net/asterisk16/files/patch-channels::Makefile,v 1.18 2009/09/10 09:25:25 sobomax Exp $ + +--- channels/Makefile.orig ++++ channels/Makefile +@@ -27,9 +27,10 @@ + endif + + ifeq ($(OSARCH),FreeBSD) +- PTLIB=-lpt_FreeBSD_x86_r +- H323LIB=-lh323_FreeBSD_x86_r ++ PTLIB=-lpt_r ++ H323LIB=-lh323_r + CHANH323LIB=-pthread ++ H323LDLIBS=$(PTLIB) $(H323LIB) $(CHANH323LIB) + endif + + ifeq ($(OSARCH),NetBSD) +@@ -80,9 +81,13 @@ + else + chan_h323.so: chan_h323.o h323/libchanh323.a + $(ECHO_PREFIX) echo " [LD] $^ -> $@" ++ifeq ($(OSARCH),FreeBSD) ++ $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -L$(PREFIX)/lib $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CHANH323LIB) ++else + $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat + endif + endif ++endif + + chan_misdn.o: _ASTCFLAGS+=-Imisdn + diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/files/patch-channels::chan_sip.c /usr/ports/net/asterisk16/files/patch-channels::chan_sip.c --- /usr/ports/net/asterisk16.orig/files/patch-channels::chan_sip.c 2010-09-21 07:42:50.000000000 +0200 +++ /usr/ports/net/asterisk16/files/patch-channels::chan_sip.c 2010-09-21 13:18:06.000000000 +0200 @@ -1,14 +1,11 @@ - -$FreeBSD: ports/net/asterisk16/files/patch-channels::chan_sip.c,v 1.13 2009/08/02 19:34:55 mezz Exp $ - ---- channels/chan_sip.c -+++ channels/chan_sip.c -@@ -611,7 +611,7 @@ - #define DEFAULT_MOHINTERPRET "default" +--- channels/chan_sip.c.orig 2010-05-28 23:57:40.000000000 +0600 ++++ channels/chan_sip.c 2010-08-11 10:47:07.000000000 +0600 +@@ -980,7 +980,7 @@ + #define DEFAULT_MOHINTERPRET "default" /*!< The default music class */ #define DEFAULT_MOHSUGGEST "" - #define DEFAULT_VMEXTEN "asterisk" --#define DEFAULT_CALLERID "asterisk" -+#define DEFAULT_CALLERID "Unknown" + #define DEFAULT_VMEXTEN "asterisk" /*!< Default voicemail extension */ +-#define DEFAULT_CALLERID "asterisk" /*!< Default caller ID */ ++#define DEFAULT_CALLERID "Unknown" /*!< Default caller ID */ #define DEFAULT_NOTIFYMIME "application/simple-message-summary" #define DEFAULT_ALLOWGUEST TRUE - #define DEFAULT_CALLCOUNTER FALSE + #define DEFAULT_RTPKEEPALIVE 0 /*!< Default RTPkeepalive setting */ diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/files/patch-configure /usr/ports/net/asterisk16/files/patch-configure --- /usr/ports/net/asterisk16.orig/files/patch-configure 2010-09-21 07:42:50.000000000 +0200 +++ /usr/ports/net/asterisk16/files/patch-configure 2010-09-21 13:18:06.000000000 +0200 @@ -1,18 +1,16 @@ - -$FreeBSD: ports/net/asterisk16/files/patch-configure,v 1.8 2010/01/29 10:32:17 sobomax Exp $ - ---- configure.orig -+++ configure -@@ -4432,8 +4432,6 @@ +--- ./configure.orig 2010-07-17 23:43:50.000000000 +0600 ++++ ./configure 2010-08-24 09:37:46.000000000 +0600 +@@ -4147,9 +4147,6 @@ + case "${host_os}" in freebsd*) - ac_default_prefix=/usr/local +- - CPPFLAGS=-I/usr/local/include - LDFLAGS=-L/usr/local/lib ;; + openbsd*) - darwin*) -@@ -18784,7 +18782,7 @@ +@@ -34755,7 +34752,7 @@ fi @@ -20,4 +18,4 @@ + PLATFORM_OPENH323="h323_${OPENH323_SUFFIX}" if test "${HAS_OPENH323:-unset}" != "unset"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH323 installation validity" >&5 + { echo "$as_me:$LINENO: checking OpenH323 installation validity" >&5 diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/files/patch-main::Makefile /usr/ports/net/asterisk16/files/patch-main::Makefile --- /usr/ports/net/asterisk16.orig/files/patch-main::Makefile 2010-09-21 07:42:50.000000000 +0200 +++ /usr/ports/net/asterisk16/files/patch-main::Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ - -$FreeBSD: ports/net/asterisk16/files/patch-main::Makefile,v 1.8 2009/11/20 23:43:09 sobomax Exp $ - ---- main/Makefile.orig -+++ main/Makefile -@@ -101,8 +101,8 @@ - cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS:-Werror=) $(ASTCFLAGS))" LDFLAGS="$(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR) - $(MAKE) -C editline libedit.a - --db1-ast/libdb1.a: CHECK_SUBDIR -- _ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a -+#db1-ast/libdb1.a: CHECK_SUBDIR -+# _ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a - - ast_expr2.c ast_expr2.h: - bison -o $@ -d --name-prefix=ast_yy ast_expr2.y -@@ -159,13 +159,13 @@ - GMIMELDFLAGS+=$(GMIME_LIB) - endif - --$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) -+$(MAIN_TGT): $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) - @$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS) - $(ECHO_PREFIX) echo " [LD] $^ -> $@" - ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),) -- $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) -+ $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) - else -- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) -+ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) - endif - $(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@ - diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/files/patch-main::Makefile.orig /usr/ports/net/asterisk16/files/patch-main::Makefile.orig --- /usr/ports/net/asterisk16.orig/files/patch-main::Makefile.orig 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/net/asterisk16/files/patch-main::Makefile.orig 2010-09-21 13:18:06.000000000 +0200 @@ -0,0 +1,33 @@ + +$FreeBSD: ports/net/asterisk16/files/patch-main::Makefile,v 1.8 2009/11/20 23:43:09 sobomax Exp $ + +--- main/Makefile.orig ++++ main/Makefile +@@ -101,8 +101,8 @@ + cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS:-Werror=) $(ASTCFLAGS))" LDFLAGS="$(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR) + $(MAKE) -C editline libedit.a + +-db1-ast/libdb1.a: CHECK_SUBDIR +- _ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a ++#db1-ast/libdb1.a: CHECK_SUBDIR ++# _ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a + + ast_expr2.c ast_expr2.h: + bison -o $@ -d --name-prefix=ast_yy ast_expr2.y +@@ -159,13 +159,13 @@ + GMIMELDFLAGS+=$(GMIME_LIB) + endif + +-$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) ++$(MAIN_TGT): $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) + @$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS) + $(ECHO_PREFIX) echo " [LD] $^ -> $@" + ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),) +- $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) ++ $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) + else +- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) ++ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) + endif + $(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@ + diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/files/patch-main__Makefile /usr/ports/net/asterisk16/files/patch-main__Makefile --- /usr/ports/net/asterisk16.orig/files/patch-main__Makefile 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/net/asterisk16/files/patch-main__Makefile 2010-09-21 13:18:06.000000000 +0200 @@ -0,0 +1,30 @@ +--- ./main/Makefile.orig 2010-06-26 00:58:37.000000000 +0600 ++++ ./main/Makefile 2010-08-24 09:40:39.000000000 +0600 +@@ -113,8 +113,8 @@ + cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS:-Werror=) $(ASTCFLAGS))" LDFLAGS="$(_ASTLDFLAGS) $(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR) + $(MAKE) -C editline libedit.a + +-db1-ast/libdb1.a: CHECK_SUBDIR +- _ASTCFLAGS="$(_ASTCFLAGS) -Wno-strict-aliasing" ASTCFLAGS="$(ASTCFLAGS)" $(MAKE) -C db1-ast libdb1.a ++#db1-ast/libdb1.a: CHECK_SUBDIR ++# _ASTCFLAGS="$(_ASTCFLAGS) -Wno-strict-aliasing" ASTCFLAGS="$(ASTCFLAGS)" $(MAKE) -C db1-ast libdb1.a + + ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),) + ast_expr2.c ast_expr2.h: ast_expr2.y +@@ -177,13 +177,13 @@ + GMIMELDFLAGS+=$(GMIME_LIB) + endif + +-$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) ++$(MAIN_TGT): $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS) + @$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS) + $(ECHO_PREFIX) echo " [LD] $^ -> $@" + ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),) +- $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) ++ $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) + else +- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) ++ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) + endif + $(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@ + diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/pkg-plist /usr/ports/net/asterisk16/pkg-plist --- /usr/ports/net/asterisk16.orig/pkg-plist 2010-09-21 07:42:50.000000000 +0200 +++ /usr/ports/net/asterisk16/pkg-plist 2010-09-21 18:59:59.000000000 +0200 @@ -1,11 +1,21 @@ +@unexec if cmp -s %D/etc/asterisk/ais.conf %D/etc/asterisk/ais.conf-dist; then rm -f %D/etc/asterisk/ais.conf; fi +etc/asterisk/ais.conf-dist @unexec if cmp -s %D/etc/asterisk/cdr_adaptive_odbc.conf %D/etc/asterisk/cdr_adaptive_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_adaptive_odbc.conf; fi etc/asterisk/cdr_adaptive_odbc.conf-dist @unexec if cmp -s %D/etc/asterisk/cdr_sqlite3_custom.conf %D/etc/asterisk/cdr_sqlite3_custom.conf-dist; then rm -f %D/etc/asterisk/cdr_sqlite3_custom.conf; fi etc/asterisk/cdr_sqlite3_custom.conf-dist @unexec if cmp -s %D/etc/asterisk/cli.conf %D/etc/asterisk/cli.conf-dist; then rm -f %D/etc/asterisk/cli.conf; fi etc/asterisk/cli.conf-dist +@unexec if cmp -s %D/etc/asterisk/cli_aliases.conf %D/etc/asterisk/cli_aliases.conf-dist; then rm -f %D/etc/asterisk/cli_aliases.conf; fi +etc/asterisk/cli_aliases.conf-dist +@unexec if cmp -s %D/etc/asterisk/cli_permissions.conf %D/etc/asterisk/cli_permissions.conf-dist; then rm -f %D/etc/asterisk/cli_permissions.conf; fi +etc/asterisk/cli_permissions.conf-dist @unexec if cmp -s %D/etc/asterisk/console.conf %D/etc/asterisk/console.conf-dist; then rm -f %D/etc/asterisk/console.conf; fi etc/asterisk/console.conf-dist +@unexec if cmp -s %D/etc/asterisk/dbsep.conf %D/etc/asterisk/dbsep.conf-dist; then rm -f %D/etc/asterisk/dbsep.conf; fi +etc/asterisk/dbsep.conf-dist +@unexec if cmp -s %D/etc/asterisk/dsp.conf %D/etc/asterisk/dsp.conf-dist; then rm -f %D/etc/asterisk/dsp.conf; fi +etc/asterisk/dsp.conf-dist @unexec if cmp -s %D/etc/asterisk/extensions.lua %D/etc/asterisk/extensions.lua-dist; then rm -f %D/etc/asterisk/extensions.lua; fi etc/asterisk/extensions.lua-dist @unexec if cmp -s %D/etc/asterisk/extensions_minivm.conf %D/etc/asterisk/extensions_minivm.conf-dist; then rm -f %D/etc/asterisk/extensions_minivm.conf; fi @@ -146,6 +156,8 @@ etc/asterisk/followme.conf-dist @unexec if cmp -s %D/etc/asterisk/amd.conf %D/etc/asterisk/amd.conf-dist; then rm -f %D/etc/asterisk/amd.conf; fi etc/asterisk/amd.conf-dist +@unexec if cmp -s %D/etc/asterisk/res_config_sqlite.conf %D/etc/asterisk/res_config_sqlite.conf-dist; then rm -f %D/etc/asterisk/res_config_sqlite.conf; fi +etc/asterisk/res_config_sqlite.conf-dist @exec if test ! -e %D/etc/asterisk/cdr_adaptive_odbc.conf; then cp -p %D/etc/asterisk/cdr_adaptive_odbc.conf-dist %D/etc/asterisk/cdr_adaptive_odbc.conf; fi @exec if test ! -e %D/etc/asterisk/cdr_sqlite3_custom.conf; then cp -p %D/etc/asterisk/cdr_sqlite3_custom.conf-dist %D/etc/asterisk/cdr_sqlite3_custom.conf; fi @exec if test ! -e %D/etc/asterisk/cli.conf; then cp -p %D/etc/asterisk/cli.conf-dist %D/etc/asterisk/cli.conf; fi @@ -250,7 +262,11 @@ include/asterisk/astosp.h include/asterisk/audiohook.h include/asterisk/autoconfig.h +include/asterisk/bridging.h +include/asterisk/bridging_features.h +include/asterisk/bridging_technology.h include/asterisk/build.h +include/asterisk/buildinfo.h include/asterisk/buildopts.h include/asterisk/callerid.h include/asterisk/causes.h @@ -262,8 +278,10 @@ include/asterisk/compiler.h include/asterisk/config.h include/asterisk/crypto.h +include/asterisk/datastore.h include/asterisk/devicestate.h include/asterisk/dial.h +include/asterisk/dlinkedlists.h include/asterisk/dns.h include/asterisk/dnsmgr.h include/asterisk/doxyref.h @@ -276,6 +294,7 @@ include/asterisk/frame.h include/asterisk/fskmodem.h include/asterisk/global_datastores.h +include/asterisk/heap.h include/asterisk/http.h include/asterisk/image.h include/asterisk/indications.h @@ -304,16 +323,20 @@ include/asterisk/say.h include/asterisk/sched.h include/asterisk/sha1.h +include/asterisk/slin.h include/asterisk/slinfactory.h include/asterisk/smdi.h include/asterisk/speech.h include/asterisk/srv.h include/asterisk/stringfields.h include/asterisk/strings.h +include/asterisk/taskprocessor.h include/asterisk/tdd.h include/asterisk/term.h +include/asterisk/test.h include/asterisk/threadstorage.h include/asterisk/time.h +include/asterisk/timing.h include/asterisk/transcap.h include/asterisk/translate.h include/asterisk/udptl.h @@ -321,17 +344,30 @@ include/asterisk/unaligned.h include/asterisk/utils.h include/asterisk/version.h +include/asterisk/xml.h +include/asterisk/xmldoc.h +lib/asterisk/modules/app_confbridge.so lib/asterisk/modules/app_minivm.so -lib/asterisk/modules/app_pickupchan.so +lib/asterisk/modules/app_originate.so +lib/asterisk/modules/app_playtones.so lib/asterisk/modules/app_readexten.so lib/asterisk/modules/app_waituntil.so +lib/asterisk/modules/bridge_builtin_features.so +lib/asterisk/modules/bridge_multiplexed.so +lib/asterisk/modules/bridge_simple.so +lib/asterisk/modules/bridge_softmix.so %%WITH_ODBC%%lib/asterisk/modules/cdr_adaptive_odbc.so %%WITH_JABBER%%lib/asterisk/modules/chan_jingle.so +lib/asterisk/modules/chan_bridge.so lib/asterisk/modules/chan_unistim.so lib/asterisk/modules/codec_g722.so lib/asterisk/modules/format_sln16.so +lib/asterisk/modules/format_siren14.so +lib/asterisk/modules/format_siren7.so +lib/asterisk/modules/func_aes.so lib/asterisk/modules/func_audiohookinherit.so lib/asterisk/modules/func_blacklist.so +lib/asterisk/modules/func_config.so lib/asterisk/modules/func_devstate.so lib/asterisk/modules/func_dialgroup.so lib/asterisk/modules/func_dialplan.so @@ -340,17 +376,23 @@ lib/asterisk/modules/func_lock.so lib/asterisk/modules/func_module.so lib/asterisk/modules/func_shell.so +lib/asterisk/modules/func_speex.so +lib/asterisk/modules/func_sprintf.so lib/asterisk/modules/func_sysinfo.so lib/asterisk/modules/func_version.so lib/asterisk/modules/func_vmcount.so lib/asterisk/modules/func_volume.so lib/asterisk/modules/res_ael_share.so +lib/asterisk/modules/res_clialiases.so +%%WITH_CURL%%lib/asterisk/modules/res_curl.so %%WITH_CURL%%lib/asterisk/modules/res_config_curl.so lib/asterisk/modules/res_config_ldap.so %%WITH_SQLITE%%lib/asterisk/modules/res_config_sqlite.so lib/asterisk/modules/res_limit.so lib/asterisk/modules/res_phoneprov.so lib/asterisk/modules/res_realtime.so +%%WITH_DAHDI%%lib/asterisk/modules/res_timing_dahdi.so +lib/asterisk/modules/res_timing_pthread.so lib/asterisk/modules/app_adsiprog.so lib/asterisk/modules/app_alarmreceiver.so lib/asterisk/modules/app_amd.so @@ -481,7 +523,6 @@ %%WITH_POSTGRES%%lib/asterisk/modules/res_config_pgsql.so lib/asterisk/modules/res_convert.so lib/asterisk/modules/res_crypto.so -lib/asterisk/modules/res_indications.so %%WITH_JABBER%%lib/asterisk/modules/res_jabber.so lib/asterisk/modules/res_monitor.so lib/asterisk/modules/res_musiconhold.so @@ -498,6 +539,7 @@ sbin/astman sbin/autosupport sbin/muted +sbin/refcounter sbin/rasterisk sbin/safe_asterisk sbin/smsq @@ -507,9 +549,11 @@ share/asterisk/agi-bin/eagi-sphinx-test share/asterisk/agi-bin/eagi-test share/asterisk/agi-bin/jukebox.agi +share/asterisk/documentation/appdocsxml.dtd +share/asterisk/documentation/core-en_US.xml share/asterisk/keys/freeworlddialup.pub share/asterisk/keys/iaxtel.pub -share/asterisk/moh/.asterisk-moh-opsound-wav +share/asterisk/moh/.asterisk-moh-opsound-wav-2.03 share/asterisk/moh/CHANGES-asterisk-moh-opsound-wav share/asterisk/moh/CREDITS-asterisk-moh-opsound-wav share/asterisk/moh/LICENSE-asterisk-moh-opsound-wav @@ -522,12 +566,19 @@ share/asterisk/phoneprov/000000000000-phone.cfg share/asterisk/phoneprov/000000000000.cfg share/asterisk/phoneprov/polycom.xml -share/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.17 -share/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.17 +share/asterisk/phoneprov/polycom_line.xml +share/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.19 +share/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.19 +share/asterisk/sounds/en/ascending-2tone.gsm share/asterisk/sounds/en/conf-adminmenu-162.gsm share/asterisk/sounds/en/conf-extended.gsm share/asterisk/sounds/en/conf-nonextended.gsm +share/asterisk/sounds/en/conf-now-muted.gsm +share/asterisk/sounds/en/conf-now-recording.gsm +share/asterisk/sounds/en/conf-now-unmuted.gsm +share/asterisk/sounds/en/conf-roll-callcomplete.gsm share/asterisk/sounds/en/conf-usermenu-162.gsm +share/asterisk/sounds/en/descending-2tone.gsm share/asterisk/sounds/en/spy-dahdi.gsm share/asterisk/sounds/en/vm-Urgent.gsm share/asterisk/sounds/en/vm-forward-multiple.gsm @@ -538,8 +589,8 @@ share/asterisk/sounds/en/vm-record-prepend.gsm share/asterisk/sounds/en/vm-review-nonurgent.gsm share/asterisk/sounds/en/vm-review-urgent.gsm -share/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.17 -share/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.17 +share/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.19 +share/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.19 share/asterisk/sounds/en/dir-usingkeypad.gsm share/asterisk/sounds/en/dir-welcome.gsm share/asterisk/sounds/en/agent-alreadyon.gsm @@ -633,6 +684,7 @@ share/asterisk/sounds/en/digits/90.gsm share/asterisk/sounds/en/digits/a-m.gsm share/asterisk/sounds/en/digits/at.gsm +share/asterisk/sounds/en/digits/billion.gsm share/asterisk/sounds/en/digits/day-0.gsm share/asterisk/sounds/en/digits/day-1.gsm share/asterisk/sounds/en/digits/day-2.gsm @@ -657,11 +709,21 @@ share/asterisk/sounds/en/digits/h-3.gsm share/asterisk/sounds/en/digits/h-30.gsm share/asterisk/sounds/en/digits/h-4.gsm +share/asterisk/sounds/en/digits/h-40.gsm share/asterisk/sounds/en/digits/h-5.gsm +share/asterisk/sounds/en/digits/h-50.gsm share/asterisk/sounds/en/digits/h-6.gsm +share/asterisk/sounds/en/digits/h-60.gsm share/asterisk/sounds/en/digits/h-7.gsm +share/asterisk/sounds/en/digits/h-70.gsm share/asterisk/sounds/en/digits/h-8.gsm +share/asterisk/sounds/en/digits/h-80.gsm share/asterisk/sounds/en/digits/h-9.gsm +share/asterisk/sounds/en/digits/h-90.gsm +share/asterisk/sounds/en/digits/h-billion.gsm +share/asterisk/sounds/en/digits/h-hundred.gsm +share/asterisk/sounds/en/digits/h-million.gsm +share/asterisk/sounds/en/digits/h-thousand.gsm share/asterisk/sounds/en/digits/hundred.gsm share/asterisk/sounds/en/digits/million.gsm share/asterisk/sounds/en/digits/minus.gsm @@ -772,6 +834,7 @@ share/asterisk/sounds/en/minutes.gsm share/asterisk/sounds/en/pbx-invalid.gsm share/asterisk/sounds/en/pbx-invalidpark.gsm +share/asterisk/sounds/en/pbx-parkingfailed.gsm share/asterisk/sounds/en/pbx-transfer.gsm share/asterisk/sounds/en/phonetic/9_p.gsm share/asterisk/sounds/en/phonetic/a_p.gsm @@ -811,6 +874,7 @@ share/asterisk/sounds/en/queue-callswaiting.gsm share/asterisk/sounds/en/queue-holdtime.gsm share/asterisk/sounds/en/queue-less-than.gsm +share/asterisk/sounds/en/queue-minute.gsm share/asterisk/sounds/en/queue-minutes.gsm share/asterisk/sounds/en/queue-periodic-announce.gsm share/asterisk/sounds/en/queue-quantity1.gsm @@ -991,6 +1055,10 @@ %%DOCSDIR%%/img3.png %%DOCSDIR%%/img4.png %%DOCSDIR%%/img5.png +%%DOCSDIR%%/img6.png +%%DOCSDIR%%/img7.png +%%DOCSDIR%%/img8.png +%%DOCSDIR%%/img9.png %%DOCSDIR%%/index.html %%DOCSDIR%%/internals.pl %%DOCSDIR%%/labels.pl @@ -1195,6 +1263,25 @@ %%DOCSDIR%%/node278.html %%DOCSDIR%%/node279.html %%DOCSDIR%%/node28.html +%%DOCSDIR%%/node280.html +%%DOCSDIR%%/node281.html +%%DOCSDIR%%/node282.html +%%DOCSDIR%%/node283.html +%%DOCSDIR%%/node284.html +%%DOCSDIR%%/node285.html +%%DOCSDIR%%/node286.html +%%DOCSDIR%%/node287.html +%%DOCSDIR%%/node288.html +%%DOCSDIR%%/node289.html +%%DOCSDIR%%/node290.html +%%DOCSDIR%%/node291.html +%%DOCSDIR%%/node292.html +%%DOCSDIR%%/node293.html +%%DOCSDIR%%/node294.html +%%DOCSDIR%%/node295.html +%%DOCSDIR%%/node296.html +%%DOCSDIR%%/node297.html +%%DOCSDIR%%/node298.html %%DOCSDIR%%/node29.html %%DOCSDIR%%/node3.html %%DOCSDIR%%/node30.html @@ -1291,12 +1378,16 @@ @dirrm share/asterisk/keys @dirrm share/asterisk/firmware/iax @dirrm share/asterisk/firmware +@dirrm share/asterisk/documentation/thirdparty +@dirrm share/asterisk/documentation @dirrm share/asterisk/agi-bin @dirrm share/asterisk @dirrm lib/asterisk/modules @dirrm lib/asterisk @dirrm include/asterisk @dirrmtry etc/asterisk +@exec mkdir -p %D/share/asterisk/firmware/iax +@exec mkdir -p %D/share/asterisk/documentation/thirdparty @exec mkdir -p %D/share/asterisk/sounds/es @exec mkdir -p %D/share/asterisk/sounds/fr @cwd /var @@ -1304,15 +1395,18 @@ spool/asterisk/voicemail/default/1234/en/unavail.gsm @exec mkdir -p %D/log/asterisk/cdr-csv @exec mkdir -p %D/log/asterisk/cdr-custom -@exec mkdir -p %D/spool/asterisk/voicemail/default/1234/INBOX @exec mkdir -p %D/spool/asterisk/dictate @exec mkdir -p %D/spool/asterisk/meetme @exec mkdir -p %D/spool/asterisk/monitor @exec mkdir -p %D/spool/asterisk/system +@exec mkdir -p %D/spool/asterisk/voicemail/default/1234/INBOX +@exec mkdir -p %D/spool/asterisk/voicemail/default/1234/en @exec mkdir -p %D/spool/asterisk/tmp +@exec mkdir -p %D/db/asterisk @dirrm spool/asterisk/dictate @dirrm spool/asterisk/meetme @dirrm spool/asterisk/monitor +@dirrm spool/asterisk/outgoing @dirrm spool/asterisk/system @dirrm spool/asterisk/voicemail/default/1234/INBOX @dirrm spool/asterisk/voicemail/default/1234/en --------------030302080308090603070000-- From: TAKATSU Tomonari To: bug-followup@FreeBSD.org, emz@norma.perm.ru, flo@smeets.im Cc: Subject: Re: ports/146964: New port: net/asterisk162 Date: Sat, 25 Sep 2010 23:47:15 +0900 --0016e644c57c3620560491169208 Content-Type: text/plain; charset=ISO-8859-1 Hi Florian, Thank you for sending your "patch-1.diff" patch. I modified your patch as follows. (1) move USE_GNOME to USE_* section (2) remove *.orig files in files directory (3) add @exec mkdir -p %D/spool/asterisk/outgoing to pkg-plist (4) add $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/outgoing to files/patch-Makefile to fix an error when "make deinstall" (*). (*) # make deinstall ===> Deinstalling for net/asterisk16 ===> Deinstalling asterisk16-1.6.2.13 pkg_delete: file '/var/spool/asterisk/outgoing' doesn't exist pkg_delete: unable to completely remove directory '/var/spool/asterisk/outgoing' pkg_delete: couldn't entirely delete package (perhaps the packing list is incorrectly specified?) Please make sure. Regards, -- TAKATSU Tomonari --0016e644c57c3620560491169208 Content-Type: application/octet-stream; name="net.asterisk16-1.6.2.13.patch" Content-Disposition: attachment; filename="net.asterisk16-1.6.2.13.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_geil8kas0 SW5kZXg6IE1ha2VmaWxlCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL25jdnMvcG9ydHMvbmV0 L2FzdGVyaXNrMTYvTWFrZWZpbGUsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTM3CmRpZmYgLXUg LXIxLjEzNyBNYWtlZmlsZQotLS0gTWFrZWZpbGUJMjIgU2VwIDIwMTAgMjE6MjE6MjQgLTAwMDAJ MS4xMzcKKysrIE1ha2VmaWxlCTI1IFNlcCAyMDEwIDE0OjI3OjI5IC0wMDAwCkBAIC02LDEyICs2 LDExIEBACiAjCiAKIFBPUlROQU1FPQlhc3RlcmlzawotUE9SVFZFUlNJT049CTEuNi4wLjIxCi1Q T1JUUkVWSVNJT049CTQKLVBLR05BTUVTVUZGSVg9CTE2CitQT1JUVkVSU0lPTj0JMS42LjIuMTMK IENBVEVHT1JJRVM9CW5ldAogTUFTVEVSX1NJVEVTPQlodHRwOi8vZG93bmxvYWRzLmFzdGVyaXNr Lm9yZy9wdWIvdGVsZXBob255L2FzdGVyaXNrLyBcCiAJCWh0dHA6Ly9kb3dubG9hZHMuYXN0ZXJp c2sub3JnL3B1Yi90ZWxlcGhvbnkvYXN0ZXJpc2svb2xkLXJlbGVhc2VzLworUEtHTkFNRVNVRkZJ WD0JMTYKIAogTUFJTlRBSU5FUj0JZmxvQHNtZWV0cy5pbQogQ09NTUVOVD0JQW4gT3BlbiBTb3Vy Y2UgUEJYIGFuZCB0ZWxlcGhvbnkgdG9vbGtpdApAQCAtMjYsOSArMjUsMTAgQEAKIEdOVV9DT05G SUdVUkU9CXllcwogQ09ORklHVVJFX0VOVj0JQ1BQRkxBR1M9Ii1JJHtMT0NBTEJBU0V9L2luY2x1 ZGUgLUkke0xPQ0FMQkFTRX0vaW5jbHVkZS9vcGVuaDMyMyIgXAogCQlMREZMQUdTPSItTCR7TE9D QUxCQVNFfS9saWIiCi1DT05GSUdVUkVfQVJHUz0JLS13aXRoLWdzbT0ke0xPQ0FMQkFTRX0KK0NP TkZJR1VSRV9BUkdTPQktLXdpdGgtZ3NtPSR7TE9DQUxCQVNFfSAtLWxvY2Fsc3RhdGVkaXI9L3Zh cgogQ1BQRkxBR1M9CS1JJHtMT0NBTEJBU0V9L2luY2x1ZGUgLUkke0xPQ0FMQkFTRX0vaW5jbHVk ZS9vcGVuaDMyMwogVVNFX0dNQUtFPQl5ZXMKK1VTRV9HTk9NRT0JbGlieG1sMgogVVNFX0JJU09O PQlidWlsZAogVVNFX1JDX1NVQlI9CWFzdGVyaXNrLnNoCiBNQUtFX0VOVj0JUFRIUkVBRF9DRkxB R1M9IiR7UFRIUkVBRF9DRkxBR1N9IiBcCkBAIC01NSwzNSArNTUsMzIgQEAKIAkJR1NNCQkiRW5h YmxlIEdTTSBjb2RlYyIgb24gXAogCQlDVVJMCQkiRW5hYmxlIENVUkwgc3VwcG9ydCIgb24gXAog CQlJTEJDCQkiRW5hYmxlIGlMQkMgY29kZWMiIG9mZiBcCi0JCVNQQU5EU1AJCSJFbmFibGUgU3Bh bmRzcCBmYXhpbmcgc3VwcG9ydCIgb2ZmIFwKLSMJCUNPREVDX1BBVENICSJBcHBseSBjb2RlYyBu ZWdvdGlhdGlvbiBwYXRjaCIgb2ZmIFwKLSMJCU1JU0NfUEFUQ0hFUwkiQXBwbHkgYWRkaXRpb25h bCBwYXRjaGVzIiBvZmYKKwkJU1BBTkRTUAkJIkVuYWJsZSBTcGFuZHNwIGZheGluZyBzdXBwb3J0 IiBvZmYKIAogLmluY2x1ZGUgPGJzZC5wb3J0LnByZS5taz4KIAogLmlmICR7QVJDSH0gPT0gImkz ODYiIHx8ICR7QVJDSH0gPT0gImFtZDY0IgogT1BUSU9OUys9CURBSERJCQkiRW5hYmxlIERBSERJ IHN1cHBvcnQiIG9uCi0KICMgSW5jbHVkZSB0aGlzIHNpbmNlIHdlIGhhdmUgYWx0ZXJlZCBPUFRJ T05TLgotLmluY2x1ZGUgIiQoUE9SVFNESVIpL01rL2JzZC5wb3J0Lm9wdGlvbnMubWsiCisuaW5j bHVkZSA8YnNkLnBvcnQub3B0aW9ucy5taz4KIC5lbmRpZgogCiAuaWYgIWRlZmluZWQoV0lUSF9I MzIzKQogUExJU1RfU1VCKz0JV0lUSF9IMzIzPSJAY29tbWVudCAiCi1DT05GSUdVUkVfQVJHUys9 IC0td2l0aG91dC1oMzIzCitDT05GSUdVUkVfQVJHUys9CS0td2l0aG91dC1oMzIzCiAuZWxzZQog UExJU1RfU1VCKz0JV0lUSF9IMzIzPSIiCi1DT05GSUdVUkVfQVJHUys9IC0td2l0aC1oMzIzPSR7 TE9DQUxCQVNFfQorQ09ORklHVVJFX0FSR1MrPQktLXdpdGgtaDMyMz0ke0xPQ0FMQkFTRX0KIExJ Ql9ERVBFTkRTKz0JcHRfci4xOiR7UE9SVFNESVJ9L2RldmVsL3B3bGliIFwKIAkJaDMyM19yLjE6 JHtQT1JUU0RJUn0vbmV0L29wZW5oMzIzCiAuZW5kaWYKIAogLmlmICFkZWZpbmVkKFdJVEhfREFI REkpCiBQTElTVF9TVUIrPQlXSVRIX0RBSERJPSJAY29tbWVudCAiCi1DT05GSUdVUkVfQVJHUys9 IC0td2l0aG91dC1kYWhkaQorQ09ORklHVVJFX0FSR1MrPQktLXdpdGhvdXQtZGFoZGkKIC5lbHNl CiBQTElTVF9TVUIrPQlXSVRIX0RBSERJPSIiCi1DT05GSUdVUkVfQVJHUys9IC0td2l0aC1kYWhk aQorQ09ORklHVVJFX0FSR1MrPQktLXdpdGgtZGFoZGkKIEJVSUxEX0RFUEVORFMrPQlsaWJwcmk+ PTEuNC4xMDoke1BPUlRTRElSfS9taXNjL2xpYnByaSBcCiAJCSR7TE9DQUxCQVNFfS9pbmNsdWRl L2RhaGRpL3VzZXIuaDoke1BPUlRTRElSfS9taXNjL2RhaGRpCiBMSUJfREVQRU5EUys9CXByaS4x OiR7UE9SVFNESVJ9L21pc2MvbGlicHJpCkBAIC05NSw3NSArOTIsNzUgQEAKICMgc2ltaWxhcmx5 CiAuaWYgIWRlZmluZWQoV0lUSF9PREJDKQogUExJU1RfU1VCKz0JV0lUSF9PREJDPSJAY29tbWVu dCAiCi1DT05GSUdVUkVfQVJHUys9IC0td2l0aG91dC1vZGJjCitDT05GSUdVUkVfQVJHUys9CS0t d2l0aG91dC11bml4b2RiYwogLmVsc2UKIFBMSVNUX1NVQis9CVdJVEhfT0RCQz0iIgotQ09ORklH VVJFX0FSR1MrPSAtLXdpdGgtb2RiYyAtLXdpdGgtbHRkbAotTElCX0RFUEVORFMrPQlvZGJjLjE6 JHtQT1JUU0RJUn0vZGF0YWJhc2VzL3VuaXhPREJDIFwKLQkJbHRkbC43OiR7UE9SVFNESVJ9L2Rl dmVsL2xpYmx0ZGwyMgorQ09ORklHVVJFX0FSR1MrPQktLXdpdGgtdW5peG9kYmMgLS13aXRoLWx0 ZGwKK0xJQl9ERVBFTkRTKz0Jb2RiYy4xOiR7UE9SVFNESVJ9L2RhdGFiYXNlcy91bml4T0RCQwor VVNFX0FVVE9UT09MUz0JbGlibHRkbAogLmVuZGlmCiAKIC5pZiAhZGVmaW5lZChXSVRIX0ZSRUVU RFMpCiBQTElTVF9TVUIrPQlXSVRIX0ZSRUVURFM9IkBjb21tZW50ICIKLUNPTkZJR1VSRV9BUkdT Kz0gLS13aXRob3V0LXRkcworQ09ORklHVVJFX0FSR1MrPQktLXdpdGhvdXQtdGRzCiAuZWxzZQog UExJU1RfU1VCKz0JV0lUSF9GUkVFVERTPSIiCi1DT05GSUdVUkVfQVJHUys9IC0td2l0aC10ZHM9 JHtMT0NBTEJBU0V9CitDT05GSUdVUkVfQVJHUys9CS0td2l0aC10ZHM9JHtMT0NBTEJBU0V9CiBM SUJfREVQRU5EUys9CXRkcy41OiR7UE9SVFNESVJ9L2RhdGFiYXNlcy9mcmVldGRzCiAuZW5kaWYK IAogLmlmICFkZWZpbmVkKFdJVEhfUE9TVEdSRVMpCiBQTElTVF9TVUIrPQlXSVRIX1BPU1RHUkVT PSJAY29tbWVudCAiCi1DT05GSUdVUkVfQVJHUys9IC0td2l0aG91dC1wb3N0Z3JlcworQ09ORklH VVJFX0FSR1MrPQktLXdpdGhvdXQtcG9zdGdyZXMKIC5lbHNlCiBQTElTVF9TVUIrPQlXSVRIX1BP U1RHUkVTPSIiCiBVU0VfUEdTUUw9CXllcwotQ09ORklHVVJFX0FSR1MrPSAtLXdpdGgtcG9zdGdy ZXMKK0NPTkZJR1VSRV9BUkdTKz0JLS13aXRoLXBvc3RncmVzCiAuZW5kaWYKIAogLmlmICFkZWZp bmVkKFdJVEhfT0dHVk9SQklTKQogUExJU1RfU1VCKz0JV0lUSF9PR0dWT1JCSVM9IkBjb21tZW50 ICIKLUNPTkZJR1VSRV9BUkdTKz0gLS13aXRob3V0LW9nZworQ09ORklHVVJFX0FSR1MrPQktLXdp dGhvdXQtb2dnCiAuZWxzZQogUExJU1RfU1VCKz0JV0lUSF9PR0dWT1JCSVM9IiIKLUNPTkZJR1VS RV9BUkdTKz0gLS13aXRoLW9nZworQ09ORklHVVJFX0FSR1MrPQktLXdpdGgtb2dnCiBMSUJfREVQ RU5EUys9CXZvcmJpcy40OiR7UE9SVFNESVJ9L2F1ZGlvL2xpYnZvcmJpcwogLmVuZGlmCiAKIC5p ZiAhZGVmaW5lZChXSVRIX1JBRElVUykKIFBMSVNUX1NVQis9CVdJVEhfUkFESVVTPSJAY29tbWVu dCAiCi1DT05GSUdVUkVfQVJHUys9IC0td2l0aG91dC1yYWRpdXMKK0NPTkZJR1VSRV9BUkdTKz0J LS13aXRob3V0LXJhZGl1cwogLmVsc2UKIFBMSVNUX1NVQis9CVdJVEhfUkFESVVTPSIiCi1DT05G SUdVUkVfQVJHUys9IC0td2l0aC1yYWRpdXMKK0NPTkZJR1VSRV9BUkdTKz0JLS13aXRoLXJhZGl1 cwogTElCX0RFUEVORFMrPQlyYWRpdXNjbGllbnQtbmcuMjoke1BPUlRTRElSfS9uZXQvcmFkaXVz Y2xpZW50CiAuZW5kaWYKIAogLmlmICFkZWZpbmVkKFdJVEhfU05NUCkKIFBMSVNUX1NVQis9CVdJ VEhfU05NUD0iQGNvbW1lbnQgIgotQ09ORklHVVJFX0FSR1MrPSAtLXdpdGhvdXQtbmV0c25tcAor Q09ORklHVVJFX0FSR1MrPQktLXdpdGhvdXQtbmV0c25tcAogLmVsc2UKIFBMSVNUX1NVQis9CVdJ VEhfU05NUD0iIgotQ09ORklHVVJFX0FSR1MrPSAtLXdpdGgtbmV0c25tcAotTElCX0RFUEVORFMr PQluZXRzbm1wLjIwOiR7UE9SVFNESVJ9L25ldC1tZ210L25ldC1zbm1wCitDT05GSUdVUkVfQVJH Uys9CS0td2l0aC1uZXRzbm1wCitMSUJfREVQRU5EUys9CW5ldHNubXA6JHtQT1JUU0RJUn0vbmV0 LW1nbXQvbmV0LXNubXAKIC5lbmRpZgogCiAuaWYgIWRlZmluZWQoV0lUSF9KQUJCRVIpCiBQTElT VF9TVUIrPQlXSVRIX0pBQkJFUj0iQGNvbW1lbnQgIgotQ09ORklHVVJFX0FSR1MrPSAtLXdpdGhv dXQtaWtzZW1lbAorQ09ORklHVVJFX0FSR1MrPQktLXdpdGhvdXQtaWtzZW1lbAogLmVsc2UKIFBM SVNUX1NVQis9CVdJVEhfSkFCQkVSPSIiCi1DT05GSUdVUkVfQVJHUys9IC0td2l0aC1pa3NlbWVs CitDT05GSUdVUkVfQVJHUys9CS0td2l0aC1pa3NlbWVsCiBMSUJfREVQRU5EUys9CWlrc2VtZWwu NDoke1BPUlRTRElSfS90ZXh0cHJvYy9pa3NlbWVsCiAuZW5kaWYKIAogLmlmICFkZWZpbmVkKFdJ VEhfU1FMSVRFKQogUExJU1RfU1VCKz0JV0lUSF9TUUxJVEU9IkBjb21tZW50ICIKIENPTkZJR1VS RV9BUkdTKz0JLS13aXRob3V0LXNxbGl0ZSBcCi0JCS0td2l0aC1zcWxpdGUzPW5vCisJCQktLXdp dGgtc3FsaXRlMz1ubwogLmVsc2UKIFBMSVNUX1NVQis9CVdJVEhfU1FMSVRFPSIiCi1DT05GSUdV UkVfQVJHUys9IC0td2l0aC1zcWxpdGUKK0NPTkZJR1VSRV9BUkdTKz0JLS13aXRoLXNxbGl0ZQog TElCX0RFUEVORFMrPQlzcWxpdGU6JHtQT1JUU0RJUn0vZGF0YWJhc2VzL3NxbGl0ZTIgXAogCQlz cWxpdGUzOiR7UE9SVFNESVJ9L2RhdGFiYXNlcy9zcWxpdGUzCiAuZW5kaWYKQEAgLTE3Nyw0MSAr MTc0LDMxIEBACiAKIC5pZiAhZGVmaW5lZChXSVRIX0dTTSkKIFBMSVNUX1NVQis9CVdJVEhfR1NN PSJAY29tbWVudCAiCi1DT05GSUdVUkVfQVJHUys9IC0td2l0aG91dC1nc20KK0NPTkZJR1VSRV9B UkdTKz0JLS13aXRob3V0LWdzbQogLmVsc2UKIFBMSVNUX1NVQis9CVdJVEhfR1NNPSIiCi1DT05G SUdVUkVfQVJHUys9IC0td2l0aC1nc20KK0NPTkZJR1VSRV9BUkdTKz0JLS13aXRoLWdzbQogTElC X0RFUEVORFMrPQlnc20uMToke1BPUlRTRElSfS9hdWRpby9nc20KIC5lbmRpZgogCiAuaWYgIWRl ZmluZWQoV0lUSF9DVVJMKQogUExJU1RfU1VCKz0JV0lUSF9DVVJMPSJAY29tbWVudCAiCi1DT05G SUdVUkVfQVJHUys9IC0td2l0aC1jdXJsPW5vIFwKLQkJLS13aXRoLWxpYmN1cmw9bm8KK0NPTkZJ R1VSRV9BUkdTKz0JLS13aXRoLWxpYmN1cmw9bm8KIC5lbHNlCiBQTElTVF9TVUIrPQlXSVRIX0NV Ukw9IiIKLUNPTkZJR1VSRV9BUkdTKz0gLS13aXRoLWN1cmwgXAotCQktLXdpdGgtbGliY3VybAor Q09ORklHVVJFX0FSR1MrPQktLXdpdGgtbGliY3VybAogTElCX0RFUEVORFMrPQljdXJsLjY6JHtQ T1JUU0RJUn0vZnRwL2N1cmwKIC5lbmRpZgogCiAuaWYgIWRlZmluZWQoV0lUSF9TUEFORFNQKQog UExJU1RfU1VCKz0JV0lUSF9TUEFORFNQPSJAY29tbWVudCAiCi1DT05GSUdVUkVfQVJHUys9IC0t d2l0aG91dC1zcGFuZHNwCitDT05GSUdVUkVfQVJHUys9CS0td2l0aG91dC1zcGFuZHNwCiAuZWxz ZQogUExJU1RfU1VCKz0JV0lUSF9TUEFORFNQPSIiCi1DT05GSUdVUkVfQVJHUys9IC0td2l0aC1z cGFuZHNwCitDT05GSUdVUkVfQVJHUys9CS0td2l0aC1zcGFuZHNwCiBMSUJfREVQRU5EUys9CXNw YW5kc3AuMjoke1BPUlRTRElSfS9jb21tcy9zcGFuZHNwLWRldmVsCiAuZW5kaWYKIAotLmlmIGRl ZmluZWQoV0lUSF9DT0RFQ19QQVRDSCkKLVBBVENIRklMRVM9CWFzdGVyaXNrLTEuNC4yMi1jb2Rl Yy1uZWdvdGlhdGlvbi0yMDA4MTExMC5kaWZmLmd6Ci1QQVRDSF9TSVRFUz0JaHR0cDovL2IyYnVh Lm9yZy9jaHJvbWUvc2l0ZS8KLUVYVFJBX1BBVENIRVMrPQkke1BBVENIRElSfS9jb2RlY25lZ28t cGF0Y2gtTWFrZWZpbGUKLS5lbHNlCi1FWFRSQV9QQVRDSEVTKz0JJHtQQVRDSERJUn0vbm9jb2Rl Y25lZ28tcGF0Y2gtTWFrZWZpbGUKLS5lbmRpZgotCiAuaWYgZGVmaW5lZChXSVRIX01JU0NfUEFU Q0hFUykKIEVYVFJBX1BBVENIRVMrPQkke1BBVENIRElSfS9kdG1mX2RlYnVnLmRpZmYKIEVYVFJB X1BBVENIRVMrPQkke1BBVENIRElSfS9mZWF0dXJlX2Rpc2Nvbm5lY3QuZGlmZgpJbmRleDogZGlz dGluZm8KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2hvbWUvbmN2cy9wb3J0cy9uZXQvYXN0ZXJpc2sx Ni9kaXN0aW5mbyx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS40OQpkaWZmIC11IC1yMS40OSBkaXN0 aW5mbwotLS0gZGlzdGluZm8JMjkgSmFuIDIwMTAgMTA6MzI6MTcgLTAwMDAJMS40OQorKysgZGlz dGluZm8JMjUgU2VwIDIwMTAgMDI6MTA6MzggLTAwMDAKQEAgLTEsMyArMSwzIEBACi1NRDUgKGFz dGVyaXNrLTEuNi4wLjIxLnRhci5neikgPSBhMTcyZmIwMzBhZGFiNTBiZGZmNmFlM2I1ZTc2NTI4 MwotU0hBMjU2IChhc3Rlcmlzay0xLjYuMC4yMS50YXIuZ3opID0gMGQ0MWE5MDMzOTM0NjQwOTky ZGEyOWVlMDNhZTk2YTIwOGViM2ZmOGE0NjQ0MGUzODg5MjBkNDcxZWNiYmFmZgotU0laRSAoYXN0 ZXJpc2stMS42LjAuMjEudGFyLmd6KSA9IDIzMTQ1NTg0CitNRDUgKGFzdGVyaXNrLTEuNi4yLjEz LnRhci5neikgPSAxZTE4NGE0ZDkzMDFlMmU0YjlkZTNiYzk4YjUwN2Q0ZgorU0hBMjU2IChhc3Rl cmlzay0xLjYuMi4xMy50YXIuZ3opID0gMjhiYjE4ZTk4OGQyMjU1N2VlNzcyMjBjYjMzMjA5MjEy YWYxZTYxODM0OGMzZDQyNjY2Zjc4NWRhNTE3YzAxZQorU0laRSAoYXN0ZXJpc2stMS42LjIuMTMu dGFyLmd6KSA9IDIzNjc5MzA0CkluZGV4OiBwa2ctcGxpc3QKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTog L2hvbWUvbmN2cy9wb3J0cy9uZXQvYXN0ZXJpc2sxNi9wa2ctcGxpc3QsdgpyZXRyaWV2aW5nIHJl dmlzaW9uIDEuNDUKZGlmZiAtdSAtcjEuNDUgcGtnLXBsaXN0Ci0tLSBwa2ctcGxpc3QJNSBNYXIg MjAxMCAwODozMTozNSAtMDAwMAkxLjQ1CisrKyBwa2ctcGxpc3QJMjUgU2VwIDIwMTAgMDI6NTc6 MDcgLTAwMDAKQEAgLTEsMTEgKzEsMjEgQEAKK0B1bmV4ZWMgaWYgY21wIC1zICVEL2V0Yy9hc3Rl cmlzay9haXMuY29uZiAlRC9ldGMvYXN0ZXJpc2svYWlzLmNvbmYtZGlzdDsgdGhlbiBybSAtZiAl RC9ldGMvYXN0ZXJpc2svYWlzLmNvbmY7IGZpCitldGMvYXN0ZXJpc2svYWlzLmNvbmYtZGlzdAog QHVuZXhlYyBpZiBjbXAgLXMgJUQvZXRjL2FzdGVyaXNrL2Nkcl9hZGFwdGl2ZV9vZGJjLmNvbmYg JUQvZXRjL2FzdGVyaXNrL2Nkcl9hZGFwdGl2ZV9vZGJjLmNvbmYtZGlzdDsgdGhlbiBybSAtZiAl RC9ldGMvYXN0ZXJpc2svY2RyX2FkYXB0aXZlX29kYmMuY29uZjsgZmkKIGV0Yy9hc3Rlcmlzay9j ZHJfYWRhcHRpdmVfb2RiYy5jb25mLWRpc3QKIEB1bmV4ZWMgaWYgY21wIC1zICVEL2V0Yy9hc3Rl cmlzay9jZHJfc3FsaXRlM19jdXN0b20uY29uZiAlRC9ldGMvYXN0ZXJpc2svY2RyX3NxbGl0ZTNf Y3VzdG9tLmNvbmYtZGlzdDsgdGhlbiBybSAtZiAlRC9ldGMvYXN0ZXJpc2svY2RyX3NxbGl0ZTNf Y3VzdG9tLmNvbmY7IGZpCiBldGMvYXN0ZXJpc2svY2RyX3NxbGl0ZTNfY3VzdG9tLmNvbmYtZGlz dAogQHVuZXhlYyBpZiBjbXAgLXMgJUQvZXRjL2FzdGVyaXNrL2NsaS5jb25mICVEL2V0Yy9hc3Rl cmlzay9jbGkuY29uZi1kaXN0OyB0aGVuIHJtIC1mICVEL2V0Yy9hc3Rlcmlzay9jbGkuY29uZjsg ZmkKIGV0Yy9hc3Rlcmlzay9jbGkuY29uZi1kaXN0CitAdW5leGVjIGlmIGNtcCAtcyAlRC9ldGMv YXN0ZXJpc2svY2xpX2FsaWFzZXMuY29uZiAlRC9ldGMvYXN0ZXJpc2svY2xpX2FsaWFzZXMuY29u Zi1kaXN0OyB0aGVuIHJtIC1mICVEL2V0Yy9hc3Rlcmlzay9jbGlfYWxpYXNlcy5jb25mOyBmaQor ZXRjL2FzdGVyaXNrL2NsaV9hbGlhc2VzLmNvbmYtZGlzdAorQHVuZXhlYyBpZiBjbXAgLXMgJUQv ZXRjL2FzdGVyaXNrL2NsaV9wZXJtaXNzaW9ucy5jb25mICVEL2V0Yy9hc3Rlcmlzay9jbGlfcGVy bWlzc2lvbnMuY29uZi1kaXN0OyB0aGVuIHJtIC1mICVEL2V0Yy9hc3Rlcmlzay9jbGlfcGVybWlz c2lvbnMuY29uZjsgZmkKK2V0Yy9hc3Rlcmlzay9jbGlfcGVybWlzc2lvbnMuY29uZi1kaXN0CiBA dW5leGVjIGlmIGNtcCAtcyAlRC9ldGMvYXN0ZXJpc2svY29uc29sZS5jb25mICVEL2V0Yy9hc3Rl cmlzay9jb25zb2xlLmNvbmYtZGlzdDsgdGhlbiBybSAtZiAlRC9ldGMvYXN0ZXJpc2svY29uc29s ZS5jb25mOyBmaQogZXRjL2FzdGVyaXNrL2NvbnNvbGUuY29uZi1kaXN0CitAdW5leGVjIGlmIGNt cCAtcyAlRC9ldGMvYXN0ZXJpc2svZGJzZXAuY29uZiAlRC9ldGMvYXN0ZXJpc2svZGJzZXAuY29u Zi1kaXN0OyB0aGVuIHJtIC1mICVEL2V0Yy9hc3Rlcmlzay9kYnNlcC5jb25mOyBmaQorZXRjL2Fz dGVyaXNrL2Ric2VwLmNvbmYtZGlzdAorQHVuZXhlYyBpZiBjbXAgLXMgJUQvZXRjL2FzdGVyaXNr L2RzcC5jb25mICVEL2V0Yy9hc3Rlcmlzay9kc3AuY29uZi1kaXN0OyB0aGVuIHJtIC1mICVEL2V0 Yy9hc3Rlcmlzay9kc3AuY29uZjsgZmkKK2V0Yy9hc3Rlcmlzay9kc3AuY29uZi1kaXN0CiBAdW5l eGVjIGlmIGNtcCAtcyAlRC9ldGMvYXN0ZXJpc2svZXh0ZW5zaW9ucy5sdWEgJUQvZXRjL2FzdGVy aXNrL2V4dGVuc2lvbnMubHVhLWRpc3Q7IHRoZW4gcm0gLWYgJUQvZXRjL2FzdGVyaXNrL2V4dGVu c2lvbnMubHVhOyBmaQogZXRjL2FzdGVyaXNrL2V4dGVuc2lvbnMubHVhLWRpc3QKIEB1bmV4ZWMg aWYgY21wIC1zICVEL2V0Yy9hc3Rlcmlzay9leHRlbnNpb25zX21pbml2bS5jb25mICVEL2V0Yy9h c3Rlcmlzay9leHRlbnNpb25zX21pbml2bS5jb25mLWRpc3Q7IHRoZW4gcm0gLWYgJUQvZXRjL2Fz dGVyaXNrL2V4dGVuc2lvbnNfbWluaXZtLmNvbmY7IGZpCkBAIC0xNDYsNiArMTU2LDggQEAKIGV0 Yy9hc3Rlcmlzay9mb2xsb3dtZS5jb25mLWRpc3QKIEB1bmV4ZWMgaWYgY21wIC1zICVEL2V0Yy9h c3Rlcmlzay9hbWQuY29uZiAlRC9ldGMvYXN0ZXJpc2svYW1kLmNvbmYtZGlzdDsgdGhlbiBybSAt ZiAlRC9ldGMvYXN0ZXJpc2svYW1kLmNvbmY7IGZpCiBldGMvYXN0ZXJpc2svYW1kLmNvbmYtZGlz dAorQHVuZXhlYyBpZiBjbXAgLXMgJUQvZXRjL2FzdGVyaXNrL3Jlc19jb25maWdfc3FsaXRlLmNv bmYgJUQvZXRjL2FzdGVyaXNrL3Jlc19jb25maWdfc3FsaXRlLmNvbmYtZGlzdDsgdGhlbiBybSAt ZiAlRC9ldGMvYXN0ZXJpc2svcmVzX2NvbmZpZ19zcWxpdGUuY29uZjsgZmkKK2V0Yy9hc3Rlcmlz ay9yZXNfY29uZmlnX3NxbGl0ZS5jb25mLWRpc3QKIEBleGVjIGlmIHRlc3QgISAtZSAlRC9ldGMv YXN0ZXJpc2svY2RyX2FkYXB0aXZlX29kYmMuY29uZjsgdGhlbiBjcCAtcCAlRC9ldGMvYXN0ZXJp c2svY2RyX2FkYXB0aXZlX29kYmMuY29uZi1kaXN0ICVEL2V0Yy9hc3Rlcmlzay9jZHJfYWRhcHRp dmVfb2RiYy5jb25mOyBmaQogQGV4ZWMgaWYgdGVzdCAhIC1lICVEL2V0Yy9hc3Rlcmlzay9jZHJf c3FsaXRlM19jdXN0b20uY29uZjsgdGhlbiBjcCAtcCAlRC9ldGMvYXN0ZXJpc2svY2RyX3NxbGl0 ZTNfY3VzdG9tLmNvbmYtZGlzdCAlRC9ldGMvYXN0ZXJpc2svY2RyX3NxbGl0ZTNfY3VzdG9tLmNv bmY7IGZpCiBAZXhlYyBpZiB0ZXN0ICEgLWUgJUQvZXRjL2FzdGVyaXNrL2NsaS5jb25mOyB0aGVu IGNwIC1wICVEL2V0Yy9hc3Rlcmlzay9jbGkuY29uZi1kaXN0ICVEL2V0Yy9hc3Rlcmlzay9jbGku Y29uZjsgZmkKQEAgLTI1MCw3ICsyNjIsMTEgQEAKIGluY2x1ZGUvYXN0ZXJpc2svYXN0b3NwLmgK IGluY2x1ZGUvYXN0ZXJpc2svYXVkaW9ob29rLmgKIGluY2x1ZGUvYXN0ZXJpc2svYXV0b2NvbmZp Zy5oCitpbmNsdWRlL2FzdGVyaXNrL2JyaWRnaW5nLmgKK2luY2x1ZGUvYXN0ZXJpc2svYnJpZGdp bmdfZmVhdHVyZXMuaAoraW5jbHVkZS9hc3Rlcmlzay9icmlkZ2luZ190ZWNobm9sb2d5LmgKIGlu Y2x1ZGUvYXN0ZXJpc2svYnVpbGQuaAoraW5jbHVkZS9hc3Rlcmlzay9idWlsZGluZm8uaAogaW5j bHVkZS9hc3Rlcmlzay9idWlsZG9wdHMuaAogaW5jbHVkZS9hc3Rlcmlzay9jYWxsZXJpZC5oCiBp bmNsdWRlL2FzdGVyaXNrL2NhdXNlcy5oCkBAIC0yNjIsOCArMjc4LDEwIEBACiBpbmNsdWRlL2Fz dGVyaXNrL2NvbXBpbGVyLmgKIGluY2x1ZGUvYXN0ZXJpc2svY29uZmlnLmgKIGluY2x1ZGUvYXN0 ZXJpc2svY3J5cHRvLmgKK2luY2x1ZGUvYXN0ZXJpc2svZGF0YXN0b3JlLmgKIGluY2x1ZGUvYXN0 ZXJpc2svZGV2aWNlc3RhdGUuaAogaW5jbHVkZS9hc3Rlcmlzay9kaWFsLmgKK2luY2x1ZGUvYXN0 ZXJpc2svZGxpbmtlZGxpc3RzLmgKIGluY2x1ZGUvYXN0ZXJpc2svZG5zLmgKIGluY2x1ZGUvYXN0 ZXJpc2svZG5zbWdyLmgKIGluY2x1ZGUvYXN0ZXJpc2svZG94eXJlZi5oCkBAIC0yNzYsNiArMjk0 LDcgQEAKIGluY2x1ZGUvYXN0ZXJpc2svZnJhbWUuaAogaW5jbHVkZS9hc3Rlcmlzay9mc2ttb2Rl bS5oCiBpbmNsdWRlL2FzdGVyaXNrL2dsb2JhbF9kYXRhc3RvcmVzLmgKK2luY2x1ZGUvYXN0ZXJp c2svaGVhcC5oCiBpbmNsdWRlL2FzdGVyaXNrL2h0dHAuaAogaW5jbHVkZS9hc3Rlcmlzay9pbWFn ZS5oCiBpbmNsdWRlL2FzdGVyaXNrL2luZGljYXRpb25zLmgKQEAgLTMwNCwxNiArMzIzLDIwIEBA CiBpbmNsdWRlL2FzdGVyaXNrL3NheS5oCiBpbmNsdWRlL2FzdGVyaXNrL3NjaGVkLmgKIGluY2x1 ZGUvYXN0ZXJpc2svc2hhMS5oCitpbmNsdWRlL2FzdGVyaXNrL3NsaW4uaAogaW5jbHVkZS9hc3Rl cmlzay9zbGluZmFjdG9yeS5oCiBpbmNsdWRlL2FzdGVyaXNrL3NtZGkuaAogaW5jbHVkZS9hc3Rl cmlzay9zcGVlY2guaAogaW5jbHVkZS9hc3Rlcmlzay9zcnYuaAogaW5jbHVkZS9hc3Rlcmlzay9z dHJpbmdmaWVsZHMuaAogaW5jbHVkZS9hc3Rlcmlzay9zdHJpbmdzLmgKK2luY2x1ZGUvYXN0ZXJp c2svdGFza3Byb2Nlc3Nvci5oCiBpbmNsdWRlL2FzdGVyaXNrL3RkZC5oCiBpbmNsdWRlL2FzdGVy aXNrL3Rlcm0uaAoraW5jbHVkZS9hc3Rlcmlzay90ZXN0LmgKIGluY2x1ZGUvYXN0ZXJpc2svdGhy ZWFkc3RvcmFnZS5oCiBpbmNsdWRlL2FzdGVyaXNrL3RpbWUuaAoraW5jbHVkZS9hc3Rlcmlzay90 aW1pbmcuaAogaW5jbHVkZS9hc3Rlcmlzay90cmFuc2NhcC5oCiBpbmNsdWRlL2FzdGVyaXNrL3Ry YW5zbGF0ZS5oCiBpbmNsdWRlL2FzdGVyaXNrL3VkcHRsLmgKQEAgLTMyMSwxNyArMzQ0LDMwIEBA CiBpbmNsdWRlL2FzdGVyaXNrL3VuYWxpZ25lZC5oCiBpbmNsdWRlL2FzdGVyaXNrL3V0aWxzLmgK IGluY2x1ZGUvYXN0ZXJpc2svdmVyc2lvbi5oCitpbmNsdWRlL2FzdGVyaXNrL3htbC5oCitpbmNs dWRlL2FzdGVyaXNrL3htbGRvYy5oCitsaWIvYXN0ZXJpc2svbW9kdWxlcy9hcHBfY29uZmJyaWRn ZS5zbwogbGliL2FzdGVyaXNrL21vZHVsZXMvYXBwX21pbml2bS5zbwotbGliL2FzdGVyaXNrL21v ZHVsZXMvYXBwX3BpY2t1cGNoYW4uc28KK2xpYi9hc3Rlcmlzay9tb2R1bGVzL2FwcF9vcmlnaW5h dGUuc28KK2xpYi9hc3Rlcmlzay9tb2R1bGVzL2FwcF9wbGF5dG9uZXMuc28KIGxpYi9hc3Rlcmlz ay9tb2R1bGVzL2FwcF9yZWFkZXh0ZW4uc28KIGxpYi9hc3Rlcmlzay9tb2R1bGVzL2FwcF93YWl0 dW50aWwuc28KK2xpYi9hc3Rlcmlzay9tb2R1bGVzL2JyaWRnZV9idWlsdGluX2ZlYXR1cmVzLnNv CitsaWIvYXN0ZXJpc2svbW9kdWxlcy9icmlkZ2VfbXVsdGlwbGV4ZWQuc28KK2xpYi9hc3Rlcmlz ay9tb2R1bGVzL2JyaWRnZV9zaW1wbGUuc28KK2xpYi9hc3Rlcmlzay9tb2R1bGVzL2JyaWRnZV9z b2Z0bWl4LnNvCiAlJVdJVEhfT0RCQyUlbGliL2FzdGVyaXNrL21vZHVsZXMvY2RyX2FkYXB0aXZl X29kYmMuc28KICUlV0lUSF9KQUJCRVIlJWxpYi9hc3Rlcmlzay9tb2R1bGVzL2NoYW5famluZ2xl LnNvCitsaWIvYXN0ZXJpc2svbW9kdWxlcy9jaGFuX2JyaWRnZS5zbwogbGliL2FzdGVyaXNrL21v ZHVsZXMvY2hhbl91bmlzdGltLnNvCiBsaWIvYXN0ZXJpc2svbW9kdWxlcy9jb2RlY19nNzIyLnNv CiBsaWIvYXN0ZXJpc2svbW9kdWxlcy9mb3JtYXRfc2xuMTYuc28KK2xpYi9hc3Rlcmlzay9tb2R1 bGVzL2Zvcm1hdF9zaXJlbjE0LnNvCitsaWIvYXN0ZXJpc2svbW9kdWxlcy9mb3JtYXRfc2lyZW43 LnNvCitsaWIvYXN0ZXJpc2svbW9kdWxlcy9mdW5jX2Flcy5zbwogbGliL2FzdGVyaXNrL21vZHVs ZXMvZnVuY19hdWRpb2hvb2tpbmhlcml0LnNvCiBsaWIvYXN0ZXJpc2svbW9kdWxlcy9mdW5jX2Js YWNrbGlzdC5zbworbGliL2FzdGVyaXNrL21vZHVsZXMvZnVuY19jb25maWcuc28KIGxpYi9hc3Rl cmlzay9tb2R1bGVzL2Z1bmNfZGV2c3RhdGUuc28KIGxpYi9hc3Rlcmlzay9tb2R1bGVzL2Z1bmNf ZGlhbGdyb3VwLnNvCiBsaWIvYXN0ZXJpc2svbW9kdWxlcy9mdW5jX2RpYWxwbGFuLnNvCkBAIC0z NDAsMTcgKzM3NiwyMyBAQAogbGliL2FzdGVyaXNrL21vZHVsZXMvZnVuY19sb2NrLnNvCiBsaWIv YXN0ZXJpc2svbW9kdWxlcy9mdW5jX21vZHVsZS5zbwogbGliL2FzdGVyaXNrL21vZHVsZXMvZnVu Y19zaGVsbC5zbworbGliL2FzdGVyaXNrL21vZHVsZXMvZnVuY19zcGVleC5zbworbGliL2FzdGVy aXNrL21vZHVsZXMvZnVuY19zcHJpbnRmLnNvCiBsaWIvYXN0ZXJpc2svbW9kdWxlcy9mdW5jX3N5 c2luZm8uc28KIGxpYi9hc3Rlcmlzay9tb2R1bGVzL2Z1bmNfdmVyc2lvbi5zbwogbGliL2FzdGVy aXNrL21vZHVsZXMvZnVuY192bWNvdW50LnNvCiBsaWIvYXN0ZXJpc2svbW9kdWxlcy9mdW5jX3Zv bHVtZS5zbwogbGliL2FzdGVyaXNrL21vZHVsZXMvcmVzX2FlbF9zaGFyZS5zbworbGliL2FzdGVy aXNrL21vZHVsZXMvcmVzX2NsaWFsaWFzZXMuc28KKyUlV0lUSF9DVVJMJSVsaWIvYXN0ZXJpc2sv bW9kdWxlcy9yZXNfY3VybC5zbwogJSVXSVRIX0NVUkwlJWxpYi9hc3Rlcmlzay9tb2R1bGVzL3Jl c19jb25maWdfY3VybC5zbwogbGliL2FzdGVyaXNrL21vZHVsZXMvcmVzX2NvbmZpZ19sZGFwLnNv CiAlJVdJVEhfU1FMSVRFJSVsaWIvYXN0ZXJpc2svbW9kdWxlcy9yZXNfY29uZmlnX3NxbGl0ZS5z bwogbGliL2FzdGVyaXNrL21vZHVsZXMvcmVzX2xpbWl0LnNvCiBsaWIvYXN0ZXJpc2svbW9kdWxl cy9yZXNfcGhvbmVwcm92LnNvCiBsaWIvYXN0ZXJpc2svbW9kdWxlcy9yZXNfcmVhbHRpbWUuc28K KyUlV0lUSF9EQUhESSUlbGliL2FzdGVyaXNrL21vZHVsZXMvcmVzX3RpbWluZ19kYWhkaS5zbwor bGliL2FzdGVyaXNrL21vZHVsZXMvcmVzX3RpbWluZ19wdGhyZWFkLnNvCiBsaWIvYXN0ZXJpc2sv bW9kdWxlcy9hcHBfYWRzaXByb2cuc28KIGxpYi9hc3Rlcmlzay9tb2R1bGVzL2FwcF9hbGFybXJl Y2VpdmVyLnNvCiBsaWIvYXN0ZXJpc2svbW9kdWxlcy9hcHBfYW1kLnNvCkBAIC00ODEsNyArNTIz LDYgQEAKICUlV0lUSF9QT1NUR1JFUyUlbGliL2FzdGVyaXNrL21vZHVsZXMvcmVzX2NvbmZpZ19w Z3NxbC5zbwogbGliL2FzdGVyaXNrL21vZHVsZXMvcmVzX2NvbnZlcnQuc28KIGxpYi9hc3Rlcmlz ay9tb2R1bGVzL3Jlc19jcnlwdG8uc28KLWxpYi9hc3Rlcmlzay9tb2R1bGVzL3Jlc19pbmRpY2F0 aW9ucy5zbwogJSVXSVRIX0pBQkJFUiUlbGliL2FzdGVyaXNrL21vZHVsZXMvcmVzX2phYmJlci5z bwogbGliL2FzdGVyaXNrL21vZHVsZXMvcmVzX21vbml0b3Iuc28KIGxpYi9hc3Rlcmlzay9tb2R1 bGVzL3Jlc19tdXNpY29uaG9sZC5zbwpAQCAtNDk4LDYgKzUzOSw3IEBACiBzYmluL2FzdG1hbgog c2Jpbi9hdXRvc3VwcG9ydAogc2Jpbi9tdXRlZAorc2Jpbi9yZWZjb3VudGVyCiBzYmluL3Jhc3Rl cmlzawogc2Jpbi9zYWZlX2FzdGVyaXNrCiBzYmluL3Ntc3EKQEAgLTUwNyw5ICs1NDksMTEgQEAK IHNoYXJlL2FzdGVyaXNrL2FnaS1iaW4vZWFnaS1zcGhpbngtdGVzdAogc2hhcmUvYXN0ZXJpc2sv YWdpLWJpbi9lYWdpLXRlc3QKIHNoYXJlL2FzdGVyaXNrL2FnaS1iaW4vanVrZWJveC5hZ2kKK3No YXJlL2FzdGVyaXNrL2RvY3VtZW50YXRpb24vYXBwZG9jc3htbC5kdGQKK3NoYXJlL2FzdGVyaXNr L2RvY3VtZW50YXRpb24vY29yZS1lbl9VUy54bWwKIHNoYXJlL2FzdGVyaXNrL2tleXMvZnJlZXdv cmxkZGlhbHVwLnB1Ygogc2hhcmUvYXN0ZXJpc2sva2V5cy9pYXh0ZWwucHViCi1zaGFyZS9hc3Rl cmlzay9tb2gvLmFzdGVyaXNrLW1vaC1vcHNvdW5kLXdhdgorc2hhcmUvYXN0ZXJpc2svbW9oLy5h c3Rlcmlzay1tb2gtb3Bzb3VuZC13YXYtMi4wMwogc2hhcmUvYXN0ZXJpc2svbW9oL0NIQU5HRVMt YXN0ZXJpc2stbW9oLW9wc291bmQtd2F2CiBzaGFyZS9hc3Rlcmlzay9tb2gvQ1JFRElUUy1hc3Rl cmlzay1tb2gtb3Bzb3VuZC13YXYKIHNoYXJlL2FzdGVyaXNrL21vaC9MSUNFTlNFLWFzdGVyaXNr LW1vaC1vcHNvdW5kLXdhdgpAQCAtNTIyLDEyICs1NjYsMTkgQEAKIHNoYXJlL2FzdGVyaXNrL3Bo b25lcHJvdi8wMDAwMDAwMDAwMDAtcGhvbmUuY2ZnCiBzaGFyZS9hc3Rlcmlzay9waG9uZXByb3Yv MDAwMDAwMDAwMDAwLmNmZwogc2hhcmUvYXN0ZXJpc2svcGhvbmVwcm92L3BvbHljb20ueG1sCi1z aGFyZS9hc3Rlcmlzay9zb3VuZHMvLmFzdGVyaXNrLWNvcmUtc291bmRzLWVuLWdzbS0xLjQuMTcK LXNoYXJlL2FzdGVyaXNrL3NvdW5kcy9lbi9MSUNFTlNFLWFzdGVyaXNrLWNvcmUtZW4tMS40LjE3 CitzaGFyZS9hc3Rlcmlzay9waG9uZXByb3YvcG9seWNvbV9saW5lLnhtbAorc2hhcmUvYXN0ZXJp c2svc291bmRzLy5hc3Rlcmlzay1jb3JlLXNvdW5kcy1lbi1nc20tMS40LjE5CitzaGFyZS9hc3Rl cmlzay9zb3VuZHMvZW4vTElDRU5TRS1hc3Rlcmlzay1jb3JlLWVuLTEuNC4xOQorc2hhcmUvYXN0 ZXJpc2svc291bmRzL2VuL2FzY2VuZGluZy0ydG9uZS5nc20KIHNoYXJlL2FzdGVyaXNrL3NvdW5k cy9lbi9jb25mLWFkbWlubWVudS0xNjIuZ3NtCiBzaGFyZS9hc3Rlcmlzay9zb3VuZHMvZW4vY29u Zi1leHRlbmRlZC5nc20KIHNoYXJlL2FzdGVyaXNrL3NvdW5kcy9lbi9jb25mLW5vbmV4dGVuZGVk LmdzbQorc2hhcmUvYXN0ZXJpc2svc291bmRzL2VuL2NvbmYtbm93LW11dGVkLmdzbQorc2hhcmUv YXN0ZXJpc2svc291bmRzL2VuL2NvbmYtbm93LXJlY29yZGluZy5nc20KK3NoYXJlL2FzdGVyaXNr L3NvdW5kcy9lbi9jb25mLW5vdy11bm11dGVkLmdzbQorc2hhcmUvYXN0ZXJpc2svc291bmRzL2Vu L2NvbmYtcm9sbC1jYWxsY29tcGxldGUuZ3NtCiBzaGFyZS9hc3Rlcmlzay9zb3VuZHMvZW4vY29u Zi11c2VybWVudS0xNjIuZ3NtCitzaGFyZS9hc3Rlcmlzay9zb3VuZHMvZW4vZGVzY2VuZGluZy0y dG9uZS5nc20KIHNoYXJlL2FzdGVyaXNrL3NvdW5kcy9lbi9zcHktZGFoZGkuZ3NtCiBzaGFyZS9h c3Rlcmlzay9zb3VuZHMvZW4vdm0tVXJnZW50LmdzbQogc2hhcmUvYXN0ZXJpc2svc291bmRzL2Vu L3ZtLWZvcndhcmQtbXVsdGlwbGUuZ3NtCkBAIC01MzgsOCArNTg5LDggQEAKIHNoYXJlL2FzdGVy aXNrL3NvdW5kcy9lbi92bS1yZWNvcmQtcHJlcGVuZC5nc20KIHNoYXJlL2FzdGVyaXNrL3NvdW5k cy9lbi92bS1yZXZpZXctbm9udXJnZW50LmdzbQogc2hhcmUvYXN0ZXJpc2svc291bmRzL2VuL3Zt LXJldmlldy11cmdlbnQuZ3NtCi1zaGFyZS9hc3Rlcmlzay9zb3VuZHMvZW4vQ0hBTkdFUy1hc3Rl cmlzay1jb3JlLWVuLTEuNC4xNwotc2hhcmUvYXN0ZXJpc2svc291bmRzL2VuL0NSRURJVFMtYXN0 ZXJpc2stY29yZS1lbi0xLjQuMTcKK3NoYXJlL2FzdGVyaXNrL3NvdW5kcy9lbi9DSEFOR0VTLWFz dGVyaXNrLWNvcmUtZW4tMS40LjE5CitzaGFyZS9hc3Rlcmlzay9zb3VuZHMvZW4vQ1JFRElUUy1h c3Rlcmlzay1jb3JlLWVuLTEuNC4xOQogc2hhcmUvYXN0ZXJpc2svc291bmRzL2VuL2Rpci11c2lu Z2tleXBhZC5nc20KIHNoYXJlL2FzdGVyaXNrL3NvdW5kcy9lbi9kaXItd2VsY29tZS5nc20KIHNo YXJlL2FzdGVyaXNrL3NvdW5kcy9lbi9hZ2VudC1hbHJlYWR5b24uZ3NtCkBAIC02MzMsNiArNjg0 LDcgQEAKIHNoYXJlL2FzdGVyaXNrL3NvdW5kcy9lbi9kaWdpdHMvOTAuZ3NtCiBzaGFyZS9hc3Rl cmlzay9zb3VuZHMvZW4vZGlnaXRzL2EtbS5nc20KIHNoYXJlL2FzdGVyaXNrL3NvdW5kcy9lbi9k aWdpdHMvYXQuZ3NtCitzaGFyZS9hc3Rlcmlzay9zb3VuZHMvZW4vZGlnaXRzL2JpbGxpb24uZ3Nt CiBzaGFyZS9hc3Rlcmlzay9zb3VuZHMvZW4vZGlnaXRzL2RheS0wLmdzbQogc2hhcmUvYXN0ZXJp c2svc291bmRzL2VuL2RpZ2l0cy9kYXktMS5nc20KIHNoYXJlL2FzdGVyaXNrL3NvdW5kcy9lbi9k aWdpdHMvZGF5LTIuZ3NtCkBAIC02NTcsMTEgKzcwOSwyMSBAQAogc2hhcmUvYXN0ZXJpc2svc291 bmRzL2VuL2RpZ2l0cy9oLTMuZ3NtCiBzaGFyZS9hc3Rlcmlzay9zb3VuZHMvZW4vZGlnaXRzL2gt MzAuZ3NtCiBzaGFyZS9hc3Rlcmlzay9zb3VuZHMvZW4vZGlnaXRzL2gtNC5nc20KK3NoYXJlL2Fz dGVyaXNrL3NvdW5kcy9lbi9kaWdpdHMvaC00MC5nc20KIHNoYXJlL2FzdGVyaXNrL3NvdW5kcy9l bi9kaWdpdHMvaC01LmdzbQorc2hhcmUvYXN0ZXJpc2svc291bmRzL2VuL2RpZ2l0cy9oLTUwLmdz bQogc2hhcmUvYXN0ZXJpc2svc291bmRzL2VuL2RpZ2l0cy9oLTYuZ3NtCitzaGFyZS9hc3Rlcmlz ay9zb3VuZHMvZW4vZGlnaXRzL2gtNjAuZ3NtCiBzaGFyZS9hc3Rlcmlzay9zb3VuZHMvZW4vZGln aXRzL2gtNy5nc20KK3NoYXJlL2FzdGVyaXNrL3NvdW5kcy9lbi9kaWdpdHMvaC03MC5nc20KIHNo YXJlL2FzdGVyaXNrL3NvdW5kcy9lbi9kaWdpdHMvaC04LmdzbQorc2hhcmUvYXN0ZXJpc2svc291 bmRzL2VuL2RpZ2l0cy9oLTgwLmdzbQogc2hhcmUvYXN0ZXJpc2svc291bmRzL2VuL2RpZ2l0cy9o LTkuZ3NtCitzaGFyZS9hc3Rlcmlzay9zb3VuZHMvZW4vZGlnaXRzL2gtOTAuZ3NtCitzaGFyZS9h c3Rlcmlzay9zb3VuZHMvZW4vZGlnaXRzL2gtYmlsbGlvbi5nc20KK3NoYXJlL2FzdGVyaXNrL3Nv dW5kcy9lbi9kaWdpdHMvaC1odW5kcmVkLmdzbQorc2hhcmUvYXN0ZXJpc2svc291bmRzL2VuL2Rp Z2l0cy9oLW1pbGxpb24uZ3NtCitzaGFyZS9hc3Rlcmlzay9zb3VuZHMvZW4vZGlnaXRzL2gtdGhv dXNhbmQuZ3NtCiBzaGFyZS9hc3Rlcmlzay9zb3VuZHMvZW4vZGlnaXRzL2h1bmRyZWQuZ3NtCiBz aGFyZS9hc3Rlcmlzay9zb3VuZHMvZW4vZGlnaXRzL21pbGxpb24uZ3NtCiBzaGFyZS9hc3Rlcmlz ay9zb3VuZHMvZW4vZGlnaXRzL21pbnVzLmdzbQpAQCAtNzcyLDYgKzgzNCw3IEBACiBzaGFyZS9h c3Rlcmlzay9zb3VuZHMvZW4vbWludXRlcy5nc20KIHNoYXJlL2FzdGVyaXNrL3NvdW5kcy9lbi9w YngtaW52YWxpZC5nc20KIHNoYXJlL2FzdGVyaXNrL3NvdW5kcy9lbi9wYngtaW52YWxpZHBhcmsu Z3NtCitzaGFyZS9hc3Rlcmlzay9zb3VuZHMvZW4vcGJ4LXBhcmtpbmdmYWlsZWQuZ3NtCiBzaGFy ZS9hc3Rlcmlzay9zb3VuZHMvZW4vcGJ4LXRyYW5zZmVyLmdzbQogc2hhcmUvYXN0ZXJpc2svc291 bmRzL2VuL3Bob25ldGljLzlfcC5nc20KIHNoYXJlL2FzdGVyaXNrL3NvdW5kcy9lbi9waG9uZXRp Yy9hX3AuZ3NtCkBAIC04MTEsNiArODc0LDcgQEAKIHNoYXJlL2FzdGVyaXNrL3NvdW5kcy9lbi9x dWV1ZS1jYWxsc3dhaXRpbmcuZ3NtCiBzaGFyZS9hc3Rlcmlzay9zb3VuZHMvZW4vcXVldWUtaG9s ZHRpbWUuZ3NtCiBzaGFyZS9hc3Rlcmlzay9zb3VuZHMvZW4vcXVldWUtbGVzcy10aGFuLmdzbQor c2hhcmUvYXN0ZXJpc2svc291bmRzL2VuL3F1ZXVlLW1pbnV0ZS5nc20KIHNoYXJlL2FzdGVyaXNr L3NvdW5kcy9lbi9xdWV1ZS1taW51dGVzLmdzbQogc2hhcmUvYXN0ZXJpc2svc291bmRzL2VuL3F1 ZXVlLXBlcmlvZGljLWFubm91bmNlLmdzbQogc2hhcmUvYXN0ZXJpc2svc291bmRzL2VuL3F1ZXVl LXF1YW50aXR5MS5nc20KQEAgLTk5MSw2ICsxMDU1LDEwIEBACiAlJURPQ1NESVIlJS9pbWczLnBu ZwogJSVET0NTRElSJSUvaW1nNC5wbmcKICUlRE9DU0RJUiUlL2ltZzUucG5nCislJURPQ1NESVIl JS9pbWc2LnBuZworJSVET0NTRElSJSUvaW1nNy5wbmcKKyUlRE9DU0RJUiUlL2ltZzgucG5nCisl JURPQ1NESVIlJS9pbWc5LnBuZwogJSVET0NTRElSJSUvaW5kZXguaHRtbAogJSVET0NTRElSJSUv aW50ZXJuYWxzLnBsCiAlJURPQ1NESVIlJS9sYWJlbHMucGwKQEAgLTExOTUsNiArMTI2MywyNSBA QAogJSVET0NTRElSJSUvbm9kZTI3OC5odG1sCiAlJURPQ1NESVIlJS9ub2RlMjc5Lmh0bWwKICUl RE9DU0RJUiUlL25vZGUyOC5odG1sCislJURPQ1NESVIlJS9ub2RlMjgwLmh0bWwKKyUlRE9DU0RJ UiUlL25vZGUyODEuaHRtbAorJSVET0NTRElSJSUvbm9kZTI4Mi5odG1sCislJURPQ1NESVIlJS9u b2RlMjgzLmh0bWwKKyUlRE9DU0RJUiUlL25vZGUyODQuaHRtbAorJSVET0NTRElSJSUvbm9kZTI4 NS5odG1sCislJURPQ1NESVIlJS9ub2RlMjg2Lmh0bWwKKyUlRE9DU0RJUiUlL25vZGUyODcuaHRt bAorJSVET0NTRElSJSUvbm9kZTI4OC5odG1sCislJURPQ1NESVIlJS9ub2RlMjg5Lmh0bWwKKyUl RE9DU0RJUiUlL25vZGUyOTAuaHRtbAorJSVET0NTRElSJSUvbm9kZTI5MS5odG1sCislJURPQ1NE SVIlJS9ub2RlMjkyLmh0bWwKKyUlRE9DU0RJUiUlL25vZGUyOTMuaHRtbAorJSVET0NTRElSJSUv bm9kZTI5NC5odG1sCislJURPQ1NESVIlJS9ub2RlMjk1Lmh0bWwKKyUlRE9DU0RJUiUlL25vZGUy OTYuaHRtbAorJSVET0NTRElSJSUvbm9kZTI5Ny5odG1sCislJURPQ1NESVIlJS9ub2RlMjk4Lmh0 bWwKICUlRE9DU0RJUiUlL25vZGUyOS5odG1sCiAlJURPQ1NESVIlJS9ub2RlMy5odG1sCiAlJURP Q1NESVIlJS9ub2RlMzAuaHRtbApAQCAtMTI5MSwxMiArMTM3OCwxNiBAQAogQGRpcnJtIHNoYXJl L2FzdGVyaXNrL2tleXMKIEBkaXJybSBzaGFyZS9hc3Rlcmlzay9maXJtd2FyZS9pYXgKIEBkaXJy bSBzaGFyZS9hc3Rlcmlzay9maXJtd2FyZQorQGRpcnJtIHNoYXJlL2FzdGVyaXNrL2RvY3VtZW50 YXRpb24vdGhpcmRwYXJ0eQorQGRpcnJtIHNoYXJlL2FzdGVyaXNrL2RvY3VtZW50YXRpb24KIEBk aXJybSBzaGFyZS9hc3Rlcmlzay9hZ2ktYmluCiBAZGlycm0gc2hhcmUvYXN0ZXJpc2sKIEBkaXJy bSBsaWIvYXN0ZXJpc2svbW9kdWxlcwogQGRpcnJtIGxpYi9hc3RlcmlzawogQGRpcnJtIGluY2x1 ZGUvYXN0ZXJpc2sKIEBkaXJybXRyeSBldGMvYXN0ZXJpc2sKK0BleGVjIG1rZGlyIC1wICVEL3No YXJlL2FzdGVyaXNrL2Zpcm13YXJlL2lheAorQGV4ZWMgbWtkaXIgLXAgJUQvc2hhcmUvYXN0ZXJp c2svZG9jdW1lbnRhdGlvbi90aGlyZHBhcnR5CiBAZXhlYyBta2RpciAtcCAlRC9zaGFyZS9hc3Rl cmlzay9zb3VuZHMvZXMKIEBleGVjIG1rZGlyIC1wICVEL3NoYXJlL2FzdGVyaXNrL3NvdW5kcy9m cgogQGN3ZCAvdmFyCkBAIC0xMzA0LDE1ICsxMzk1LDE5IEBACiBzcG9vbC9hc3Rlcmlzay92b2lj ZW1haWwvZGVmYXVsdC8xMjM0L2VuL3VuYXZhaWwuZ3NtCiBAZXhlYyBta2RpciAtcCAlRC9sb2cv YXN0ZXJpc2svY2RyLWNzdgogQGV4ZWMgbWtkaXIgLXAgJUQvbG9nL2FzdGVyaXNrL2Nkci1jdXN0 b20KLUBleGVjIG1rZGlyIC1wICVEL3Nwb29sL2FzdGVyaXNrL3ZvaWNlbWFpbC9kZWZhdWx0LzEy MzQvSU5CT1gKIEBleGVjIG1rZGlyIC1wICVEL3Nwb29sL2FzdGVyaXNrL2RpY3RhdGUKIEBleGVj IG1rZGlyIC1wICVEL3Nwb29sL2FzdGVyaXNrL21lZXRtZQogQGV4ZWMgbWtkaXIgLXAgJUQvc3Bv b2wvYXN0ZXJpc2svbW9uaXRvcgorQGV4ZWMgbWtkaXIgLXAgJUQvc3Bvb2wvYXN0ZXJpc2svb3V0 Z29pbmcKIEBleGVjIG1rZGlyIC1wICVEL3Nwb29sL2FzdGVyaXNrL3N5c3RlbQorQGV4ZWMgbWtk aXIgLXAgJUQvc3Bvb2wvYXN0ZXJpc2svdm9pY2VtYWlsL2RlZmF1bHQvMTIzNC9JTkJPWAorQGV4 ZWMgbWtkaXIgLXAgJUQvc3Bvb2wvYXN0ZXJpc2svdm9pY2VtYWlsL2RlZmF1bHQvMTIzNC9lbgog QGV4ZWMgbWtkaXIgLXAgJUQvc3Bvb2wvYXN0ZXJpc2svdG1wCitAZXhlYyBta2RpciAtcCAlRC9k Yi9hc3RlcmlzawogQGRpcnJtIHNwb29sL2FzdGVyaXNrL2RpY3RhdGUKIEBkaXJybSBzcG9vbC9h c3Rlcmlzay9tZWV0bWUKIEBkaXJybSBzcG9vbC9hc3Rlcmlzay9tb25pdG9yCitAZGlycm0gc3Bv b2wvYXN0ZXJpc2svb3V0Z29pbmcKIEBkaXJybSBzcG9vbC9hc3Rlcmlzay9zeXN0ZW0KIEBkaXJy bSBzcG9vbC9hc3Rlcmlzay92b2ljZW1haWwvZGVmYXVsdC8xMjM0L0lOQk9YCiBAZGlycm0gc3Bv b2wvYXN0ZXJpc2svdm9pY2VtYWlsL2RlZmF1bHQvMTIzNC9lbgpJbmRleDogZmlsZXMvYXN0ZXJp c2suc2guaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2hvbWUvbmN2cy9wb3J0cy9uZXQvYXN0ZXJp c2sxNi9maWxlcy9hc3Rlcmlzay5zaC5pbix2CnJldHJpZXZpbmcgcmV2aXNpb24gMS44CmRpZmYg LXUgLXIxLjggYXN0ZXJpc2suc2guaW4KLS0tIGZpbGVzL2FzdGVyaXNrLnNoLmluCTI3IE1hciAy MDEwIDAwOjEzOjM0IC0wMDAwCTEuOAorKysgZmlsZXMvYXN0ZXJpc2suc2guaW4JMjUgU2VwIDIw MTAgMDI6MTA6MzggLTAwMDAKQEAgLTExLDEwICsxMSwxMCBAQAogCiAuIC9ldGMvcmMuc3Vicgog Ci1zdG9wX3ByZWNtZD1hc3Rlcmlza19zaHV0ZG93bgotc2lnX3N0b3A9S0lMTAorc3RvcF9jbWQ9 YXN0ZXJpc2tfc2h1dGRvd24KIGFzdGVyaXNrX3NodXRkb3duICgpIHsKLSAgJSVQUkVGSVglJS9z YmluL2FzdGVyaXNrIC1xcnggJ3N0b3Agbm93JworICBlY2hvICdTdG9wcGluZyBhc3RlcmlzaycK KyAgJSVQUkVGSVglJS9zYmluL2FzdGVyaXNrIC1xcnggJ2NvcmUgc3RvcCBub3cnCiAgIHNsZWVw IDEKICAgcmV0dXJuIDAKIH0KSW5kZXg6IGZpbGVzL2NvZGVjbmVnby1wYXRjaC1NYWtlZmlsZQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09ClJDUyBmaWxlOiBmaWxlcy9jb2RlY25lZ28tcGF0Y2gtTWFrZWZpbGUKZGlmZiAt TiBmaWxlcy9jb2RlY25lZ28tcGF0Y2gtTWFrZWZpbGUKLS0tIGZpbGVzL2NvZGVjbmVnby1wYXRj aC1NYWtlZmlsZQk5IERlYyAyMDA4IDA3OjU5OjUwIC0wMDAwCTEuNworKysgL2Rldi9udWxsCTEg SmFuIDE5NzAgMDA6MDA6MDAgLTAwMDAKQEAgLTEsMjEwICswLDAgQEAKLS0tLSBNYWtlZmlsZS5v cmlnCTIwMDgtMTAtMTYgMTc6MzY6MzUuMDAwMDAwMDAwICswMzAwCi0rKysgTWFrZWZpbGUJMjAw OC0xMC0xNiAxNzozNjozNi4wMDAwMDAwMDAgKzAzMDAKLUBAIC0xMjksNyArMTI5LDcgQEAKLSAg IEFTVE1BTkRJUj0kKG1hbmRpcikKLSBpZm5lcSAoJChmaW5kc3RyaW5nIEJTRCwkKE9TQVJDSCkp LCkKLSAgIEFTVFZBUkxJQkRJUj0kKHByZWZpeCkvc2hhcmUvYXN0ZXJpc2sKLS0gIEFTVFZBUlJV TkRJUj0kKGxvY2Fsc3RhdGVkaXIpL3J1bi9hc3RlcmlzawotKyAgQVNUVkFSUlVORElSPSQobG9j YWxzdGF0ZWRpcikvcnVuCi0gZWxzZQotICAgQVNUVkFSTElCRElSPSQobG9jYWxzdGF0ZWRpcikv bGliL2FzdGVyaXNrCi0gZW5kaWYKLUBAIC0yMTQsOSArMjE0LDExIEBACi0gICBBU1RMREZMQUdT Kz0tTC91c3IvbG9jYWwvbGliCi0gZW5kaWYKLSAKLStpZm5lcSAoJChPU0FSQ0gpLEZyZWVCU0Qp Ci0gaWZuZXEgKCQoUFJPQyksdWx0cmFzcGFyYykKLSAgIEFTVENGTEFHUys9JChzaGVsbCBpZiAk KENDKSAtbWFyY2g9JChQUk9DKSAtUyAtbyAvZGV2L251bGwgLXhjIC9kZXYvbnVsbCA+L2Rldi9u dWxsIDI+JjE7IHRoZW4gZWNobyAiLW1hcmNoPSQoUFJPQykiOyBmaSkKLSBlbmRpZgotK2VuZGlm Ci0gCi0gaWZlcSAoJChQUk9DKSxwcGMpCi0gICBBU1RDRkxBR1MrPS1mc2lnbmVkLWNoYXIKLUBA IC0yMjQsNyArMjI2LDcgQEAKLSAKLSBpZmVxICgkKE9TQVJDSCksRnJlZUJTRCkKLSAgICMgLVYg aXMgdW5kZXJzdG9vZCBieSBCU0QgTWFrZSwgbm90IGJ5IEdOVSBtYWtlLgotLSAgQlNEVkVSU0lP Tj0kKHNoZWxsIG1ha2UgLVYgT1NWRVJTSU9OIC1mIC91c3Ivc2hhcmUvbWsvYnNkLnBvcnQuc3Vi ZGlyLm1rKQotKyAgQlNEVkVSU0lPTj0kKE9TVkVSU0lPTikKLSAgIEFTVENGTEFHUys9JChzaGVs bCBpZiB0ZXN0ICQoQlNEVkVSU0lPTikgLWx0IDUwMDAxNiA7IHRoZW4gZWNobyAiLURfVEhSRUFE X1NBRkUiOyBmaSkKLSAgIEFTVF9MSUJTKz0kKHNoZWxsIGlmIHRlc3QgICQoQlNEVkVSU0lPTikg LWx0IDUwMjEwMiA7IHRoZW4gZWNobyAiLWxjX3IiOyBlbHNlIGVjaG8gIi1wdGhyZWFkIjsgZmkp Ci0gZW5kaWYKLUBAIC00MDEsMTUgKzQwMywxNSBAQAotICMgU2hvdWxkIHN0YXRpYyBIVFRQIGJl IGluc3RhbGxlZCBkdXJpbmcgbWFrZSBzYW1wbGVzIG9yIGV2ZW4gd2l0aCBpdHMgb3duIHRhcmdl dCBhbGEKLSAjIHdlYnZvaWNlbWFpbD8gIFRoZXJlIGFyZSBwb3J0aW9ucyBoZXJlIHRoYXQgKmNv dWxkKiBiZSBjdXN0b21pemVkIGJ1dCBtaWdodCBhbHNvIGJlCi0gIyBpbXByb3ZlZCBhIGxvdC4g IEknbGwgcHV0IGl0IGhlcmUgZm9yIG5vdy4KLS0JbWtkaXIgLXAgJChERVNURElSKSQoQVNUREFU QURJUikvc3RhdGljLWh0dHAKLSsJJChNS0RJUikgJChERVNURElSKSQoQVNUREFUQURJUikvc3Rh dGljLWh0dHAKLSAJZm9yIHggaW4gc3RhdGljLWh0dHAvKjsgZG8gXAotLQkJJChJTlNUQUxMKSAt bSA2NDQgJCR4ICQoREVTVERJUikkKEFTVERBVEFESVIpL3N0YXRpYy1odHRwIDsgXAotKwkJJChC U0RfSU5TVEFMTF9EQVRBKSAkJHggJChERVNURElSKSQoQVNUREFUQURJUikvc3RhdGljLWh0dHAg OyBcCi0gCWRvbmUKLS0JbWtkaXIgLXAgJChERVNURElSKSQoQVNUREFUQURJUikvaW1hZ2VzCi0r CSQoTUtESVIpICQoREVTVERJUikkKEFTVERBVEFESVIpL2ltYWdlcwotIAlmb3IgeCBpbiBpbWFn ZXMvKi5qcGc7IGRvIFwKLS0JCSQoSU5TVEFMTCkgLW0gNjQ0ICQkeCAkKERFU1RESVIpJChBU1RE QVRBRElSKS9pbWFnZXMgOyBcCi0rCQkkKEJTRF9JTlNUQUxMX0RBVEEpICQkeCAkKERFU1RESVIp JChBU1REQVRBRElSKS9pbWFnZXMgOyBcCi0gCWRvbmUKLS0JbWtkaXIgLXAgJChERVNURElSKSQo QUdJX0RJUikKLSsJJChNS0RJUikgJChERVNURElSKSQoQUdJX0RJUikKLSAJJChNQUtFKSAtQyBz b3VuZHMgaW5zdGFsbAotIAotIHVwZGF0ZTogCi1AQCAtNDMwLDQ3ICs0MzIsNDcgQEAKLSBPTERI RUFERVJTPSQoZmlsdGVyLW91dCAkKE5FV0hFQURFUlMpLCQobm90ZGlyICQod2lsZGNhcmQgJChE RVNURElSKSQoQVNUSEVBREVSRElSKS8qLmgpKSkKLSAKLSBpbnN0YWxsZGlyczoKLS0JbWtkaXIg LXAgJChERVNURElSKSQoTU9EVUxFU19ESVIpCi0tCW1rZGlyIC1wICQoREVTVERJUikkKEFTVFNC SU5ESVIpCi0tCW1rZGlyIC1wICQoREVTVERJUikkKEFTVEVUQ0RJUikKLS0JbWtkaXIgLXAgJChE RVNURElSKSQoQVNUQklORElSKQotLQlta2RpciAtcCAkKERFU1RESVIpJChBU1RWQVJSVU5ESVIp Ci0tCW1rZGlyIC1wICQoREVTVERJUikkKEFTVFNQT09MRElSKS92b2ljZW1haWwKLS0JbWtkaXIg LXAgJChERVNURElSKSQoQVNUU1BPT0xESVIpL2RpY3RhdGUKLS0JbWtkaXIgLXAgJChERVNURElS KSQoQVNUU1BPT0xESVIpL3N5c3RlbQotLQlta2RpciAtcCAkKERFU1RESVIpJChBU1RTUE9PTERJ UikvdG1wCi0tCW1rZGlyIC1wICQoREVTVERJUikkKEFTVFNQT09MRElSKS9tZWV0bWUKLS0JbWtk aXIgLXAgJChERVNURElSKSQoQVNUU1BPT0xESVIpL21vbml0b3IKLSsJJChNS0RJUikgJChERVNU RElSKSQoTU9EVUxFU19ESVIpCi0rCSQoTUtESVIpICQoREVTVERJUikkKEFTVFNCSU5ESVIpCi0r CSQoTUtESVIpICQoREVTVERJUikkKEFTVEVUQ0RJUikKLSsJJChNS0RJUikgJChERVNURElSKSQo QVNUQklORElSKQotKwkkKE1LRElSKSAkKERFU1RESVIpJChBU1RWQVJSVU5ESVIpCi0rCSQoTUtE SVIpICQoREVTVERJUikkKEFTVFNQT09MRElSKS92b2ljZW1haWwKLSsJJChNS0RJUikgJChERVNU RElSKSQoQVNUU1BPT0xESVIpL2RpY3RhdGUKLSsJJChNS0RJUikgJChERVNURElSKSQoQVNUU1BP T0xESVIpL3N5c3RlbQotKwkkKE1LRElSKSAkKERFU1RESVIpJChBU1RTUE9PTERJUikvdG1wCi0r CSQoTUtESVIpICQoREVTVERJUikkKEFTVFNQT09MRElSKS9tZWV0bWUKLSsJJChNS0RJUikgJChE RVNURElSKSQoQVNUU1BPT0xESVIpL21vbml0b3IKLSAKLSBiaW5pbnN0YWxsOiBfYWxsIGluc3Rh bGxkaXJzICQoU1VCRElSU19JTlNUQUxMKQotLQkkKElOU1RBTEwpIC1tIDc1NSBtYWluL2FzdGVy aXNrICQoREVTVERJUikkKEFTVFNCSU5ESVIpLwotKwkkKEJTRF9JTlNUQUxMX1BST0dSQU0pIG1h aW4vYXN0ZXJpc2sgJChERVNURElSKSQoQVNUU0JJTkRJUikvCi0gCSQoTE4pIC1zZiBhc3Rlcmlz ayAkKERFU1RESVIpJChBU1RTQklORElSKS9yYXN0ZXJpc2sKLS0JJChJTlNUQUxMKSAtbSA3NTUg Y29udHJpYi9zY3JpcHRzL2FzdGdlbmtleSAkKERFU1RESVIpJChBU1RTQklORElSKS8KLS0JJChJ TlNUQUxMKSAtbSA3NTUgY29udHJpYi9zY3JpcHRzL2F1dG9zdXBwb3J0ICQoREVTVERJUikkKEFT VFNCSU5ESVIpLwotKwkkKEJTRF9JTlNUQUxMX1NDUklQVCkgY29udHJpYi9zY3JpcHRzL2FzdGdl bmtleSAkKERFU1RESVIpJChBU1RTQklORElSKS8KLSsJJChCU0RfSU5TVEFMTF9TQ1JJUFQpIGNv bnRyaWIvc2NyaXB0cy9hdXRvc3VwcG9ydCAkKERFU1RESVIpJChBU1RTQklORElSKS8KLSAJaWYg WyAhIC1mICQoREVTVERJUikkKEFTVFNCSU5ESVIpL3NhZmVfYXN0ZXJpc2sgXTsgdGhlbiBcCi0t CQljYXQgY29udHJpYi9zY3JpcHRzL3NhZmVfYXN0ZXJpc2sgfCBzZWQgJ3N8X19BU1RFUklTS19T QklOX0RJUl9ffCQoQVNUU0JJTkRJUil8O3N8X19BU1RFUklTS19WQVJSVU5fRElSX198JChBU1RW QVJSVU5ESVIpfDsnID4gJChERVNURElSKSQoQVNUU0JJTkRJUikvc2FmZV9hc3RlcmlzayA7XAot LQkJY2htb2QgNzU1ICQoREVTVERJUikkKEFTVFNCSU5ESVIpL3NhZmVfYXN0ZXJpc2s7XAotKwkJ Y2F0IGNvbnRyaWIvc2NyaXB0cy9zYWZlX2FzdGVyaXNrIHwgc2VkICdzfF9fQVNURVJJU0tfU0JJ Tl9ESVJfX3wkKEFTVFNCSU5ESVIpfDtzfF9fQVNURVJJU0tfVkFSUlVOX0RJUl9ffCQoQVNUVkFS UlVORElSKXw7JyA+IGNvbnRyaWIvc2NyaXB0cy9zYWZlX2FzdGVyaXNrLm91dDtcCi0rCQkke0JT RF9JTlNUQUxMX1NDUklQVH0gY29udHJpYi9zY3JpcHRzL3NhZmVfYXN0ZXJpc2sub3V0ICQoREVT VERJUikkKEFTVFNCSU5ESVIpL3NhZmVfYXN0ZXJpc2sgO1wKLSAJZmkKLS0JJChJTlNUQUxMKSAt ZCAkKERFU1RESVIpJChBU1RIRUFERVJESVIpCi0tCSQoSU5TVEFMTCkgLW0gNjQ0IGluY2x1ZGUv YXN0ZXJpc2suaCAkKERFU1RESVIpJChpbmNsdWRlZGlyKQotLQkkKElOU1RBTEwpIC1tIDY0NCBp bmNsdWRlL2FzdGVyaXNrLyouaCAkKERFU1RESVIpJChBU1RIRUFERVJESVIpCi0rCSQoTUtESVIp ICQoREVTVERJUikkKEFTVEhFQURFUkRJUikKLSsJJChCU0RfSU5TVEFMTF9EQVRBKSBpbmNsdWRl L2FzdGVyaXNrLmggJChERVNURElSKSQoaW5jbHVkZWRpcikKLSsJJChCU0RfSU5TVEFMTF9EQVRB KSBpbmNsdWRlL2FzdGVyaXNrLyouaCAkKERFU1RESVIpJChBU1RIRUFERVJESVIpCi0gCWlmIFsg LW4gIiQoT0xESEVBREVSUykiIF07IHRoZW4gXAotIAkJcm0gLWYgJChhZGRwcmVmaXggJChERVNU RElSKSQoQVNUSEVBREVSRElSKS8sJChPTERIRUFERVJTKSkgO1wKLSAJZmkKLS0JbWtkaXIgLXAg JChERVNURElSKSQoQVNUTE9HRElSKS9jZHItY3N2Ci0tCW1rZGlyIC1wICQoREVTVERJUikkKEFT VExPR0RJUikvY2RyLWN1c3RvbQotLQlta2RpciAtcCAkKERFU1RESVIpJChBU1REQVRBRElSKS9r ZXlzCi0tCW1rZGlyIC1wICQoREVTVERJUikkKEFTVERBVEFESVIpL2Zpcm13YXJlCi0tCW1rZGly IC1wICQoREVTVERJUikkKEFTVERBVEFESVIpL2Zpcm13YXJlL2lheAotLQlta2RpciAtcCAkKERF U1RESVIpJChBU1RNQU5ESVIpL21hbjgKLS0JJChJTlNUQUxMKSAtbSA2NDQga2V5cy9pYXh0ZWwu cHViICQoREVTVERJUikkKEFTVERBVEFESVIpL2tleXMKLS0JJChJTlNUQUxMKSAtbSA2NDQga2V5 cy9mcmVld29ybGRkaWFsdXAucHViICQoREVTVERJUikkKEFTVERBVEFESVIpL2tleXMKLS0JJChJ TlNUQUxMKSAtbSA2NDQgZG9jL2FzdGVyaXNrLjggJChERVNURElSKSQoQVNUTUFORElSKS9tYW44 Ci0tCSQoSU5TVEFMTCkgLW0gNjQ0IGNvbnRyaWIvc2NyaXB0cy9hc3RnZW5rZXkuOCAkKERFU1RE SVIpJChBU1RNQU5ESVIpL21hbjgKLS0JJChJTlNUQUxMKSAtbSA2NDQgY29udHJpYi9zY3JpcHRz L2F1dG9zdXBwb3J0LjggJChERVNURElSKSQoQVNUTUFORElSKS9tYW44Ci0tCSQoSU5TVEFMTCkg LW0gNjQ0IGNvbnRyaWIvc2NyaXB0cy9zYWZlX2FzdGVyaXNrLjggJChERVNURElSKSQoQVNUTUFO RElSKS9tYW44Ci0rCSQoTUtESVIpICQoREVTVERJUikkKEFTVExPR0RJUikvY2RyLWNzdgotKwkk KE1LRElSKSAkKERFU1RESVIpJChBU1RMT0dESVIpL2Nkci1jdXN0b20KLSsJJChNS0RJUikgJChE RVNURElSKSQoQVNUREFUQURJUikva2V5cwotKwkkKE1LRElSKSAkKERFU1RESVIpJChBU1REQVRB RElSKS9maXJtd2FyZQotKwkkKE1LRElSKSAkKERFU1RESVIpJChBU1REQVRBRElSKS9maXJtd2Fy ZS9pYXgKLSsJJChNS0RJUikgJChERVNURElSKSQoQVNUTUFORElSKS9tYW44Ci0rCSQoQlNEX0lO U1RBTExfREFUQSkga2V5cy9pYXh0ZWwucHViICQoREVTVERJUikkKEFTVERBVEFESVIpL2tleXMK LSsJJChCU0RfSU5TVEFMTF9EQVRBKSBrZXlzL2ZyZWV3b3JsZGRpYWx1cC5wdWIgJChERVNURElS KSQoQVNUREFUQURJUikva2V5cwotKwkkKEJTRF9JTlNUQUxMX01BTikgZG9jL2FzdGVyaXNrLjgg JChERVNURElSKSQoQVNUTUFORElSKS9tYW44Ci0rCSQoQlNEX0lOU1RBTExfTUFOKSBjb250cmli L3NjcmlwdHMvYXN0Z2Vua2V5LjggJChERVNURElSKSQoQVNUTUFORElSKS9tYW44Ci0rCSQoQlNE X0lOU1RBTExfTUFOKSBjb250cmliL3NjcmlwdHMvYXV0b3N1cHBvcnQuOCAkKERFU1RESVIpJChB U1RNQU5ESVIpL21hbjgKLSsJJChCU0RfSU5TVEFMTF9NQU4pIGNvbnRyaWIvc2NyaXB0cy9zYWZl X2FzdGVyaXNrLjggJChERVNURElSKSQoQVNUTUFORElSKS9tYW44Ci0gCWlmIFsgLWYgY29udHJp Yi9maXJtd2FyZS9pYXgvaWF4eS5iaW4gXSA7IHRoZW4gXAotLQkJJChJTlNUQUxMKSAtbSA2NDQg Y29udHJpYi9maXJtd2FyZS9pYXgvaWF4eS5iaW4gJChERVNURElSKSQoQVNUREFUQURJUikvZmly bXdhcmUvaWF4L2lheHkuYmluOyBcCi0rCQkkKEJTRF9JTlNUQUxMX0RBVEEpIGNvbnRyaWIvZmly bXdhcmUvaWF4L2lheHkuYmluICQoREVTVERJUikkKEFTVERBVEFESVIpL2Zpcm13YXJlL2lheC9p YXh5LmJpbjsgXAotIAlmaQotIAotICQoU1VCRElSU19JTlNUQUxMKToKLUBAIC01MDYsNyArNTA4 LDcgQEAKLSAJQGV4aXQgMQotIGVuZGlmCi0gCi0taW5zdGFsbDogYmFkc2hlbGwgZGF0YWZpbGVz IGJpbmluc3RhbGwKLStpbnN0YWxsOiBiYWRzaGVsbCBkYXRhZmlsZXMgYmluaW5zdGFsbCBzYW1w bGVzCi0gCUBpZiBbIC14IC91c3Ivc2Jpbi9hc3Rlcmlzay1wb3N0LWluc3RhbGwgXTsgdGhlbiBc Ci0gCQkvdXNyL3NiaW4vYXN0ZXJpc2stcG9zdC1pbnN0YWxsICQoREVTVERJUikgLiA7IFwKLSAJ ZmkKLUBAIC01NDQsMzEgKzU0NiwyMyBAQAotIHVwZ3JhZGU6IGJpbmluc3RhbGwKLSAKLSBhZHNp OgotLQlta2RpciAtcCAkKERFU1RESVIpJChBU1RFVENESVIpCi0rCSQoTUtESVIpICQoREVTVERJ UikkKEFTVEVUQ0RJUikKLSAJZm9yIHggaW4gY29uZmlncy8qLmFkc2k7IGRvIFwKLSAJCWlmIFsg ISAtZiAkKERFU1RESVIpJChBU1RFVENESVIpLyQkeCBdOyB0aGVuIFwKLS0JCQkkKElOU1RBTEwp IC1tIDY0NCAkJHggJChERVNURElSKSQoQVNURVRDRElSKS9gJChCQVNFTkFNRSkgJCR4YCA7IFwK LSsJCQkkKEJTRF9JTlNUQUxMX0RBVEEpICQkeCAkKERFU1RESVIpJChBU1RFVENESVIpL2AkKEJB U0VOQU1FKSAkJHhgIDsgXAotIAkJZmkgOyBcCi0rCQkkKEJTRF9JTlNUQUxMX0RBVEEpICQkeCAk KERFU1RESVIpJChBU1RFVENESVIpL2AkKEJBU0VOQU1FKSAkJHhgLWRpc3QgOyBcCi0gCWRvbmUK LSAKLSBzYW1wbGVzOiBhZHNpCi0tCW1rZGlyIC1wICQoREVTVERJUikkKEFTVEVUQ0RJUikKLSsJ JChNS0RJUikgJChERVNURElSKSQoQVNURVRDRElSKQotIAlmb3IgeCBpbiBjb25maWdzLyouc2Ft cGxlOyBkbyBcCi0tCQlpZiBbIC1mICQoREVTVERJUikkKEFTVEVUQ0RJUikvYCQoQkFTRU5BTUUp ICQkeCAuc2FtcGxlYCBdOyB0aGVuIFwKLS0JCQlpZiBbICIkKE9WRVJXUklURSkiID0gInkiIF07 IHRoZW4gXAotLQkJCQlpZiBjbXAgLXMgJChERVNURElSKSQoQVNURVRDRElSKS9gJChCQVNFTkFN RSkgJCR4IC5zYW1wbGVgICQkeCA7IHRoZW4gXAotLQkJCQkJZWNobyAiQ29uZmlnIGZpbGUgJCR4 IGlzIHVuY2hhbmdlZCI7IFwKLS0JCQkJCWNvbnRpbnVlOyBcCi0tCQkJCWZpIDsgXAotLQkJCQlt diAtZiAkKERFU1RESVIpJChBU1RFVENESVIpL2AkKEJBU0VOQU1FKSAkJHggLnNhbXBsZWAgJChE RVNURElSKSQoQVNURVRDRElSKS9gJChCQVNFTkFNRSkgJCR4IC5zYW1wbGVgLm9sZCA7IFwKLS0J CQllbHNlIFwKLS0JCQkJZWNobyAiU2tpcHBpbmcgY29uZmlnIGZpbGUgJCR4IjsgXAotLQkJCQlj b250aW51ZTsgXAotLQkJCWZpIDtcCi0rCQkkKEJTRF9JTlNUQUxMX0RBVEEpICQkeCAkKERFU1RE SVIpJChBU1RFVENESVIpL2AkKEJBU0VOQU1FKSAkJHggLnNhbXBsZWAtZGlzdCA7XAotKwkJaWYg WyAhIC1mICQoREVTVERJUikkKEFTVEVUQ0RJUikvYCQoQkFTRU5BTUUpICQkeCAuc2FtcGxlYCBd OyB0aGVuIFwKLSsJCQkkKEJTRF9JTlNUQUxMX0RBVEEpICQkeCAkKERFU1RESVIpJChBU1RFVENE SVIpL2AkKEJBU0VOQU1FKSAkJHggLnNhbXBsZWA7XAotIAkJZmkgOyBcCi0tCQkkKElOU1RBTEwp IC1tIDY0NCAkJHggJChERVNURElSKSQoQVNURVRDRElSKS9gJChCQVNFTkFNRSkgJCR4IC5zYW1w bGVgIDtcCi0gCWRvbmUKLS0JaWYgWyAiJChPVkVSV1JJVEUpIiA9ICJ5IiBdIHx8IFsgISAtZiAk KERFU1RESVIpJChBU1RDT05GUEFUSCkgXTsgdGhlbiBcCi0rCWlmIHRydWU7IHRoZW4gXAotIAkJ KCBcCi0gCQllY2hvICJbZGlyZWN0b3JpZXNdIiA7IFwKLSAJCWVjaG8gImFzdGV0Y2RpciA9PiAk KEFTVEVUQ0RJUikiIDsgXAotQEAgLTY1NSwyMCArNjQ5LDIzIEBACi0gCQllY2hvICI7IERlZmF1 bHQ6IHN0cmljdCI7IFwKLSAJCWVjaG8gIjsiOyBcCi0gCQllY2hvICI7dHJhbnNsYXRpb25fYWxn b3JpdGhtID0gc3RyaWN0IjsgXAotLQkJKSA+ICQoREVTVERJUikkKEFTVENPTkZQQVRIKSA7IFwK LSsJCSkgPiAkKERFU1RESVIpJChBU1RDT05GUEFUSCktZGlzdCA7IFwKLSsJCWlmIFsgISAtZiAk KERFU1RESVIpJChBU1RDT05GUEFUSCkgXTsgdGhlbiBcCi0rCQkJY3AgJChERVNURElSKSQoQVNU Q09ORlBBVEgpLWRpc3QgJChERVNURElSKSQoQVNUQ09ORlBBVEgpOyBcCi0rCQlmaTsgXAotIAll bHNlIFwKLSAJCWVjaG8gIlNraXBwaW5nIGFzdGVyaXNrLmNvbmYgY3JlYXRpb24iOyBcCi0gCWZp Ci0tCW1rZGlyIC1wICQoREVTVERJUikkKEFTVFNQT09MRElSKS92b2ljZW1haWwvZGVmYXVsdC8x MjM0L0lOQk9YCi0rCSQoTUtESVIpICQoREVTVERJUikkKEFTVFNQT09MRElSKS92b2ljZW1haWwv ZGVmYXVsdC8xMjM0L0lOQk9YCi0gCWJ1aWxkX3Rvb2xzL21ha2Vfc2FtcGxlX3ZvaWNlbWFpbCAk KERFU1RESVIpLyQoQVNUREFUQURJUikgJChERVNURElSKS8kKEFTVFNQT09MRElSKQotIAotIHdl YnZtYWlsOgotIAlAWyAtZCAkKERFU1RESVIpJChIVFRQX0RPQ1NESVIpLyBdIHx8ICggcHJpbnRm ICJodHRwIGRvY3MgZGlyZWN0b3J5IG5vdCBmb3VuZC5cblVwZGF0ZSBhc3NpZ25tZW50IG9mIHZh cmlhYmxlIEhUVFBfRE9DU0RJUiBpbiBNYWtlZmlsZSFcbiIgJiYgZXhpdCAxICkKLSAJQFsgLWQg JChERVNURElSKSQoSFRUUF9DR0lESVIpIF0gfHwgKCBwcmludGYgImNnaS1iaW4gZGlyZWN0b3J5 IG5vdCBmb3VuZC5cblVwZGF0ZSBhc3NpZ25tZW50IG9mIHZhcmlhYmxlIEhUVFBfQ0dJRElSIGlu IE1ha2VmaWxlIVxuIiAmJiBleGl0IDEgKQotIAkkKElOU1RBTEwpIC1tIDQ3NTUgLW8gcm9vdCAt ZyByb290IGNvbnRyaWIvc2NyaXB0cy92bWFpbC5jZ2kgJChERVNURElSKSQoSFRUUF9DR0lESVIp L3ZtYWlsLmNnaQotLQlta2RpciAtcCAkKERFU1RESVIpJChIVFRQX0RPQ1NESVIpL19hc3Rlcmlz awotKwkkKE1LRElSKSAkKERFU1RESVIpJChIVFRQX0RPQ1NESVIpL19hc3RlcmlzawotIAlmb3Ig eCBpbiBpbWFnZXMvKi5naWY7IGRvIFwKLS0JCSQoSU5TVEFMTCkgLW0gNjQ0ICQkeCAkKERFU1RE SVIpJChIVFRQX0RPQ1NESVIpL19hc3Rlcmlzay87IFwKLSsJCSQoQlNEX0lOU1RBTExfREFUQSkg JCR4ICQoREVTVERJUikkKEhUVFBfRE9DU0RJUikvX2FzdGVyaXNrLzsgXAotIAlkb25lCi0gCUBl Y2hvICIgKy0tLS0tLS0tLSBBc3RlcmlzayBXZWIgVm9pY2VtYWlsIC0tLS0tLS0tLS0rIiAgCi0g CUBlY2hvICIgKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICArIgpJ bmRleDogZmlsZXMvbm9jb2RlY25lZ28tcGF0Y2gtTWFrZWZpbGUKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmls ZTogZmlsZXMvbm9jb2RlY25lZ28tcGF0Y2gtTWFrZWZpbGUKZGlmZiAtTiBmaWxlcy9ub2NvZGVj bmVnby1wYXRjaC1NYWtlZmlsZQotLS0gZmlsZXMvbm9jb2RlY25lZ28tcGF0Y2gtTWFrZWZpbGUJ MjAgTm92IDIwMDkgMjM6NDM6MDkgLTAwMDAJMS4xMQorKysgL2Rldi9udWxsCTEgSmFuIDE5NzAg MDA6MDA6MDAgLTAwMDAKQEAgLTEsMjQzICswLDAgQEAKLS0tLSBNYWtlZmlsZS5vcmlnCTIwMDkt MTEtMDMgMTI6MDA6MjcuMDAwMDAwMDAwIC0wODAwCi0rKysgTWFrZWZpbGUJMjAwOS0xMS0yMCAx MzoxMzowNi4wMDAwMDAwMDAgLTA4MDAKLUBAIC0xMTgsNyArMTE4LDcgQEAKLSBPVkVSV1JJVEU9 eQotIAotICMgSW5jbHVkZSBkZWJ1ZyBhbmQgbWFjcm8gc3ltYm9scyBpbiB0aGUgZXhlY3V0YWJs ZXMgKC1nKSBhbmQgcHJvZmlsaW5nIGluZm8gKC1wZykKLS1ERUJVRz0tZzMKLSsjREVCVUc9LWcz Ci0gCi0gCi0gIyBEZWZpbmUgc3RhbmRhcmQgZGlyZWN0b3JpZXMgZm9yIHZhcmlvdXMgcGxhdGZv cm1zCi1AQCAtMTQ4LDcgKzE0OCw3IEBACi0gICBBU1RNQU5ESVI9JChtYW5kaXIpCi0gaWZuZXEg KCQoZmluZHN0cmluZyBCU0QsJChPU0FSQ0gpKSwpCi0gICBBU1RWQVJMSUJESVI9JChwcmVmaXgp L3NoYXJlL2FzdGVyaXNrCi0tICBBU1RWQVJSVU5ESVI9JChsb2NhbHN0YXRlZGlyKS9ydW4vYXN0 ZXJpc2sKLSsgIEFTVFZBUlJVTkRJUj0kKGxvY2Fsc3RhdGVkaXIpL3J1bgotICAgQVNUREJESVI9 JChsb2NhbHN0YXRlZGlyKS9kYi9hc3RlcmlzawotIGVsc2UKLSAgIEFTVFZBUkxJQkRJUj0kKGxv Y2Fsc3RhdGVkaXIpL2xpYi9hc3RlcmlzawotQEAgLTI0OCw5ICsyNDgsMTEgQEAKLSAgIF9BU1RD RkxBR1MrPS1pc3lzdGVtIC91c3IvbG9jYWwvaW5jbHVkZQotIGVuZGlmCi0gCi0raWZuZXEgKCQo T1NBUkNIKSxGcmVlQlNEKQotIGlmbmVxICgkKFBST0MpLHVsdHJhc3BhcmMpCi0gICBfQVNUQ0ZM QUdTKz0kKHNoZWxsIGlmICQoQ0MpIC1tYXJjaD0kKFBST0MpIC1TIC1vIC9kZXYvbnVsbCAteGMg L2Rldi9udWxsID4vZGV2L251bGwgMj4mMTsgdGhlbiBlY2hvICItbWFyY2g9JChQUk9DKSI7IGZp KQotIGVuZGlmCi0rZW5kaWYKLSAKLSBpZmVxICgkKFBST0MpLHBwYykKLSAgIF9BU1RDRkxBR1Mr PS1mc2lnbmVkLWNoYXIKLUBAIC0yNTgsNyArMjYwLDcgQEAKLSAKLSBpZmVxICgkKE9TQVJDSCks RnJlZUJTRCkKLSAgICMgLVYgaXMgdW5kZXJzdG9vZCBieSBCU0QgTWFrZSwgbm90IGJ5IEdOVSBt YWtlLgotLSAgQlNEVkVSU0lPTj0kKHNoZWxsIG1ha2UgLVYgT1NWRVJTSU9OIC1mIC91c3Ivc2hh cmUvbWsvYnNkLnBvcnQuc3ViZGlyLm1rKQotKyAgQlNEVkVSU0lPTj0kKE9TVkVSU0lPTikKLSAg IF9BU1RDRkxBR1MrPSQoc2hlbGwgaWYgdGVzdCAkKEJTRFZFUlNJT04pIC1sdCA1MDAwMTYgOyB0 aGVuIGVjaG8gIi1EX1RIUkVBRF9TQUZFIjsgZmkpCi0gZW5kaWYKLSAKLUBAIC00NjcsMjEgKzQ2 OSwyMSBAQAotICMgU2hvdWxkIHN0YXRpYyBIVFRQIGJlIGluc3RhbGxlZCBkdXJpbmcgbWFrZSBz YW1wbGVzIG9yIGV2ZW4gd2l0aCBpdHMgb3duIHRhcmdldCBhbGEKLSAjIHdlYnZvaWNlbWFpbD8g IFRoZXJlIGFyZSBwb3J0aW9ucyBoZXJlIHRoYXQgKmNvdWxkKiBiZSBjdXN0b21pemVkIGJ1dCBt aWdodCBhbHNvIGJlCi0gIyBpbXByb3ZlZCBhIGxvdC4gIEknbGwgcHV0IGl0IGhlcmUgZm9yIG5v dy4KLS0JbWtkaXIgLXAgJChERVNURElSKSQoQVNUREFUQURJUikvc3RhdGljLWh0dHAKLSsJJChN S0RJUikgJChERVNURElSKSQoQVNUREFUQURJUikvc3RhdGljLWh0dHAKLSAJZm9yIHggaW4gc3Rh dGljLWh0dHAvKjsgZG8gXAotLQkJJChJTlNUQUxMKSAtbSA2NDQgJCR4ICQoREVTVERJUikkKEFT VERBVEFESVIpL3N0YXRpYy1odHRwIDsgXAotKwkJJChCU0RfSU5TVEFMTF9EQVRBKSAkJHggJChE RVNURElSKSQoQVNUREFUQURJUikvc3RhdGljLWh0dHAgOyBcCi0gCWRvbmUKLSAJaWYgWyAtZCBk b2MvdGV4L2FzdGVyaXNrIF0gOyB0aGVuIFwKLS0JCQlta2RpciAtcCAkKERFU1RESVIpJChBU1RE QVRBRElSKS9zdGF0aWMtaHR0cC9kb2NzIDsgXAotKwkJCSQoTUtESVIpICQoREVTVERJUikkKERP Q1NESVIpIDsgXAotIAkJCWZvciBuIGluIGRvYy90ZXgvYXN0ZXJpc2svKiA7IGRvIFwKLS0JCQkJ JChJTlNUQUxMKSAtbSA2NDQgJCRuICQoREVTVERJUikkKEFTVERBVEFESVIpL3N0YXRpYy1odHRw L2RvY3MgOyBcCi0rCQkJCSQoQlNEX0lOU1RBTExfREFUQSkgJCRuICQoREVTVERJUikkKERPQ1NE SVIpIDsgXAotIAkJCWRvbmUgXAotIAlmaQotLQlta2RpciAtcCAkKERFU1RESVIpJChBU1REQVRB RElSKS9pbWFnZXMKLSsJJChNS0RJUikgJChERVNURElSKSQoRE9DU0RJUikvaW1hZ2VzCi0gCWZv ciB4IGluIGltYWdlcy8qLmpwZzsgZG8gXAotLQkJJChJTlNUQUxMKSAtbSA2NDQgJCR4ICQoREVT VERJUikkKEFTVERBVEFESVIpL2ltYWdlcyA7IFwKLSsJCSQoQlNEX0lOU1RBTExfREFUQSkgJCR4 ICQoREVTVERJUikkKERPQ1NESVIpL2ltYWdlcyA7IFwKLSAJZG9uZQotLQlta2RpciAtcCAkKERF U1RESVIpJChBR0lfRElSKQotKwkkKE1LRElSKSAkKERFU1RESVIpJChBR0lfRElSKQotIAkkKE1B S0UpIC1DIHNvdW5kcyBpbnN0YWxsCi0gCi0gdXBkYXRlOiAKLUBAIC01MDUsNDcgKzUwNyw0NyBA QAotIE9MREhFQURFUlM9JChmaWx0ZXItb3V0ICQoTkVXSEVBREVSUyksJChub3RkaXIgJCh3aWxk Y2FyZCAkKERFU1RESVIpJChBU1RIRUFERVJESVIpLyouaCkpKQotIAotIGluc3RhbGxkaXJzOgot LQlta2RpciAtcCAkKERFU1RESVIpJChNT0RVTEVTX0RJUikKLS0JbWtkaXIgLXAgJChERVNURElS KSQoQVNUU0JJTkRJUikKLS0JbWtkaXIgLXAgJChERVNURElSKSQoQVNURVRDRElSKQotLQlta2Rp ciAtcCAkKERFU1RESVIpJChBU1RCSU5ESVIpCi0tCW1rZGlyIC1wICQoREVTVERJUikkKEFTVFZB UlJVTkRJUikKLS0JbWtkaXIgLXAgJChERVNURElSKSQoQVNUU1BPT0xESVIpL3ZvaWNlbWFpbAot LQlta2RpciAtcCAkKERFU1RESVIpJChBU1RTUE9PTERJUikvZGljdGF0ZQotLQlta2RpciAtcCAk KERFU1RESVIpJChBU1RTUE9PTERJUikvc3lzdGVtCi0tCW1rZGlyIC1wICQoREVTVERJUikkKEFT VFNQT09MRElSKS90bXAKLS0JbWtkaXIgLXAgJChERVNURElSKSQoQVNUU1BPT0xESVIpL21lZXRt ZQotLQlta2RpciAtcCAkKERFU1RESVIpJChBU1RTUE9PTERJUikvbW9uaXRvcgotKwkkKE1LRElS KSAkKERFU1RESVIpJChNT0RVTEVTX0RJUikKLSsJJChNS0RJUikgJChERVNURElSKSQoQVNUU0JJ TkRJUikKLSsJJChNS0RJUikgJChERVNURElSKSQoQVNURVRDRElSKQotKwkkKE1LRElSKSAkKERF U1RESVIpJChBU1RCSU5ESVIpCi0rCSQoTUtESVIpICQoREVTVERJUikkKEFTVFZBUlJVTkRJUikK LSsJJChNS0RJUikgJChERVNURElSKSQoQVNUU1BPT0xESVIpL3ZvaWNlbWFpbAotKwkkKE1LRElS KSAkKERFU1RESVIpJChBU1RTUE9PTERJUikvZGljdGF0ZQotKwkkKE1LRElSKSAkKERFU1RESVIp JChBU1RTUE9PTERJUikvc3lzdGVtCi0rCSQoTUtESVIpICQoREVTVERJUikkKEFTVFNQT09MRElS KS90bXAKLSsJJChNS0RJUikgJChERVNURElSKSQoQVNUU1BPT0xESVIpL21lZXRtZQotKwkkKE1L RElSKSAkKERFU1RESVIpJChBU1RTUE9PTERJUikvbW9uaXRvcgotIAotIGJpbmluc3RhbGw6IF9h bGwgaW5zdGFsbGRpcnMgJChTVUJESVJTX0lOU1RBTEwpCi0tCSQoSU5TVEFMTCkgLW0gNzU1IG1h aW4vYXN0ZXJpc2sgJChERVNURElSKSQoQVNUU0JJTkRJUikvCi0rCSQoQlNEX0lOU1RBTExfUFJP R1JBTSkgbWFpbi9hc3RlcmlzayAkKERFU1RESVIpJChBU1RTQklORElSKS8KLSAJJChMTikgLXNm IGFzdGVyaXNrICQoREVTVERJUikkKEFTVFNCSU5ESVIpL3Jhc3RlcmlzawotLQkkKElOU1RBTEwp IC1tIDc1NSBjb250cmliL3NjcmlwdHMvYXN0Z2Vua2V5ICQoREVTVERJUikkKEFTVFNCSU5ESVIp LwotLQkkKElOU1RBTEwpIC1tIDc1NSBjb250cmliL3NjcmlwdHMvYXV0b3N1cHBvcnQgJChERVNU RElSKSQoQVNUU0JJTkRJUikvCi0rCSQoQlNEX0lOU1RBTExfU0NSSVBUKSBjb250cmliL3Njcmlw dHMvYXN0Z2Vua2V5ICQoREVTVERJUikkKEFTVFNCSU5ESVIpLwotKwkkKEJTRF9JTlNUQUxMX1ND UklQVCkgY29udHJpYi9zY3JpcHRzL2F1dG9zdXBwb3J0ICQoREVTVERJUikkKEFTVFNCSU5ESVIp LwotIAlpZiBbICEgLWYgJChERVNURElSKSQoQVNUU0JJTkRJUikvc2FmZV9hc3RlcmlzayBdOyB0 aGVuIFwKLS0JCWNhdCBjb250cmliL3NjcmlwdHMvc2FmZV9hc3RlcmlzayB8IHNlZCAnc3xfX0FT VEVSSVNLX1NCSU5fRElSX198JChBU1RTQklORElSKXw7c3xfX0FTVEVSSVNLX1ZBUlJVTl9ESVJf X3wkKEFTVFZBUlJVTkRJUil8OycgPiAkKERFU1RESVIpJChBU1RTQklORElSKS9zYWZlX2FzdGVy aXNrIDtcCi0tCQljaG1vZCA3NTUgJChERVNURElSKSQoQVNUU0JJTkRJUikvc2FmZV9hc3Rlcmlz aztcCi0rCQljYXQgY29udHJpYi9zY3JpcHRzL3NhZmVfYXN0ZXJpc2sgfCBzZWQgJ3N8X19BU1RF UklTS19TQklOX0RJUl9ffCQoQVNUU0JJTkRJUil8O3N8X19BU1RFUklTS19WQVJSVU5fRElSX198 JChBU1RWQVJSVU5ESVIpfDsnID4gY29udHJpYi9zY3JpcHRzL3NhZmVfYXN0ZXJpc2sub3V0O1wK LSsJCSAke0JTRF9JTlNUQUxMX1NDUklQVH0gY29udHJpYi9zY3JpcHRzL3NhZmVfYXN0ZXJpc2su b3V0ICQoREVTVERJUikkKEFTVFNCSU5ESVIpL3NhZmVfYXN0ZXJpc2s7XAotIAlmaQotLQkkKElO U1RBTEwpIC1kICQoREVTVERJUikkKEFTVEhFQURFUkRJUikKLS0JJChJTlNUQUxMKSAtbSA2NDQg aW5jbHVkZS9hc3Rlcmlzay5oICQoREVTVERJUikkKGluY2x1ZGVkaXIpCi0tCSQoSU5TVEFMTCkg LW0gNjQ0IGluY2x1ZGUvYXN0ZXJpc2svKi5oICQoREVTVERJUikkKEFTVEhFQURFUkRJUikKLSsJ JChNS0RJUikgJChERVNURElSKSQoQVNUSEVBREVSRElSKQotKwkkKEJTRF9JTlNUQUxMX0RBVEEp IGluY2x1ZGUvYXN0ZXJpc2suaCAkKERFU1RESVIpJChpbmNsdWRlZGlyKQotKwkkKEJTRF9JTlNU QUxMX0RBVEEpIGluY2x1ZGUvYXN0ZXJpc2svKi5oICQoREVTVERJUikkKEFTVEhFQURFUkRJUikK LSAJaWYgWyAtbiAiJChPTERIRUFERVJTKSIgXTsgdGhlbiBcCi0gCQlybSAtZiAkKGFkZHByZWZp eCAkKERFU1RESVIpJChBU1RIRUFERVJESVIpLywkKE9MREhFQURFUlMpKSA7XAotIAlmaQotLQlt a2RpciAtcCAkKERFU1RESVIpJChBU1RMT0dESVIpL2Nkci1jc3YKLS0JbWtkaXIgLXAgJChERVNU RElSKSQoQVNUTE9HRElSKS9jZHItY3VzdG9tCi0tCW1rZGlyIC1wICQoREVTVERJUikkKEFTVERB VEFESVIpL2tleXMKLS0JbWtkaXIgLXAgJChERVNURElSKSQoQVNUREFUQURJUikvZmlybXdhcmUK LS0JbWtkaXIgLXAgJChERVNURElSKSQoQVNUREFUQURJUikvZmlybXdhcmUvaWF4Ci0tCW1rZGly IC1wICQoREVTVERJUikkKEFTVE1BTkRJUikvbWFuOAotLQkkKElOU1RBTEwpIC1tIDY0NCBrZXlz L2lheHRlbC5wdWIgJChERVNURElSKSQoQVNUREFUQURJUikva2V5cwotLQkkKElOU1RBTEwpIC1t IDY0NCBrZXlzL2ZyZWV3b3JsZGRpYWx1cC5wdWIgJChERVNURElSKSQoQVNUREFUQURJUikva2V5 cwotLQkkKElOU1RBTEwpIC1tIDY0NCBkb2MvYXN0ZXJpc2suOCAkKERFU1RESVIpJChBU1RNQU5E SVIpL21hbjgKLS0JJChJTlNUQUxMKSAtbSA2NDQgY29udHJpYi9zY3JpcHRzL2FzdGdlbmtleS44 ICQoREVTVERJUikkKEFTVE1BTkRJUikvbWFuOAotLQkkKElOU1RBTEwpIC1tIDY0NCBjb250cmli L3NjcmlwdHMvYXV0b3N1cHBvcnQuOCAkKERFU1RESVIpJChBU1RNQU5ESVIpL21hbjgKLS0JJChJ TlNUQUxMKSAtbSA2NDQgY29udHJpYi9zY3JpcHRzL3NhZmVfYXN0ZXJpc2suOCAkKERFU1RESVIp JChBU1RNQU5ESVIpL21hbjgKLSsJJChNS0RJUikgJChERVNURElSKSQoQVNUTE9HRElSKS9jZHIt Y3N2Ci0rCSQoTUtESVIpICQoREVTVERJUikkKEFTVExPR0RJUikvY2RyLWN1c3RvbQotKwkkKE1L RElSKSAkKERFU1RESVIpJChBU1REQVRBRElSKS9rZXlzCi0rCSQoTUtESVIpICQoREVTVERJUikk KEFTVERBVEFESVIpL2Zpcm13YXJlCi0rCSQoTUtESVIpICQoREVTVERJUikkKEFTVERBVEFESVIp L2Zpcm13YXJlL2lheAotKwkkKE1LRElSKSAkKERFU1RESVIpJChBU1RNQU5ESVIpL21hbjgKLSsJ JChCU0RfSU5TVEFMTF9EQVRBKSBrZXlzL2lheHRlbC5wdWIgJChERVNURElSKSQoQVNUREFUQURJ Uikva2V5cwotKwkkKEJTRF9JTlNUQUxMX0RBVEEpIGtleXMvZnJlZXdvcmxkZGlhbHVwLnB1YiAk KERFU1RESVIpJChBU1REQVRBRElSKS9rZXlzCi0rCSQoQlNEX0lOU1RBTExfTUFOKSBkb2MvYXN0 ZXJpc2suOCAkKERFU1RESVIpJChBU1RNQU5ESVIpL21hbjgKLSsJJChCU0RfSU5TVEFMTF9NQU4p IGNvbnRyaWIvc2NyaXB0cy9hc3RnZW5rZXkuOCAkKERFU1RESVIpJChBU1RNQU5ESVIpL21hbjgK LSsJJChCU0RfSU5TVEFMTF9NQU4pIGNvbnRyaWIvc2NyaXB0cy9hdXRvc3VwcG9ydC44ICQoREVT VERJUikkKEFTVE1BTkRJUikvbWFuOAotKwkkKEJTRF9JTlNUQUxMX01BTikgY29udHJpYi9zY3Jp cHRzL3NhZmVfYXN0ZXJpc2suOCAkKERFU1RESVIpJChBU1RNQU5ESVIpL21hbjgKLSAJaWYgWyAt ZiBjb250cmliL2Zpcm13YXJlL2lheC9pYXh5LmJpbiBdIDsgdGhlbiBcCi0tCQkkKElOU1RBTEwp IC1tIDY0NCBjb250cmliL2Zpcm13YXJlL2lheC9pYXh5LmJpbiAkKERFU1RESVIpJChBU1REQVRB RElSKS9maXJtd2FyZS9pYXgvaWF4eS5iaW47IFwKLSsJCSQoQlNEX0lOU1RBTExfREFUQSkgY29u dHJpYi9maXJtd2FyZS9pYXgvaWF4eS5iaW4gJChERVNURElSKSQoQVNUREFUQURJUikvZmlybXdh cmUvaWF4L2lheHkuYmluOyBcCi0gCWZpCi0gCi0gJChTVUJESVJTX0lOU1RBTEwpOgotQEAgLTU3 OSw3ICs1ODEsNyBAQAotIAlAZXhpdCAxCi0gZW5kaWYKLSAKLS1pbnN0YWxsOiBiYWRzaGVsbCBk YXRhZmlsZXMgYmluaW5zdGFsbAotK2luc3RhbGw6IGJhZHNoZWxsIGRhdGFmaWxlcyBiaW5pbnN0 YWxsIHNhbXBsZXMKLSAJQGlmIFsgLXggL3Vzci9zYmluL2FzdGVyaXNrLXBvc3QtaW5zdGFsbCBd OyB0aGVuIFwKLSAJCS91c3Ivc2Jpbi9hc3Rlcmlzay1wb3N0LWluc3RhbGwgJChERVNURElSKSAu IDsgXAotIAlmaQotQEAgLTYxMSwzOCArNjEzLDI1IEBACi0gIyBYWFggd2h5ICouYWRzaSBpcyBp bnN0YWxsZWQgZmlyc3QgPwotIGFkc2k6Ci0gCUBlY2hvIEluc3RhbGxpbmcgYWRzaSBjb25maWcg ZmlsZXMuLi4KLS0JQG1rZGlyIC1wICQoREVTVERJUikkKEFTVEVUQ0RJUikKLSsJQCQoTUtESVIp ICQoREVTVERJUikkKEFTVEVUQ0RJUikKLSAJQGZvciB4IGluIGNvbmZpZ3MvKi5hZHNpOyBkbyBc Ci0gCQlkc3Q9IiQoREVTVERJUikkKEFTVEVUQ0RJUikvYCQoQkFTRU5BTUUpICQkeGAiIDsgXAot IAkJaWYgWyAtZiAkJHtkc3R9IF0gOyB0aGVuIFwKLS0JCQllY2hvICJPdmVyd3JpdGluZyAkJHgi IDsgXAotLQkJZWxzZSBcCi0tCQkJZWNobyAiSW5zdGFsbGluZyAkJHgiIDsgXAotKwkJCSQoQlNE X0lOU1RBTExfREFUQSkgJCR4ICQoREVTVERJUikkKEFTVEVUQ0RJUikvYCQoQkFTRU5BTUUpICQk eGAgOyBcCi0gCQlmaSA7IFwKLS0JCSQoSU5TVEFMTCkgLW0gNjQ0ICQkeCAkKERFU1RESVIpJChB U1RFVENESVIpL2AkKEJBU0VOQU1FKSAkJHhgIDsgXAotKwkJJChCU0RfSU5TVEFMTF9EQVRBKSAk JHggJChERVNURElSKSQoQVNURVRDRElSKS9gJChCQVNFTkFNRSkgJCR4YC1kaXN0IDsgXAotIAlk b25lCi0gCi0gc2FtcGxlczogYWRzaQotIAlAZWNobyBJbnN0YWxsaW5nIG90aGVyIGNvbmZpZyBm aWxlcy4uLgotLQlAbWtkaXIgLXAgJChERVNURElSKSQoQVNURVRDRElSKQotKwlAJChNS0RJUikg JChERVNURElSKSQoQVNURVRDRElSKQotIAlAZm9yIHggaW4gY29uZmlncy8qLnNhbXBsZTsgZG8g XAotLQkJZHN0PSIkKERFU1RESVIpJChBU1RFVENESVIpL2AkKEJBU0VOQU1FKSAkJHggLnNhbXBs ZWAiIDsJXAotLQkJaWYgWyAtZiAkJHtkc3R9IF07IHRoZW4gXAotLQkJCWlmIFsgIiQoT1ZFUldS SVRFKSIgPSAieSIgXTsgdGhlbiBcCi0tCQkJCWlmIGNtcCAtcyAkJHtkc3R9ICQkeCA7IHRoZW4g XAotLQkJCQkJZWNobyAiQ29uZmlnIGZpbGUgJCR4IGlzIHVuY2hhbmdlZCI7IFwKLS0JCQkJCWNv bnRpbnVlOyBcCi0tCQkJCWZpIDsgXAotLQkJCQltdiAtZiAkJHtkc3R9ICQke2RzdH0ub2xkIDsg XAotLQkJCWVsc2UgXAotLQkJCQllY2hvICJTa2lwcGluZyBjb25maWcgZmlsZSAkJHgiOyBcCi0t CQkJCWNvbnRpbnVlOyBcCi0tCQkJZmkgO1wKLSsJCSQoQlNEX0lOU1RBTExfREFUQSkgJCR4ICQo REVTVERJUikkKEFTVEVUQ0RJUikvYCQoQkFTRU5BTUUpICQkeCAuc2FtcGxlYC1kaXN0IDtcCi0r CQlpZiBbICEgLWYgJChERVNURElSKSQoQVNURVRDRElSKS9gJChCQVNFTkFNRSkgJCR4IC5zYW1w bGVgIF07IHRoZW4gXAotKwkJCSQoQlNEX0lOU1RBTExfREFUQSkgJCR4ICQoREVTVERJUikkKEFT VEVUQ0RJUikvYCQoQkFTRU5BTUUpICQkeCAuc2FtcGxlYDtcCi0gCQlmaSA7IFwKLS0JCWVjaG8g Ikluc3RhbGxpbmcgZmlsZSAkJHgiOyBcCi0tCQkkKElOU1RBTEwpIC1tIDY0NCAkJHggJCR7ZHN0 fSA7XAotIAlkb25lCi0tCUBpZiBbICIkKE9WRVJXUklURSkiID0gInkiIF0gfHwgWyAhIC1mICQo REVTVERJUikkKEFTVENPTkZQQVRIKSBdOyB0aGVuIFwKLSsJQGlmIHRydWU7IHRoZW4gXAotIAkJ ZWNobyAiQ3JlYXRpbmcgYXN0ZXJpc2suY29uZiI7IFwKLSAJCSggXAotIAkJZWNobyAiW2RpcmVj dG9yaWVzXSghKSA7IHJlbW92ZSB0aGUgKCEpIHRvIGVuYWJsZSB0aGlzIiA7IFwKLUBAIC02OTgs MTMgKzY4NywxNiBAQAotIAkJZWNobyAicGJ4X3JlYWx0aW1lPTEuNiIgOyBcCi0gCQllY2hvICJy ZXNfYWdpPTEuNiIgOyBcCi0gCQllY2hvICJhcHBfc2V0PTEuNiIgOyBcCi0tCQkpID4gJChERVNU RElSKSQoQVNUQ09ORlBBVEgpIDsgXAotKwkJKSA+ICQoREVTVERJUikkKEFTVENPTkZQQVRIKS1k aXN0IDsgXAotKwkJaWYgWyAhIC1mICQoREVTVERJUikkKEFTVENPTkZQQVRIKSBdOyB0aGVuIFwK LSsJCQkkKEJTRF9JTlNUQUxMX0RBVEEpICQoREVTVERJUikkKEFTVENPTkZQQVRIKS1kaXN0ICQo REVTVERJUikkKEFTVENPTkZQQVRIKTsgXAotKwkJZmk7IFwKLSAJZWxzZSBcCi0gCQllY2hvICJT a2lwcGluZyBhc3Rlcmlzay5jb25mIGNyZWF0aW9uIjsgXAotIAlmaQotLQlta2RpciAtcCAkKERF U1RESVIpJChBU1RTUE9PTERJUikvdm9pY2VtYWlsL2RlZmF1bHQvMTIzNC9JTkJPWAotKwkkKE1L RElSKSAkKERFU1RESVIpJChBU1RTUE9PTERJUikvdm9pY2VtYWlsL2RlZmF1bHQvMTIzNC9JTkJP WAotIAlidWlsZF90b29scy9tYWtlX3NhbXBsZV92b2ljZW1haWwgJChERVNURElSKS8kKEFTVERB VEFESVIpICQoREVTVERJUikvJChBU1RTUE9PTERJUikKLS0JQG1rZGlyIC1wICQoREVTVERJUikk KEFTVERBVEFESVIpL3Bob25lcHJvdgotKwlAJChNS0RJUikgJChERVNURElSKSQoQVNUREFUQURJ UikvcGhvbmVwcm92Ci0gCUBmb3IgeCBpbiBwaG9uZXByb3YvKjsgZG8gXAotIAkJZHN0PSIkKERF U1RESVIpJChBU1REQVRBRElSKS8kJHgiIDsJXAotIAkJaWYgWyAtZiAkJHtkc3R9IF07IHRoZW4g XAotQEAgLTcyMCwxNCArNzEyLDE0IEBACi0gCQkJZmkgO1wKLSAJCWZpIDsgXAotIAkJZWNobyAi SW5zdGFsbGluZyBmaWxlICQkeCI7IFwKLS0JCSQoSU5TVEFMTCkgLW0gNjQ0ICQkeCAkJHtkc3R9 IDtcCi0rCQkkKEJTRF9JTlNUQUxMX0RBVEEpICQkeCAkJHtkc3R9IDtcCi0gCWRvbmUKLSAKLSB3 ZWJ2bWFpbDoKLSAJQFsgLWQgJChERVNURElSKSQoSFRUUF9ET0NTRElSKS8gXSB8fCAoIHByaW50 ZiAiaHR0cCBkb2NzIGRpcmVjdG9yeSBub3QgZm91bmQuXG5VcGRhdGUgYXNzaWdubWVudCBvZiB2 YXJpYWJsZSBIVFRQX0RPQ1NESVIgaW4gTWFrZWZpbGUhXG4iICYmIGV4aXQgMSApCi0gCUBbIC1k ICQoREVTVERJUikkKEhUVFBfQ0dJRElSKSBdIHx8ICggcHJpbnRmICJjZ2ktYmluIGRpcmVjdG9y eSBub3QgZm91bmQuXG5VcGRhdGUgYXNzaWdubWVudCBvZiB2YXJpYWJsZSBIVFRQX0NHSURJUiBp biBNYWtlZmlsZSFcbiIgJiYgZXhpdCAxICkKLSAJJChJTlNUQUxMKSAtbSA0NzU1IC1vIHJvb3Qg LWcgcm9vdCBjb250cmliL3NjcmlwdHMvdm1haWwuY2dpICQoREVTVERJUikkKEhUVFBfQ0dJRElS KS92bWFpbC5jZ2kKLS0JbWtkaXIgLXAgJChERVNURElSKSQoSFRUUF9ET0NTRElSKS9fYXN0ZXJp c2sKLSsJJChNS0RJUikgJChERVNURElSKSQoSFRUUF9ET0NTRElSKS9fYXN0ZXJpc2sKLSAJZm9y IHggaW4gaW1hZ2VzLyouZ2lmOyBkbyBcCi0gCQkkKElOU1RBTEwpIC1tIDY0NCAkJHggJChERVNU RElSKSQoSFRUUF9ET0NTRElSKS9fYXN0ZXJpc2svOyBcCi0gCWRvbmUKSW5kZXg6IGZpbGVzL3Bh dGNoLU1ha2VmaWxlCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IGZpbGVzL3BhdGNoLU1ha2VmaWxlCmRp ZmYgLU4gZmlsZXMvcGF0Y2gtTWFrZWZpbGUKLS0tIC9kZXYvbnVsbAkxIEphbiAxOTcwIDAwOjAw OjAwIC0wMDAwCisrKyBmaWxlcy9wYXRjaC1NYWtlZmlsZQkyNSBTZXAgMjAxMCAxNDowNTo1MiAt MDAwMApAQCAtMCwwICsxLDI1OCBAQAorLS0tIE1ha2VmaWxlLm9yaWcJMjAxMC0wNi0xMSAwNToz NTowNi4wMDAwMDAwMDAgKzA5MDAKKysrKyBNYWtlZmlsZQkyMDEwLTA5LTI1IDIzOjA0OjU5LjAw MDAwMDAwMCArMDkwMAorQEAgLTEyMSw3ICsxMjEsNyBAQAorIE9WRVJXUklURT15CisgCisgIyBJ bmNsdWRlIGRlYnVnIGFuZCBtYWNybyBzeW1ib2xzIGluIHRoZSBleGVjdXRhYmxlcyAoLWcpIGFu ZCBwcm9maWxpbmcgaW5mbyAoLXBnKQorLURFQlVHPS1nMworKyNERUJVRz0tZzMKKyAKKyAKKyAj IERlZmluZSBzdGFuZGFyZCBkaXJlY3RvcmllcyBmb3IgdmFyaW91cyBwbGF0Zm9ybXMKK0BAIC0x NDksNyArMTQ5LDcgQEAKKyAgIEFTVE1BTkRJUj0kKG1hbmRpcikKKyBpZm5lcSAoJChmaW5kc3Ry aW5nIEJTRCwkKE9TQVJDSCkpLCkKKyAgIEFTVFZBUkxJQkRJUj0kKHByZWZpeCkvc2hhcmUvYXN0 ZXJpc2sKKy0gIEFTVFZBUlJVTkRJUj0kKGxvY2Fsc3RhdGVkaXIpL3J1bi9hc3RlcmlzaworKyAg QVNUVkFSUlVORElSPSQobG9jYWxzdGF0ZWRpcikvcnVuCisgICBBU1REQkRJUj0kKGxvY2Fsc3Rh dGVkaXIpL2RiL2FzdGVyaXNrCisgZWxzZQorICAgQVNUVkFSTElCRElSPSQobG9jYWxzdGF0ZWRp cikvbGliL2FzdGVyaXNrCitAQCAtMjQ4LDEyICsyNDgsMTMgQEAKKyBpZm5lcSAoJChmaW5kc3Ry aW5nIEJTRCwkKE9TQVJDSCkpLCkKKyAgIF9BU1RDRkxBR1MrPS1pc3lzdGVtIC91c3IvbG9jYWwv aW5jbHVkZQorIGVuZGlmCistCisraWZuZXEgKCQoT1NBUkNIKSxGcmVlQlNEKQorIGlmZXEgKCQo ZmluZHN0cmluZyAtbWFyY2gsJChfQVNUQ0ZMQUdTKSAkKEFTVENGTEFHUykpLCkKKyAgIGlmbmVx ICgkKFBST0MpLHVsdHJhc3BhcmMpCisgICAgIF9BU1RDRkxBR1MrPSQoc2hlbGwgaWYgJChDQykg LW1hcmNoPSQoUFJPQykgLVMgLW8gL2Rldi9udWxsIC14YyAvZGV2L251bGwgPi9kZXYvbnVsbCAy PiYxOyB0aGVuIGVjaG8gIi1tYXJjaD0kKFBST0MpIjsgZmkpCisgICBlbmRpZgorIGVuZGlmCisr ZW5kaWYKKyAKKyBpZmVxICgkKFBST0MpLHBwYykKKyAgIF9BU1RDRkxBR1MrPS1mc2lnbmVkLWNo YXIKK0BAIC0yNjEsNyArMjYyLDcgQEAKKyAKKyBpZmVxICgkKE9TQVJDSCksRnJlZUJTRCkKKyAg ICMgLVYgaXMgdW5kZXJzdG9vZCBieSBCU0QgTWFrZSwgbm90IGJ5IEdOVSBtYWtlLgorLSAgQlNE VkVSU0lPTj0kKHNoZWxsIG1ha2UgLVYgT1NWRVJTSU9OIC1mIC91c3Ivc2hhcmUvbWsvYnNkLnBv cnQuc3ViZGlyLm1rKQorKyAgQlNEVkVSU0lPTj0kKE9TVkVSU0lPTikKKyAgIF9BU1RDRkxBR1Mr PSQoc2hlbGwgaWYgdGVzdCAkKEJTRFZFUlNJT04pIC1sdCA1MDAwMTYgOyB0aGVuIGVjaG8gIi1E X1RIUkVBRF9TQUZFIjsgZmkpCisgZW5kaWYKKyAKK0BAIC00NzgsMjEgKzQ3OSwyMyBAQAorICMg U2hvdWxkIHN0YXRpYyBIVFRQIGJlIGluc3RhbGxlZCBkdXJpbmcgbWFrZSBzYW1wbGVzIG9yIGV2 ZW4gd2l0aCBpdHMgb3duIHRhcmdldCBhbGEKKyAjIHdlYnZvaWNlbWFpbD8gIFRoZXJlIGFyZSBw b3J0aW9ucyBoZXJlIHRoYXQgKmNvdWxkKiBiZSBjdXN0b21pemVkIGJ1dCBtaWdodCBhbHNvIGJl CisgIyBpbXByb3ZlZCBhIGxvdC4gIEknbGwgcHV0IGl0IGhlcmUgZm9yIG5vdy4KKy0JbWtkaXIg LXAgJChERVNURElSKSQoQVNUREFUQURJUikvc3RhdGljLWh0dHAKKysJJChNS0RJUikgJChERVNU RElSKSQoQVNUREFUQURJUikvc3RhdGljLWh0dHAKKyAJZm9yIHggaW4gc3RhdGljLWh0dHAvKjsg ZG8gXAorLQkJJChJTlNUQUxMKSAtbSA2NDQgJCR4ICQoREVTVERJUikkKEFTVERBVEFESVIpL3N0 YXRpYy1odHRwIDsgXAorKwkJJChCU0RfSU5TVEFMTF9EQVRBKSAkJHggJChERVNURElSKSQoQVNU REFUQURJUikvc3RhdGljLWh0dHAgOyBcCisgCWRvbmUKKyAJaWYgWyAtZCBkb2MvdGV4L2FzdGVy aXNrIF0gOyB0aGVuIFwKKy0JCQlta2RpciAtcCAkKERFU1RESVIpJChBU1REQVRBRElSKS9zdGF0 aWMtaHR0cC9kb2NzIDsgXAorKwkJCSQoTUtESVIpICQoREVTVERJUikkKERPQ1NESVIpIDsgXAor IAkJCWZvciBuIGluIGRvYy90ZXgvYXN0ZXJpc2svKiA7IGRvIFwKKy0JCQkJJChJTlNUQUxMKSAt bSA2NDQgJCRuICQoREVTVERJUikkKEFTVERBVEFESVIpL3N0YXRpYy1odHRwL2RvY3MgOyBcCisr CQkJCSQoQlNEX0lOU1RBTExfREFUQSkgJCRuICQoREVTVERJUikkKERPQ1NESVIpIDsgXAorIAkJ CWRvbmUgXAorIAlmaQorLQlta2RpciAtcCAkKERFU1RESVIpJChBU1REQVRBRElSKS9pbWFnZXMK KysJaWYgWyAhIC1kICQoREVTVERJUikkKERPQ1NESVIpL2ltYWdlcyBdOyB0aGVuIFwKKysJICAg ICQoTUtESVIpICQoREVTVERJUikkKERPQ1NESVIpL2ltYWdlczsgXAorKwlmaQorIAlmb3IgeCBp biBpbWFnZXMvKi5qcGc7IGRvIFwKKy0JCSQoSU5TVEFMTCkgLW0gNjQ0ICQkeCAkKERFU1RESVIp JChBU1REQVRBRElSKS9pbWFnZXMgOyBcCisrCQkkKEJTRF9JTlNUQUxMX0RBVEEpICQkeCAkKERF U1RESVIpJChET0NTRElSKS9pbWFnZXMgOyBcCisgCWRvbmUKKy0JbWtkaXIgLXAgJChERVNURElS KSQoQUdJX0RJUikKKysJJChNS0RJUikgJChERVNURElSKSQoQUdJX0RJUikKKyAJJChNQUtFKSAt QyBzb3VuZHMgaW5zdGFsbAorIAorIGRvYy9jb3JlLWVuX1VTLnhtbDogJChmb3JlYWNoIGRpciwk KE1PRF9TVUJESVJTKSwkKHNoZWxsICQoR1JFUCkgLWwgImxhbmd1YWdlPVwiZW5fVVNcIiIgJChk aXIpLyouYyAkKGRpcikvKi5jYyAyPi9kZXYvbnVsbCkpCitAQCAtNTM5LDUwICs1NDIsNTIgQEAK KyBPTERIRUFERVJTPSQoZmlsdGVyLW91dCAkKE5FV0hFQURFUlMpLCQobm90ZGlyICQod2lsZGNh cmQgJChERVNURElSKSQoQVNUSEVBREVSRElSKS8qLmgpKSkKKyAKKyBpbnN0YWxsZGlyczoKKy0J bWtkaXIgLXAgJChERVNURElSKSQoTU9EVUxFU19ESVIpCistCW1rZGlyIC1wICQoREVTVERJUikk KEFTVFNCSU5ESVIpCistCW1rZGlyIC1wICQoREVTVERJUikkKEFTVEVUQ0RJUikKKy0JbWtkaXIg LXAgJChERVNURElSKSQoQVNUVkFSUlVORElSKQorLQlta2RpciAtcCAkKERFU1RESVIpJChBU1RT UE9PTERJUikvdm9pY2VtYWlsCistCW1rZGlyIC1wICQoREVTVERJUikkKEFTVFNQT09MRElSKS9k aWN0YXRlCistCW1rZGlyIC1wICQoREVTVERJUikkKEFTVFNQT09MRElSKS9zeXN0ZW0KKy0JbWtk aXIgLXAgJChERVNURElSKSQoQVNUU1BPT0xESVIpL3RtcAorLQlta2RpciAtcCAkKERFU1RESVIp JChBU1RTUE9PTERJUikvbWVldG1lCistCW1rZGlyIC1wICQoREVTVERJUikkKEFTVFNQT09MRElS KS9tb25pdG9yCisrCSQoTUtESVIpICQoREVTVERJUikkKE1PRFVMRVNfRElSKQorKwkkKE1LRElS KSAkKERFU1RESVIpJChBU1RTQklORElSKQorKwkkKE1LRElSKSAkKERFU1RESVIpJChBU1RFVENE SVIpCisrCSQoTUtESVIpICQoREVTVERJUikkKEFTVFZBUlJVTkRJUikKKysJJChNS0RJUikgJChE RVNURElSKSQoQVNUREJESVIpCisrCSQoTUtESVIpICQoREVTVERJUikkKEFTVFNQT09MRElSKS92 b2ljZW1haWwKKysJJChNS0RJUikgJChERVNURElSKSQoQVNUU1BPT0xESVIpL2RpY3RhdGUKKysJ JChNS0RJUikgJChERVNURElSKSQoQVNUU1BPT0xESVIpL291dGdvaW5nCisrCSQoTUtESVIpICQo REVTVERJUikkKEFTVFNQT09MRElSKS9zeXN0ZW0KKysJJChNS0RJUikgJChERVNURElSKSQoQVNU U1BPT0xESVIpL3RtcAorKwkkKE1LRElSKSAkKERFU1RESVIpJChBU1RTUE9PTERJUikvbWVldG1l CisrCSQoTUtESVIpICQoREVTVERJUikkKEFTVFNQT09MRElSKS9tb25pdG9yCisgCisgYmluaW5z dGFsbDogX2FsbCBpbnN0YWxsZGlycyAkKFNVQkRJUlNfSU5TVEFMTCkKKy0JJChJTlNUQUxMKSAt bSA3NTUgbWFpbi9hc3RlcmlzayAkKERFU1RESVIpJChBU1RTQklORElSKS8KKysJJChCU0RfSU5T VEFMTF9QUk9HUkFNKSBtYWluL2FzdGVyaXNrICQoREVTVERJUikkKEFTVFNCSU5ESVIpLworIAkk KExOKSAtc2YgYXN0ZXJpc2sgJChERVNURElSKSQoQVNUU0JJTkRJUikvcmFzdGVyaXNrCistCSQo SU5TVEFMTCkgLW0gNzU1IGNvbnRyaWIvc2NyaXB0cy9hc3RnZW5rZXkgJChERVNURElSKSQoQVNU U0JJTkRJUikvCistCSQoSU5TVEFMTCkgLW0gNzU1IGNvbnRyaWIvc2NyaXB0cy9hdXRvc3VwcG9y dCAkKERFU1RESVIpJChBU1RTQklORElSKS8KKysJJChCU0RfSU5TVEFMTF9TQ1JJUFQpIGNvbnRy aWIvc2NyaXB0cy9hc3RnZW5rZXkgJChERVNURElSKSQoQVNUU0JJTkRJUikvCisrCSQoQlNEX0lO U1RBTExfU0NSSVBUKSBjb250cmliL3NjcmlwdHMvYXV0b3N1cHBvcnQgJChERVNURElSKSQoQVNU U0JJTkRJUikvCisgCWlmIFsgISAtZiAkKERFU1RESVIpJChBU1RTQklORElSKS9zYWZlX2FzdGVy aXNrIF07IHRoZW4gXAorLQkJY2F0IGNvbnRyaWIvc2NyaXB0cy9zYWZlX2FzdGVyaXNrIHwgc2Vk ICdzfF9fQVNURVJJU0tfU0JJTl9ESVJfX3wkKEFTVFNCSU5ESVIpfDtzfF9fQVNURVJJU0tfVkFS UlVOX0RJUl9ffCQoQVNUVkFSUlVORElSKXw7JyA+ICQoREVTVERJUikkKEFTVFNCSU5ESVIpL3Nh ZmVfYXN0ZXJpc2sgO1wKKy0JCWNobW9kIDc1NSAkKERFU1RESVIpJChBU1RTQklORElSKS9zYWZl X2FzdGVyaXNrO1wKKysJCWNhdCBjb250cmliL3NjcmlwdHMvc2FmZV9hc3RlcmlzayB8IHNlZCAn c3xfX0FTVEVSSVNLX1NCSU5fRElSX198JChBU1RTQklORElSKXw7c3xfX0FTVEVSSVNLX1ZBUlJV Tl9ESVJfX3wkKEFTVFZBUlJVTkRJUil8OycgPiBjb250cmliL3NjcmlwdHMvc2FmZV9hc3Rlcmlz ay5vdXQ7XAorKwkJJHtCU0RfSU5TVEFMTF9TQ1JJUFR9IGNvbnRyaWIvc2NyaXB0cy9zYWZlX2Fz dGVyaXNrLm91dCAkKERFU1RESVIpJChBU1RTQklORElSKS9zYWZlX2FzdGVyaXNrO1wKKyAJZmkK Ky0JJChJTlNUQUxMKSAtZCAkKERFU1RESVIpJChBU1RIRUFERVJESVIpCistCSQoSU5TVEFMTCkg LW0gNjQ0IGluY2x1ZGUvYXN0ZXJpc2suaCAkKERFU1RESVIpJChpbmNsdWRlZGlyKQorLQkkKElO U1RBTEwpIC1tIDY0NCBpbmNsdWRlL2FzdGVyaXNrLyouaCAkKERFU1RESVIpJChBU1RIRUFERVJE SVIpCisrCSQoTUtESVIpICQoREVTVERJUikkKEFTVEhFQURFUkRJUikKKysJJChCU0RfSU5TVEFM TF9EQVRBKSBpbmNsdWRlL2FzdGVyaXNrLmggJChERVNURElSKSQoaW5jbHVkZWRpcikKKysJJChC U0RfSU5TVEFMTF9EQVRBKSBpbmNsdWRlL2FzdGVyaXNrLyouaCAkKERFU1RESVIpJChBU1RIRUFE RVJESVIpCisgCWlmIFsgLW4gIiQoT0xESEVBREVSUykiIF07IHRoZW4gXAorIAkJcm0gLWYgJChh ZGRwcmVmaXggJChERVNURElSKSQoQVNUSEVBREVSRElSKS8sJChPTERIRUFERVJTKSkgO1wKKyAJ ZmkKKy0JbWtkaXIgLXAgJChERVNURElSKSQoQVNUREFUQURJUikvZG9jdW1lbnRhdGlvbgorLQlt a2RpciAtcCAkKERFU1RESVIpJChBU1REQVRBRElSKS9kb2N1bWVudGF0aW9uL3RoaXJkcGFydHkK Ky0JbWtkaXIgLXAgJChERVNURElSKSQoQVNUTE9HRElSKS9jZHItY3N2CistCW1rZGlyIC1wICQo REVTVERJUikkKEFTVExPR0RJUikvY2RyLWN1c3RvbQorLQlta2RpciAtcCAkKERFU1RESVIpJChB U1REQVRBRElSKS9rZXlzCistCW1rZGlyIC1wICQoREVTVERJUikkKEFTVERBVEFESVIpL2Zpcm13 YXJlCistCW1rZGlyIC1wICQoREVTVERJUikkKEFTVERBVEFESVIpL2Zpcm13YXJlL2lheAorLQlt a2RpciAtcCAkKERFU1RESVIpJChBU1RNQU5ESVIpL21hbjgKKy0JJChJTlNUQUxMKSAtbSA2NDQg ZG9jL2NvcmUtKi54bWwgJChERVNURElSKSQoQVNUREFUQURJUikvZG9jdW1lbnRhdGlvbgorLQkk KElOU1RBTEwpIC1tIDY0NCBkb2MvYXBwZG9jc3htbC5kdGQgJChERVNURElSKSQoQVNUREFUQURJ UikvZG9jdW1lbnRhdGlvbgorLQkkKElOU1RBTEwpIC1tIDY0NCBrZXlzL2lheHRlbC5wdWIgJChE RVNURElSKSQoQVNUREFUQURJUikva2V5cworLQkkKElOU1RBTEwpIC1tIDY0NCBrZXlzL2ZyZWV3 b3JsZGRpYWx1cC5wdWIgJChERVNURElSKSQoQVNUREFUQURJUikva2V5cworLQkkKElOU1RBTEwp IC1tIDY0NCBkb2MvYXN0ZXJpc2suOCAkKERFU1RESVIpJChBU1RNQU5ESVIpL21hbjgKKy0JJChJ TlNUQUxMKSAtbSA2NDQgY29udHJpYi9zY3JpcHRzL2FzdGdlbmtleS44ICQoREVTVERJUikkKEFT VE1BTkRJUikvbWFuOAorLQkkKElOU1RBTEwpIC1tIDY0NCBjb250cmliL3NjcmlwdHMvYXV0b3N1 cHBvcnQuOCAkKERFU1RESVIpJChBU1RNQU5ESVIpL21hbjgKKy0JJChJTlNUQUxMKSAtbSA2NDQg Y29udHJpYi9zY3JpcHRzL3NhZmVfYXN0ZXJpc2suOCAkKERFU1RESVIpJChBU1RNQU5ESVIpL21h bjgKKysJJChNS0RJUikgJChERVNURElSKSQoQVNUREFUQURJUikvZG9jdW1lbnRhdGlvbgorKwkk KE1LRElSKSAkKERFU1RESVIpJChBU1REQVRBRElSKS9kb2N1bWVudGF0aW9uL3RoaXJkcGFydHkK KysJJChNS0RJUikgJChERVNURElSKSQoQVNUTE9HRElSKS9jZHItY3N2CisrCSQoTUtESVIpICQo REVTVERJUikkKEFTVExPR0RJUikvY2RyLWN1c3RvbQorKwkkKE1LRElSKSAkKERFU1RESVIpJChB U1REQVRBRElSKS9rZXlzCisrCSQoTUtESVIpICQoREVTVERJUikkKEFTVERBVEFESVIpL2Zpcm13 YXJlCisrCSQoTUtESVIpICQoREVTVERJUikkKEFTVERBVEFESVIpL2Zpcm13YXJlL2lheAorKwkk KE1LRElSKSAkKERFU1RESVIpJChBU1RNQU5ESVIpL21hbjgKKysJJChCU0RfSU5TVEFMTF9EQVRB KSBkb2MvY29yZS0qLnhtbCAkKERFU1RESVIpJChBU1REQVRBRElSKS9kb2N1bWVudGF0aW9uCisr CSQoQlNEX0lOU1RBTExfREFUQSkgZG9jL2FwcGRvY3N4bWwuZHRkICQoREVTVERJUikkKEFTVERB VEFESVIpL2RvY3VtZW50YXRpb24KKysJJChCU0RfSU5TVEFMTF9EQVRBKSBrZXlzL2lheHRlbC5w dWIgJChERVNURElSKSQoQVNUREFUQURJUikva2V5cworKwkkKEJTRF9JTlNUQUxMX0RBVEEpIGtl eXMvZnJlZXdvcmxkZGlhbHVwLnB1YiAkKERFU1RESVIpJChBU1REQVRBRElSKS9rZXlzCisrCSQo QlNEX0lOU1RBTExfTUFOKSBkb2MvYXN0ZXJpc2suOCAkKERFU1RESVIpJChBU1RNQU5ESVIpL21h bjgKKysJJChCU0RfSU5TVEFMTF9NQU4pIGNvbnRyaWIvc2NyaXB0cy9hc3RnZW5rZXkuOCAkKERF U1RESVIpJChBU1RNQU5ESVIpL21hbjgKKysJJChCU0RfSU5TVEFMTF9NQU4pIGNvbnRyaWIvc2Ny aXB0cy9hdXRvc3VwcG9ydC44ICQoREVTVERJUikkKEFTVE1BTkRJUikvbWFuOAorKwkkKEJTRF9J TlNUQUxMX01BTikgY29udHJpYi9zY3JpcHRzL3NhZmVfYXN0ZXJpc2suOCAkKERFU1RESVIpJChB U1RNQU5ESVIpL21hbjgKKyAJaWYgWyAtZiBjb250cmliL2Zpcm13YXJlL2lheC9pYXh5LmJpbiBd IDsgdGhlbiBcCistCQkkKElOU1RBTEwpIC1tIDY0NCBjb250cmliL2Zpcm13YXJlL2lheC9pYXh5 LmJpbiAkKERFU1RESVIpJChBU1REQVRBRElSKS9maXJtd2FyZS9pYXgvaWF4eS5iaW47IFwKKysJ CSQoQlNEX0lOU1RBTExfREFUQSkgY29udHJpYi9maXJtd2FyZS9pYXgvaWF4eS5iaW4gJChERVNU RElSKSQoQVNUREFUQURJUikvZmlybXdhcmUvaWF4L2lheHkuYmluOyBcCisgCWZpCisgCisgJChT VUJESVJTX0lOU1RBTEwpOgorQEAgLTYxNiw3ICs2MjEsNyBAQAorIAlAZXhpdCAxCisgZW5kaWYK KyAKKy1pbnN0YWxsOiBiYWRzaGVsbCBkYXRhZmlsZXMgYmluaW5zdGFsbAorK2luc3RhbGw6IGJh ZHNoZWxsIGRhdGFmaWxlcyBiaW5pbnN0YWxsIHNhbXBsZXMKKyAJQGlmIFsgLXggL3Vzci9zYmlu L2FzdGVyaXNrLXBvc3QtaW5zdGFsbCBdOyB0aGVuIFwKKyAJCS91c3Ivc2Jpbi9hc3Rlcmlzay1w b3N0LWluc3RhbGwgJChERVNURElSKSAuIDsgXAorIAlmaQorQEAgLTY1MCwzOCArNjU1LDI1IEBA CisgIyBYWFggd2h5ICouYWRzaSBpcyBpbnN0YWxsZWQgZmlyc3QgPworIGFkc2k6CisgCUBlY2hv IEluc3RhbGxpbmcgYWRzaSBjb25maWcgZmlsZXMuLi4KKy0JQG1rZGlyIC1wICQoREVTVERJUikk KEFTVEVUQ0RJUikKKysJQCQoTUtESVIpICQoREVTVERJUikkKEFTVEVUQ0RJUikKKyAJQGZvciB4 IGluIGNvbmZpZ3MvKi5hZHNpOyBkbyBcCisgCQlkc3Q9IiQoREVTVERJUikkKEFTVEVUQ0RJUikv YCQoQkFTRU5BTUUpICQkeGAiIDsgXAorIAkJaWYgWyAtZiAkJHtkc3R9IF0gOyB0aGVuIFwKKy0J CQllY2hvICJPdmVyd3JpdGluZyAkJHgiIDsgXAorLQkJZWxzZSBcCistCQkJZWNobyAiSW5zdGFs bGluZyAkJHgiIDsgXAorKwkJICAgICQoQlNEX0lOU1RBTExfREFUQSkgJCR4ICQoREVTVERJUikk KEFTVEVUQ0RJUikvYCQoQkFTRU5BTUUpICQkeGAgOyBcCisgCQlmaSA7IFwKKy0JCSQoSU5TVEFM TCkgLW0gNjQ0ICQkeCAkKERFU1RESVIpJChBU1RFVENESVIpL2AkKEJBU0VOQU1FKSAkJHhgIDsg XAorKwkJJChCU0RfSU5TVEFMTF9EQVRBKSAkJHggJChERVNURElSKSQoQVNURVRDRElSKS9gJChC QVNFTkFNRSkgJCR4YC1kaXN0IDsgXAorIAlkb25lCisgCisgc2FtcGxlczogYWRzaQorIAlAZWNo byBJbnN0YWxsaW5nIG90aGVyIGNvbmZpZyBmaWxlcy4uLgorLQlAbWtkaXIgLXAgJChERVNURElS KSQoQVNURVRDRElSKQorKwlAJChNS0RJUikgJChERVNURElSKSQoQVNURVRDRElSKQorIAlAZm9y IHggaW4gY29uZmlncy8qLnNhbXBsZTsgZG8gXAorLQkJZHN0PSIkKERFU1RESVIpJChBU1RFVENE SVIpL2AkKEJBU0VOQU1FKSAkJHggLnNhbXBsZWAiIDsJXAorLQkJaWYgWyAtZiAkJHtkc3R9IF07 IHRoZW4gXAorLQkJCWlmIFsgIiQoT1ZFUldSSVRFKSIgPSAieSIgXTsgdGhlbiBcCistCQkJCWlm IGNtcCAtcyAkJHtkc3R9ICQkeCA7IHRoZW4gXAorLQkJCQkJZWNobyAiQ29uZmlnIGZpbGUgJCR4 IGlzIHVuY2hhbmdlZCI7IFwKKy0JCQkJCWNvbnRpbnVlOyBcCistCQkJCWZpIDsgXAorLQkJCQlt diAtZiAkJHtkc3R9ICQke2RzdH0ub2xkIDsgXAorLQkJCWVsc2UgXAorLQkJCQllY2hvICJTa2lw cGluZyBjb25maWcgZmlsZSAkJHgiOyBcCistCQkJCWNvbnRpbnVlOyBcCistCQkJZmkgO1wKKysJ CSQoQlNEX0lOU1RBTExfREFUQSkgJCR4ICQoREVTVERJUikkKEFTVEVUQ0RJUikvYCQoQkFTRU5B TUUpICQkeCAuc2FtcGxlYC1kaXN0IDsgXAorKwkJaWYgWyAhIC1mICQoREVTVERJUikkKEFTVEVU Q0RJUikvYCQoQkFTRU5BTUUpICQkeCAuc2FtcGxlYCBdOyB0aGVuIFwKKysJCSAgICAkKEJTRF9J TlNUQUxMX0RBVEEpICQkeCAkKERFU1RESVIpJChBU1RFVENESVIpL2AkKEJBU0VOQU1FKSAkJHgg LnNhbXBsZWA7IFwKKyAJCWZpIDsgXAorLQkJZWNobyAiSW5zdGFsbGluZyBmaWxlICQkeCI7IFwK Ky0JCSQoSU5TVEFMTCkgLW0gNjQ0ICQkeCAkJHtkc3R9IDtcCisgCWRvbmUKKy0JQGlmIFsgIiQo T1ZFUldSSVRFKSIgPSAieSIgXSB8fCBbICEgLWYgJChERVNURElSKSQoQVNUQ09ORlBBVEgpIF07 IHRoZW4gXAorKwlAaWYgdHJ1ZTsgdGhlbiBcCisgCQllY2hvICJDcmVhdGluZyBhc3Rlcmlzay5j b25mIjsgXAorIAkJKCBcCisgCQllY2hvICJbZGlyZWN0b3JpZXNdKCEpIDsgcmVtb3ZlIHRoZSAo ISkgdG8gZW5hYmxlIHRoaXMiIDsgXAorQEAgLTc0NSwxNCArNzM3LDE3IEBACisgCQllY2hvICJw YnhfcmVhbHRpbWU9MS42IiA7IFwKKyAJCWVjaG8gInJlc19hZ2k9MS42IiA7IFwKKyAJCWVjaG8g ImFwcF9zZXQ9MS42IiA7IFwKKy0JCSkgPiAkKERFU1RESVIpJChBU1RDT05GUEFUSCkgOyBcCisr CQkpID4gJChERVNURElSKSQoQVNUQ09ORlBBVEgpLWRpc3QgOyBcCisrCQlpZiBbICEgLWYgJChE RVNURElSKSQoQVNUQ09ORlBBVEgpIF07IHRoZW4gXAorKwkJICAgICQoQlNEX0lOU1RBTExfREFU QSkgJChERVNURElSKSQoQVNUQ09ORlBBVEgpLWRpc3QgJChERVNURElSKSQoQVNUQ09ORlBBVEgp OyBcCisrCQlmaTsgXAorIAllbHNlIFwKKyAJCWVjaG8gIlNraXBwaW5nIGFzdGVyaXNrLmNvbmYg Y3JlYXRpb24iOyBcCisgCWZpCistCW1rZGlyIC1wICQoREVTVERJUikkKEFTVFNQT09MRElSKS92 b2ljZW1haWwvZGVmYXVsdC8xMjM0L0lOQk9YCisrCSQoTUtESVIpICQoREVTVERJUikkKEFTVFNQ T09MRElSKS92b2ljZW1haWwvZGVmYXVsdC8xMjM0L0lOQk9YCisgCWJ1aWxkX3Rvb2xzL21ha2Vf c2FtcGxlX3ZvaWNlbWFpbCAkKERFU1RESVIpLyQoQVNUREFUQURJUikgJChERVNURElSKS8kKEFT VFNQT09MRElSKQorLQlAbWtkaXIgLXAgJChERVNURElSKSQoQVNUREFUQURJUikvcGhvbmVwcm92 CistCUBmb3IgeCBpbiBwaG9uZXByb3YvKjsgZG8gXAorKwlAJChNS0RJUikgJChERVNURElSKSQo QVNUREFUQURJUikvcGhvbmVwcm92CisrCWZvciB4IGluIHBob25lcHJvdi8qOyBkbyBcCisgCQlk c3Q9IiQoREVTVERJUikkKEFTVERBVEFESVIpLyQkeCIgOwlcCisgCQlpZiBbIC1mICQke2RzdH0g XTsgdGhlbiBcCisgCQkJaWYgWyAiJChPVkVSV1JJVEUpIiA9ICJ5IiBdOyB0aGVuIFwKK0BAIC03 NjcsMTQgKzc2MiwxNCBAQAorIAkJCWZpIDtcCisgCQlmaSA7IFwKKyAJCWVjaG8gIkluc3RhbGxp bmcgZmlsZSAkJHgiOyBcCistCQkkKElOU1RBTEwpIC1tIDY0NCAkJHggJCR7ZHN0fSA7XAorKwkJ JChCU0RfSU5TVEFMTF9EQVRBKSAkJHggJCR7ZHN0fSA7XAorIAlkb25lCisgCisgd2Vidm1haWw6 CisgCUBbIC1kICQoREVTVERJUikkKEhUVFBfRE9DU0RJUikvIF0gfHwgKCBwcmludGYgImh0dHAg ZG9jcyBkaXJlY3Rvcnkgbm90IGZvdW5kLlxuVXBkYXRlIGFzc2lnbm1lbnQgb2YgdmFyaWFibGUg SFRUUF9ET0NTRElSIGluIE1ha2VmaWxlIVxuIiAmJiBleGl0IDEgKQorIAlAWyAtZCAkKERFU1RE SVIpJChIVFRQX0NHSURJUikgXSB8fCAoIHByaW50ZiAiY2dpLWJpbiBkaXJlY3Rvcnkgbm90IGZv dW5kLlxuVXBkYXRlIGFzc2lnbm1lbnQgb2YgdmFyaWFibGUgSFRUUF9DR0lESVIgaW4gTWFrZWZp bGUhXG4iICYmIGV4aXQgMSApCisgCSQoSU5TVEFMTCkgLW0gNDc1NSAtbyByb290IC1nIHJvb3Qg Y29udHJpYi9zY3JpcHRzL3ZtYWlsLmNnaSAkKERFU1RESVIpJChIVFRQX0NHSURJUikvdm1haWwu Y2dpCistCW1rZGlyIC1wICQoREVTVERJUikkKEhUVFBfRE9DU0RJUikvX2FzdGVyaXNrCisrCSQo TUtESVIpICQoREVTVERJUikkKEhUVFBfRE9DU0RJUikvX2FzdGVyaXNrCisgCWZvciB4IGluIGlt YWdlcy8qLmdpZjsgZG8gXAorIAkJJChJTlNUQUxMKSAtbSA2NDQgJCR4ICQoREVTVERJUikkKEhU VFBfRE9DU0RJUikvX2FzdGVyaXNrLzsgXAorIAlkb25lCkluZGV4OiBmaWxlcy9wYXRjaC1NYWtl ZmlsZS5ydWxlcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9uY3ZzL3BvcnRzL25ldC9hc3Rl cmlzazE2L2ZpbGVzL3BhdGNoLU1ha2VmaWxlLnJ1bGVzLHYKcmV0cmlldmluZyByZXZpc2lvbiAx LjMKZGlmZiAtdSAtcjEuMyBwYXRjaC1NYWtlZmlsZS5ydWxlcwotLS0gZmlsZXMvcGF0Y2gtTWFr ZWZpbGUucnVsZXMJMiBBdWcgMjAwOSAxOTozNDo1NSAtMDAwMAkxLjMKKysrIGZpbGVzL3BhdGNo LU1ha2VmaWxlLnJ1bGVzCTI1IFNlcCAyMDEwIDAyOjEwOjM5IC0wMDAwCkBAIC0xLDE1ICsxLDEz IEBACi0KLSRGcmVlQlNEOiBwb3J0cy9uZXQvYXN0ZXJpc2sxNi9maWxlcy9wYXRjaC1NYWtlZmls ZS5ydWxlcyx2IDEuMyAyMDA5LzA4LzAyIDE5OjM0OjU1IG1lenogRXhwICQKLQotLS0tIE1ha2Vm aWxlLnJ1bGVzCi0rKysgTWFrZWZpbGUucnVsZXMKLUBAIC0zNSw3ICszNSw5IEBACi0gICAgIENN RF9QUkVGSVg9CistLS0gTWFrZWZpbGUucnVsZXMub3JpZwkyMDEwLTA1LTA1IDE1OjU5OjI4LjAw MDAwMDAwMCArMDYwMAorKysrIE1ha2VmaWxlLnJ1bGVzCTIwMTAtMDUtMDUgMTU6MjY6MDQuMDAw MDAwMDAwICswNjAwCitAQCAtNDMsNiArNDMsMTAgQEAKKyAgIGVuZGlmCiAgZW5kaWYKICAKICtp Zm5lcSAoJChPU0FSQ0gpLEZyZWVCU0QpCi0gT1BUSU1JWkU/PS1PNgorKyBPUFRJTUlaRT89LU82 CiArZW5kaWYKLSAKKysKICBpZmVxICgkKGZpbmRzdHJpbmcgRE9OVF9PUFRJTUlaRSwkKE1FTlVT RUxFQ1RfQ0ZMQUdTKSksKQotICAgICAjIE1vcmUgR1NNIGNvZGVjIG9wdGltaXphdGlvbgorICAg ICBfQVNUQ0ZMQUdTKz0kKE9QVElNSVpFKQorIGVsc2UKSW5kZXg6IGZpbGVzL3BhdGNoLWNoYW5u ZWxzLWNoYW5fZGFoZGkuYwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9uY3ZzL3BvcnRzL25l dC9hc3RlcmlzazE2L2ZpbGVzL3BhdGNoLWNoYW5uZWxzLWNoYW5fZGFoZGkuYyx2CnJldHJpZXZp bmcgcmV2aXNpb24gMS4xCmRpZmYgLXUgLXIxLjEgcGF0Y2gtY2hhbm5lbHMtY2hhbl9kYWhkaS5j Ci0tLSBmaWxlcy9wYXRjaC1jaGFubmVscy1jaGFuX2RhaGRpLmMJNSBNYXIgMjAxMCAwODozMToz NSAtMDAwMAkxLjEKKysrIGZpbGVzL3BhdGNoLWNoYW5uZWxzLWNoYW5fZGFoZGkuYwkyNSBTZXAg MjAxMCAwMjoxMDozOSAtMDAwMApAQCAtMSw2ICsxLDYgQEAKLS0tLSBjaGFubmVscy9jaGFuX2Rh aGRpLmMub3JpZwkyMDA5LTEwLTIyIDE3OjE5OjIxLjU2ODI1MDk4NSArMDAwMAotKysrIGNoYW5u ZWxzL2NoYW5fZGFoZGkuYwkyMDA5LTEwLTIyIDE3OjI2OjI2LjI2MTU4NDA3NiArMDAwMAotQEAg LTE5OTcsMTMgKzE5OTcsMTcgQEAKKy0tLSBjaGFubmVscy9jaGFuX2RhaGRpLmMub3JpZwkyMDEw LTA1LTA1IDE3OjUwOjE1LjAwMDAwMDAwMCArMDYwMAorKysrIGNoYW5uZWxzL2NoYW5fZGFoZGku YwkyMDEwLTA1LTA1IDE3OjUwOjA5LjAwMDAwMDAwMCArMDYwMAorQEAgLTI2NzIsMTMgKzI2NzIs MTcgQEAKICAJCXJldHVybjsKICAJfQogIAlpZiAocC0+ZWNob2NhbmNlbC5oZWFkLnRhcF9sZW5n dGgpIHsKQEAgLTEzLDEzICsxMywxMyBAQAogIAkJCQlhc3RfbG9nKExPR19XQVJOSU5HLCAiVW5h YmxlIHRvIGVuYWJsZSBhdWRpbyBtb2RlIG9uIGNoYW5uZWwgJWQgKCVzKVxuIiwgcC0+Y2hhbm5l bCwgc3RyZXJyb3IoZXJybm8pKTsKICAJCX0KIC0JCXJlcyA9IGlvY3RsKHAtPnN1YnNbU1VCX1JF QUxdLmRmZCwgREFIRElfRUNIT0NBTkNFTF9QQVJBTVMsICZwLT5lY2hvY2FuY2VsKTsKLSsKKysJ CQogKwkJcGVjcCA9ICZwLT5lY2hvY2FuY2VsLmhlYWQ7CiArCQlyZXMgPSBpb2N0bChwLT5zdWJz W1NVQl9SRUFMXS5kZmQsIERBSERJX0VDSE9DQU5DRUxfUEFSQU1TLCAmcGVjcCk7Ci0gCQlpZiAo cmVzKSAgeworIAkJaWYgKHJlcykgewogIAkJCWFzdF9sb2coTE9HX1dBUk5JTkcsICJVbmFibGUg dG8gZW5hYmxlIGVjaG8gY2FuY2VsbGF0aW9uIG9uIGNoYW5uZWwgJWQgKCVzKVxuIiwgcC0+Y2hh bm5lbCwgc3RyZXJyb3IoZXJybm8pKTsKICAJCX0gZWxzZSB7Ci1AQCAtMjAzNyw4ICsyMDQxLDkg QEAKK0BAIC0yNzEyLDggKzI3MTYsOSBAQAogIAogIAlpZiAocC0+ZWNob2Nhbm9uKSB7CiAgCQlz dHJ1Y3QgZGFoZGlfZWNob2NhbnBhcmFtcyBlY3AgPSB7IC50YXBfbGVuZ3RoID0gMCB9OwpJbmRl eDogZmlsZXMvcGF0Y2gtY2hhbm5lbHM6Ok1ha2VmaWxlCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9o b21lL25jdnMvcG9ydHMvbmV0L2FzdGVyaXNrMTYvZmlsZXMvcGF0Y2gtY2hhbm5lbHM6Ok1ha2Vm aWxlLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjE4CmRpZmYgLXUgLXIxLjE4IHBhdGNoLWNoYW5u ZWxzOjpNYWtlZmlsZQotLS0gZmlsZXMvcGF0Y2gtY2hhbm5lbHM6Ok1ha2VmaWxlCTEwIFNlcCAy MDA5IDA5OjI1OjI1IC0wMDAwCTEuMTgKKysrIGZpbGVzL3BhdGNoLWNoYW5uZWxzOjpNYWtlZmls ZQkyNSBTZXAgMjAxMCAwMjoxMDozOSAtMDAwMApAQCAtMSw4ICsxLDUgQEAKLQotJEZyZWVCU0Q6 IHBvcnRzL25ldC9hc3RlcmlzazE2L2ZpbGVzL3BhdGNoLWNoYW5uZWxzOjpNYWtlZmlsZSx2IDEu MTggMjAwOS8wOS8xMCAwOToyNToyNSBzb2JvbWF4IEV4cCAkCi0KLS0tLSBjaGFubmVscy9NYWtl ZmlsZS5vcmlnCi0rKysgY2hhbm5lbHMvTWFrZWZpbGUKKy0tLSBjaGFubmVscy9NYWtlZmlsZS5v cmlnCTIwMTAtMDUtMDUgMTc6NTc6MjIuMDAwMDAwMDAwICswNjAwCisrKysgY2hhbm5lbHMvTWFr ZWZpbGUJMjAxMC0wNS0wNSAxODowMTo1OC4wMDAwMDAwMDAgKzA2MDAKIEBAIC0yNyw5ICsyNywx MCBAQAogIGVuZGlmCiAgCkBAIC0yMSw5ICsxOCw5IEBACiAgY2hhbl9oMzIzLnNvOiBjaGFuX2gz MjMubyBoMzIzL2xpYmNoYW5oMzIzLmEKICAJJChFQ0hPX1BSRUZJWCkgZWNobyAiICAgW0xEXSAk XiAtPiAkQCIKICtpZmVxICgkKE9TQVJDSCksRnJlZUJTRCkKLSsJJChDTURfUFJFRklYKSAkKENY WCkgJChQVEhSRUFEX0NGTEFHUykgJChBU1RMREZMQUdTKSAkKFNPTElOSykgLUwkKFBSRUZJWCkv bGliICQoSDMyM0xERkxBR1MpIC1vICRAICQ8IGgzMjMvbGliY2hhbmgzMjMuYSAkKEgzMjNMRExJ QlMpICQoQ0hBTkgzMjNMSUIpCisrCSQoQ01EX1BSRUZJWCkgJChDWFgpICQoUFRIUkVBRF9DRkxB R1MpICQoQVNUTERGTEFHUykgJChTT0xJTkspIC1MJChMT0NBTEJBU0UpL2xpYiAkKEgzMjNMREZM QUdTKSAtbyAkQCAkPCBoMzIzL2xpYmNoYW5oMzIzLmEgJChIMzIzTERMSUJTKSAkKENIQU5IMzIz TElCKQogK2Vsc2UKLSAJJChDTURfUFJFRklYKSAkKENYWCkgJChQVEhSRUFEX0NGTEFHUykgJChB U1RMREZMQUdTKSAkKFNPTElOSykgLW8gJEAgJDwgaDMyMy9saWJjaGFuaDMyMy5hICQoQ0hBTkgz MjNMSUIpIC1MJChQV0xJQkRJUikvbGliICQoUFRMSUIpIC1MJChPUEVOSDMyM0RJUikvbGliICQo SDMyM0xJQikgLUwvdXNyL2xpYiAtbGNyeXB0byAtbHNzbCAtbGV4cGF0CisgCSQoQ01EX1BSRUZJ WCkgJChDWFgpICQoUFRIUkVBRF9DRkxBR1MpICQoX0FTVExERkxBR1MpICQoQVNUTERGTEFHUykg JChTT0xJTkspIC1vICRAICQ8IGgzMjMvbGliY2hhbmgzMjMuYSAkKENIQU5IMzIzTElCKSAtTCQo UFdMSUJESVIpL2xpYiAkKFBUTElCKSAtTCQoT1BFTkgzMjNESVIpL2xpYiAkKEgzMjNMSUIpIC1M L3Vzci9saWIgLWxjcnlwdG8gLWxzc2wgLWxleHBhdAogIGVuZGlmCiAgZW5kaWYKICtlbmRpZgpJ bmRleDogZmlsZXMvcGF0Y2gtY2hhbm5lbHM6OmNoYW5fc2lwLmMKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmls ZTogL2hvbWUvbmN2cy9wb3J0cy9uZXQvYXN0ZXJpc2sxNi9maWxlcy9wYXRjaC1jaGFubmVsczo6 Y2hhbl9zaXAuYyx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4xMwpkaWZmIC11IC1yMS4xMyBwYXRj aC1jaGFubmVsczo6Y2hhbl9zaXAuYwotLS0gZmlsZXMvcGF0Y2gtY2hhbm5lbHM6OmNoYW5fc2lw LmMJMiBBdWcgMjAwOSAxOTozNDo1NSAtMDAwMAkxLjEzCisrKyBmaWxlcy9wYXRjaC1jaGFubmVs czo6Y2hhbl9zaXAuYwkyNSBTZXAgMjAxMCAwMjoxMDozOSAtMDAwMApAQCAtMSwxNCArMSwxMSBA QAotCi0kRnJlZUJTRDogcG9ydHMvbmV0L2FzdGVyaXNrMTYvZmlsZXMvcGF0Y2gtY2hhbm5lbHM6 OmNoYW5fc2lwLmMsdiAxLjEzIDIwMDkvMDgvMDIgMTk6MzQ6NTUgbWV6eiBFeHAgJAotCi0tLS0g Y2hhbm5lbHMvY2hhbl9zaXAuYwotKysrIGNoYW5uZWxzL2NoYW5fc2lwLmMKLUBAIC02MTEsNyAr NjExLDcgQEAKLSAjZGVmaW5lIERFRkFVTFRfTU9ISU5URVJQUkVUICAgICJkZWZhdWx0IgorLS0t IGNoYW5uZWxzL2NoYW5fc2lwLmMub3JpZwkyMDEwLTA1LTI4IDIzOjU3OjQwLjAwMDAwMDAwMCAr MDYwMAorKysrIGNoYW5uZWxzL2NoYW5fc2lwLmMJMjAxMC0wOC0xMSAxMDo0NzowNy4wMDAwMDAw MDAgKzA2MDAKK0BAIC05ODAsNyArOTgwLDcgQEAKKyAjZGVmaW5lIERFRkFVTFRfTU9ISU5URVJQ UkVUICAgICJkZWZhdWx0IgkvKiE8IFRoZSBkZWZhdWx0IG11c2ljIGNsYXNzICovCiAgI2RlZmlu ZSBERUZBVUxUX01PSFNVR0dFU1QgICAgICAiIgotICNkZWZpbmUgREVGQVVMVF9WTUVYVEVOIAki YXN0ZXJpc2siCi0tI2RlZmluZSBERUZBVUxUX0NBTExFUklEIAkiYXN0ZXJpc2siCi0rI2RlZmlu ZSBERUZBVUxUX0NBTExFUklEIAkiVW5rbm93biIKKyAjZGVmaW5lIERFRkFVTFRfVk1FWFRFTiAJ ImFzdGVyaXNrIgkvKiE8IERlZmF1bHQgdm9pY2VtYWlsIGV4dGVuc2lvbiAqLworLSNkZWZpbmUg REVGQVVMVF9DQUxMRVJJRCAJImFzdGVyaXNrIgkvKiE8IERlZmF1bHQgY2FsbGVyIElEICovCisr I2RlZmluZSBERUZBVUxUX0NBTExFUklEIAkiVW5rbm93biIJLyohPCBEZWZhdWx0IGNhbGxlciBJ RCAqLwogICNkZWZpbmUgREVGQVVMVF9OT1RJRllNSU1FIAkiYXBwbGljYXRpb24vc2ltcGxlLW1l c3NhZ2Utc3VtbWFyeSIKICAjZGVmaW5lIERFRkFVTFRfQUxMT1dHVUVTVAlUUlVFCi0gI2RlZmlu ZSBERUZBVUxUX0NBTExDT1VOVEVSCUZBTFNFCisgI2RlZmluZSBERUZBVUxUX1JUUEtFRVBBTElW RQkwCQkvKiE8IERlZmF1bHQgUlRQa2VlcGFsaXZlIHNldHRpbmcgKi8KSW5kZXg6IGZpbGVzL3Bh dGNoLWNvbmZpZ3VyZQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9uY3ZzL3BvcnRzL25ldC9h c3RlcmlzazE2L2ZpbGVzL3BhdGNoLWNvbmZpZ3VyZSx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS44 CmRpZmYgLXUgLXIxLjggcGF0Y2gtY29uZmlndXJlCi0tLSBmaWxlcy9wYXRjaC1jb25maWd1cmUJ MjkgSmFuIDIwMTAgMTA6MzI6MTcgLTAwMDAJMS44CisrKyBmaWxlcy9wYXRjaC1jb25maWd1cmUJ MjUgU2VwIDIwMTAgMDI6MTA6MzkgLTAwMDAKQEAgLTEsMTggKzEsMTYgQEAKLQotJEZyZWVCU0Q6 IHBvcnRzL25ldC9hc3RlcmlzazE2L2ZpbGVzL3BhdGNoLWNvbmZpZ3VyZSx2IDEuOCAyMDEwLzAx LzI5IDEwOjMyOjE3IHNvYm9tYXggRXhwICQKLQotLS0tIGNvbmZpZ3VyZS5vcmlnCi0rKysgY29u ZmlndXJlCi1AQCAtNDQzMiw4ICs0NDMyLDYgQEAKKy0tLSAuL2NvbmZpZ3VyZS5vcmlnCTIwMTAt MDctMTcgMjM6NDM6NTAuMDAwMDAwMDAwICswNjAwCisrKysgLi9jb25maWd1cmUJMjAxMC0wOC0y NCAwOTozNzo0Ni4wMDAwMDAwMDAgKzA2MDAKK0BAIC00MTQ3LDkgKzQxNDcsNiBAQAorIAogIGNh c2UgIiR7aG9zdF9vc30iIGluCiAgICAgICBmcmVlYnNkKikKLSAgICAgIGFjX2RlZmF1bHRfcHJl Zml4PS91c3IvbG9jYWwKKy0KIC0gICAgIENQUEZMQUdTPS1JL3Vzci9sb2NhbC9pbmNsdWRlCiAt ICAgICBMREZMQUdTPS1ML3Vzci9sb2NhbC9saWIKICAgICAgIDs7CisgICAgICBvcGVuYnNkKikK ICAKLSAgICAgIGRhcndpbiopCi1AQCAtMTg3ODQsNyArMTg3ODIsNyBAQAorQEAgLTM0NzU1LDcg KzM0NzUyLDcgQEAKICAKICAJZmkKICAKQEAgLTIwLDQgKzE4LDQgQEAKICsJUExBVEZPUk1fT1BF TkgzMjM9ImgzMjNfJHtPUEVOSDMyM19TVUZGSVh9IgogIAogIAlpZiB0ZXN0ICIke0hBU19PUEVO SDMyMzotdW5zZXR9IiAhPSAidW5zZXQiOyB0aGVuCi0gCSAgIHsgJGFzX2VjaG8gIiRhc19tZTok e2FzX2xpbmVuby0kTElORU5PfTogY2hlY2tpbmcgT3BlbkgzMjMgaW5zdGFsbGF0aW9uIHZhbGlk aXR5IiA+JjUKKyAJICAgeyBlY2hvICIkYXNfbWU6JExJTkVOTzogY2hlY2tpbmcgT3BlbkgzMjMg aW5zdGFsbGF0aW9uIHZhbGlkaXR5IiA+JjUKSW5kZXg6IGZpbGVzL3BhdGNoLW1haW46Ok1ha2Vm aWxlCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KUkNTIGZpbGU6IGZpbGVzL3BhdGNoLW1haW46Ok1ha2VmaWxlCmRpZmYg LU4gZmlsZXMvcGF0Y2gtbWFpbjo6TWFrZWZpbGUKLS0tIGZpbGVzL3BhdGNoLW1haW46Ok1ha2Vm aWxlCTIwIE5vdiAyMDA5IDIzOjQzOjA5IC0wMDAwCTEuOAorKysgL2Rldi9udWxsCTEgSmFuIDE5 NzAgMDA6MDA6MDAgLTAwMDAKQEAgLTEsMzMgKzAsMCBAQAotCi0kRnJlZUJTRDogcG9ydHMvbmV0 L2FzdGVyaXNrMTYvZmlsZXMvcGF0Y2gtbWFpbjo6TWFrZWZpbGUsdiAxLjggMjAwOS8xMS8yMCAy Mzo0MzowOSBzb2JvbWF4IEV4cCAkCi0KLS0tLSBtYWluL01ha2VmaWxlLm9yaWcKLSsrKyBtYWlu L01ha2VmaWxlCi1AQCAtMTAxLDggKzEwMSw4IEBACi0gCWNkIGVkaXRsaW5lICYmIHRlc3QgLWYg Y29uZmlnLmggfHwgQ0ZMQUdTPSIkKFBUSFJFQURfQ0ZMQUdTKSAkKHN1YnN0ICQoQVNUVE9QRElS KSwuLi8uLi8sJChfQVNUQ0ZMQUdTOi1XZXJyb3I9KSAkKEFTVENGTEFHUykpIiBMREZMQUdTPSIk KEFTVExERkxBR1MpIiAuL2NvbmZpZ3VyZSAtLWJ1aWxkPSQoQlVJTERfUExBVEZPUk0pIC0taG9z dD0kKEhPU1RfUExBVEZPUk0pIC0td2l0aC1uY3Vyc2VzPSQoTkNVUlNFU19ESVIpIC0td2l0aC1j dXJzZXM9JChDVVJTRVNfRElSKSAtLXdpdGgtdGVybWNhcD0kKFRFUk1DQVBfRElSKSAtLXdpdGgt dGluZm89JChUSU5GT19ESVIpCi0gCSQoTUFLRSkgLUMgZWRpdGxpbmUgbGliZWRpdC5hCi0gCi0t ZGIxLWFzdC9saWJkYjEuYTogQ0hFQ0tfU1VCRElSCi0tCV9BU1RDRkxBR1M9IiQoX0FTVENGTEFH UykiIEFTVENGTEFHUz0iJChBU1RDRkxBR1MpIC1Xbm8tc3RyaWN0LWFsaWFzaW5nIiAkKE1BS0Up IC1DIGRiMS1hc3QgbGliZGIxLmEKLSsjZGIxLWFzdC9saWJkYjEuYTogQ0hFQ0tfU1VCRElSCi0r IwlfQVNUQ0ZMQUdTPSIkKF9BU1RDRkxBR1MpIiBBU1RDRkxBR1M9IiQoQVNUQ0ZMQUdTKSAtV25v LXN0cmljdC1hbGlhc2luZyIgJChNQUtFKSAtQyBkYjEtYXN0IGxpYmRiMS5hCi0gCi0gYXN0X2V4 cHIyLmMgYXN0X2V4cHIyLmg6Ci0gCWJpc29uIC1vICRAIC1kIC0tbmFtZS1wcmVmaXg9YXN0X3l5 IGFzdF9leHByMi55Ci1AQCAtMTU5LDEzICsxNTksMTMgQEAKLSBHTUlNRUxERkxBR1MrPSQoR01J TUVfTElCKQotIGVuZGlmCi0gCi0tJChNQUlOX1RHVCk6ICQoT0JKUykgZWRpdGxpbmUvbGliZWRp dC5hIGRiMS1hc3QvbGliZGIxLmEgJChBU1RfRU1CRURfTERTQ1JJUFRTKQotKyQoTUFJTl9UR1Qp OiAkKE9CSlMpIGVkaXRsaW5lL2xpYmVkaXQuYSAkKEFTVF9FTUJFRF9MRFNDUklQVFMpCi0gCUAk KENDKSAtYyAtbyBidWlsZGluZm8ubyAkKF9BU1RDRkxBR1MpIGJ1aWxkaW5mby5jICQoQVNUQ0ZM QUdTKQotIAkkKEVDSE9fUFJFRklYKSBlY2hvICIgICBbTERdICReIC0+ICRAIgotIGlmbmVxICgk KGZpbmRzdHJpbmcgY2hhbl9oMzIzLCQoTUVOVVNFTEVDVF9DSEFOTkVMUykpLCkKLS0JJChDTURf UFJFRklYKSAkKENDKSAkKFNUQVRJQ19CVUlMRCkgLW8gJEAgJChBU1RMSU5LKSAkKEFTVF9FTUJF RF9MREZMQUdTKSAkKEFTVExERkxBR1MpICReIGJ1aWxkaW5mby5vICQoQVNUX0xJQlMpICQoQVNU X0VNQkVEX0xJQlMpICQoR01JTUVMREZMQUdTKQotKwkkKENNRF9QUkVGSVgpICQoQ0MpICQoU1RB VElDX0JVSUxEKSAtbyAkQCAkKEFTVExJTkspICQoTERGTEFHUykgJChBU1RfRU1CRURfTERGTEFH UykgJChBU1RMREZMQUdTKSAkXiBidWlsZGluZm8ubyAkKEFTVF9MSUJTKSAkKEFTVF9FTUJFRF9M SUJTKSAkKEdNSU1FTERGTEFHUykKLSBlbHNlCi0tCSQoQ01EX1BSRUZJWCkgJChDWFgpICQoU1RB VElDX0JVSUxEKSAtbyAkQCAkKEFTVExJTkspICQoQVNUX0VNQkVEX0xERkxBR1MpICQoQVNUTERG TEFHUykgJChIMzIzTERGTEFHUykgJF4gYnVpbGRpbmZvLm8gJChBU1RfTElCUykgJChBU1RfRU1C RURfTElCUykgJChIMzIzTERMSUJTKSAkKEdNSU1FTERGTEFHUykKLSsJJChDTURfUFJFRklYKSAk KENYWCkgJChTVEFUSUNfQlVJTEQpIC1vICRAICQoQVNUTElOSykgJChMREZMQUdTKSAkKEFTVF9F TUJFRF9MREZMQUdTKSAkKEFTVExERkxBR1MpICQoSDMyM0xERkxBR1MpICReIGJ1aWxkaW5mby5v ICQoQVNUX0xJQlMpICQoQVNUX0VNQkVEX0xJQlMpICQoSDMyM0xETElCUykgJChHTUlNRUxERkxB R1MpCi0gZW5kaWYKLSAJJChDTURfUFJFRklYKSAkKEFTVFRPUERJUikvYnVpbGRfdG9vbHMvc3Ry aXBfbm9uYXBpICRAIHx8IHJtICRACi0gCkluZGV4OiBmaWxlcy9wYXRjaC1tYWluX19NYWtlZmls ZQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09ClJDUyBmaWxlOiBmaWxlcy9wYXRjaC1tYWluX19NYWtlZmlsZQpkaWZmIC1O IGZpbGVzL3BhdGNoLW1haW5fX01ha2VmaWxlCi0tLSAvZGV2L251bGwJMSBKYW4gMTk3MCAwMDow MDowMCAtMDAwMAorKysgZmlsZXMvcGF0Y2gtbWFpbl9fTWFrZWZpbGUJMjUgU2VwIDIwMTAgMDI6 MTA6MzkgLTAwMDAKQEAgLTAsMCArMSwzMCBAQAorLS0tIC4vbWFpbi9NYWtlZmlsZS5vcmlnCTIw MTAtMDYtMjYgMDA6NTg6MzcuMDAwMDAwMDAwICswNjAwCisrKysgLi9tYWluL01ha2VmaWxlCTIw MTAtMDgtMjQgMDk6NDA6MzkuMDAwMDAwMDAwICswNjAwCitAQCAtMTEzLDggKzExMyw4IEBACisg CWNkIGVkaXRsaW5lICYmIHRlc3QgLWYgY29uZmlnLmggfHwgQ0ZMQUdTPSIkKFBUSFJFQURfQ0ZM QUdTKSAkKHN1YnN0ICQoQVNUVE9QRElSKSwuLi8uLi8sJChfQVNUQ0ZMQUdTOi1XZXJyb3I9KSAk KEFTVENGTEFHUykpIiBMREZMQUdTPSIkKF9BU1RMREZMQUdTKSAkKEFTVExERkxBR1MpIiAuL2Nv bmZpZ3VyZSAtLWJ1aWxkPSQoQlVJTERfUExBVEZPUk0pIC0taG9zdD0kKEhPU1RfUExBVEZPUk0p IC0td2l0aC1uY3Vyc2VzPSQoTkNVUlNFU19ESVIpIC0td2l0aC1jdXJzZXM9JChDVVJTRVNfRElS KSAtLXdpdGgtdGVybWNhcD0kKFRFUk1DQVBfRElSKSAtLXdpdGgtdGluZm89JChUSU5GT19ESVIp CisgCSQoTUFLRSkgLUMgZWRpdGxpbmUgbGliZWRpdC5hCisgCistZGIxLWFzdC9saWJkYjEuYTog Q0hFQ0tfU1VCRElSCistCV9BU1RDRkxBR1M9IiQoX0FTVENGTEFHUykgLVduby1zdHJpY3QtYWxp YXNpbmciIEFTVENGTEFHUz0iJChBU1RDRkxBR1MpIiAkKE1BS0UpIC1DIGRiMS1hc3QgbGliZGIx LmEKKysjZGIxLWFzdC9saWJkYjEuYTogQ0hFQ0tfU1VCRElSCisrIwlfQVNUQ0ZMQUdTPSIkKF9B U1RDRkxBR1MpIC1Xbm8tc3RyaWN0LWFsaWFzaW5nIiBBU1RDRkxBR1M9IiQoQVNUQ0ZMQUdTKSIg JChNQUtFKSAtQyBkYjEtYXN0IGxpYmRiMS5hCisgCisgaWZuZXEgKCQoZmluZHN0cmluZyBSRUJV SUxEX1BBUlNFUlMsJChNRU5VU0VMRUNUX0NGTEFHUykpLCkKKyBhc3RfZXhwcjIuYyBhc3RfZXhw cjIuaDogYXN0X2V4cHIyLnkKK0BAIC0xNzcsMTMgKzE3NywxMyBAQAorIEdNSU1FTERGTEFHUys9 JChHTUlNRV9MSUIpCisgZW5kaWYKKyAKKy0kKE1BSU5fVEdUKTogJChPQkpTKSBlZGl0bGluZS9s aWJlZGl0LmEgZGIxLWFzdC9saWJkYjEuYSAkKEFTVF9FTUJFRF9MRFNDUklQVFMpCisrJChNQUlO X1RHVCk6ICQoT0JKUykgZWRpdGxpbmUvbGliZWRpdC5hICQoQVNUX0VNQkVEX0xEU0NSSVBUUykK KyAJQCQoQ0MpIC1jIC1vIGJ1aWxkaW5mby5vICQoX0FTVENGTEFHUykgYnVpbGRpbmZvLmMgJChB U1RDRkxBR1MpCisgCSQoRUNIT19QUkVGSVgpIGVjaG8gIiAgIFtMRF0gJF4gLT4gJEAiCisgaWZu ZXEgKCQoZmluZHN0cmluZyBjaGFuX2gzMjMsJChNRU5VU0VMRUNUX0NIQU5ORUxTKSksKQorLQkk KENNRF9QUkVGSVgpICQoQ0MpICQoU1RBVElDX0JVSUxEKSAtbyAkQCAkKEFTVExJTkspICQoQVNU X0VNQkVEX0xERkxBR1MpICQoX0FTVExERkxBR1MpICQoQVNUTERGTEFHUykgJF4gYnVpbGRpbmZv Lm8gJChBU1RfTElCUykgJChBU1RfRU1CRURfTElCUykgJChHTUlNRUxERkxBR1MpCisrCSQoQ01E X1BSRUZJWCkgJChDQykgJChTVEFUSUNfQlVJTEQpIC1vICRAICQoQVNUTElOSykgJChMREZMQUdT KSAkKEFTVF9FTUJFRF9MREZMQUdTKSAkKEFTVExERkxBR1MpICReIGJ1aWxkaW5mby5vICQoQVNU X0xJQlMpICQoQVNUX0VNQkVEX0xJQlMpICQoR01JTUVMREZMQUdTKQorIGVsc2UKKy0JJChDTURf UFJFRklYKSAkKENYWCkgJChTVEFUSUNfQlVJTEQpIC1vICRAICQoQVNUTElOSykgJChBU1RfRU1C RURfTERGTEFHUykgJChfQVNUTERGTEFHUykgJChBU1RMREZMQUdTKSAkKEgzMjNMREZMQUdTKSAk XiBidWlsZGluZm8ubyAkKEFTVF9MSUJTKSAkKEFTVF9FTUJFRF9MSUJTKSAkKEgzMjNMRExJQlMp ICQoR01JTUVMREZMQUdTKQorKwkkKENNRF9QUkVGSVgpICQoQ1hYKSAkKFNUQVRJQ19CVUlMRCkg LW8gJEAgJChBU1RMSU5LKSAkKExERkxBR1MpICQoQVNUX0VNQkVEX0xERkxBR1MpICQoQVNUTERG TEFHUykgJChIMzIzTERGTEFHUykgJF4gYnVpbGRpbmZvLm8gJChBU1RfTElCUykgJChBU1RfRU1C RURfTElCUykgJChIMzIzTERMSUJTKSAkKEdNSU1FTERGTEFHUykKKyBlbmRpZgorIAkkKENNRF9Q UkVGSVgpICQoQVNUVE9QRElSKS9idWlsZF90b29scy9zdHJpcF9ub25hcGkgJEAgfHwgcm0gJEAK KyAK --0016e644c57c3620560491169208-- From: Florian Smeets To: TAKATSU Tomonari Cc: bug-followup@FreeBSD.org, emz@norma.perm.ru Subject: Re: ports/146964: New port: net/asterisk162 Date: Mon, 27 Sep 2010 16:09:29 +0200 On 25.09.10 16:47, TAKATSU Tomonari wrote: > Hi Florian, > > Thank you for sending your "patch-1.diff" patch. > > I modified your patch as follows. > (1) move USE_GNOME to USE_* section > (2) remove *.orig files in files directory > (3) add @exec mkdir -p %D/spool/asterisk/outgoing to pkg-plist > (4) add $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/outgoing to files/patch-Makefile > to fix an error when "make deinstall" (*). Thanks for fixing these. I reran my TB tests with your latest patch an everything seems fine. Thanks, Florian Responsible-Changed-From-To: freebsd-ports-bugs->tota Responsible-Changed-By: tota Responsible-Changed-When: Wed Sep 29 12:13:28 UTC 2010 Responsible-Changed-Why: I'll take it. http://www.freebsd.org/cgi/query-pr.cgi?pr=146964 From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/146964: commit references a PR Date: Wed, 29 Sep 2010 12:49:04 +0000 (UTC) tota 2010-09-29 12:48:58 UTC FreeBSD ports repository Modified files: net/asterisk16 Makefile distinfo pkg-plist net/asterisk16/files asterisk.sh.in patch-Makefile.rules patch-channels-chan_dahdi.c patch-channels::Makefile patch-channels::chan_sip.c patch-configure patch-main::Makefile Added files: net/asterisk16/files patch-Makefile Removed files: net/asterisk16/files codecnego-patch-Makefile nocodecnego-patch-Makefile Log: - Upgrade to 1.6.2.13 * switch to 1.6.2.X release series because 1.6.0.X is approaching its End of Life date. see http://www.asterisk.org/asterisk-versions * make sure your asterisk configurations between 1.6.0.X and 1.6.2.X before upgrading it. PR: ports/144065 [1], ports/146964 [2] Submitted by: Tom Judge [1], Eugene M. Zheganin [2] Approved by: Florian Smeets (maintainer) Revision Changes Path 1.138 +35 -47 ports/net/asterisk16/Makefile 1.50 +3 -3 ports/net/asterisk16/distinfo 1.9 +3 -3 ports/net/asterisk16/files/asterisk.sh.in 1.8 +0 -210 ports/net/asterisk16/files/codecnego-patch-Makefile (dead) 1.12 +0 -243 ports/net/asterisk16/files/nocodecnego-patch-Makefile (dead) 1.22 +258 -0 ports/net/asterisk16/files/patch-Makefile (new) 1.4 +8 -10 ports/net/asterisk16/files/patch-Makefile.rules 1.2 +6 -6 ports/net/asterisk16/files/patch-channels-chan_dahdi.c 1.19 +4 -7 ports/net/asterisk16/files/patch-channels::Makefile 1.14 +8 -11 ports/net/asterisk16/files/patch-channels::chan_sip.c 1.9 +8 -10 ports/net/asterisk16/files/patch-configure 1.9 +12 -12 ports/net/asterisk16/files/patch-main::Makefile 1.46 +103 -8 ports/net/asterisk16/pkg-plist _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org" State-Changed-From-To: open->closed State-Changed-By: tota State-Changed-When: Wed Sep 29 14:16:39 UTC 2010 State-Changed-Why: Committed. Thanks! http://www.freebsd.org/cgi/query-pr.cgi?pr=146964 >Unformatted: