mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 23:48:39 +01:00
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>
(cherry picked from commit 5d8d4fbbcb)
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
This commit is contained in:
committed by
Jeffery To
parent
99a5a094eb
commit
b1cbd93bcd
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user