diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-09-19 17:53:02 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-09-19 17:53:02 +0000 |
commit | 16bf99274f8b2ad14864a53d85db021bb34c95ec (patch) | |
tree | 30412c0a9287d44752579510000aa002de3cb16b /app-arch/bsdsfv/files | |
parent | tidy (diff) | |
download | historical-16bf99274f8b2ad14864a53d85db021bb34c95ec.tar.gz historical-16bf99274f8b2ad14864a53d85db021bb34c95ec.tar.bz2 historical-16bf99274f8b2ad14864a53d85db021bb34c95ec.zip |
Added patch to work fine on 64bit arches. Don't let the package be stripped by the makefile. Respected the configured compiler.
Package-Manager: portage-2.0.52-r1
Diffstat (limited to 'app-arch/bsdsfv/files')
-rw-r--r-- | app-arch/bsdsfv/files/bsdsfv-1.18-64bit.patch | 85 | ||||
-rw-r--r-- | app-arch/bsdsfv/files/digest-bsdsfv-1.18-r1 | 1 |
2 files changed, 86 insertions, 0 deletions
diff --git a/app-arch/bsdsfv/files/bsdsfv-1.18-64bit.patch b/app-arch/bsdsfv/files/bsdsfv-1.18-64bit.patch new file mode 100644 index 000000000000..651b419ed6fe --- /dev/null +++ b/app-arch/bsdsfv/files/bsdsfv-1.18-64bit.patch @@ -0,0 +1,85 @@ +Index: bsdsfv/bsdsfv.c +=================================================================== +--- bsdsfv.orig/bsdsfv.c ++++ bsdsfv/bsdsfv.c +@@ -60,9 +60,13 @@ typedef struct sfvtable { + #include <sys/mman.h> + #include <dirent.h> + ++#ifdef __GLIBC__ ++#include <inttypes.h> ++#endif ++ + +-long +-UpdateCRC(unsigned long CRC, const char *buffer, long count) ++int32_t ++UpdateCRC(uint32_t CRC, const char *buffer, int32_t count) + { + /* + * Note: if you want to know how CRC32-checking works, I +@@ -70,7 +74,7 @@ UpdateCRC(unsigned long CRC, const char + * There is not much you can change in this function, so + * if you need a CRC32-check yourself, feel free to rip. + */ +- unsigned long CRCTABLE[] = { ++ uint32_t CRCTABLE[] = { + 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, + 0x706af48f, + 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, +@@ -175,13 +179,13 @@ UpdateCRC(unsigned long CRC, const char + + + +-long ++int32_t + GetFileCRC(char *filename) + { +- unsigned long crc = 0xffffffff; ++ uint32_t crc = 0xffffffff; + FILE *f; +- long totalread = 0; +- long localread; ++ int32_t totalread = 0; ++ int32_t localread; + + /* + * Note: different buffer sizes may result in noticable +@@ -306,7 +310,7 @@ main(int argc, char *argv[]) + FILE *missingfile; + DIR *dirp; + struct dirent *dp; +- long mycrc; ++ int32_t mycrc; + int cnt; + int dothisone; + char cfname[FNAMELEN]; +@@ -487,8 +491,8 @@ main(int argc, char *argv[]) + printf("Adding file: %s ... ", cfname); + fflush(stdout); + mycrc = GetFileCRC(cfname); +- printf("CRC = 0x%08lX\n", mycrc); +- sprintf(sfvline, "%s %08lX", cfname, mycrc); ++ printf("CRC = 0x%08" PRIX32 "\n", mycrc); ++ sprintf(sfvline, "%s %08" PRIX32, cfname, mycrc); + + // uncomment next 2 lines to + // convert filename to upper case, for whatever reason +@@ -516,7 +520,7 @@ main(int argc, char *argv[]) + printf("Testing %s ... ", cfname); + fflush(stdout); + mycrc = GetFileCRC(cfname); +- printf("local = 0x%08lX, listed = ", mycrc); ++ printf("local = 0x%08" PRIX32 ", listed = ", mycrc); + fflush(stdout); + + sfvfile = fopen(sfvname, "rt"); +@@ -675,7 +679,7 @@ main(int argc, char *argv[]) + + mycrc = GetFileCRC(dp->d_name); + +- printf("local = 0x%08lX ... ", mycrc); ++ printf("local = 0x%08" PRIX32 " ... ", mycrc); + + if (mycrc == sfvTable[cnt].crc) { + printf("OK\n"); diff --git a/app-arch/bsdsfv/files/digest-bsdsfv-1.18-r1 b/app-arch/bsdsfv/files/digest-bsdsfv-1.18-r1 new file mode 100644 index 000000000000..eb6674ae0796 --- /dev/null +++ b/app-arch/bsdsfv/files/digest-bsdsfv-1.18-r1 @@ -0,0 +1 @@ +MD5 381df19a827d5a20097ab95ea9e760fa bsdsfv-1.18.tar.gz 13301 |