| 1 |
vapier 10/01/31 06:21:07 |
| 2 |
|
| 3 |
Modified: xc-4.3.2-implicit-decl.patch xc-4.3.2-gentoo.patch |
| 4 |
xc-4.3.2-add-115200.patch |
| 5 |
Log: |
| 6 |
Fix multilib handling, more implicit decls, and improve crc output. |
| 7 |
(Portage version: 2.2_rc61/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 net-dialup/xc/files/xc-4.3.2-implicit-decl.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/xc/files/xc-4.3.2-implicit-decl.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/xc/files/xc-4.3.2-implicit-decl.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/xc/files/xc-4.3.2-implicit-decl.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: xc-4.3.2-implicit-decl.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-dialup/xc/files/xc-4.3.2-implicit-decl.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- xc-4.3.2-implicit-decl.patch 15 Apr 2007 11:36:51 -0000 1.1 |
| 23 |
+++ xc-4.3.2-implicit-decl.patch 31 Jan 2010 06:21:06 -0000 1.2 |
| 24 |
@@ -1,17 +1,16 @@ |
| 25 |
-diff -Nru xc-4.3.2.orig/crc.c xc-4.3.2/crc.c |
| 26 |
---- xc-4.3.2.orig/crc.c 1996-09-27 05:47:17.000000000 +0300 |
| 27 |
-+++ xc-4.3.2/crc.c 2007-04-15 14:34:09.000000000 +0300 |
| 28 |
-@@ -5,6 +5,7 @@ |
| 29 |
+--- xc-4.3.2/crc.c |
| 30 |
++++ xc-4.3.2/crc.c |
| 31 |
+@@ -5,6 +5,8 @@ |
| 32 |
* Crc - 32 BIT ANSI X3.66 CRC checksum files |
| 33 |
*/ |
| 34 |
#include <stdio.h> |
| 35 |
+#include <stdlib.h> |
| 36 |
++#include <string.h> |
| 37 |
#define OK 0 |
| 38 |
#define ERROR (-1) |
| 39 |
#define LINT_ARGS |
| 40 |
-diff -Nru xc-4.3.2.orig/xcterm.c xc-4.3.2/xcterm.c |
| 41 |
---- xc-4.3.2.orig/xcterm.c 1996-09-25 06:58:31.000000000 +0300 |
| 42 |
-+++ xc-4.3.2/xcterm.c 2007-04-15 14:33:46.000000000 +0300 |
| 43 |
+--- xc-4.3.2/xcterm.c |
| 44 |
++++ xc-4.3.2/xcterm.c |
| 45 |
@@ -4,6 +4,8 @@ |
| 46 |
#define XCTERM_C 1 |
| 47 |
|
| 48 |
|
| 49 |
|
| 50 |
|
| 51 |
1.2 net-dialup/xc/files/xc-4.3.2-gentoo.patch |
| 52 |
|
| 53 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/xc/files/xc-4.3.2-gentoo.patch?rev=1.2&view=markup |
| 54 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/xc/files/xc-4.3.2-gentoo.patch?rev=1.2&content-type=text/plain |
| 55 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/xc/files/xc-4.3.2-gentoo.patch?r1=1.1&r2=1.2 |
| 56 |
|
| 57 |
Index: xc-4.3.2-gentoo.patch |
| 58 |
=================================================================== |
| 59 |
RCS file: /var/cvsroot/gentoo-x86/net-dialup/xc/files/xc-4.3.2-gentoo.patch,v |
| 60 |
retrieving revision 1.1 |
| 61 |
retrieving revision 1.2 |
| 62 |
diff -u -r1.1 -r1.2 |
| 63 |
--- xc-4.3.2-gentoo.patch 18 Oct 2008 09:15:32 -0000 1.1 |
| 64 |
+++ xc-4.3.2-gentoo.patch 31 Jan 2010 06:21:06 -0000 1.2 |
| 65 |
@@ -1,7 +1,6 @@ |
| 66 |
-diff -ur xc-4.3.2.orig/Makefile xc-4.3.2/Makefile |
| 67 |
---- xc-4.3.2.orig/Makefile 1996-11-24 06:56:14.000000000 +0000 |
| 68 |
-+++ xc-4.3.2/Makefile 2008-10-18 09:06:12.000000000 +0000 |
| 69 |
-@@ -5,21 +5,23 @@ |
| 70 |
+--- xc-4.3.2/Makefile |
| 71 |
++++ xc-4.3.2/Makefile |
| 72 |
+@@ -5,21 +5,24 @@ |
| 73 |
|
| 74 |
SHELL = /bin/sh |
| 75 |
|
| 76 |
@@ -15,7 +14,8 @@ |
| 77 |
+#CC = gcc |
| 78 |
+GCCOPT = -fno-strength-reduce |
| 79 |
#GCCOPT = -O -g |
| 80 |
- CDEFS = -D_POSIX_SOURCE=1 |
| 81 |
+-CDEFS = -D_POSIX_SOURCE=1 |
| 82 |
++CDEFS = -D_XOPEN_SOURCE |
| 83 |
-CFLAGS = $(WARN) $(CDEFS) $(GCCOPT) |
| 84 |
+CFLAGS += $(WARN) $(CDEFS) $(GCCOPT) |
| 85 |
|
| 86 |
@@ -25,6 +25,7 @@ |
| 87 |
libdir = $(prefix)/lib/xc |
| 88 |
-mandir = /usr/man/man1 |
| 89 |
+mandir = /usr/share/man |
| 90 |
++man1dir = $(mandir)/man1 |
| 91 |
catdir = /var/catman/cat1 |
| 92 |
-manown = -o root -g man |
| 93 |
+manown = -o root -g root |
| 94 |
@@ -45,11 +46,11 @@ |
| 95 |
|
| 96 |
xc: $(OBJS) eline |
| 97 |
- $(CC) $(CFLAGS) $(OBJS) -o xc $(LDFLAGS) |
| 98 |
-+ $(CC) $(LDFLAGS) $(OBJS) -o xc $(LIBS) |
| 99 |
++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o xc $(LIBS) |
| 100 |
|
| 101 |
uninstall: |
| 102 |
rm -f $(bindir)/xc $(mandir)/xc.1 $(catdir)/xc.1.* |
| 103 |
-@@ -64,10 +66,10 @@ |
| 104 |
+@@ -64,10 +66,9 @@ |
| 105 |
|
| 106 |
install: ./bin/xc ./bin/crc xc.1 crc.1 |
| 107 |
@echo " " |
| 108 |
@@ -57,39 +58,46 @@ |
| 109 |
- $(INSTALL) $(binown) -m 755 -s ./bin/crc $(bindir) |
| 110 |
- $(INSTALL) $(manown) -m 644 xc.1 $(mandir) |
| 111 |
- $(INSTALL) $(manown) -m 644 crc.1 $(mandir) |
| 112 |
-+ $(INSTALL) $(binown) -m 755 ./bin/xc $(DESTDIR)$(bindir) |
| 113 |
-+ $(INSTALL) $(binown) -m 755 ./bin/crc $(DESTDIR)$(bindir) |
| 114 |
-+ $(INSTALL) $(manown) -m 644 xc.1 $(DESTDIR)$(mandir)/man1 |
| 115 |
-+ $(INSTALL) $(manown) -m 644 crc.1 $(DESTDIR)$(mandir)/man1 |
| 116 |
++ $(INSTALL) -d -m755 $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) |
| 117 |
++ $(INSTALL) $(binown) -m 755 xc crc $(DESTDIR)$(bindir) |
| 118 |
++ $(INSTALL) $(manown) -m 644 xc.1 crc.1 $(DESTDIR)$(man1dir) |
| 119 |
@echo " " |
| 120 |
@echo " " |
| 121 |
@echo "You will want to manually install 'phonelist' and" |
| 122 |
-@@ -113,7 +115,6 @@ |
| 123 |
- bin: xc crc |
| 124 |
- cp ./xc ./bin |
| 125 |
- cp ./crc ./bin |
| 126 |
-- strip ./bin/xc ./bin/crc |
| 127 |
- |
| 128 |
- ######################################### |
| 129 |
- ## mostly unused stuff below here ... ## |
| 130 |
-diff -ur xc-4.3.2.orig/xcsubs.c xc-4.3.2/xcsubs.c |
| 131 |
---- xc-4.3.2.orig/xcsubs.c 1996-09-21 08:22:17.000000000 +0000 |
| 132 |
-+++ xc-4.3.2/xcsubs.c 2008-10-18 09:04:32.000000000 +0000 |
| 133 |
-@@ -23,7 +23,7 @@ |
| 134 |
+--- xc-4.3.2/xcsubs.c |
| 135 |
++++ xc-4.3.2/xcsubs.c |
| 136 |
+@@ -23,7 +23,6 @@ |
| 137 |
*tgetstr(), *tgoto(); |
| 138 |
int LI, /* One less than screen length in termcap entry */ |
| 139 |
CO; /* Screen width */ |
| 140 |
-speed_t ospeed; /* Used by termcap lib */ |
| 141 |
-+//speed_t ospeed; /* Used by termcap lib */ |
| 142 |
static char tc[LG_BUFF]; /* termcap buffer */ |
| 143 |
static char tbuf[LG_BUFF], *CD, *CF, *CL, *CM, *CN, *AE, *SE, *SO, *ME; |
| 144 |
char *CE, PC; /* used by termcap -- padding character */ |
| 145 |
-@@ -410,7 +410,7 @@ |
| 146 |
+ |
| 147 |
+limit the 32bit crc to 32bits |
| 148 |
+ |
| 149 |
+add simple usage |
| 150 |
+ |
| 151 |
+--- xc-4.3.2/crc.c |
| 152 |
++++ xc-4.3.2/crc.c |
| 153 |
+@@ -152,7 +152,7 @@ char *name; |
| 154 |
+ } |
| 155 |
+ crc32 = oldcrc32; oldcrc = oldcrc32 = ~oldcrc32; |
| 156 |
+ |
| 157 |
+- printf("%08lx %7ld ", oldcrc, charcnt); |
| 158 |
++ printf("%08lx %7ld ", oldcrc & 0xffffffff, charcnt); |
| 159 |
+ if (Block == 128) |
| 160 |
+ printf("%5ld+%3ld ", charcnt/Block, charcnt%Block); |
| 161 |
+ if (Block == 1024) |
| 162 |
+@@ -170,6 +170,10 @@ char **argv; |
| 163 |
{ |
| 164 |
- struct stat statbuf; |
| 165 |
+ register errors = 0; |
| 166 |
|
| 167 |
-- if (stat(pathname,&statbuf) || (statbuf.st_mode & S_IFMT) != S_IFREG) |
| 168 |
-+ if (stat(pathname,&statbuf) || (statbuf.st_mode & __S_IFMT) != __S_IFREG) |
| 169 |
- return NIL(FILE); |
| 170 |
- return fopen(pathname, "r"); |
| 171 |
- } |
| 172 |
++ if (argc == 1) { |
| 173 |
++ puts("Usage: crc [-x|-k] <files>\n -x pad to 128 bytes\n -k pad to 1024 bytes"); |
| 174 |
++ exit(0); |
| 175 |
++ } |
| 176 |
+ if (argc > 1) { |
| 177 |
+ if (!strcmp(argv[1], "-x")) { |
| 178 |
+ Block = 128; |
| 179 |
|
| 180 |
|
| 181 |
|
| 182 |
1.2 net-dialup/xc/files/xc-4.3.2-add-115200.patch |
| 183 |
|
| 184 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/xc/files/xc-4.3.2-add-115200.patch?rev=1.2&view=markup |
| 185 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/xc/files/xc-4.3.2-add-115200.patch?rev=1.2&content-type=text/plain |
| 186 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/xc/files/xc-4.3.2-add-115200.patch?r1=1.1&r2=1.2 |
| 187 |
|
| 188 |
Index: xc-4.3.2-add-115200.patch |
| 189 |
=================================================================== |
| 190 |
RCS file: /var/cvsroot/gentoo-x86/net-dialup/xc/files/xc-4.3.2-add-115200.patch,v |
| 191 |
retrieving revision 1.1 |
| 192 |
retrieving revision 1.2 |
| 193 |
diff -u -r1.1 -r1.2 |
| 194 |
--- xc-4.3.2-add-115200.patch 16 Jan 2004 10:50:38 -0000 1.1 |
| 195 |
+++ xc-4.3.2-add-115200.patch 31 Jan 2010 06:21:06 -0000 1.2 |
| 196 |
@@ -1,6 +1,8 @@ |
| 197 |
---- xcport.c.orig 2004-01-16 05:11:34.131877776 -0500 |
| 198 |
-+++ xcport.c 2004-01-16 05:13:52.459848728 -0500 |
| 199 |
-@@ -107,6 +107,7 @@ static struct { |
| 200 |
+add support for 115200 baud |
| 201 |
+ |
| 202 |
+--- xc-4.3.2/xcport.c |
| 203 |
++++ xc-4.3.2/xcport.c |
| 204 |
+@@ -107,6 +107,7 @@ |
| 205 |
{"38400",38400,B38400}, |
| 206 |
{"57600",57600,B50}, |
| 207 |
#endif |
Archives