diff options
| author | Marcus Alves Grando <mnag@FreeBSD.org> | 2006-04-05 03:14:27 +0000 |
|---|---|---|
| committer | Marcus Alves Grando <mnag@FreeBSD.org> | 2006-04-05 03:14:27 +0000 |
| commit | 977260e5fbdbbfa36551bd727ba39def7459d537 (patch) | |
| tree | e56dd3915dbcd0a807cc9782a0f086727838ff22 /net/samba3/files | |
| parent | 7efbf99a783496920ef00e02df65d0f653624065 (diff) | |
| download | ports-977260e5fbdbbfa36551bd727ba39def7459d537.tar.gz ports-977260e5fbdbbfa36551bd727ba39def7459d537.zip | |
Notes
Diffstat (limited to 'net/samba3/files')
| -rw-r--r-- | net/samba3/files/patch-Makefile.in | 30 | ||||
| -rw-r--r-- | net/samba3/files/patch-configure.in | 28 | ||||
| -rw-r--r-- | net/samba3/files/samba.sh.sample | 2 |
3 files changed, 30 insertions, 30 deletions
diff --git a/net/samba3/files/patch-Makefile.in b/net/samba3/files/patch-Makefile.in index 009b68c5fc0a..b54c7080f851 100644 --- a/net/samba3/files/patch-Makefile.in +++ b/net/samba3/files/patch-Makefile.in @@ -1,30 +1,6 @@ ---- Makefile.in.orig Wed Dec 14 13:45:49 2005 -+++ Makefile.in Sun Jan 1 03:35:30 2006 -@@ -676,6 +676,7 @@ - - CAC_PICOBJS = $(CAC_OBJ:.o=.@PICSUFFIX@) - -+NSS_VERSION=1 - - PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \ - pam_smbpass/pam_smb_acct.o pam_smbpass/support.o \ -@@ -1172,13 +1173,13 @@ - @WINBIND_NSS@: $(WINBIND_NSS_PICOBJS) - @echo "Linking $@" - @$(SHLD) $(WINBIND_NSS_LDSHFLAGS) -o $@ $(WINBIND_NSS_PICOBJS) \ -- @WINBIND_NSS_EXTRA_LIBS@ @SONAMEFLAG@`basename $@` -+ @WINBIND_NSS_EXTRA_LIBS@ @SONAMEFLAG@`basename $@`.$(NSS_VERSION) - - @WINBIND_WINS_NSS@: $(WINBIND_WINS_NSS_PICOBJS) - @echo "Linking $@" - @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_PICOBJS) \ - $(LDAP_LIBS) $(KRB5LIBS) -lc \ -- @SONAMEFLAG@`basename $@` -+ @SONAMEFLAG@`basename $@`.$(NSS_VERSION) - - nsswitch/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_PICOBJ) bin/.dummy - @echo "Linking $@" -@@ -1389,7 +1390,7 @@ +--- Makefile.in.orig Mon Feb 20 21:33:23 2006 ++++ Makefile.in Sat Feb 25 05:30:42 2006 +@@ -1390,7 +1390,7 @@ bin/t_snprintf@EXEEXT@: lib/snprintf.c $(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(DYNEXP) -DTEST_SNPRINTF lib/snprintf.c -lm diff --git a/net/samba3/files/patch-configure.in b/net/samba3/files/patch-configure.in index 952ff5f3d895..cfd1e4745069 100644 --- a/net/samba3/files/patch-configure.in +++ b/net/samba3/files/patch-configure.in @@ -1,6 +1,6 @@ ---- configure.in.orig Mon Jan 30 15:45:07 2006 -+++ configure.in Sun Feb 19 07:00:42 2006 -@@ -967,6 +967,21 @@ +--- configure.in.orig Mon Feb 20 21:33:23 2006 ++++ configure.in Sat Feb 25 05:34:56 2006 +@@ -968,6 +968,21 @@ AC_DEFINE(HAVE_SIG_ATOMIC_T_TYPE,1,[Whether we have the atomic_t variable type]) fi @@ -22,3 +22,25 @@ AC_CACHE_CHECK([for struct timespec type],samba_cv_struct_timespec, [ AC_TRY_COMPILE([ #include <sys/types.h> +@@ -1408,7 +1423,6 @@ + DYNEXP="-Wl,--export-dynamic" + PICFLAGS="-fPIC" + SONAMEFLAG="-Wl,-soname=" +- SONAMEVERSIONSUFFIX=".2" + AC_DEFINE(STAT_ST_BLOCKSIZE,512) + ;; + *solaris*) AC_DEFINE(SUNOS5,1,[Whether the host os is solaris]) +@@ -4911,11 +4925,13 @@ + + case "$host_os" in + *linux*) ++ SONAMEVERSIONSUFFIX=".2" + WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o" + ;; + *freebsd[[5-9]]*) + # FreeBSD winbind client is implemented as a wrapper around + # the Linux version. ++ SONAMEVERSIONSUFFIX=".1" + WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_freebsd.o \ + nsswitch/winbind_nss_linux.o" + WINBIND_NSS="nsswitch/nss_winbind.$SHLIBEXT" diff --git a/net/samba3/files/samba.sh.sample b/net/samba3/files/samba.sh.sample index ad4fc591fde1..df4490137893 100644 --- a/net/samba3/files/samba.sh.sample +++ b/net/samba3/files/samba.sh.sample @@ -88,6 +88,7 @@ command_args="-s ${samba_config}" load_rc_config $name run_rc_command "$1" +_rc_restart_done=false # smbd name=smbd @@ -103,6 +104,7 @@ command_args="-s ${samba_config}" load_rc_config $name run_rc_command "$1" +%%WINBIND%%_rc_restart_done=false %%WINBIND%% %%WINBIND%%# winbindd %%WINBIND%%name=winbindd |