diff -u likewise-open-4.1.0.2956/debian/changelog likewise-open-4.1.2982/debian/changelog --- likewise-open-4.1.0.2956/debian/changelog +++ likewise-open-4.1.2982/debian/changelog @@ -1,3 +1,17 @@ +likewise-open (4.1.2982-0ubuntu1) intrepid; urgency=low + + * Upstream bugfix microrelease (LP: #272134) + * Replaced no-template-modifications.diff by homedir_setting.patch to + match upstream patches + * Added upstream's daemon_restart.patch that removes likewise-open + self-management of daemon start at boot (LP: #272132) + * Added --with-dnsupdate configure option to properly register DDNS entries + on domain join (LP: #272060) + * Added graceful_dbus_restart.diff patch to fix Gnome session blow-up when + using GUI to join domain (LP: #222224) + + -- Thierry Carrez Fri, 19 Sep 2008 15:57:23 +0200 + likewise-open (4.1.0.2956-0ubuntu2) intrepid; urgency=low [ Steve Langasek ] diff -u likewise-open-4.1.0.2956/debian/rules likewise-open-4.1.2982/debian/rules --- likewise-open-4.1.0.2956/debian/rules +++ likewise-open-4.1.2982/debian/rules @@ -74,6 +74,7 @@ --with-privatedir=/etc/samba \ --enable-require-wrfile-keytab \ --with-ads \ + --with-dnsupdate \ --with-pam \ --without-readline \ --with-included-popt \ diff -u likewise-open-4.1.0.2956/debian/patches/series likewise-open-4.1.2982/debian/patches/series --- likewise-open-4.1.0.2956/debian/patches/series +++ likewise-open-4.1.2982/debian/patches/series @@ -1,2 +1,4 @@ -no-template-modifications.diff +graceful_dbus_restart.diff +daemon_restart.patch +homedir_setting.patch pam-auth-update.diff reverted: --- likewise-open-4.1.0.2956/debian/patches/no-template-modifications.diff +++ likewise-open-4.1.0.2956.orig/debian/patches/no-template-modifications.diff @@ -1,37 +0,0 @@ -Index: likewise-open-4.1.0.2956/domainjoin/libdomainjoin/src/djauthinfo.c -=================================================================== ---- likewise-open-4.1.0.2956.orig/domainjoin/libdomainjoin/src/djauthinfo.c 2008-07-31 15:26:42.000000000 +0200 -+++ likewise-open-4.1.0.2956/domainjoin/libdomainjoin/src/djauthinfo.c 2008-07-31 15:58:19.000000000 +0200 -@@ -1126,32 +1126,6 @@ - - LW_CLEANUP_CTERR(exc, DJGetDistroInfo(NULL, &distro)); - -- switch (distro.os) { -- case OS_SUNOS: -- LW_CLEANUP_CTERR(exc, DJSetSambaValue(NULL, -- "template homedir", -- "/export/home/local/%D/%U")); -- LW_CLEANUP_CTERR(exc, DJSetSambaValue(NULL, -- "template shell", -- "/bin/ksh")); -- break; -- case OS_DARWIN: -- LW_CLEANUP_CTERR(exc, DJSetSambaValue(NULL, -- "template homedir", -- "/Users/%D/%U")); -- LW_CLEANUP_CTERR(exc, DJSetSambaValue(NULL, -- "template shell", -- "/bin/bash")); -- break; -- default: -- LW_CLEANUP_CTERR(exc, DJSetSambaValue(NULL, -- "template homedir", -- "/home/local/%D/%U")); -- LW_CLEANUP_CTERR(exc, DJSetSambaValue(NULL, -- "template shell", -- "/bin/bash")); -- } -- - /* - * Need to determine between an Enterprise and Open install. - */ only in patch2: unchanged: --- likewise-open-4.1.2982.orig/debian/patches/homedir_setting.patch +++ likewise-open-4.1.2982/debian/patches/homedir_setting.patch @@ -0,0 +1,22 @@ +diff --git a/domainjoin/libdomainjoin/src/djauthinfo.c b/domainjoin/libdomainjoin/src/djauthinfo.c +index 6e52b52..094a7dd 100644 +--- a/domainjoin/libdomainjoin/src/djauthinfo.c ++++ b/domainjoin/libdomainjoin/src/djauthinfo.c +@@ -1126,6 +1126,9 @@ static void DoLwiConf(JoinProcessOptions *options, LWException **exc) + + LW_CLEANUP_CTERR(exc, DJGetDistroInfo(NULL, &distro)); + ++#if 0 /* Disabled to allow distros to pre-configure the homedir and ++ shell setting as appropriate. */ ++ + switch (distro.os) { + case OS_SUNOS: + LW_CLEANUP_CTERR(exc, DJSetSambaValue(NULL, +@@ -1151,6 +1154,7 @@ static void DoLwiConf(JoinProcessOptions *options, LWException **exc) + "template shell", + "/bin/bash")); + } ++#endif + + /* + * Need to determine between an Enterprise and Open install. only in patch2: unchanged: --- likewise-open-4.1.2982.orig/debian/patches/daemon_restart.patch +++ likewise-open-4.1.2982/debian/patches/daemon_restart.patch @@ -0,0 +1,18 @@ +Index: likewise-open-4.1.2956/domainjoin/libdomainjoin/src/djdaemonmgr_nonmac.c +=================================================================== +--- likewise-open-4.1.2956.orig/domainjoin/libdomainjoin/src/djdaemonmgr_nonmac.c 2008-08-04 01:01:17.000000000 -0500 ++++ likewise-open-4.1.2956/domainjoin/libdomainjoin/src/djdaemonmgr_nonmac.c 2008-08-12 13:50:57.000000000 -0500 +@@ -615,8 +615,13 @@ + + } + ++#if 0 /* Disabled to allow Ubuntu's upstart process and packaging ++ to manage the daemon's restart on boot */ ++ + LW_TRY(exc, DJConfigureForDaemonRestart(pszName, bStatus, pszStartPriority, pszStopPriority, &LW_EXC)); + ++#endif ++ + cleanup: + ; + } only in patch2: unchanged: --- likewise-open-4.1.2982.orig/debian/patches/graceful_dbus_restart.diff +++ likewise-open-4.1.2982/debian/patches/graceful_dbus_restart.diff @@ -0,0 +1,23 @@ +Index: likewise-open-4.1.2982-release/domainjoin/scripts/ConfigureLogin.in +=================================================================== +--- likewise-open-4.1.2982-release.orig/domainjoin/scripts/ConfigureLogin.in 2008-09-19 15:55:37.000000000 +0200 ++++ likewise-open-4.1.2982-release/domainjoin/scripts/ConfigureLogin.in 2008-09-19 15:56:45.000000000 +0200 +@@ -302,8 +302,18 @@ + fi + fi + else ++ if [ "$distroType" = "Ubuntu" ]; then ++ if [ -e /var/run/dbus/pid ] && ++ ps --no-heading -p $(cat /var/run/dbus/pid) > /dev/null; then ++ invoke-rc.d dbus reload ++ result=$? ++ else ++ return 0 ++ fi ++ else + /etc/init.d/dbus restart + result=$? ++ fi + fi + WaitForNetworkManager + return $result