[med-svn] [Git][med-team/acedb][master] Fix patch from last upload
Andreas Tille (@tille)
gitlab at salsa.debian.org
Sun Oct 25 09:17:53 GMT 2026
Andreas Tille pushed to branch master at Debian Med / acedb
Commits:
a489b112 by Andreas Tille at 2026-10-25T10:16:57+01:00
Fix patch from last upload
- - - - -
2 changed files:
- debian/changelog
- debian/patches/s390x.patch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+acedb (4.9.39+dfsg.02-13) UNRELEASED; urgency=medium
+
+ * Fix patch from last upload
+
+ -- Pranav P <pranav.p7 at ibm.com> Sun, 25 Oct 2026 10:16:30 +0100
+
acedb (4.9.39+dfsg.02-12) unstable; urgency=medium
* Team upload.
=====================================
debian/patches/s390x.patch
=====================================
@@ -1,37 +1,49 @@
Author: Pranav P pranav.p7 at ibm.com>
-Last-Update: 2026-10-23
+Last-Update: 2026-10-25
Bug-Debian: https://bugs.debian.org/1151434
Description: Fix autopkgtest on s390x
Forwarded: no (upstream is inactive)
+diff --git a/w9/dbidx.c b/w9/dbidx.c
+index b7785ea..a453bf5 100644
--- a/w9/dbidx.c
+++ b/w9/dbidx.c
-@@ -37,10 +37,12 @@
- *-------------------------------------------------------------------
- */
-
-+#include "os.h"
- #include "dbidx.h"
+@@ -41,14 +41,24 @@
#include <string.h>
#include <ctype.h>
#include <stdarg.h>
+-
+#include <stdint.h>
-
++
++#if defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) /* GCC, Clang, Open XL */
++# define HOST_BIG_ENDIAN (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
++#elif defined(__BIG_ENDIAN__) /* IBM XL C */
++# define HOST_BIG_ENDIAN 1
++#elif defined(_MSC_VER) || defined(__LITTLE_ENDIAN__) /* MSVC targets are little-endian */
++# define HOST_BIG_ENDIAN 0
++#else
++# error "Cannot determine host byte order: define HOST_BIG_ENDIAN to 0 or 1"
++#endif
#define MAXLINE 1024
-@@ -48,7 +50,11 @@
+
/* Global variables */
char dbsource[32]="";
-+#if BIG_ENDIAN
-+int Reversebytes = 0;
-+#else
- int Reversebytes = 1;
-+#endif
+-int Reversebytes = 1;
++int Reversebytes = !HOST_BIG_ENDIAN;
int search = 0;
int display_head = 0;
int fasta = 0;
-@@ -119,14 +125,21 @@ Header *readheader(FILE *idx)
+@@ -86,7 +96,6 @@ void strcpy_noCR(char *dest, char *src)
+ if ((int)src[i] != 13) dest[j++] = src[i];
+ }
+
+-
+ /* REVERSEBYTES changes order of n bytes at location ptr
+ max capacity 256 bytes
+ */
+@@ -119,14 +128,21 @@ Header *readheader(FILE *idx)
}
rewind(idx);
@@ -40,9 +52,6 @@ Forwarded: no (upstream is inactive)
- if (fread(&head->nrecords, 4, 1, idx) != 1) return NULL;
- if (Reversebytes) reversebytes((char *)&head->nrecords, 4);
--
-- if (fread(&head->record_size, 2, 1, idx) != 1) return NULL;
-- if (Reversebytes) reversebytes((char *)&head->record_size, 2);
+ uint32_t tmp_file_size;
+ if (fread(&tmp_file_size, 4, 1, idx) != 1) return NULL;
+ if (Reversebytes) reversebytes((char *)&tmp_file_size, 4);
@@ -52,7 +61,9 @@ Forwarded: no (upstream is inactive)
+ if (fread(&tmp_nrecords, 4, 1, idx) != 1) return NULL;
+ if (Reversebytes) reversebytes((char *)&tmp_nrecords, 4);
+ head->nrecords = tmp_nrecords;
-+
+
+- if (fread(&head->record_size, 2, 1, idx) != 1) return NULL;
+- if (Reversebytes) reversebytes((char *)&head->record_size, 2);
+ uint16_t tmp_rec_size;
+ if (fread(&tmp_rec_size, 2, 1, idx) != 1) return NULL;
+ if (Reversebytes) reversebytes((char *)&tmp_rec_size, 2);
@@ -60,20 +71,19 @@ Forwarded: no (upstream is inactive)
head->entry_name_size = head->record_size - 10;
/* Each record has 10 bytes in use (ver. 1.4)*/
-@@ -172,11 +185,15 @@ Acnum *readActrg(FILE *idx, Header *head
+@@ -172,11 +188,15 @@ Acnum *readActrg(FILE *idx, Header *head, int pos)
fseek(idx, 300 + head->record_size*pos, 0);
- if (fread(&rec.nhits, 4, 1, idx) != 1) return NULL;
- if (Reversebytes) reversebytes((char *)&rec.nhits, 4);
--
-- if (fread(&rec.hit_rec_num, 4, 1, idx) != 1) return NULL;
-- if (Reversebytes) reversebytes((char *)&rec.hit_rec_num, 4);
+ uint32_t tmp_nhits;
+ if (fread(&tmp_nhits, 4, 1, idx) != 1) return NULL;
+ if (Reversebytes) reversebytes((char *)&tmp_nhits, 4);
+ rec.nhits = tmp_nhits;
-+
+
+- if (fread(&rec.hit_rec_num, 4, 1, idx) != 1) return NULL;
+- if (Reversebytes) reversebytes((char *)&rec.hit_rec_num, 4);
+ uint32_t tmp_hit_rec_num;
+ if (fread(&tmp_hit_rec_num, 4, 1, idx) != 1) return NULL;
+ if (Reversebytes) reversebytes((char *)&tmp_hit_rec_num, 4);
@@ -81,7 +91,7 @@ Forwarded: no (upstream is inactive)
if (fread(rec.acnum, name_size, 1, idx) != 1) return NULL;
rec.acnum[name_size] = '\0';
-@@ -198,14 +215,20 @@ Entrynam *readEntrynam(FILE *idx, Header
+@@ -198,14 +218,20 @@ Entrynam *readEntrynam(FILE *idx, Header *head, int pos)
if( space = (char *)strchr(rec.entry_name, ' ') ) *space = '\0';
@@ -93,9 +103,10 @@ Forwarded: no (upstream is inactive)
+ rec.ann_offset = tmp_ann_offset;
- if (fread(&rec.seq_offset, 4, 1, idx) != 1) return NULL;
+- if (Reversebytes) reversebytes((char *)&rec.seq_offset, 4);
+ uint32_t tmp_seq_offset;
+ if (fread(&tmp_seq_offset, 4, 1, idx) != 1) return NULL;
- if (Reversebytes) reversebytes((char *)&rec.seq_offset, 4);
++ if (Reversebytes) reversebytes((char *)&tmp_seq_offset, 4);
+ rec.seq_offset = tmp_seq_offset;
- if (fread(&rec.div_code, 2, 1, idx) != 1) return NULL;
@@ -107,28 +118,26 @@ Forwarded: no (upstream is inactive)
return &rec;
}
-@@ -219,14 +242,20 @@ Entrynam *readnextEntrynam(FILE *idx, He
+@@ -219,14 +245,20 @@ Entrynam *readnextEntrynam(FILE *idx, Header *head)
if (fread(rec.entry_name, name_size, 1, idx) != 1) return NULL;
rec.entry_name[name_size] = '\0';
- if (fread(&rec.ann_offset, 4, 1, idx) != 1) return NULL;
- if (Reversebytes) reversebytes((char *)&rec.ann_offset, 4);
--
-- if (fread(&rec.seq_offset, 4, 1, idx) != 1) return NULL;
-- if (Reversebytes) reversebytes((char *)&rec.seq_offset, 4);
--
-- if (fread(&rec.div_code, 2, 1, idx) != 1) return NULL;
-- if (Reversebytes) reversebytes((char *)&rec.div_code, 2);
+ uint32_t tmp_ann_offset;
+ if (fread(&tmp_ann_offset, 4, 1, idx) != 1) return NULL;
+ if (Reversebytes) reversebytes((char *)&tmp_ann_offset, 4);
+ rec.ann_offset = tmp_ann_offset;
-+
+
+- if (fread(&rec.seq_offset, 4, 1, idx) != 1) return NULL;
+- if (Reversebytes) reversebytes((char *)&rec.seq_offset, 4);
+ uint32_t tmp_seq_offset;
+ if (fread(&tmp_seq_offset, 4, 1, idx) != 1) return NULL;
+ if (Reversebytes) reversebytes((char *)&tmp_seq_offset, 4);
+ rec.seq_offset = tmp_seq_offset;
-+
+
+- if (fread(&rec.div_code, 2, 1, idx) != 1) return NULL;
+- if (Reversebytes) reversebytes((char *)&rec.div_code, 2);
+ uint16_t tmp_div_code;
+ if (fread(&tmp_div_code, 2, 1, idx) != 1) return NULL;
+ if (Reversebytes) reversebytes((char *)&tmp_div_code, 2);
@@ -136,7 +145,7 @@ Forwarded: no (upstream is inactive)
return &rec;
}
-@@ -612,8 +641,9 @@ char *getdbfile(int div_code, char *divf
+@@ -612,8 +644,10 @@ char *getdbfile(int div_code, char *divfile)
for (i=0; i < divhead->nrecords; i++)
{
@@ -145,10 +154,11 @@ Forwarded: no (upstream is inactive)
+ uint16_t tmp_code;
+ if (fread(&tmp_code, 2, 1, div) != 1) return NULL;
+ if (Reversebytes) reversebytes((char *)&tmp_code, 2);
++ code = tmp_code;
if (fread(name, name_size, 1, div) != 1) return NULL;
-@@ -739,11 +769,13 @@ int getAcentry_rec_num(FILE *achit, Head
+@@ -739,12 +773,14 @@ int getAcentry_rec_num(FILE *achit, Header *achithead, int offset)
offset);
exit(1);
}
@@ -159,8 +169,10 @@ Forwarded: no (upstream is inactive)
exit(1);
}
- if (Reversebytes) reversebytes((char *)&entry_rec_num, 4);
+- if (display_head) printf("Entry record number: %u\n%", entry_rec_num);
+ if (Reversebytes) reversebytes((char *)&tmp, 4);
+ entry_rec_num = tmp;
- if (display_head) printf("Entry record number: %u\n%", entry_rec_num);
++ if (display_head) printf("Entry record number: %u\n", entry_rec_num);
return (int)(entry_rec_num - 1);
}
+
View it on GitLab: https://salsa.debian.org/med-team/acedb/-/commit/a489b11283159bee3a4bc5c14278fe1e9e449830
--
View it on GitLab: https://salsa.debian.org/med-team/acedb/-/commit/a489b11283159bee3a4bc5c14278fe1e9e449830
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20261025/6dadbd50/attachment-0001.htm>
More information about the debian-med-commit
mailing list