summaryrefslogtreecommitdiff
path: root/net/open-isns
diff options
context:
space:
mode:
authorIlya Lipnitskiy <ilya.lipnitskiy@gmail.com>2021-02-20 16:02:15 -0800
committerIlya Lipnitskiy <ilya.lipnitskiy@gmail.com>2021-02-20 16:02:15 -0800
commit5d8d4fbbcb5c5de9370711c19bb3510210989a98 (patch)
treed0754921833f413b7eb93fb6bb1b1c8a22fb0498 /net/open-isns
parentd651082447b4392399a40ea1ae11d0bce4bfe83a (diff)
treewide: Run refresh on all packages
The crude loop I wrote to come up with this changeset: find -L package/feeds/packages/ -name patches | \ sed 's/patches$/refresh/' | sort | xargs make Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Diffstat (limited to 'net/open-isns')
-rw-r--r--net/open-isns/patches/01-security_mode.patch22
-rw-r--r--net/open-isns/patches/02-fix_signed_vs_unsigned.patch6
-rw-r--r--net/open-isns/patches/03-include_poll_h.patch2
-rw-r--r--net/open-isns/patches/04-ignore_write.patch6
-rw-r--r--net/open-isns/patches/20-signals.patch2
5 files changed, 8 insertions, 30 deletions
diff --git a/net/open-isns/patches/01-security_mode.patch b/net/open-isns/patches/01-security_mode.patch
index dc827bd96..e6d962ef2 100644
--- a/net/open-isns/patches/01-security_mode.patch
+++ b/net/open-isns/patches/01-security_mode.patch
@@ -12,11 +12,9 @@ Subject: [PATCH] Fix compiler issue when not in security mode
socket.c | 5 +++--
6 files changed, 35 insertions(+), 19 deletions(-)
-diff --git a/client.c b/client.c
-index 8487877..fda26be 100644
--- a/client.c
+++ b/client.c
-@@ -122,22 +122,17 @@ isns_client_get_local_address(const isns_client_t *clnt,
+@@ -122,22 +122,17 @@ isns_client_get_local_address(const isns
/*
* Create a security context
*/
@@ -40,7 +38,7 @@ index 8487877..fda26be 100644
ctx = isns_create_dsa_context();
if (ctx == NULL)
isns_fatal("Unable to create security context\n");
-@@ -174,8 +169,19 @@ __create_security_context(const char *name, const char *auth_key,
+@@ -174,8 +169,19 @@ __create_security_context(const char *na
}
return ctx;
@@ -61,11 +59,9 @@ index 8487877..fda26be 100644
/*
* Create the default security context
-diff --git a/db-policy.c b/db-policy.c
-index b1c46e2..d4a0cba 100644
--- a/db-policy.c
+++ b/db-policy.c
-@@ -52,11 +52,11 @@ __isns_db_keystore_lookup(isns_db_keystore_t *store,
+@@ -52,11 +52,11 @@ __isns_db_keystore_lookup(isns_db_keysto
/*
* Load a DSA key from the DB store
*/
@@ -78,7 +74,7 @@ index b1c46e2..d4a0cba 100644
isns_db_keystore_t *store = (isns_db_keystore_t *) store_base;
isns_object_t *obj;
const void *key_data;
-@@ -71,10 +71,16 @@ __isns_db_keystore_find(isns_keystore_t *store_base,
+@@ -71,10 +71,16 @@ __isns_db_keystore_find(isns_keystore_t
return NULL;
return isns_dsa_decode_public(key_data, key_size);
@@ -97,8 +93,6 @@ index b1c46e2..d4a0cba 100644
/*
* Retrieve policy from database
-diff --git a/include/libisns/util.h b/include/libisns/util.h
-index 4174480..e5ed037 100644
--- a/include/libisns/util.h
+++ b/include/libisns/util.h
@@ -14,6 +14,7 @@
@@ -109,8 +103,6 @@ index 4174480..e5ed037 100644
#define array_num_elements(a) (sizeof(a) / sizeof((a)[0]))
-diff --git a/isnsadm.c b/isnsadm.c
-index 7a96007..94c705e 100644
--- a/isnsadm.c
+++ b/isnsadm.c
@@ -1162,7 +1162,7 @@ generate_key_callback(void)
@@ -122,8 +114,6 @@ index 7a96007..94c705e 100644
{
isns_fatal("Authentication disabled in this build\n");
return NULL;
-diff --git a/security.c b/security.c
-index 673a26e..68eb779 100644
--- a/security.c
+++ b/security.c
@@ -408,32 +408,34 @@ isns_security_init(void)
@@ -167,11 +157,9 @@ index 673a26e..68eb779 100644
{
return NULL;
}
-diff --git a/socket.c b/socket.c
-index da9f5dc..a76d593 100644
--- a/socket.c
+++ b/socket.c
-@@ -322,8 +322,9 @@ isns_pdu_authenticate(isns_security_t *sec,
+@@ -322,8 +322,9 @@ failed:
}
#else /* WITH_SECURITY */
static int
diff --git a/net/open-isns/patches/02-fix_signed_vs_unsigned.patch b/net/open-isns/patches/02-fix_signed_vs_unsigned.patch
index 2d966dd3a..9a4837018 100644
--- a/net/open-isns/patches/02-fix_signed_vs_unsigned.patch
+++ b/net/open-isns/patches/02-fix_signed_vs_unsigned.patch
@@ -13,8 +13,6 @@ shows up only on 586 (32-bit).
isnsdd.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/configure.ac b/configure.ac
-index e4f3995..d956e58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ AC_PATH_PROG(SH, sh)
@@ -26,11 +24,9 @@ index e4f3995..d956e58 100644
CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
fi
-diff --git a/isnsdd.c b/isnsdd.c
-index 58825cc..9cedb9f 100644
--- a/isnsdd.c
+++ b/isnsdd.c
-@@ -401,7 +401,7 @@ check_portal_registration(__attribute__((unused))void *ptr)
+@@ -401,7 +401,7 @@ check_portal_registration(__attribute__(
continue;
last_modified = isns_object_last_modified(obj);
diff --git a/net/open-isns/patches/03-include_poll_h.patch b/net/open-isns/patches/03-include_poll_h.patch
index cf87b51b5..5183fd62e 100644
--- a/net/open-isns/patches/03-include_poll_h.patch
+++ b/net/open-isns/patches/03-include_poll_h.patch
@@ -9,8 +9,6 @@ https://pubs.opengroup.org/onlinepubs/009695399/basedefs/poll.h.html
socket.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/socket.c b/socket.c
-index a76d593..432a9bd 100644
--- a/socket.c
+++ b/socket.c
@@ -5,7 +5,7 @@
diff --git a/net/open-isns/patches/04-ignore_write.patch b/net/open-isns/patches/04-ignore_write.patch
index 012bea7d4..3affdcd0b 100644
--- a/net/open-isns/patches/04-ignore_write.patch
+++ b/net/open-isns/patches/04-ignore_write.patch
@@ -9,8 +9,6 @@ system call, so check the return value.
pki.c | 37 ++++++++++++++++++++++++++++++++-----
1 file changed, 32 insertions(+), 5 deletions(-)
-diff --git a/pki.c b/pki.c
-index 486d9bb..57ea664 100644
--- a/pki.c
+++ b/pki.c
@@ -9,12 +9,13 @@
@@ -28,7 +26,7 @@ index 486d9bb..57ea664 100644
#include <libisns/isns.h>
#include "security.h"
#include <libisns/util.h>
-@@ -431,17 +432,43 @@ isns_dsa_load_params(const char *filename)
+@@ -431,17 +432,43 @@ isns_dsa_load_params(const char *filenam
return dsa;
}
@@ -75,7 +73,7 @@ index 486d9bb..57ea664 100644
return 0;
}
-@@ -478,7 +505,7 @@ isns_dsa_init_params(const char *filename)
+@@ -478,7 +505,7 @@ isns_dsa_init_params(const char *filenam
dsa = DSA_generate_parameters(dsa_key_bits, NULL, 0,
NULL, NULL, isns_dsa_param_gen_callback, NULL);
#endif
diff --git a/net/open-isns/patches/20-signals.patch b/net/open-isns/patches/20-signals.patch
index 898284794..8b9d999b6 100644
--- a/net/open-isns/patches/20-signals.patch
+++ b/net/open-isns/patches/20-signals.patch
@@ -8,8 +8,6 @@ The man page says that these are deprecated. Use sugprocmask as a replacement.
include/libisns/util.h | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
-diff --git a/include/libisns/util.h b/include/libisns/util.h
-index e5ed037..f1b97f0 100644
--- a/include/libisns/util.h
+++ b/include/libisns/util.h
@@ -41,14 +41,22 @@ char * print_size(unsigned long);