--- a/components/samba/Makefile Tue Apr 05 20:57:21 2016 -0700
+++ b/components/samba/Makefile Wed Apr 06 02:23:05 2016 -0700
@@ -38,9 +38,9 @@
endif
COMPONENT_NAME= samba
-COMPONENT_VERSION= 4.1.22
-TPNO= 26541
-COMPONENT_ARCHIVE_HASH= sha256:5563a1c94a2dac837ccffd1f0821bb25e097affaa7389fef186f9cfb3486cfe5
+COMPONENT_VERSION= 4.1.23
+TPNO= 27625
+COMPONENT_ARCHIVE_HASH= sha256:2c33291bf5454ba05e8b5fdc2c57ee010cf44d077e57a307ad2e7be9fac27cd2
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_PROJECT_URL= http://www.samba.org/
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
--- a/components/samba/samba.license Tue Apr 05 20:57:21 2016 -0700
+++ b/components/samba/samba.license Wed Apr 06 02:23:05 2016 -0700
@@ -1,8 +1,7 @@
-
- GNU GENERAL PUBLIC LICENSE
+ GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
- Copyright (C) 2007 Free Software Foundation, Inc. http://fsf.org/.
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -269,7 +268,7 @@
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and non-commercially, and
+ alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
@@ -632,8 +631,8 @@
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
-
- Copyright (C)
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -646,14 +645,14 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program. If not, see http://www.gnu.org/licenses/.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
- Copyright (C)
+ <program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
@@ -665,13 +664,12 @@
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
-http://www.gnu.org/licenses/.
+<http://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
-http://www.gnu.org/philosophy/why-not-lgpl.html.
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-
--- a/components/samba/samba.p5m.common Tue Apr 05 20:57:21 2016 -0700
+++ b/components/samba/samba.p5m.common Wed Apr 06 02:23:05 2016 -0700
@@ -38,9 +38,6 @@
<transform dir path=var$ -> drop>
<transform dir path=var/lib$ -> drop>
-# Unit test suite testtools is now the python package
-<transform file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools.* -> drop>
-
# Samba customized krb5-config
<transform file path=usr/bin/krb5-config -> drop>
--- a/components/samba/samba.proto-objects Tue Apr 05 20:57:21 2016 -0700
+++ b/components/samba/samba.proto-objects Wed Apr 06 02:23:05 2016 -0700
@@ -226,125 +226,6 @@
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/test_test_protocol.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/test_test_results.py
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/subunit/tests/test_test_results.pyc
-dir path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/__init__.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/__init__.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/_compat2x.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/_compat2x.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/_compat3x.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/_compat3x.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/_spinner.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/_spinner.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/compat.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/compat.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/content.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/content.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/content_type.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/content_type.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/deferredruntest.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/deferredruntest.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/distutilscmd.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/distutilscmd.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/helpers.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/helpers.pyc
-dir path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/matchers
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/matchers/__init__.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/matchers/__init__.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/matchers/_basic.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/matchers/_basic.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/matchers/_datastructures.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/matchers/_datastructures.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/matchers/_dict.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/matchers/_dict.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/matchers/_doctest.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/matchers/_doctest.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/matchers/_exception.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/matchers/_exception.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/matchers/_filesystem.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/matchers/_filesystem.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/matchers/_higherorder.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/matchers/_higherorder.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/matchers/_impl.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/matchers/_impl.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/monkey.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/monkey.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/run.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/run.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/runtest.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/runtest.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tags.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tags.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/testcase.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/testcase.pyc
-dir path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/testresult
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/testresult/__init__.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/testresult/__init__.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/testresult/doubles.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/testresult/doubles.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/testresult/real.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/testresult/real.pyc
-dir path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/__init__.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/__init__.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/helpers.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/helpers.pyc
-dir path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/matchers
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/matchers/__init__.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/matchers/__init__.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/matchers/helpers.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/matchers/helpers.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/matchers/test_basic.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/matchers/test_basic.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/matchers/test_datastructures.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/matchers/test_datastructures.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/matchers/test_dict.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/matchers/test_dict.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/matchers/test_doctest.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/matchers/test_doctest.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/matchers/test_exception.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/matchers/test_exception.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/matchers/test_filesystem.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/matchers/test_filesystem.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/matchers/test_higherorder.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/matchers/test_higherorder.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/matchers/test_impl.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/matchers/test_impl.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_compat.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_compat.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_content.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_content.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_content_type.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_content_type.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_deferredruntest.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_deferredruntest.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_distutilscmd.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_distutilscmd.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_fixturesupport.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_fixturesupport.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_helpers.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_helpers.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_monkey.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_monkey.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_run.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_run.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_runtest.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_runtest.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_spinner.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_spinner.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_tags.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_tags.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_testcase.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_testcase.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_testresult.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_testresult.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_testsuite.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_testsuite.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_with_with.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/tests/test_with_with.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/testsuite.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/testsuite.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/utils.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/external/testtools/utils.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/gensec.so
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/getopt.py
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/getopt.pyc
@@ -492,8 +373,8 @@
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/dsdb.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/gensec.py
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/gensec.pyc
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/getopt.py
-file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/getopt.pyc
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/get_opt.py
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/get_opt.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/hostconfig.py
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/hostconfig.pyc
file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/libsmb_samba_internal.py