-
Notifications
You must be signed in to change notification settings - Fork 39
Updated dependencies (master) #1770
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
7bb304f
Updated dependency 'git' from version 2.49.0 to 2.50.0
github-actions[bot] 1350f95
Updated dependency 'libxml2' from version 2.14.3 to 2.14.4
github-actions[bot] f6917dc
Updated dependency 'nghttp2' from version 1.65.0 to 1.66.0
github-actions[bot] 16fc9aa
Fixed fatal error: sys/random.h: No such file or directory
larsewi 6e0eaed
Fixed implicit declaration of GNU extension gettid
larsewi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| diff -ruN httpd-2.4.63/server/log.c httpd-2.4.63-modified/server/log.c | ||
| --- httpd-2.4.63/server/log.c 2024-06-21 16:31:54.000000000 +0200 | ||
| +++ httpd-2.4.63-modified/server/log.c 2025-06-30 16:51:30.836217481 +0200 | ||
| @@ -21,6 +21,8 @@ | ||
| * | ||
| */ | ||
|
|
||
| +#define _GNU_SOURCE /* gettid() */ | ||
| + | ||
| #include "apr.h" | ||
| #include "apr_general.h" /* for signal stuff */ | ||
| #include "apr_strings.h" | ||
| @@ -1461,7 +1463,7 @@ | ||
|
|
||
| memset(buf, ' ', LOG_BYTES_BUFFER_SIZE - 1); | ||
| buf[LOG_BYTES_BUFFER_SIZE - 1] = '\0'; | ||
| - | ||
| + | ||
| chars = buf; /* start character dump here */ | ||
| hex = buf + BYTES_LOGGED_PER_LINE + 1; /* start hex dump here */ | ||
| while (*off < len && this_time < BYTES_LOGGED_PER_LINE) { | ||
| @@ -1533,7 +1535,7 @@ | ||
| } | ||
| } | ||
|
|
||
| -AP_DECLARE(void) ap_log_data_(const char *file, int line, | ||
| +AP_DECLARE(void) ap_log_data_(const char *file, int line, | ||
| int module_index, int level, | ||
| const server_rec *s, const char *label, | ||
| const void *data, apr_size_t len, |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| f8047f572f665bebeb637fd5f14678f31b3ca5d2ff9a18f20bd925bd48f75d3c git-2.49.0.tar.gz | ||
| 920f8ca563d16a7d4fdecb44349cbffbc5cb814a8b36c96028463478197050da git-2.50.0.tar.gz |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| diff -ruN git-2.50.0/compat/posix.h git-2.50.0-modified/compat/posix.h | ||
| --- git-2.50.0/compat/posix.h 2025-06-24 15:50:16.431161905 +0200 | ||
| +++ git-2.50.0-modified/compat/posix.h 2025-06-24 15:56:12.823192406 +0200 | ||
| @@ -155,9 +155,9 @@ | ||
| #ifdef HAVE_ARC4RANDOM_LIBBSD | ||
| #include <bsd/stdlib.h> | ||
| #endif | ||
| -#ifdef HAVE_GETRANDOM | ||
| -#include <sys/random.h> | ||
| -#endif | ||
| +// #ifdef HAVE_GETRANDOM | ||
| +// #include <sys/random.h> | ||
| +// #endif | ||
| #ifdef NO_INTPTR_T | ||
| /* | ||
| * On I16LP32, ILP32 and LP64 "long" is the safe bet, however | ||
| diff -ruN git-2.50.0/wrapper.c git-2.50.0-modified/wrapper.c | ||
| --- git-2.50.0/wrapper.c 2025-06-16 07:42:57.000000000 +0200 | ||
| +++ git-2.50.0-modified/wrapper.c 2025-06-24 15:56:09.560108133 +0200 | ||
| @@ -775,17 +775,17 @@ | ||
| /* This function never returns an error. */ | ||
| arc4random_buf(buf, len); | ||
| return 0; | ||
| -#elif defined(HAVE_GETRANDOM) | ||
| - ssize_t res; | ||
| - char *p = buf; | ||
| - while (len) { | ||
| - res = getrandom(p, len, 0); | ||
| - if (res < 0) | ||
| - return -1; | ||
| - len -= res; | ||
| - p += res; | ||
| - } | ||
| - return 0; | ||
| +// #elif defined(HAVE_GETRANDOM) | ||
| +// ssize_t res; | ||
| +// char *p = buf; | ||
| +// while (len) { | ||
| +// res = getrandom(p, len, 0); | ||
| +// if (res < 0) | ||
| +// return -1; | ||
| +// len -= res; | ||
| +// p += res; | ||
| +// } | ||
| +// return 0; | ||
| #elif defined(HAVE_GETENTROPY) | ||
| int res; | ||
| char *p = buf; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 6de55cacc8c2bc758f2ef6f93c313cb30e4dd5d84ac5d3c7ccbd9344d8cc6833 libxml2-2.14.3.tar.xz | ||
| 24175ec30a97cfa86bdf9befb7ccf4613f8f4b2713c5103e0dd0bc9c711a2773 libxml2-2.14.4.tar.xz |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| f1b9df5f02e9942b31247e3d415483553bc4ac501c87aa39340b6d19c92a9331 nghttp2-1.65.0.tar.xz | ||
| 00ba1bdf0ba2c74b2a4fe6c8b1069dc9d82f82608af24442d430df97c6f9e631 nghttp2-1.66.0.tar.xz |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| https://github.com/nghttp2/nghttp2/releases/download/v1.65.0/ | ||
| https://github.com/nghttp2/nghttp2/releases/download/v1.66.0/ |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
odd, this is new? and maybe we could more easily fix the autoconfig bits which are incorrectly setting HAVE_GETRANDOM to true?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this may be happening because the function is there, but the build host is missing the development header files. They should probably additionally check
#ifdef HAVE_SYS_GETRANDOM_HThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Feel free to look at the autoconfig bits Craig :)