SOURCES: bcm5820-link.patch (NEW), bcm5820-log.patch (NEW), bcm582...
qboosh
qboosh at pld-linux.org
Sun Sep 2 23:24:59 CEST 2007
Author: qboosh Date: Sun Sep 2 21:24:59 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- old RH fixes
---- Files affected:
SOURCES:
bcm5820-link.patch (NONE -> 1.1) (NEW), bcm5820-log.patch (NONE -> 1.1) (NEW), bcm5820-noclear.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/bcm5820-link.patch
diff -u /dev/null SOURCES/bcm5820-link.patch:1.1
--- /dev/null Sun Sep 2 23:24:59 2007
+++ SOURCES/bcm5820-link.patch Sun Sep 2 23:24:54 2007
@@ -0,0 +1,26 @@
+--- bcm5820-1.81/ubslib/Makefile.Linux.jj Fri Feb 22 17:33:06 2002
++++ bcm5820-1.81/ubslib/Makefile.Linux Fri Aug 23 08:33:46 2002
+@@ -46,13 +46,9 @@ LIBNAME=
+ RM = /bin/rm
+ RMFLAGS = -f
+
+-ifeq ($(shell `echo uname -a` | grep -i " ia64 "),$(shell `echo uname -a`))
+- LINUXIA64= -lgcc_s
+-endif
+-
+ # to build shared library
+ SHRCFLAGS = -O2 -ansi -pedantic -fPIC -c $(INCLUDES) -w $(DBGFLAGS)
+-SHRLDFLAGS = -shared $(LINUXIA64)
++SHRLDFLAGS = -shared -Wl,-soname=$(SHRBINNAME).0
+
+ SHRCFLAGS += $(BCM_OEM_DEFINES) -DUSER_APPLICATION
+
+@@ -96,7 +92,7 @@ CNPKCS11OBJ = \
+ endif
+
+ $(SHRBINNAME): $(SHROBJSUBSEC) $(LIBNAME) $(CNPKCS11OBJ)
+- $(ECHO) $(LD) -o $(SHRBINNAME) $(CNPKCS11OBJ) $(SHRLDFLAGS) $(SHROBJSUBSEC) \
++ $(ECHO) $(CC) -o $(SHRBINNAME) $(CNPKCS11OBJ) $(SHRLDFLAGS) $(SHROBJSUBSEC) \
+ $(LIBNAME)
+
+ clean:
================================================================
Index: SOURCES/bcm5820-log.patch
diff -u /dev/null SOURCES/bcm5820-log.patch:1.1
--- /dev/null Sun Sep 2 23:24:59 2007
+++ SOURCES/bcm5820-log.patch Sun Sep 2 23:24:54 2007
@@ -0,0 +1,14 @@
+--- bcm5820-1.81/snmp/get5820stats.log Fri Feb 22 17:33:06 2002
++++ bcm5820-1.81/snmp/get5820stats Tue Mar 12 18:39:19 2002
+@@ -9,8 +9,10 @@
+ exit 0
+ fi
+
++# Debug code?
++LOGFILE=`mktemp /tmp/passtest.log.XXXXXX`
+ if [ "$1" = "-s" ]; then
+- echo $* >> /tmp/snmpstats.log
++ echo $* >> $LOGFILE
+ exit 0
+ fi
+
================================================================
Index: SOURCES/bcm5820-noclear.patch
diff -u /dev/null SOURCES/bcm5820-noclear.patch:1.1
--- /dev/null Sun Sep 2 23:24:59 2007
+++ SOURCES/bcm5820-noclear.patch Sun Sep 2 23:24:54 2007
@@ -0,0 +1,64 @@
+Add a -n option which inhibits screen clearing when we're not in loop mode.
+--- ./stats/stats.c 2002-11-04 16:15:45.000000000 -0500
++++ ./stats/stats.c 2002-11-04 16:15:38.000000000 -0500
+@@ -72,7 +72,8 @@
+ key_mode = 0x0002,
+ ssl_mode = 0x0004,
+ loop_mode = 0x0100,
+- verbose_mode = 0x0200
++ verbose_mode = 0x0200,
++ clear_mode = 0x8000
+ };
+
+
+@@ -194,7 +195,8 @@
+
+ int i;
+
+- system("clear");
++ if(control_word & (clear_mode | loop_mode))
++ system("clear");
+ stats_printHeaderSimple(control_word);
+
+ if(current_device == num_devices)
+@@ -220,7 +222,8 @@
+
+ int i;
+
+- system("clear");
++ if(control_word & (clear_mode | loop_mode))
++ system("clear");
+ stats_printHeaderVerbose(control_word);
+
+ if(current_device == num_devices)
+@@ -357,6 +360,7 @@
+ printf("\t-v\t\tVerbose mode. Show more detailed statistics information\n\t\t\tincluding rate information.\n\n");
+ printf("\t-s [num]\tShow statistics for specified device only. Default is\n\t\t\tall devices.\n\n");
+ printf("\t-c\t\tShow statistics for crypto operations. Default is key\n\t\t\toperations only.\n\n");
++ printf("\t-n\t\tAvoid clearing the screen when not in loop mode.\n\n");
+ printf("\t-h\t\tDisplay usage information.\n\n");
+ }
+
+@@ -384,10 +388,11 @@
+ interval = 3;
+ control_word = 0;
+ control_word |= key_mode;
++ control_word |= clear_mode;
+
+ bzero(prev_stats, sizeof(ubsec_stats_t));
+
+- while ((c = getopt(argc, argv, "LlVvS:s:I:i:CcDdKkHh?")) != -1) {
++ while ((c = getopt(argc, argv, "LlVvS:s:I:i:CcDdKknHh?")) != -1) {
+ switch (c) {
+ case 'L':
+ case 'l':
+@@ -420,6 +425,9 @@
+ control_word &= (control_word & ~crypto_mode);
+ control_word |= key_mode;
+ break;
++ case 'n':
++ control_word &= (control_word & ~clear_mode);
++ break;
+ case 'H':
+ case 'h':
+ case '?':
================================================================
More information about the pld-cvs-commit
mailing list