Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package arj for openSUSE:Factory checked in at 2023-04-11 13:51:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/arj (Old) and /work/SRC/openSUSE:Factory/.arj.new.19717 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "arj" Tue Apr 11 13:51:22 2023 rev:5 rq:1078370 version:3.10.22 Changes: -------- --- /work/SRC/openSUSE:Factory/arj/arj.changes 2020-03-26 23:33:13.846774101 +0100 +++ /work/SRC/openSUSE:Factory/.arj.new.19717/arj.changes 2023-04-11 13:51:40.103537671 +0200 @@ -1,0 +2,6 @@ +Sat Apr 8 18:13:34 UTC 2023 - Bernhard Wiedemann <[email protected]> + +- Extend arj-3.10.22-fixstrcpy.patch to avoid trouble with strcpy + in two more places + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arj-3.10.22-fixstrcpy.patch ++++++ --- /var/tmp/diff_new_pack.8pRwTZ/_old 2023-04-11 13:51:40.787541634 +0200 +++ /var/tmp/diff_new_pack.8pRwTZ/_new 2023-04-11 13:51:40.791541656 +0200 @@ -1,5 +1,6 @@ Author: Bernhard M. Wiedemann <[email protected]> -Date: 2020-03-25 +Co-Author: Thorsten Otto <[email protected]> +Date: 2020-03-25 ; 2023-04-04 reproducible builds showed differences in strings produced from msgbind depending on CPU-type @@ -7,6 +8,18 @@ valgrind --tool=memcheck helped to locate two relevant calls to strcpy on overlapping regions +diff -rup arj-3.10.22.orig/arj.c arj-3.10.22/arj.c +--- arj-3.10.22.orig/arj.c 2005-06-21 21:53:12.000000000 +0200 ++++ arj-3.10.22/arj.c 2023-04-04 18:07:00.860946972 +0200 +@@ -1170,7 +1170,7 @@ int main(int argc, char *argv[]) + if(strlen(tmp_ptr)<=121) + tmp_ptr[0]='\0'; + else if(tmp_ptr[120]==' ') +- strcpy(tmp_ptr, tmp_ptr+121); ++ memmove(tmp_ptr, tmp_ptr+121, strlen(tmp_ptr+121)+1); + } + if(cmd==ARJ_CMD_ORDER&&strpbrk(tmp_ptr, wildcard_pattern)!=NULL) + error(M_ORDER_WILDCARD); Index: arj-3.10.22/arjdata.c =================================================================== --- arj-3.10.22.orig/arjdata.c @@ -38,7 +51,7 @@ #define MSG_SIZE 32752 /* Constant msg buffer size */ #define POOL_SIZE 51200 /* Maximum size of variable-len buf */ #define POOL_R_INC 1024 /* Realloc incrementation */ -@@ -586,7 +586,7 @@ int main(int argc, char **argv) +@@ -574,7 +574,7 @@ int main(int argc, char **argv) } strcat(pool[tpool].data, msgname); strcat(pool[tpool].data, ", "); @@ -47,4 +60,16 @@ buf_len=strlen(msg_buffer); msg_buffer[--buf_len]='\0'; patch_string(msg_buffer); +diff -rup arj-3.10.22.orig/packager.c arj-3.10.22/packager.c +--- arj-3.10.22.orig/packager.c 2004-04-17 13:39:42.000000000 +0200 ++++ arj-3.10.22/packager.c 2023-04-04 18:05:26.869081516 +0200 +@@ -347,7 +347,7 @@ int main(int argc, char **argv) + expand_tags(buf, sizeof(buf)-1); + if((p=strchr(buf, '.'))!=NULL) + { +- strcpy(p, p+1); ++ memmove(p, p+1, strlen(p+1) + 1); + if((p=strchr(buf, '.'))!=NULL) + *p='\0'; + }
