summaryrefslogtreecommitdiff
path: root/net/openradius/files
diff options
context:
space:
mode:
Diffstat (limited to 'net/openradius/files')
-rw-r--r--net/openradius/files/patch-ETCRules.mk21
-rw-r--r--net/openradius/files/patch-Rules.mk29
-rw-r--r--net/openradius/files/patch-aa22
-rw-r--r--net/openradius/files/patch-common-Rules.mk11
-rw-r--r--net/openradius/files/patch-language-Rules.mk11
-rw-r--r--net/openradius/files/patch-ringbuf62
6 files changed, 49 insertions, 107 deletions
diff --git a/net/openradius/files/patch-ETCRules.mk b/net/openradius/files/patch-ETCRules.mk
index b8d850c83fd5..c1672dfde65e 100644
--- a/net/openradius/files/patch-ETCRules.mk
+++ b/net/openradius/files/patch-ETCRules.mk
@@ -1,13 +1,10 @@
---- etc/Rules.mk.orig Thu Mar 31 10:50:37 2005
-+++ etc/Rules.mk Thu Mar 31 10:50:29 2005
-@@ -11,9 +11,7 @@
-
+--- etc/Rules.mk.orig Fri Mar 17 13:39:14 2006
++++ etc/Rules.mk Sun Oct 29 15:46:17 2006
+@@ -13,7 +13,6 @@
CMD_INSTETC := $(CMD_INSTETC) \
- $(INST) $(d)/subdicts/* -m 644 -d $(DIR_ETC)/subdicts \
-- $(d)/modules/* -m 644 -d $(DIR_ETC)/modules \
-- $(d)/legacy/* -m 640 -d $(DIR_ETC)/legacy ;
--
-+ $(d)/modules/* -m 644 -d $(DIR_ETC)/modules ;
-
- # Standard things
-
+ $(INST) $(d)/dictionary -m 644 -d $(INST_PREFIX)$(DIR_ETC) \
+ $(d)/subdicts/* -m 644 -d $(INST_PREFIX)$(DIR_ETC)/subdicts \
+- $(d)/legacy/* -m 640 -d $(INST_PREFIX)$(DIR_ETC)/legacy \
+ $(d)/modules/radldap.attrmap \
+ -m 644 -d $(INST_PREFIX)$(DIR_ETC)/modules ; \
+ cp examples/configuration.sample-usersfile $(INST_PREFIX)$(DIR_ETC)/configuration ; \
diff --git a/net/openradius/files/patch-Rules.mk b/net/openradius/files/patch-Rules.mk
index 718e523747fc..8960625292c1 100644
--- a/net/openradius/files/patch-Rules.mk
+++ b/net/openradius/files/patch-Rules.mk
@@ -1,15 +1,22 @@
---- Rules.mk.orig Thu Mar 31 10:55:15 2005
-+++ Rules.mk Thu Mar 31 10:55:43 2005
-@@ -69,12 +69,7 @@
- $(CMD_INSTBIN)
- $(INST) $(TGT_SBIN) -m 750 -d $(DIR_SBIN)
+--- Rules.mk.orig Thu Mar 23 17:19:04 2006
++++ Rules.mk Sun Oct 29 15:49:17 2006
+@@ -74,19 +74,6 @@
$(CMD_INSTSBIN)
--ifeq ($(wildcard $(DIR_ETC)/*),)
-- $(INST) $(TGT_ETC) -m 644 -d $(DIR_ETC)
- $(CMD_INSTETC)
+ $(INST) $(TGT_LIB) -m 755 -d $(INST_PREFIX)$(DIR_LIB)
+ $(CMD_INSTLIB)
+-ifeq ($(wildcard $(INST_PREFIX)$(DIR_ETC)/*),)
+- $(INST) $(TGT_ETC) -m 644 -d $(INST_PREFIX)$(DIR_ETC)
+- $(CMD_INSTETC)
-else
-- @echo Configuration directory $(DIR_ETC) already present -- skipping
+- @echo
+- @echo Configuration directory $(DIR_ETC) already present -- skipping.
+- @echo
+- @echo When upgrading, is recommended to rename your existing configuration
+- @echo directory $(DIR_ETC) to eg. $(DIR_ETC).orig,
+- @echo to redo the installation, and to copy only the configuration- and behaviour
+- @echo files and the files in the legacy and modules subdirectories that have
+- @echo local changes back from the .orig directory.
-endif
- $(INST) $(TGT_LIB) -m 750 -d $(DIR_LIB)
- $(CMD_INSTLIB)
+ @echo
+ @echo If no error messages appeared, OpenRADIUS has been installed successfully.
@echo
diff --git a/net/openradius/files/patch-aa b/net/openradius/files/patch-aa
deleted file mode 100644
index f4797e38c759..000000000000
--- a/net/openradius/files/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
---- language/Rules.mk.orig Thu Jan 9 11:18:53 2003
-+++ language/Rules.mk Thu Apr 7 14:06:31 2005
-@@ -31,7 +31,7 @@
- $(COMP)
-
- $(d)/language.a: $(LIBOBJS_$(d))
-- $(ARCH)
-+ $(AR)
-
- $(d)/langtest: $(TSTOBJS_$(d)) common/common.a
- $(LINK)
---- common/Rules.mk.orig Sun Feb 23 14:32:14 2003
-+++ common/Rules.mk Thu Apr 7 14:05:54 2005
-@@ -29,7 +29,7 @@
- $(OBJS_$(d)): $(d)/platform.h
-
- $(d)/common.a: $(OBJS_$(d))
-- $(ARCH)
-+ $(AR)
-
- $(d)/platform.h: $(d)/Rules.mk
- $(DEFHDR) $@ $(S_CF_U_INT32_T) $(S_CF_VSNPRINTF) $(S_CF_SYSLOG)
diff --git a/net/openradius/files/patch-common-Rules.mk b/net/openradius/files/patch-common-Rules.mk
new file mode 100644
index 000000000000..56e32013bf16
--- /dev/null
+++ b/net/openradius/files/patch-common-Rules.mk
@@ -0,0 +1,11 @@
+--- common/Rules.mk.orig Sun Oct 29 15:53:42 2006
++++ common/Rules.mk Sun Oct 29 15:53:45 2006
+@@ -29,7 +29,7 @@
+ $(OBJS_$(d)): $(d)/platform.h
+
+ $(d)/common.a: $(OBJS_$(d))
+- $(ARCHIVE)
++ $(AR)
+
+ $(d)/platform.h: $(d)/Rules.mk
+ $(DEFHDR) $@ $(S_CF_U_INT32_T) $(S_CF_VSNPRINTF) \
diff --git a/net/openradius/files/patch-language-Rules.mk b/net/openradius/files/patch-language-Rules.mk
new file mode 100644
index 000000000000..faffdf82327f
--- /dev/null
+++ b/net/openradius/files/patch-language-Rules.mk
@@ -0,0 +1,11 @@
+--- language/Rules.mk.orig Sun Oct 29 15:55:04 2006
++++ language/Rules.mk Sun Oct 29 15:55:08 2006
+@@ -31,7 +31,7 @@
+ $(COMP)
+
+ $(d)/language.a: $(LIBOBJS_$(d))
+- $(ARCHIVE)
++ $(AR)
+
+ $(d)/langtest: LL_TGT := $(S_LL_CRYPT)
+ $(d)/langtest: $(TSTOBJS_$(d)) common/common.a
diff --git a/net/openradius/files/patch-ringbuf b/net/openradius/files/patch-ringbuf
deleted file mode 100644
index 40692dfaf8d2..000000000000
--- a/net/openradius/files/patch-ringbuf
+++ /dev/null
@@ -1,62 +0,0 @@
---- common/ringbuf.c.orig Mon Feb 14 16:10:51 2005
-+++ common/ringbuf.c Tue Aug 30 13:55:42 2005
-@@ -355,7 +355,7 @@
- ssize_t ring_count(RING *r, RINGCNTFUNC func, ...)
- {
- va_list ap;
-- ssize_t len, ret;
-+ ssize_t len, ret = 0;
-
- len = ring_maxget(r);
-
-@@ -363,37 +363,41 @@
-
- /* There is data available */
-
-- va_start(ap, func);
--
- if (r->r + len <= r->size) {
-
- /* Message ends before end of buffer */
-
- /* peek at single part, return whatever the
- closure returns. */
-- return func(r->buf + r->r, len, 0, ap);
-+ va_start(ap, func);
-+ ret = func(r->buf + r->r, len, 0, ap);
-+ va_end(ap);
- }
- else {
-
- /* Message doesn't end before end of buffer */
-
- /* peek at first part, till end of buffer */
-+ va_start(ap, func);
- ret = func(r->buf + r->r, r->size - r->r, 0, ap);
-+ va_end(ap);
-
- if (ret < r->size - r->r) {
- /* Satisfied by first part; return whatever
- the closure gave us. */
-- return ret;
- }
--
-- /* peek at rest, from start of buffer */
-- return ret + func(r->buf, len - (r->size - r->r),
-- ret, ap);
-+ else {
-+ /* peek at rest, from start of buffer */
-+ va_start(ap, func);
-+ ret += func(r->buf, len - (r->size - r->r),
-+ ret, ap);
-+ va_end(ap);
-+ }
- }
- }
-
- /* No data available, return 0. */
-- return 0;
-+ return ret;
- }
-
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 21:25:14 +0000