22662663 samba: Uprev to 4.1.22
authorJiri Sasek <Jiri.Sasek@Oracle.COM>
Wed, 27 Jan 2016 18:45:20 -0800
changeset 5398 f499dad29f21
parent 5397 c7d00b55bd2b
child 5399 88010dbde9bb
22662663 samba: Uprev to 4.1.22 22526544 problem in UTILITY/SAMBA 22526597 problem in UTILITY/SAMBA 22526577 problem in UTILITY/SAMBA
components/samba/Makefile
components/samba/samba.proto-objects
--- a/components/samba/Makefile	Thu Feb 04 07:44:25 2016 -0800
+++ b/components/samba/Makefile	Wed Jan 27 18:45:20 2016 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -41,13 +41,13 @@
 export PARFAIT_BUILD=no
 
 COMPONENT_NAME=		samba
-COMPONENT_VERSION=	4.1.17
-TPNO=			20605
+COMPONENT_VERSION=	4.1.22
+TPNO=			26541
+COMPONENT_ARCHIVE_HASH= sha256:5563a1c94a2dac837ccffd1f0821bb25e097affaa7389fef186f9cfb3486cfe5
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://www.samba.org/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH= sha256:7aeb5d09e9c84bbeeb4b98d33404e9dbc4d99c54e64a447cc9c4d57e9255cb1d
-COMPONENT_ARCHIVE_URL=	http://us1.samba.org/samba/ftp/stable/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	https://download.samba.org/pub/samba/stable/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/samba
 
 include $(WS_MAKE_RULES)/prep.mk
--- a/components/samba/samba.proto-objects	Thu Feb 04 07:44:25 2016 -0800
+++ b/components/samba/samba.proto-objects	Wed Jan 27 18:45:20 2016 -0800
@@ -921,8 +921,8 @@
     target=libpyldb-util.so.1.1.17
 file path=usr/lib/samba/private/$(MACH64)/libpyldb-util.so.1.1.17
 link path=usr/lib/samba/private/$(MACH64)/libpytalloc-util.so.2 \
-    target=libpytalloc-util.so.2.0.8
-file path=usr/lib/samba/private/$(MACH64)/libpytalloc-util.so.2.0.8
+    target=libpytalloc-util.so.2.1.2
+file path=usr/lib/samba/private/$(MACH64)/libpytalloc-util.so.2.1.2
 file path=usr/lib/samba/private/$(MACH64)/libreplace.so
 file path=usr/lib/samba/private/$(MACH64)/libsamba-modules.so
 file path=usr/lib/samba/private/$(MACH64)/libsamba-net.so
@@ -943,8 +943,8 @@
 file path=usr/lib/samba/private/$(MACH64)/libsmbregistry.so
 file path=usr/lib/samba/private/$(MACH64)/libsubunit.so
 link path=usr/lib/samba/private/$(MACH64)/libtalloc.so.2 \
-    target=libtalloc.so.2.0.8
-file path=usr/lib/samba/private/$(MACH64)/libtalloc.so.2.0.8
+    target=libtalloc.so.2.1.2
+file path=usr/lib/samba/private/$(MACH64)/libtalloc.so.2.1.2
 file path=usr/lib/samba/private/$(MACH64)/libtdb-wrap.so
 link path=usr/lib/samba/private/$(MACH64)/libtdb.so.1 target=libtdb.so.1.2.12
 file path=usr/lib/samba/private/$(MACH64)/libtdb.so.1.2.12