From dmichelsen at users.sourceforge.net Fri Apr 1 15:17:43 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 1 Apr 2016 13:17:43 +0000 Subject: SF.net SVN: gar:[25639] csw/mgar/pkg/ncurses/trunk Message-ID: <3qc24j5Nmvz1MN@mail.opencsw.org> Revision: 25639 http://sourceforge.net/p/gar/code/25639 Author: dmichelsen Date: 2016-04-01 13:17:42 +0000 (Fri, 01 Apr 2016) Log Message: ----------- ncurses/trunk: Update to 6.0 Modified Paths: -------------- csw/mgar/pkg/ncurses/trunk/Makefile csw/mgar/pkg/ncurses/trunk/checksums Modified: csw/mgar/pkg/ncurses/trunk/Makefile =================================================================== --- csw/mgar/pkg/ncurses/trunk/Makefile 2016-03-30 22:33:56 UTC (rev 25638) +++ csw/mgar/pkg/ncurses/trunk/Makefile 2016-04-01 13:17:42 UTC (rev 25639) @@ -6,7 +6,7 @@ # https://plus.google.com/105567297772267099132/posts/Bv5GSTQvfzC NAME = ncurses -VERSION = 5.9 +VERSION = 6.0 GARTYPE = v2 define BLURB @@ -20,7 +20,7 @@ endef MASTER_SITES = $(GNU_MIRROR) -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES += $(DISTNAME).tar.gz LICENSE = README @@ -28,7 +28,7 @@ SPKG_DESC_CSWncurses = A free software emulation of curses RUNTIME_DEP_PKGS_CSWncurses += CSWterminfo CHECKPKG_OVERRIDES_CSWncurses += surplus-dependency|CSWterminfo -RUNTIME_DEP_PKGS_CSWncurses += CSWlibncursesw5 +RUNTIME_DEP_PKGS_CSWncurses += CSWlibncursesw6 # These are legacy dependencies for packages still depending on CSWncurses # instead of the specific libraries RUNTIME_DEP_PKGS_CSWncurses += CSWlibncurses5 @@ -38,61 +38,61 @@ RUNTIME_DEP_PKGS_CSWncurses += CSWlibpanelw5 CHECKPKG_OVERRIDES_CSWncurses += surplus-dependency|CSWlibpanelw5 -PACKAGES += CSWlibform5 -PKGFILES_CSWlibform5 += $(call pkgfiles_lib,libform.so.5) -SPKG_DESC_CSWlibform5 += A free software emulation of curses, libform.so.5 -RUNTIME_DEP_PKGS_CSWlibform5 += CSWlibncurses5 +PACKAGES += CSWlibform6 +PKGFILES_CSWlibform6 += $(call pkgfiles_lib,libform.so.6) +SPKG_DESC_CSWlibform6 += A free software emulation of curses, libform.so.6 +RUNTIME_DEP_PKGS_CSWlibform6 += CSWlibncurses6 -PACKAGES += CSWlibformw5 -PKGFILES_CSWlibformw5 += $(call pkgfiles_lib,libformw.so.5) -SPKG_DESC_CSWlibformw5 += A free software emulation of curses, libformw.so.5 -RUNTIME_DEP_PKGS_CSWlibformw5 += CSWlibncursesw5 +PACKAGES += CSWlibformw6 +PKGFILES_CSWlibformw6 += $(call pkgfiles_lib,libformw.so.6) +SPKG_DESC_CSWlibformw6 += A free software emulation of curses, libformw.so.6 +RUNTIME_DEP_PKGS_CSWlibformw6 += CSWlibncursesw6 -PACKAGES += CSWlibmenu5 -PKGFILES_CSWlibmenu5 += $(call pkgfiles_lib,libmenu.so.5) -SPKG_DESC_CSWlibmenu5 += A free software emulation of curses, libmenu.so.5 -RUNTIME_DEP_PKGS_CSWlibmenu5 += CSWlibncurses5 +PACKAGES += CSWlibmenu6 +PKGFILES_CSWlibmenu6 += $(call pkgfiles_lib,libmenu.so.6) +SPKG_DESC_CSWlibmenu6 += A free software emulation of curses, libmenu.so.6 +RUNTIME_DEP_PKGS_CSWlibmenu6 += CSWlibncurses6 -PACKAGES += CSWlibmenuw5 -PKGFILES_CSWlibmenuw5 += $(call pkgfiles_lib,libmenuw.so.5) -SPKG_DESC_CSWlibmenuw5 += A free software emulation of curses, libmenuw.so.5 -RUNTIME_DEP_PKGS_CSWlibmenuw5 += CSWlibncursesw5 +PACKAGES += CSWlibmenuw6 +PKGFILES_CSWlibmenuw6 += $(call pkgfiles_lib,libmenuw.so.6) +SPKG_DESC_CSWlibmenuw6 += A free software emulation of curses, libmenuw.so.6 +RUNTIME_DEP_PKGS_CSWlibmenuw6 += CSWlibncursesw6 -PACKAGES += CSWlibncurses5 -PKGFILES_CSWlibncurses5 += $(call pkgfiles_lib,libncurses.so.5) -SPKG_DESC_CSWlibncurses5 += A free software emulation of curses, libncurses.so.5 +PACKAGES += CSWlibncurses6 +PKGFILES_CSWlibncurses6 += $(call pkgfiles_lib,libncurses.so.6) +SPKG_DESC_CSWlibncurses6 += A free software emulation of curses, libncurses.so.6 # If we access via libncurses we also need the terminal definitions (undetected by checkpkg) -RUNTIME_DEP_PKGS_CSWlibncurses5 += CSWterminfo -CHECKPKG_OVERRIDES_CSWlibncurses5 += surplus-dependency|CSWterminfo +RUNTIME_DEP_PKGS_CSWlibncurses6 += CSWterminfo +CHECKPKG_OVERRIDES_CSWlibncurses6 += surplus-dependency|CSWterminfo -PACKAGES += CSWlibncursesw5 -PKGFILES_CSWlibncursesw5 += $(call pkgfiles_lib,libncursesw.so.5) -SPKG_DESC_CSWlibncursesw5 += A free software emulation of curses, libncursesw.so.5 +PACKAGES += CSWlibncursesw6 +PKGFILES_CSWlibncursesw6 += $(call pkgfiles_lib,libncursesw.so.6) +SPKG_DESC_CSWlibncursesw6 += A free software emulation of curses, libncursesw.so.6 # If we access via libncursesw we also need the terminal definitions (undetected by checkpkg) -RUNTIME_DEP_PKGS_CSWlibncursesw5 += CSWterminfo -CHECKPKG_OVERRIDES_CSWlibncursesw5 += surplus-dependency|CSWterminfo +RUNTIME_DEP_PKGS_CSWlibncursesw6 += CSWterminfo +CHECKPKG_OVERRIDES_CSWlibncursesw6 += surplus-dependency|CSWterminfo -PACKAGES += CSWlibpanel5 -PKGFILES_CSWlibpanel5 += $(call pkgfiles_lib,libpanel.so.5) -SPKG_DESC_CSWlibpanel5 += A free software emulation of curses, libpanel.so.5 -RUNTIME_DEP_PKGS_CSWlibpanel5 += CSWlibncurses5 +PACKAGES += CSWlibpanel6 +PKGFILES_CSWlibpanel6 += $(call pkgfiles_lib,libpanel.so.6) +SPKG_DESC_CSWlibpanel6 += A free software emulation of curses, libpanel.so.6 +RUNTIME_DEP_PKGS_CSWlibpanel6 += CSWlibncurses6 -PACKAGES += CSWlibpanelw5 -PKGFILES_CSWlibpanelw5 += $(call pkgfiles_lib,libpanelw.so.5) -SPKG_DESC_CSWlibpanelw5 += A free software emulation of curses, libpanelw.so.5 -RUNTIME_DEP_PKGS_CSWlibpanelw5 += CSWlibncursesw5 +PACKAGES += CSWlibpanelw6 +PKGFILES_CSWlibpanelw6 += $(call pkgfiles_lib,libpanelw.so.6) +SPKG_DESC_CSWlibpanelw6 += A free software emulation of curses, libpanelw.so.6 +RUNTIME_DEP_PKGS_CSWlibpanelw6 += CSWlibncursesw6 PACKAGES += CSWlibncurses-dev -SPKG_DESC_CSWlibncurses-dev = Development files for libncurses.so.5 and assorted libraries +SPKG_DESC_CSWlibncurses-dev = Development files for libncurses.so.6 and assorted libraries PKGFILES_CSWlibncurses-dev = $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWlibncurses-dev += CSWlibncursesw5 -RUNTIME_DEP_PKGS_CSWlibncurses-dev += CSWlibmenuw5 -RUNTIME_DEP_PKGS_CSWlibncurses-dev += CSWlibncurses5 -RUNTIME_DEP_PKGS_CSWlibncurses-dev += CSWlibpanel5 -RUNTIME_DEP_PKGS_CSWlibncurses-dev += CSWlibformw5 -RUNTIME_DEP_PKGS_CSWlibncurses-dev += CSWlibform5 -RUNTIME_DEP_PKGS_CSWlibncurses-dev += CSWlibpanelw5 -RUNTIME_DEP_PKGS_CSWlibncurses-dev += CSWlibmenu5 +RUNTIME_DEP_PKGS_CSWlibncurses-dev += CSWlibncursesw6 +RUNTIME_DEP_PKGS_CSWlibncurses-dev += CSWlibmenuw6 +RUNTIME_DEP_PKGS_CSWlibncurses-dev += CSWlibncurses6 +RUNTIME_DEP_PKGS_CSWlibncurses-dev += CSWlibpanel6 +RUNTIME_DEP_PKGS_CSWlibncurses-dev += CSWlibformw6 +RUNTIME_DEP_PKGS_CSWlibncurses-dev += CSWlibform6 +RUNTIME_DEP_PKGS_CSWlibncurses-dev += CSWlibpanelw6 +RUNTIME_DEP_PKGS_CSWlibncurses-dev += CSWlibmenu6 PACKAGES += CSWterminfo SPKG_DESC_CSWterminfo = Database of terminal information, part of ncurses @@ -121,6 +121,12 @@ EXTRA_CFLAGS = $(EXTRA_CFLAGS-$(ISA)) EXTRA_LDFLAGS = $(EXTRA_CFLAGS-$(ISA)) +# The configure scripts uses bashisms +REINPLACEMENTS += configure +REINPLACE_MATCH_configure = /bin/sh +REINPLACE_WITH_configure = /usr/bin/bash +REINPLACE_FILES_configure += configure + CONFIGURE_ARGS = --prefix=$(prefix) CONFIGURE_ARGS += --bindir=$(bindir) CONFIGURE_ARGS += --libdir=$(libdir) Modified: csw/mgar/pkg/ncurses/trunk/checksums =================================================================== --- csw/mgar/pkg/ncurses/trunk/checksums 2016-03-30 22:33:56 UTC (rev 25638) +++ csw/mgar/pkg/ncurses/trunk/checksums 2016-04-01 13:17:42 UTC (rev 25639) @@ -1 +1 @@ -8cb9c412e5f2d96bc6f459aa8c6282a1 ncurses-5.9.tar.gz +ee13d052e1ead260d7c28071f46eefb1 ncurses-6.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Apr 4 09:26:22 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 4 Apr 2016 07:26:22 +0000 Subject: SF.net SVN: gar:[25640] csw/mgar/pkg/lang-python/salt/trunk/files/ salt-master Message-ID: <3qdk7m5KQRzV7@mail.opencsw.org> Revision: 25640 http://sourceforge.net/p/gar/code/25640 Author: dmichelsen Date: 2016-04-04 07:26:21 +0000 (Mon, 04 Apr 2016) Log Message: ----------- lang-python/salt/trunk: Fix start script as reported in #5273 Modified Paths: -------------- csw/mgar/pkg/lang-python/salt/trunk/files/salt-master Modified: csw/mgar/pkg/lang-python/salt/trunk/files/salt-master =================================================================== --- csw/mgar/pkg/lang-python/salt/trunk/files/salt-master 2016-04-01 13:17:42 UTC (rev 25639) +++ csw/mgar/pkg/lang-python/salt/trunk/files/salt-master 2016-04-04 07:26:21 UTC (rev 25640) @@ -9,7 +9,7 @@ PIDFILE=/var/run/salt-master.pid SALTMASTER=/opt/csw/bin/salt-master -[ ! -f ${CONF_DIR} ] && exit $CONF_DIR +[ ! -d ${CONF_DIR} ] && exit $CONF_DIR start_service() { /bin/rm -f ${PIDFILE} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Apr 4 11:38:18 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 4 Apr 2016 09:38:18 +0000 Subject: SF.net SVN: gar:[25641] csw/mgar/pkg/squid/trunk Message-ID: <3qdn7F0rTpzbY@mail.opencsw.org> Revision: 25641 http://sourceforge.net/p/gar/code/25641 Author: dmichelsen Date: 2016-04-04 09:38:17 +0000 (Mon, 04 Apr 2016) Log Message: ----------- squid/trunk: Update to 3.5.16 Modified Paths: -------------- csw/mgar/pkg/squid/trunk/Makefile csw/mgar/pkg/squid/trunk/checksums Modified: csw/mgar/pkg/squid/trunk/Makefile =================================================================== --- csw/mgar/pkg/squid/trunk/Makefile 2016-04-04 07:26:21 UTC (rev 25640) +++ csw/mgar/pkg/squid/trunk/Makefile 2016-04-04 09:38:17 UTC (rev 25641) @@ -2,7 +2,7 @@ # $Id$ # NAME = squid -VERSION = 3.5.15 +VERSION = 3.5.16 GARTYPE = v2 DESCRIPTION = High performance Web proxy cache Modified: csw/mgar/pkg/squid/trunk/checksums =================================================================== --- csw/mgar/pkg/squid/trunk/checksums 2016-04-04 07:26:21 UTC (rev 25640) +++ csw/mgar/pkg/squid/trunk/checksums 2016-04-04 09:38:17 UTC (rev 25641) @@ -1 +1 @@ -59d6732a4ebd3f63e2164d9847dc37c0 squid-3.5.15.tar.bz2 +ab9c92f4a579e056cd8afafa0a95f612 squid-3.5.16.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Apr 4 11:41:13 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 4 Apr 2016 09:41:13 +0000 Subject: SF.net SVN: gar:[25642] csw/mgar/pkg/squid/trunk/files/cswsquid3 Message-ID: <3qdn7F2T9fzbZ@mail.opencsw.org> Revision: 25642 http://sourceforge.net/p/gar/code/25642 Author: dmichelsen Date: 2016-04-04 09:41:13 +0000 (Mon, 04 Apr 2016) Log Message: ----------- squid/trunk: Put pidfile in run/ as reported in #5270 Modified Paths: -------------- csw/mgar/pkg/squid/trunk/files/cswsquid3 Modified: csw/mgar/pkg/squid/trunk/files/cswsquid3 =================================================================== --- csw/mgar/pkg/squid/trunk/files/cswsquid3 2016-04-04 09:38:17 UTC (rev 25641) +++ csw/mgar/pkg/squid/trunk/files/cswsquid3 2016-04-04 09:41:13 UTC (rev 25642) @@ -7,7 +7,7 @@ CSWSBIN=${CSWPREFIX}/sbin SQUID_DAEMON=${CSWSBIN}/squid SQUID_CONF=${CSWETC}/squid/squid.conf -SQUID_PIDFILE=/var${CSWPREFIX}/squid/logs/squid.pid +SQUID_PIDFILE=/var${CSWPREFIX}/squid/run/squid.pid if [ -f /lib/svc/share/smf_include.sh ]; then . /lib/svc/share/smf_include.sh @@ -38,12 +38,12 @@ ## stop gracefully echo 'stopping squid server... please wait for cleanup...' ${SQUID_DAEMON} -k shutdown - rm -f /var/opt/csw/squid/logs/squid.pid + rm -f ${SQUID_PIDFILE} exit 0 else ## Not running echo 'squid server is already down' - rm -f /var/opt/csw/squid/logs/squid.pid + rm -f ${SQUID_PIDFILE} exit 0 fi else @@ -51,7 +51,7 @@ echo 'Squid server not properly installed' echo 'Forcing Down!' pkill -9 squid - rm -f /var/opt/csw/squid/logs/squid.pid + rm -f ${SQUID_PIDFILE} exit 1 fi ;; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Apr 4 18:25:58 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 4 Apr 2016 16:25:58 +0000 Subject: SF.net SVN: gar:[25643] csw/mgar/pkg/php5/branches/php-5.6.x Message-ID: <3qdy6K2D9nzv0@mail.opencsw.org> Revision: 25643 http://sourceforge.net/p/gar/code/25643 Author: dmichelsen Date: 2016-04-04 16:25:58 +0000 (Mon, 04 Apr 2016) Log Message: ----------- php5/branches/php-5.6.x: Update to 5.6.20, fix preservation of config files, update to ncurses 6.0 Modified Paths: -------------- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile csw/mgar/pkg/php5/branches/php-5.6.x/checksums Modified: csw/mgar/pkg/php5/branches/php-5.6.x/Makefile =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2016-04-04 09:41:13 UTC (rev 25642) +++ csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2016-04-04 16:25:58 UTC (rev 25643) @@ -1,5 +1,6 @@ NAME = php VERSION = 5.6.19 +VERSION = 5.6.20 GARTYPE = v2 BUNDLE = php5 @@ -92,9 +93,8 @@ PRESERVECONF += $(sysconfdir)/php.ini PRESERVECONF += $(sysconfdir)/pear.conf -PRESERVECONF-ap2 += $(sysconfdir_ap2)/extra/httpd-php5.conf -PRESERVECONF-ap24 += $(sysconfdir_ap24)/extra/httpd-php5.conf -PRESERVECONF += $(PRESERVECONF-$(SAPI)) +PRESERVECONF += $(sysconfdir_ap2)/extra/httpd-php5.conf +PRESERVECONF += $(sysconfdir_ap24)/extra/httpd-php5.conf define php5_subpackage PACKAGES += CSWphp5-$(subst _,-,$(1)) @@ -255,7 +255,7 @@ $(eval $(call php5_subpackage,pgsql,CSWlibpq5)) $(eval $(call php5_subpackage,posix,)) $(eval $(call php5_subpackage,pspell,CSWlibaspell15)) -RUNTIME_DEP_PKGS_CSWphp5-readline_sparc += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWphp5-readline_sparc += CSWlibncurses6 RUNTIME_DEP_PKGS_CSWphp5-readline += $(RUNTIME_DEP_PKGS_CSWphp5-readline_$(GARCH)) $(eval $(call php5_subpackage,readline,CSWlibreadline6)) $(eval $(call php5_subpackage,session,CSWlibmm)) Modified: csw/mgar/pkg/php5/branches/php-5.6.x/checksums =================================================================== --- csw/mgar/pkg/php5/branches/php-5.6.x/checksums 2016-04-04 09:41:13 UTC (rev 25642) +++ csw/mgar/pkg/php5/branches/php-5.6.x/checksums 2016-04-04 16:25:58 UTC (rev 25643) @@ -1 +1 @@ -aab960cc1b2bfbeb00d030a9d42b38bd php-5.6.19.tar.xz +e81f3993997acafeac2ddd2c8bab7153 php-5.6.20.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Apr 4 20:42:17 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 4 Apr 2016 18:42:17 +0000 Subject: SF.net SVN: gar:[25644] csw/mgar/pkg Message-ID: <3qf17g68c0zyV@mail.opencsw.org> Revision: 25644 http://sourceforge.net/p/gar/code/25644 Author: dmichelsen Date: 2016-04-04 18:42:17 +0000 (Mon, 04 Apr 2016) Log Message: ----------- libicu57: Initial commit Modified Paths: -------------- csw/mgar/pkg/libicu57/trunk/Makefile csw/mgar/pkg/libicu57/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libicu57/ Modified: csw/mgar/pkg/libicu57/trunk/Makefile =================================================================== --- csw/mgar/pkg/libicu56/trunk/Makefile 2016-02-05 17:04:31 UTC (rev 25550) +++ csw/mgar/pkg/libicu57/trunk/Makefile 2016-04-04 18:42:17 UTC (rev 25644) @@ -1,6 +1,6 @@ # $Id$ NAME = libicu -VERSION = 56.1 +VERSION = 57.1 GARTYPE = v2 DESCRIPTION = International Components for Unicode @@ -15,72 +15,72 @@ LICENSE = license.html -PACKAGES += CSWlibicudata56 -SPKG_DESC_CSWlibicudata56 = International Components for Unicode, libicudata.so.56 -PKGFILES_CSWlibicudata56 += $(call pkgfiles_lib,libicudata.so.56) +PACKAGES += CSWlibicudata57 +SPKG_DESC_CSWlibicudata57 = International Components for Unicode, libicudata.so.57 +PKGFILES_CSWlibicudata57 += $(call pkgfiles_lib,libicudata.so.57) -PACKAGES += CSWlibicui18n56 -SPKG_DESC_CSWlibicui18n56 = International Components for Unicode, libicui18n.so.56 -PKGFILES_CSWlibicui18n56 += $(call pkgfiles_lib,libicui18n.so.56) -RUNTIME_DEP_PKGS_CSWlibicui18n56 += CSWlibicuuc56 -RUNTIME_DEP_PKGS_CSWlibicui18n56 += CSWlibicudata56 +PACKAGES += CSWlibicui18n57 +SPKG_DESC_CSWlibicui18n57 = International Components for Unicode, libicui18n.so.57 +PKGFILES_CSWlibicui18n57 += $(call pkgfiles_lib,libicui18n.so.57) +RUNTIME_DEP_PKGS_CSWlibicui18n57 += CSWlibicuuc57 +RUNTIME_DEP_PKGS_CSWlibicui18n57 += CSWlibicudata57 -PACKAGES += CSWlibicuio56 -SPKG_DESC_CSWlibicuio56 = International Components for Unicode, libicuio.so.56 -PKGFILES_CSWlibicuio56 += $(call pkgfiles_lib,libicuio.so.56) -RUNTIME_DEP_PKGS_CSWlibicuio56 += CSWlibicui18n56 -RUNTIME_DEP_PKGS_CSWlibicuio56 += CSWlibicuuc56 -RUNTIME_DEP_PKGS_CSWlibicuio56 += CSWlibicudata56 +PACKAGES += CSWlibicuio57 +SPKG_DESC_CSWlibicuio57 = International Components for Unicode, libicuio.so.57 +PKGFILES_CSWlibicuio57 += $(call pkgfiles_lib,libicuio.so.57) +RUNTIME_DEP_PKGS_CSWlibicuio57 += CSWlibicui18n57 +RUNTIME_DEP_PKGS_CSWlibicuio57 += CSWlibicuuc57 +RUNTIME_DEP_PKGS_CSWlibicuio57 += CSWlibicudata57 -PACKAGES += CSWlibicule56 -SPKG_DESC_CSWlibicule56 = International Components for Unicode, libicule.so.56 -PKGFILES_CSWlibicule56 += $(call pkgfiles_lib,libicule.so.56) -RUNTIME_DEP_PKGS_CSWlibicule56 += CSWlibicuuc56 -RUNTIME_DEP_PKGS_CSWlibicule56 += CSWlibicudata56 +PACKAGES += CSWlibicule57 +SPKG_DESC_CSWlibicule57 = International Components for Unicode, libicule.so.57 +PKGFILES_CSWlibicule57 += $(call pkgfiles_lib,libicule.so.57) +RUNTIME_DEP_PKGS_CSWlibicule57 += CSWlibicuuc57 +RUNTIME_DEP_PKGS_CSWlibicule57 += CSWlibicudata57 -PACKAGES += CSWlibiculx56 -SPKG_DESC_CSWlibiculx56 = International Components for Unicode, libiculx.so.56 -PKGFILES_CSWlibiculx56 += $(call pkgfiles_lib,libiculx.so.56) -RUNTIME_DEP_PKGS_CSWlibiculx56 += CSWlibicuuc56 -RUNTIME_DEP_PKGS_CSWlibiculx56 += CSWlibicule56 -RUNTIME_DEP_PKGS_CSWlibiculx56 += CSWlibicudata56 +PACKAGES += CSWlibiculx57 +SPKG_DESC_CSWlibiculx57 = International Components for Unicode, libiculx.so.57 +PKGFILES_CSWlibiculx57 += $(call pkgfiles_lib,libiculx.so.57) +RUNTIME_DEP_PKGS_CSWlibiculx57 += CSWlibicuuc57 +RUNTIME_DEP_PKGS_CSWlibiculx57 += CSWlibicule57 +RUNTIME_DEP_PKGS_CSWlibiculx57 += CSWlibicudata57 -PACKAGES += CSWlibicutest56 -SPKG_DESC_CSWlibicutest56 = International Components for Unicode, libicutest.so.56 -PKGFILES_CSWlibicutest56 += $(call pkgfiles_lib,libicutest.so.56) -RUNTIME_DEP_PKGS_CSWlibicutest56 += CSWlibicutu56 -RUNTIME_DEP_PKGS_CSWlibicutest56 += CSWlibicuuc56 -RUNTIME_DEP_PKGS_CSWlibicutest56 += CSWlibicui18n56 -RUNTIME_DEP_PKGS_CSWlibicutest56 += CSWlibicudata56 +PACKAGES += CSWlibicutest57 +SPKG_DESC_CSWlibicutest57 = International Components for Unicode, libicutest.so.57 +PKGFILES_CSWlibicutest57 += $(call pkgfiles_lib,libicutest.so.57) +RUNTIME_DEP_PKGS_CSWlibicutest57 += CSWlibicutu57 +RUNTIME_DEP_PKGS_CSWlibicutest57 += CSWlibicuuc57 +RUNTIME_DEP_PKGS_CSWlibicutest57 += CSWlibicui18n57 +RUNTIME_DEP_PKGS_CSWlibicutest57 += CSWlibicudata57 -PACKAGES += CSWlibicutu56 -SPKG_DESC_CSWlibicutu56 = International Components for Unicode, libicutu.so.56 -PKGFILES_CSWlibicutu56 += $(call pkgfiles_lib,libicutu.so.56) -RUNTIME_DEP_PKGS_CSWlibicutu56 += CSWlibicuuc56 -RUNTIME_DEP_PKGS_CSWlibicutu56 += CSWlibicui18n56 -RUNTIME_DEP_PKGS_CSWlibicutu56 += CSWlibicudata56 +PACKAGES += CSWlibicutu57 +SPKG_DESC_CSWlibicutu57 = International Components for Unicode, libicutu.so.57 +PKGFILES_CSWlibicutu57 += $(call pkgfiles_lib,libicutu.so.57) +RUNTIME_DEP_PKGS_CSWlibicutu57 += CSWlibicuuc57 +RUNTIME_DEP_PKGS_CSWlibicutu57 += CSWlibicui18n57 +RUNTIME_DEP_PKGS_CSWlibicutu57 += CSWlibicudata57 -PACKAGES += CSWlibicuuc56 -SPKG_DESC_CSWlibicuuc56 = International Components for Unicode, libicuuc.so.56 -PKGFILES_CSWlibicuuc56 += $(call pkgfiles_lib,libicuuc.so.56) -RUNTIME_DEP_PKGS_CSWlibicuuc56 += CSWlibicudata56 +PACKAGES += CSWlibicuuc57 +SPKG_DESC_CSWlibicuuc57 = International Components for Unicode, libicuuc.so.57 +PKGFILES_CSWlibicuuc57 += $(call pkgfiles_lib,libicuuc.so.57) +RUNTIME_DEP_PKGS_CSWlibicuuc57 += CSWlibicudata57 # This is the presence of /usr/share/lib/zoneinfo which is ok -CHECKPKG_OVERRIDES_CSWlibicuuc56 += file-with-bad-content|/usr/share|root/opt/csw/lib/libicuuc.so.56.1 -CHECKPKG_OVERRIDES_CSWlibicuuc56 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libicuuc.so.56.1 -CHECKPKG_OVERRIDES_CSWlibicuuc56 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libicuuc.so.56.1 +CHECKPKG_OVERRIDES_CSWlibicuuc57 += file-with-bad-content|/usr/share|root/opt/csw/lib/libicuuc.so.57.1 +CHECKPKG_OVERRIDES_CSWlibicuuc57 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libicuuc.so.57.1 +CHECKPKG_OVERRIDES_CSWlibicuuc57 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libicuuc.so.57.1 PACKAGES += CSWlibicu-dev -SPKG_DESC_CSWlibicu-dev = Development files for libicu.so.56 +SPKG_DESC_CSWlibicu-dev = Development files for libicu.so.57 # This package is PKGFILES catchall -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicudata56 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicui18n56 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicuio56 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicule56 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibiculx56 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicutest56 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicutu56 -RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicuuc56 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicudata57 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicui18n57 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicuio57 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicule57 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibiculx57 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicutest57 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicutu57 +RUNTIME_DEP_PKGS_CSWlibicu-dev += CSWlibicuuc57 # This is a false positive. Override until this is fixed: # http://lists.opencsw.org/pipermail/maintainers/2015-January/019612.html @@ -92,17 +92,20 @@ CHECKPKG_OVERRIDES_CSWlibicu-dev += file-needed-but-no-package-satisfies-it|/opt/csw/lib/icu/current/pkgdata.inc|CSWlibicu-dev|contains|symlink|/opt/csw/lib/icu/pkgdata.inc|which|needs|the|target|file:|/opt/csw/lib/icu/current/pkgdata.inc # For i386 due to different linker settings -CHECKPKG_OVERRIDES_CSWlibicule56 += surplus-dependency|CSWlibicudata56 -CHECKPKG_OVERRIDES_CSWlibicutu56 += surplus-dependency|CSWlibicudata56 -CHECKPKG_OVERRIDES_CSWlibiculx56 += surplus-dependency|CSWlibicudata56 -CHECKPKG_OVERRIDES_CSWlibicuio56 += surplus-dependency|CSWlibicudata56 -CHECKPKG_OVERRIDES_CSWlibicutest56 += surplus-dependency|CSWlibicudata56 -CHECKPKG_OVERRIDES_CSWlibicutest56 += surplus-dependency|CSWlibicui18n56 -CHECKPKG_OVERRIDES_CSWlibicui18n56 += surplus-dependency|CSWlibicudata56 +CHECKPKG_OVERRIDES_CSWlibicule57 += surplus-dependency|CSWlibicudata57 +CHECKPKG_OVERRIDES_CSWlibicutu57 += surplus-dependency|CSWlibicudata57 +CHECKPKG_OVERRIDES_CSWlibiculx57 += surplus-dependency|CSWlibicudata57 +CHECKPKG_OVERRIDES_CSWlibicuio57 += surplus-dependency|CSWlibicudata57 +CHECKPKG_OVERRIDES_CSWlibicutest57 += surplus-dependency|CSWlibicudata57 +CHECKPKG_OVERRIDES_CSWlibicutest57 += surplus-dependency|CSWlibicui18n57 +CHECKPKG_OVERRIDES_CSWlibicui18n57 += surplus-dependency|CSWlibicudata57 DISTNAME = icu WORKSRC = $(WORKDIR)/$(DISTNAME)/source +# Raise compiler as newer features are needed +GARCOMPILER = SOS12U4 + REINPLACE_USRLOCAL += config/icu-config-bottom # Using -I/opt/csw/include here puts it before the include of the newly built Modified: csw/mgar/pkg/libicu57/trunk/checksums =================================================================== --- csw/mgar/pkg/libicu56/trunk/checksums 2016-02-05 17:04:31 UTC (rev 25550) +++ csw/mgar/pkg/libicu57/trunk/checksums 2016-04-04 18:42:17 UTC (rev 25644) @@ -1 +1 @@ -c4a2d71ff56aec5ebfab2a3f059be99d icu4c-56_1-src.tgz +976734806026a4ef8bdd17937c8898b9 icu4c-57_1-src.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Mon Apr 4 22:02:29 2016 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Mon, 4 Apr 2016 20:02:29 +0000 Subject: SF.net SVN: gar:[25645] csw/mgar/pkg/dovecot-sieve/trunk Message-ID: <3qf2w5612Zz12d@mail.opencsw.org> Revision: 25645 http://sourceforge.net/p/gar/code/25645 Author: jake_goerzen Date: 2016-04-04 20:02:29 +0000 (Mon, 04 Apr 2016) Log Message: ----------- dovecot-sieve/trunk: update to version 0.4.13 Modified Paths: -------------- csw/mgar/pkg/dovecot-sieve/trunk/Makefile csw/mgar/pkg/dovecot-sieve/trunk/checksums Modified: csw/mgar/pkg/dovecot-sieve/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot-sieve/trunk/Makefile 2016-04-04 18:42:17 UTC (rev 25644) +++ csw/mgar/pkg/dovecot-sieve/trunk/Makefile 2016-04-04 20:02:29 UTC (rev 25645) @@ -1,5 +1,5 @@ NAME = dovecot-2.2-pigeonhole -VERSION = 0.4.12 +VERSION = 0.4.13 GARTYPE = v2 DESCRIPTION = Secure POP3/IMAP server - Sieve filters support Modified: csw/mgar/pkg/dovecot-sieve/trunk/checksums =================================================================== --- csw/mgar/pkg/dovecot-sieve/trunk/checksums 2016-04-04 18:42:17 UTC (rev 25644) +++ csw/mgar/pkg/dovecot-sieve/trunk/checksums 2016-04-04 20:02:29 UTC (rev 25645) @@ -1 +1 @@ -eb96e65be62c71f987a3b5ad2d782b7b dovecot-2.2-pigeonhole-0.4.12.tar.gz +5009b133096724aa2cb7fe1056d88125 dovecot-2.2-pigeonhole-0.4.13.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Tue Apr 5 19:37:11 2016 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Tue, 5 Apr 2016 17:37:11 +0000 Subject: SF.net SVN: gar:[25646] csw/mgar/pkg/hatari/trunk Message-ID: <3qfbf72Z05z1TL@mail.opencsw.org> Revision: 25646 http://sourceforge.net/p/gar/code/25646 Author: jake_goerzen Date: 2016-04-05 17:37:10 +0000 (Tue, 05 Apr 2016) Log Message: ----------- hatari/trunk: update to 1.9.0 Modified Paths: -------------- csw/mgar/pkg/hatari/trunk/Makefile csw/mgar/pkg/hatari/trunk/checksums Modified: csw/mgar/pkg/hatari/trunk/Makefile =================================================================== --- csw/mgar/pkg/hatari/trunk/Makefile 2016-04-04 20:02:29 UTC (rev 25645) +++ csw/mgar/pkg/hatari/trunk/Makefile 2016-04-05 17:37:10 UTC (rev 25646) @@ -1,10 +1,10 @@ NAME = hatari -VERSION = 1.8.0 +VERSION = 1.9.0 GARTYPE = v2 DESCRIPTION = Atari ST emulator define BLURB -Hatari is an Atari ST and STE emulator for GNU/Linux, BSD, BeOS, Mac OS X and other systems that are supported by the SDL library. +Hatari is an Atari ST, STE, TT and Falcon emulator for GNU/Linux, BSD, BeOS, Mac OS X and other systems that are supported by the SDL library. endef MASTER_SITES = http://download.tuxfamily.org/hatari/$(VERSION)/ @@ -12,7 +12,7 @@ PACKAGES = CSWhatari RUNTIME_DEP_PKGS_CSWhatari += CSWlibz1 -RUNTIME_DEP_PKGS_CSWhatari += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWhatari += CSWlibpng16-16 RUNTIME_DEP_PKGS_CSWhatari += CSWlibsdl1-2-0 RUNTIME_DEP_PKGS_CSWhatari += CSWlibreadline6 Modified: csw/mgar/pkg/hatari/trunk/checksums =================================================================== --- csw/mgar/pkg/hatari/trunk/checksums 2016-04-04 20:02:29 UTC (rev 25645) +++ csw/mgar/pkg/hatari/trunk/checksums 2016-04-05 17:37:10 UTC (rev 25646) @@ -1 +1 @@ -f78cf673debbbe2d523415ab605550e1 hatari-1.8.0.tar.bz2 +24e54b19958943dbe5ac1b1f6f32b284 hatari-1.9.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Tue Apr 5 19:41:22 2016 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Tue, 5 Apr 2016 17:41:22 +0000 Subject: SF.net SVN: gar:[25647] csw/mgar/pkg/hatari/trunk/Makefile Message-ID: <3qfbkp17t4z1Wl@mail.opencsw.org> Revision: 25647 http://sourceforge.net/p/gar/code/25647 Author: jake_goerzen Date: 2016-04-05 17:41:22 +0000 (Tue, 05 Apr 2016) Log Message: ----------- hatari/trunk: fix override for libpng16 Modified Paths: -------------- csw/mgar/pkg/hatari/trunk/Makefile Modified: csw/mgar/pkg/hatari/trunk/Makefile =================================================================== --- csw/mgar/pkg/hatari/trunk/Makefile 2016-04-05 17:37:10 UTC (rev 25646) +++ csw/mgar/pkg/hatari/trunk/Makefile 2016-04-05 17:41:22 UTC (rev 25647) @@ -32,7 +32,7 @@ CHECKPKG_OVERRIDES_CSWhatari += no-direct-binding|/opt/csw/bin/hatari|is|not|directly|bound|to|soname|libSM.so.6 CHECKPKG_OVERRIDES_CSWhatari += no-direct-binding|/opt/csw/bin/hatari|is|not|directly|bound|to|soname|libX11.so.4 CHECKPKG_OVERRIDES_CSWhatari += no-direct-binding|/opt/csw/bin/hatari|is|not|directly|bound|to|soname|libXext.so.0 -CHECKPKG_OVERRIDES_CSWhatari += no-direct-binding|/opt/csw/bin/hatari|is|not|directly|bound|to|soname|libpng15.so.15 +CHECKPKG_OVERRIDES_CSWhatari += no-direct-binding|/opt/csw/bin/hatari|is|not|directly|bound|to|soname|libpng16.so.16 CHECKPKG_OVERRIDES_CSWhatari += no-direct-binding|/opt/csw/bin/hatari|is|not|directly|bound|to|soname|libreadline.so.6 CHECKPKG_OVERRIDES_CSWhatari += no-direct-binding|/opt/csw/bin/hatari|is|not|directly|bound|to|soname|libz.so.1 CHECKPKG_OVERRIDES_CSWhatari += no-direct-binding|/opt/csw/bin/hmsa|is|not|directly|bound|to|soname|libz.so.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Apr 6 09:18:01 2016 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 6 Apr 2016 07:18:01 +0000 Subject: SF.net SVN: gar:[25648] csw/mgar/pkg/squid/trunk/Makefile Message-ID: <3qfxsB5vmBzGl@mail.opencsw.org> Revision: 25648 http://sourceforge.net/p/gar/code/25648 Author: cgrzemba Date: 2016-04-06 07:18:01 +0000 (Wed, 06 Apr 2016) Log Message: ----------- squid/trunk: add debug configure options Modified Paths: -------------- csw/mgar/pkg/squid/trunk/Makefile Modified: csw/mgar/pkg/squid/trunk/Makefile =================================================================== --- csw/mgar/pkg/squid/trunk/Makefile 2016-04-05 17:41:22 UTC (rev 25647) +++ csw/mgar/pkg/squid/trunk/Makefile 2016-04-06 07:18:01 UTC (rev 25648) @@ -111,6 +111,7 @@ CONFIGURE_ARGS += --enable-wccp CONFIGURE_ARGS += --enable-wccpv2 + # Native instructions need to be disabled for zones as reported in #5221 # This is described in detail in # http://wiki.squid-cache.org/KnowledgeBase/IllegalInstructionError @@ -141,8 +142,12 @@ # Add #define until this is fixed: # http://bugs.squid-cache.org/show_bug.cgi?id=4025 EXTRA_CPPFLAGS += -DKRB5_DEPRECATED=1 -CONFIGURE_ARGS += --disable-strict-error-checking +CONFIGURE_ARGS_OPT += --disable-strict-error-checking +CONFIGURE_ARGS_DBG += --disable-optimizations +CONFIGURE_ARGS_DBG += --disable-inline +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) + # configure tests with 'id -u' and expects a uidnumber CONFIGURE_ENV_PATH = /usr/xpg4/bin:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rmottola at users.sourceforge.net Wed Apr 6 12:50:42 2016 From: rmottola at users.sourceforge.net (rmottola at users.sourceforge.net) Date: Wed, 6 Apr 2016 10:50:42 +0000 Subject: SF.net SVN: gar:[25649] csw/mgar/pkg/gnustep-make/trunk Message-ID: <3qg2ZV0Bk7zPC@mail.opencsw.org> Revision: 25649 http://sourceforge.net/p/gar/code/25649 Author: rmottola Date: 2016-04-06 10:50:42 +0000 (Wed, 06 Apr 2016) Log Message: ----------- gnustep-make/trunk: update version Modified Paths: -------------- csw/mgar/pkg/gnustep-make/trunk/Makefile csw/mgar/pkg/gnustep-make/trunk/checksums Modified: csw/mgar/pkg/gnustep-make/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnustep-make/trunk/Makefile 2016-04-06 07:18:01 UTC (rev 25648) +++ csw/mgar/pkg/gnustep-make/trunk/Makefile 2016-04-06 10:50:42 UTC (rev 25649) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = gnustep-make -VERSION = 2.6.7 +VERSION = 2.6.8 GARTYPE = v2 DESCRIPTION = GNUstep-core make Modified: csw/mgar/pkg/gnustep-make/trunk/checksums =================================================================== --- csw/mgar/pkg/gnustep-make/trunk/checksums 2016-04-06 07:18:01 UTC (rev 25648) +++ csw/mgar/pkg/gnustep-make/trunk/checksums 2016-04-06 10:50:42 UTC (rev 25649) @@ -1 +1 @@ -b272c985b9e7a1ac6fb27cbbb6a248b2 gnustep-make-2.6.7.tar.gz +7faa60b737e9bbb7fab69ecb14af4e61 gnustep-make-2.6.8.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Apr 7 13:42:51 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 7 Apr 2016 11:42:51 +0000 Subject: SF.net SVN: gar:[25650] csw/mgar/pkg/libstatgrab/trunk/Makefile Message-ID: <3qgghL3F63zrC@mail.opencsw.org> Revision: 25650 http://sourceforge.net/p/gar/code/25650 Author: dmichelsen Date: 2016-04-07 11:42:51 +0000 (Thu, 07 Apr 2016) Log Message: ----------- libstatgrab/trunk: Switch to gcc Modified Paths: -------------- csw/mgar/pkg/libstatgrab/trunk/Makefile Modified: csw/mgar/pkg/libstatgrab/trunk/Makefile =================================================================== --- csw/mgar/pkg/libstatgrab/trunk/Makefile 2016-04-06 10:50:42 UTC (rev 25649) +++ csw/mgar/pkg/libstatgrab/trunk/Makefile 2016-04-07 11:42:51 UTC (rev 25650) @@ -20,6 +20,7 @@ PACKAGES += CSWlibstatgrab10 SPKG_DESC_CSWlibstatgrab10 = A library that provides cross platform access to statistics, libstatgrab.so.10 PKGFILES_CSWlibstatgrab10 += $(call pkgfiles_lib,libstatgrab.so.10) +RUNTIME_DEP_PKGS_CSWlibstatgrab10 += CSWlibgcc-s1 PACKAGES += CSWlibstatgrab-dev SPKG_DESC_CSWlibstatgrab-dev = Development files for libstatgrab.so.10 @@ -34,13 +35,17 @@ SPKG_DESC_CSWlibstatgrab-utils = Statistic gathering tools based on libstatgrab.so.10 # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWlibstatgrab-utils += CSWlibstatgrab10 +RUNTIME_DEP_PKGS_CSWlibstatgrab-utils += CSWlibncurses6 +# We move to GCC anyway and the visibility flags in statgrab.h are compiler-specific +GARCOMPILER = GNU + # Don't pull in ncurses from CSW, but add needed libraries to be self-sufficient -LINKER_FLAGS = +# LINKER_FLAGS = BUILD64 = 1 ISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-curses-prefix=/usr +#CONFIGURE_ARGS += --with-curses-prefix=/usr include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Apr 7 16:55:30 2016 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 7 Apr 2016 14:55:30 +0000 Subject: SF.net SVN: gar:[25651] csw/mgar/pkg/squid/trunk Message-ID: <3qglyb0GGzzyn@mail.opencsw.org> Revision: 25651 http://sourceforge.net/p/gar/code/25651 Author: cgrzemba Date: 2016-04-07 14:55:30 +0000 (Thu, 07 Apr 2016) Log Message: ----------- squid/trunk: add some patches Modified Paths: -------------- csw/mgar/pkg/squid/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/squid/trunk/files/bug4482.patch csw/mgar/pkg/squid/trunk/files/opt-cflags-configure.ap.patch Modified: csw/mgar/pkg/squid/trunk/Makefile =================================================================== --- csw/mgar/pkg/squid/trunk/Makefile 2016-04-07 11:42:51 UTC (rev 25650) +++ csw/mgar/pkg/squid/trunk/Makefile 2016-04-07 14:55:30 UTC (rev 25651) @@ -29,6 +29,10 @@ # From http://bugs.squid-cache.org/show_bug.cgi?id=4057 #PATCHFILES += bug4057.patch +PATCHFILES += bug4482.patch +# bug4483 integrated in squid-4 +PATCHFILES += opt-cflags-configure.ap.patch + PACKAGES = CSWsquid RUNTIME_DEP_PKGS_CSWsquid += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWsquid += CSWlibldap2-4-2 @@ -142,10 +146,10 @@ # Add #define until this is fixed: # http://bugs.squid-cache.org/show_bug.cgi?id=4025 EXTRA_CPPFLAGS += -DKRB5_DEPRECATED=1 -CONFIGURE_ARGS_OPT += --disable-strict-error-checking +# CONFIGURE_ARGS_OPT += --disable-strict-error-checking -CONFIGURE_ARGS_DBG += --disable-optimizations -CONFIGURE_ARGS_DBG += --disable-inline +# CONFIGURE_ARGS_DBG += --disable-optimizations +# CONFIGURE_ARGS_DBG += --disable-inline CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) # configure tests with 'id -u' and expects a uidnumber @@ -180,6 +184,10 @@ include gar/category.mk +pre-configure: + cd $(WORKSRC) && autoreconf --force --install + @$(MAKECOOKIE) + post-install-modulated: ginstall -d $(DESTDIR)/etc/opt/csw/init.d ginstall -d $(DESTDIR)/var/opt/csw/$(NAME)/logs Added: csw/mgar/pkg/squid/trunk/files/bug4482.patch =================================================================== --- csw/mgar/pkg/squid/trunk/files/bug4482.patch (rev 0) +++ csw/mgar/pkg/squid/trunk/files/bug4482.patch 2016-04-07 14:55:30 UTC (rev 25651) @@ -0,0 +1,11 @@ +--- a/src/ip/Intercept.cc ++++ b/src/ip/Intercept.cc +@@ -205,7 +205,7 @@ Ip::Intercept::IpfInterception(const Comm::ConnectionPointer &newConn, int silen + // warn once every 10 at critical level, then push down a level each repeated event + static int warningLevel = DBG_CRITICAL; + debugs(89, warningLevel, "IPF (IPFilter v4) NAT does not support IPv6. Please upgrade to IPFilter v5.1"); +- warningLevel = ++warningLevel % 10; ++ warningLevel = (warningLevel+1) % 10; + return false; + #else + natLookup.nl_v = 6; Added: csw/mgar/pkg/squid/trunk/files/opt-cflags-configure.ap.patch =================================================================== --- csw/mgar/pkg/squid/trunk/files/opt-cflags-configure.ap.patch (rev 0) +++ csw/mgar/pkg/squid/trunk/files/opt-cflags-configure.ap.patch 2016-04-07 14:55:30 UTC (rev 25651) @@ -0,0 +1,20 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -400,7 +400,7 @@ AC_ARG_ENABLE(optimizations, + if test "x$enableval" = "xno" ; then + AC_MSG_NOTICE([Disabling compiler optimizations (-O flag)]) + CFLAGS="`echo $CFLAGS | sed -e 's/-O[[0-9]]*//'`" +- CXXFLAGS="`echo $CXXFLAGS | sed -e 's/-O[[0-9]]*//'`" ++ CXXFLAGS="`echo $CXXFLAGS | sed -e 's/-O[[0-9g]]*//'`" + enable_inline="no" + fi + ]) +@@ -3237,7 +3237,7 @@ case "$host" in + i386-*-solaris2.*) + if test "x$GCC" = "xyes"; then + AC_MSG_NOTICE([Removing -O for gcc on $host]) +- CFLAGS="`echo $CFLAGS | sed -e 's/-O[[0-9]]*//'`" ++ CFLAGS="`echo $CFLAGS | sed -e 's/-O[[0-9g]]*//'`" + fi + ;; + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Apr 7 20:54:57 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 7 Apr 2016 18:54:57 +0000 Subject: SF.net SVN: gar:[25652] csw/mgar/pkg/nrpe/trunk Message-ID: <3qgsH43XGkz1Vv@mail.opencsw.org> Revision: 25652 http://sourceforge.net/p/gar/code/25652 Author: dmichelsen Date: 2016-04-07 18:54:55 +0000 (Thu, 07 Apr 2016) Log Message: ----------- nrpe/trunk: General rework Modified Paths: -------------- csw/mgar/pkg/nrpe/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/nrpe/trunk/files/0003-change_dh_param_to_2048.patch Removed Paths: ------------- csw/mgar/pkg/nrpe/trunk/files/0003-chage_dh_param_to_2048.patch csw/mgar/pkg/nrpe/trunk/files/0003-remove-chown-on-install.patch csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.checkinstall csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.gspec csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preinstall csw/mgar/pkg/nrpe/trunk/files/CSWnrpeplugin.gspec csw/mgar/pkg/nrpe/trunk/files/common.h.diff csw/mgar/pkg/nrpe/trunk/files/configure.diff csw/mgar/pkg/nrpe/trunk/files/cswusergroup csw/mgar/pkg/nrpe/trunk/files/patch.diff Modified: csw/mgar/pkg/nrpe/trunk/Makefile =================================================================== --- csw/mgar/pkg/nrpe/trunk/Makefile 2016-04-07 14:55:30 UTC (rev 25651) +++ csw/mgar/pkg/nrpe/trunk/Makefile 2016-04-07 18:54:55 UTC (rev 25652) @@ -4,73 +4,42 @@ define BLURB - NRPE allows you to remotely execute Nagios plugins on other Linux/Unix machines. This allows you to monitor remote machine metrics (disk usage, CPU load, etc.). NRPE can also communicate with some of the Windows agent addons, so you can execute scripts and check metrics on remote Windows machines as well. + NRPE allows you to remotely execute Nagios plugins on other Linux/Unix machines. + This allows you to monitor remote machine metrics (disk usage, CPU load, etc.). + NRPE can also communicate with some of the Windows agent addons, so you can execute + scripts and check metrics on remote Windows machines as well. endef SF_PROJECT = nagios MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES += $(DISTNAME).tar.gz +DISTFILES += cswnrpe +DISTFILES += README_8k -# -# modulations -# +PATCHFILES_isa-sparcv8plus-size-8k += 0002-changing-packetbuffer-length-to-8k.patch +PATCHFILES_isa-pentium_pro-size-8k += 0002-changing-packetbuffer-length-to-8k.patch +PATCHFILES += 0003-change_dh_param_to_2048.patch + +LICENSE = LEGAL + EXTRA_MODULATORS = SIZE MODULATIONS_SIZE = 1k 8k -DISTFILES += CSWnrpe.preinstall -DISTFILES += cswnrpe cswusergroup -DISTFILES += README_8k +REINPLACE_USRLOCAL += .*/nrpe-2.15/SECURITY +REINPLACE_USRLOCAL += .*/nrpe-2.15/README +REINPLACE_USRLOCAL += sample-config/nrpe.cfg.in -PATCHFILES_isa-sparcv8plus-size-8k = 0002-changing-packetbuffer-length-to-8k.patch -PATCHFILES_isa-pentium_pro-size-8k = 0002-changing-packetbuffer-length-to-8k.patch -# needs autoconf! -PATCHFILES += 0003-remove-chown-on-install.patch -PATCHFILES += 0003-chage_dh_param_to_2048.patch +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +PACKAGING_PLATFORMS += solaris11-sparc solaris11-i386 -# -# replace /usr/local -# - -REINPLACE_USRLOCAL += .*/nrpe-2.15/SECURITY -REINPLACE_USRLOCAL += .*/nrpe-2.15/README -REINPLACE_USRLOCAL += sample-config/nrpe.cfg.in - -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 solaris11-i386 solaris11-sparc - -# GARCOMPILER = GCC5 - -# -# -# PRESERVECONF += $(sysconfdir)/nrpe.cfg USERGROUP += $(sysconfdir)/pkg/CSWnrpe/cswusergroup INITSMF += $(sysconfdir)/init.d/cswnrpe -# OBSOLETED_BY_CSWnrpe-plugin = CSWnrpeplugin -# SPKG_CATALOG_NAME_CSWnrpeplugin = nrpe_plugin_stub - -# -# files for CSWnrpe -# - -IPS_PACKAGE_PREFIX = diagnostic/ -PACKAGES += CSWnrpe -SPKG_DESC_CSWnrpe = Nagios remote plugin executor -PKGFILES_CSWnrpe += /opt/csw/bin/nrpe_1k -PKGFILES_CSWnrpe += /opt/csw/bin/nrpe_8k -PKGFILES_CSWnrpe += /opt/csw/bin/nrpe -PKGFILES_CSWnrpe += /etc/opt/csw/nrpe.cfg.CSW -PKGFILES_CSWnrpe += /etc/opt/csw/init.d/cswnrpe -PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe -PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/NRPE.pdf -PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/LEGAL -PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/license -PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/README -PKGFILES_CSWnrpe_SHARED += /opt/csw/share/doc/nrpe/README_8k -PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/README.SSL -PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/SECURITY -PKGFILES_CSWnrpe += /opt/csw/nagios +PACKAGES += CSWnrpe +SPKG_DESC_CSWnrpe = Nagios remote plugin executor +# PKGFILES is catchall RUNTIME_DEP_PKGS_CSWnrpe += CSWlibwrap1 RUNTIME_DEP_PKGS_CSWnrpe += CSWlibssl1-0-0 @@ -78,112 +47,69 @@ CHECKPKG_OVERRIDES_CSWnrpe += file-collision|/opt/csw/share/doc/nrpe/README_8k|CSWnrpe|CSWnrpe-plugin CHECKPKG_OVERRIDES_CSWnrpe-plugin += file-collision|/opt/csw/share/doc/nrpe/README_8k|CSWnrpe|CSWnrpe-plugin - -# -# files for CSWnrpe-plugin -# - -PACKAGES += CSWnrpe-plugin -SPKG_DESC_CSWnrpe-plugin = Nagios plugin that connects to nrpe demon -PKGFILES_CSWnrpe-plugin += /opt/csw/libexec/nagios-plugins -PKGFILES_CSWnrpe-plugin += /opt/csw/libexec/nagios-plugins/check_nrpe -PKGFILES_CSWnrpe-plugin += /opt/csw/libexec/nagios-plugins/check_nrpe_1k -PKGFILES_CSWnrpe-plugin += /opt/csw/libexec/nagios-plugins/check_nrpe_8k -PKGFILES_CSWnrpe-plugin += /opt/csw/share/doc/nrpe -PKGFILES_CSWnrpe-plugin_SHARED += /opt/csw/share/doc/nrpe/README_8k -PKGFILES_CSWnrpe-plugin += /opt/csw/share/doc/nrpe_plugin -PKGFILES_CSWnrpe-plugin += /opt/csw/share/doc/nrpe_plugin/license +PACKAGES += CSWnrpe-plugin +SPKG_DESC_CSWnrpe-plugin = Nagios plugin that connects to nrpe demon +PKGFILES_CSWnrpe-plugin += .*/check_nrpe_.* +PKGFILES_CSWnrpe-plugin_SHARED += /opt/csw/share/doc/nrpe/README_8k RUNTIME_DEP_PKGS_CSWnrpe-plugin += CSWlibssl1-0-0 #RUNTIME_DEP_PKGS_CSWnrpe-plugin += CSWnrpe +ALTERNATIVES = 1k 8k +ALTERNATIVE_1k += $(bindir)/nrpe nrpe $(bindir)/nrpe_1k 20 +ALTERNATIVE_1k += $(libexecdir)/check_nrpe check_nrpe $(libexecdir)/check_nrpe_1k +ALTERNATIVE_8k += $(bindir)/nrpe nrpe $(bindir)/nrpe_8k 10 +ALTERNATIVE_8k += $(libexecdir)/check_nrpe check_nrpe $(libexecdir)/check_nrpe_8k -# -# migrate configuration -# +NOISALIST = 1 -# MIGRATE_FILES_CSWnrpe = nrpe.cfg -# MIGRATE_SOURCE_DIR = /opt/csw/etc -# MIGRATE_DEST_DIR = /etc/opt/csw +libexecdir = $(prefix)/libexec/nagios-plugins -LICENSE = LEGAL - -NOISALIST = 1 - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-ssl-lib=/opt/csw/lib -CONFIGURE_ARGS += --with-ssl-inc=/opt/csw/include -CONFIGURE_ARGS += --with-ssl-dir=/opt/csw/bin -CONFIGURE_ARGS += --with-kerberos-inc=/opt/csw/include +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --with-ssl-lib=$(libdir) +CONFIGURE_ARGS += --with-ssl-inc=$(includedir) +CONFIGURE_ARGS += --with-ssl-dir=$(bindir) +CONFIGURE_ARGS += --with-kerberos-inc=$(includedir) CONFIGURE_ARGS += --enable-command-args -CONFIGURE_ARGS += --prefix=/opt/csw -CONFIGURE_ARGS += --exec-prefix=/opt/csw -CFLAGS += "-I/opt/csw/include" +INSTALL_ARGS = install-daemon-config -sysconfdir = /etc${prefix} -bindir = $(prefix)/bin -libexecdir = $(prefix)/libexec/nagios-plugins -datadir = $(prefix)/share +# There is no testsuite +TEST_SCRIPTS = -TEST_TARGET = all +INSTALL_OVERRIDE_VARS += NAGIOS_INSTALL_OPTS +INSTALL_OVERRIDE_VARS += NRPE_INSTALL_OPTS -INSTALL_SCRIPTS = custom - MERGE_SCRIPTS_isa-sparcv8plus-size-1k = copy-all -MERGE_SCRIPTS_isa-sparcv8plus-size-8k = copy-nrpe-only +MERGE_SCRIPTS_isa-sparcv8plus-size-8k = copy-only MERGE_SCRIPTS_isa-pentium_pro-size-1k = copy-all -MERGE_SCRIPTS_isa-pentium_pro-size-8k = copy-nrpe-only +MERGE_SCRIPTS_isa-pentium_pro-size-8k = copy-only -# -# -# -#POSTMSG = /opt/csw/share/doc/nrpe/README.CSW -# -# overrides -# +EXTRA_PAX_ARGS += -s ',($(bindir))/nrpe,$$1/nrpe_$(SIZE),' +EXTRA_PAX_ARGS += -s ',($(libexecdir))/check_nrpe,$$1/check_nrpe_$(SIZE),' -# -# -# - include gar/category.mk -DOCDIR=$(datadir)/doc/nrpe -CFGDIR=$(sysconfdir) -LIBEXECDIR=$(libexecdir) -BINDIR=$(bindir) - pre-configure: + @# This is because of patch 0003-change_dh_param_to_2048.patch cd $(WORKSRC) && autoconf @$(MAKECOOKIE) -install-custom: - @ginstall -m 775 -d $(DESTDIR)$(DOCDIR) - @ginstall -m 755 -d $(DESTDIR)$(LIBEXECDIR) - @ginstall -m 755 -d $(DESTDIR)$(BINDIR) - @ginstall -m 755 $(WORKSRC)/src/check_nrpe $(DESTDIR)$(LIBEXECDIR)/check_nrpe_1k - @ln -s $(LIBEXECDIR)/check_nrpe_1k $(DESTDIR)$(LIBEXECDIR)/check_nrpe - @ginstall -m 755 $(WORKSRC)/src/nrpe $(DESTDIR)$(BINDIR)/nrpe_1k - @ln -s $(BINDIR)/nrpe_1k $(DESTDIR)$(BINDIR)/nrpe - @ginstall -m 644 $(WORKSRC)/docs/NRPE.pdf $(DESTDIR)$(DOCDIR) - @ginstall -m 644 $(FILEDIR)/README_8k $(DESTDIR)$(DOCDIR) - @ginstall -m 644 $(WORKSRC)/LEGAL $(DESTDIR)$(DOCDIR) - @ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(DOCDIR) - @ginstall -m 644 $(WORKSRC)/README.SSL $(DESTDIR)$(DOCDIR) - @ginstall -m 644 $(WORKSRC)/SECURITY $(DESTDIR)$(DOCDIR) - # @ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWnrpe - # @ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/etc/opt/csw/pkg/CSWnrpe/cswusergroup - @# - @# Start / Stop script - @ginstall -d $(DESTDIR)/etc/$(BUILD_PREFIX)/init.d - @ginstall -m 755 $(FILEDIR)/cswnrpe $(DESTDIR)/etc/$(BUILD_PREFIX)/init.d/cswnrpe - cd $(WORKSRC) && gmake install-daemon-config DESTDIR=$(DESTDIR) +post-install: DOCDIR=$(docdir)/nrpe +post-install: + ginstall -m 775 -d $(DESTDIR)$(DOCDIR) + ginstall -m 644 $(WORKDIR)/README_8k $(DESTDIR)$(DOCDIR) + ginstall -m 644 $(WORKSRC)/docs/NRPE.pdf $(DESTDIR)$(DOCDIR) + ginstall -m 644 $(WORKSRC)/LEGAL $(DESTDIR)$(DOCDIR) + ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(DOCDIR) + ginstall -m 644 $(WORKSRC)/README.SSL $(DESTDIR)$(DOCDIR) + ginstall -m 644 $(WORKSRC)/SECURITY $(DESTDIR)$(DOCDIR) + ginstall -D -m 755 $(WORKDIR)/cswnrpe $(DESTDIR)$(sysconfdir)/init.d/cswnrpe @$(MAKECOOKIE) merge-copy-nrpe-only: - cp $(INSTALLISADIR)$(bindir)/nrpe_1k $(PKGROOT)$(bindir)/nrpe_8k - cp $(INSTALLISADIR)$(LIBEXECDIR)/check_nrpe_1k $(PKGROOT)$(LIBEXECDIR)/check_nrpe_8k + cp $(INSTALLISADIR)$(bindir)/nrpe $(PKGROOT)$(bindir)/nrpe_$(SIZE) + cp $(INSTALLISADIR)$(LIBEXECDIR)/check_nrpe $(PKGROOT)$(LIBEXECDIR)/check_nrpe_$(SIZE) @$(MAKECOOKIE) Deleted: csw/mgar/pkg/nrpe/trunk/files/0003-chage_dh_param_to_2048.patch =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/0003-chage_dh_param_to_2048.patch 2016-04-07 14:55:30 UTC (rev 25651) +++ csw/mgar/pkg/nrpe/trunk/files/0003-chage_dh_param_to_2048.patch 2016-04-07 18:54:55 UTC (rev 25652) @@ -1,39 +0,0 @@ -From a733ca5b0f5e5e8f8a17730c43164c338c79161e Mon Sep 17 00:00:00 2001 -From: Jan Holzhueter -Date: Tue, 29 Mar 2016 10:16:49 +0200 -Subject: [PATCH] chage_dh_param_to_2048 - ---- - configure.in | 2 +- - src/nrpe.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.in b/configure.in -index f0dfa09..1993140 100644 ---- a/configure.in -+++ b/configure.in -@@ -340,7 +340,7 @@ if test x$check_for_ssl = xyes; then - sslbin=$ssldir/bin/openssl - fi - # awk to strip off meta data at bottom of dhparam output -- $sslbin dhparam -C 512 | awk '/^-----/ {exit} {print}' > include/dh.h -+ $sslbin dhparam -C 2048 | awk '/^-----/ {exit} {print}' > include/dh.h - fi - fi - -diff --git a/src/nrpe.c b/src/nrpe.c -index 381f0ac..6234492 100644 ---- a/src/nrpe.c -+++ b/src/nrpe.c -@@ -266,7 +266,7 @@ int main(int argc, char **argv){ - - /* use anonymous DH ciphers */ - SSL_CTX_set_cipher_list(ctx,"ADH"); -- dh=get_dh512(); -+ dh=get_dh2048(); - SSL_CTX_set_tmp_dh(ctx,dh); - DH_free(dh); - if(debug==TRUE) --- -2.4.0 - Copied: csw/mgar/pkg/nrpe/trunk/files/0003-change_dh_param_to_2048.patch (from rev 25651, csw/mgar/pkg/nrpe/trunk/files/0003-chage_dh_param_to_2048.patch) =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/0003-change_dh_param_to_2048.patch (rev 0) +++ csw/mgar/pkg/nrpe/trunk/files/0003-change_dh_param_to_2048.patch 2016-04-07 18:54:55 UTC (rev 25652) @@ -0,0 +1,39 @@ +From a733ca5b0f5e5e8f8a17730c43164c338c79161e Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter +Date: Tue, 29 Mar 2016 10:16:49 +0200 +Subject: [PATCH] chage_dh_param_to_2048 + +--- + configure.in | 2 +- + src/nrpe.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +index f0dfa09..1993140 100644 +--- a/configure.in ++++ b/configure.in +@@ -340,7 +340,7 @@ if test x$check_for_ssl = xyes; then + sslbin=$ssldir/bin/openssl + fi + # awk to strip off meta data at bottom of dhparam output +- $sslbin dhparam -C 512 | awk '/^-----/ {exit} {print}' > include/dh.h ++ $sslbin dhparam -C 2048 | awk '/^-----/ {exit} {print}' > include/dh.h + fi + fi + +diff --git a/src/nrpe.c b/src/nrpe.c +index 381f0ac..6234492 100644 +--- a/src/nrpe.c ++++ b/src/nrpe.c +@@ -266,7 +266,7 @@ int main(int argc, char **argv){ + + /* use anonymous DH ciphers */ + SSL_CTX_set_cipher_list(ctx,"ADH"); +- dh=get_dh512(); ++ dh=get_dh2048(); + SSL_CTX_set_tmp_dh(ctx,dh); + DH_free(dh); + if(debug==TRUE) +-- +2.4.0 + Deleted: csw/mgar/pkg/nrpe/trunk/files/0003-remove-chown-on-install.patch =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/0003-remove-chown-on-install.patch 2016-04-07 14:55:30 UTC (rev 25651) +++ csw/mgar/pkg/nrpe/trunk/files/0003-remove-chown-on-install.patch 2016-04-07 18:54:55 UTC (rev 25652) @@ -1,20 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -392,7 +392,7 @@ AC_ARG_WITH([nrpe_port], - [nrpe_port=5666]) - AC_SUBST(nrpe_user) - AC_SUBST(nrpe_group) --NRPE_INSTALL_OPTS="-o $nrpe_user -g $nrpe_group" -+NRPE_INSTALL_OPTS= - AC_SUBST(NRPE_INSTALL_OPTS) - AC_SUBST(nrpe_port) - AC_DEFINE_UNQUOTED(DEFAULT_SERVER_PORT,$nrpe_port,[Default port for NRPE daemon]) -@@ -409,7 +409,7 @@ AC_ARG_WITH([nagios_group], - [nagios_group=nagios]) - AC_SUBST(nagios_user) - AC_SUBST(nagios_group) --NAGIOS_INSTALL_OPTS="-o $nagios_user -g $nagios_group" -+NAGIOS_INSTALL_OPTS= - AC_SUBST(NAGIOS_INSTALL_OPTS) - - # Determine target OS, version and architecture for package build macros Deleted: csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.checkinstall =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.checkinstall 2016-04-07 14:55:30 UTC (rev 25651) +++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.checkinstall 2016-04-07 18:54:55 UTC (rev 25652) @@ -1,50 +0,0 @@ -# See if user group are needed -NEEDNAGUSER=0 -NEEDNAGGROUP=0 -NEEDCMDGROUP=0 - -#First check target machines password file, THEN check -#NIS/NIS+/whatever - -grep '^nagios:' /etc/passwd >/dev/null -if [ $? -ne 0 ] ; then - getent passwd nagios >/dev/null - if [ $? -ne 0 ] ; then - NEEDNAGUSER=1 - fi -fi - -grep '^nagios:' /etc/group >/dev/null -if [ $? -ne 0 ] ; then - getent group nagios >/dev/null - if [ $? -ne 0 ] ; then - NEEDNAGGROUP=1 - fi -fi - -if [ "$NEEDNAGUSER" = 1 ] ; then - echo "***" - echo "User nagios must exist for this package install." - echo "nagios user will be added." - ADDNAGUSER=1 -else - echo "nagios user detected" -fi - -if [ "$NEEDNAGGROUP" = 1 ] ; then - echo "***" - echo "Group nagios must exist for this package install." - echo "nagios group will be added." - ADDNAGGROUP=1 -else - echo "nagios group detected" -fi - -# Make env variables available to other packaging scripts - -cat >$1 <&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lwrap $LIBS" -+LIBS="-lsocket -lwrap $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF Deleted: csw/mgar/pkg/nrpe/trunk/files/cswusergroup =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/cswusergroup 2016-04-07 14:55:30 UTC (rev 25651) +++ csw/mgar/pkg/nrpe/trunk/files/cswusergroup 2016-04-07 18:54:55 UTC (rev 25652) @@ -1 +0,0 @@ -nagios:nagios:Nagios user:/opt/csw/nagios:/bin/false:m:r Deleted: csw/mgar/pkg/nrpe/trunk/files/patch.diff =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/patch.diff 2016-04-07 14:55:30 UTC (rev 25651) +++ csw/mgar/pkg/nrpe/trunk/files/patch.diff 2016-04-07 18:54:55 UTC (rev 25652) @@ -1,16 +0,0 @@ -diff --speed-large-files --minimal -Nru nrpe-2.12.orig/src/nrpe.c nrpe-2.12/src/nrpe.c ---- nrpe-2.12.orig/src/nrpe.c 2008-03-10 22:04:43.000000000 +0100 -+++ nrpe-2.12/src/nrpe.c 2008-12-15 14:31:43.737436594 +0100 -@@ -613,10 +613,10 @@ - log_facility=LOG_UUCP; - else if(!strcmp(varvalue,"cron")) - log_facility=LOG_CRON; -- else if(!strcmp(varvalue,"authpriv")) -+/* else if(!strcmp(varvalue,"authpriv")) - log_facility=LOG_AUTHPRIV; - else if(!strcmp(varvalue,"ftp")) -- log_facility=LOG_FTP; -+ log_facility=LOG_FTP; */ - else if(!strcmp(varvalue,"local0")) - log_facility=LOG_LOCAL0; - else if(!strcmp(varvalue,"local1")) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 8 10:36:59 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 8 Apr 2016 08:36:59 +0000 Subject: SF.net SVN: gar:[25653] csw/mgar/pkg Message-ID: <3qhCWK5ycszH8@mail.opencsw.org> Revision: 25653 http://sourceforge.net/p/gar/code/25653 Author: dmichelsen Date: 2016-04-08 08:36:59 +0000 (Fri, 08 Apr 2016) Log Message: ----------- libcerf/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/libcerf/ csw/mgar/pkg/libcerf/Makefile csw/mgar/pkg/libcerf/branches/ csw/mgar/pkg/libcerf/tags/ csw/mgar/pkg/libcerf/trunk/ csw/mgar/pkg/libcerf/trunk/Makefile csw/mgar/pkg/libcerf/trunk/checksums csw/mgar/pkg/libcerf/trunk/files/ Added: csw/mgar/pkg/libcerf/Makefile =================================================================== --- csw/mgar/pkg/libcerf/Makefile (rev 0) +++ csw/mgar/pkg/libcerf/Makefile 2016-04-08 08:36:59 UTC (rev 25653) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/libcerf/trunk =================================================================== --- csw/mgar/pkg/libcerf/trunk 2016-04-07 18:54:55 UTC (rev 25652) +++ csw/mgar/pkg/libcerf/trunk 2016-04-08 08:36:59 UTC (rev 25653) Property changes on: csw/mgar/pkg/libcerf/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/libcerf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcerf/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libcerf/trunk/Makefile 2016-04-08 08:36:59 UTC (rev 25653) @@ -0,0 +1,32 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = libcerf +VERSION = 1.4 +GARTYPE = v2 + +DESCRIPTION = Complex error functions + +MASTER_SITES = http://apps.jcns.fz-juelich.de/src/libcerf/ +DISTFILES += $(DISTNAME).tgz + +VENDOR_URL = http://apps.jcns.fz-juelich.de/doku/sc/libcerf + +PACKAGES += CSWlibcerf1 +SPKG_DESC_CSWlibcerf1 = Complex error functions, libcerf.so.1 +PKGFILES_CSWlibcerf1 += $(call pkgfiles_lib,libcerf.so.1) +RUNTIME_DEP_PKGS_CSWlibcerf1 += CSWlibgcc-s1 + +PACKAGES += CSWlibcerf-dev +SPKG_DESC_CSWlibcerf-dev = Development files for libcerf.so.1 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibcerf-dev += CSWlibcerf1 + +GARCOMPILER = GNU + +BUILD64 = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/libcerf/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/libcerf/trunk/checksums =================================================================== --- csw/mgar/pkg/libcerf/trunk/checksums (rev 0) +++ csw/mgar/pkg/libcerf/trunk/checksums 2016-04-08 08:36:59 UTC (rev 25653) @@ -0,0 +1 @@ +5cf986e791bb6675ec3fa0c186b1a265 libcerf-1.4.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 8 13:07:43 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 8 Apr 2016 11:07:43 +0000 Subject: SF.net SVN: gar:[25654] csw/mgar/pkg/squid/branches/squid-4.x Message-ID: <3qhGsC4DGczMP@mail.opencsw.org> Revision: 25654 http://sourceforge.net/p/gar/code/25654 Author: dmichelsen Date: 2016-04-08 11:07:43 +0000 (Fri, 08 Apr 2016) Log Message: ----------- squid/branches/squid-4.x: Update to 4.0.8 Modified Paths: -------------- csw/mgar/pkg/squid/branches/squid-4.x/Makefile csw/mgar/pkg/squid/branches/squid-4.x/checksums Modified: csw/mgar/pkg/squid/branches/squid-4.x/Makefile =================================================================== --- csw/mgar/pkg/squid/branches/squid-4.x/Makefile 2016-04-08 08:36:59 UTC (rev 25653) +++ csw/mgar/pkg/squid/branches/squid-4.x/Makefile 2016-04-08 11:07:43 UTC (rev 25654) @@ -2,7 +2,7 @@ # $Id$ # NAME = squid -VERSION = 4.0.4 +VERSION = 4.0.8 GARTYPE = v2 DESCRIPTION = High performance Web proxy cache @@ -33,7 +33,6 @@ RUNTIME_DEP_PKGS_CSWsquid += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWsquid += CSWlibsasl2-2 RUNTIME_DEP_PKGS_CSWsquid += CSWlibltdl7 -RUNTIME_DEP_PKGS_CSWsquid += CSWperl RUNTIME_DEP_PKGS_CSWsquid += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWsquid += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWsquid += CSWlibssl1-0-0 Modified: csw/mgar/pkg/squid/branches/squid-4.x/checksums =================================================================== --- csw/mgar/pkg/squid/branches/squid-4.x/checksums 2016-04-08 08:36:59 UTC (rev 25653) +++ csw/mgar/pkg/squid/branches/squid-4.x/checksums 2016-04-08 11:07:43 UTC (rev 25654) @@ -1 +1 @@ -5e9e247394fc9332d53bf3e1b23dcd63 squid-4.0.4.tar.xz +1faaba303d7affd061a5162e378e318a squid-4.0.8.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon Apr 11 12:32:12 2016 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 11 Apr 2016 10:32:12 +0000 Subject: SF.net SVN: gar:[25655] csw/mgar/pkg/subversion/branches Message-ID: <3qk5x54HQ9zBK@mail.opencsw.org> Revision: 25655 http://sourceforge.net/p/gar/code/25655 Author: cgrzemba Date: 2016-04-11 10:32:12 +0000 (Mon, 11 Apr 2016) Log Message: ----------- create an IPS branch Modified Paths: -------------- csw/mgar/pkg/subversion/branches/ips/Makefile Added Paths: ----------- csw/mgar/pkg/subversion/branches/ips/ Modified: csw/mgar/pkg/subversion/branches/ips/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2016-03-23 10:20:15 UTC (rev 25629) +++ csw/mgar/pkg/subversion/branches/ips/Makefile 2016-04-11 10:32:12 UTC (rev 25655) @@ -47,11 +47,25 @@ # solaris9 does not have the newest glib2 any more so no gnome-keychain on Solaris9 PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386 -BUILD_DEP_PKGS += CSWlibexpat-dev -BUILD_DEP_PKGS += CSWlibsqlite3-dev +#BUILD_DEP_PKGS += CSWlibexpat-dev +#BUILD_DEP_PKGS += CSWlibsqlite3-dev +#BUILD_DEP_PKGS += CSWggettext-dev BUILD_DEP_PKGS-5.10 += CSWlibserf-dev BUILD_DEP_PKGS += $(BUILD_DEP_PKGS-$(GAROSREL)) +EXTRA_MODULATORS += PYTHON_VERSION +MODULATIONS_PYTHON_VERSION = 2.7 +# MODULATIONS_PYTHON_VERSION = 2.6 2.7 +# We need 64 bit just once as it is without python anyway +SKIP_MODULATIONS += isa-sparcv9-python_version-2.7 +SKIP_MODULATIONS += isa-amd64-python_version-2.7 +PYTHON = $(bindir)/python$(PYTHON_VERSION) +MERGE_SCRIPTS_isa-default-python_version-2.6 += copy-all +MERGE_SCRIPTS_isa-default-python_version-2.7 += copy-all +MERGE_SCRIPTS_isa-default64-python_version-2.6 += copy-relocated-only +MERGE_DIRS_isa-default64-python_version-2.6 += $(libdir) + +IPS_PACKAGE_PREFIX = developer/versioning/ PACKAGES += CSWsvn SPKG_DESC_CSWsvn = Version control rethought CATALOGNAME_CSWsvn = subversion @@ -262,9 +276,9 @@ #EXTRA_INC += $(prefix)/apache2/include #EXTRA_LIB += /opt/csw/apache2/lib -EXTRA_LIB += /opt/csw/bdb48/lib +# EXTRA_LIB += /opt/csw/bdb48/lib EXTRA_LIB += $(SVNLIB) -EXTRA_LINKER_FLAGS = -lintl -liconv +EXTRA_LINKER_FLAGS = -L/usr/gnu/lib -R/usr/gnu/lib -lintl -liconv -R/usr/apr/1.5/lib -R/usr/apr-util/1.5/lib # Only add $ISALIST to dirs which ship optimized versions (done by explicitly # excluding those lib dirs which are known not to ship optimized versions). @@ -298,22 +312,22 @@ NODIRPATHS = --libdir --libexecdir CONFIGURE_ARGS = $(DIRPATHS) --libdir=$(SVNLIB) --libexecdir=$(SVNLIB) CONFIGURE_ARGS += --disable-mod-activation -CONFIGURE_ARGS += --with-jdk=$(JAVA_HOME) +# CONFIGURE_ARGS += --with-jdk=$(JAVA_HOME) # Solaris 9 has issues with JDK 1.6.0 and Sun Studio 12: # Error: Could not find a match for EditorProxy::EditorProxy -CONFIGURE_ARGS_5.10 += --enable-javahl -CONFIGURE_ARGS += --with-apr=$(bindir)/apr-1-config -CONFIGURE_ARGS += --with-apr-util=$(bindir)/apu-1-config -CONFIGURE_ARGS += --with-apxs=$(prefix)/apache2/sbin/apxs -CONFIGURE_ARGS += --with-sasl=$(prefix) -CONFIGURE_ARGS += --with-serf=$(prefix) +# CONFIGURE_ARGS_5.10 += --enable-javahl +# CONFIGURE_ARGS += --with-apr=$(bindir)/apr-1-config +# CONFIGURE_ARGS += --with-apr-util=$(bindir)/apu-1-config +# CONFIGURE_ARGS += --with-apxs=$(prefix)/apache2/sbin/apxs +# CONFIGURE_ARGS += --with-sasl=$(prefix) +CONFIGURE_ARGS += --with-serf=/usr/gnu # XXX: configure: WARNING: unrecognized options: --with-ssl # CONFIGURE_ARGS += --with-ssl=$(prefix) -CONFIGURE_ARGS += --with-zlib=$(prefix) -CONFIGURE_ARGS += --with-apache-libexecdir=$(prefix)/apache2/libexec +# CONFIGURE_ARGS += --with-zlib=$(prefix) +# CONFIGURE_ARGS += --with-apache-libexecdir=$(prefix)/apache2/libexec # No Keyring on Solaris9 -CONFIGURE_ARGS_5.10 += --with-gnome-keyring=$(prefix) +# CONFIGURE_ARGS_5.10 += --with-gnome-keyring=$(prefix) CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GAROSREL)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Apr 11 17:14:35 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 11 Apr 2016 15:14:35 +0000 Subject: SF.net SVN: gar:[25656] csw/mgar/pkg/apache24/trunk Message-ID: <3qkDBh2nwYzHK@mail.opencsw.org> Revision: 25656 http://sourceforge.net/p/gar/code/25656 Author: dmichelsen Date: 2016-04-11 15:14:34 +0000 (Mon, 11 Apr 2016) Log Message: ----------- apache24/trunk: Update to 2.4.20 Modified Paths: -------------- csw/mgar/pkg/apache24/trunk/Makefile csw/mgar/pkg/apache24/trunk/checksums Modified: csw/mgar/pkg/apache24/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache24/trunk/Makefile 2016-04-11 10:32:12 UTC (rev 25655) +++ csw/mgar/pkg/apache24/trunk/Makefile 2016-04-11 15:14:34 UTC (rev 25656) @@ -1,7 +1,7 @@ # $Id: Makefile 18185 2012-06-01 02:30:46Z bdwalton $ NAME = httpd -VERSION = 2.4.18 +VERSION = 2.4.20 GARTYPE = v2 PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc Modified: csw/mgar/pkg/apache24/trunk/checksums =================================================================== --- csw/mgar/pkg/apache24/trunk/checksums 2016-04-11 10:32:12 UTC (rev 25655) +++ csw/mgar/pkg/apache24/trunk/checksums 2016-04-11 15:14:34 UTC (rev 25656) @@ -1 +1 @@ -2f90ce3426541817e0dfd01cae086b60 httpd-2.4.18.tar.gz +e725c268624737a163dc844e28f720d1 httpd-2.4.20.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Tue Apr 12 13:30:35 2016 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 12 Apr 2016 11:30:35 +0000 Subject: SF.net SVN: gar:[25657] csw/mgar/pkg/mysql5/branches/mysql-5.5.x Message-ID: <3qkl9t5D9mz177@mail.opencsw.org> Revision: 25657 http://sourceforge.net/p/gar/code/25657 Author: lblume Date: 2016-04-12 11:30:35 +0000 (Tue, 12 Apr 2016) Log Message: ----------- mysql5/branches/mysql-5.5.x: Bump to 5.5.49 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2016-04-11 15:14:34 UTC (rev 25656) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2016-04-12 11:30:35 UTC (rev 25657) @@ -14,7 +14,7 @@ PROJ_NAME = mysql NAME = $(PROJ_NAME)5 BASE_VERSION = 5.5 -PATCHLEVEL = 48 +PATCHLEVEL = 49 ALTS_PRIO = 55 VERSION = $(BASE_VERSION).$(PATCHLEVEL) Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 2016-04-11 15:14:34 UTC (rev 25656) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 2016-04-12 11:30:35 UTC (rev 25657) @@ -1 +1 @@ -53c9b1e5058183ac64c71455ae4dfc51 mysql-5.5.48.tar.gz +a02028d1e3981d03efd24292e3a734cc mysql-5.5.49.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Tue Apr 12 15:28:19 2016 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Tue, 12 Apr 2016 13:28:19 +0000 Subject: SF.net SVN: gar:[25658] csw/mgar/pkg/mysql5/branches/mysql-5.6.x Message-ID: <3qknnc36smz31@mail.opencsw.org> Revision: 25658 http://sourceforge.net/p/gar/code/25658 Author: lblume Date: 2016-04-12 13:28:18 +0000 (Tue, 12 Apr 2016) Log Message: ----------- mysql5/branches/mysql-5.6.x: Bump to 5.6.30 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2016-04-12 11:30:35 UTC (rev 25657) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile 2016-04-12 13:28:18 UTC (rev 25658) @@ -20,7 +20,7 @@ PROJ_NAME = mysql NAME = $(PROJ_NAME)56 BASE_VERSION = 5.6 -PATCHLEVEL = 29 +PATCHLEVEL = 30 ALTS_PRIO = 56 VERSION = $(BASE_VERSION).$(PATCHLEVEL) Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums 2016-04-12 11:30:35 UTC (rev 25657) +++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/checksums 2016-04-12 13:28:18 UTC (rev 25658) @@ -1 +1 @@ -aaa21c6450adee3a1894fd1710f02bf5 mysql-5.6.29.tar.gz +ac8ba1db4454d2c144c7d892185a9328 mysql-5.6.30.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Apr 15 15:55:00 2016 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 15 Apr 2016 13:55:00 +0000 Subject: SF.net SVN: gar:[25659] csw/mgar/pkg/mercurial/trunk Message-ID: <3qmfF84SVPz1Ff@mail.opencsw.org> Revision: 25659 http://sourceforge.net/p/gar/code/25659 Author: rthurner Date: 2016-04-15 13:55:00 +0000 (Fri, 15 Apr 2016) Log Message: ----------- mercurial/trunk: mercurial, update to hg-3.7.3 Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile csw/mgar/pkg/mercurial/trunk/checksums Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2016-04-12 13:28:18 UTC (rev 25658) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2016-04-15 13:55:00 UTC (rev 25659) @@ -1,5 +1,5 @@ NAME = mercurial -VERSION = 3.7.2 +VERSION = 3.7.3 CATEGORIES = python DESCRIPTION = Fast, lightweight Source Control Management system Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2016-04-12 13:28:18 UTC (rev 25658) +++ csw/mgar/pkg/mercurial/trunk/checksums 2016-04-15 13:55:00 UTC (rev 25659) @@ -1 +1 @@ -cebd60f39965480879d268d6e13e3d30 mercurial-3.7.2.tar.gz +f47c9c76b7bf429dafecb71fa81c01b4 mercurial-3.7.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Fri Apr 15 17:13:23 2016 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 15 Apr 2016 15:13:23 +0000 Subject: SF.net SVN: gar:[25660] csw/mgar/pkg/samba/branches/samba3 Message-ID: <3qmh0x1wjpz10w@mail.opencsw.org> Revision: 25660 http://sourceforge.net/p/gar/code/25660 Author: lblume Date: 2016-04-15 15:13:22 +0000 (Fri, 15 Apr 2016) Log Message: ----------- samba/branches/samba3: Add patches for recent CVEs Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba3/Makefile Added Paths: ----------- csw/mgar/pkg/samba/branches/samba3/files/CVE-2015-5370-v3-6.patch csw/mgar/pkg/samba/branches/samba3/files/CVE-2016-2110-v3-6.patch csw/mgar/pkg/samba/branches/samba3/files/CVE-2016-2111-v3-6.patch csw/mgar/pkg/samba/branches/samba3/files/CVE-2016-2112-v3-6.patch csw/mgar/pkg/samba/branches/samba3/files/CVE-2016-2115-v3-6.patch csw/mgar/pkg/samba/branches/samba3/files/CVE-2016-2118-v3-6.patch csw/mgar/pkg/samba/branches/samba3/files/CVE-preparation-v3-6.patch csw/mgar/pkg/samba/branches/samba3/files/samba-3.6.25-security-2015-12-16.patch Modified: csw/mgar/pkg/samba/branches/samba3/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba3/Makefile 2016-04-15 13:55:00 UTC (rev 25659) +++ csw/mgar/pkg/samba/branches/samba3/Makefile 2016-04-15 15:13:22 UTC (rev 25660) @@ -30,6 +30,16 @@ PATCHFILES += 0002-smbd-patch-for-setgroups.c.patch PATCHFILES += 0003-rename-nss-modules.patch +# Upstream patches for recent CVEs +PATCHFILES += samba-3.6.25-security-2015-12-16.patch +PATCHFILES += CVE-preparation-v3-6.patch +PATCHFILES += CVE-2016-2118-v3-6.patch +PATCHFILES += CVE-2016-2115-v3-6.patch +PATCHFILES += CVE-2016-2112-v3-6.patch +PATCHFILES += CVE-2016-2111-v3-6.patch +PATCHFILES += CVE-2016-2110-v3-6.patch +PATCHFILES += CVE-2015-5370-v3-6.patch + BUILD_DEP_PKGS += CSWlibtalloc-dev BUILD_DEP_PKGS += CSWopenldap-dev BUILD_DEP_PKGS += CSWlibkrb5-dev @@ -418,8 +428,8 @@ # Studio 12 is the last supported on Solaris 9 GARCOMPILER_5.9 = SOS12 -GARCOMPILER_5.10 = SOS12U3 -GARCOMPILER_5.11 = SOS12U3 +GARCOMPILER_5.10 = GCC5 +GARCOMPILER_5.11 = GCC5 GARCOMPILER = $(GARCOMPILER_$(GAROSREL)) # Set the target dir for modules with the proper arch Added: csw/mgar/pkg/samba/branches/samba3/files/CVE-2015-5370-v3-6.patch =================================================================== --- csw/mgar/pkg/samba/branches/samba3/files/CVE-2015-5370-v3-6.patch (rev 0) +++ csw/mgar/pkg/samba/branches/samba3/files/CVE-2015-5370-v3-6.patch 2016-04-15 15:13:22 UTC (rev 25660) @@ -0,0 +1,3080 @@ +From 8716bb5e03cc4f10e2d4edc704d8defe7e8045f1 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Thu, 16 Jul 2015 22:46:05 +0200 +Subject: [PATCH 01/40] CVE-2015-5370: dcerpc.idl: add + DCERPC_{NCACN_PAYLOAD,FRAG}_MAX_SIZE defines +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +--- + librpc/idl/dcerpc.idl | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/librpc/idl/dcerpc.idl b/librpc/idl/dcerpc.idl +index 75ef2ec..bbb42d1 100644 +--- a/librpc/idl/dcerpc.idl ++++ b/librpc/idl/dcerpc.idl +@@ -475,9 +475,11 @@ interface dcerpc + const uint8 DCERPC_PFC_OFFSET = 3; + const uint8 DCERPC_DREP_OFFSET = 4; + const uint8 DCERPC_FRAG_LEN_OFFSET = 8; ++ const uint32 DCERPC_FRAG_MAX_SIZE = 5840; + const uint8 DCERPC_AUTH_LEN_OFFSET = 10; + const uint8 DCERPC_CALL_ID_OFFSET = 12; + const uint8 DCERPC_NCACN_PAYLOAD_OFFSET = 16; ++ const uint32 DCERPC_NCACN_PAYLOAD_MAX_SIZE = 0x400000; /* 4 MByte */ + + /* little-endian flag */ + const uint8 DCERPC_DREP_LE = 0x10; +-- +2.8.1 + + +From 3b1cdbd2dc1c4d3773b4a1ef86ad1643abc5c208 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Sun, 28 Jun 2015 01:19:57 +0200 +Subject: [PATCH 02/40] CVE-2015-5370: librpc/rpc: simplify and harden + dcerpc_pull_auth_trailer() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +--- + librpc/rpc/dcerpc_util.c | 63 ++++++++++++++++++++++++++++++++++++------------ + librpc/rpc/rpc_common.h | 4 +-- + 2 files changed, 49 insertions(+), 18 deletions(-) + +diff --git a/librpc/rpc/dcerpc_util.c b/librpc/rpc/dcerpc_util.c +index 97ef798..f936ef4 100644 +--- a/librpc/rpc/dcerpc_util.c ++++ b/librpc/rpc/dcerpc_util.c +@@ -92,31 +92,44 @@ uint8_t dcerpc_get_endian_flag(DATA_BLOB *blob) + * + * @return - A NTSTATUS error code. + */ +-NTSTATUS dcerpc_pull_auth_trailer(struct ncacn_packet *pkt, ++NTSTATUS dcerpc_pull_auth_trailer(const struct ncacn_packet *pkt, + TALLOC_CTX *mem_ctx, +- DATA_BLOB *pkt_trailer, ++ const DATA_BLOB *pkt_trailer, + struct dcerpc_auth *auth, +- uint32_t *auth_length, ++ uint32_t *_auth_length, + bool auth_data_only) + { + struct ndr_pull *ndr; + enum ndr_err_code ndr_err; +- uint32_t data_and_pad; ++ uint16_t data_and_pad; ++ uint16_t auth_length; ++ uint32_t tmp_length; + +- data_and_pad = pkt_trailer->length +- - (DCERPC_AUTH_TRAILER_LENGTH + pkt->auth_length); ++ ZERO_STRUCTP(auth); ++ if (_auth_length != NULL) { ++ *_auth_length = 0; ++ } + +- /* paranoia check for pad size. This would be caught anyway by +- the ndr_pull_advance() a few lines down, but it scared +- Jeremy enough for him to call me, so we might as well check +- it now, just to prevent someone posting a bogus YouTube +- video in the future. +- */ +- if (data_and_pad > pkt_trailer->length) { +- return NT_STATUS_INFO_LENGTH_MISMATCH; ++ /* Paranoia checks for auth_length. The caller should check this... */ ++ if (pkt->auth_length > pkt->frag_length) { ++ return NT_STATUS_INTERNAL_ERROR; ++ } ++ tmp_length = DCERPC_NCACN_PAYLOAD_OFFSET; ++ tmp_length += DCERPC_AUTH_TRAILER_LENGTH; ++ tmp_length += pkt->auth_length; ++ if (tmp_length > pkt->frag_length) { ++ return NT_STATUS_INTERNAL_ERROR; ++ } ++ if (pkt_trailer->length > UINT16_MAX) { ++ return NT_STATUS_INTERNAL_ERROR; + } + +- *auth_length = pkt_trailer->length - data_and_pad; ++ auth_length = DCERPC_AUTH_TRAILER_LENGTH + pkt->auth_length; ++ if (pkt_trailer->length < auth_length) { ++ return NT_STATUS_RPC_PROTOCOL_ERROR; ++ } ++ ++ data_and_pad = pkt_trailer->length - auth_length; + + ndr = ndr_pull_init_blob(pkt_trailer, mem_ctx); + if (!ndr) { +@@ -136,14 +149,28 @@ NTSTATUS dcerpc_pull_auth_trailer(struct ncacn_packet *pkt, + ndr_err = ndr_pull_dcerpc_auth(ndr, NDR_SCALARS|NDR_BUFFERS, auth); + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { + talloc_free(ndr); ++ ZERO_STRUCTP(auth); + return ndr_map_error2ntstatus(ndr_err); + } + ++ if (data_and_pad < auth->auth_pad_length) { ++ DEBUG(1, (__location__ ": ERROR: pad length mismatch. " ++ "Calculated %u got %u\n", ++ (unsigned)data_and_pad, ++ (unsigned)auth->auth_pad_length)); ++ talloc_free(ndr); ++ ZERO_STRUCTP(auth); ++ return NT_STATUS_RPC_PROTOCOL_ERROR; ++ } ++ + if (auth_data_only && data_and_pad != auth->auth_pad_length) { +- DEBUG(1, (__location__ ": WARNING: pad length mismatch. " ++ DEBUG(1, (__location__ ": ERROR: pad length mismatch. " + "Calculated %u got %u\n", + (unsigned)data_and_pad, + (unsigned)auth->auth_pad_length)); ++ talloc_free(ndr); ++ ZERO_STRUCTP(auth); ++ return NT_STATUS_RPC_PROTOCOL_ERROR; + } + + DEBUG(6,(__location__ ": auth_pad_length %u\n", +@@ -152,6 +179,10 @@ NTSTATUS dcerpc_pull_auth_trailer(struct ncacn_packet *pkt, + talloc_steal(mem_ctx, auth->credentials.data); + talloc_free(ndr); + ++ if (_auth_length != NULL) { ++ *_auth_length = auth_length; ++ } ++ + return NT_STATUS_OK; + } + +diff --git a/librpc/rpc/rpc_common.h b/librpc/rpc/rpc_common.h +index fe8129d..98a2e95 100644 +--- a/librpc/rpc/rpc_common.h ++++ b/librpc/rpc/rpc_common.h +@@ -158,9 +158,9 @@ uint8_t dcerpc_get_endian_flag(DATA_BLOB *blob); + * + * @return - A NTSTATUS error code. + */ +-NTSTATUS dcerpc_pull_auth_trailer(struct ncacn_packet *pkt, ++NTSTATUS dcerpc_pull_auth_trailer(const struct ncacn_packet *pkt, + TALLOC_CTX *mem_ctx, +- DATA_BLOB *pkt_trailer, ++ const DATA_BLOB *pkt_trailer, + struct dcerpc_auth *auth, + uint32_t *auth_length, + bool auth_data_only); +-- +2.8.1 + + +From 3aa9e6ec1cf2b2220968c3e0f711dfeca9ee3450 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Mon, 29 Jun 2015 10:24:45 +0200 +Subject: [PATCH 03/40] CVE-2015-5370: s3:librpc/rpc: don't call + dcerpc_pull_auth_trailer() if auth_length is 0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +All other paranoia checks are done within dcerpc_pull_auth_trailer() +now. + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +--- + source3/librpc/rpc/dcerpc_helpers.c | 12 ++---------- + 1 file changed, 2 insertions(+), 10 deletions(-) + +diff --git a/source3/librpc/rpc/dcerpc_helpers.c b/source3/librpc/rpc/dcerpc_helpers.c +index 24f2f52..76f2acc 100644 +--- a/source3/librpc/rpc/dcerpc_helpers.c ++++ b/source3/librpc/rpc/dcerpc_helpers.c +@@ -899,16 +899,8 @@ NTSTATUS dcerpc_check_auth(struct pipe_auth_data *auth, + return NT_STATUS_INVALID_PARAMETER; + } + +- /* Paranioa checks for auth_length. */ +- if (pkt->auth_length > pkt->frag_length) { +- return NT_STATUS_INFO_LENGTH_MISMATCH; +- } +- if (((unsigned int)pkt->auth_length +- + DCERPC_AUTH_TRAILER_LENGTH < (unsigned int)pkt->auth_length) || +- ((unsigned int)pkt->auth_length +- + DCERPC_AUTH_TRAILER_LENGTH < DCERPC_AUTH_TRAILER_LENGTH)) { +- /* Integer wrap attempt. */ +- return NT_STATUS_INFO_LENGTH_MISMATCH; ++ if (pkt->auth_length == 0) { ++ return NT_STATUS_INVALID_PARAMETER; + } + + status = dcerpc_pull_auth_trailer(pkt, pkt, pkt_trailer, +-- +2.8.1 + + +From de179f2907134e2bc23d1e5cf9ac85a0c759dad3 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Fri, 26 Jun 2015 08:10:46 +0200 +Subject: [PATCH 04/40] CVE-2015-5370: librpc/rpc: add a + dcerpc_verify_ncacn_packet_header() helper function +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit 8266be48f455a5e541d0f7f62a1c8c38e0835976) +--- + librpc/rpc/dcerpc_util.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++ + librpc/rpc/rpc_common.h | 5 ++++ + 2 files changed, 78 insertions(+) + +diff --git a/librpc/rpc/dcerpc_util.c b/librpc/rpc/dcerpc_util.c +index f936ef4..2f599d5 100644 +--- a/librpc/rpc/dcerpc_util.c ++++ b/librpc/rpc/dcerpc_util.c +@@ -186,6 +186,79 @@ NTSTATUS dcerpc_pull_auth_trailer(const struct ncacn_packet *pkt, + return NT_STATUS_OK; + } + ++/** ++* @brief Verify the fields in ncacn_packet header. ++* ++* @param pkt - The ncacn_packet strcuture ++* @param ptype - The expected PDU type ++* @param max_auth_info - The maximum size of a possible auth trailer ++* @param required_flags - The required flags for the pdu. ++* @param optional_flags - The possible optional flags for the pdu. ++* ++* @return - A NTSTATUS error code. ++*/ ++NTSTATUS dcerpc_verify_ncacn_packet_header(const struct ncacn_packet *pkt, ++ enum dcerpc_pkt_type ptype, ++ size_t max_auth_info, ++ uint8_t required_flags, ++ uint8_t optional_flags) ++{ ++ if (pkt->rpc_vers != 5) { ++ return NT_STATUS_RPC_PROTOCOL_ERROR; ++ } ++ ++ if (pkt->rpc_vers_minor != 0) { ++ return NT_STATUS_RPC_PROTOCOL_ERROR; ++ } ++ ++ if (pkt->auth_length > pkt->frag_length) { ++ return NT_STATUS_RPC_PROTOCOL_ERROR; ++ } ++ ++ if (pkt->ptype != ptype) { ++ return NT_STATUS_RPC_PROTOCOL_ERROR; ++ } ++ ++ if (max_auth_info > UINT16_MAX) { ++ return NT_STATUS_INTERNAL_ERROR; ++ } ++ ++ if (pkt->auth_length > 0) { ++ size_t max_auth_length; ++ ++ if (max_auth_info <= DCERPC_AUTH_TRAILER_LENGTH) { ++ return NT_STATUS_RPC_PROTOCOL_ERROR; ++ } ++ max_auth_length = max_auth_info - DCERPC_AUTH_TRAILER_LENGTH; ++ ++ if (pkt->auth_length > max_auth_length) { ++ return NT_STATUS_RPC_PROTOCOL_ERROR; ++ } ++ } ++ ++ if ((pkt->pfc_flags & required_flags) != required_flags) { ++ return NT_STATUS_RPC_PROTOCOL_ERROR; ++ } ++ if (pkt->pfc_flags & ~(optional_flags|required_flags)) { ++ return NT_STATUS_RPC_PROTOCOL_ERROR; ++ } ++ ++ if (pkt->drep[0] & ~DCERPC_DREP_LE) { ++ return NT_STATUS_RPC_PROTOCOL_ERROR; ++ } ++ if (pkt->drep[1] != 0) { ++ return NT_STATUS_RPC_PROTOCOL_ERROR; ++ } ++ if (pkt->drep[2] != 0) { ++ return NT_STATUS_RPC_PROTOCOL_ERROR; ++ } ++ if (pkt->drep[3] != 0) { ++ return NT_STATUS_RPC_PROTOCOL_ERROR; ++ } ++ ++ return NT_STATUS_OK; ++} ++ + struct dcerpc_read_ncacn_packet_state { + #if 0 + struct { +diff --git a/librpc/rpc/rpc_common.h b/librpc/rpc/rpc_common.h +index 98a2e95..b3ae5b2 100644 +--- a/librpc/rpc/rpc_common.h ++++ b/librpc/rpc/rpc_common.h +@@ -164,6 +164,11 @@ NTSTATUS dcerpc_pull_auth_trailer(const struct ncacn_packet *pkt, + struct dcerpc_auth *auth, + uint32_t *auth_length, + bool auth_data_only); ++NTSTATUS dcerpc_verify_ncacn_packet_header(const struct ncacn_packet *pkt, ++ enum dcerpc_pkt_type ptype, ++ size_t max_auth_info, ++ uint8_t required_flags, ++ uint8_t optional_flags); + struct tevent_req *dcerpc_read_ncacn_packet_send(TALLOC_CTX *mem_ctx, + struct tevent_context *ev, + struct tstream_context *stream); +-- +2.8.1 + + +From 4fda096df6005abdb964032bd4017da6496c1b50 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Tue, 7 Jul 2015 13:05:01 +0200 +Subject: [PATCH 05/40] CVE-2015-5370: s3:rpc_client: move AS/U hack to the top + of cli_pipe_validate_current_pdu() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit 665b874b6022bfcdec3f13a9f5a844e5d1784aba) +--- + source3/rpc_client/cli_pipe.c | 24 +++++++++++++----------- + 1 file changed, 13 insertions(+), 11 deletions(-) + +diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c +index 5ddabb7..295b88f 100644 +--- a/source3/rpc_client/cli_pipe.c ++++ b/source3/rpc_client/cli_pipe.c +@@ -414,6 +414,19 @@ static NTSTATUS cli_pipe_validate_current_pdu(TALLOC_CTX *mem_ctx, + */ + *rdata = *pdu; + ++ if ((pkt->ptype == DCERPC_PKT_BIND_ACK) && ++ !(pkt->pfc_flags & DCERPC_PFC_FLAG_LAST)) { ++ /* ++ * TODO: do we still need this hack which was introduced ++ * in commit a42afcdcc7ab9aa9ed193ae36d3dbb10843447f0. ++ * ++ * I don't even know what AS/U might be... ++ */ ++ DEBUG(5, (__location__ ": bug in server (AS/U?), setting " ++ "fragment first/last ON.\n")); ++ pkt->pfc_flags |= DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST; ++ } ++ + /* Ensure we have the correct type. */ + switch (pkt->ptype) { + case DCERPC_PKT_ALTER_RESP: +@@ -518,17 +531,6 @@ static NTSTATUS cli_pipe_validate_current_pdu(TALLOC_CTX *mem_ctx, + return NT_STATUS_RPC_PROTOCOL_ERROR; + } + +- /* Do this just before return - we don't want to modify any rpc header +- data before now as we may have needed to do cryptographic actions on +- it before. */ +- +- if ((pkt->ptype == DCERPC_PKT_BIND_ACK) && +- !(pkt->pfc_flags & DCERPC_PFC_FLAG_LAST)) { +- DEBUG(5, (__location__ ": bug in server (AS/U?), setting " +- "fragment first/last ON.\n")); +- pkt->pfc_flags |= DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST; +- } +- + return NT_STATUS_OK; + } + +-- +2.8.1 + + +From e0d9dfcb27d6d76f819c32db4c1f3dd720f7c964 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Tue, 7 Jul 2015 13:05:01 +0200 +Subject: [PATCH 06/40] CVE-2015-5370: s3:rpc_client: remove useless + frag_length check in rpc_api_pipe_got_pdu() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +dcerpc_pull_ncacn_packet() already verifies this. + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit 9a3f045244b12ff9f77d2664396137c390042297) +--- + source3/rpc_client/cli_pipe.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c +index 295b88f..2787fbc 100644 +--- a/source3/rpc_client/cli_pipe.c ++++ b/source3/rpc_client/cli_pipe.c +@@ -898,14 +898,6 @@ static void rpc_api_pipe_got_pdu(struct tevent_req *subreq) + return; + } + +- if (state->incoming_frag.length != state->pkt->frag_length) { +- DEBUG(5, ("Incorrect pdu length %u, expected %u\n", +- (unsigned int)state->incoming_frag.length, +- (unsigned int)state->pkt->frag_length)); +- tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER); +- return; +- } +- + status = cli_pipe_validate_current_pdu(state, + state->cli, state->pkt, + &state->incoming_frag, +-- +2.8.1 + + +From 39c53a768b5b4eac7a644d4bd1afeb1cd7fb8ef1 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Fri, 26 Jun 2015 08:10:46 +0200 +Subject: [PATCH 07/40] CVE-2015-5370: s4:rpc_server: no authentication is + indicated by pkt->auth_length == 0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +pkt->u.*.auth_info.length is not the correct thing to check. + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(packported from commit c0236de09e542dbb168969d8ae9f0c150a75198e) +--- + source4/rpc_server/dcesrv_auth.c | 23 ++++++++++++++--------- + 1 file changed, 14 insertions(+), 9 deletions(-) + +diff --git a/source4/rpc_server/dcesrv_auth.c b/source4/rpc_server/dcesrv_auth.c +index 1e6aa24..61f2176 100644 +--- a/source4/rpc_server/dcesrv_auth.c ++++ b/source4/rpc_server/dcesrv_auth.c +@@ -46,7 +46,7 @@ bool dcesrv_auth_bind(struct dcesrv_call_state *call) + NTSTATUS status; + uint32_t auth_length; + +- if (pkt->u.bind.auth_info.length == 0) { ++ if (pkt->auth_length == 0) { + dce_conn->auth_state.auth_info = NULL; + return true; + } +@@ -108,7 +108,7 @@ NTSTATUS dcesrv_auth_bind_ack(struct dcesrv_call_state *call, struct ncacn_packe + struct dcesrv_connection *dce_conn = call->conn; + NTSTATUS status; + +- if (!call->conn->auth_state.gensec_security) { ++ if (call->pkt.auth_length == 0) { + return NT_STATUS_OK; + } + +@@ -155,10 +155,16 @@ bool dcesrv_auth_auth3(struct dcesrv_call_state *call) + NTSTATUS status; + uint32_t auth_length; + +- /* We can't work without an existing gensec state, and an new blob to feed it */ +- if (!dce_conn->auth_state.auth_info || +- !dce_conn->auth_state.gensec_security || +- pkt->u.auth3.auth_info.length == 0) { ++ if (pkt->auth_length == 0) { ++ return false; ++ } ++ ++ if (!dce_conn->auth_state.auth_info) { ++ return false; ++ } ++ ++ /* We can't work without an existing gensec state */ ++ if (!dce_conn->auth_state.gensec_security) { + return false; + } + +@@ -203,7 +209,7 @@ bool dcesrv_auth_alter(struct dcesrv_call_state *call) + uint32_t auth_length; + + /* on a pure interface change there is no auth blob */ +- if (pkt->u.alter.auth_info.length == 0) { ++ if (pkt->auth_length == 0) { + return true; + } + +@@ -238,8 +244,7 @@ NTSTATUS dcesrv_auth_alter_ack(struct dcesrv_call_state *call, struct ncacn_pack + + /* on a pure interface change there is no auth_info structure + setup */ +- if (!call->conn->auth_state.auth_info || +- dce_conn->auth_state.auth_info->credentials.length == 0) { ++ if (call->pkt.auth_length == 0) { + return NT_STATUS_OK; + } + +-- +2.8.1 + + +From f37e77ea11f691fe0717797890c0ac2d4fc76792 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Sat, 27 Jun 2015 10:31:48 +0200 +Subject: [PATCH 08/40] CVE-2015-5370: s4:librpc/rpc: check pkt->auth_length + before calling dcerpc_pull_auth_trailer + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Ralph Boehme +(backported from 630dcb55ad7a3a89bcd8643c98a5cdbfb8735ef7) +--- + source4/librpc/rpc/dcerpc.c | 13 ++++++++++--- + source4/rpc_server/dcesrv_auth.c | 5 +++++ + 2 files changed, 15 insertions(+), 3 deletions(-) + +diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c +index 742d710..cfbccd6 100644 +--- a/source4/librpc/rpc/dcerpc.c ++++ b/source4/librpc/rpc/dcerpc.c +@@ -701,6 +701,14 @@ static NTSTATUS ncacn_pull_request_auth(struct dcecli_connection *c, TALLOC_CTX + return NT_STATUS_INVALID_LEVEL; + } + ++ if (pkt->auth_length == 0) { ++ return NT_STATUS_INVALID_NETWORK_RESPONSE; ++ } ++ ++ if (c->security_state.generic_state == NULL) { ++ return NT_STATUS_INTERNAL_ERROR; ++ } ++ + status = dcerpc_pull_auth_trailer(pkt, mem_ctx, + &pkt->u.response.stub_and_verifier, + &auth, &auth_length, false); +@@ -1074,7 +1082,7 @@ static void dcerpc_bind_recv_handler(struct rpc_request *req, + } + + /* the bind_ack might contain a reply set of credentials */ +- if (conn->security_state.auth_info && pkt->u.bind_ack.auth_info.length) { ++ if (conn->security_state.auth_info && pkt->auth_length) { + NTSTATUS status; + uint32_t auth_length; + status = dcerpc_pull_auth_trailer(pkt, conn, &pkt->u.bind_ack.auth_info, +@@ -1847,8 +1855,7 @@ static void dcerpc_alter_recv_handler(struct rpc_request *req, + } + + /* the alter_resp might contain a reply set of credentials */ +- if (recv_pipe->conn->security_state.auth_info && +- pkt->u.alter_resp.auth_info.length) { ++ if (recv_pipe->conn->security_state.auth_info && pkt->auth_length) { + struct dcecli_connection *conn = recv_pipe->conn; + NTSTATUS status; + uint32_t auth_length; +diff --git a/source4/rpc_server/dcesrv_auth.c b/source4/rpc_server/dcesrv_auth.c +index 61f2176..3051c1c 100644 +--- a/source4/rpc_server/dcesrv_auth.c ++++ b/source4/rpc_server/dcesrv_auth.c +@@ -320,6 +320,11 @@ bool dcesrv_auth_request(struct dcesrv_call_state *call, DATA_BLOB *full_packet) + return false; + } + ++ if (pkt->auth_length == 0) { ++ DEBUG(1,("dcesrv_auth_request: unexpected auth_length of 0\n")); ++ return false; ++ } ++ + status = dcerpc_pull_auth_trailer(pkt, call, + &pkt->u.request.stub_and_verifier, + &auth, &auth_length, false); +-- +2.8.1 + + +From d3e41f6a15df3669b52009e48ce808b50bb837e4 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Sun, 28 Jun 2015 01:19:57 +0200 +Subject: [PATCH 09/40] CVE-2015-5370: librpc/rpc: don't allow pkt->auth_length + == 0 in dcerpc_pull_auth_trailer() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +All callers should have already checked that. + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit 1ed83c7657a3b405db1928db06c29f41d2738186) +--- + librpc/rpc/dcerpc_util.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/librpc/rpc/dcerpc_util.c b/librpc/rpc/dcerpc_util.c +index 2f599d5..89b7597 100644 +--- a/librpc/rpc/dcerpc_util.c ++++ b/librpc/rpc/dcerpc_util.c +@@ -111,6 +111,11 @@ NTSTATUS dcerpc_pull_auth_trailer(const struct ncacn_packet *pkt, + } + + /* Paranoia checks for auth_length. The caller should check this... */ ++ if (pkt->auth_length == 0) { ++ return NT_STATUS_INTERNAL_ERROR; ++ } ++ ++ /* Paranoia checks for auth_length. The caller should check this... */ + if (pkt->auth_length > pkt->frag_length) { + return NT_STATUS_INTERNAL_ERROR; + } +-- +2.8.1 + + +From fc994e4614d7ff43736ff2a516d42bb43b7c8ec9 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Thu, 9 Jul 2015 07:59:24 +0200 +Subject: [PATCH 10/40] CVE-2015-5370: s3:librpc/rpc: remove auth trailer and + possible padding within dcerpc_check_auth() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This simplifies the callers a lot. + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit df3cdf072d1c1e6fd0a58e0374348758f5c65a49) +--- + source3/librpc/rpc/dcerpc.h | 5 ++--- + source3/librpc/rpc/dcerpc_helpers.c | 31 ++++++++++++++++++++----------- + source3/rpc_client/cli_pipe.c | 33 ++++++++++----------------------- + source3/rpc_server/srv_pipe.c | 17 +---------------- + 4 files changed, 33 insertions(+), 53 deletions(-) + +diff --git a/source3/librpc/rpc/dcerpc.h b/source3/librpc/rpc/dcerpc.h +index d14d8e0..e7cca9e 100644 +--- a/source3/librpc/rpc/dcerpc.h ++++ b/source3/librpc/rpc/dcerpc.h +@@ -85,9 +85,8 @@ NTSTATUS dcerpc_add_auth_footer(struct pipe_auth_data *auth, + NTSTATUS dcerpc_check_auth(struct pipe_auth_data *auth, + struct ncacn_packet *pkt, + DATA_BLOB *pkt_trailer, +- size_t header_size, +- DATA_BLOB *raw_pkt, +- size_t *pad_len); ++ uint8_t header_size, ++ DATA_BLOB *raw_pkt); + + /* The following definitions come from librpc/rpc/rpc_common.c */ + +diff --git a/source3/librpc/rpc/dcerpc_helpers.c b/source3/librpc/rpc/dcerpc_helpers.c +index 76f2acc..d871339 100644 +--- a/source3/librpc/rpc/dcerpc_helpers.c ++++ b/source3/librpc/rpc/dcerpc_helpers.c +@@ -844,19 +844,18 @@ NTSTATUS dcerpc_add_auth_footer(struct pipe_auth_data *auth, + * + * @param auth The auth data for the connection + * @param pkt The actual ncacn_packet +-* @param pkt_trailer The stub_and_verifier part of the packet ++* @param pkt_trailer [in][out] The stub_and_verifier part of the packet, ++* the auth_trailer and padding will be removed. + * @param header_size The header size + * @param raw_pkt The whole raw packet data blob +-* @param pad_len [out] The padding length used in the packet + * + * @return A NTSTATUS error code + */ + NTSTATUS dcerpc_check_auth(struct pipe_auth_data *auth, + struct ncacn_packet *pkt, + DATA_BLOB *pkt_trailer, +- size_t header_size, +- DATA_BLOB *raw_pkt, +- size_t *pad_len) ++ uint8_t header_size, ++ DATA_BLOB *raw_pkt) + { + struct schannel_state *schannel_auth; + struct auth_ntlmssp_state *ntlmssp_ctx; +@@ -868,6 +867,14 @@ NTSTATUS dcerpc_check_auth(struct pipe_auth_data *auth, + DATA_BLOB full_pkt; + DATA_BLOB data; + ++ /* ++ * These check should be done in the caller. ++ */ ++ SMB_ASSERT(raw_pkt->length == pkt->frag_length); ++ SMB_ASSERT(header_size <= pkt->frag_length); ++ SMB_ASSERT(pkt_trailer->length < pkt->frag_length); ++ SMB_ASSERT((pkt_trailer->length + header_size) <= pkt->frag_length); ++ + switch (auth->auth_level) { + case DCERPC_AUTH_LEVEL_PRIVACY: + DEBUG(10, ("Requested Privacy.\n")); +@@ -881,7 +888,6 @@ NTSTATUS dcerpc_check_auth(struct pipe_auth_data *auth, + if (pkt->auth_length != 0) { + break; + } +- *pad_len = 0; + return NT_STATUS_OK; + + case DCERPC_AUTH_LEVEL_NONE: +@@ -890,7 +896,6 @@ NTSTATUS dcerpc_check_auth(struct pipe_auth_data *auth, + "authenticated connection!\n")); + return NT_STATUS_INVALID_PARAMETER; + } +- *pad_len = 0; + return NT_STATUS_OK; + + default: +@@ -909,10 +914,11 @@ NTSTATUS dcerpc_check_auth(struct pipe_auth_data *auth, + return status; + } + ++ pkt_trailer->length -= auth_length; + data = data_blob_const(raw_pkt->data + header_size, +- pkt_trailer->length - auth_length); +- full_pkt = data_blob_const(raw_pkt->data, +- raw_pkt->length - auth_info.credentials.length); ++ pkt_trailer->length); ++ full_pkt = data_blob_const(raw_pkt->data, raw_pkt->length); ++ full_pkt.length -= auth_info.credentials.length; + + switch (auth->auth_type) { + case DCERPC_AUTH_TYPE_NONE: +@@ -988,10 +994,13 @@ NTSTATUS dcerpc_check_auth(struct pipe_auth_data *auth, + * pkt_trailer actually has a copy of the raw data, and they + * are still both used in later calls */ + if (auth->auth_level == DCERPC_AUTH_LEVEL_PRIVACY) { ++ if (pkt_trailer->length != data.length) { ++ return NT_STATUS_INVALID_PARAMETER; ++ } + memcpy(pkt_trailer->data, data.data, data.length); + } + +- *pad_len = auth_info.auth_pad_length; ++ pkt_trailer->length -= auth_info.auth_pad_length; + data_blob_free(&auth_info.credentials); + return NT_STATUS_OK; + } +diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c +index 2787fbc..776e2bf 100644 +--- a/source3/rpc_client/cli_pipe.c ++++ b/source3/rpc_client/cli_pipe.c +@@ -404,9 +404,9 @@ static NTSTATUS cli_pipe_validate_current_pdu(TALLOC_CTX *mem_ctx, + DATA_BLOB *rdata, + DATA_BLOB *reply_pdu) + { +- struct dcerpc_response *r; ++ const struct dcerpc_response *r = NULL; ++ DATA_BLOB tmp_stub = data_blob_null; + NTSTATUS ret = NT_STATUS_OK; +- size_t pad_len = 0; + + /* + * Point the return values at the real data including the RPC +@@ -440,37 +440,24 @@ static NTSTATUS cli_pipe_validate_current_pdu(TALLOC_CTX *mem_ctx, + + r = &pkt->u.response; + ++ tmp_stub.data = r->stub_and_verifier.data; ++ tmp_stub.length = r->stub_and_verifier.length; ++ + /* Here's where we deal with incoming sign/seal. */ + ret = dcerpc_check_auth(cli->auth, pkt, +- &r->stub_and_verifier, ++ &tmp_stub, + DCERPC_RESPONSE_LENGTH, +- pdu, &pad_len); ++ pdu); + if (!NT_STATUS_IS_OK(ret)) { + return ret; + } + +- if (pkt->frag_length < DCERPC_RESPONSE_LENGTH + pad_len) { +- return NT_STATUS_BUFFER_TOO_SMALL; +- } +- + /* Point the return values at the NDR data. */ +- rdata->data = r->stub_and_verifier.data; +- +- if (pkt->auth_length) { +- /* We've already done integer wrap tests in +- * dcerpc_check_auth(). */ +- rdata->length = r->stub_and_verifier.length +- - pad_len +- - DCERPC_AUTH_TRAILER_LENGTH +- - pkt->auth_length; +- } else { +- rdata->length = r->stub_and_verifier.length; +- } ++ *rdata = tmp_stub; + +- DEBUG(10, ("Got pdu len %lu, data_len %lu, ss_len %u\n", ++ DEBUG(10, ("Got pdu len %lu, data_len %lu\n", + (long unsigned int)pdu->length, +- (long unsigned int)rdata->length, +- (unsigned int)pad_len)); ++ (long unsigned int)rdata->length)); + + /* + * If this is the first reply, and the allocation hint is +diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c +index 964b843..0ab7dc6 100644 +--- a/source3/rpc_server/srv_pipe.c ++++ b/source3/rpc_server/srv_pipe.c +@@ -1848,7 +1848,6 @@ static NTSTATUS dcesrv_auth_request(struct pipe_auth_data *auth, + { + NTSTATUS status; + size_t hdr_size = DCERPC_REQUEST_LENGTH; +- size_t pad_len; + + DEBUG(10, ("Checking request auth.\n")); + +@@ -1859,25 +1858,11 @@ static NTSTATUS dcesrv_auth_request(struct pipe_auth_data *auth, + /* in case of sealing this function will unseal the data in place */ + status = dcerpc_check_auth(auth, pkt, + &pkt->u.request.stub_and_verifier, +- hdr_size, raw_pkt, +- &pad_len); ++ hdr_size, raw_pkt); + if (!NT_STATUS_IS_OK(status)) { + return status; + } + +- +- /* remove padding and auth trailer, +- * this way the caller will get just the data */ +- if (pkt->auth_length) { +- size_t trail_len = pad_len +- + DCERPC_AUTH_TRAILER_LENGTH +- + pkt->auth_length; +- if (pkt->u.request.stub_and_verifier.length < trail_len) { +- return NT_STATUS_INFO_LENGTH_MISMATCH; +- } +- pkt->u.request.stub_and_verifier.length -= trail_len; +- } +- + return NT_STATUS_OK; + } + +-- +2.8.1 + + +From 79bd5e74ad984a4f805e34bff5c4199da522c923 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Thu, 9 Jul 2015 07:59:24 +0200 +Subject: [PATCH 11/40] CVE-2015-5370: s3:librpc/rpc: let dcerpc_check_auth() + auth_{type,level} against the expected values. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit 19f489d32c03ff5fafd34fe86a075d782af1989a) +--- + source3/librpc/rpc/dcerpc_helpers.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/source3/librpc/rpc/dcerpc_helpers.c b/source3/librpc/rpc/dcerpc_helpers.c +index d871339..c07835f 100644 +--- a/source3/librpc/rpc/dcerpc_helpers.c ++++ b/source3/librpc/rpc/dcerpc_helpers.c +@@ -914,6 +914,14 @@ NTSTATUS dcerpc_check_auth(struct pipe_auth_data *auth, + return status; + } + ++ if (auth_info.auth_type != auth->auth_type) { ++ return NT_STATUS_INVALID_PARAMETER; ++ } ++ ++ if (auth_info.auth_level != auth->auth_level) { ++ return NT_STATUS_INVALID_PARAMETER; ++ } ++ + pkt_trailer->length -= auth_length; + data = data_blob_const(raw_pkt->data + header_size, + pkt_trailer->length); +-- +2.8.1 + + +From acabcb860d2e77b5b8ef878696b4405599f8c761 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Tue, 7 Jul 2015 13:05:01 +0200 +Subject: [PATCH 12/40] CVE-2015-5370: s3:rpc_client: make use of + dcerpc_pull_auth_trailer() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The does much more validation than dcerpc_pull_dcerpc_auth(). + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit acea87f158f02c3240abff45c3e54c7d5fa60b29) +--- + source3/rpc_client/cli_pipe.c | 20 ++++++-------------- + 1 file changed, 6 insertions(+), 14 deletions(-) + +diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c +index 776e2bf..27e37f8 100644 +--- a/source3/rpc_client/cli_pipe.c ++++ b/source3/rpc_client/cli_pipe.c +@@ -1938,20 +1938,15 @@ static void rpc_pipe_bind_step_one_done(struct tevent_req *subreq) + rpc_pipe_bind_step_two_trigger(req); + return; + +- case DCERPC_AUTH_TYPE_NTLMSSP: +- case DCERPC_AUTH_TYPE_SPNEGO: +- case DCERPC_AUTH_TYPE_KRB5: +- /* Paranoid lenght checks */ +- if (pkt->frag_length < DCERPC_AUTH_TRAILER_LENGTH +- + pkt->auth_length) { +- tevent_req_nterror(req, +- NT_STATUS_INFO_LENGTH_MISMATCH); ++ default: ++ if (pkt->auth_length == 0) { ++ tevent_req_nterror(req, NT_STATUS_RPC_PROTOCOL_ERROR); + return; + } + /* get auth credentials */ +- status = dcerpc_pull_dcerpc_auth(talloc_tos(), +- &pkt->u.bind_ack.auth_info, +- &auth, false); ++ status = dcerpc_pull_auth_trailer(pkt, talloc_tos(), ++ &pkt->u.bind_ack.auth_info, ++ &auth, NULL, true); + if (!NT_STATUS_IS_OK(status)) { + DEBUG(0, ("Failed to pull dcerpc auth: %s.\n", + nt_errstr(status))); +@@ -1959,9 +1954,6 @@ static void rpc_pipe_bind_step_one_done(struct tevent_req *subreq) + return; + } + break; +- +- default: +- goto err_out; + } + + /* +-- +2.8.1 + + +From adf098f191acd3cb6ba2b8893b6c259af66d8696 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Tue, 7 Jul 2015 13:05:01 +0200 +Subject: [PATCH 13/40] CVE-2015-5370: s3:rpc_client: make use of + dcerpc_verify_ncacn_packet_header() in cli_pipe_validate_current_pdu() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit 81bbffa14f5f6faa9801a3bf2d564d2762d49bb6) +--- + source3/rpc_client/cli_pipe.c | 111 ++++++++++++++++++++++++++++++++++++------ + 1 file changed, 96 insertions(+), 15 deletions(-) + +diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c +index 27e37f8..6a22d38 100644 +--- a/source3/rpc_client/cli_pipe.c ++++ b/source3/rpc_client/cli_pipe.c +@@ -429,17 +429,89 @@ static NTSTATUS cli_pipe_validate_current_pdu(TALLOC_CTX *mem_ctx, + + /* Ensure we have the correct type. */ + switch (pkt->ptype) { +- case DCERPC_PKT_ALTER_RESP: ++ case DCERPC_PKT_BIND_NAK: ++ DEBUG(1, (__location__ ": Bind NACK received from %s!\n", ++ rpccli_pipe_txt(talloc_tos(), cli))); ++ ++ ret = dcerpc_verify_ncacn_packet_header(pkt, ++ DCERPC_PKT_BIND_NAK, ++ 0, /* max_auth_info */ ++ DCERPC_PFC_FLAG_FIRST | ++ DCERPC_PFC_FLAG_LAST, ++ 0); /* optional flags */ ++ if (!NT_STATUS_IS_OK(ret)) { ++ DEBUG(1, (__location__ ": Connection to %s got an unexpected " ++ "RPC packet type - %u, expected %u: %s\n", ++ rpccli_pipe_txt(talloc_tos(), cli), ++ pkt->ptype, expected_pkt_type, ++ nt_errstr(ret))); ++ NDR_PRINT_DEBUG(ncacn_packet, pkt); ++ return ret; ++ } ++ ++ /* Use this for now... */ ++ return NT_STATUS_NETWORK_ACCESS_DENIED; ++ + case DCERPC_PKT_BIND_ACK: ++ ret = dcerpc_verify_ncacn_packet_header(pkt, ++ expected_pkt_type, ++ pkt->u.bind_ack.auth_info.length, ++ DCERPC_PFC_FLAG_FIRST | ++ DCERPC_PFC_FLAG_LAST, ++ DCERPC_PFC_FLAG_CONC_MPX | ++ DCERPC_PFC_FLAG_SUPPORT_HEADER_SIGN); ++ if (!NT_STATUS_IS_OK(ret)) { ++ DEBUG(1, (__location__ ": Connection to %s got an unexpected " ++ "RPC packet type - %u, expected %u: %s\n", ++ rpccli_pipe_txt(talloc_tos(), cli), ++ pkt->ptype, expected_pkt_type, ++ nt_errstr(ret))); ++ NDR_PRINT_DEBUG(ncacn_packet, pkt); ++ return ret; ++ } + +- /* Client code never receives this kind of packets */ + break; + ++ case DCERPC_PKT_ALTER_RESP: ++ ret = dcerpc_verify_ncacn_packet_header(pkt, ++ expected_pkt_type, ++ pkt->u.alter_resp.auth_info.length, ++ DCERPC_PFC_FLAG_FIRST | ++ DCERPC_PFC_FLAG_LAST, ++ DCERPC_PFC_FLAG_CONC_MPX | ++ DCERPC_PFC_FLAG_SUPPORT_HEADER_SIGN); ++ if (!NT_STATUS_IS_OK(ret)) { ++ DEBUG(1, (__location__ ": Connection to %s got an unexpected " ++ "RPC packet type - %u, expected %u: %s\n", ++ rpccli_pipe_txt(talloc_tos(), cli), ++ pkt->ptype, expected_pkt_type, ++ nt_errstr(ret))); ++ NDR_PRINT_DEBUG(ncacn_packet, pkt); ++ return ret; ++ } ++ ++ break; + + case DCERPC_PKT_RESPONSE: + + r = &pkt->u.response; + ++ ret = dcerpc_verify_ncacn_packet_header(pkt, ++ expected_pkt_type, ++ r->stub_and_verifier.length, ++ 0, /* required_flags */ ++ DCERPC_PFC_FLAG_FIRST | ++ DCERPC_PFC_FLAG_LAST); ++ if (!NT_STATUS_IS_OK(ret)) { ++ DEBUG(1, (__location__ ": Connection to %s got an unexpected " ++ "RPC packet type - %u, expected %u: %s\n", ++ rpccli_pipe_txt(talloc_tos(), cli), ++ pkt->ptype, expected_pkt_type, ++ nt_errstr(ret))); ++ NDR_PRINT_DEBUG(ncacn_packet, pkt); ++ return ret; ++ } ++ + tmp_stub.data = r->stub_and_verifier.data; + tmp_stub.length = r->stub_and_verifier.length; + +@@ -449,6 +521,12 @@ static NTSTATUS cli_pipe_validate_current_pdu(TALLOC_CTX *mem_ctx, + DCERPC_RESPONSE_LENGTH, + pdu); + if (!NT_STATUS_IS_OK(ret)) { ++ DEBUG(1, (__location__ ": Connection to %s got an unexpected " ++ "RPC packet type - %u, expected %u: %s\n", ++ rpccli_pipe_txt(talloc_tos(), cli), ++ pkt->ptype, expected_pkt_type, ++ nt_errstr(ret))); ++ NDR_PRINT_DEBUG(ncacn_packet, pkt); + return ret; + } + +@@ -478,14 +556,24 @@ static NTSTATUS cli_pipe_validate_current_pdu(TALLOC_CTX *mem_ctx, + + break; + +- case DCERPC_PKT_BIND_NAK: +- DEBUG(1, (__location__ ": Bind NACK received from %s!\n", +- rpccli_pipe_txt(talloc_tos(), cli))); +- /* Use this for now... */ +- return NT_STATUS_NETWORK_ACCESS_DENIED; +- + case DCERPC_PKT_FAULT: + ++ ret = dcerpc_verify_ncacn_packet_header(pkt, ++ DCERPC_PKT_FAULT, ++ 0, /* max_auth_info */ ++ DCERPC_PFC_FLAG_FIRST | ++ DCERPC_PFC_FLAG_LAST, ++ DCERPC_PFC_FLAG_DID_NOT_EXECUTE); ++ if (!NT_STATUS_IS_OK(ret)) { ++ DEBUG(1, (__location__ ": Connection to %s got an unexpected " ++ "RPC packet type - %u, expected %u: %s\n", ++ rpccli_pipe_txt(talloc_tos(), cli), ++ pkt->ptype, expected_pkt_type, ++ nt_errstr(ret))); ++ NDR_PRINT_DEBUG(ncacn_packet, pkt); ++ return ret; ++ } ++ + DEBUG(1, (__location__ ": RPC fault code %s received " + "from %s!\n", + dcerpc_errstr(talloc_tos(), +@@ -502,13 +590,6 @@ static NTSTATUS cli_pipe_validate_current_pdu(TALLOC_CTX *mem_ctx, + return NT_STATUS_RPC_PROTOCOL_ERROR; + } + +- if (pkt->ptype != expected_pkt_type) { +- DEBUG(3, (__location__ ": Connection to %s got an unexpected " +- "RPC packet type - %u, not %u\n", +- rpccli_pipe_txt(talloc_tos(), cli), +- pkt->ptype, expected_pkt_type)); +- return NT_STATUS_RPC_PROTOCOL_ERROR; +- } + + if (pkt->call_id != call_id) { + DEBUG(3, (__location__ ": Connection to %s got an unexpected " +-- +2.8.1 + + +From 46c9eb371fda87c5b0c5ba30e95c4f4992c9dd00 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Fri, 10 Jul 2015 14:48:38 +0200 +Subject: [PATCH 14/40] CVE-2015-5370: s3:rpc_client: protect + rpc_api_pipe_got_pdu() against too large payloads +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit 98182969e761429e577064e1a0fd5cbc6b50d7d9) +--- + source3/rpc_client/cli_pipe.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c +index 6a22d38..755b458 100644 +--- a/source3/rpc_client/cli_pipe.c ++++ b/source3/rpc_client/cli_pipe.c +@@ -1007,6 +1007,11 @@ static void rpc_api_pipe_got_pdu(struct tevent_req *subreq) + return; + } + ++ if (state->reply_pdu_offset + rdata.length > MAX_RPC_DATA_SIZE) { ++ tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER); ++ return; ++ } ++ + /* Now copy the data portion out of the pdu into rbuf. */ + if (state->reply_pdu.length < state->reply_pdu_offset + rdata.length) { + if (!data_blob_realloc(NULL, &state->reply_pdu, +-- +2.8.1 + + +From e7866caecb0433d490172f3b262280a7d6902c4d Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Tue, 7 Jul 2015 22:51:18 +0200 +Subject: [PATCH 15/40] CVE-2015-5370: s3:rpc_client: verify auth_{type,level} + in rpc_pipe_bind_step_one_done() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit df51c22bea7fbf906613ceb160f16f298b2e3106) +--- + source3/rpc_client/cli_pipe.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c +index 755b458..1c4ff01 100644 +--- a/source3/rpc_client/cli_pipe.c ++++ b/source3/rpc_client/cli_pipe.c +@@ -2039,6 +2039,21 @@ static void rpc_pipe_bind_step_one_done(struct tevent_req *subreq) + tevent_req_nterror(req, status); + return; + } ++ ++ if (auth.auth_type != pauth->auth_type) { ++ DEBUG(0, (__location__ " Auth type %u mismatch expected %u.\n", ++ auth.auth_type, pauth->auth_type)); ++ tevent_req_nterror(req, NT_STATUS_RPC_PROTOCOL_ERROR); ++ return; ++ } ++ ++ if (auth.auth_level != pauth->auth_level) { ++ DEBUG(0, (__location__ " Auth level %u mismatch expected %u.\n", ++ auth.auth_level, pauth->auth_level)); ++ tevent_req_nterror(req, NT_STATUS_RPC_PROTOCOL_ERROR); ++ return; ++ } ++ + break; + } + +-- +2.8.1 + + +From b73d83a791237fe0262b4dcca8adf16b457eb188 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Tue, 7 Jul 2015 13:05:01 +0200 +Subject: [PATCH 16/40] CVE-2015-5370: s3:rpc_server: make use of + dcerpc_pull_auth_trailer() in api_pipe_{bind_req,alter_context,bind_auth3}() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit 2a92546590a78760d2fe0e63067a3888dbce53be) +--- + source3/rpc_server/srv_pipe.c | 62 +++++++++---------------------------------- + 1 file changed, 13 insertions(+), 49 deletions(-) + +diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c +index 0ab7dc6..40b1b8e 100644 +--- a/source3/rpc_server/srv_pipe.c ++++ b/source3/rpc_server/srv_pipe.c +@@ -1012,25 +1012,12 @@ static bool api_pipe_bind_req(struct pipes_struct *p, + * Check if this is an authenticated bind request. + */ + if (pkt->auth_length) { +- /* Quick length check. Won't catch a bad auth footer, +- * prevents overrun. */ +- +- if (pkt->frag_length < RPC_HEADER_LEN + +- DCERPC_AUTH_TRAILER_LENGTH + +- pkt->auth_length) { +- DEBUG(0,("api_pipe_bind_req: auth_len (%u) " +- "too long for fragment %u.\n", +- (unsigned int)pkt->auth_length, +- (unsigned int)pkt->frag_length)); +- goto err_exit; +- } +- + /* + * Decode the authentication verifier. + */ +- status = dcerpc_pull_dcerpc_auth(pkt, +- &pkt->u.bind.auth_info, +- &auth_info, p->endian); ++ status = dcerpc_pull_auth_trailer(pkt, pkt, ++ &pkt->u.bind.auth_info, ++ &auth_info, NULL, true); + if (!NT_STATUS_IS_OK(status)) { + DEBUG(0, ("Unable to unmarshall dcerpc_auth.\n")); + goto err_exit; +@@ -1233,23 +1220,13 @@ bool api_pipe_bind_auth3(struct pipes_struct *p, struct ncacn_packet *pkt) + goto err; + } + +- /* Ensure there's enough data for an authenticated request. */ +- if (pkt->frag_length < RPC_HEADER_LEN +- + DCERPC_AUTH_TRAILER_LENGTH +- + pkt->auth_length) { +- DEBUG(0,("api_pipe_ntlmssp_auth_process: auth_len " +- "%u is too large.\n", +- (unsigned int)pkt->auth_length)); +- goto err; +- } +- + /* + * Decode the authentication verifier response. + */ + +- status = dcerpc_pull_dcerpc_auth(pkt, +- &pkt->u.auth3.auth_info, +- &auth_info, p->endian); ++ status = dcerpc_pull_auth_trailer(pkt, pkt, ++ &pkt->u.auth3.auth_info, ++ &auth_info, NULL, true); + if (!NT_STATUS_IS_OK(status)) { + DEBUG(0, ("Failed to unmarshall dcerpc_auth.\n")); + goto err; +@@ -1382,34 +1359,21 @@ static bool api_pipe_alter_context(struct pipes_struct *p, + * Check if this is an authenticated alter context request. + */ + if (pkt->auth_length) { +- /* Quick length check. Won't catch a bad auth footer, +- * prevents overrun. */ +- +- if (pkt->frag_length < RPC_HEADER_LEN + +- DCERPC_AUTH_TRAILER_LENGTH + +- pkt->auth_length) { +- DEBUG(0,("api_pipe_alter_context: auth_len (%u) " +- "too long for fragment %u.\n", +- (unsigned int)pkt->auth_length, +- (unsigned int)pkt->frag_length )); ++ /* We can only finish if the pipe is unbound for now */ ++ if (p->pipe_bound) { ++ DEBUG(0, (__location__ ": Pipe already bound, " ++ "Altering Context not yet supported!\n")); + goto err_exit; + } + +- status = dcerpc_pull_dcerpc_auth(pkt, +- &pkt->u.bind.auth_info, +- &auth_info, p->endian); ++ status = dcerpc_pull_auth_trailer(pkt, pkt, ++ &pkt->u.bind.auth_info, ++ &auth_info, NULL, true); + if (!NT_STATUS_IS_OK(status)) { + DEBUG(0, ("Unable to unmarshall dcerpc_auth.\n")); + goto err_exit; + } + +- /* We can only finish if the pipe is unbound for now */ +- if (p->pipe_bound) { +- DEBUG(0, (__location__ ": Pipe already bound, " +- "Altering Context not yet supported!\n")); +- goto err_exit; +- } +- + if (auth_info.auth_type != p->auth.auth_type) { + DEBUG(0, ("Auth type mismatch! Client sent %d, " + "but auth was started as type %d!\n", +-- +2.8.1 + + +From 06e5f78341fbe220bd9fb8e27a7f2f8f4e593fa6 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Wed, 23 Dec 2015 12:38:55 +0100 +Subject: [PATCH 17/40] CVE-2015-5370: s3:rpc_server: let a failing + sec_verification_trailer mark the connection as broken + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +(cherry picked from commit 189c0fbb7a3405f0893f23e5b8d755d259f98eaf) +--- + source3/rpc_server/srv_pipe.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c +index 40b1b8e..da9b91c 100644 +--- a/source3/rpc_server/srv_pipe.c ++++ b/source3/rpc_server/srv_pipe.c +@@ -1663,6 +1663,7 @@ static bool api_pipe_request(struct pipes_struct *p, + + if (!srv_pipe_check_verification_trailer(p, pkt, pipe_fns)) { + DEBUG(1, ("srv_pipe_check_verification_trailer: failed\n")); ++ set_incoming_fault(p); + setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_ACCESS_DENIED)); + data_blob_free(&p->out_data.rdata); + TALLOC_FREE(frame); +-- +2.8.1 + + +From 38ff4f5913f5a323b635253748684f98fc63549c Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Tue, 7 Jul 2015 13:05:01 +0200 +Subject: [PATCH 18/40] CVE-2015-5370: s3:rpc_server: don't ignore failures of + dcerpc_push_ncacn_packet() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit 25bf597124f217c55b5ca71a5ea9cb0ea83943e5) +--- + source3/rpc_server/srv_pipe.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c +index da9b91c..71b4665 100644 +--- a/source3/rpc_server/srv_pipe.c ++++ b/source3/rpc_server/srv_pipe.c +@@ -1152,6 +1152,7 @@ static bool api_pipe_bind_req(struct pipes_struct *p, + if (!NT_STATUS_IS_OK(status)) { + DEBUG(0, ("Failed to marshall bind_ack packet. (%s)\n", + nt_errstr(status))); ++ goto err_exit; + } + + if (auth_resp.length) { +@@ -1469,6 +1470,7 @@ static bool api_pipe_alter_context(struct pipes_struct *p, + if (!NT_STATUS_IS_OK(status)) { + DEBUG(0, ("Failed to marshall bind_ack packet. (%s)\n", + nt_errstr(status))); ++ goto err_exit; + } + + if (auth_resp.length) { +-- +2.8.1 + + +From c24152e5778bcdc1f252bbbeacb89af0c6f4f578 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Tue, 7 Jul 2015 13:05:01 +0200 +Subject: [PATCH 19/40] CVE-2015-5370: s3:rpc_server: don't allow auth3 if the + authentication was already finished +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit 69280e6acef7c3941407d4308b659c5e90ed702d) +--- + source3/rpc_server/srv_pipe.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c +index 71b4665..4e5b50d4 100644 +--- a/source3/rpc_server/srv_pipe.c ++++ b/source3/rpc_server/srv_pipe.c +@@ -1216,8 +1216,15 @@ bool api_pipe_bind_auth3(struct pipes_struct *p, struct ncacn_packet *pkt) + + DEBUG(5, ("api_pipe_bind_auth3: decode request. %d\n", __LINE__)); + ++ /* We can only finish if the pipe is unbound for now */ ++ if (p->pipe_bound) { ++ DEBUG(0, (__location__ ": Pipe already bound, " ++ "AUTH3 not supported!\n")); ++ goto err; ++ } ++ + if (pkt->auth_length == 0) { +- DEBUG(0, ("No auth field sent for bind request!\n")); ++ DEBUG(1, ("No auth field sent for auth3 request!\n")); + goto err; + } + +-- +2.8.1 + + +From 1156d7445ed3c86af2610f0bfd2ea38831010726 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Tue, 14 Jul 2015 16:18:45 +0200 +Subject: [PATCH 20/40] CVE-2015-5370: s3:rpc_server: let a failing auth3 mark + the authentication as invalid +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit 8c96ef7b4fbd925607b26d351b14ad9a95febd88) +--- + source3/rpc_server/srv_pipe.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c +index 4e5b50d4..d28ba8e 100644 +--- a/source3/rpc_server/srv_pipe.c ++++ b/source3/rpc_server/srv_pipe.c +@@ -1304,7 +1304,7 @@ bool api_pipe_bind_auth3(struct pipes_struct *p, struct ncacn_packet *pkt) + return true; + + err: +- ++ p->pipe_bound = false; + TALLOC_FREE(p->auth.auth_ctx); + return false; + } +-- +2.8.1 + + +From da145d9e8a4c1b5d507734b599563fdb0fff90a9 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Tue, 7 Jul 2015 13:05:01 +0200 +Subject: [PATCH 21/40] CVE-2015-5370: s3:rpc_server: make sure auth_level + isn't changed by alter_context or auth3 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit 63d21d2546a1064be73582a499ec15b0e11e2708) +--- + source3/rpc_server/srv_pipe.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c +index d28ba8e..1b81a4c 100644 +--- a/source3/rpc_server/srv_pipe.c ++++ b/source3/rpc_server/srv_pipe.c +@@ -1252,6 +1252,13 @@ bool api_pipe_bind_auth3(struct pipes_struct *p, struct ncacn_packet *pkt) + goto err; + } + ++ if (auth_info.auth_level != p->auth.auth_level) { ++ DEBUG(1, ("Auth level mismatch! Client sent %d, " ++ "but auth was started as level %d!\n", ++ auth_info.auth_level, p->auth.auth_level)); ++ goto err; ++ } ++ + switch (auth_info.auth_type) { + case DCERPC_AUTH_TYPE_NTLMSSP: + ntlmssp_ctx = talloc_get_type_abort(p->auth.auth_ctx, +@@ -1389,6 +1396,12 @@ static bool api_pipe_alter_context(struct pipes_struct *p, + goto err_exit; + } + ++ if (auth_info.auth_level != p->auth.auth_level) { ++ DEBUG(0, ("Auth level mismatch! Client sent %d, " ++ "but auth was started as level %d!\n", ++ auth_info.auth_level, p->auth.auth_level)); ++ goto err_exit; ++ } + + switch (auth_info.auth_type) { + case DCERPC_AUTH_TYPE_SPNEGO: +-- +2.8.1 + + +From 7a313b254fda2b7577a60bfb9d07ccd9c745abdf Mon Sep 17 00:00:00 2001 +From: Jeremy Allison +Date: Tue, 7 Jul 2015 09:15:39 +0200 +Subject: [PATCH 22/40] CVE-2015-5370: s3:rpc_server: ensure that the message + ordering doesn't violate the spec +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The first pdu is always a BIND. + +REQUEST pdus are only allowed once the authentication +is finished. + +A simple anonymous authentication is finished after the BIND. +Real authentication may need additional ALTER or AUTH3 exchanges. + +Pair-Programmed-With: Stefan Metzmacher + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Jeremy Allison +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit 0239bfa562ee303c4ac204375b3c66ca287f6cb0) +--- + source3/include/ntdomain.h | 7 ++++++ + source3/rpc_server/rpc_ncacn_np.c | 1 + + source3/rpc_server/rpc_server.c | 1 + + source3/rpc_server/srv_pipe.c | 51 ++++++++++++++++++++++++++++++++++----- + 4 files changed, 54 insertions(+), 6 deletions(-) + +diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h +index 650f1d0..b3c5451 100644 +--- a/source3/include/ntdomain.h ++++ b/source3/include/ntdomain.h +@@ -139,6 +139,13 @@ struct pipes_struct { + bool pipe_bound; + + /* ++ * States we can be in. ++ */ ++ bool allow_alter; ++ bool allow_bind; ++ bool allow_auth3; ++ ++ /* + * Set the DCERPC_FAULT to return. + */ + +diff --git a/source3/rpc_server/rpc_ncacn_np.c b/source3/rpc_server/rpc_ncacn_np.c +index efdee27..f2e9d10 100644 +--- a/source3/rpc_server/rpc_ncacn_np.c ++++ b/source3/rpc_server/rpc_ncacn_np.c +@@ -171,6 +171,7 @@ struct pipes_struct *make_internal_rpc_pipe_p(TALLOC_CTX *mem_ctx, + + p->syntax = *syntax; + p->transport = NCALRPC; ++ p->allow_bind = true; + + DEBUG(4,("Created internal pipe %s (pipes_open=%d)\n", + get_pipe_name_from_syntax(talloc_tos(), syntax), pipes_open)); +diff --git a/source3/rpc_server/rpc_server.c b/source3/rpc_server/rpc_server.c +index 8ec55bb..376d26a 100644 +--- a/source3/rpc_server/rpc_server.c ++++ b/source3/rpc_server/rpc_server.c +@@ -102,6 +102,7 @@ static int make_server_pipes_struct(TALLOC_CTX *mem_ctx, + p->syntax = id; + p->transport = transport; + p->ncalrpc_as_system = ncalrpc_as_system; ++ p->allow_bind = true; + + p->mem_ctx = talloc_named(p, 0, "pipe %s %p", pipe_name, p); + if (!p->mem_ctx) { +diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c +index 1b81a4c..41111aa 100644 +--- a/source3/rpc_server/srv_pipe.c ++++ b/source3/rpc_server/srv_pipe.c +@@ -279,6 +279,9 @@ static bool setup_bind_nak(struct pipes_struct *p, struct ncacn_packet *pkt) + p->auth.auth_level = DCERPC_AUTH_LEVEL_NONE; + p->auth.auth_type = DCERPC_AUTH_TYPE_NONE; + p->pipe_bound = False; ++ p->allow_bind = false; ++ p->allow_alter = false; ++ p->allow_auth3 = false; + + return True; + } +@@ -828,6 +831,11 @@ static NTSTATUS pipe_auth_verify_final(struct pipes_struct *p) + void *mech_ctx; + NTSTATUS status; + ++ if (p->auth.auth_type == DCERPC_AUTH_TYPE_NONE) { ++ p->pipe_bound = true; ++ return NT_STATUS_OK; ++ } ++ + switch (p->auth.auth_type) { + case DCERPC_AUTH_TYPE_NTLMSSP: + ntlmssp_ctx = talloc_get_type_abort(p->auth.auth_ctx, +@@ -919,13 +927,11 @@ static bool api_pipe_bind_req(struct pipes_struct *p, + DATA_BLOB auth_resp = data_blob_null; + DATA_BLOB auth_blob = data_blob_null; + +- /* No rebinds on a bound pipe - use alter context. */ +- if (p->pipe_bound) { +- DEBUG(2,("api_pipe_bind_req: rejecting bind request on bound " +- "pipe %s.\n", +- get_pipe_name_from_syntax(talloc_tos(), &p->syntax))); ++ if (!p->allow_bind) { ++ DEBUG(2,("Pipe not in allow bind state\n")); + return setup_bind_nak(p, pkt); + } ++ p->allow_bind = false; + + if (pkt->u.bind.num_contexts == 0) { + DEBUG(0, ("api_pipe_bind_req: no rpc contexts around\n")); +@@ -1192,6 +1198,22 @@ static bool api_pipe_bind_req(struct pipes_struct *p, + p->out_data.current_pdu_sent = 0; + + TALLOC_FREE(auth_blob.data); ++ ++ if (bind_ack_ctx.result == 0) { ++ p->allow_alter = true; ++ p->allow_auth3 = true; ++ if (p->auth.auth_type == DCERPC_AUTH_TYPE_NONE) { ++ status = pipe_auth_verify_final(p); ++ if (!NT_STATUS_IS_OK(status)) { ++ DEBUG(0, ("pipe_auth_verify_final failed: %s\n", ++ nt_errstr(status))); ++ goto err_exit; ++ } ++ } ++ } else { ++ goto err_exit; ++ } ++ + return True; + + err_exit: +@@ -1216,6 +1238,11 @@ bool api_pipe_bind_auth3(struct pipes_struct *p, struct ncacn_packet *pkt) + + DEBUG(5, ("api_pipe_bind_auth3: decode request. %d\n", __LINE__)); + ++ if (!p->allow_auth3) { ++ DEBUG(1, ("Pipe not in allow auth3 state.\n")); ++ goto err; ++ } ++ + /* We can only finish if the pipe is unbound for now */ + if (p->pipe_bound) { + DEBUG(0, (__location__ ": Pipe already bound, " +@@ -1312,6 +1339,10 @@ bool api_pipe_bind_auth3(struct pipes_struct *p, struct ncacn_packet *pkt) + + err: + p->pipe_bound = false; ++ p->allow_bind = false; ++ p->allow_alter = false; ++ p->allow_auth3 = false; ++ + TALLOC_FREE(p->auth.auth_ctx); + return false; + } +@@ -1338,6 +1369,11 @@ static bool api_pipe_alter_context(struct pipes_struct *p, + + DEBUG(5,("api_pipe_alter_context: make response. %d\n", __LINE__)); + ++ if (!p->allow_alter) { ++ DEBUG(1, ("Pipe not in allow alter state.\n")); ++ goto err_exit; ++ } ++ + if (pkt->u.bind.assoc_group_id != 0) { + assoc_gid = pkt->u.bind.assoc_group_id; + } else { +@@ -1363,7 +1399,6 @@ static bool api_pipe_alter_context(struct pipes_struct *p, + bind_ack_ctx.reason = 0; + bind_ack_ctx.syntax = pkt->u.bind.ctx_list[0].transfer_syntaxes[0]; + } else { +- p->pipe_bound = False; + /* Rejection reason: abstract syntax not supported */ + bind_ack_ctx.result = DCERPC_BIND_PROVIDER_REJECT; + bind_ack_ctx.reason = DCERPC_BIND_REASON_ASYNTAX; +@@ -1826,6 +1861,10 @@ void set_incoming_fault(struct pipes_struct *p) + p->in_data.pdu.length = 0; + p->fault_state = DCERPC_FAULT_CANT_PERFORM; + ++ p->allow_alter = false; ++ p->allow_auth3 = false; ++ p->pipe_bound = false; ++ + DEBUG(10, ("Setting fault state\n")); + } + +-- +2.8.1 + + +From 23147db714d05d113ca06d327ab65087f3420998 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Tue, 7 Jul 2015 16:06:59 +0200 +Subject: [PATCH 23/40] CVE-2015-5370: s3:rpc_server: use 'alter' instead of + 'bind' for variables in api_pipe_alter_context() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit cdefee174d2f8920323e9e62966df4f4ced49ed3) +--- + source3/rpc_server/srv_pipe.c | 32 ++++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) + +diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c +index 41111aa..382d94a 100644 +--- a/source3/rpc_server/srv_pipe.c ++++ b/source3/rpc_server/srv_pipe.c +@@ -1359,7 +1359,7 @@ static bool api_pipe_alter_context(struct pipes_struct *p, + uint16 assoc_gid; + NTSTATUS status; + union dcerpc_payload u; +- struct dcerpc_ack_ctx bind_ack_ctx; ++ struct dcerpc_ack_ctx alter_ack_ctx; + DATA_BLOB auth_resp = data_blob_null; + DATA_BLOB auth_blob = data_blob_null; + int pad_len = 0; +@@ -1374,8 +1374,8 @@ static bool api_pipe_alter_context(struct pipes_struct *p, + goto err_exit; + } + +- if (pkt->u.bind.assoc_group_id != 0) { +- assoc_gid = pkt->u.bind.assoc_group_id; ++ if (pkt->u.alter.assoc_group_id != 0) { ++ assoc_gid = pkt->u.alter.assoc_group_id; + } else { + assoc_gid = 0x53f0; + } +@@ -1385,24 +1385,24 @@ static bool api_pipe_alter_context(struct pipes_struct *p, + */ + + /* If the requested abstract synt uuid doesn't match our client pipe, +- reject the bind_ack & set the transfer interface synt to all 0's, ++ reject the alter_ack & set the transfer interface synt to all 0's, + ver 0 (observed when NT5 attempts to bind to abstract interfaces + unknown to NT4) + Needed when adding entries to a DACL from NT5 - SK */ + + if (check_bind_req(p, +- &pkt->u.bind.ctx_list[0].abstract_syntax, +- &pkt->u.bind.ctx_list[0].transfer_syntaxes[0], +- pkt->u.bind.ctx_list[0].context_id)) { ++ &pkt->u.alter.ctx_list[0].abstract_syntax, ++ &pkt->u.alter.ctx_list[0].transfer_syntaxes[0], ++ pkt->u.alter.ctx_list[0].context_id)) { + +- bind_ack_ctx.result = 0; +- bind_ack_ctx.reason = 0; +- bind_ack_ctx.syntax = pkt->u.bind.ctx_list[0].transfer_syntaxes[0]; ++ alter_ack_ctx.result = 0; ++ alter_ack_ctx.reason = 0; ++ alter_ack_ctx.syntax = pkt->u.alter.ctx_list[0].transfer_syntaxes[0]; + } else { + /* Rejection reason: abstract syntax not supported */ +- bind_ack_ctx.result = DCERPC_BIND_PROVIDER_REJECT; +- bind_ack_ctx.reason = DCERPC_BIND_REASON_ASYNTAX; +- bind_ack_ctx.syntax = null_ndr_syntax_id; ++ alter_ack_ctx.result = DCERPC_BIND_PROVIDER_REJECT; ++ alter_ack_ctx.reason = DCERPC_BIND_REASON_ASYNTAX; ++ alter_ack_ctx.syntax = null_ndr_syntax_id; + } + + /* +@@ -1417,7 +1417,7 @@ static bool api_pipe_alter_context(struct pipes_struct *p, + } + + status = dcerpc_pull_auth_trailer(pkt, pkt, +- &pkt->u.bind.auth_info, ++ &pkt->u.alter.auth_info, + &auth_info, NULL, true); + if (!NT_STATUS_IS_OK(status)) { + DEBUG(0, ("Unable to unmarshall dcerpc_auth.\n")); +@@ -1503,7 +1503,7 @@ static bool api_pipe_alter_context(struct pipes_struct *p, + u.alter_resp.secondary_address_size = 1; + + u.alter_resp.num_results = 1; +- u.alter_resp.ctx_list = &bind_ack_ctx; ++ u.alter_resp.ctx_list = &alter_ack_ctx; + + /* NOTE: We leave the auth_info empty so we can calculate the padding + * later and then append the auth_info --simo */ +@@ -1523,7 +1523,7 @@ static bool api_pipe_alter_context(struct pipes_struct *p, + &u, + &p->out_data.frag); + if (!NT_STATUS_IS_OK(status)) { +- DEBUG(0, ("Failed to marshall bind_ack packet. (%s)\n", ++ DEBUG(0, ("Failed to marshall alter_resp packet. (%s)\n", + nt_errstr(status))); + goto err_exit; + } +-- +2.8.1 + + +From bf96df45abbd32c90a561b8f444e510d4a34da0e Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Tue, 7 Jul 2015 16:06:59 +0200 +Subject: [PATCH 24/40] CVE-2015-5370: s3:rpc_server: verify presentation + context arrays +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit 1e6b4abac14840e4cee1afc5d4811b0f0277eade) +--- + source3/rpc_server/srv_pipe.c | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c +index 382d94a..335af2a 100644 +--- a/source3/rpc_server/srv_pipe.c ++++ b/source3/rpc_server/srv_pipe.c +@@ -934,7 +934,12 @@ static bool api_pipe_bind_req(struct pipes_struct *p, + p->allow_bind = false; + + if (pkt->u.bind.num_contexts == 0) { +- DEBUG(0, ("api_pipe_bind_req: no rpc contexts around\n")); ++ DEBUG(1, ("api_pipe_bind_req: no rpc contexts around\n")); ++ goto err_exit; ++ } ++ ++ if (pkt->u.bind.ctx_list[0].num_transfer_syntaxes == 0) { ++ DEBUG(1, ("api_pipe_bind_req: no transfer syntaxes around\n")); + goto err_exit; + } + +@@ -1374,6 +1379,16 @@ static bool api_pipe_alter_context(struct pipes_struct *p, + goto err_exit; + } + ++ if (pkt->u.alter.num_contexts == 0) { ++ DEBUG(1, ("api_pipe_alter_context: no rpc contexts around\n")); ++ goto err_exit; ++ } ++ ++ if (pkt->u.alter.ctx_list[0].num_transfer_syntaxes == 0) { ++ DEBUG(1, ("api_pipe_alter_context: no transfer syntaxes around\n")); ++ goto err_exit; ++ } ++ + if (pkt->u.alter.assoc_group_id != 0) { + assoc_gid = pkt->u.alter.assoc_group_id; + } else { +-- +2.8.1 + + +From 5d564f46ae2621f99c4450d21a198b432ca0cd30 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Tue, 7 Jul 2015 16:06:59 +0200 +Subject: [PATCH 25/40] CVE-2015-5370: s3:rpc_server: make use of + dcerpc_verify_ncacn_packet_header() to verify incoming pdus +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit e39fdceb25fc75b6f8c77c097bf8dbd2f4286618) +--- + source3/rpc_server/srv_pipe.c | 81 +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 81 insertions(+) + +diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c +index 335af2a..2f404b4 100644 +--- a/source3/rpc_server/srv_pipe.c ++++ b/source3/rpc_server/srv_pipe.c +@@ -42,6 +42,7 @@ + #include "auth.h" + #include "ntdomain.h" + #include "rpc_server/srv_pipe.h" ++#include "../librpc/gen_ndr/ndr_dcerpc.h" + #include "../librpc/ndr/ndr_dcerpc.h" + #include "../librpc/gen_ndr/ndr_samr.h" + #include "../librpc/gen_ndr/ndr_lsa.h" +@@ -933,6 +934,25 @@ static bool api_pipe_bind_req(struct pipes_struct *p, + } + p->allow_bind = false; + ++ status = dcerpc_verify_ncacn_packet_header(pkt, ++ DCERPC_PKT_BIND, ++ pkt->u.bind.auth_info.length, ++ 0, /* required flags */ ++ DCERPC_PFC_FLAG_FIRST | ++ DCERPC_PFC_FLAG_LAST | ++ DCERPC_PFC_FLAG_SUPPORT_HEADER_SIGN | ++ 0x08 | /* this is not defined, but should be ignored */ ++ DCERPC_PFC_FLAG_CONC_MPX | ++ DCERPC_PFC_FLAG_DID_NOT_EXECUTE | ++ DCERPC_PFC_FLAG_MAYBE | ++ DCERPC_PFC_FLAG_OBJECT_UUID); ++ if (!NT_STATUS_IS_OK(status)) { ++ DEBUG(1, ("api_pipe_bind_req: invalid pdu: %s\n", ++ nt_errstr(status))); ++ NDR_PRINT_DEBUG(ncacn_packet, pkt); ++ goto err_exit; ++ } ++ + if (pkt->u.bind.num_contexts == 0) { + DEBUG(1, ("api_pipe_bind_req: no rpc contexts around\n")); + goto err_exit; +@@ -1248,6 +1268,25 @@ bool api_pipe_bind_auth3(struct pipes_struct *p, struct ncacn_packet *pkt) + goto err; + } + ++ status = dcerpc_verify_ncacn_packet_header(pkt, ++ DCERPC_PKT_AUTH3, ++ pkt->u.auth3.auth_info.length, ++ 0, /* required flags */ ++ DCERPC_PFC_FLAG_FIRST | ++ DCERPC_PFC_FLAG_LAST | ++ DCERPC_PFC_FLAG_SUPPORT_HEADER_SIGN | ++ 0x08 | /* this is not defined, but should be ignored */ ++ DCERPC_PFC_FLAG_CONC_MPX | ++ DCERPC_PFC_FLAG_DID_NOT_EXECUTE | ++ DCERPC_PFC_FLAG_MAYBE | ++ DCERPC_PFC_FLAG_OBJECT_UUID); ++ if (!NT_STATUS_IS_OK(status)) { ++ DEBUG(1, ("api_pipe_bind_auth3: invalid pdu: %s\n", ++ nt_errstr(status))); ++ NDR_PRINT_DEBUG(ncacn_packet, pkt); ++ goto err; ++ } ++ + /* We can only finish if the pipe is unbound for now */ + if (p->pipe_bound) { + DEBUG(0, (__location__ ": Pipe already bound, " +@@ -1379,6 +1418,25 @@ static bool api_pipe_alter_context(struct pipes_struct *p, + goto err_exit; + } + ++ status = dcerpc_verify_ncacn_packet_header(pkt, ++ DCERPC_PKT_ALTER, ++ pkt->u.alter.auth_info.length, ++ 0, /* required flags */ ++ DCERPC_PFC_FLAG_FIRST | ++ DCERPC_PFC_FLAG_LAST | ++ DCERPC_PFC_FLAG_SUPPORT_HEADER_SIGN | ++ 0x08 | /* this is not defined, but should be ignored */ ++ DCERPC_PFC_FLAG_CONC_MPX | ++ DCERPC_PFC_FLAG_DID_NOT_EXECUTE | ++ DCERPC_PFC_FLAG_MAYBE | ++ DCERPC_PFC_FLAG_OBJECT_UUID); ++ if (!NT_STATUS_IS_OK(status)) { ++ DEBUG(1, ("api_pipe_alter_context: invalid pdu: %s\n", ++ nt_errstr(status))); ++ NDR_PRINT_DEBUG(ncacn_packet, pkt); ++ goto err_exit; ++ } ++ + if (pkt->u.alter.num_contexts == 0) { + DEBUG(1, ("api_pipe_alter_context: no rpc contexts around\n")); + goto err_exit; +@@ -1923,6 +1981,29 @@ static bool process_request_pdu(struct pipes_struct *p, struct ncacn_packet *pkt + return False; + } + ++ /* ++ * We don't ignore DCERPC_PFC_FLAG_PENDING_CANCEL. ++ * TODO: we can reject it with DCERPC_FAULT_NO_CALL_ACTIVE later. ++ */ ++ status = dcerpc_verify_ncacn_packet_header(pkt, ++ DCERPC_PKT_REQUEST, ++ pkt->u.request.stub_and_verifier.length, ++ 0, /* required_flags */ ++ DCERPC_PFC_FLAG_FIRST | ++ DCERPC_PFC_FLAG_LAST | ++ 0x08 | /* this is not defined, but should be ignored */ ++ DCERPC_PFC_FLAG_CONC_MPX | ++ DCERPC_PFC_FLAG_DID_NOT_EXECUTE | ++ DCERPC_PFC_FLAG_MAYBE | ++ DCERPC_PFC_FLAG_OBJECT_UUID); ++ if (!NT_STATUS_IS_OK(status)) { ++ DEBUG(1, ("process_request_pdu: invalid pdu: %s\n", ++ nt_errstr(status))); ++ NDR_PRINT_DEBUG(ncacn_packet, pkt); ++ set_incoming_fault(p); ++ return false; ++ } ++ + /* Store the opnum */ + p->opnum = pkt->u.request.opnum; + +-- +2.8.1 + + +From 5a53b46092399686d5c1ade79e15eb093b9d1842 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Wed, 23 Dec 2015 12:40:58 +0100 +Subject: [PATCH 26/40] CVE-2015-5370: s3:rpc_server: disconnect the connection + after a fatal FAULT pdu +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit 664d7ace0e68b42d2de99583757e0a985647eb4b) +--- + source3/rpc_server/rpc_server.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/source3/rpc_server/rpc_server.c b/source3/rpc_server/rpc_server.c +index 376d26a..3ba83e0 100644 +--- a/source3/rpc_server/rpc_server.c ++++ b/source3/rpc_server/rpc_server.c +@@ -664,6 +664,12 @@ static void named_pipe_packet_done(struct tevent_req *subreq) + goto fail; + } + ++ if (npc->p->fault_state != 0) { ++ DEBUG(2, ("Disconnect after fault\n")); ++ sys_errno = EINVAL; ++ goto fail; ++ } ++ + /* clear out any data that may have been left around */ + npc->count = 0; + TALLOC_FREE(npc->iov); +@@ -1392,6 +1398,12 @@ static void dcerpc_ncacn_packet_done(struct tevent_req *subreq) + goto fail; + } + ++ if (ncacn_conn->p->fault_state != 0) { ++ DEBUG(2, ("Disconnect after fault\n")); ++ sys_errno = EINVAL; ++ goto fail; ++ } ++ + /* clear out any data that may have been left around */ + ncacn_conn->count = 0; + TALLOC_FREE(ncacn_conn->iov); +-- +2.8.1 + + +From a895ca55f14cbdb28b7327d3a1fdbf2b5397ad96 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Wed, 23 Dec 2015 12:38:55 +0100 +Subject: [PATCH 27/40] CVE-2015-5370: s3:rpc_server: let a failing BIND mark + the connection as broken +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit 8d97085efd8782e48d0f1162e3f56756acb99472) +--- + source3/rpc_server/srv_pipe.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c +index 2f404b4..6275190 100644 +--- a/source3/rpc_server/srv_pipe.c ++++ b/source3/rpc_server/srv_pipe.c +@@ -276,6 +276,7 @@ static bool setup_bind_nak(struct pipes_struct *p, struct ncacn_packet *pkt) + p->out_data.data_sent_length = 0; + p->out_data.current_pdu_sent = 0; + ++ set_incoming_fault(p); + TALLOC_FREE(p->auth.auth_ctx); + p->auth.auth_level = DCERPC_AUTH_LEVEL_NONE; + p->auth.auth_type = DCERPC_AUTH_TYPE_NONE; +-- +2.8.1 + + +From 1633842f3667442c3a5bdf683fc0dbb905755b11 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Wed, 23 Dec 2015 12:38:55 +0100 +Subject: [PATCH 28/40] CVE-2015-5370: s3:rpc_server: use + DCERPC_NCA_S_PROTO_ERROR FAULTs for protocol errors +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit d30363f08efb81b22055d4445977c96df3737adf) +--- + source3/rpc_server/srv_pipe.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c +index 6275190..3fb8855 100644 +--- a/source3/rpc_server/srv_pipe.c ++++ b/source3/rpc_server/srv_pipe.c +@@ -1933,7 +1933,7 @@ void set_incoming_fault(struct pipes_struct *p) + data_blob_free(&p->in_data.data); + p->in_data.pdu_needed_len = 0; + p->in_data.pdu.length = 0; +- p->fault_state = DCERPC_FAULT_CANT_PERFORM; ++ p->fault_state = DCERPC_NCA_S_PROTO_ERROR; + + p->allow_alter = false; + p->allow_auth3 = false; +@@ -2254,7 +2254,7 @@ done: + "pipe %s\n", get_pipe_name_from_syntax(talloc_tos(), + &p->syntax))); + set_incoming_fault(p); +- setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR)); ++ setup_fault_pdu(p, NT_STATUS(DCERPC_NCA_S_PROTO_ERROR)); + TALLOC_FREE(pkt); + } else { + /* +-- +2.8.1 + + +From 62e058a6874f9ae3f1856cd9c3c52516ce350f95 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Sat, 11 Jul 2015 10:58:07 +0200 +Subject: [PATCH 29/40] CVE-2015-5370: s3:librpc/rpc: remove unused + dcerpc_pull_dcerpc_auth() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit 02aef978ff8f16009a52c2d981d414d019bc8dd9) +--- + source3/librpc/rpc/dcerpc.h | 4 ---- + source3/librpc/rpc/dcerpc_helpers.c | 41 ------------------------------------- + 2 files changed, 45 deletions(-) + +diff --git a/source3/librpc/rpc/dcerpc.h b/source3/librpc/rpc/dcerpc.h +index e7cca9e..9452e85 100644 +--- a/source3/librpc/rpc/dcerpc.h ++++ b/source3/librpc/rpc/dcerpc.h +@@ -71,10 +71,6 @@ NTSTATUS dcerpc_push_dcerpc_auth(TALLOC_CTX *mem_ctx, + uint32_t auth_context_id, + const DATA_BLOB *credentials, + DATA_BLOB *blob); +-NTSTATUS dcerpc_pull_dcerpc_auth(TALLOC_CTX *mem_ctx, +- const DATA_BLOB *blob, +- struct dcerpc_auth *r, +- bool bigendian); + NTSTATUS dcerpc_guess_sizes(struct pipe_auth_data *auth, + size_t header_len, size_t data_left, + size_t max_xmit_frag, size_t pad_alignment, +diff --git a/source3/librpc/rpc/dcerpc_helpers.c b/source3/librpc/rpc/dcerpc_helpers.c +index c07835f..e4d0e3a 100644 +--- a/source3/librpc/rpc/dcerpc_helpers.c ++++ b/source3/librpc/rpc/dcerpc_helpers.c +@@ -210,47 +210,6 @@ NTSTATUS dcerpc_push_dcerpc_auth(TALLOC_CTX *mem_ctx, + } + + /** +-* @brief Decodes a dcerpc_auth blob +-* +-* @param mem_ctx The memory context on which to allocate the packet +-* elements +-* @param blob The blob of data to decode +-* @param r An empty dcerpc_auth structure, must not be NULL +-* +-* @return a NTSTATUS error code +-*/ +-NTSTATUS dcerpc_pull_dcerpc_auth(TALLOC_CTX *mem_ctx, +- const DATA_BLOB *blob, +- struct dcerpc_auth *r, +- bool bigendian) +-{ +- enum ndr_err_code ndr_err; +- struct ndr_pull *ndr; +- +- ndr = ndr_pull_init_blob(blob, mem_ctx); +- if (!ndr) { +- return NT_STATUS_NO_MEMORY; +- } +- if (bigendian) { +- ndr->flags |= LIBNDR_FLAG_BIGENDIAN; +- } +- +- ndr_err = ndr_pull_dcerpc_auth(ndr, NDR_SCALARS|NDR_BUFFERS, r); +- +- if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { +- talloc_free(ndr); +- return ndr_map_error2ntstatus(ndr_err); +- } +- talloc_free(ndr); +- +- if (DEBUGLEVEL >= 10) { +- NDR_PRINT_DEBUG(dcerpc_auth, r); +- } +- +- return NT_STATUS_OK; +-} +- +-/** + * @brief Calculate how much data we can in a packet, including calculating + * auth token and pad lengths. + * +-- +2.8.1 + + +From 34cbf85617810fb81ad27250ef6bab0efd13a5e7 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Tue, 7 Jul 2015 13:05:01 +0200 +Subject: [PATCH 30/40] CVE-2015-5370: s3:rpc_server: check the transfer syntax + in check_bind_req() first +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit 9464684010461947fa98d8ee084069e9cf362625) +--- + source3/rpc_server/srv_pipe.c | 20 ++++++++++++++------ + 1 file changed, 14 insertions(+), 6 deletions(-) + +diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c +index 3fb8855..0e6b073 100644 +--- a/source3/rpc_server/srv_pipe.c ++++ b/source3/rpc_server/srv_pipe.c +@@ -351,16 +351,24 @@ static bool check_bind_req(struct pipes_struct *p, + DEBUG(3,("check_bind_req for %s\n", + get_pipe_name_from_syntax(talloc_tos(), abstract))); + ++ ok = ndr_syntax_id_equal(transfer, &ndr_transfer_syntax); ++ if (!ok) { ++ DEBUG(1,("check_bind_req unknown transfer syntax for " ++ "%s context_id=%u\n", ++ get_pipe_name_from_syntax(talloc_tos(), abstract), ++ (unsigned)context_id)); ++ return false; ++ } ++ + /* we have to check all now since win2k introduced a new UUID on the lsaprpc pipe */ +- if (rpc_srv_pipe_exists_by_id(abstract) && +- ndr_syntax_id_equal(transfer, &ndr_transfer_syntax)) { +- DEBUG(3, ("check_bind_req: \\PIPE\\%s -> \\PIPE\\%s\n", +- rpc_srv_get_pipe_cli_name(abstract), +- rpc_srv_get_pipe_srv_name(abstract))); +- } else { ++ if (!rpc_srv_pipe_exists_by_id(abstract)) { + return false; + } + ++ DEBUG(3, ("check_bind_req: %s -> %s rpc service\n", ++ rpc_srv_get_pipe_cli_name(abstract), ++ rpc_srv_get_pipe_srv_name(abstract))); ++ + context_fns = SMB_MALLOC_P(struct pipe_rpc_fns); + if (context_fns == NULL) { + DEBUG(0,("check_bind_req: malloc() failed!\n")); +-- +2.8.1 + + +From 511a212ad0bde4c84c6fb30625537cfc5052ac43 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Tue, 7 Jul 2015 13:05:01 +0200 +Subject: [PATCH 31/40] CVE-2015-5370: s3:rpc_server: don't allow an existing + context to be changed in check_bind_req() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +An alter context can't change the syntax of an existing context, +a new context_id will be used for that. + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit a995740d4e7fbd8fbb5c8c6280b73eaceae53574) +--- + source3/rpc_server/srv_pipe.c | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c +index 0e6b073..4263a91 100644 +--- a/source3/rpc_server/srv_pipe.c ++++ b/source3/rpc_server/srv_pipe.c +@@ -360,6 +360,28 @@ static bool check_bind_req(struct pipes_struct *p, + return false; + } + ++ for (context_fns = p->contexts; ++ context_fns != NULL; ++ context_fns = context_fns->next) ++ { ++ if (context_fns->context_id != context_id) { ++ continue; ++ } ++ ++ ok = ndr_syntax_id_equal(&context_fns->syntax, ++ abstract); ++ if (ok) { ++ return true; ++ } ++ ++ DEBUG(1,("check_bind_req: changing abstract syntax for " ++ "%s context_id=%u into %s not supported\n", ++ get_pipe_name_from_syntax(talloc_tos(), &context_fns->syntax), ++ (unsigned)context_id, ++ get_pipe_name_from_syntax(talloc_tos(), abstract))); ++ return false; ++ } ++ + /* we have to check all now since win2k introduced a new UUID on the lsaprpc pipe */ + if (!rpc_srv_pipe_exists_by_id(abstract)) { + return false; +-- +2.8.1 + + +From 6d8d1b5524548c7d2a5f4ba5d2f6263b3ed57590 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Wed, 8 Jul 2015 00:01:37 +0200 +Subject: [PATCH 32/40] CVE-2015-5370: s3:rpc_client: pass struct + pipe_auth_data to create_rpc_{bind_auth3,alter_context}() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit f556d9245c13d018d4e772f06d013ebe558703d9) +--- + source3/rpc_client/cli_pipe.c | 26 ++++++++++---------------- + 1 file changed, 10 insertions(+), 16 deletions(-) + +diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c +index 1c4ff01..3af3d8f 100644 +--- a/source3/rpc_client/cli_pipe.c ++++ b/source3/rpc_client/cli_pipe.c +@@ -1816,9 +1816,8 @@ static bool check_bind_response(const struct dcerpc_bind_ack *r, + + static NTSTATUS create_rpc_bind_auth3(TALLOC_CTX *mem_ctx, + struct rpc_pipe_client *cli, +- uint32 rpc_call_id, +- enum dcerpc_AuthType auth_type, +- enum dcerpc_AuthLevel auth_level, ++ struct pipe_auth_data *auth, ++ uint32_t rpc_call_id, + DATA_BLOB *pauth_blob, + DATA_BLOB *rpc_out) + { +@@ -1828,8 +1827,8 @@ static NTSTATUS create_rpc_bind_auth3(TALLOC_CTX *mem_ctx, + u.auth3._pad = 0; + + status = dcerpc_push_dcerpc_auth(mem_ctx, +- auth_type, +- auth_level, ++ auth->auth_type, ++ auth->auth_level, + 0, /* auth_pad_length */ + 1, /* auth_context_id */ + pauth_blob, +@@ -1861,9 +1860,8 @@ static NTSTATUS create_rpc_bind_auth3(TALLOC_CTX *mem_ctx, + ********************************************************************/ + + static NTSTATUS create_rpc_alter_context(TALLOC_CTX *mem_ctx, +- enum dcerpc_AuthType auth_type, +- enum dcerpc_AuthLevel auth_level, +- uint32 rpc_call_id, ++ struct pipe_auth_data *auth, ++ uint32_t rpc_call_id, + const struct ndr_syntax_id *abstract, + const struct ndr_syntax_id *transfer, + const DATA_BLOB *pauth_blob, /* spnego auth blob already created. */ +@@ -1873,8 +1871,8 @@ static NTSTATUS create_rpc_alter_context(TALLOC_CTX *mem_ctx, + NTSTATUS status; + + status = dcerpc_push_dcerpc_auth(mem_ctx, +- auth_type, +- auth_level, ++ auth->auth_type, ++ auth->auth_level, + 0, /* auth_pad_length */ + 1, /* auth_context_id */ + pauth_blob, +@@ -2300,9 +2298,7 @@ static NTSTATUS rpc_bind_next_send(struct tevent_req *req, + /* Now prepare the alter context pdu. */ + data_blob_free(&state->rpc_out); + +- status = create_rpc_alter_context(state, +- auth->auth_type, +- auth->auth_level, ++ status = create_rpc_alter_context(state, auth, + state->rpc_call_id, + &state->cli->abstract_syntax, + &state->cli->transfer_syntax, +@@ -2335,10 +2331,8 @@ static NTSTATUS rpc_bind_finish_send(struct tevent_req *req, + /* Now prepare the auth3 context pdu. */ + data_blob_free(&state->rpc_out); + +- status = create_rpc_bind_auth3(state, state->cli, ++ status = create_rpc_bind_auth3(state, state->cli, auth, + state->rpc_call_id, +- auth->auth_type, +- auth->auth_level, + auth_token, + &state->rpc_out); + if (!NT_STATUS_IS_OK(status)) { +-- +2.8.1 + + +From 62166b207bd465b5c10e07dd23de4b9b2d44bfa4 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Wed, 8 Jul 2015 00:01:37 +0200 +Subject: [PATCH 33/40] CVE-2015-5370: s3:librpc/rpc: add auth_context_id to + struct pipe_auth_data +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit cbf20b43d7b40e3b6ccf044f6f51a5adff1f5e6d) +--- + source3/librpc/rpc/dcerpc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/source3/librpc/rpc/dcerpc.h b/source3/librpc/rpc/dcerpc.h +index 9452e85..c25b0f5 100644 +--- a/source3/librpc/rpc/dcerpc.h ++++ b/source3/librpc/rpc/dcerpc.h +@@ -42,6 +42,7 @@ struct pipe_auth_data { + bool verified_bitmask1; + + void *auth_ctx; ++ uint32_t auth_context_id; + + /* Only the client code uses these 3 for now */ + char *domain; +-- +2.8.1 + + +From dbfd333649e66f03c13e266e5e2007cd70acdc44 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Wed, 8 Jul 2015 00:01:37 +0200 +Subject: [PATCH 34/40] CVE-2015-5370: s3:rpc_client: make use of + pipe_auth_data->auth_context_id +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is better than using hardcoded values. +We need to use auth_context_id = 1 for authenticated +connections, as old Samba server (before this patchset) +will use a hardcoded value of 1. + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit ae68d3f325c3880144b80385779c9445897646e6) +--- + source3/rpc_client/cli_pipe.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c +index 3af3d8f..755d676 100644 +--- a/source3/rpc_client/cli_pipe.c ++++ b/source3/rpc_client/cli_pipe.c +@@ -1314,7 +1314,7 @@ static NTSTATUS create_rpc_bind_req(TALLOC_CTX *mem_ctx, + auth->auth_type, + auth->auth_level, + 0, /* auth_pad_length */ +- 1, /* auth_context_id */ ++ auth->auth_context_id, + &auth_token, + &auth_info); + if (!NT_STATUS_IS_OK(ret)) { +@@ -1830,7 +1830,7 @@ static NTSTATUS create_rpc_bind_auth3(TALLOC_CTX *mem_ctx, + auth->auth_type, + auth->auth_level, + 0, /* auth_pad_length */ +- 1, /* auth_context_id */ ++ auth->auth_context_id, + pauth_blob, + &u.auth3.auth_info); + if (!NT_STATUS_IS_OK(status)) { +@@ -1874,7 +1874,7 @@ static NTSTATUS create_rpc_alter_context(TALLOC_CTX *mem_ctx, + auth->auth_type, + auth->auth_level, + 0, /* auth_pad_length */ +- 1, /* auth_context_id */ ++ auth->auth_context_id, + pauth_blob, + &auth_info); + if (!NT_STATUS_IS_OK(status)) { +@@ -2704,6 +2704,7 @@ NTSTATUS rpccli_ncalrpc_bind_data(TALLOC_CTX *mem_ctx, + + result->auth_type = DCERPC_AUTH_TYPE_NCALRPC_AS_SYSTEM; + result->auth_level = DCERPC_AUTH_LEVEL_CONNECT; ++ result->auth_context_id = 1; + + result->user_name = talloc_strdup(result, ""); + result->domain = talloc_strdup(result, ""); +@@ -2728,6 +2729,7 @@ NTSTATUS rpccli_anon_bind_data(TALLOC_CTX *mem_ctx, + + result->auth_type = DCERPC_AUTH_TYPE_NONE; + result->auth_level = DCERPC_AUTH_LEVEL_NONE; ++ result->auth_context_id = 0; + + result->user_name = talloc_strdup(result, ""); + result->domain = talloc_strdup(result, ""); +@@ -2765,6 +2767,7 @@ static NTSTATUS rpccli_ntlmssp_bind_data(TALLOC_CTX *mem_ctx, + + result->auth_type = auth_type; + result->auth_level = auth_level; ++ result->auth_context_id = 1; + + result->user_name = talloc_strdup(result, username); + result->domain = talloc_strdup(result, domain); +@@ -2836,6 +2839,7 @@ NTSTATUS rpccli_schannel_bind_data(TALLOC_CTX *mem_ctx, const char *domain, + + result->auth_type = DCERPC_AUTH_TYPE_SCHANNEL; + result->auth_level = auth_level; ++ result->auth_context_id = 1; + + result->user_name = talloc_strdup(result, ""); + result->domain = talloc_strdup(result, domain); +@@ -3500,6 +3504,7 @@ NTSTATUS cli_rpc_pipe_open_krb5(struct cli_state *cli, + } + auth->auth_type = DCERPC_AUTH_TYPE_KRB5; + auth->auth_level = auth_level; ++ auth->auth_context_id = 1; + + if (!username) { + username = ""; +@@ -3570,6 +3575,7 @@ NTSTATUS cli_rpc_pipe_open_spnego_krb5(struct cli_state *cli, + } + auth->auth_type = DCERPC_AUTH_TYPE_SPNEGO; + auth->auth_level = auth_level; ++ auth->auth_context_id = 1; + + if (!username) { + username = ""; +@@ -3644,6 +3650,7 @@ NTSTATUS cli_rpc_pipe_open_spnego_ntlmssp(struct cli_state *cli, + } + auth->auth_type = DCERPC_AUTH_TYPE_SPNEGO; + auth->auth_level = auth_level; ++ auth->auth_context_id = 1; + + if (!username) { + username = ""; +-- +2.8.1 + + +From 2d58dfb478eccb3f93e1d56f1d2bbff1577d3c02 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Wed, 8 Jul 2015 00:01:37 +0200 +Subject: [PATCH 35/40] CVE-2015-5370: s3:rpc_server: make use of + pipe_auth_data->auth_context_id +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is better than using hardcoded values. +We need to use the value the client used in the BIND request. + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit 2bc617293a5d8652e484af69660b3646f3d48690) +--- + source3/rpc_server/rpc_ncacn_np.c | 1 + + source3/rpc_server/srv_pipe.c | 11 +++++++---- + 2 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/source3/rpc_server/rpc_ncacn_np.c b/source3/rpc_server/rpc_ncacn_np.c +index f2e9d10..c0f24a6 100644 +--- a/source3/rpc_server/rpc_ncacn_np.c ++++ b/source3/rpc_server/rpc_ncacn_np.c +@@ -781,6 +781,7 @@ static NTSTATUS rpc_pipe_open_external(TALLOC_CTX *mem_ctx, + } + result->auth->auth_type = DCERPC_AUTH_TYPE_NONE; + result->auth->auth_level = DCERPC_AUTH_LEVEL_NONE; ++ result->auth->auth_context_id = 0; + + status = rpccli_anon_bind_data(result, &auth); + if (!NT_STATUS_IS_OK(status)) { +diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c +index 4263a91..d6c4118 100644 +--- a/source3/rpc_server/srv_pipe.c ++++ b/source3/rpc_server/srv_pipe.c +@@ -534,6 +534,7 @@ static bool pipe_spnego_auth_bind(struct pipes_struct *p, + + p->auth.auth_ctx = spnego_ctx; + p->auth.auth_type = DCERPC_AUTH_TYPE_SPNEGO; ++ p->auth.auth_context_id = auth_info->auth_context_id; + + DEBUG(10, ("SPNEGO auth started\n")); + +@@ -644,6 +645,7 @@ static bool pipe_schannel_auth_bind(struct pipes_struct *p, + /* We're finished with this bind - no more packets. */ + p->auth.auth_ctx = schannel_auth; + p->auth.auth_type = DCERPC_AUTH_TYPE_SCHANNEL; ++ p->auth.auth_context_id = auth_info->auth_context_id; + + p->pipe_bound = True; + +@@ -688,6 +690,7 @@ static bool pipe_ntlmssp_auth_bind(struct pipes_struct *p, + + p->auth.auth_ctx = ntlmssp_state; + p->auth.auth_type = DCERPC_AUTH_TYPE_NTLMSSP; ++ p->auth.auth_context_id = auth_info->auth_context_id; + + DEBUG(10, (__location__ ": NTLMSSP auth started\n")); + +@@ -1173,6 +1176,7 @@ static bool api_pipe_bind_req(struct pipes_struct *p, + p->pipe_bound = True; + /* The session key was initialized from the SMB + * session in make_internal_rpc_pipe_p */ ++ p->auth.auth_context_id = 0; + } + + ZERO_STRUCT(u.bind_ack); +@@ -1218,12 +1222,11 @@ static bool api_pipe_bind_req(struct pipes_struct *p, + } + + if (auth_resp.length) { +- + status = dcerpc_push_dcerpc_auth(pkt, + auth_type, + auth_info.auth_level, +- 0, +- 1, /* auth_context_id */ ++ 0, /* pad_len */ ++ p->auth.auth_context_id, + &auth_resp, + &auth_blob); + if (!NT_STATUS_IS_OK(status)) { +@@ -1646,7 +1649,7 @@ static bool api_pipe_alter_context(struct pipes_struct *p, + auth_info.auth_type, + auth_info.auth_level, + pad_len, +- 1, /* auth_context_id */ ++ p->auth.auth_context_id, + &auth_resp, + &auth_blob); + if (!NT_STATUS_IS_OK(status)) { +-- +2.8.1 + + +From 43a77c90f877df714e71274143ab01eef27271cb Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Wed, 8 Jul 2015 00:01:37 +0200 +Subject: [PATCH 36/40] CVE-2015-5370: s3:librpc/rpc: make use of + auth->auth_context_id in dcerpc_add_auth_footer() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit 61faaa63e7e610308c72ae4c41a5c7b5b7312685) +--- + source3/librpc/rpc/dcerpc_helpers.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/source3/librpc/rpc/dcerpc_helpers.c b/source3/librpc/rpc/dcerpc_helpers.c +index e4d0e3a..977a372 100644 +--- a/source3/librpc/rpc/dcerpc_helpers.c ++++ b/source3/librpc/rpc/dcerpc_helpers.c +@@ -741,7 +741,7 @@ NTSTATUS dcerpc_add_auth_footer(struct pipe_auth_data *auth, + auth->auth_type, + auth->auth_level, + pad_len, +- 1 /* context id. */, ++ auth->auth_context_id, + &auth_blob, + &auth_info); + if (!NT_STATUS_IS_OK(status)) { +-- +2.8.1 + + +From fd2a01c93e86f1f7d23700c25cde5c84743bc289 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Wed, 8 Jul 2015 00:01:37 +0200 +Subject: [PATCH 37/40] CVE-2015-5370: s3:librpc/rpc: verify auth_context_id in + dcerpc_check_auth() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit 0cf3151c843e2c779b534743b455e630d89e2ba9) +--- + source3/librpc/rpc/dcerpc_helpers.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/source3/librpc/rpc/dcerpc_helpers.c b/source3/librpc/rpc/dcerpc_helpers.c +index 977a372..b00cf1bf 100644 +--- a/source3/librpc/rpc/dcerpc_helpers.c ++++ b/source3/librpc/rpc/dcerpc_helpers.c +@@ -881,6 +881,10 @@ NTSTATUS dcerpc_check_auth(struct pipe_auth_data *auth, + return NT_STATUS_INVALID_PARAMETER; + } + ++ if (auth_info.auth_context_id != auth->auth_context_id) { ++ return NT_STATUS_INVALID_PARAMETER; ++ } ++ + pkt_trailer->length -= auth_length; + data = data_blob_const(raw_pkt->data + header_size, + pkt_trailer->length); +-- +2.8.1 + + +From b2f0b95a0cdeeaad2ca9b993940fbbb5687a3509 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Tue, 7 Jul 2015 22:51:18 +0200 +Subject: [PATCH 38/40] CVE-2015-5370: s3:rpc_client: verify auth_context_id in + rpc_pipe_bind_step_one_done() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit 93a0f92b8ebecb38f92d3b2c9a946b486ee91d3c) +--- + source3/rpc_client/cli_pipe.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c +index 755d676..ee33e80 100644 +--- a/source3/rpc_client/cli_pipe.c ++++ b/source3/rpc_client/cli_pipe.c +@@ -2052,6 +2052,14 @@ static void rpc_pipe_bind_step_one_done(struct tevent_req *subreq) + return; + } + ++ if (auth.auth_context_id != pauth->auth_context_id) { ++ DEBUG(0, (__location__ " Auth context id %u mismatch expected %u.\n", ++ (unsigned)auth.auth_context_id, ++ (unsigned)pauth->auth_context_id)); ++ tevent_req_nterror(req, NT_STATUS_RPC_PROTOCOL_ERROR); ++ return; ++ } ++ + break; + } + +-- +2.8.1 + + +From 6e814c0173c4e74469d6f884f6eef3fc117e7117 Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Wed, 8 Jul 2015 00:01:37 +0200 +Subject: [PATCH 39/40] CVE-2015-5370: s3:rpc_server: verify auth_context_id in + api_pipe_{bind_auth3,alter_context} +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit 3ef461d8304ee36184cd7a3963676eedff4ef1eb) +--- + source3/rpc_server/srv_pipe.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c +index d6c4118..26c4ee0 100644 +--- a/source3/rpc_server/srv_pipe.c ++++ b/source3/rpc_server/srv_pipe.c +@@ -1364,6 +1364,14 @@ bool api_pipe_bind_auth3(struct pipes_struct *p, struct ncacn_packet *pkt) + goto err; + } + ++ if (auth_info.auth_context_id != p->auth.auth_context_id) { ++ DEBUG(0, ("Auth context id mismatch! Client sent %u, " ++ "but auth was started as level %u!\n", ++ (unsigned)auth_info.auth_context_id, ++ (unsigned)p->auth.auth_context_id)); ++ goto err; ++ } ++ + switch (auth_info.auth_type) { + case DCERPC_AUTH_TYPE_NTLMSSP: + ntlmssp_ctx = talloc_get_type_abort(p->auth.auth_ctx, +@@ -1545,6 +1553,14 @@ static bool api_pipe_alter_context(struct pipes_struct *p, + goto err_exit; + } + ++ if (auth_info.auth_context_id != p->auth.auth_context_id) { ++ DEBUG(0, ("Auth context id mismatch! Client sent %u, " ++ "but auth was started as level %u!\n", ++ (unsigned)auth_info.auth_context_id, ++ (unsigned)p->auth.auth_context_id)); ++ goto err_exit; ++ } ++ + switch (auth_info.auth_type) { + case DCERPC_AUTH_TYPE_SPNEGO: + spnego_ctx = talloc_get_type_abort(p->auth.auth_ctx, +-- +2.8.1 + + +From dca4488d6ce0477cac4bf4ab878444d64a83ebfb Mon Sep 17 00:00:00 2001 +From: Stefan Metzmacher +Date: Tue, 22 Dec 2015 21:23:14 +0100 +Subject: [PATCH 40/40] CVE-2015-5370: s3:rpc_client: disconnect connection on + protocol errors +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +BUG: https://bugzilla.samba.org/show_bug.cgi?id=11344 + +Signed-off-by: Stefan Metzmacher +Reviewed-by: G?nther Deschner +(cherry picked from commit 024d3b263a2879cee4fb7794d70f253c948cc043) +--- + source3/rpc_client/cli_pipe.c | 67 +++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 64 insertions(+), 3 deletions(-) + +diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c +index ee33e80..a3810f0 100644 +--- a/source3/rpc_client/cli_pipe.c ++++ b/source3/rpc_client/cli_pipe.c +@@ -953,6 +953,12 @@ static void rpc_api_pipe_got_pdu(struct tevent_req *subreq) + + state->pkt = talloc(state, struct ncacn_packet); + if (!state->pkt) { ++ /* ++ * TODO: do a real async disconnect ... ++ * ++ * For now do it sync... ++ */ ++ TALLOC_FREE(state->cli->transport); + tevent_req_nterror(req, NT_STATUS_NO_MEMORY); + return; + } +@@ -962,6 +968,12 @@ static void rpc_api_pipe_got_pdu(struct tevent_req *subreq) + state->pkt, + !state->endianess); + if (!NT_STATUS_IS_OK(status)) { ++ /* ++ * TODO: do a real async disconnect ... ++ * ++ * For now do it sync... ++ */ ++ TALLOC_FREE(state->cli->transport); + tevent_req_nterror(req, status); + return; + } +@@ -979,6 +991,28 @@ static void rpc_api_pipe_got_pdu(struct tevent_req *subreq) + (unsigned)state->reply_pdu_offset, + nt_errstr(status))); + ++ if (state->pkt->ptype != DCERPC_PKT_FAULT && !NT_STATUS_IS_OK(status)) { ++ /* ++ * TODO: do a real async disconnect ... ++ * ++ * For now do it sync... ++ */ ++ TALLOC_FREE(state->cli->transport); ++ } else if (NT_STATUS_EQUAL(status, NT_STATUS_RPC_PROTOCOL_ERROR)) { ++ /* ++ * TODO: do a real async disconnect ... ++ * ++ * For now do it sync... ++ */ ++ TALLOC_FREE(state->cli->transport); ++ } else if (NT_STATUS_EQUAL(status, NT_STATUS_RPC_SEC_PKG_ERROR)) { ++ /* ++ * TODO: do a real async disconnect ... ++ * ++ * For now do it sync... ++ */ ++ TALLOC_FREE(state->cli->transport); ++ } + if (!NT_STATUS_IS_OK(status)) { + tevent_req_nterror(req, status); + return; +@@ -1003,12 +1037,24 @@ static void rpc_api_pipe_got_pdu(struct tevent_req *subreq) + "%s\n", + state->endianess?"little":"big", + state->pkt->drep[0]?"little":"big")); +- tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER); ++ /* ++ * TODO: do a real async disconnect ... ++ * ++ * For now do it sync... ++ */ ++ TALLOC_FREE(state->cli->transport); ++ tevent_req_nterror(req, NT_STATUS_RPC_PROTOCOL_ERROR); + return; + } + + if (state->reply_pdu_offset + rdata.length > MAX_RPC_DATA_SIZE) { +- tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER); ++ /* ++ * TODO: do a real async disconnect ... ++ * ++ * For now do it sync... ++ */ ++ TALLOC_FREE(state->cli->transport); ++ tevent_req_nterror(req, NT_STATUS_RPC_PROTOCOL_ERROR); + return; + } + +@@ -1016,6 +1062,12 @@ static void rpc_api_pipe_got_pdu(struct tevent_req *subreq) @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Fri Apr 15 19:28:39 2016 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Fri, 15 Apr 2016 17:28:39 +0000 Subject: SF.net SVN: gar:[25661] csw/mgar/pkg/nginx/trunk Message-ID: <3qmkzX1NQLzdm@mail.opencsw.org> Revision: 25661 http://sourceforge.net/p/gar/code/25661 Author: rthurner Date: 2016-04-15 17:28:39 +0000 (Fri, 15 Apr 2016) Log Message: ----------- nginx/trunk: nginx, upgrade to 1.9.14 Modified Paths: -------------- csw/mgar/pkg/nginx/trunk/Makefile csw/mgar/pkg/nginx/trunk/checksums Modified: csw/mgar/pkg/nginx/trunk/Makefile =================================================================== --- csw/mgar/pkg/nginx/trunk/Makefile 2016-04-15 15:13:22 UTC (rev 25660) +++ csw/mgar/pkg/nginx/trunk/Makefile 2016-04-15 17:28:39 UTC (rev 25661) @@ -1,5 +1,5 @@ NAME = nginx -VERSION = 1.7.10 +VERSION = 1.9.14 GARTYPE = v2 DESCRIPTION = HTTP server and mail proxy server @@ -102,7 +102,7 @@ CONFIGURE_ARGS += --with-http_secure_link_module CONFIGURE_ARGS += --with-http_degradation_module CONFIGURE_ARGS += --with-http_stub_status_module -CONFIGURE_ARGS += --with-http_spdy_module +CONFIGURE_ARGS += --with-http_v2_module # Enable when we have 64 bit perl # CONFIGURE_ARGS += --with-http_perl_module # Specifically enable legacy method for people who want that Modified: csw/mgar/pkg/nginx/trunk/checksums =================================================================== --- csw/mgar/pkg/nginx/trunk/checksums 2016-04-15 15:13:22 UTC (rev 25660) +++ csw/mgar/pkg/nginx/trunk/checksums 2016-04-15 17:28:39 UTC (rev 25661) @@ -1 +1 @@ -8e800ea5247630b0fcf31ba35cb3245d nginx-1.7.10.tar.gz +a25818039f34b5d54b017d44c76321c4 nginx-1.9.14.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Fri Apr 15 22:47:34 2016 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Fri, 15 Apr 2016 20:47:34 +0000 Subject: SF.net SVN: gar:[25662] csw/mgar/pkg/samba/branches/samba3/Makefile Message-ID: <3qmqP33myTz1MP@mail.opencsw.org> Revision: 25662 http://sourceforge.net/p/gar/code/25662 Author: lblume Date: 2016-04-15 20:47:34 +0000 (Fri, 15 Apr 2016) Log Message: ----------- samba/branches/samba3: Some files need regenerating after the patches are applied so the build works Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba3/Makefile Modified: csw/mgar/pkg/samba/branches/samba3/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba3/Makefile 2016-04-15 17:28:39 UTC (rev 25661) +++ csw/mgar/pkg/samba/branches/samba3/Makefile 2016-04-15 20:47:34 UTC (rev 25662) @@ -460,6 +460,10 @@ $(WORKSRC)/source3/configure @$(MAKECOOKIE) +pre-build: + cd $(WORKSRC)/source3/ && $(MAKE) idl_full + @$(MAKECOOKIE) + post-install-modulated: ginstall -d $(DESTDIR)/etc/opt/csw/init.d ginstall $(WORKDIR)/cswsamba $(DESTDIR)/etc/opt/csw/init.d/cswsamba This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sat Apr 16 10:55:04 2016 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 16 Apr 2016 08:55:04 +0000 Subject: SF.net SVN: gar:[25663] csw/mgar/pkg/samba/branches/samba3/Makefile Message-ID: <3qn7XS6gBNz1Wp@mail.opencsw.org> Revision: 25663 http://sourceforge.net/p/gar/code/25663 Author: lblume Date: 2016-04-16 08:55:04 +0000 (Sat, 16 Apr 2016) Log Message: ----------- samba/branches/samba3: Add dependencies specific to S10 Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba3/Makefile Modified: csw/mgar/pkg/samba/branches/samba3/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba3/Makefile 2016-04-15 20:47:34 UTC (rev 25662) +++ csw/mgar/pkg/samba/branches/samba3/Makefile 2016-04-16 08:55:04 UTC (rev 25663) @@ -329,6 +329,22 @@ endif ### +### Additional dependencies on S10 +ifeq ($(shell /usr/bin/uname -r),5.10) +RUNTIME_DEP_PKGS_CSWlibtdb1 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibsmbclient0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibtevent0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibsmbsharemodes0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWsamba-nss += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibwbclient0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWsamba += CSWlibncurses6 +RUNTIME_DEP_PKGS_CSWsamba += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibncurses6 +endif +### + ### Needed to work around the ld Bug ifeq ($(shell /usr/bin/uname -rp),5.10 sparc) RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibintl8 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sat Apr 16 12:26:45 2016 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 16 Apr 2016 10:26:45 +0000 Subject: SF.net SVN: gar:[25664] csw/mgar/pkg/samba/branches/samba3/Makefile Message-ID: <3qn9ZF44Zkz42@mail.opencsw.org> Revision: 25664 http://sourceforge.net/p/gar/code/25664 Author: lblume Date: 2016-04-16 10:26:44 +0000 (Sat, 16 Apr 2016) Log Message: ----------- samba/branches/samba3: Some new dependencies seem to be from the ld bug and are sparc-only Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba3/Makefile Modified: csw/mgar/pkg/samba/branches/samba3/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba3/Makefile 2016-04-16 08:55:04 UTC (rev 25663) +++ csw/mgar/pkg/samba/branches/samba3/Makefile 2016-04-16 10:26:44 UTC (rev 25664) @@ -338,14 +338,12 @@ RUNTIME_DEP_PKGS_CSWsamba-nss += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWsamba-winbind += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibwbclient0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWsamba += CSWlibncurses6 RUNTIME_DEP_PKGS_CSWsamba += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibncurses6 endif ### -### Needed to work around the ld Bug +### Needed to work around the ld bug ifeq ($(shell /usr/bin/uname -rp),5.10 sparc) RUNTIME_DEP_PKGS_CSWsamba-swat += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibtdb1 += CSWlibintl8 @@ -357,6 +355,8 @@ RUNTIME_DEP_PKGS_CSWsamba-nss += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWsamba += CSWlibncurses6 +RUNTIME_DEP_PKGS_CSWsamba-client += CSWlibncurses6 endif ### This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sat Apr 16 14:27:55 2016 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 16 Apr 2016 12:27:55 +0000 Subject: SF.net SVN: gar:[25665] csw/mgar/pkg/samba/branches/samba3/files/cswsamba Message-ID: <3qnDG33DnJz82@mail.opencsw.org> Revision: 25665 http://sourceforge.net/p/gar/code/25665 Author: lblume Date: 2016-04-16 12:27:55 +0000 (Sat, 16 Apr 2016) Log Message: ----------- samba/branches/samba3: The init script should test pid files existence before using them Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba3/files/cswsamba Modified: csw/mgar/pkg/samba/branches/samba3/files/cswsamba =================================================================== --- csw/mgar/pkg/samba/branches/samba3/files/cswsamba 2016-04-16 10:26:44 UTC (rev 25664) +++ csw/mgar/pkg/samba/branches/samba3/files/cswsamba 2016-04-16 12:27:55 UTC (rev 25665) @@ -26,8 +26,8 @@ ;; stop) echo "Stopping Samba..." - kill "`cat @SMBLOCKDIR@/smbd.pid`" - kill "`cat @SMBLOCKDIR@/nmbd.pid`" + [ -f @SMBLOCKDIR@/smbd.pid ] && kill "`cat @SMBLOCKDIR@/smbd.pid`" + [ -f @SMBLOCKDIR@/nmbd.pid ] && kill "`cat @SMBLOCKDIR@/nmbd.pid`" ;; restart) $0 stop This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From lblume at users.sourceforge.net Sat Apr 16 14:50:17 2016 From: lblume at users.sourceforge.net (lblume at users.sourceforge.net) Date: Sat, 16 Apr 2016 12:50:17 +0000 Subject: SF.net SVN: gar:[25666] csw/mgar/pkg/samba/branches/samba3/files/cswwinbind Message-ID: <3qnDlr6dBwzBd@mail.opencsw.org> Revision: 25666 http://sourceforge.net/p/gar/code/25666 Author: lblume Date: 2016-04-16 12:50:17 +0000 (Sat, 16 Apr 2016) Log Message: ----------- samba/branches/samba3: Use the same pidfile check for winbind Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba3/files/cswwinbind Modified: csw/mgar/pkg/samba/branches/samba3/files/cswwinbind =================================================================== --- csw/mgar/pkg/samba/branches/samba3/files/cswwinbind 2016-04-16 12:27:55 UTC (rev 25665) +++ csw/mgar/pkg/samba/branches/samba3/files/cswwinbind 2016-04-16 12:50:17 UTC (rev 25666) @@ -22,7 +22,7 @@ ;; stop) echo "Stopping Winbind..." - pkill winbindd + [ -f @SMBLOCKDIR@/winbindd.pid ] && kill "`cat @SMBLOCKDIR@/winbindd.pid`" ;; restart) $0 stop This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Apr 18 13:51:29 2016 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 18 Apr 2016 11:51:29 +0000 Subject: SF.net SVN: gar:[25667] csw/mgar/pkg/x264/trunk Message-ID: <3qpRMH38Qbz1N1@mail.opencsw.org> Revision: 25667 http://sourceforge.net/p/gar/code/25667 Author: janholzh Date: 2016-04-18 11:51:28 +0000 (Mon, 18 Apr 2016) Log Message: ----------- x264/trunk: update to v148 Modified Paths: -------------- csw/mgar/pkg/x264/trunk/Makefile csw/mgar/pkg/x264/trunk/files/0001-replace-version.sh.patch Modified: csw/mgar/pkg/x264/trunk/Makefile =================================================================== --- csw/mgar/pkg/x264/trunk/Makefile 2016-04-16 12:50:17 UTC (rev 25666) +++ csw/mgar/pkg/x264/trunk/Makefile 2016-04-18 11:51:28 UTC (rev 25667) @@ -3,7 +3,7 @@ # # So it does not get lost. With gcc4.8 you now need -fno-aggressive-loop-optimizations: http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/161226 NAME = x264 -VERSION = a3ac64b +VERSION = 64f4e24 GARTYPE = v2 DESCRIPTION =The x264 project is encoding video streams into the H.264/MPEG-4 AVC format @@ -15,7 +15,7 @@ #MASTER_SITES = http://repo.or.cz/w/x264.git/snapshot/ #DISTFILES = c522ad1fed167d0e985e4f9dcdee042473cf74db.tar.gz GIT_REPOS = http://git.videolan.org/git/x264.git -GIT_TREEISH_tig.git = a3ac64b8b467eea1264c0053022893bc84b2e9a2 +GIT_TREEISH_tig.git = 64f4e24909924fceeea6e154d71b7dfbf586c7ea # This Patch file needs to be updated on every new version! PATCHFILES += 0001-replace-version.sh.patch @@ -29,7 +29,7 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -GARCOMPILER = GCC4 +GARCOMPILER = GCC5 SKIPTEST = 1 BUILD64 = 1 Modified: csw/mgar/pkg/x264/trunk/files/0001-replace-version.sh.patch =================================================================== --- csw/mgar/pkg/x264/trunk/files/0001-replace-version.sh.patch 2016-04-16 12:50:17 UTC (rev 25666) +++ csw/mgar/pkg/x264/trunk/files/0001-replace-version.sh.patch 2016-04-18 11:51:28 UTC (rev 25667) @@ -1,47 +1,50 @@ -From 6d62d0bfa41a80d0afb547ec87e20ea8cc9c0740 Mon Sep 17 00:00:00 2001 +From 3dc12ac0e9186d004b0049faecb76da77468a622 Mon Sep 17 00:00:00 2001 From: Jan Holzhueter -Date: Wed, 21 Mar 2012 10:12:19 +0100 -Subject: [PATCH] replace version.sh +Date: Mon, 18 Apr 2016 13:44:42 +0200 +Subject: [PATCH] static-version --- - version.sh | 29 ++++++----------------------- - 1 files changed, 6 insertions(+), 23 deletions(-) + version.sh | 30 +++++------------------------- + 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/version.sh b/version.sh -index 5466ef2..a1d43eb 100755 +index 178fc95..c6852c8 100755 --- a/version.sh +++ b/version.sh -@@ -1,24 +1,7 @@ - #!/bin/bash --[ -n "$1" ] && cd $1 --git rev-list HEAD | sort > config.git-hash --LOCALVER=`wc -l config.git-hash | awk '{print $1}'` --if [ $LOCALVER \> 1 ] ; then -- VER=`git rev-list origin/master | sort | join config.git-hash - | wc -l | awk '{print $1}'` -- VER_DIFF=$(($LOCALVER-$VER)) -- echo "#define X264_REV $VER" -- echo "#define X264_REV_DIFF $VER_DIFF" -- if [ $VER_DIFF != 0 ] ; then -- VER="$VER+$VER_DIFF" +@@ -1,28 +1,8 @@ + #!/bin/sh + +-cd "$(dirname "$0")" >/dev/null && [ -f x264.h ] || exit 1 ++echo "#define X264_REV 2692" ++echo "#define X264_REV_DIFF 0" ++echo '#define X264_VERSION " r2692 64f4e24"' ++echo '#define X264_POINTVER "0.148.2692 64f4e24"' ++exit 0 + +-api="$(grep '#define X264_BUILD' < x264.h | sed 's/^.* \([1-9][0-9]*\).*$/\1/')" +-ver="x" +-version="" +- +-if [ -d .git ] && command -v git >/dev/null 2>&1 ; then +- localver="$(($(git rev-list HEAD | wc -l)))" +- if [ "$localver" -gt 1 ] ; then +- ver_diff="$(($(git rev-list origin/master..HEAD | wc -l)))" +- ver="$((localver-ver_diff))" +- echo "#define X264_REV $ver" +- echo "#define X264_REV_DIFF $ver_diff" +- if [ "$ver_diff" -ne 0 ] ; then +- ver="$ver+$ver_diff" +- fi +- if git status | grep -q "modified:" ; then +- ver="${ver}M" +- fi +- ver="$ver $(git rev-list -n 1 HEAD | cut -c 1-7)" +- version=" r$ver" - fi -- if git status | grep -q "modified:" ; then -- VER="${VER}M" -- fi -- VER="$VER $(git rev-list HEAD -n 1 | cut -c 1-7)" -- echo "#define X264_VERSION \" r$VER\"" --else -- echo "#define X264_VERSION \"\"" -- VER="x" -fi --rm -f config.git-hash --API=`grep '#define X264_BUILD' < x264.h | sed -e 's/.* \([1-9][0-9]*\).*/\1/'` --echo "#define X264_POINTVER \"0.$API.$VER\"" -+ -+echo "#define X264_REV 2334" -+echo "#define X264_REV_DIFF 0" -+echo '#define X264_VERSION " r2334 a3ac64b"' -+echo '#define X264_POINTVER "0.133.2334 a3ac64b"' -+exit 0 +- +-echo "#define X264_VERSION \"$version\"" +-echo "#define X264_POINTVER \"0.$api.$ver\"" -- -1.7.9 +2.4.0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Apr 18 14:05:38 2016 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 18 Apr 2016 12:05:38 +0000 Subject: SF.net SVN: gar:[25668] csw/mgar/pkg/x264/trunk/Makefile Message-ID: <3qpRgQ2bdTz1QR@mail.opencsw.org> Revision: 25668 http://sourceforge.net/p/gar/code/25668 Author: janholzh Date: 2016-04-18 12:05:37 +0000 (Mon, 18 Apr 2016) Log Message: ----------- x264/trunk: change lib version and disable ffmpeg deps for now (cycle dep) Modified Paths: -------------- csw/mgar/pkg/x264/trunk/Makefile Modified: csw/mgar/pkg/x264/trunk/Makefile =================================================================== --- csw/mgar/pkg/x264/trunk/Makefile 2016-04-18 11:51:28 UTC (rev 25667) +++ csw/mgar/pkg/x264/trunk/Makefile 2016-04-18 12:05:37 UTC (rev 25668) @@ -50,24 +50,24 @@ PACKAGES += CSWx264 SPKG_DESC_CSWx264 = $(DESCRIPTION) # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWx264 += CSWlibavcodec54 -RUNTIME_DEP_PKGS_CSWx264 += CSWlibavformat54 -RUNTIME_DEP_PKGS_CSWx264 += CSWlibswscale2 -RUNTIME_DEP_PKGS_CSWx264 += CSWlibavutil52 +#RUNTIME_DEP_PKGS_CSWx264 += CSWlibavcodec54 +#RUNTIME_DEP_PKGS_CSWx264 += CSWlibavformat54 +#RUNTIME_DEP_PKGS_CSWx264 += CSWlibswscale2 +#RUNTIME_DEP_PKGS_CSWx264 += CSWlibavutil52 -PACKAGES += CSWlibx264-133 -CATALOGNAME_CSWlibx264-133 = libx264_133 -PKGFILES_CSWlibx264-133 += $(call baseisadirs,$(libdir),libx264\.so\.133) -PKGFILES_CSWlibx264-133 += $(call baseisadirs,$(libdir),libx264\.so\.133(\.\d+)*) -SPKG_DESC_CSWlibx264-133 += $(DESCRIPTION), libx264.so.133 -RUNTIME_DEP_PKGS_CSWlibx264-133 += CSWlibgcc-s1 +PACKAGES += CSWlibx264-148 +CATALOGNAME_CSWlibx264-148 = libx264_148 +PKGFILES_CSWlibx264-148 += $(call baseisadirs,$(libdir),libx264\.so\.148) +PKGFILES_CSWlibx264-148 += $(call baseisadirs,$(libdir),libx264\.so\.148(\.\d+)*) +SPKG_DESC_CSWlibx264-148 += $(DESCRIPTION), libx264.so.148 +RUNTIME_DEP_PKGS_CSWlibx264-148 += CSWlibgcc-s1 PACKAGES += CSWlibx264-dev CATALOGNAME_CSWlibx264-dev = libx264_dev SPKG_DESC_CSWlibx264-dev += $(DESCRIPTION), development files PKGFILES_CSWlibx264-dev += /opt/csw/lib/libx264.so PKGFILES_CSWlibx264-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWlibx264-dev += CSWlibx264-133 +RUNTIME_DEP_PKGS_CSWlibx264-dev += CSWlibx264-148 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Apr 18 17:31:37 2016 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 18 Apr 2016 15:31:37 +0000 Subject: SF.net SVN: gar:[25669] csw/mgar/pkg Message-ID: <3qpXFD2bdXzXp@mail.opencsw.org> Revision: 25669 http://sourceforge.net/p/gar/code/25669 Author: janholzh Date: 2016-04-18 15:31:37 +0000 (Mon, 18 Apr 2016) Log Message: ----------- x265/trunk: inital commit Added Paths: ----------- csw/mgar/pkg/x265/ csw/mgar/pkg/x265/Makefile csw/mgar/pkg/x265/branches/ csw/mgar/pkg/x265/tags/ csw/mgar/pkg/x265/trunk/ csw/mgar/pkg/x265/trunk/Makefile csw/mgar/pkg/x265/trunk/checksums csw/mgar/pkg/x265/trunk/files/ csw/mgar/pkg/x265/trunk/files/0001-add_posix_memalign.patch csw/mgar/pkg/x265/trunk/files/0002-remove_unknown_linker_option.patch Added: csw/mgar/pkg/x265/Makefile =================================================================== --- csw/mgar/pkg/x265/Makefile (rev 0) +++ csw/mgar/pkg/x265/Makefile 2016-04-18 15:31:37 UTC (rev 25669) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/x265/trunk =================================================================== --- csw/mgar/pkg/x265/trunk 2016-04-18 12:05:37 UTC (rev 25668) +++ csw/mgar/pkg/x265/trunk 2016-04-18 15:31:37 UTC (rev 25669) Property changes on: csw/mgar/pkg/x265/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/x265/trunk/Makefile =================================================================== --- csw/mgar/pkg/x265/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x265/trunk/Makefile 2016-04-18 15:31:37 UTC (rev 25669) @@ -0,0 +1,76 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = x265 +VERSION = 1.9 +GARTYPE = v2 + +DESCRIPTION = The x265 is encoding video streams into the H.265/MPEG-H HEVC format +define BLURB + x265 is a free software library and application for encoding video streams into the H.265/MPEG-H HEVC compression format, and is released under the terms of the GNU GPL. +endef + +MASTER_SITES = https://bitbucket.org/multicoreware/x265/downloads/ +DISTNAME = $(NAME)_$(VERSION) +DISTFILES = $(DISTNAME).tar.gz +PATCHFILES += 0001-add_posix_memalign.patch +PATCHFILES += 0002-remove_unknown_linker_option.patch + +PACKAGES += CSWx265 +SPKG_DESC_CSWx265 = $(DESCRIPTION) +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWx265 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWx265 += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWx265 += CSWlibx265-79 + +PACKAGES += CSWlibx265-79 +CATALOGNAME_CSWlibx265-79 = libx265_79 +SPKG_DESC_CSWlibx265-79 += $(DESCRIPTION), libx265.so.79 +PKGFILES_CSWlibx265-79 += $(call baseisadirs,$(libdir),libx265\.so\.79) +PKGFILES_CSWlibx265-79 += $(call baseisadirs,$(libdir),libx265\.so\.79(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibx265-79 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibx265-79 += CSWlibstdc++6 + +PACKAGES += CSWx265-dev +CATALOGNAME_CSWx265-dev = x265_dev +SPKG_DESC_CSWx265-dev += $(DESCRIPTION), development files +PKGFILES_CSWx265-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWx265-dev += CSWlibx265-79 + + +GARCOMPILER = GCC5 +BUILD64 = 1 +ISAEXEC = 1 + +CONFIGURE_SCRIPTS = custom + +CONFIGURE_ARGS = $(DIRPATHS) +CMAKE_ARGS += -DCMAKE_PREFIX_PATH="$(prefix)" +CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX="$(prefix)" +#CMAKE_ARGS += "-DBIN_INSTALL_DIR:STRING=$(subst $(prefix)/,,$(bindir))" +CMAKE_ARGS += -DBIN_INSTALL_DIR:STRING="$(bindir)" +#CMAKE_ARGS += "-DLIB_INSTALL_DIR:STRING=$(subst $(prefix)/,,$(libdir))" +CMAKE_ARGS += -DLIB_INSTALL_DIR:STRING="$(libdir)" +CMAKE_ARGS += -DCMAKE_C_FLAGS="$(CFLAGS)" +CMAKE_ARGS += -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" +CMAKE_ARGS += -DCMAKE_C_LINK_FLAGS="$(LDFLAGS)" +CMAKE_ARGS += -DCMAKE_CXX_LINK_FLAGS="$(LDFLAGS)" +CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)" +CMAKE_ARGS += -DCMAKE_INCLUDE_PATH="$(includedir)" +CMAKE_ARGS += -DCMAKE_VERBOSE_MAKEFILE=ON +CMAKE_ARGS += "-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON" +CMAKE_ARGS += "-DENABLE_PIC:BOOL=ON" + +SKIPTEST = 1 + + +include gar/category.mk + +configure-custom: + (cd $(WORKSRC)&& \ + /usr/bin/env -i \ + $(CONFIGURE_ENV) \ + cmake \ + ./source \ + $(CMAKE_ARGS)) + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/x265/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/x265/trunk/checksums =================================================================== --- csw/mgar/pkg/x265/trunk/checksums (rev 0) +++ csw/mgar/pkg/x265/trunk/checksums 2016-04-18 15:31:37 UTC (rev 25669) @@ -0,0 +1 @@ +f34a1c4c660ff07511365cb0983cf164 x265_1.9.tar.gz Added: csw/mgar/pkg/x265/trunk/files/0001-add_posix_memalign.patch =================================================================== --- csw/mgar/pkg/x265/trunk/files/0001-add_posix_memalign.patch (rev 0) +++ csw/mgar/pkg/x265/trunk/files/0001-add_posix_memalign.patch 2016-04-18 15:31:37 UTC (rev 25669) @@ -0,0 +1,49 @@ +From ad937a7169b9b36e3a3e65ce3fcd94b1513be342 Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter +Date: Mon, 18 Apr 2016 15:25:59 +0200 +Subject: [PATCH] add_posix_memalign + +--- + source/common/common.cpp | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff --git a/source/common/common.cpp b/source/common/common.cpp +index 673aabb..539b557 100644 +--- a/source/common/common.cpp ++++ b/source/common/common.cpp +@@ -25,6 +25,7 @@ + #include "slice.h" + #include "threading.h" + #include "x265.h" ++#include + + #if _WIN32 + #include +@@ -35,6 +36,24 @@ + + namespace X265_NS { + ++ ++int posix_memalign(void **memptr, size_t alignment, size_t size) ++{ ++ void *ptr = NULL; ++ int error = 0; ++ ++ if (alignment == 0 || ++ (alignment & (sizeof (void *) - 1)) != 0 || ++ (alignment & (alignment - 1)) != 0) ++ error = EINVAL; ++ else if (size != 0 && ++ (ptr = memalign(alignment, size)) == NULL) ++ error = ENOMEM; ++ ++ *memptr = ptr; ++ return (error); ++} ++ + #if CHECKED_BUILD || _DEBUG + int g_checkFailures; + #endif +-- +2.4.0 + Added: csw/mgar/pkg/x265/trunk/files/0002-remove_unknown_linker_option.patch =================================================================== --- csw/mgar/pkg/x265/trunk/files/0002-remove_unknown_linker_option.patch (rev 0) +++ csw/mgar/pkg/x265/trunk/files/0002-remove_unknown_linker_option.patch 2016-04-18 15:31:37 UTC (rev 25669) @@ -0,0 +1,25 @@ +From 279b7318a589ea14f317cd538721985a85158cc1 Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter +Date: Mon, 18 Apr 2016 15:50:20 +0200 +Subject: [PATCH] remove_unkown_linker_option + +--- + source/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt +index 8102847..5d85c84 100644 +--- a/source/CMakeLists.txt ++++ b/source/CMakeLists.txt +@@ -481,7 +481,7 @@ if(ENABLE_SHARED) + elseif(CYGWIN) + # Cygwin is not officially supported or tested. MinGW with msys is recommended. + else() +- list(APPEND LINKER_OPTIONS "-Wl,-Bsymbolic,-znoexecstack") ++ list(APPEND LINKER_OPTIONS "") + endif() + endif() + set_target_properties(x265-shared PROPERTIES SOVERSION ${X265_BUILD}) +-- +2.4.0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Apr 18 17:49:31 2016 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 18 Apr 2016 15:49:31 +0000 Subject: SF.net SVN: gar:[25670] csw/mgar/pkg/x265/trunk/Makefile Message-ID: <3qpXdl6732zbH@mail.opencsw.org> Revision: 25670 http://sourceforge.net/p/gar/code/25670 Author: janholzh Date: 2016-04-18 15:49:31 +0000 (Mon, 18 Apr 2016) Log Message: ----------- x265/trunk: asm brakes build Modified Paths: -------------- csw/mgar/pkg/x265/trunk/Makefile Modified: csw/mgar/pkg/x265/trunk/Makefile =================================================================== --- csw/mgar/pkg/x265/trunk/Makefile 2016-04-18 15:31:37 UTC (rev 25669) +++ csw/mgar/pkg/x265/trunk/Makefile 2016-04-18 15:49:31 UTC (rev 25670) @@ -60,6 +60,7 @@ CMAKE_ARGS += -DCMAKE_VERBOSE_MAKEFILE=ON CMAKE_ARGS += "-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON" CMAKE_ARGS += "-DENABLE_PIC:BOOL=ON" +CMAKE_ARGS += "-DENABLE_ASSEMBLY:BOOL=OFF" SKIPTEST = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Apr 19 14:08:43 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 19 Apr 2016 12:08:43 +0000 Subject: SF.net SVN: gar:[25671] csw/mgar/pkg/opencsw-manual/trunk/files/ for-maintainers/buildfarm-setup.rst Message-ID: <3qq3hf5pV9z1Q6@mail.opencsw.org> Revision: 25671 http://sourceforge.net/p/gar/code/25671 Author: dmichelsen Date: 2016-04-19 12:08:43 +0000 (Tue, 19 Apr 2016) Log Message: ----------- opencsw-manual: Add Solaris Studio 12.4 Modified Paths: -------------- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst Modified: csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst =================================================================== --- csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2016-04-18 15:49:31 UTC (rev 25670) +++ csw/mgar/pkg/opencsw-manual/trunk/files/for-maintainers/buildfarm-setup.rst 2016-04-19 12:08:43 UTC (rev 25671) @@ -487,6 +487,7 @@ * Sun Studio 12u1: ``/opt/studio/sunstudio12.1`` * Solaris Studio 12u2: ``/opt/solstudio12.2`` * Solaris Studio 12u3: ``/opt/solarisstudio12.3`` +* Solaris Studio 12u4: ``/opt/solarisstudio12.4`` You can install multiple versions of SOS on one system. If you have your compiler installed at a different location you can set it in your ``~/.garrc`` @@ -513,6 +514,20 @@ sudo ./solarisstudio.sh --non-interactive --tempdir /var/tmp +Installing Oracle Solaris Studio 12u4 ++++++++++++++++++++++++++++++++++++++ + +This version requires the following minimum patch levels: + +* Sparc: 118683-13, 147436-01 +* x86: 119961-13, 147437-02 + +Also a recent Java is required. This can be achieved with installing `CSWjre8`. + +:: + + sudo ./solarisstudio.sh --non-interactive --tempdir /var/tmp --javahome /opt/csw/java/jre/jre8 + Patching the installed compilers ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Apr 19 14:11:28 2016 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 19 Apr 2016 12:11:28 +0000 Subject: SF.net SVN: gar:[25672] csw/mgar/pkg/ffmpeg/trunk Message-ID: <3qq3lv49CMz1ST@mail.opencsw.org> Revision: 25672 http://sourceforge.net/p/gar/code/25672 Author: janholzh Date: 2016-04-19 12:11:27 +0000 (Tue, 19 Apr 2016) Log Message: ----------- ffmpeg/trunk: update to 3.0.1 add x265 Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile csw/mgar/pkg/ffmpeg/trunk/checksums csw/mgar/pkg/ffmpeg/trunk/files/0001-fix-version.sh.patch csw/mgar/pkg/ffmpeg/trunk/files/0004-remove-GNU-ld-specific-options.patch Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2016-04-19 12:08:43 UTC (rev 25671) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2016-04-19 12:11:27 UTC (rev 25672) @@ -8,7 +8,7 @@ # Another thing is to see if it can be build with suncc see http://ftp.jaist.ac.jp/pub/pkgsrc/current/pkgsrc/multimedia/ffmpeg/Makefile.common NAME = ffmpeg -VERSION = 1.2.1 +VERSION = 3.0.1 GARTYPE = v2 DESCRIPTION = Very fast video and audio converter (includes libavcodec) @@ -33,112 +33,130 @@ BUILD_DEP_PKGS += CSWlibtheora-dev BUILD_DEP_PKGS += CSWlibvorbis-dev BUILD_DEP_PKGS += CSWlibx264-dev +BUILD_DEP_PKGS += CSWx265-dev -PACKAGES += CSWlibavcodec54 -SPKG_DESC_CSWlibavcodec54 = FFMPEG library libavcodec.so.54 -PKGFILES_CSWlibavcodec54 += $(call pkgfiles_lib,libavcodec.so.54) -RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibvorbisenc2 -RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibavutil52 -RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibavfilter3 -RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibvorbis0 -RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibmp3lame0 -RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibtheoradec1 -RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibtheoraenc1 -RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibspeex1 -RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibx264-133 -RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibgcc-s1 +PACKAGES += CSWlibavcodec57 +SPKG_DESC_CSWlibavcodec57 = FFMPEG library libavcodec.so.57 +PKGFILES_CSWlibavcodec57 += $(call pkgfiles_lib,libavcodec.so.57) +RUNTIME_DEP_PKGS_CSWlibavcodec57 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibavcodec57 += CSWlibvorbisenc2 +RUNTIME_DEP_PKGS_CSWlibavcodec57 += CSWlibavutil55 +RUNTIME_DEP_PKGS_CSWlibavcodec57 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibavcodec57 += CSWlibvorbis0 +RUNTIME_DEP_PKGS_CSWlibavcodec57 += CSWlibmp3lame0 +RUNTIME_DEP_PKGS_CSWlibavcodec57 += CSWlibtheoradec1 +RUNTIME_DEP_PKGS_CSWlibavcodec57 += CSWlibtheoraenc1 +RUNTIME_DEP_PKGS_CSWlibavcodec57 += CSWlibspeex1 +RUNTIME_DEP_PKGS_CSWlibavcodec57 += CSWlibx264-148 +RUNTIME_DEP_PKGS_CSWlibavcodec57 += CSWlibx265-79 +RUNTIME_DEP_PKGS_CSWlibavcodec57 += CSWliblzma5 +RUNTIME_DEP_PKGS_CSWlibavcodec57 += CSWlibswresample2 +RUNTIME_DEP_PKGS_CSWlibavcodec57 += CSWlibgcc-s1 -PACKAGES += CSWlibavdevice54 -SPKG_DESC_CSWlibavdevice54 = FFMPEG library libavdevice.so.54 -PKGFILES_CSWlibavdevice54 += $(call pkgfiles_lib,libavdevice.so.54) -RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibavformat54 -RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibvorbisenc2 -RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibavutil52 -RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibsdl1-2-0 -RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibogg0 -RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibavcodec54 -RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibvorbis0 -RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibmp3lame0 -RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibtheoradec1 -RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibtheoraenc1 -RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibspeex1 -RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibx264-133 -RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibgcc-s1 +PACKAGES += CSWlibavdevice57 +SPKG_DESC_CSWlibavdevice57 = FFMPEG library libavdevice.so.57 +PKGFILES_CSWlibavdevice57 += $(call pkgfiles_lib,libavdevice.so.57) +RUNTIME_DEP_PKGS_CSWlibavdevice57 += CSWlibavformat57 +RUNTIME_DEP_PKGS_CSWlibavdevice57 += CSWlibavfilter6 +RUNTIME_DEP_PKGS_CSWlibavdevice57 += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWlibavdevice57 += CSWlibvorbisenc2 +RUNTIME_DEP_PKGS_CSWlibavdevice57 += CSWlibavutil55 +RUNTIME_DEP_PKGS_CSWlibavdevice57 += CSWlibsdl1-2-0 +RUNTIME_DEP_PKGS_CSWlibavdevice57 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibavdevice57 += CSWlibogg0 +RUNTIME_DEP_PKGS_CSWlibavdevice57 += CSWlibavcodec57 +RUNTIME_DEP_PKGS_CSWlibavdevice57 += CSWlibvorbis0 +RUNTIME_DEP_PKGS_CSWlibavdevice57 += CSWlibmp3lame0 +RUNTIME_DEP_PKGS_CSWlibavdevice57 += CSWlibtheoradec1 +RUNTIME_DEP_PKGS_CSWlibavdevice57 += CSWlibtheoraenc1 +RUNTIME_DEP_PKGS_CSWlibavdevice57 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibavdevice57 += CSWlibspeex1 +RUNTIME_DEP_PKGS_CSWlibavdevice57 += CSWlibx264-148 +RUNTIME_DEP_PKGS_CSWlibavdevice57 += CSWlibgcc-s1 -PACKAGES += CSWlibavfilter3 -SPKG_DESC_CSWlibavfilter3 = FFMPEG library libavfilter.so.3 -PKGFILES_CSWlibavfilter3 += $(call pkgfiles_lib,libavfilter.so.3) -RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibavformat54 -RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibswscale2 -RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibavutil52 -RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibavcodec54 -RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibswresample0 -RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibpostproc52 -RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibgcc-s1 +PACKAGES += CSWlibavfilter6 +SPKG_DESC_CSWlibavfilter6 = FFMPEG library libavfilter.so.6 +PKGFILES_CSWlibavfilter6 += $(call pkgfiles_lib,libavfilter.so.6) +RUNTIME_DEP_PKGS_CSWlibavfilter6 += CSWlibavformat57 +RUNTIME_DEP_PKGS_CSWlibavfilter6 += CSWlibswscale4 +RUNTIME_DEP_PKGS_CSWlibavfilter6 += CSWlibavutil55 +RUNTIME_DEP_PKGS_CSWlibavfilter6 += CSWlibavcodec57 +RUNTIME_DEP_PKGS_CSWlibavfilter6 += CSWlibswresample2 +RUNTIME_DEP_PKGS_CSWlibavfilter6 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibavfilter6 += CSWlibpostproc54 +RUNTIME_DEP_PKGS_CSWlibavfilter6 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibavfilter6_sparc += CSWlibx264-148 +RUNTIME_DEP_PKGS_CSWlibavfilter6+= $(RUNTIME_DEP_PKGS_CSWlibavfilter6_$(GARCH)) -PACKAGES += CSWlibavformat54 -SPKG_DESC_CSWlibavformat54 = FFMPEG library libavformat.so.54 -PKGFILES_CSWlibavformat54 += $(call pkgfiles_lib,libavformat.so.54) -RUNTIME_DEP_PKGS_CSWlibavformat54 += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWlibavformat54 += CSWlibavutil52 -RUNTIME_DEP_PKGS_CSWlibavformat54 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibavformat54 += CSWlibavcodec54 -RUNTIME_DEP_PKGS_CSWlibavformat54 += CSWlibgcc-s1 +PACKAGES += CSWlibavformat57 +SPKG_DESC_CSWlibavformat57 = FFMPEG library libavformat.so.57 +PKGFILES_CSWlibavformat57 += $(call pkgfiles_lib,libavformat.so.57) +RUNTIME_DEP_PKGS_CSWlibavformat57 += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWlibavformat57 += CSWlibavutil55 +RUNTIME_DEP_PKGS_CSWlibavformat57 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibavformat57 += CSWlibavcodec57 +RUNTIME_DEP_PKGS_CSWlibavformat57 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibavformat57_sparc += CSWlibx264-148 +RUNTIME_DEP_PKGS_CSWlibavformat57 += $(RUNTIME_DEP_PKGS_CSWlibavformat57_$(GARCH)) -PACKAGES += CSWlibavutil52 -SPKG_DESC_CSWlibavutil52 = FFMPEG library libavutil.so.52 -PKGFILES_CSWlibavutil52 += $(call pkgfiles_lib,libavutil.so.52) -RUNTIME_DEP_PKGS_CSWlibavutil52 += CSWlibgcc-s1 +PACKAGES += CSWlibavutil55 +SPKG_DESC_CSWlibavutil55 = FFMPEG library libavutil.so.55 +PKGFILES_CSWlibavutil55 += $(call pkgfiles_lib,libavutil.so.55) +RUNTIME_DEP_PKGS_CSWlibavutil55 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibavutil55_sparc += CSWlibx264-148 +RUNTIME_DEP_PKGS_CSWlibavutil55+= $(RUNTIME_DEP_PKGS_CSWlibavutil55_$(GARCH)) -PACKAGES += CSWlibpostproc52 -SPKG_DESC_CSWlibpostproc52 = FFMPEG library libpostproc.so.52 -PKGFILES_CSWlibpostproc52 += $(call pkgfiles_lib,libpostproc.so.52) -RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibavutil52 -RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibgcc-s1 +PACKAGES += CSWlibpostproc54 +SPKG_DESC_CSWlibpostproc54 = FFMPEG library libpostproc.so.54 +PKGFILES_CSWlibpostproc54 += $(call pkgfiles_lib,libpostproc.so.54) +RUNTIME_DEP_PKGS_CSWlibpostproc54 += CSWlibavutil55 +RUNTIME_DEP_PKGS_CSWlibpostproc54 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibpostproc54_sparc += CSWlibx264-148 +RUNTIME_DEP_PKGS_CSWlibpostproc54+= $(RUNTIME_DEP_PKGS_CSWlibpostproc54_$(GARCH)) -PACKAGES += CSWlibswscale2 -SPKG_DESC_CSWlibswscale2 = FFMPEG library libswscale.so.2 -PKGFILES_CSWlibswscale2 += $(call pkgfiles_lib,libswscale.so.2) -RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibavutil52 -RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibgcc-s1 +PACKAGES += CSWlibswscale4 +SPKG_DESC_CSWlibswscale4 = FFMPEG library libswscale.so.4 +PKGFILES_CSWlibswscale4 += $(call pkgfiles_lib,libswscale.so.4) +RUNTIME_DEP_PKGS_CSWlibswscale4 += CSWlibavutil55 +RUNTIME_DEP_PKGS_CSWlibswscale4 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibswscale4_sparc += CSWlibx264-148 +RUNTIME_DEP_PKGS_CSWlibswscale4+= $(RUNTIME_DEP_PKGS_CSWlibpostproc54_$(GARCH)) -PACKAGES += CSWlibswresample0 -SPKG_DESC_CSWlibswresample0 = FFMPEG library libswresample.so.0 -PKGFILES_CSWlibswresample0 += $(call pkgfiles_lib,libswresample.so.0) -RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibavutil52 -RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibgcc-s1 +PACKAGES += CSWlibswresample2 +SPKG_DESC_CSWlibswresample2 = FFMPEG library libswresample.so.2 +PKGFILES_CSWlibswresample2 += $(call pkgfiles_lib,libswresample.so.2) +RUNTIME_DEP_PKGS_CSWlibswresample2 += CSWlibavutil55 +RUNTIME_DEP_PKGS_CSWlibswresample2 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibswresample2_sparc += CSWlibx264-148 +RUNTIME_DEP_PKGS_CSWlibswresample2+= $(RUNTIME_DEP_PKGS_CSWlibswresample2_$(GARCH)) PACKAGES += CSWffmpeg-dev SPKG_DESC_CSWffmpeg-dev = Development files for several FFMPEG shared libraries PKGFILES_CSWffmpeg-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavcodec54 -RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavdevice54 -RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavfilter3 -RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavformat54 -RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavutil52 -RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibpostproc52 -RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibswscale2 -RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibswresample0 +RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavcodec57 +RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavdevice57 +RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavfilter6 +RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavformat57 +RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavutil55 +RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibpostproc54 +RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibswscale4 +RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibswresample2 PACKAGES += CSWffmpeg SPKG_DESC_CSWffmpeg = Very fast video and audio converter # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavformat54 -RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibswscale2 -RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavutil52 +RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavformat57 +RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibswscale4 +RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavutil55 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibsdl1-2-0 -RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavcodec54 -RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavdevice54 -RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibswresample0 -RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavfilter3 -RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibpostproc52 +RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavcodec57 +RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavdevice57 +RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibswresample2 +RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavfilter6 +RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibpostproc54 +RUNTIME_DEP_PKGS_CSWffmpeg_sparc += CSWlibx264-148 +RUNTIME_DEP_PKGS_CSWffmpeg+= $(RUNTIME_DEP_PKGS_CSWffmpeg_$(GARCH)) #EXTRA_MODULATORS = SHARED @@ -166,6 +184,7 @@ CONFIGURE_ARGS += --enable-gpl CONFIGURE_ARGS += --enable-version3 CONFIGURE_ARGS += --enable-runtime-cpudetect +CONFIGURE_ARGS += --disable-vdpau #Needs sse to get asm stuff to work on x86 CONFIGURE_ARGS_i386 += --extra-cflags="-mfpmath=sse -msse" @@ -197,6 +216,7 @@ CONFIGURE_ARGS += --enable-libtheora CONFIGURE_ARGS += --enable-libvorbis CONFIGURE_ARGS += --enable-libx264 +CONFIGURE_ARGS += --enable-libx265 # We don't want to use GNU strip as # it corrupts a SUN specific elf section @@ -212,3 +232,9 @@ # For 'grep -q' PATH := /opt/csw/gnu:$(PATH) + +post-install: + rm $(INSTALLISADIR)/opt/csw//share/doc/developer.html + rm $(INSTALLISADIR)/opt/csw//share/doc/faq.html + @$(MAKECOOKIE) + Modified: csw/mgar/pkg/ffmpeg/trunk/checksums =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/checksums 2016-04-19 12:08:43 UTC (rev 25671) +++ csw/mgar/pkg/ffmpeg/trunk/checksums 2016-04-19 12:11:27 UTC (rev 25672) @@ -1 +1 @@ -5071a26cc149f380908ce79ec2a677ef ffmpeg-1.2.1.tar.bz2 +51ca580a64c0d2ecb6dba721b2744815 ffmpeg-3.0.1.tar.bz2 Modified: csw/mgar/pkg/ffmpeg/trunk/files/0001-fix-version.sh.patch =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/files/0001-fix-version.sh.patch 2016-04-19 12:08:43 UTC (rev 25671) +++ csw/mgar/pkg/ffmpeg/trunk/files/0001-fix-version.sh.patch 2016-04-19 12:11:27 UTC (rev 25672) @@ -1,22 +1,22 @@ -From 203595cdab30aea5661fbe8be7cea2143b0f6507 Mon Sep 17 00:00:00 2001 +From 04f2eb0227967cc0e38d949ca4e4e716cdf97e95 Mon Sep 17 00:00:00 2001 From: Jan Holzhueter -Date: Fri, 15 Jul 2011 08:44:12 +0200 -Subject: [PATCH] fix-version.sh +Date: Mon, 18 Apr 2016 14:14:57 +0200 +Subject: [PATCH] fix-shell --- - version.sh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + version.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sh b/version.sh -index 41ae520..a83a539 100755 +index a9d7e39..fb8bb47 100755 --- a/version.sh +++ b/version.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/opt/csw/bin/bash - # check for git short hash - if ! test "$revision"; then + # Usage: version.sh + -- -1.7.6 +2.4.0 Modified: csw/mgar/pkg/ffmpeg/trunk/files/0004-remove-GNU-ld-specific-options.patch =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/files/0004-remove-GNU-ld-specific-options.patch 2016-04-19 12:08:43 UTC (rev 25671) +++ csw/mgar/pkg/ffmpeg/trunk/files/0004-remove-GNU-ld-specific-options.patch 2016-04-19 12:11:27 UTC (rev 25672) @@ -1,24 +1,24 @@ -From 14fb2a6aa9fc69358b7d0148da0674279fdcdf1c Mon Sep 17 00:00:00 2001 +From fab7765a101cd0693e03195f56f4ba54be3a00e6 Mon Sep 17 00:00:00 2001 From: Jan Holzhueter -Date: Mon, 1 Oct 2012 14:47:53 +0200 -Subject: [PATCH] remove-linkerflags +Date: Mon, 18 Apr 2016 15:23:33 +0200 +Subject: [PATCH] linker_flags --- configure | 1 - 1 file changed, 1 deletion(-) diff --git a/configure b/configure -index ac429ef..03992c4 100755 +index 475c087..650b018 100755 --- a/configure +++ b/configure -@@ -3813,7 +3813,6 @@ enabled extra_warnings && check_cflags -Winline +@@ -5817,7 +5817,6 @@ check_disable_warning -Wno-unused-const-variable # add some linker flags check_ldflags -Wl,--warn-common -check_ldflags -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample + enabled rpath && add_ldexeflags -Wl,-rpath,$libdir + enabled rpath && add_ldlibflags -Wl,-rpath,$libdir test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic - - enabled xmm_clobber_test && -- -1.7.12 +2.4.0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Apr 19 15:27:02 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 19 Apr 2016 13:27:02 +0000 Subject: SF.net SVN: gar:[25673] csw/mgar/pkg/jdk8/trunk Message-ID: <3qq5Qv65l2zRr@mail.opencsw.org> Revision: 25673 http://sourceforge.net/p/gar/code/25673 Author: dmichelsen Date: 2016-04-19 13:27:01 +0000 (Tue, 19 Apr 2016) Log Message: ----------- jdk8/trunk: Update to 8u77 Modified Paths: -------------- csw/mgar/pkg/jdk8/trunk/Makefile csw/mgar/pkg/jdk8/trunk/checksums Modified: csw/mgar/pkg/jdk8/trunk/Makefile =================================================================== --- csw/mgar/pkg/jdk8/trunk/Makefile 2016-04-19 12:11:27 UTC (rev 25672) +++ csw/mgar/pkg/jdk8/trunk/Makefile 2016-04-19 13:27:01 UTC (rev 25673) @@ -1,6 +1,6 @@ NAME = jre8 -SPKG_VERSION = 1.8.0_74 -VERSION = 8u74 +SPKG_VERSION = 1.8.0_77 +VERSION = 8u77 GARTYPE = v2 DESCRIPTION = Java Development Kit 8 Modified: csw/mgar/pkg/jdk8/trunk/checksums =================================================================== --- csw/mgar/pkg/jdk8/trunk/checksums 2016-04-19 12:11:27 UTC (rev 25672) +++ csw/mgar/pkg/jdk8/trunk/checksums 2016-04-19 13:27:01 UTC (rev 25673) @@ -1,2 +1,2 @@ -92b6c3e2358146a215417dc48439a75f jdk-8u74-solaris-sparcv9.tar.gz -e1e472e994e608be8dce526b3fa7c62e jdk-8u74-solaris-x64.tar.gz +9b5e00f02f439b227421623eb08df07b jdk-8u77-solaris-sparcv9.tar.gz +d433d9a170a8d032bba154e857e846fa jdk-8u77-solaris-x64.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Apr 20 08:09:52 2016 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 20 Apr 2016 06:09:52 +0000 Subject: SF.net SVN: gar:[25674] csw/mgar/pkg/openssl1/branches Message-ID: <3qqWh209S5zsY@mail.opencsw.org> Revision: 25674 http://sourceforge.net/p/gar/code/25674 Author: cgrzemba Date: 2016-04-20 06:09:52 +0000 (Wed, 20 Apr 2016) Log Message: ----------- openssl1/branches/ips: create IPS recipe Modified Paths: -------------- csw/mgar/pkg/openssl1/branches/ips/Makefile Added Paths: ----------- csw/mgar/pkg/openssl1/branches/ips/ Modified: csw/mgar/pkg/openssl1/branches/ips/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2016-04-12 13:28:18 UTC (rev 25658) +++ csw/mgar/pkg/openssl1/branches/ips/Makefile 2016-04-20 06:09:52 UTC (rev 25674) @@ -31,6 +31,9 @@ GARCOMPILER = SOS12U4 GARCOMPILER_TYPE = $(if $(findstring GCC,$(GARCOMPILER)),GNU,SUN) +IPS_PACKAGE_PREFIX = library/security/ +IPS_VERSION = 1.0.2.5 + PACKAGES = CSWlibssl1-0-0 CSWlibssl-dev CSWopenssl-utils PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 solaris11-sparc solaris11-i386 @@ -38,10 +41,10 @@ RUNTIME_DEP_PKGS_CSWlibssl1-0-0 = $(RUNTIME_DEP_PKGS_CSWlibssl1-0-0_$(GARCOMPILER_TYPE)) RUNTIME_DEP_PKGS_CSWlibssl1-0-0_GNU = CSWlibgcc-s1 SPKG_DESC_CSWlibssl1-0-0 = Openssl 1.0 runtime libraries -PKGFILES_CSWlibssl1-0-0 = $(PKGFILES_RT) -PKGFILES_CSWlibssl1-0-0 += $(libdir)(/[^/]*)?/openssl-1.0.0/engines/.* -PKGFILES_CSWlibssl1-0-0 += $(prefix)/etc/ssl/private $(prefix)/etc/ssl/certs -PKGFILES_CSWlibssl1-0-0 += $(docdir)/libssl1_0_0/.* +# PKGFILES_CSWlibssl1-0-0 = $(PKGFILES_RT) +# PKGFILES_CSWlibssl1-0-0 += $(libdir)(/[^/]*)?/openssl-1.0.0/engines/.* +# PKGFILES_CSWlibssl1-0-0 += $(prefix)/etc/ssl/private $(prefix)/etc/ssl/certs +# PKGFILES_CSWlibssl1-0-0 += $(docdir)/libssl1_0_0/.* RUNTIME_DEP_PKGS_CSWlibssl-dev = CSWlibssl1-0-0 SPKG_DESC_CSWlibssl-dev = Openssl 1.0 development support files @@ -249,6 +252,11 @@ fi @$(MAKECOOKIE) +# pre-build: +# echo " ==> run 'gmake depend'" +# cd $(WORKSRC) && gmake depend +# @$(MAKECOOKIE) + pre-configure-modulated: echo " ==> Creating configure script" cd $(WORKSRC) && ln -nf Configure configure @@ -261,7 +269,7 @@ @$(MAKECOOKIE) install-conf-misc: - [ ! -f "$(PKGROOT)$(sysconfdir)/ssl/openssl.cnf" ] || \ + [ $(PKGFORMAT)="ips" -o ! -f "$(PKGROOT)$(sysconfdir)/ssl/openssl.cnf" ] || \ mv "$(PKGROOT)$(sysconfdir)/ssl/openssl.cnf" $(PKGROOT)$(sysconfdir)/ssl/openssl.cnf.CSW [ ! -d "$(PKGROOT)$(sysconfdir)/ssl/misc" ] || \ ( ginstall -d "$(PKGROOT)/$(prefix)/ssl/" && mv "$(PKGROOT)$(sysconfdir)/ssl/misc/" "$(PKGROOT)/$(prefix)/ssl/" ) @@ -276,7 +284,7 @@ post-merge-all: merge-doc install-conf-misc -NUM_CPUS := $(shell psrinfo | wc -l | awk '{ print $$1 }') +NUM_CPUS := $(shell /usr/sbin/psrinfo | wc -l | awk '{ print $$1 }') package-fast: PARALLELMODULATIONS=1 PARALLELMFLAGS="-j" $(MAKE) package This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Apr 20 09:51:33 2016 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 20 Apr 2016 07:51:33 +0000 Subject: SF.net SVN: gar:[25675] csw/mgar/pkg/emacs/trunk/Makefile Message-ID: <3qqYxc09wMzxM@mail.opencsw.org> Revision: 25675 http://sourceforge.net/p/gar/code/25675 Author: pfelecan Date: 2016-04-20 07:51:32 +0000 (Wed, 20 Apr 2016) Log Message: ----------- - actualized runtime dependencies - apply versioned overrides - fix e-lisp sources packages Modified Paths: -------------- csw/mgar/pkg/emacs/trunk/Makefile Modified: csw/mgar/pkg/emacs/trunk/Makefile =================================================================== --- csw/mgar/pkg/emacs/trunk/Makefile 2016-04-20 06:09:52 UTC (rev 25674) +++ csw/mgar/pkg/emacs/trunk/Makefile 2016-04-20 07:51:32 UTC (rev 25675) @@ -153,65 +153,65 @@ CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/eshell.info CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/mh-e.info CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/tramp.info -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/etc/NEWS.19 -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/etc/NEWS -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/etc/MH-E-NEWS -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/etc/NEWS.20 -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/etc/DOC-24.3.1 -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/etc/PROBLEMS -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/ldefs-boot.el -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/ffap.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/woman.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/find-file.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/man.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/info.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/loaddefs.el -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/ps-bdf.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/textmodes/ispell.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/play/dunnet.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/progmodes/idlwave.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/progmodes/ada-mode.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/progmodes/m4-mode.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/progmodes/idlw-help.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/mh-e/mh-e.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/gnus/gnus-setup.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/gnus/gnus-art.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/gnus/nnspool.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/gnus/mailcap.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/obsolete/complete.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/net/tramp-sh.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.3/lisp/net/tramp-loaddefs.el +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.5/etc/NEWS.19 +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.5/etc/NEWS +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.5/etc/MH-E-NEWS +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.5/etc/NEWS.20 +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.5/etc/DOC-24.5.1 +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.5/etc/PROBLEMS +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.5/lisp/ldefs-boot.el +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.5/lisp/ffap.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.5/lisp/woman.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.5/lisp/find-file.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.5/lisp/man.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.5/lisp/info.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.5/lisp/loaddefs.el +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.5/lisp/ps-bdf.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.5/lisp/textmodes/ispell.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.5/lisp/play/dunnet.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.5/lisp/progmodes/idlwave.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.5/lisp/progmodes/ada-mode.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.5/lisp/progmodes/m4-mode.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.5/lisp/progmodes/idlw-help.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.5/lisp/mh-e/mh-e.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.5/lisp/gnus/gnus-setup.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.5/lisp/gnus/gnus-art.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.5/lisp/gnus/nnspool.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.5/lisp/gnus/mailcap.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.5/lisp/obsolete/complete.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.5/lisp/net/tramp-sh.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/24.5/lisp/net/tramp-loaddefs.el CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/emacs.1 CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/info/dbus.info CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/info/elisp.info CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/info/eintr.info CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/info/emacs.info CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/info/efaq.info -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/etc/DOC-24.3.1 -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/etc/PROBLEMS -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/etc/compilation.txt -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/ldefs-boot.el -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/woman.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/printing.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/loaddefs.el -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/hfy-cmap.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/textmodes/ispell.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/international/eucjp-ms.el -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/international/mule-cmds.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/mh-e/mh-xface.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/mh-e/mh-alias.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/gnus/gnus-art.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/cedet/semantic/bovine/scm.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/term/x-win.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/org/org-odt.elc -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.3/lisp/org/org-version.el +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.5/etc/DOC-24.5.1 +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.5/etc/PROBLEMS +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.5/etc/compilation.txt +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.5/lisp/ldefs-boot.el +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.5/lisp/woman.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.5/lisp/printing.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.5/lisp/loaddefs.el +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.5/lisp/hfy-cmap.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.5/lisp/textmodes/ispell.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.5/lisp/international/eucjp-ms.el +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.5/lisp/international/mule-cmds.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.5/lisp/mh-e/mh-xface.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.5/lisp/mh-e/mh-alias.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.5/lisp/gnus/gnus-art.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.5/lisp/cedet/semantic/bovine/scm.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.5/lisp/term/x-win.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.5/lisp/org/org-odt.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/24.5/lisp/org/org-version.el PACKAGES += CSWemacs-el SPKG_DESC_CSWemacs-el = $(DESCRIPTION) - elisp sources CATALOGNAME_CSWemacs-el = emacs_el RUNTIME_DEP_PKGS_CSWemacs-el = CSWemacs-common CHECKPKG_OVERRIDES_CSWemacs-el += surplus-dependency|CSWemacs-common -PKGFILES_CSWemacs-el = /opt/csw/share/emacs/$(VERSION)/.*[.]el[.]gz +PKGFILES_CSWemacs-el = /opt/csw/share/emacs/$(VERSION)/.*[.]el ARCHALL_CSWemacs-el = 1 PACKAGES += CSWemacs-bin-common @@ -249,24 +249,26 @@ RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibgnutls28 RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibintl8 RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibjpeg7 RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibm17n-core0 RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibm17n-flt0 RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibotf-utils -RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibmagickcore6q16hdri1 -RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibmagickwand6q16hdri1 -RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibncurses5 -RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibmagickcore6q16hdri2 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibmagickwand6q16hdri2 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibncurses6 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibpng16-16 RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibrsvg2-2 RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibtiff5 RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibxft2 RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibxpm4 RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibxrender +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibz1 PKGFILES_CSWemacs-athena = /opt/csw/bin/emacs-athena PKGFILES_CSWemacs-athena += /opt/csw/bin/emacs-$(VERSION)-athena -CHECKPKG_OVERRIDES_CSWemacs-athena += file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-24.3-athena -CHECKPKG_OVERRIDES_CSWemacs-athena += file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-24.3-athena +CHECKPKG_OVERRIDES_CSWemacs-athena += file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-24.5-athena +CHECKPKG_OVERRIDES_CSWemacs-athena += file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-24.5-athena CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWemacs-common CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWfconfig @@ -288,24 +290,26 @@ RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibgnutls28 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibintl8 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibjpeg7 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibm17n-core0 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibm17n-flt0 -RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibmagickcore6q16hdri1 -RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibmagickwand6q16hdri1 -RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibmagickcore6q16hdri2 +RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibmagickwand6q16hdri2 +RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibncurses6 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibotf-utils -RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibpng15-15 +RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibpng16-16 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibrsvg2-2 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibtiff5 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibxft2 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibxpm4 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibxrender +RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibz1 PKGFILES_CSWemacs-gtk = /opt/csw/bin/emacs-gtk PKGFILES_CSWemacs-gtk += /opt/csw/bin/emacs-$(VERSION)-gtk -CHECKPKG_OVERRIDES_CSWemacs-gtk += file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-24.3-gtk -CHECKPKG_OVERRIDES_CSWemacs-gtk += file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-24.3-gtk +CHECKPKG_OVERRIDES_CSWemacs-gtk += file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-24.5-gtk +CHECKPKG_OVERRIDES_CSWemacs-gtk += file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-24.5-gtk CHECKPKG_OVERRIDES_CSWemacs-gtk += surplus-dependency|CSWemacs-common CHECKPKG_OVERRIDES_CSWemacs-gtk += surplus-dependency|CSWfconfig @@ -314,13 +318,18 @@ CATALOGNAME_CSWemacsnox = emacs_nox RUNTIME_DEP_PKGS_CSWemacs-nox = CSWemacs-bin-common RUNTIME_DEP_PKGS_CSWemacs-nox += CSWemacs-common +RUNTIME_DEP_PKGS_CSWemacs-nox += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWemacs-nox += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWemacs-nox += CSWlibgnutls28 -RUNTIME_DEP_PKGS_CSWemacs-nox += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWemacs-nox += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWemacs-nox += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWemacs-nox += CSWlibncurses6 RUNTIME_DEP_PKGS_CSWemacs-nox += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWemacs-nox += CSWlibz1 PKGFILES_CSWemacs-nox = /opt/csw/bin/emacs-nox PKGFILES_CSWemacs-nox += /opt/csw/bin/emacs-$(VERSION)-nox -CHECKPKG_OVERRIDES_CSWemacs-nox += file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-24.3-nox -CHECKPKG_OVERRIDES_CSWemacs-nox += file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-24.3-nox +CHECKPKG_OVERRIDES_CSWemacs-nox += file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-24.5-nox +CHECKPKG_OVERRIDES_CSWemacs-nox += file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-24.5-nox CHECKPKG_OVERRIDES_CSWemacs-nox += surplus-dependency|CSWemacs-common include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Wed Apr 20 12:32:24 2016 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Wed, 20 Apr 2016 10:32:24 +0000 Subject: SF.net SVN: gar:[25676] csw/mgar/pkg/samba/branches/samba4 Message-ID: <3qqdW5605sz1Fy@mail.opencsw.org> Revision: 25676 http://sourceforge.net/p/gar/code/25676 Author: janholzh Date: 2016-04-20 10:32:24 +0000 (Wed, 20 Apr 2016) Log Message: ----------- samba/branches/samba4: update to 4.4.2 Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba4/Makefile csw/mgar/pkg/samba/branches/samba4/checksums Added Paths: ----------- csw/mgar/pkg/samba/branches/samba4/files/0004-fix_clearenv.patch Modified: csw/mgar/pkg/samba/branches/samba4/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba4/Makefile 2016-04-20 07:51:32 UTC (rev 25675) +++ csw/mgar/pkg/samba/branches/samba4/Makefile 2016-04-20 10:32:24 UTC (rev 25676) @@ -1,5 +1,5 @@ NAME = samba -VERSION = 4.4.0 +VERSION = 4.4.2 GARTYPE = v2 DESCRIPTION = Tools to access a servers filespace and printers via SMB (server) @@ -72,6 +72,9 @@ #https://git.samba.org/?p=samba.git;a=patch;h=5134d29cbb2edcc2326de8896c5465afb3a0f392 #PATCHFILES +=idmap_fix +#from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=208767 +PATCHFILES += 0004-fix_clearenv.patch + NOGITPATCH += 1 # Filesystem layout @@ -139,6 +142,7 @@ #RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibssp0 +RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibncurses6 RUNTIME_DEP_PKGS_CSWsamba4 += $(RUNTIME_DEP_PKGS_CSWsamba4_$(GAROSREL)) # Silence conflicts with CSWsamba CHECKPKG_OVERRIDES_CSWsamba4 += file-collision @@ -172,10 +176,10 @@ PKGFILES_CSWsamba4-client += $(foreach C,$(SMB_CLIENT_BINS),$(call baseisadirs,$(mandir),man1/$C\.1)) RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWsamba4-libs -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibform5 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibform6 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibncurses6 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibssp0 -RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibpanel5 +RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibpanel6 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibpopt0 RUNTIME_DEP_PKGS_CSWsamba4-client_5.11 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWsamba4-client_sparc_5.10 += CSWlibintl8 @@ -441,6 +445,7 @@ CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links_5.11 += surplus-dependency|CSWsamba4-winbind CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links_5.11 += surplus-dependency|CSWsamba4 CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += $(CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links_$(GAROSREL)) +CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += surplus-dependency|CSWsamba4 Modified: csw/mgar/pkg/samba/branches/samba4/checksums =================================================================== --- csw/mgar/pkg/samba/branches/samba4/checksums 2016-04-20 07:51:32 UTC (rev 25675) +++ csw/mgar/pkg/samba/branches/samba4/checksums 2016-04-20 10:32:24 UTC (rev 25676) @@ -1 +1 @@ -e42b884d0e07528c8571641a4df40666 samba-4.4.0.tar.gz +03a65a3adf08ceb1636ad59d234d7f9d samba-4.4.2.tar.gz Added: csw/mgar/pkg/samba/branches/samba4/files/0004-fix_clearenv.patch =================================================================== --- csw/mgar/pkg/samba/branches/samba4/files/0004-fix_clearenv.patch (rev 0) +++ csw/mgar/pkg/samba/branches/samba4/files/0004-fix_clearenv.patch 2016-04-20 10:32:24 UTC (rev 25676) @@ -0,0 +1,25 @@ +From 23a6c34de123f819a50036ab4cd4c40fdf238903 Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter +Date: Tue, 19 Apr 2016 14:39:10 +0200 +Subject: [PATCH] fix_clearenv + +--- + source3/client/smbspool_krb5_wrapper.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/source3/client/smbspool_krb5_wrapper.c b/source3/client/smbspool_krb5_wrapper.c +index e19fd92..0310bfb 100644 +--- a/source3/client/smbspool_krb5_wrapper.c ++++ b/source3/client/smbspool_krb5_wrapper.c +@@ -195,7 +195,7 @@ int main(int argc, char *argv[]) + * Make sure we do not have LD_PRELOAD or other security relevant + * environment variables set. + */ +- clearenv(); ++ environ[0] = NULL; + + CUPS_SMB_DEBUG("Setting KRB5CCNAME to '%s'", gen_cc); + setenv("KRB5CCNAME", gen_cc, 1); +-- +2.4.0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Apr 20 13:44:28 2016 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 20 Apr 2016 11:44:28 +0000 Subject: SF.net SVN: gar:[25677] csw/mgar/pkg/emacs/trunk/Makefile Message-ID: <3qqg654zRRz1Vm@mail.opencsw.org> Revision: 25677 http://sourceforge.net/p/gar/code/25677 Author: pfelecan Date: 2016-04-20 11:44:28 +0000 (Wed, 20 Apr 2016) Log Message: ----------- remove runtime dependency on old fontconfig package Modified Paths: -------------- csw/mgar/pkg/emacs/trunk/Makefile Modified: csw/mgar/pkg/emacs/trunk/Makefile =================================================================== --- csw/mgar/pkg/emacs/trunk/Makefile 2016-04-20 10:32:24 UTC (rev 25676) +++ csw/mgar/pkg/emacs/trunk/Makefile 2016-04-20 11:44:28 UTC (rev 25677) @@ -240,7 +240,6 @@ CATALOGNAME_CSWemacs-athena = emacs_athena RUNTIME_DEP_PKGS_CSWemacs-athena = CSWemacs-bin-common RUNTIME_DEP_PKGS_CSWemacs-athena += CSWemacs-common -RUNTIME_DEP_PKGS_CSWemacs-athena += CSWfconfig RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibfontconfig1 RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibgdk-pixbuf2-0-0 @@ -270,14 +269,12 @@ CHECKPKG_OVERRIDES_CSWemacs-athena += file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-24.5-athena CHECKPKG_OVERRIDES_CSWemacs-athena += file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-24.5-athena CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWemacs-common -CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWfconfig PACKAGES += CSWemacs-gtk SPKG_DESC_CSWemacs-gtk = $(DESCRIPTION) - based on the GTK toolkit CATALOGNAME_CSWemacs-gtk = emacs_gtk RUNTIME_DEP_PKGS_CSWemacs-gtk = CSWemacs-bin-common RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWemacs-common -RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWfconfig RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibdbus1-3 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibfontconfig1 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibfreetype6 @@ -311,7 +308,6 @@ CHECKPKG_OVERRIDES_CSWemacs-gtk += file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-24.5-gtk CHECKPKG_OVERRIDES_CSWemacs-gtk += file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-24.5-gtk CHECKPKG_OVERRIDES_CSWemacs-gtk += surplus-dependency|CSWemacs-common -CHECKPKG_OVERRIDES_CSWemacs-gtk += surplus-dependency|CSWfconfig PACKAGES += CSWemacs-nox SPKG_DESC_CSWemacs-nox = $(DESCRIPTION) - without any XWindows dependencies This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Apr 20 14:30:53 2016 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 20 Apr 2016 12:30:53 +0000 Subject: SF.net SVN: gar:[25678] csw/mgar/pkg/emacs/trunk/Makefile Message-ID: <3qqh7m5KL7z2L@mail.opencsw.org> Revision: 25678 http://sourceforge.net/p/gar/code/25678 Author: pfelecan Date: 2016-04-20 12:30:53 +0000 (Wed, 20 Apr 2016) Log Message: ----------- add overrides for libintl which, eventhough not used the configuration forces linking with it. Modified Paths: -------------- csw/mgar/pkg/emacs/trunk/Makefile Modified: csw/mgar/pkg/emacs/trunk/Makefile =================================================================== --- csw/mgar/pkg/emacs/trunk/Makefile 2016-04-20 11:44:28 UTC (rev 25677) +++ csw/mgar/pkg/emacs/trunk/Makefile 2016-04-20 12:30:53 UTC (rev 25678) @@ -210,7 +210,6 @@ SPKG_DESC_CSWemacs-el = $(DESCRIPTION) - elisp sources CATALOGNAME_CSWemacs-el = emacs_el RUNTIME_DEP_PKGS_CSWemacs-el = CSWemacs-common -CHECKPKG_OVERRIDES_CSWemacs-el += surplus-dependency|CSWemacs-common PKGFILES_CSWemacs-el = /opt/csw/share/emacs/$(VERSION)/.*[.]el ARCHALL_CSWemacs-el = 1 @@ -268,7 +267,8 @@ PKGFILES_CSWemacs-athena += /opt/csw/bin/emacs-$(VERSION)-athena CHECKPKG_OVERRIDES_CSWemacs-athena += file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-24.5-athena CHECKPKG_OVERRIDES_CSWemacs-athena += file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-24.5-athena -CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWemacs-common +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWemacs-common +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibintl8 PACKAGES += CSWemacs-gtk SPKG_DESC_CSWemacs-gtk = $(DESCRIPTION) - based on the GTK toolkit @@ -307,7 +307,8 @@ PKGFILES_CSWemacs-gtk += /opt/csw/bin/emacs-$(VERSION)-gtk CHECKPKG_OVERRIDES_CSWemacs-gtk += file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-24.5-gtk CHECKPKG_OVERRIDES_CSWemacs-gtk += file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-24.5-gtk -CHECKPKG_OVERRIDES_CSWemacs-gtk += surplus-dependency|CSWemacs-common +CHECKPKG_OVERRIDES_CSWemacs-gtk += surplus-dependency|CSWemacs-common +CHECKPKG_OVERRIDES_CSWemacs-gtk += surplus-dependency|CSWlibintl8 PACKAGES += CSWemacs-nox SPKG_DESC_CSWemacs-nox = $(DESCRIPTION) - without any XWindows dependencies @@ -327,6 +328,7 @@ CHECKPKG_OVERRIDES_CSWemacs-nox += file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-24.5-nox CHECKPKG_OVERRIDES_CSWemacs-nox += file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-24.5-nox CHECKPKG_OVERRIDES_CSWemacs-nox += surplus-dependency|CSWemacs-common +CHECKPKG_OVERRIDES_CSWemacs-nox += surplus-dependency|CSWlibintl8 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Apr 22 13:21:32 2016 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 22 Apr 2016 11:21:32 +0000 Subject: SF.net SVN: gar:[25679] csw/mgar/pkg/emacs/trunk/Notes.org Message-ID: <3qrtVp5S2Xzn9@mail.opencsw.org> Revision: 25679 http://sourceforge.net/p/gar/code/25679 Author: pfelecan Date: 2016-04-22 11:21:31 +0000 (Fri, 22 Apr 2016) Log Message: ----------- initial controlled version Added Paths: ----------- csw/mgar/pkg/emacs/trunk/Notes.org Added: csw/mgar/pkg/emacs/trunk/Notes.org =================================================================== --- csw/mgar/pkg/emacs/trunk/Notes.org (rev 0) +++ csw/mgar/pkg/emacs/trunk/Notes.org 2016-04-22 11:21:31 UTC (rev 25679) @@ -0,0 +1,12 @@ +* $Id$ +* 24.5 +** TODO some e-lisp not compiled + there are some e-lisp files which are not compiled and for which we + need to install the emacs_el package +** TODO tramp mode + the default scp, and ssh, internal methods, does not work; we must + uses scpx and sshx internal methods which work flawlessly. +* Local Variables +Local Variables: +mode: org +End: Property changes on: csw/mgar/pkg/emacs/trunk/Notes.org ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Author Date HeadURL Id Revision \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sat Apr 23 20:58:13 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sat, 23 Apr 2016 18:58:13 +0000 Subject: SF.net SVN: gar:[25680] csw/mgar/pkg/squid/trunk Message-ID: <3qshbG1Ds5z19f@mail.opencsw.org> Revision: 25680 http://sourceforge.net/p/gar/code/25680 Author: dmichelsen Date: 2016-04-23 18:58:13 +0000 (Sat, 23 Apr 2016) Log Message: ----------- squid/trunk: Update to 3.5.17 Modified Paths: -------------- csw/mgar/pkg/squid/trunk/Makefile csw/mgar/pkg/squid/trunk/checksums Modified: csw/mgar/pkg/squid/trunk/Makefile =================================================================== --- csw/mgar/pkg/squid/trunk/Makefile 2016-04-22 11:21:31 UTC (rev 25679) +++ csw/mgar/pkg/squid/trunk/Makefile 2016-04-23 18:58:13 UTC (rev 25680) @@ -2,7 +2,7 @@ # $Id$ # NAME = squid -VERSION = 3.5.16 +VERSION = 3.5.17 GARTYPE = v2 DESCRIPTION = High performance Web proxy cache Modified: csw/mgar/pkg/squid/trunk/checksums =================================================================== --- csw/mgar/pkg/squid/trunk/checksums 2016-04-22 11:21:31 UTC (rev 25679) +++ csw/mgar/pkg/squid/trunk/checksums 2016-04-23 18:58:13 UTC (rev 25680) @@ -1 +1 @@ -ab9c92f4a579e056cd8afafa0a95f612 squid-3.5.16.tar.bz2 +229ad68a5af2c46aa85e55bde8519847 squid-3.5.17.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Apr 25 09:28:41 2016 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 25 Apr 2016 07:28:41 +0000 Subject: SF.net SVN: gar:[25681] csw/mgar/pkg/zabbix/trunk Message-ID: <3qtdBl1xgsz52@mail.opencsw.org> Revision: 25681 http://sourceforge.net/p/gar/code/25681 Author: janholzh Date: 2016-04-25 07:28:41 +0000 (Mon, 25 Apr 2016) Log Message: ----------- zabbix/trunk: update to 3.0.2 Modified Paths: -------------- csw/mgar/pkg/zabbix/trunk/Makefile csw/mgar/pkg/zabbix/trunk/checksums Modified: csw/mgar/pkg/zabbix/trunk/Makefile =================================================================== --- csw/mgar/pkg/zabbix/trunk/Makefile 2016-04-23 18:58:13 UTC (rev 25680) +++ csw/mgar/pkg/zabbix/trunk/Makefile 2016-04-25 07:28:41 UTC (rev 25681) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = zabbix -VERSION = 3.0.0 +VERSION = 3.0.2 GARTYPE = v2 DESCRIPTION = Zabbix monitoring system Modified: csw/mgar/pkg/zabbix/trunk/checksums =================================================================== --- csw/mgar/pkg/zabbix/trunk/checksums 2016-04-23 18:58:13 UTC (rev 25680) +++ csw/mgar/pkg/zabbix/trunk/checksums 2016-04-25 07:28:41 UTC (rev 25681) @@ -1 +1 @@ -fd4032444711ebb45e92b4cd54a354c6 zabbix-3.0.0.tar.gz +9b16ba5a69cb1c0be78d65feda61af47 zabbix-3.0.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Apr 25 10:26:43 2016 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 25 Apr 2016 08:26:43 +0000 Subject: SF.net SVN: gar:[25682] csw/mgar/pkg/samba/branches/samba4/Makefile Message-ID: <3qtfTb11D2z8Z@mail.opencsw.org> Revision: 25682 http://sourceforge.net/p/gar/code/25682 Author: janholzh Date: 2016-04-25 08:26:43 +0000 (Mon, 25 Apr 2016) Log Message: ----------- samba/branches/samba4: fix packaging Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba4/Makefile Modified: csw/mgar/pkg/samba/branches/samba4/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba4/Makefile 2016-04-25 07:28:41 UTC (rev 25681) +++ csw/mgar/pkg/samba/branches/samba4/Makefile 2016-04-25 08:26:43 UTC (rev 25682) @@ -266,7 +266,7 @@ RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibpython2-7-1-0 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibcups2 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibpytalloc-util2 +#RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibpytalloc-util2 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibgnutls28 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibpopt0 @@ -549,7 +549,7 @@ ginstall $(WORKDIR)/cswsamba $(DESTDIR)/etc/opt/csw/init.d/cswsamba4 ginstall $(WORKDIR)/cswwinbind $(DESTDIR)/etc/opt/csw/init.d/cswwinbind4 ginstall -d $(DESTDIR)/etc/opt/csw/samba - ginstall $(WORKDIR)/smb.conf $(DESTDIR)/etc/opt/csw/samba/smb.conf + ginstall $(WORKDIR)/smb.conf $(DESTDIR)/etc/opt/csw/samba/smb.conf.CSW ginstall -d $(DESTDIR)/etc/opt/csw/openldap/schema ginstall $(WORKSRC)/examples/LDAP/samba.schema $(DESTDIR)/etc/opt/csw/openldap/schema # This bit is to install the symlinks to use the NSS modules with the This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon Apr 25 11:31:50 2016 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 25 Apr 2016 09:31:50 +0000 Subject: SF.net SVN: gar:[25683] csw/mgar/pkg/git/branches Message-ID: <3qtgwn3wq3zCm@mail.opencsw.org> Revision: 25683 http://sourceforge.net/p/gar/code/25683 Author: cgrzemba Date: 2016-04-25 09:31:50 +0000 (Mon, 25 Apr 2016) Log Message: ----------- git/branches/ips: create IPS recipe Modified Paths: -------------- csw/mgar/pkg/git/branches/ips/Makefile csw/mgar/pkg/git/branches/ips/checksums csw/mgar/pkg/git/branches/ips/files/0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch Added Paths: ----------- csw/mgar/pkg/git/branches/ips/ Modified: csw/mgar/pkg/git/branches/ips/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2016-04-20 06:09:52 UTC (rev 25674) +++ csw/mgar/pkg/git/branches/ips/Makefile 2016-04-25 09:31:50 UTC (rev 25683) @@ -1,5 +1,5 @@ NAME = git -VERSION = 2.7.1 +VERSION = 2.7.4 #PATCHLEVEL = rc4 DISTNAME = $(NAME)-$(VERSION) GARTYPE = v2 @@ -19,6 +19,8 @@ # TEST_SCRIPTS = TEST_TARGET = test +IPS_PACKAGE_PREFIX = /developer/versioning/ + PACKAGES = CSWgit CSWgitk CSWgit-gui CSWgit-svn CSWgit-cvs PACKAGES += CSWgit-emacs CSWgit-doc CSWgit-completion CSWgit-dev @@ -40,11 +42,11 @@ ARCHALL_CSWgit-doc = 1 ARCHALL_CSWgit-completion = 1 -BUILD_DEP_PKGS = CSWasciidoc CSWlibssl-dev CSWxmlto CSWbash CSWlibcurl-dev -BUILD_DEP_PKGS += CSWgsed CSWperl CSWtk CSWexpat -BUILD_DEP_PKGS += CSWzlib CSWpmerror CSWpmsvn CSWcvs CSWemacs -BUILD_DEP_PKGS += CSWpython -BUILD_DEP_PKGS += CSWlibiconv-dev +# BUILD_DEP_PKGS = CSWasciidoc CSWlibssl-dev CSWxmlto CSWbash CSWlibcurl-dev +# BUILD_DEP_PKGS += CSWgsed CSWperl CSWtk CSWexpat +# BUILD_DEP_PKGS += CSWzlib CSWpmerror CSWpmsvn CSWcvs CSWemacs +# BUILD_DEP_PKGS += CSWpython +# BUILD_DEP_PKGS += CSWlibiconv-dev RUNTIME_DEP_PKGS_CSWgit = CSWlibz1 CSWperl CSWrsync CSWlibcurl4 RUNTIME_DEP_PKGS_CSWgit += CSWopenssh-client CSWlibiconv2 CSWlibexpat1 @@ -128,7 +130,8 @@ #set bashconfdir to sysconfdir when bash changes bashconfdir = /opt/csw/etc/ -CONFIGURE_ARGS = $(DIRPATHS) --with-shell=$(bindir)/bash +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-shell=$(bindir)/bash CONFIGURE_ARGS += --with-perl=$(bindir)/perl CONFIGURE_ARGS += --with-tcltk=$(bindir)/wish CONFIGURE_ARGS += --with-zlib=$(prefix) Modified: csw/mgar/pkg/git/branches/ips/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2016-04-20 06:09:52 UTC (rev 25674) +++ csw/mgar/pkg/git/branches/ips/checksums 2016-04-25 09:31:50 UTC (rev 25683) @@ -1 +1 @@ -846ac45a1638e9a6ff3a9b790f6c8d99 git-2.7.1.tar.gz +c64012d491e24c7d65cd389f75383d91 git-2.7.4.tar.gz Modified: csw/mgar/pkg/git/branches/ips/files/0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch 2016-04-20 06:09:52 UTC (rev 25674) +++ csw/mgar/pkg/git/branches/ips/files/0002-Alter-the-value-of-_PATH_DEFPATH-when-paths.h-not-pr.patch 2016-04-25 09:31:50 UTC (rev 25683) @@ -14,10 +14,10 @@ 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/git-compat-util.h b/git-compat-util.h -index 2af8d3e..762f620 100644 +index c07e0c1..fca7ce0 100644 --- a/git-compat-util.h +++ b/git-compat-util.h -@@ -184,7 +184,7 @@ extern char *gitbasename(char *); +@@ -330,7 +330,7 @@ extern char *gitdirname(char *); #include #endif #ifndef _PATH_DEFPATH @@ -25,7 +25,7 @@ +#define _PATH_DEFPATH "/opt/csw/bin:/usr/bin:/bin" #endif - #ifndef STRIP_EXTENSION + #ifndef has_dos_drive_prefix -- 1.7.3 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Apr 25 14:44:13 2016 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 25 Apr 2016 12:44:13 +0000 Subject: SF.net SVN: gar:[25684] csw/mgar/pkg/samba/branches/samba4/Makefile Message-ID: <3qtmBh2C8FzJ1@mail.opencsw.org> Revision: 25684 http://sourceforge.net/p/gar/code/25684 Author: janholzh Date: 2016-04-25 12:44:12 +0000 (Mon, 25 Apr 2016) Log Message: ----------- samba/branches/samba4: add ntvfs-fileserver back Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba4/Makefile Modified: csw/mgar/pkg/samba/branches/samba4/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba4/Makefile 2016-04-25 09:31:50 UTC (rev 25683) +++ csw/mgar/pkg/samba/branches/samba4/Makefile 2016-04-25 12:44:12 UTC (rev 25684) @@ -485,6 +485,7 @@ CONFIGURE_ARGS += --with-ldap CONFIGURE_ARGS += --with-automount CONFIGURE_ARGS += --enable-cups +CONFIGURE_ARGS += --with-ntvfs-fileserver CONFIGURE_ARGS += --with-privatedir=$(SMBPRIVATEDIR) CONFIGURE_ARGS += --with-configdir=$(SMBCONFIGDIR) CONFIGURE_ARGS += --with-lockdir=$(SMBLOCKDIR) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From jake_goerzen at users.sourceforge.net Wed Apr 27 17:13:54 2016 From: jake_goerzen at users.sourceforge.net (jake_goerzen at users.sourceforge.net) Date: Wed, 27 Apr 2016 15:13:54 +0000 Subject: SF.net SVN: gar:[25685] csw/mgar/pkg/dovecot/trunk Message-ID: <3qx5LN6TM8z11F@mail.opencsw.org> Revision: 25685 http://sourceforge.net/p/gar/code/25685 Author: jake_goerzen Date: 2016-04-27 15:13:53 +0000 (Wed, 27 Apr 2016) Log Message: ----------- dovecot: update to version 2.2.24 Modified Paths: -------------- csw/mgar/pkg/dovecot/trunk/Makefile csw/mgar/pkg/dovecot/trunk/checksums Modified: csw/mgar/pkg/dovecot/trunk/Makefile =================================================================== --- csw/mgar/pkg/dovecot/trunk/Makefile 2016-04-25 12:44:12 UTC (rev 25684) +++ csw/mgar/pkg/dovecot/trunk/Makefile 2016-04-27 15:13:53 UTC (rev 25685) @@ -2,7 +2,7 @@ # - SSL certs to /etc/opt/csw/ssl? # - /var/run/dovecot instead of /var/opt/csw/run? NAME = dovecot -VERSION = 2.2.23 +VERSION = 2.2.24 GARTYPE = v2 DESCRIPTION = Secure IMAP server Modified: csw/mgar/pkg/dovecot/trunk/checksums =================================================================== --- csw/mgar/pkg/dovecot/trunk/checksums 2016-04-25 12:44:12 UTC (rev 25684) +++ csw/mgar/pkg/dovecot/trunk/checksums 2016-04-27 15:13:53 UTC (rev 25685) @@ -1 +1 @@ -0d2855c19b0603b417cd70613b4a9f36 dovecot-2.2.23.tar.gz +91576b3411b436234ca5f63e1bbab60d dovecot-2.2.24.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Apr 29 15:40:01 2016 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 29 Apr 2016 13:40:01 +0000 Subject: SF.net SVN: gar:[25686] csw/mgar/pkg/bind/trunk Message-ID: <3qxFFJ2NDfz1N5@mail.opencsw.org> Revision: 25686 http://sourceforge.net/p/gar/code/25686 Author: bonivart Date: 2016-04-29 13:40:01 +0000 (Fri, 29 Apr 2016) Log Message: ----------- bind/trunk: update to 9.10.4 Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile csw/mgar/pkg/bind/trunk/checksums Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2016-04-27 15:13:53 UTC (rev 25685) +++ csw/mgar/pkg/bind/trunk/Makefile 2016-04-29 13:40:01 UTC (rev 25686) @@ -3,27 +3,27 @@ # dlz extensions problematic, remove source: /bin/tests/system, rm -rf dlzexternal NAME = bind -VERSION = 9.10.3 +VERSION = 9.10.4 GARTYPE = v2 # Enable these for Px-releases -RELEASE = P4 -DISTVERSION = $(VERSION)-$(RELEASE) -SPKG_VERSION = $(VERSION)$(RELEASE) -DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) -WORKSRC = $(WORKDIR)/$(DISTNAME) +#RELEASE = P4 +#DISTVERSION = $(VERSION)-$(RELEASE) +#SPKG_VERSION = $(VERSION)$(RELEASE) +#DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) +#WORKSRC = $(WORKDIR)/$(DISTNAME) DESCRIPTION = ISC BIND DNS reference implementation define BLURB endef # Enable these for Px-releases -MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)-$(RELEASE)/ -DISTFILES = $(DISTNAME).tar.gz +#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)-$(RELEASE)/ +#DISTFILES = $(DISTNAME).tar.gz # Disable these for Px-releases -#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)/ -#DISTFILES = $(NAME)-$(VERSION).tar.gz +MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)/ +DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += CSWbindchroot.postinstall @@ -121,14 +121,14 @@ CHECKPKG_OVERRIDES_CSWbindchroot += catalogname-does-not-match-pkgname|pkgname=CSWbindchroot|catalogname=bind_chroot|expected-catalogname=bindchroot # Will not split out all these libs -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libbind9.so.140.0.10|soname=libbind9.so.140|pkgname=CSWlibbind|expected=CSWlibbind9-140 CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libirs.so.141.0.4|soname=libirs.so.141|pkgname=CSWlibbind|expected=CSWlibirs141 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisc.so.160.0.0|soname=libisc.so.160|pkgname=CSWlibbind|expected=CSWlibisc160 -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccfg.so.140.3.0|soname=libisccfg.so.140|pkgname=CSWlibbind|expected=CSWlibisccfg140 CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/liblwres.so.141.0.3|soname=liblwres.so.141|pkgname=CSWlibbind|expected=CSWliblwres141 CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccc.so.140.0.4|soname=libisccc.so.140|pkgname=CSWlibbind|expected=CSWlibisccc140 CHECKPKG_OVERRIDES_CSWlibbind += pkginfo-opencsw-repository-uncommitted -CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdns.so.162.1.3|soname=libdns.so.162|pkgname=CSWlibbind|expected=CSWlibdns162 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libbind9.so.140.0.11|soname=libbind9.so.140|pkgname=CSWlibbind|expected=CSWlibbind9-140 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libdns.so.164.0.3|soname=libdns.so.164|pkgname=CSWlibbind|expected=CSWlibdns164 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisc.so.160.1.1|soname=libisc.so.160|pkgname=CSWlibbind|expected=CSWlibisc160 +CHECKPKG_OVERRIDES_CSWlibbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libisccfg.so.140.3.1|soname=libisccfg.so.140|pkgname=CSWlibbind|expected=CSWlibisccfg140 # Some new checks, have no idea about their relevance CHECKPKG_OVERRIDES_CSWlibbind += no-direct-binding Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2016-04-27 15:13:53 UTC (rev 25685) +++ csw/mgar/pkg/bind/trunk/checksums 2016-04-29 13:40:01 UTC (rev 25686) @@ -1 +1 @@ -173ce5e83e9ba31f8368367ee1ff7807 bind-9.10.3-P4.tar.gz +f2167f42e6f1baad42c637d8771c9675 bind-9.10.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Apr 29 15:57:04 2016 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 29 Apr 2016 13:57:04 +0000 Subject: SF.net SVN: gar:[25687] csw/mgar/pkg/msmtp/trunk Message-ID: <3qxFcv5K4Rz1QW@mail.opencsw.org> Revision: 25687 http://sourceforge.net/p/gar/code/25687 Author: dmichelsen Date: 2016-04-29 13:57:03 +0000 (Fri, 29 Apr 2016) Log Message: ----------- msmtp/trunk: Update to 1.6.4 Modified Paths: -------------- csw/mgar/pkg/msmtp/trunk/Makefile csw/mgar/pkg/msmtp/trunk/checksums Modified: csw/mgar/pkg/msmtp/trunk/Makefile =================================================================== --- csw/mgar/pkg/msmtp/trunk/Makefile 2016-04-29 13:40:01 UTC (rev 25686) +++ csw/mgar/pkg/msmtp/trunk/Makefile 2016-04-29 13:57:03 UTC (rev 25687) @@ -1,5 +1,5 @@ NAME = msmtp -VERSION = 1.4.31 +VERSION = 1.6.4 GARTYPE = v2 DESCRIPTION = SMTP client @@ -23,7 +23,7 @@ endef MASTER_SITES = $(SF_MIRRORS) -DISTFILES = $(NAME)-$(VERSION).tar.bz2 +DISTFILES = $(DISTNAME).tar.xz # New glib2 is only available for Solaris 10 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 Modified: csw/mgar/pkg/msmtp/trunk/checksums =================================================================== --- csw/mgar/pkg/msmtp/trunk/checksums 2016-04-29 13:40:01 UTC (rev 25686) +++ csw/mgar/pkg/msmtp/trunk/checksums 2016-04-29 13:57:03 UTC (rev 25687) @@ -1 +1 @@ -792ac0ffa30dc95ea1889a548128186d msmtp-1.4.31.tar.bz2 +aa829b5e9faeca5139f7983e6637f0d6 msmtp-1.6.4.tar.xz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.