KBrown/gentoo-overlay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Parche invertido

Browse source
This commit is contained in:
Sandino Araico Sanchez 2019-10-08 03:44:30 -05:00
parent 3a5ce9efec
commit 4615b41c4c
2 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
www-servers/cherokee/Manifest
View file

@ -1,7 +1,7 @@
AUX cherokee-1.2.99-gentoo.patch 1763 BLAKE2B d4ab785332c60fcac0c22b1b0aefabe44db710a7a0973114e8ddbe0423dd1331c64493b4e862ce944f5afa6da30b307cbd27eead278ea9a080309d4bf1d08cc9 SHA512 2f2b1aa03cd7656ceb90f9a94d24704b4a411b3ab99e084444d1f60ce0270bad650b597b1edbdcb4fb0dda750215f42c3f5de3e9f6253825f3742dfbe871be4b
AUX cherokee-confd-1.2.98 144 BLAKE2B 9462724ac4500ed501a005e2b001eefa53f2e71e48181a39f497c492cf69cdce1d5d325227535bfdb465b5bb6940cb89aedafb6420a7c14074b15f36b93866e1 SHA512 e010ec9e6d6bd6862c486c494e968cf93ff5f7eeaa523f1bc1fb9db72dc878c17fbc04443e74aef0bbfef1e2ba64ba00a7dc8bbd1b58f6759d2e000c76e88f84
AUX cherokee-initd-1.2.99 1186 BLAKE2B 3c4d0bbc378940e425bcc8ae4f451e44ded8bc4d4f9d9375c26f6af04c120bccc49c6259aaf33749b071c151b80a096766cc98dee44bfc65af10208b9a43c936 SHA512 595e37b6cf70d4fbd466be918db6c17c37766f5e39a9ee4384a21025f1ce04367aeca495217b1e2c74ed2bce9ff8cfd9a58523b59d1181ce9f470eca97445641
AUX cherokee-openssl-1.1.patch 2753 BLAKE2B b2c5001bc8f532fdfa58e95a8b5ae0bed68941ba89a7080c270b1db3d9a0fe1d6e56939950fc35abc634ec672285c051c29b977b3678aa71264127c63bae2f63 SHA512 654ce8b5b8e244264e75565e7007bb20cd020c86a0769b6aae6db7d220b4e2bd33f2b86cf1145e0980292f264564d37922a9511b39f02d9c120d50ebb05f2f5d
AUX cherokee-openssl-1.1.patch 2753 BLAKE2B e01ef08edf93e8c8a85fd10b269253bc6d92fc5bd49c9ed364bd2e9aab4bb12a47dc11acf8de1c417fbf880808763cd7307846a60c0451c7b9c01cb667d0bb67 SHA512 8556fa8d787ea519926204ecc31d04f01e4809be316f9e2bddbf8d3e0d6f9656d92c2723e561d793f41e49fcefcf7ac3433fd178088c85ce97ad6ba0c3620634
AUX cherokee.logrotate-r1 255 BLAKE2B 33d6c7dca525e424d1a88c0248595d011215cebae749a5d6aacc9eecd2b6e8d447d67655570baf62b23db96c5f5611d4a98b99bfcb6be9e194b52794264fcf49 SHA512 73be4a46f217302b3e7969f0a5acf7f83357a831331f85c89c17320c594eb9e6fd87da111b7d8eb06840e0b1bb094106a5bb6f7dbf7923e834164a367f85d5ad
AUX cherokee.service 184 BLAKE2B 76a55b38f5a7d78df80fd57f9461f68dc360b5efafe19338cc242c71f625b6900c5872283c32a97b6234f58621b89616e123983dec027d3bb1f797d388cf743b SHA512 e05cfe0805bcd7f133fc0bf485fbf781b9cc5e6f9e222b8ea89bdc4e9d4531caa6049100670b67d12bdb73c1e93ed5d949cc1828241213cfcd60a39b7424d8ec
DIST cherokee-1.2.104.zip 6200164 BLAKE2B 55ff5b5475c478078727ec072da4f1205209701b972efa420fbee4133cb83cf2ebd4a0f49165e4653c4a6b6f9e0f6ef633258e6ee4732d998b19863e99e6e2f2 SHA512 9c9f44643d0d2636f2e3e61ef8e2918d91d9bb6099be761826c8ffad01d339739ed40984d01151044c2e536d4754b5157d6d20c37627ce49eecdb404a716cd9d

50
www-servers/cherokee/files/cherokee-openssl-1.1.patch
View file

@ -1,13 +1,13 @@
diff --git a/cherokee/cryptor_libssl.c b/cherokee/cryptor_libssl.c
index 80a5c2eb..fabf9912 100644
index fabf9912..80a5c2eb 100644
--- a/cherokee/cryptor_libssl.c
+++ b/cherokee/cryptor_libssl.c
@@ -356,7 +356,7 @@ verify_trace_cb(int preverify_ok, X509_STORE_CTX *x509_store)
char *ptr;
X509_print (mem, peer_certificate);
BIO_get_mem_data(mem, &ptr);
- TRACE (ENTRIES, "SSL: %s\n", ptr);
+ TRACE (ENTRIES, "SSL: %s", ptr);
- TRACE (ENTRIES, "SSL: %s", ptr);
+ TRACE (ENTRIES, "SSL: %s\n", ptr);
BIO_free (mem);
}
@ -15,74 +15,74 @@ index 80a5c2eb..fabf9912 100644
if (cipher) {
SSL_CIPHER_description (cipher, &buf[0], buf_size-1);
- TRACE (ENTRIES, "SSL: %s, %sREUSED, Ciphers: %s\n",
+ TRACE (ENTRIES, "SSL: %s, %sREUSED, Ciphers: %s",
- TRACE (ENTRIES, "SSL: %s, %sREUSED, Ciphers: %s",
+ TRACE (ENTRIES, "SSL: %s, %sREUSED, Ciphers: %s\n",
SSL_get_version(cryp->session),
SSL_session_reused(cryp->session)? "" : "Not ", &buf[0]);
}
diff --git a/cherokee/post.c b/cherokee/post.c
index 8a1fe4bd..5d98b920 100644
index 5d98b920..8a1fe4bd 100644
--- a/cherokee/post.c
+++ b/cherokee/post.c
@@ -309,7 +309,6 @@ process_chunk (cherokee_post_t *post,
@@ -309,6 +309,7 @@ process_chunk (cherokee_post_t *post,
}
if (unlikely (p+2 > end)) {
- cherokee_buffer_clean (in);
+ cherokee_buffer_clean (in);
return ret_ok;
}
@@ -326,7 +325,6 @@ process_chunk (cherokee_post_t *post,
@@ -325,6 +326,7 @@ process_chunk (cherokee_post_t *post,
/* Read the length
*/
- errno = 0;
+ errno = 0;
content_size = (size_t) strtoul (begin, NULL, 16);
if (unlikely (errno != 0)) {
return ret_error;
@@ -351,7 +349,6 @@ process_chunk (cherokee_post_t *post,
@@ -349,6 +351,7 @@ process_chunk (cherokee_post_t *post,
if (post->chunked.retransmit) {
cherokee_buffer_add_str (out, "0" CRLF);
}
- p += 2; /* CRLF */
+ p += 2; /* CRLF */
begin = p;
break;
}
@@ -381,7 +378,7 @@ process_chunk (cherokee_post_t *post,
@@ -378,7 +381,7 @@ process_chunk (cherokee_post_t *post,
/* Very unlikely, but still possible
*/
if (! cherokee_buffer_is_empty(in)) {
- TRACE (ENTRIES, "There are %d left-over bytes in the post buffer -> incoming header\n", in->len);
+ TRACE (ENTRIES, "There are %d left-over bytes in the post buffer -> incoming header", in->len);
- TRACE (ENTRIES, "There are %d left-over bytes in the post buffer -> incoming header", in->len);
+ TRACE (ENTRIES, "There are %d left-over bytes in the post buffer -> incoming header\n", in->len);
#if 0
cherokee_buffer_add_buffer (&conn->incoming_header, in);
cherokee_buffer_clean (in);
diff --git a/cherokee/rule_url_arg.c b/cherokee/rule_url_arg.c
index 0cdf8668..4c88f6e1 100644
index 4c88f6e1..0cdf8668 100644
--- a/cherokee/rule_url_arg.c
+++ b/cherokee/rule_url_arg.c
@@ -42,11 +42,6 @@ check_argument (cherokee_rule_url_arg_t *rule,
@@ -42,6 +42,11 @@ check_argument (cherokee_rule_url_arg_t *rule,
{
int re;
- if (value == NULL) {
- TRACE (ENTRIES, "Empty parameter value\n");
- return ret_not_found;
- }
-
+ if (value == NULL) {
+ TRACE (ENTRIES, "Empty parameter value\n");
+ return ret_not_found;
+ }
+
/* Check whether it matches
*/
re = pcre_exec (rule->pcre, NULL,
diff --git a/cherokee/server.c b/cherokee/server.c
index 64faccdd..7afbf19d 100644
index 7afbf19d..64faccdd 100644
--- a/cherokee/server.c
+++ b/cherokee/server.c
@@ -1770,7 +1770,7 @@ cherokee_server_daemonize (cherokee_server_t *srv)
{
pid_t child_pid;
- TRACE (ENTRIES, "server (%p) about to become evil\n", srv);
+ TRACE (ENTRIES, "server (%p) about to become evil", srv);
- TRACE (ENTRIES, "server (%p) about to become evil", srv);
+ TRACE (ENTRIES, "server (%p) about to become evil\n", srv);
child_pid = fork();
switch (child_pid) {