added my Recipes
This commit is contained in:
@@ -0,0 +1,50 @@
|
||||
From 40848547abf592c8d29b85ef1346001514944435 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 17 Jun 2017 10:14:20 -0700
|
||||
Subject: [PATCH] Fix build with format string checks
|
||||
|
||||
Fixes
|
||||
| ruli_addr.c:418:5: error: format not a string literal and no format arguments [-Werror=format-security]
|
||||
| return fprintf(out, inet_ntoa(addr->ipv4));
|
||||
| ^~~~~~
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
src/ruli_addr.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/src/ruli_addr.c
|
||||
+++ b/src/ruli_addr.c
|
||||
@@ -415,7 +415,7 @@ int ruli_in_print(FILE *out, const _ruli
|
||||
{
|
||||
switch (family) {
|
||||
case PF_INET:
|
||||
- return fprintf(out, inet_ntoa(addr->ipv4));
|
||||
+ return fprintf(out, "%s", inet_ntoa(addr->ipv4));
|
||||
|
||||
case PF_INET6:
|
||||
return ruli_inet6_print(out, &addr->ipv6);
|
||||
--- a/sample/getaddrinfo.c
|
||||
+++ b/sample/getaddrinfo.c
|
||||
@@ -174,7 +174,7 @@ static void solve(const char *fullname)
|
||||
|
||||
for (ai = ai_res; ai; ai = ai->ai_next) {
|
||||
|
||||
- printf(fullname);
|
||||
+ printf("%s", fullname);
|
||||
|
||||
switch (ai->ai_family) {
|
||||
case PF_INET:
|
||||
--- a/sample/ruli-getaddrinfo.c
|
||||
+++ b/sample/ruli-getaddrinfo.c
|
||||
@@ -176,7 +176,7 @@ static void solve(const char *fullname)
|
||||
|
||||
for (ai = ai_res; ai; ai = ai->ai_next) {
|
||||
|
||||
- printf(fullname);
|
||||
+ printf("%s", fullname);
|
||||
|
||||
switch (ai->ai_family) {
|
||||
case PF_INET:
|
||||
@@ -0,0 +1,95 @@
|
||||
From bb19a2c7e5b3142d70d3e13c2d8a92a63f2b840a Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 20 Nov 2019 22:12:52 -0800
|
||||
Subject: [PATCH] Make space for flags from environment
|
||||
|
||||
Add force option to ln cmd, so do_install can be rerun in same directory
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
sample/Makefile | 20 ++++++++++----------
|
||||
src/Makefile | 8 ++++----
|
||||
2 files changed, 14 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/sample/Makefile b/sample/Makefile
|
||||
index 15cafd9..d83641f 100644
|
||||
--- a/sample/Makefile
|
||||
+++ b/sample/Makefile
|
||||
@@ -35,9 +35,9 @@ ifeq ($(PLATFORM),SunOS)
|
||||
SOLARIS_LIBS = -lresolv -lnsl -lsocket
|
||||
endif
|
||||
|
||||
-CC = gcc
|
||||
-CFLAGS = -O2 -pipe -Wall -g -I../src -I$(OOP_INCLUDE_DIR)
|
||||
-LDFLAGS = -L../src -L$(OOP_LIB_DIR) $(SOLARIS_LDFLAGS)
|
||||
+CC ?= gcc
|
||||
+CFLAGS += -O2 -pipe -Wall -g -I../src -I$(OOP_INCLUDE_DIR)
|
||||
+LDFLAGS += -L../src -L$(OOP_LIB_DIR) $(SOLARIS_LDFLAGS)
|
||||
UNRULI_LINK = $(CC) $(ARCH) $(LDFLAGS) -o $@ $^ $(SOLARIS_LIBS)
|
||||
LINK = $(UNRULI_LINK) -lruli -loop
|
||||
|
||||
@@ -65,13 +65,13 @@ install: $(TARGETS)
|
||||
mkdir -p $(INSTALL_BIN_DIR) $(INSTALL_MAN1_DIR)
|
||||
cp $(TARGETS) $(INSTALL_BIN_DIR)
|
||||
cp ../doc/man/*.1 $(INSTALL_MAN1_DIR)
|
||||
- cd $(INSTALL_MAN_DIR)/man1 && ln -s srvsearch.1 smtpsearch.1
|
||||
- cd $(INSTALL_MAN_DIR)/man1 && ln -s srvsearch.1 httpsearch.1
|
||||
- cd $(INSTALL_MAN_DIR)/man1 && ln -s srvsearch.1 sync_srvsearch.1
|
||||
- cd $(INSTALL_MAN_DIR)/man1 && ln -s srvsearch.1 sync_smtpsearch.1
|
||||
- cd $(INSTALL_MAN_DIR)/man1 && ln -s srvsearch.1 sync_httpsearch.1
|
||||
- cd $(INSTALL_MAN_DIR)/man1 && ln -s srvsearch.1 ruli-getaddrinfo.1
|
||||
- cd $(INSTALL_MAN_DIR)/man1 && ln -s srvsearch.1 getaddrinfo.1
|
||||
+ cd $(INSTALL_MAN_DIR)/man1 && ln -sf srvsearch.1 smtpsearch.1
|
||||
+ cd $(INSTALL_MAN_DIR)/man1 && ln -sf srvsearch.1 httpsearch.1
|
||||
+ cd $(INSTALL_MAN_DIR)/man1 && ln -sf srvsearch.1 sync_srvsearch.1
|
||||
+ cd $(INSTALL_MAN_DIR)/man1 && ln -sf srvsearch.1 sync_smtpsearch.1
|
||||
+ cd $(INSTALL_MAN_DIR)/man1 && ln -sf srvsearch.1 sync_httpsearch.1
|
||||
+ cd $(INSTALL_MAN_DIR)/man1 && ln -sf srvsearch.1 ruli-getaddrinfo.1
|
||||
+ cd $(INSTALL_MAN_DIR)/man1 && ln -sf srvsearch.1 getaddrinfo.1
|
||||
|
||||
%.o: %.c
|
||||
$(CC) $(ARCH) $(CPPFLAGS) $(CFLAGS) -c $<
|
||||
diff --git a/src/Makefile b/src/Makefile
|
||||
index 9b56b5e..39a5ea1 100644
|
||||
--- a/src/Makefile
|
||||
+++ b/src/Makefile
|
||||
@@ -45,7 +45,7 @@ endif
|
||||
|
||||
WARN = -pedantic -ansi -Wshadow -Wpointer-arith -Wcast-qual \
|
||||
-Wcast-align -Wwrite-strings -Wredundant-decls
|
||||
-CC = gcc
|
||||
+CC ?= gcc
|
||||
|
||||
# gcc-specific options (not valid for g++)
|
||||
ifeq ($(CC),gcc)
|
||||
@@ -58,7 +58,7 @@ SHARED = -fPIC
|
||||
FLAGS = $(DEBUG) -O2 -pipe -Wall -g -shared -D_REENTRANT \
|
||||
$(DEFINE_SOLARIS) -I. -I$(OOP_INCLUDE_DIR)
|
||||
SOFT_CFLAGS = $(WARN) $(FLAGS)
|
||||
-CFLAGS = $(WARN) -Werror $(FLAGS)
|
||||
+CFLAGS += $(WARN) -Werror $(FLAGS)
|
||||
LIBOBJ = ruli_isaac.o ruli_mem.o ruli_rand.o ruli_util.o ruli_list.o \
|
||||
ruli_addr.o ruli_sock.o ruli_txt.o ruli_msg.o ruli_fsm.o \
|
||||
ruli_res.o ruli_parse.o ruli_host.o ruli_srv.o ruli_conf.o \
|
||||
@@ -66,7 +66,7 @@ LIBOBJ = ruli_isaac.o ruli_mem.o ruli_rand.o ruli_util.o ruli_list.o \
|
||||
ruli_getaddrinfo.o
|
||||
SHAREDOBJ = $(LIBOBJ:%.o=%.os)
|
||||
SONAME = libruli.so.4
|
||||
-LDFLAGS = -L$(OOP_LIB_DIR)
|
||||
+LDFLAGS += -L$(OOP_LIB_DIR)
|
||||
|
||||
COMPILE = $(CC) $(ARCH) $(CPPFLAGS) $(CFLAGS) -c
|
||||
SHARED_COMPILE = $(CC) $(ARCH) $(CPPFLAGS) $(SHARED) $(CFLAGS) -o $@ -c
|
||||
@@ -95,7 +95,7 @@ install: ruli
|
||||
cp $(SONAME) libruli.a $(INSTALL_LIB_DIR)
|
||||
cp *.h $(INSTALL_INCLUDE_DIR)
|
||||
cp ../doc/man/*.3 $(INSTALL_MAN3_DIR)
|
||||
- cd $(INSTALL_LIB_DIR) && ln -s $(SONAME) libruli.so
|
||||
+ cd $(INSTALL_LIB_DIR) && ln -sf $(SONAME) libruli.so
|
||||
@echo
|
||||
@echo "REMINDER:"
|
||||
@echo "Add $(INSTALL_LIB_DIR) to your dynamic loader path:"
|
||||
--
|
||||
2.24.0
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
From 895ae26e36c4498677ad0b2695a6e5af05548a29 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 20 Nov 2019 22:02:43 -0800
|
||||
Subject: [PATCH] ruli_srv: Mark prev_addr_list_size as unused
|
||||
|
||||
This ensures that compiler does not trip on building it
|
||||
|
||||
ruli_srv.c:157:20: error: variable 'prev_addr_list_size' set but not used [-Werror=unused-but-set-variable]
|
||||
| int prev_addr_list_size;
|
||||
| ^~~~~~~~~~~~~~~~~~~
|
||||
cc1: all warnings being treated as errors
|
||||
|
||||
Upstream-Status: Inappropriate [Workaround]
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
src/ruli_srv.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/ruli_srv.c b/src/ruli_srv.c
|
||||
index 45c70c7..ff82349 100644
|
||||
--- a/src/ruli_srv.c
|
||||
+++ b/src/ruli_srv.c
|
||||
@@ -154,7 +154,7 @@ static void *on_walk_answer(ruli_host_t *host_qry, void *qry_arg)
|
||||
walk_t *walk_qry = (walk_t *) qry_arg;
|
||||
ruli_srv_t *srv_qry = walk_qry->srv_query;
|
||||
ruli_srv_entry_t *srv_entry;
|
||||
- int prev_addr_list_size;
|
||||
+ __attribute__((unused)) int prev_addr_list_size;
|
||||
|
||||
assert(ruli_host_answer_code(host_qry) != RULI_SRV_CODE_VOID);
|
||||
|
||||
--
|
||||
2.24.0
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
From d3fb471f53712e710fb5777b1b0851c46b7be64c Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sun, 25 Jun 2017 01:23:03 -0700
|
||||
Subject: [PATCH] src/ruli_addr.c: Add missing format string
|
||||
|
||||
fixes
|
||||
|
||||
| ruli_addr.c: In function 'ruli_in_snprint':
|
||||
| ruli_addr.c:491:5: error: format not a string literal and no format arguments [-Werror=format-security]
|
||||
| return snprintf(buf, size, inet_ntoa(addr->ipv4));
|
||||
| ^~~~~~
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
Upstream-Status: Pending
|
||||
|
||||
src/ruli_addr.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/ruli_addr.c b/src/ruli_addr.c
|
||||
index f1eabae..5f1fd4f 100644
|
||||
--- a/src/ruli_addr.c
|
||||
+++ b/src/ruli_addr.c
|
||||
@@ -488,7 +488,7 @@ int ruli_in_snprint(char *buf, size_t size, const _ruli_addr *addr, int family)
|
||||
{
|
||||
switch (family) {
|
||||
case PF_INET:
|
||||
- return snprintf(buf, size, inet_ntoa(addr->ipv4));
|
||||
+ return snprintf(buf, size, "%s", inet_ntoa(addr->ipv4));
|
||||
|
||||
case PF_INET6:
|
||||
return ruli_inet6_snprint(buf, size, &addr->ipv6);
|
||||
--
|
||||
2.13.1
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
clarify type conversion
|
||||
|
||||
fixes
|
||||
| ruli_rand.c:54:47: error: implicit conversion from 'unsigned int' to 'float' changes value from 4294967295 to 4294967296 [-Werror,-Wimplicit-int-float-conversion]
|
||||
|
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
--- a/src/ruli_rand.c
|
||||
+++ b/src/ruli_rand.c
|
||||
@@ -51,7 +51,7 @@ int ruli_rand_next(ruli_rand_t *rand_ctx
|
||||
|
||||
u = isaac_rand(&rand_ctx->isaac_ctx);
|
||||
|
||||
- r = (int) ((float) (1.0 + max - min) * u / ISAAC_UB4MAXVAL + min);
|
||||
+ r = (int) ((float) (1.0 + max - min) * u / (float) (ISAAC_UB4MAXVAL + min));
|
||||
|
||||
assert(min <= r);
|
||||
assert(r <= max);
|
||||
Reference in New Issue
Block a user