diff --git a/backport-0001-change-bug-url.patch b/backport-0001-change-bug-url.patch deleted file mode 100644 index ef22421a0519b29e3b8d983c58ef28ab778c2e69..0000000000000000000000000000000000000000 --- a/backport-0001-change-bug-url.patch +++ /dev/null @@ -1,79 +0,0 @@ -Reference: https://src.fedoraproject.org/rpms/dhcp/blob/rawhide/f/0001-change-bug-url.patch -From 23dfbc560028bf7429196db1a3826f8b80c19d3e Mon Sep 17 00:00:00 2001 -From: Pavel Zhukov -Date: Thu, 21 Feb 2019 10:09:57 +0100 -Subject: [PATCH 01/26] change bug url -Cc: pzhukov@redhat.com - ---- - omapip/errwarn.c | 47 ++++++++++++++++++++++++++++++++++++++++++----- - 1 file changed, 42 insertions(+), 5 deletions(-) - -diff --git a/omapip/errwarn.c b/omapip/errwarn.c -index e30f8a0..09a3004 100644 ---- a/omapip/errwarn.c -+++ b/omapip/errwarn.c -@@ -48,6 +48,41 @@ void (*log_cleanup) (void); - static char mbuf [CVT_BUF_MAX + 1]; - static char fbuf [CVT_BUF_MAX + 1]; - -+// get BUG_REPORT_URL from /etc/os-release -+char * bug_report_url(void) { -+ FILE * file = fopen("/etc/os-release", "r"); -+ size_t len; -+ char * line = NULL; -+ char * url = NULL; -+ size_t url_len = 256; -+ -+ url = (char *) malloc(url_len * sizeof(char)); -+ strcpy(url, "https://bugzilla.redhat.com/"); -+ -+ if (!file) -+ return url; -+ -+ while ((getline(&line, &len, file)) != -1) { -+ if (strstr(line, "BUG_REPORT_URL") != NULL) { -+ char * start = strchr(line, '='); -+ char * rquotes = strrchr(line, '"'); -+ -+ if (rquotes != NULL) { -+ *rquotes = '\0'; -+ strncpy(url, start+2, url_len); -+ } else { -+ strncpy(url, start+1, url_len); -+ } -+ url[url_len-1] = '\0'; -+ fclose(file); -+ return url; -+ } -+ } -+ fclose(file); -+ return url; -+} -+ -+ - /* Log an error message, then exit... */ - - void log_fatal (const char * fmt, ... ) -@@ -74,11 +109,13 @@ void log_fatal (const char * fmt, ... ) - } - - log_error ("%s", ""); -- log_error ("If you think you have received this message due to a bug rather"); -- log_error ("than a configuration issue please read the section on submitting"); -- log_error ("bugs on either our web page at www.isc.org or in the README file"); -- log_error ("before submitting a bug. These pages explain the proper"); -- log_error ("process and the information we find helpful for debugging."); -+ log_error ("This version of ISC DHCP is based on the release available"); -+ log_error ("on ftp.isc.org. Features have been added and other changes"); -+ log_error ("have been made to the base software release in order to make"); -+ log_error ("it work better with this distribution."); -+ log_error ("%s", ""); -+ log_error ("Please report issues with this software via: "); -+ log_error ("%s", bug_report_url()); - log_error ("%s", ""); - log_error ("exiting."); - --- -2.14.5 - diff --git a/bugfix-error-message-display.patch b/bugfix-error-message-display.patch deleted file mode 100644 index 183b27a159c9db8931eaa4b4fd890b6aa7772572..0000000000000000000000000000000000000000 --- a/bugfix-error-message-display.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruNa dhcp-4.4.2-org/omapip/errwarn.c dhcp-4.4.2/omapip/errwarn.c ---- dhcp-4.4.2-org/omapip/errwarn.c 16:51:13.626927174 +0800 -+++ dhcp-4.4.2/omapip/errwarn.c 16:55:40.477496361 +0800 -@@ -57,7 +57,7 @@ - size_t url_len = 256; - - url = (char *) malloc(url_len * sizeof(char)); -- strcpy(url, "https://bugzilla.redhat.com/"); -+ strcpy(url, "https://gitee.com/src-openeuler/dhcp/issues"); - - if (!file) - return url; diff --git a/dhcp.spec b/dhcp.spec index d2a5b5c37a99a3bbd9e4dc1ae2068811b5daad61..1cbae0c463b6b2aca16faae1c050f8ea7f61e99c 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -3,7 +3,7 @@ Name: dhcp Version: 4.4.3 -Release: 3 +Release: 4 Summary: Dynamic host configuration protocol software #Please don't change the epoch on this package Epoch: 12 @@ -18,7 +18,6 @@ Source6: dhcpd.service Source7: dhcpd6.service Source8: dhcrelay.service -Patch1: backport-0001-change-bug-url.patch Patch2: backport-0002-additional-dhclient-options.patch Patch3: backport-0003-Handle-releasing-interfaces-requested-by-sbin-ifup.patch Patch4: backport-0004-Support-unicast-BOOTP-for-IBM-pSeries-systems-and-ma.patch @@ -54,7 +53,6 @@ Patch33: bugfix-dhcp-64-bit-lease-parse.patch Patch34: fix-coredump-when-client-active-is-NULL.patch Patch35: feature-lease-time-config-ipv6.patch Patch36: add-a-test-case-to-parse-code93-in-option_unittest.patch -Patch37: bugfix-error-message-display.patch Patch38: backport-Fix-CVE-2021-25220.patch Patch39: backport-Fix-CVE-2022-2928.patch Patch40: backport-Fix-CVE-2022-2929.patch @@ -307,6 +305,12 @@ exit 0 %{_mandir}/man3/omapi.3.gz %changelog +* Fri Nov 24 2023 renmingshuai - 12:4.4.3-4 +- Type:bugfix +- ID: +- SUG:restart +- DESC:delete report url added by other upstream patch to keep pace with DHCP + * Thu Jun 29 2023 renmingshuai - 12:4.4.3-3 - Type:bugfix - ID: