Date: Tue, 09 Feb 1999 15:07:41 +0100 From: Palle Girgensohn <girgen@partitur.se> To: freebsd-gnats-submit@FreeBSD.ORG, girgen@partitur.se, freebsd-ports@FreeBSD.ORG Subject: Re: ports/9953: Samba 2.0.2 update Message-ID: <36C0412D.58C849B2@partitur.se>
next in thread | raw e-mail | index | archive | help
Apparently, the 2.0.2 distfile had a glitch, so there's a new checksum (md5) file. I remade the patch, so skip the prevoius version. Also, my apologies for all the postings... diff -urN samba/Makefile samba.new/Makefile --- samba/Makefile Mon Jan 18 10:28:29 1999 +++ samba.new/Makefile Tue Feb 9 14:37:31 1999 @@ -6,10 +6,9 @@ # $Id: Makefile,v 1.30 1999/01/18 09:28:29 foxfair Exp $ # -DISTNAME= samba-2.0.0 -#PKGNAME= samba-2.0.0 +DISTNAME= samba-2.0.2 CATEGORIES= net -MASTER_SITES= ftp://ftp.bitcon.no/.7/unix/networking/samba/ \ +MASTER_SITES= ftp://ftp.sunet.se/pub/unix/utilities/samba/ \ ftp://samba.anu.edu.au/pub/samba/ MAINTAINER= hosokawa@jp.FreeBSD.org @@ -28,7 +27,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} --libdir=${SAMBA_CONFDIR} \ - --localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat + --localstatedir=${VARDIR} --with-swatdir=${PREFIX}/share/swat \ + --with-lockdir=${VARDIR}/spool/lock WRKSRC= ${WRKDIR}/${DISTNAME}/source MAN1= nmblookup.1 smbstatus.1 smbclient.1 smbrun.1 smbtar.1 \ diff -urN samba/files/md5 samba.new/files/md5 --- samba/files/md5 Mon Jan 18 03:34:05 1999 +++ samba.new/files/md5 Tue Feb 9 14:41:30 1999 @@ -1 +1 @@ -MD5 (samba-2.0.0.tar.gz) = fb4477a7967a2df752a2a94a493fbe51 +MD5 (samba-2.0.2.tar.gz) = 67a3e3765570aa35ed6cc8fa0e819aad diff -urN samba/patches/patch-aa samba.new/patches/patch-aa --- samba/patches/patch-aa Mon Jan 18 03:34:06 1999 +++ samba.new/patches/patch-aa Tue Feb 9 14:37:31 1999 @@ -1,5 +1,5 @@ ---- Makefile.in.orig Fri Jan 15 05:07:20 1999 -+++ Makefile.in Fri Jan 15 22:47:59 1999 +--- Makefile.in.old Sat Feb 6 17:33:09 1999 ++++ Makefile.in Sat Feb 6 17:49:49 1999 @@ -23,9 +23,7 @@ BASEDIR= @prefix@ @@ -23,24 +23,22 @@ CONFIGFILE = $(LIBDIR)/smb.conf LMHOSTSFILE = $(LIBDIR)/lmhosts DRIVERFILE = $(LIBDIR)/printers.def -@@ -52,7 +51,10 @@ - SWATDIR = @swatdir@ - +@@ -53,6 +52,9 @@ # the directory where lock files go --LOCKDIR = $(VARDIR)/locks -+LOCKDIR = $(VARDIR)/spool/lock -+ + LOCKDIR = @lockdir@ + +# the directory where pid files go +PIDFILEDIR = $(VARDIR)/run - ++ # The directory where code page definition files go CODEPAGEDIR = $(LIBDIR)/codepages -@@ -71,7 +73,7 @@ - PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DSMB_PASSWD_PROGRAM=\"$(SMB_PASSWD_PROGRAM)\" + +@@ -70,7 +72,7 @@ + PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DSMBLOGFILE=\"$(SMBLOGFILE)\" -DNMBLOGFILE=\"$(NMBLOGFILE)\" FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" -FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\" +FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DPIDFILEDIR=\"$(PIDFILEDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\" FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\" FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H - FLAGS = $(FLAGS5) $(PASSWD_FLAGS) + FLAGS = $(ISA) $(FLAGS5) $(PASSWD_FLAGS) diff -urN samba/patches/patch-ae samba.new/patches/patch-ae --- samba/patches/patch-ae Thu Jan 1 01:00:00 1970 +++ samba.new/patches/patch-ae Tue Feb 9 14:38:40 1999 @@ -0,0 +1,11 @@ +--- source/script/convert_smbpasswd.orig Mon Feb 8 17:25:00 1999 ++++ source/script/convert_smbpasswd Mon Feb 8 17:25:40 1999 +@@ -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 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?36C0412D.58C849B2>