| Message ID | 20211122222519.3539534-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/clamav: drop first patch | expand |
On 22/11/2021 23:25, Fabrice Fontaine wrote: > First patch is not needed since bump to version 0.99.1 in commit > 2c8e5dd69f4f281b2b497ae7ec9ec95c47e7c80c and > https://github.com/Cisco-Talos/clamav/commit/689005317680854627b79c76ffa6e42a8160b0e1 > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Applied to master, thanks. Regards, Arnout > --- > ...c-fix-build-error-due-to-missing-soc.patch | 34 ------------------- > ...acktrace-if-using-uClibc-without-ba.patch} | 0 > 2 files changed, 34 deletions(-) > delete mode 100644 package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch > rename package/clamav/{0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch => 0001-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch} (100%) > > diff --git a/package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch b/package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch > deleted file mode 100644 > index daac677eaa..0000000000 > --- a/package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch > +++ /dev/null > @@ -1,34 +0,0 @@ > -From 52fda6e6689e22866a39ec4273713fb6035c38b2 Mon Sep 17 00:00:00 2001 > -From: Bernd Kuhls <bernd.kuhls@t-online.de> > -Date: Mon, 7 May 2018 23:14:46 +0200 > -Subject: [PATCH] clamdscan/proto.c: fix build error due to missing sockaddr_un > - definition > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -proto.c: In function ‘dconnect’: > -proto.c:86:67: error: invalid application of ‘sizeof’ to incomplete type ‘struct sockaddr_un’ > - if (connect(sockd, (struct sockaddr *)&nixsock, sizeof(nixsock)) == 0) > - > -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > -Upstream-status: http://lurker.clamav.net/message/20140928.130829.5494fd68.en.html > ---- > - clamdscan/proto.c | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/clamdscan/proto.c b/clamdscan/proto.c > -index 0205f6da0..d3396732f 100644 > ---- a/clamdscan/proto.c > -+++ b/clamdscan/proto.c > -@@ -42,6 +42,7 @@ > - #include <sys/stat.h> > - #include <fcntl.h> > - #include <sys/types.h> > -+#include <sys/un.h> > - #ifdef HAVE_SYS_SELECT_H > - #include <sys/select.h> > - #endif > --- > -2.14.3 > - > diff --git a/package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch b/package/clamav/0001-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch > similarity index 100% > rename from package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch > rename to package/clamav/0001-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch >
diff --git a/package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch b/package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch deleted file mode 100644 index daac677eaa..0000000000 --- a/package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 52fda6e6689e22866a39ec4273713fb6035c38b2 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls <bernd.kuhls@t-online.de> -Date: Mon, 7 May 2018 23:14:46 +0200 -Subject: [PATCH] clamdscan/proto.c: fix build error due to missing sockaddr_un - definition -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -proto.c: In function ‘dconnect’: -proto.c:86:67: error: invalid application of ‘sizeof’ to incomplete type ‘struct sockaddr_un’ - if (connect(sockd, (struct sockaddr *)&nixsock, sizeof(nixsock)) == 0) - -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> -Upstream-status: http://lurker.clamav.net/message/20140928.130829.5494fd68.en.html ---- - clamdscan/proto.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/clamdscan/proto.c b/clamdscan/proto.c -index 0205f6da0..d3396732f 100644 ---- a/clamdscan/proto.c -+++ b/clamdscan/proto.c -@@ -42,6 +42,7 @@ - #include <sys/stat.h> - #include <fcntl.h> - #include <sys/types.h> -+#include <sys/un.h> - #ifdef HAVE_SYS_SELECT_H - #include <sys/select.h> - #endif --- -2.14.3 - diff --git a/package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch b/package/clamav/0001-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch similarity index 100% rename from package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch rename to package/clamav/0001-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch
First patch is not needed since bump to version 0.99.1 in commit 2c8e5dd69f4f281b2b497ae7ec9ec95c47e7c80c and https://github.com/Cisco-Talos/clamav/commit/689005317680854627b79c76ffa6e42a8160b0e1 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- ...c-fix-build-error-due-to-missing-soc.patch | 34 ------------------- ...acktrace-if-using-uClibc-without-ba.patch} | 0 2 files changed, 34 deletions(-) delete mode 100644 package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch rename package/clamav/{0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch => 0001-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch} (100%)