update to 16.1d: fix S1G problem

temporary master site
This commit is contained in:
naddy 2001-09-09 22:45:35 +00:00
parent 98e888abf6
commit f68ca4af26
4 changed files with 12 additions and 73 deletions

View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.3 2001/05/27 20:39:08 naddy Exp $
# $OpenBSD: Makefile,v 1.4 2001/09/09 22:45:35 naddy Exp $
ONLY_FOR_ARCHS= i386
COMMENT= "network file distribution system"
COMMENT-server= "network file distribution server"
VERSION= 16.1a
VERSION= 16.1d
DISTNAME= cvsup-snap-${VERSION}
PKGNAME= cvsup-${VERSION}p1
PKGNAME-server= cvsupd-${VERSION}p1
PKGNAME= cvsup-${VERSION}
PKGNAME-server= cvsupd-${VERSION}
CATEGORIES= net devel
NEED_VERSION= 1.405
HOMEPAGE= http://www.polstra.com/projects/freeware/CVSup/
@ -20,10 +20,11 @@ PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_DISTFILES_CDROM= Yes
MASTER_SITES= \
ftp://ftp3.freebsd.org/pub/FreeBSD/development/CVSup/snapshots/ \
ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/snapshots/ \
ftp://ftp.cs.tu-berlin.de/pub/FreeBSD/development/CVSup/snapshots/
#MASTER_SITES= \
# ftp://ftp3.freebsd.org/pub/FreeBSD/development/CVSup/snapshots/ \
# ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/snapshots/ \
# ftp://ftp.cs.tu-berlin.de/pub/FreeBSD/development/CVSup/snapshots/
MASTER_SITES= http://people.freebsd.org/~jdp/s1g/
MULTI_PACKAGES= -server

View File

@ -1,3 +1,3 @@
MD5 (cvsup-snap-16.1a.tar.gz) = 13ec2cc6a5eb0ce918f53ece6557bfa3
RMD160 (cvsup-snap-16.1a.tar.gz) = f99b1b64c6fd1d6e6da69e407b9cb28041ca2752
SHA1 (cvsup-snap-16.1a.tar.gz) = cdd1c604c2674ef081f9948dca96cb6e7f60dcb2
MD5 (cvsup-snap-16.1d.tar.gz) = 378244bb1371b73337f3a5d94c1c0d43
RMD160 (cvsup-snap-16.1d.tar.gz) = a1867870e6100ee9d9e29ff372e163fa4258a6b1
SHA1 (cvsup-snap-16.1d.tar.gz) = 5e4b3cd28525c31142c827f9ca8e30dc51e4dbbc

View File

@ -1,47 +0,0 @@
$OpenBSD: patch-client_src_Updater_m3,v 1.1 2001/05/27 20:39:09 naddy Exp $
--- client/src/Updater.m3.orig Sun Apr 15 23:53:13 2001
+++ client/src/Updater.m3 Sun May 27 13:28:29 2001
@@ -733,7 +733,7 @@ PROCEDURE UpdateFile(self: T;
IF SupFileRec.Option.KeepBadFiles IN sfr.options THEN
Warn(self, "Bad version saved in " & tempPath);
ELSE
- DeleteFile(tempPath);
+ DeleteFile(self, tempPath);
END;
END;
END UpdateFile;
@@ -1231,7 +1231,7 @@ PROCEDURE Delete(self: T;
IF NOT SupFileRec.Option.CheckoutMode IN sfr.options THEN
(* Try the attic. *)
WITH atticName = SupMisc.AtticName(destPath) DO
- DeleteFile(atticName);
+ DeleteFile(self, atticName);
(* We always delete the Attic directory when it becomes empty.
FIXME - Is that the right thing to do?. *)
TRY
@@ -1239,7 +1239,7 @@ PROCEDURE Delete(self: T;
EXCEPT OSError.E => (* Ignore. *) END;
END;
END;
- DeleteFile(destPath);
+ DeleteFile(self, destPath);
IF SupFileRec.Option.CheckoutMode IN sfr.options
OR NOT self.proto.v.dirsAreExplicit THEN
(* Delete the directory automatically if it is now empty. *)
@@ -1280,14 +1280,13 @@ PROCEDURE MakeDirectories(path: Pathname
END;
END MakeDirectories;
-PROCEDURE DeleteFile(path: Pathname.T)
- RAISES {Error} =
+PROCEDURE DeleteFile(self: T; path: Pathname.T) =
BEGIN
TRY
FileAttr.Delete(path);
EXCEPT OSError.E(l) =>
IF l.head # EnoentAtom THEN
- RAISE Error("Cannot delete \"" & path & "\": " &
+ Warn(self, "Cannot delete \"" & path & "\": " &
ErrMsg.StrError(l));
END;
END;

View File

@ -1,15 +0,0 @@
--- quake/cvsup.quake.orig Sun Apr 15 16:22:06 2001
+++ quake/cvsup.quake Sat May 26 16:46:05 2001
@@ -53,10 +53,10 @@
> tempname in
write("MODULE Version;", CR, CR, "BEGIN", CR, " Name := ")
end
- if equal("$Name: SNAP_16_1a $", "$" & "Name: $")
+ if equal("$Name: SNAP_16_1ap1 $", "$" & "Name: $")
cmd = "date -u +'\"U_%Y_%m_%d_%H_%M_%S\";'"
else
- cmd = "echo '$Name: SNAP_16_1a $' | awk '{print \"\\\"\" $2 \"\\\";\";}'"
+ cmd = "echo '$Name: SNAP_16_1ap1 $' | awk '{print \"\\\"\" $2 \"\\\";\";}'"
end
cmd = cmd & " >> " & tempname
if equal(M3_VARIANT, "PM3")