cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 0.11.8; from Andrew Dalgleish <openbsd@ajd.net.au>

Browse Source
This commit is contained in:
naddy 2004-01-14 22:19:28 +00:00
parent 8ddaa04e8e
commit cf8717a0c6
7 changed files with 135 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
devel/gputils/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.1.1.1 2003/11/03 01:02:34 naddy Exp $
# $OpenBSD: Makefile,v 1.2 2004/01/14 22:19:28 naddy Exp $
COMMENT= "GNU PIC assembler and utilities"
VERSION= 0.11.7
VERSION= 0.11.8
DISTNAME= gputils-${VERSION}
DIST_SUBDIR= gputils
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} gputils-testsuite-${VERSION}${EXTRACT_SUFX}:0
@ -33,13 +33,14 @@ CONFIGURE_ENV= "CC=${CC}" "CPP=${CPP}" "CFLAGS=${CFLAGS}" "CPPFLAGS=${CPPFLAGS}
# Commands used to create the testsuite tarball
# I put these here mainly for documentation, but if you can't fetch
# the tarball from MASTER_SITES0, this should be 100% reproducable.
# the tarball from MASTER_SITES0, this should be 100% reproducible.
# (I use find|pax to create the tarballs without directory timestamps.)
create-testsuite-tarball:
rm -fr gputils/ gputils-${VERSION}
cvs -z3 -d:pserver:anonymous@cvs.gputils.sourceforge.net:/cvsroot/gputils login
cvs -z3 -d:pserver:anonymous@cvs.gputils.sourceforge.net:/cvsroot/gputils export -r gputils-${VERSION:S/./_/g} gputils/gpasm/testsuite > /dev/null
mv gputils gputils-${VERSION}
find gputils-${VERSION} -type d -print0 | xargs -0 touch -am -t 0000000000
tar czf ${FULLDISTDIR}/gputils-testsuite-${VERSION}.tar.gz gputils-${VERSION}/gpasm/testsuite/
find gputils-${VERSION}/gpasm/testsuite/ -type f | pax -wzf ${FULLDISTDIR}/gputils-testsuite-${VERSION}.tar.gz
rm -fr gputils/ gputils-${VERSION}
do-regress:

12
devel/gputils/distinfo
View File

@ -1,6 +1,6 @@
MD5 (gputils/gputils-0.11.7.tar.gz) = b050ec0a2797440c266e03994cffffe2
MD5 (gputils/gputils-testsuite-0.11.7.tar.gz) = 0bbfaf99138237849a433f31cb956f18
RMD160 (gputils/gputils-0.11.7.tar.gz) = 6414594af4c12856a2d2d3633c207984736aeea8
RMD160 (gputils/gputils-testsuite-0.11.7.tar.gz) = b2323469c6f0a0c08f3db78155b3605bfd0a6ff3
SHA1 (gputils/gputils-0.11.7.tar.gz) = 84226bc31b25cc3c3f1b04aa192825f3b7b5daa0
SHA1 (gputils/gputils-testsuite-0.11.7.tar.gz) = 15b987a9e743b779c68edd47a39caa47c3e2aeb4
MD5 (gputils/gputils-0.11.8.tar.gz) = 06b70d81d9fdf5ddcd96791acf93eac6
MD5 (gputils/gputils-testsuite-0.11.8.tar.gz) = 56794dfa94c995f11487a83d2de0378c
RMD160 (gputils/gputils-0.11.8.tar.gz) = e4bf74b00127408ef299dc10a8315a144397d05f
RMD160 (gputils/gputils-testsuite-0.11.8.tar.gz) = acf6abd6691a920eadd3a641d1c73fd563c2e5d8
SHA1 (gputils/gputils-0.11.8.tar.gz) = 164a520b64ed3319c8b2392d8179be71dbe822e5
SHA1 (gputils/gputils-testsuite-0.11.8.tar.gz) = ff8dc51c6822f61d90bac66d6f74a86534940d80

27
devel/gputils/patches/patch-gputils_block_c Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-gputils_block_c,v 1.1 2004/01/14 22:19:29 naddy Exp $
--- gputils/block.c.orig 2003-10-19 22:14:02.000000000 +1000
+++ gputils/block.c 2003-10-19 22:14:48.000000000 +1000
@@ -44,18 +44,18 @@ void directory_block(void)
printf("Source file %s\n",
&block[COD_DIR_SOURCE]);
printf("Date %s\n",
- substr(temp_buf,&block[COD_DIR_DATE],7));
+ substr(temp_buf, sizeof(temp_buf), &block[COD_DIR_DATE],7));
printf("Time %2d:%2d\n",
gp_getl16(&block[COD_DIR_TIME]) / 100,
gp_getl16(&block[COD_DIR_DATE]) % 100);
printf("Compiler version %s\n",
- substr(temp_buf,&block[COD_DIR_VERSION],19));
+ substr(temp_buf, sizeof(temp_buf), &block[COD_DIR_VERSION],19));
printf("Compiler %s\n",
- substr(temp_buf,&block[COD_DIR_COMPILER],12));
+ substr(temp_buf, sizeof(temp_buf), &block[COD_DIR_COMPILER],12));
printf("Notice %s\n",
- substr(temp_buf,&block[COD_DIR_NOTICE],64));
+ substr(temp_buf, sizeof(temp_buf), &block[COD_DIR_NOTICE],64));
- processor_name = substr(temp_buf,&block[COD_DIR_PROCESSOR],8);
+ processor_name = substr(temp_buf, sizeof(temp_buf), &block[COD_DIR_PROCESSOR],8);
printf("Processor %s\n", processor_name);
processor_info = gp_find_processor(processor_name);

57
devel/gputils/patches/patch-gputils_dump_c
View File

@ -1,8 +1,46 @@
$OpenBSD: patch-gputils_dump_c,v 1.1.1.1 2003/11/03 01:02:36 naddy Exp $
--- gputils/dump.c.orig 2003-10-14 21:56:07.000000000 +1000
+++ gputils/dump.c 2003-10-14 22:16:52.000000000 +1000
@@ -336,9 +336,11 @@ void dump_source_files( void )
substr(b,&temp[offset+1],FILE_SIZE);
$OpenBSD: patch-gputils_dump_c,v 1.2 2004/01/14 22:19:29 naddy Exp $
--- gputils/dump.c.orig 2003-10-09 15:18:27.000000000 +1000
+++ gputils/dump.c 2003-10-19 22:13:53.000000000 +1000
@@ -28,10 +28,12 @@ Boston, MA 02111-1307, USA. */
int number_of_source_files = 0;
-char *substr(char *a, char *b, int n)
+char *substr(char *a, size_t sizeof_a, char *b, size_t n)
{
- *a = 0;
- return strncat(a,b,n);
+ strlcpy(a, b, sizeof_a);
+ if (n < sizeof_a)
+ a[n] = 0;
+ return a;
}
@@ -241,7 +243,7 @@ void dump_symbols( void )
if(temp[i*SSYMBOL_SIZE + SR_NAME])
printf("%s = %x, type = %s\n",
- substr(b,&temp[i*SSYMBOL_SIZE + SR_NAME],12),
+ substr(b, sizeof(b), &temp[i*SSYMBOL_SIZE + SR_NAME],12),
gp_getl16(&temp[i*SSYMBOL_SIZE + SR_VALUE]),
SymbolType4[(unsigned char)temp[i*SSYMBOL_SIZE + SR_TYPE]]
);
@@ -293,7 +295,7 @@ void dump_lsymbols( void )
value = gp_getb32(&s[length+3]);
printf("%s = %x, type = %s\n",
- substr(b,&s[1],length),
+ substr(b, sizeof(b), &s[1],length),
value,
SymbolType4[type]);
i += (length + 7);
@@ -333,12 +335,14 @@ void dump_source_files( void )
for(i=0; i<FILES_PER_BLOCK; i++) {
offset = i*FILE_SIZE;
- substr(b,&temp[offset+1],FILE_SIZE);
+ substr(b, sizeof(b), &temp[offset+1],FILE_SIZE);
if(temp[offset]) {
- source_file_names[number_of_source_files] =
@ -16,3 +54,12 @@ $OpenBSD: patch-gputils_dump_c,v 1.1.1.1 2003/11/03 01:02:36 naddy Exp $
printf("%s\n",source_file_names[number_of_source_files]);
source_files[number_of_source_files] =
fopen(source_file_names[number_of_source_files],"rt");
@@ -464,7 +468,7 @@ void dump_message_area(void)
DebugType = temp[j++];
- substr(DebugMessage,&temp[j],64);
+ substr(DebugMessage, sizeof(DebugMessage), &temp[j],64);
j += strlen(DebugMessage);
printf("%8x %2d %s\n",laddress, DebugType, DebugMessage);

11
devel/gputils/patches/patch-gputils_dump_h Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-gputils_dump_h,v 1.1 2004/01/14 22:19:29 naddy Exp $
--- gputils/dump.h.orig 2003-10-19 22:12:20.000000000 +1000
+++ gputils/dump.h 2003-10-19 22:12:49.000000000 +1000
@@ -33,6 +33,6 @@ void dump_message_area(void);
void dump_local_vars(void);
unsigned short get_short_int( char * buff);
-char *substr(char *a, char *b, int n);
+char *substr(char *a, size_t sizeof_a, char *b, size_t n);
#endif

19
devel/gputils/patches/patch-libgputils_gparchive_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-libgputils_gparchive_c,v 1.1.1.1 2003/11/03 01:02:36 naddy Exp $
$OpenBSD: patch-libgputils_gparchive_c,v 1.2 2004/01/14 22:19:29 naddy Exp $
--- libgputils/gparchive.c.orig 2003-03-31 16:49:39.000000000 +1000
+++ libgputils/gparchive.c 2003-10-14 23:08:45.000000000 +1000
+++ libgputils/gparchive.c 2003-11-23 12:55:02.000000000 +1100
@@ -50,7 +50,7 @@ gp_archive_member_name(gp_archive_type *
char name[256];
char *end;
@ -102,7 +102,20 @@ $OpenBSD: patch-libgputils_gparchive_c,v 1.1.1.1 2003/11/03 01:02:36 naddy Exp $
newmember->next = archive;
archive = newmember;
@@ -601,7 +609,7 @@ gp_archive_print_table(struct symbol_tab
@@ -493,8 +501,10 @@ gp_archive_add_index(struct symbol_table
/* write the symbol names to the member */
for (i = 0; i < table->count; i++) {
- strcpy(ptr, get_symbol_name(lst[i]));
- ptr += strlen(get_symbol_name(lst[i])) + 1;
+ const char* symbol_name = get_symbol_name(lst[i]);
+ const size_t symbol_len = strlen(symbol_name) + 1;
+ memcpy(ptr, symbol_name, symbol_len);
+ ptr += symbol_len;
}
return archive;
@@ -601,7 +611,7 @@ gp_archive_print_table(struct symbol_tab
member = get_symbol_annotation(lst[i]);
assert(member != NULL);
/* determine the archive member name */

21
devel/gputils/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2003/11/03 01:02:37 naddy Exp $
@comment $OpenBSD: PLIST,v 1.2 2004/01/14 22:19:29 naddy Exp $
bin/gpasm
bin/gpdasm
bin/gplib
@ -17,6 +17,7 @@ share/doc/gputils/gputils.pdf
share/doc/gputils/gputils.ps
share/gputils/header/mcp250xx.inc
share/gputils/header/memory.inc
share/gputils/header/migrate.inc
share/gputils/header/p12c508.inc
share/gputils/header/p12c508a.inc
share/gputils/header/p12c509.inc
@ -107,6 +108,7 @@ share/gputils/header/p16f630.inc
share/gputils/header/p16f648a.inc
share/gputils/header/p16f676.inc
share/gputils/header/p16f684.inc
share/gputils/header/p16f688.inc
share/gputils/header/p16f716.inc
share/gputils/header/p16f72.inc
share/gputils/header/p16f73.inc
@ -200,7 +202,7 @@ share/gputils/header/p18f8620.inc
share/gputils/header/p18f8621.inc
share/gputils/header/p18f8680.inc
share/gputils/header/p18f8720.inc
share/gputils/header/p18macro.inc
share/gputils/header/ps500.inc
share/gputils/header/rf509af.inc
share/gputils/header/rf509ag.inc
share/gputils/header/rf675f.inc
@ -219,6 +221,7 @@ share/gputils/lkr/12ce674.lkr
share/gputils/lkr/12cr509a.lkr
share/gputils/lkr/12f629.lkr
share/gputils/lkr/12f629i.lkr
share/gputils/lkr/12f635.lkr
share/gputils/lkr/12f675.lkr
share/gputils/lkr/12f675i.lkr
share/gputils/lkr/14000.lkr
@ -323,11 +326,14 @@ share/gputils/lkr/16f628a.lkr
share/gputils/lkr/16f628ai.lkr
share/gputils/lkr/16f630.lkr
share/gputils/lkr/16f630i.lkr
share/gputils/lkr/16f636.lkr
share/gputils/lkr/16f648a.lkr
share/gputils/lkr/16f648ai.lkr
share/gputils/lkr/16f676.lkr
share/gputils/lkr/16f676i.lkr
share/gputils/lkr/16f684.lkr
share/gputils/lkr/16f688.lkr
share/gputils/lkr/16f688i.lkr
share/gputils/lkr/16f716.lkr
share/gputils/lkr/16f72.lkr
share/gputils/lkr/16f73.lkr
@ -349,8 +355,6 @@ share/gputils/lkr/16f819i.lkr
share/gputils/lkr/16f83.lkr
share/gputils/lkr/16f84.lkr
share/gputils/lkr/16f84a.lkr
share/gputils/lkr/16f85.lkr
share/gputils/lkr/16f86.lkr
share/gputils/lkr/16f87.lkr
share/gputils/lkr/16f870.lkr
share/gputils/lkr/16f870i.lkr
@ -408,9 +412,11 @@ share/gputils/lkr/18f2220i.lkr
share/gputils/lkr/18f2320.lkr
share/gputils/lkr/18f2320i.lkr
share/gputils/lkr/18f2331.lkr
share/gputils/lkr/18f2331i.lkr
share/gputils/lkr/18f242.lkr
share/gputils/lkr/18f242i.lkr
share/gputils/lkr/18f2431.lkr
share/gputils/lkr/18f2431i.lkr
share/gputils/lkr/18f2439.lkr
share/gputils/lkr/18f2439i.lkr
share/gputils/lkr/18f248.lkr
@ -426,14 +432,18 @@ share/gputils/lkr/18f258i.lkr
share/gputils/lkr/18f2610.lkr
share/gputils/lkr/18f2620.lkr
share/gputils/lkr/18f2620_e.lkr
share/gputils/lkr/18f2620i.lkr
share/gputils/lkr/18f2620i_e.lkr
share/gputils/lkr/18f4220.lkr
share/gputils/lkr/18f4220i.lkr
share/gputils/lkr/18f4320.lkr
share/gputils/lkr/18f4320i.lkr
share/gputils/lkr/18f4331.lkr
share/gputils/lkr/18f4331i.lkr
share/gputils/lkr/18f442.lkr
share/gputils/lkr/18f442i.lkr
share/gputils/lkr/18f4431.lkr
share/gputils/lkr/18f4431i.lkr
share/gputils/lkr/18f4439.lkr
share/gputils/lkr/18f4439i.lkr
share/gputils/lkr/18f448.lkr
@ -449,6 +459,8 @@ share/gputils/lkr/18f458i.lkr
share/gputils/lkr/18f4610.lkr
share/gputils/lkr/18f4620.lkr
share/gputils/lkr/18f4620_e.lkr
share/gputils/lkr/18f4620i.lkr
share/gputils/lkr/18f4620i_e.lkr
share/gputils/lkr/18f6520.lkr
share/gputils/lkr/18f6520i.lkr
share/gputils/lkr/18f6525.lkr
@ -479,6 +491,7 @@ share/gputils/lkr/18f8720.lkr
share/gputils/lkr/18f8720i.lkr
share/gputils/lkr/hcs1365.lkr
share/gputils/lkr/hcs1370.lkr
share/gputils/lkr/ps500.lkr
share/gputils/lkr/rf509af.lkr
share/gputils/lkr/rf509ag.lkr
share/gputils/lkr/rf675f.lkr