Date: Mon, 1 Apr 2024 10:49:26 GMT From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2db400e0d44b - main - misc/buffer: Remove expired port Message-ID: <202404011049.431AnQ91060241@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=2db400e0d44ba47d203680df4bbe28fd7ca88eb5 commit 2db400e0d44ba47d203680df4bbe28fd7ca88eb5 Author: Rene Ladan <rene@FreeBSD.org> AuthorDate: 2024-04-01 10:49:00 +0000 Commit: Rene Ladan <rene@FreeBSD.org> CommitDate: 2024-04-01 10:49:20 +0000 misc/buffer: Remove expired port 2024-03-31 misc/buffer: No upstream updates since 1995. Switch to misc/mbuffer --- MOVED | 1 + misc/Makefile | 1 - misc/buffer/Makefile | 23 ----- misc/buffer/distinfo | 2 - misc/buffer/files/patch-buffer.c | 170 ------------------------------------- misc/buffer/files/patch-buffer.man | 33 ------- misc/buffer/files/patch-sem.c | 19 ----- misc/buffer/pkg-descr | 10 --- 8 files changed, 1 insertion(+), 258 deletions(-) diff --git a/MOVED b/MOVED index ee93181905a0..9d647cdd9332 100644 --- a/MOVED +++ b/MOVED @@ -3096,3 +3096,4 @@ www/mediawiki135||2024-04-01|Has expired: Upstream reached EOL on 2023-12-21 net-p2p/bitflu||2024-04-01|Has expired: No development in years and lack common functionality found in modern clients devel/busybee||2024-04-01|Has expired: Abandoned upstream, last release 2015 and last commit 2017 textproc/rubygem-zmq||2024-04-01|Has expired: Last releasee was in 2011 and depends on deprecated libzmq2 +misc/buffer|misc/mbuffer|2024-04-01|Has expired: No upstream updates since 1995. Switch to misc/mbuffer diff --git a/misc/Makefile b/misc/Makefile index e23b87985a75..9054231e09b0 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -38,7 +38,6 @@ SUBDIR += boxes SUBDIR += broot SUBDIR += bsod - SUBDIR += buffer SUBDIR += caffe SUBDIR += chatgpt-shell-cli SUBDIR += cheat diff --git a/misc/buffer/Makefile b/misc/buffer/Makefile deleted file mode 100644 index a36739118dc4..000000000000 --- a/misc/buffer/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -PORTNAME= buffer -PORTVERSION= 1.19 -PORTREVISION= 1 -CATEGORIES= misc -MASTER_SITES= GENTOO \ - http://www.mondorescue.org/download/MondoCD/TGZS/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= Buffer sporadic I/O for faster tape and pipe throughput - -DEPRECATED= No upstream updates since 1995. Switch to misc/mbuffer -EXPIRATION_DATE=2024-03-31 - -USES= tar:tgz -PLIST_FILES= bin/buffer \ - share/man/man1/buffer.1.gz -CFLAGS+= -D_WANT_SEMUN -MAKE_ARGS= CC="${CC}" \ - CFLAGS="${CFLAGS}" \ - INSTBIN="${STAGEDIR}${PREFIX}/bin" \ - INSTMAN="${STAGEDIR}${PREFIX}/share/man/man1" - -.include <bsd.port.mk> diff --git a/misc/buffer/distinfo b/misc/buffer/distinfo deleted file mode 100644 index a26673707f6f..000000000000 --- a/misc/buffer/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (buffer-1.19.tgz) = ec7da9f9737cd03c11a26f8380ab7d567b252b862b989da430b1e92db79b42c8 -SIZE (buffer-1.19.tgz) = 34960 diff --git a/misc/buffer/files/patch-buffer.c b/misc/buffer/files/patch-buffer.c deleted file mode 100644 index bbc8ff0ace18..000000000000 --- a/misc/buffer/files/patch-buffer.c +++ /dev/null @@ -1,170 +0,0 @@ ---- buffer.c.orig Sat Jan 19 20:47:17 2002 -+++ buffer.c Tue Dec 13 11:57:38 2005 -@@ -114,12 +114,17 @@ - #include <signal.h> - #include <fcntl.h> - #include <errno.h> -+#include <machine/param.h> - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/ipc.h> - #include <sys/shm.h> - #include <sys/sem.h> - #include <sys/wait.h> -+#include <sys/time.h> -+#include <limits.h> -+#include <stdlib.h> -+#include <strings.h> - #include "sem.h" - - #ifndef lint -@@ -127,7 +132,6 @@ - #endif - - #ifndef __alpha --extern char *shmat(); - #endif /* __alpha */ - - /* General macros */ -@@ -252,6 +256,8 @@ - /* Number of K output */ - unsigned long outk = 0; - -+struct timeval starttime; -+ - int - main( argc, argv ) - int argc; -@@ -263,6 +269,8 @@ - - buffer_allocate(); - -+ gettimeofday(&starttime, NULL); -+ - start_reader_and_writer(); - - byee( 0 ); -@@ -384,8 +392,8 @@ - fprintf( stderr, "Usage: %s [-B] [-t] [-S size] [-m memsize] [-b blocks] [-p percent] [-s blocksize] [-u pause] [-i infile] [-o outfile] [-z size]\n", - progname ); - fprintf( stderr, "-B = blocked device - pad out last block\n" ); -- fprintf( stderr, "-t = show total amount writen at end\n" ); -- fprintf( stderr, "-S size = show amount writen every size bytes\n" ); -+ fprintf( stderr, "-t = show total amount written at end\n" ); -+ fprintf( stderr, "-S size = show amount written every size bytes\n" ); - fprintf( stderr, "-m size = size of shared mem chunk to grab\n" ); - fprintf( stderr, "-b num = number of blocks in queue\n" ); - fprintf( stderr, "-p percent = don't start writing until percent blocks filled\n" ); -@@ -398,6 +406,11 @@ - } - } - -+ if (argc > optind) { -+ fprintf( stderr, "too many arguments\n" ); -+ byee( -1 ); -+ } -+ - if (zflag) showevery = blocksize; - - /* If -b was not given try and work out the max buffer size */ -@@ -507,9 +520,9 @@ - get_buffer(); - - if( debug ) -- fprintf( stderr, "%s pbuffer is 0x%08x, buffer_size is %d [%d x %d]\n", -+ fprintf( stderr, "%s pbuffer is 0x%08lx, buffer_size is %d [%d x %d]\n", - proc_string, -- (char *)pbuffer, buffer_size, blocks, blocksize ); -+ (unsigned long)pbuffer, buffer_size, blocks, blocksize ); - - #ifdef SYS5 - memset( (char *)pbuffer, '\0', buffer_size ); -@@ -526,9 +539,11 @@ - lock( pbuffer->semid, pbuffer->blocks_used_lock ); - - pbuffer->blocks_free_lock = 1; -- /* start this off so lock() can be called on it for each block -- * till all the blocks are used up */ -- sem_set( pbuffer->semid, pbuffer->blocks_free_lock, blocks - 1 ); -+ /* Initializing the semaphore to "blocks - 1" causes a hang when using option -+ * "-p 100" because it always keeps one block free, so we'll never reach 100% fill -+ * level. However, there doesn't seem to be a good reason to keep one block free, -+ * so we initialize the semaphore to "blocks" instead. */ -+ sem_set( pbuffer->semid, pbuffer->blocks_free_lock, blocks ); - - /* Detattach the shared memory so the fork doesnt do anything odd */ - shmdt( (char *)pbuffer ); -@@ -648,7 +663,7 @@ - int - fill_block() - { -- int bytes; -+ int bytes = 0; - char *start; - int toread; - static char eof_reached = 0; -@@ -707,7 +722,7 @@ - { - int filled = 0; - int maxfilled = (blocks * percent) / 100; -- int first_block; -+ int first_block = 0; - - if( debug ) - fprintf( stderr, "\tW: Entering writer\n blocks = %d\n maxfilled = %d\n", -@@ -914,13 +929,12 @@ - do_size( arg ) - char *arg; - { -- char format[ 20 ]; -- int ret; -+ int ret = 0; - -- *format = '\0'; -- sscanf( arg, "%d%s", &ret, format ); -+ char unit = '\0'; -+ sscanf( arg, "%d%c", &ret, &unit ); - -- switch( *format ){ -+ switch( unit ){ - case 'm': - case 'M': - ret = ret K K; -@@ -941,7 +955,36 @@ - void - pr_out() - { -- fprintf( stderr, " %10luK\r", outk ); -+ struct timeval now; -+ unsigned long ms_delta, k_per_s; -+ -+ gettimeofday(&now, NULL); -+ ms_delta = (now.tv_sec - starttime.tv_sec) * 1000 -+ + (now.tv_usec - starttime.tv_usec) / 1000; -+ if (ms_delta) { -+ /* Use increased accuracy for small amounts of data, -+ * decreased accuracy for *huge* throughputs > 4.1GB/s -+ * to avoid division by 0. This will overflow if your -+ * machine's throughput exceeds 4TB/s - you deserve to -+ * loose if you're still using 32 bit longs on such a -+ * beast ;-) -+ * <mbuck@debian.org> -+ */ -+ if (outk < ULONG_MAX / 1000) { -+ k_per_s = (outk * 1000) / ms_delta; -+ } else if (ms_delta >= 1000) { -+ k_per_s = outk / (ms_delta / 1000); -+ } else { -+ k_per_s = (outk / ms_delta) * 1000; -+ } -+ fprintf( stderr, " %10luK, %10luK/s\r", outk, k_per_s ); -+ } else { -+ if (outk) { -+ fprintf( stderr, " %10luK, ?K/s\r", outk ); -+ } else { -+ fprintf( stderr, " 0K, 0K/s\r"); -+ } -+ } - } - - #ifdef SYS5 diff --git a/misc/buffer/files/patch-buffer.man b/misc/buffer/files/patch-buffer.man deleted file mode 100644 index b2001a2cbec9..000000000000 --- a/misc/buffer/files/patch-buffer.man +++ /dev/null @@ -1,33 +0,0 @@ ---- buffer.man.orig Tue Dec 13 11:55:36 2005 -+++ buffer.man Tue Dec 13 11:56:56 2005 -@@ -37,7 +37,8 @@ - Use the given file as the output file. The default is stdout. - .TP - .B \-S size --After every chunk this size has been writen print out how much been writen so far. -+After every chunk of this size has been written, print out how much -+been written so far. Also prints the total throughput. - By default this is not set. - .TP - .B \-s size -@@ -71,9 +72,9 @@ - throughput on some drives.) - .TP - .B \-B --Force each block writen to be padded out to the blocksize. This is needed by some tape -+Force each block written to be padded out to the blocksize. This is needed by some tape - and cartridge drives. Defaults to unpadded. This only affects the --last block writen. -+last block written. - .TP - .B \-t - On exiting print to stderr a brief message showing the total number of -@@ -82,7 +83,7 @@ - .B \-Z - If reading/writing directly to a character device (like a tape drive) - then after each gigabyte perform an lseek to the start of the file. --Use this flag with extreme care. If can only be used on devices where -+Use this flag with extreme care. It can only be used on devices where - an lseek does not rewind the tape but does reset the kernels position - flags. It is used to allow more than 2 gigabytes to be written. - .PP diff --git a/misc/buffer/files/patch-sem.c b/misc/buffer/files/patch-sem.c deleted file mode 100644 index f6fe3c210bc4..000000000000 --- a/misc/buffer/files/patch-sem.c +++ /dev/null @@ -1,19 +0,0 @@ ---- sem.c.orig Tue Dec 13 00:33:03 2005 -+++ sem.c Tue Dec 13 00:35:22 2005 -@@ -27,6 +27,7 @@ - * semaphores */ - - #include <stdio.h> -+#include <unistd.h> - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/ipc.h> -@@ -95,7 +96,7 @@ - return sem; - } - --static -+static void - do_sem( sem_id, pbuf, err ) - int sem_id; - struct sembuf *pbuf; diff --git a/misc/buffer/pkg-descr b/misc/buffer/pkg-descr deleted file mode 100644 index 384bde054f83..000000000000 --- a/misc/buffer/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -This is a program designed initially to speed up writing tapes on remote -tape drives, but may be used as a general pipe buffering utility. -Note: You must have SYSVSHM support in FreeBSD kernel. - -The program splits itself into two processes. The first process reads -(and reblocks) from stdin into a shared memory buffer. The second -writes from the shared memory buffer to stdout. Doing it this way -means that the writing side effectly sits in a tight write loop and -doesn't have to wait for input. Similarly for the input side. It is -this waiting that slows down other reblocking processes, like dd.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404011049.431AnQ91060241>