Changeset 2009 in ProjectBuilder

Timestamp:

Oct 5, 2015, 1:16:16 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Fix fedora build using the upstream buffer code and adapting patches

Location:

projects/buffer/pbconf/1.19

Files:

• buffer.pb (modified) (1 diff)
• buffer/pbpatch/01-debian-patches.all (modified) (24 diffs)
• pbfilter/rpm.pbf (modified) (1 diff)

projects/buffer/pbconf/1.19/buffer.pb

@@ -18 +18 @@
 #
 # We use the PBURL macro for that
-#pburl buffer = http://hello-penguin.com/software/buffer/buffer-1.19.tar.gz
+pburl buffer = http://hello-penguin.com/software/buffer/buffer-1.19.tar.gz
 # Local copy in case of...
 #pburl buffer = ftp://ftp.mondorescue.org/src/buffer-1.19.tgz

projects/buffer/pbconf/1.19/buffer/pbpatch/01-debian-patches.all

@@ -20 +20 @@
   * Now tries to fill this with blocks.
   * reader waits for writer to terminate and then frees the shared mem and sems.
-@@ -109,6 +109,9 @@
+@@ -109,6 +109,10 @@
   * Initial revision
   * 
@@ -27 +27 @@
 +#include <string.h>
 +#include <limits.h>
++#include <sys/time.h>
  #include <unistd.h>
  #include <stdio.h>
  #include <signal.h>
-@@ -120,17 +123,16 @@
- #include <sys/shm.h>
- #include <sys/sem.h>
- #include <sys/wait.h>
-+#include <sys/time.h>
- #include "sem.h"
- 
- #ifndef lint
- static char *rcsid = "$Header: /a/swan/home/swan/staff/csg/lmjm/src/buffer/RCS/buffer.c,v 1.19 1995/08/24 17:46:28 lmjm Exp lmjm $";
- #endif
- 
--#ifndef __alpha
--#ifndef __ia64
-+#ifndef __linux
- extern char *shmat();
--#endif /* __ia64 */
--#endif /* __alpha */
-+#endif /* __linux */
- 
- /* General macros */
- #define TRUE 1
-@@ -139,6 +143,14 @@ extern char *shmat();
+@@ -139,6 +143,14 @@
  #define K *1024
  #define M *1024*1024
@@ -66 +46 @@
  void byee();
  void start_reader_and_writer();
-@@ -162,7 +174,7 @@ void write_block_to_stdout();
+@@ -162,7 +174,7 @@
  void pr_out();
  void end_writer();
@@ -75 +55 @@
  #define PRINT_EVERY 10 K
  
-@@ -253,7 +265,9 @@ char *progname = "buffer";
+@@ -253,7 +265,9 @@
  
  char print_total = 0;
@@ -86 +66 @@
  int
  main( argc, argv )
-@@ -265,6 +279,8 @@ main( argc, argv )
+@@ -265,6 +279,8 @@
     set_handlers();
  
@@ -95 +75 @@
     start_reader_and_writer();
  
-@@ -290,7 +306,7 @@ parse_args( argc, argv )
+@@ -290,7 +306,7 @@
  
     while( (c = getopt( argc, argv, "BS:Zdm:s:b:p:u:ti:o:z:" )) != -1 ){
@@ -104 +84 @@
             break;
         case 'u': /* pause after write for given microseconds */
-@@ -387,8 +403,8 @@ parse_args( argc, argv )
+@@ -387,8 +403,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 );
@@ -115 +95 @@
             fprintf( stderr, "-b num = number of blocks in queue\n" );
             fprintf( stderr, "-p percent = don't start writing until percent blocks filled\n" );
-@@ -400,6 +416,11 @@ parse_args( argc, argv )
+@@ -400,6 +416,11 @@
             byee( -1 );
         }
@@ -127 +107 @@
     if (zflag) showevery = blocksize;
  
-@@ -510,9 +531,9 @@ buffer_allocate()
+@@ -510,9 +531,9 @@
     get_buffer();
  
@@ -139 +119 @@
  #ifdef SYS5
     memset( (char *)pbuffer, '\0', buffer_size );
-@@ -531,7 +552,17 @@ buffer_allocate()
+@@ -531,7 +552,17 @@
     pbuffer->blocks_free_lock = 1;
     /* start this off so lock() can be called on it for each block
@@ -157 +137 @@
     /* Detattach the shared memory so the fork doesnt do anything odd */
     shmdt( (char *)pbuffer );
-@@ -651,7 +682,7 @@ get_next_free_block()
+@@ -651,7 +682,7 @@
  int
  fill_block()
@@ -166 +146 @@
     int toread;
     static char eof_reached = 0;
-@@ -710,7 +741,7 @@ writer()
+@@ -710,7 +741,7 @@
  {
     int filled = 0;
@@ -175 +155 @@
     if( debug )
         fprintf( stderr, "\tW: Entering writer\n blocks = %d\n maxfilled = %d\n",
-@@ -745,7 +776,7 @@ writer()
+@@ -745,7 +776,7 @@
     }
  
@@ -184 +164 @@
  
     if( debug )
-@@ -786,14 +817,14 @@ write_blocks_to_stdout( filled, first_bl
+@@ -786,14 +817,14 @@
  void
  write_block_to_stdout()
@@ -202 +182 @@
         next_k = showevery;
     }
-@@ -801,7 +832,7 @@ write_block_to_stdout()
+@@ -801,7 +832,7 @@
     if( (written = write( fdout, curr_block->data, curr_block->bytes )) != curr_block->bytes ){
         report_proc();
@@ -211 +191 @@
     }
  
-@@ -828,7 +859,7 @@ write_block_to_stdout()
+@@ -828,7 +859,7 @@
     }
     if( showevery ){
@@ -220 +200 @@
         if( outk >= next_k ){
             pr_out();
-@@ -917,13 +948,12 @@ int
+@@ -917,13 +948,12 @@
  do_size( arg )
     char *arg;
@@ -238 +218 @@
     case 'M':
         ret = ret K K;
-@@ -944,7 +974,36 @@ do_size( arg )
+@@ -944,7 +974,36 @@
  void
  pr_out()
@@ -279 +259 @@
 --- buffer-1.19.orig/buffer.man 2000-01-04 03:44:32.000000000 +0100
 +++ buffer-1.19/buffer.man  2008-09-20 01:18:48.000000000 +0200
-@@ -37,7 +37,8 @@ Use the given file as the input file.  T
+@@ -37,7 +37,8 @@
  Use the given file as the output file.  The default is stdout.
  .TP
@@ -289 +269 @@
  .TP
  .B \-s size
-@@ -71,9 +72,9 @@ After every write pause for this many mi
+@@ -71,9 +72,9 @@
  throughput on some drives.)
  .TP
@@ -301 +281 @@
  .B \-t
  On exiting print to stderr a brief message showing the total number of
-@@ -82,7 +83,7 @@ bytes written.
+@@ -82,7 +83,7 @@
  .B \-Z
  If reading/writing directly to a character device (like a tape drive)
@@ -529 +509 @@
  #include <sys/stat.h>
  #include <sys/ipc.h>
-@@ -103,7 +119,7 @@ new_sems( nsems )
+@@ -103,7 +119,7 @@
     return sem;
  }
@@ -538 +518 @@
     int sem_id;
     struct sembuf *pbuf;
-@@ -157,10 +173,13 @@ void
+@@ -156,10 +157,13 @@
  remove_sems( sem_id )
     int sem_id;
@@ -547 +527 @@
         return;
  
--   if( semctl( sem_id, 0, IPC_RMID, (union semun)0 ) == -1 ){
+-   if( semctl( sem_id, 0, IPC_RMID, NULL ) == -1 ){
 +   arg.val = 0;
 +   if( semctl( sem_id, 0, IPC_RMID, arg ) == -1 ){

projects/buffer/pbconf/1.19/pbfilter/rpm.pbf

@@ -22 +22 @@
 #filter PBOBS =
 
-filter PBBREQ = BuildRequires:  gcc\nBuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+filter PBBREQ = BuildRequires:  gcc$/BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)