diff -Nru samba-4.4.5+dfsg/debian/changelog samba-4.4.5+dfsg/debian/changelog --- samba-4.4.5+dfsg/debian/changelog 2016-09-18 07:26:52.000000000 -0300 +++ samba-4.4.5+dfsg/debian/changelog 2016-10-18 11:30:21.000000000 -0300 @@ -1,3 +1,12 @@ +samba (2:4.4.5+dfsg-2ubuntu6) yakkety; urgency=high + + * d/p/fix-1584485.patch: Make libnss-winbind and libpam-winbind + to be statically linked fixes LP: #1584485. + + * d/rules: Compile winbindd/winbindd statically. + + -- Jorge Niedbalski Tue, 18 Oct 2016 11:29:46 -0300 + samba (2:4.4.5+dfsg-2ubuntu5) yakkety; urgency=medium * No-change rebuild for readline soname change. diff -Nru samba-4.4.5+dfsg/debian/patches/fix-1584485.patch samba-4.4.5+dfsg/debian/patches/fix-1584485.patch --- samba-4.4.5+dfsg/debian/patches/fix-1584485.patch 1969-12-31 21:00:00.000000000 -0300 +++ samba-4.4.5+dfsg/debian/patches/fix-1584485.patch 2016-10-18 11:29:22.000000000 -0300 @@ -0,0 +1,94 @@ +--- samba-4.4.5+dfsg.orig/buildtools/wafsamba/wafsamba.py ++++ samba-4.4.5+dfsg/buildtools/wafsamba/wafsamba.py +@@ -140,7 +140,8 @@ def SAMBA_LIBRARY(bld, libname, source, + grouping_library=False, + allow_undefined_symbols=False, + allow_warnings=False, +- enabled=True): ++ enabled=True, ++ static=False): + '''define a Samba library''' + + if pyembed and bld.env['IS_EXTRA_PYTHON']: +@@ -253,7 +254,12 @@ def SAMBA_LIBRARY(bld, libname, source, + if bld.env['ENABLE_RELRO'] is True: + ldflags.extend(TO_LIST('-Wl,-z,relro,-z,now')) + +- features = 'c cshlib symlink_lib install_lib' ++ features = 'c symlink_lib install_lib' ++ if static: ++ features += ' cstaticlib' ++ else: ++ features += ' cshlib' ++ + if pyext: + features += ' pyext' + if pyembed: +--- samba-4.4.5+dfsg.orig/nsswitch/wscript_build ++++ samba-4.4.5+dfsg/nsswitch/wscript_build +@@ -10,6 +10,13 @@ bld.SAMBA_LIBRARY('winbind-client', + private_library=True + ) + ++bld.SAMBA_LIBRARY('winbind-client-static', ++ source='wb_common.c', ++ deps='replace', ++ cflags='-DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR, ++ private_library=True, static=True, install=False ++ ) ++ + + bld.SAMBA_BINARY('nsstest', + source='nsstest.c', +@@ -33,11 +40,12 @@ if (Utils.unversioned_sys_platform() == + bld.SAMBA_LIBRARY('nss_winbind', + keep_underscore=True, + source='winbind_nss_linux.c', +- deps='winbind-client', ++ deps='winbind-client-static', + public_headers=[], + public_headers_install=False, + pc_files=[], +- vnum='2') ++ vnum='2', ++ allow_undefined_symbols=True) + + bld.SAMBA3_LIBRARY('nss_wins', + keep_underscore=True, +@@ -87,21 +95,32 @@ elif Utils.unversioned_sys_platform() == + elif (host_os.rfind('hpux') > -1): + bld.SAMBA_LIBRARY('nss_winbind', + source='winbind_nss_linux.c', +- deps='winbind-client', ++ deps='winbind-client', + realname='libnss_winbind.so') + elif (host_os.rfind('aix') > -1): + bld.SAMBA_LIBRARY('nss_winbind', + source='winbind_nss_aix.c', +- deps='winbind-client', ++ deps='winbind-client', + realname='WINBIND') + + if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'): ++ bld.SAMBA_LIBRARY('pamwinbind-static', ++ source='pam_winbind.c', ++ deps='talloc wbclient winbind-client-static tiniparser pam samba_intl', ++ cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR, ++ realname='pam_winbind.so', ++ install_path='${PAMMODULESDIR}', ++ static=True, ++ install=False ++ ) ++ + bld.SAMBA_LIBRARY('pamwinbind', + source='pam_winbind.c', +- deps='talloc wbclient winbind-client tiniparser pam samba_intl', ++ deps='pamwinbind-static', + cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR, + realname='pam_winbind.so', +- install_path='${PAMMODULESDIR}' ++ install_path='${PAMMODULESDIR}', ++ allow_undefined_symbols=True + ) + + if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'): diff -Nru samba-4.4.5+dfsg/debian/patches/series samba-4.4.5+dfsg/debian/patches/series --- samba-4.4.5+dfsg/debian/patches/series 2016-08-05 11:29:34.000000000 -0400 +++ samba-4.4.5+dfsg/debian/patches/series 2016-10-18 11:29:15.000000000 -0300 @@ -22,3 +22,4 @@ krb_zero_cursor.patch winbind_trusted_domains.patch git_smbclient_cpu.patch +fix-1584485.patch diff -Nru samba-4.4.5+dfsg/debian/rules samba-4.4.5+dfsg/debian/rules --- samba-4.4.5+dfsg/debian/rules 2016-07-14 21:14:43.000000000 -0400 +++ samba-4.4.5+dfsg/debian/rules 2016-10-18 12:10:34.000000000 -0300 @@ -65,6 +65,7 @@ --disable-avahi \ --disable-rpath \ --disable-rpath-install \ + --nonshared-binary=winbindd/winbindd \ --bundled-libraries=NONE,pytevent,iniparser,roken,wind,hx509,asn1,heimbase,hcrypto,krb5,gssapi,heimntlm,hdb,kdc,com_err,compile_et,asn1_compile \ --builtin-libraries=replace,ccan,samba-cluster-support \ --minimum-library-version="$(shell ./debian/autodeps.py --minimum-library-version)" \