Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
25296601 Upgrade Samba to 4.4.8
authorJiri Sasek <Jiri.Sasek@Oracle.COM>
Wed, 21 Dec 2016 12:22:29 -0800
changeset 7519 f5b504a5dd36
parent 7518 c388d4e1d3ad
child 7520 7b33249790c8
25296601 Upgrade Samba to 4.4.8 25298063 problem in UTILITY/SAMBA
components/samba/Makefile file | annotate | diff | comparison | revisions
components/samba/samba.proto-objects file | annotate | diff | comparison | revisions 
--- a/components/samba/Makefile	Tue Dec 20 11:59:29 2016 -0800
+++ b/components/samba/Makefile	Wed Dec 21 12:22:29 2016 -0800
@@ -41,9 +41,9 @@
 export PARFAIT_BUILD=no
 
 COMPONENT_NAME=		samba
-COMPONENT_VERSION=	4.4.5
-TPNO=			30123
-COMPONENT_ARCHIVE_HASH= sha256:b876ef2e63f66265490e80a122e66ef2d7616112b839df68f56ac2e1ce17a7bd
+COMPONENT_VERSION=	4.4.8
+TPNO=			33007
+COMPONENT_ARCHIVE_HASH= sha256:0e54de8a22b77f9712578029639331b51f818b70e194766c98475a5b99470fbf
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://www.samba.org/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
@@ -92,6 +92,10 @@
 CPPFLAGS +=	$(CPP_XPG6MODE)
 CPPFLAGS +=	-I/usr/include/openldap
 
+# MIT kerberos uses different enctype defs.
+CPPFLAGS += -DCKSUMTYPE_HMAC_SHA1_96_AES_128=CKSUMTYPE_HMAC_SHA1_96_AES128
+CPPFLAGS += -DCKSUMTYPE_HMAC_SHA1_96_AES_256=CKSUMTYPE_HMAC_SHA1_96_AES256
+
 # Enable adiheap and adistack security extensions
 ADIHEAP_MODE =	$(ADIHEAP_ENABLE)
 ADISTACK_MODE =	$(ADISTACK_ENABLE)
--- a/components/samba/samba.proto-objects	Tue Dec 20 11:59:29 2016 -0800
+++ b/components/samba/samba.proto-objects	Wed Dec 21 12:22:29 2016 -0800
@@ -228,6 +228,7 @@
 file path=usr/lib/python2.7/vendor-packages/64/samba/samba/ntacls.pyc
 file path=usr/lib/python2.7/vendor-packages/64/samba/samba/param.so
 file path=usr/lib/python2.7/vendor-packages/64/samba/samba/policy.so
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/posix_eadb.so
 dir  path=usr/lib/python2.7/vendor-packages/64/samba/samba/provision
 file path=usr/lib/python2.7/vendor-packages/64/samba/samba/provision/__init__.py
 file path=usr/lib/python2.7/vendor-packages/64/samba/samba/provision/__init__.pyc
@@ -315,6 +316,8 @@
 file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/dcerpc/unix.pyc
 file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/dns.py
 file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/dns.pyc
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/dns_tkey.py
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/dns_tkey.pyc
 file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/docs.py
 file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/docs.pyc
 file path=usr/lib/python2.7/vendor-packages/64/samba/samba/tests/dsdb.py
@@ -411,6 +414,8 @@
 file path=usr/lib/python2.7/vendor-packages/64/samba/samba/web_server/__init__.pyc
 file path=usr/lib/python2.7/vendor-packages/64/samba/samba/xattr.py
 file path=usr/lib/python2.7/vendor-packages/64/samba/samba/xattr.pyc
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/xattr_native.so
+file path=usr/lib/python2.7/vendor-packages/64/samba/samba/xattr_tdb.so
 file path=usr/lib/python2.7/vendor-packages/64/samba/talloc.so
 file path=usr/lib/python2.7/vendor-packages/64/samba/tdb.so
 file path=usr/lib/python2.7/vendor-packages/64/samba/tevent.py
@@ -506,11 +511,6 @@
 file path=usr/lib/samba/$(MACH64)/libsmbconf.so.0
 link path=usr/lib/samba/$(MACH64)/libsmbldap.so target=libsmbldap.so.0
 file path=usr/lib/samba/$(MACH64)/libsmbldap.so.0
-link path=usr/lib/samba/$(MACH64)/libtevent-unix-util.so \
-    target=libtevent-unix-util.so.0.0.1
-link path=usr/lib/samba/$(MACH64)/libtevent-unix-util.so.0 \
-    target=libtevent-unix-util.so.0.0.1
-file path=usr/lib/samba/$(MACH64)/libtevent-unix-util.so.0.0.1
 link path=usr/lib/samba/$(MACH64)/libtevent-util.so \
     target=libtevent-util.so.0.0.1
 link path=usr/lib/samba/$(MACH64)/libtevent-util.so.0 \
@@ -718,6 +718,7 @@
 file path=usr/lib/samba/private/$(MACH64)/libnss-info-samba4.so
 file path=usr/lib/samba/private/$(MACH64)/libpopt-samba3-samba4.so
 file path=usr/lib/samba/private/$(MACH64)/libpopt-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libposix-eadb-samba4.so
 file path=usr/lib/samba/private/$(MACH64)/libprinting-migrate-samba4.so
 link path=usr/lib/samba/private/$(MACH64)/libpyldb-util.so.1 \
     target=libpyldb-util.so.1.1.26
upstream/oracle/userland-gate