diff options
| author | David W. Chapman Jr. <dwcjr@FreeBSD.org> | 2002-09-20 13:47:14 +0000 |
|---|---|---|
| committer | David W. Chapman Jr. <dwcjr@FreeBSD.org> | 2002-09-20 13:47:14 +0000 |
| commit | e673ac3559270d4eaee28831e848099b7c8a69e4 (patch) | |
| tree | 57b7bc6a9fb1f6d896b39018ac24b5754b89b2a3 /net/samba | |
| parent | Update to 1.29 (diff) | |
Remove s/nawk/awk/ patch for password conversion script
Remove patch to define SMBRUN since the external smbrun program has
been axed
Add patch to fix smbclient bug when connecting to win9x machines
Submitted by: jerry@samba.org
Notes
Notes:
svn path=/head/; revision=66839
Diffstat (limited to 'net/samba')
| -rw-r--r-- | net/samba/Makefile | 1 | ||||
| -rw-r--r-- | net/samba/files/patch-aa | 11 | ||||
| -rw-r--r-- | net/samba/files/patch-ae | 11 | ||||
| -rw-r--r-- | net/samba/files/patch-libsmb | 11 |
4 files changed, 12 insertions, 22 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile index 1198327f75f1..02b6edfc630e 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -7,6 +7,7 @@ PORTNAME= samba PORTVERSION= 2.2.6.p2 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://us4.samba.org/samba/ftp/%SUBDIR%/ MASTER_SITE_SUBDIR= pre old-versions . diff --git a/net/samba/files/patch-aa b/net/samba/files/patch-aa deleted file mode 100644 index 077f9c66a3ad..000000000000 --- a/net/samba/files/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ ---- source/Makefile.in.orig Thu May 2 20:02:26 2002 -+++ source/Makefile.in Fri May 3 10:04:22 2002 -@@ -82,7 +82,7 @@ - PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DTDB_PASSWD_FILE=\"$(TDB_PASSWD_FILE)\" - FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DLOGFILEBASE=\"$(LOGFILEBASE)\" - FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" --FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\" -+FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\" - FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\" -DPIDDIR=\"$(PIDDIR)\" -DLIBDIR=\"$(LIBDIR)\" - FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H - FLAGS = $(ISA) $(FLAGS5) $(PASSWD_FLAGS) diff --git a/net/samba/files/patch-ae b/net/samba/files/patch-ae deleted file mode 100644 index 705e8cd6acc9..000000000000 --- a/net/samba/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ ---- source/script/convert_smbpasswd.orig Thu Nov 5 02:50:17 1998 -+++ source/script/convert_smbpasswd Tue Oct 16 17:19:10 2001 -@@ -7,7 +7,7 @@ - # with trying to work out how to get the seconds since 1970 - # in awk or the shell. JRA. - # --nawk 'BEGIN {FS=":"} -+awk 'BEGIN {FS=":"} - { - if( $0 ~ "^#" ) { - print $0 diff --git a/net/samba/files/patch-libsmb b/net/samba/files/patch-libsmb new file mode 100644 index 000000000000..f922c5be6eb8 --- /dev/null +++ b/net/samba/files/patch-libsmb @@ -0,0 +1,11 @@ +--- source/libsmb/clilist.c Fri Jul 26 23:56:45 2002 ++++ source/libsmb/clilist.c Mon +Sep 16 07:18:16 2002 +@@ -59,7 +59,6 @@ + sizeof(finfo->name), + len, + STR_TERMINATE); +- p += 1; /* Skip the trailing \0 too */ + return PTR_DIFF(p, base); + + case 2: /* this is what OS/2 uses mostly */ |