1 |
nimiux 14/01/27 11:48:35 |
2 |
|
3 |
Added: inspircd-2.0.15-fix-path-builds.patch |
4 |
inspircd-2.0.15-init |
5 |
Log: |
6 |
Bump to version 2.0.15 |
7 |
|
8 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key D628E536) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 net-irc/inspircd/files/inspircd-2.0.15-fix-path-builds.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/inspircd/files/inspircd-2.0.15-fix-path-builds.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/inspircd/files/inspircd-2.0.15-fix-path-builds.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: inspircd-2.0.15-fix-path-builds.patch |
17 |
=================================================================== |
18 |
diff -Nuar a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example |
19 |
--- a/docs/conf/inspircd.conf.example 2014-01-21 14:13:25.000000000 +0100 |
20 |
+++ b/docs/conf/inspircd.conf.example 2014-01-27 12:07:50.189947703 +0100 |
21 |
@@ -415,11 +415,11 @@ |
22 |
|
23 |
# This file has all the information about oper classes, types and o:lines. |
24 |
# You *MUST* edit it. |
25 |
-<include file="conf/examples/opers.conf.example"> |
26 |
+<include file="/etc/inspircd/opers.conf.example"> |
27 |
|
28 |
# This file has all the information about server links and ulined servers. |
29 |
# You *MUST* edit it if you intend to link servers. |
30 |
-<include file="conf/examples/links.conf.example"> |
31 |
+<include file="/etc/inspircd/links.conf.example"> |
32 |
|
33 |
#-#-#-#-#-#-#-#-#-#- MISCELLANEOUS CONFIGURATION -#-#-#-#-#-#-#-#-#-# |
34 |
# # |
35 |
@@ -429,7 +429,8 @@ |
36 |
# motd - displayed on connect and when a user executes /MOTD |
37 |
# rules - displayed when the user executes /RULES |
38 |
# Modules can also define their own files |
39 |
-<files motd="conf/examples/motd.txt.example" rules="conf/examples/rules.txt.example"> |
40 |
+<files motd="/etc/inspircd/motd.txt.example" |
41 |
+ rules="/etc/inspircd/rules.txt.example"> |
42 |
|
43 |
# Example of an executable file include. Note this will be read on rehash, |
44 |
# not when the command is run. |
45 |
@@ -475,7 +476,7 @@ |
46 |
# the default of 'inspircd.pid' is used. # |
47 |
# # |
48 |
|
49 |
-#<pid file="/path/to/inspircd.pid"> |
50 |
+<pid file="/var/run/inspircd/inspircd.pid"> |
51 |
|
52 |
#-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-# |
53 |
# # |
54 |
@@ -957,7 +958,7 @@ |
55 |
# provide almost all the features of InspIRCd. :) # |
56 |
# # |
57 |
# The default does nothing -- we include it for simplicity for you. # |
58 |
-<include file="conf/examples/modules.conf.example"> |
59 |
+<include file="/etc/inspircd/modules.conf.example"> |
60 |
|
61 |
# Here are some pre-built modules.conf files that closely match the |
62 |
# default configurations of some popular IRCd's. You still may want to |
63 |
@@ -969,10 +970,10 @@ |
64 |
# recommended that you make your own modules file based on modules.conf.example. |
65 |
|
66 |
# Settings similar to UnrealIRCd defaults. |
67 |
-#<include file="conf/examples/modules/unrealircd.conf.example"> |
68 |
+#<include file="/etc/inspircd/modules/unrealircd.conf.example"> |
69 |
|
70 |
# Settings similar to Charybdis IRCd defaults. |
71 |
-#<include file="conf/examples/modules/charybdis.conf.example"> |
72 |
+#<include file="/etc/inspircd/modules/charybdis.conf.example"> |
73 |
|
74 |
|
75 |
######################################################################### |
76 |
diff -Nuar a/make/template/main.mk b/make/template/main.mk |
77 |
--- a/make/template/main.mk 2014-01-21 14:13:25.000000000 +0100 |
78 |
+++ b/make/template/main.mk 2014-01-27 12:12:11.749946234 +0100 |
79 |
@@ -34,7 +34,7 @@ |
80 |
SYSTEM = @SYSTEM@ |
81 |
BUILDPATH = @BUILD_DIR@ |
82 |
SOCKETENGINE = @SOCKETENGINE@ |
83 |
-CXXFLAGS = -pipe -fPIC -DPIC |
84 |
+MYCXXFLAGS = -pipe -fPIC -DPIC |
85 |
LDLIBS = -pthread -lstdc++ |
86 |
LDFLAGS = |
87 |
CORELDFLAGS = -rdynamic -L. $(LDFLAGS) |
88 |
@@ -51,9 +51,9 @@ |
89 |
INSTMODE_LIB = 0644 |
90 |
|
91 |
@IFEQ $(CC) icc |
92 |
- CXXFLAGS += -Wshadow |
93 |
+ MYCXXFLAGS += -Wshadow |
94 |
@ELSE |
95 |
- CXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall |
96 |
+ MYCXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall |
97 |
@ENDIF |
98 |
|
99 |
|
100 |
@@ -75,41 +75,41 @@ |
101 |
INSTALL = ginstall |
102 |
@ENDIF |
103 |
@IFEQ $(SYSTEM) darwin |
104 |
- CXXFLAGS += -DDARWIN -frtti |
105 |
+ MYCXXFLAGS += -DDARWIN -frtti |
106 |
LDLIBS += -ldl |
107 |
CORELDFLAGS = -dynamic -bind_at_load -L. $(LDFLAGS) |
108 |
PICLDFLAGS = -fPIC -shared -twolevel_namespace -undefined dynamic_lookup $(LDFLAGS) |
109 |
@ENDIF |
110 |
@IFEQ $(SYSTEM) interix |
111 |
- CXXFLAGS += -D_ALL_SOURCE -I/usr/local/include |
112 |
+ MYCXXFLAGS += -D_ALL_SOURCE -I/usr/local/include |
113 |
@ENDIF |
114 |
|
115 |
-@IFNDEF D |
116 |
- D=0 |
117 |
+@IFNDEF DEBUGLEVEL |
118 |
+ DEBUGLEVEL=0 |
119 |
@ENDIF |
120 |
|
121 |
DBGOK=0 |
122 |
-@IFEQ $(D) 0 |
123 |
- CXXFLAGS += -O2 |
124 |
+@IFEQ $(DEBUGLEVEL) 0 |
125 |
+ MYCXXFLAGS += -O2 |
126 |
@IFEQ $(CC) gcc |
127 |
- CXXFLAGS += -g1 |
128 |
+ MYCXXFLAGS += -g1 |
129 |
@ENDIF |
130 |
HEADER = std-header |
131 |
DBGOK=1 |
132 |
@ENDIF |
133 |
-@IFEQ $(D) 1 |
134 |
- CXXFLAGS += -O0 -g3 -Werror |
135 |
+@IFEQ $(DEBUGLEVEL) 1 |
136 |
+ MYCXXFLAGS += -O0 -g3 -Werror |
137 |
HEADER = debug-header |
138 |
DBGOK=1 |
139 |
@ENDIF |
140 |
-@IFEQ $(D) 2 |
141 |
- CXXFLAGS += -O2 -g3 |
142 |
+@IFEQ $(DEBUGLEVEL) 2 |
143 |
+ MYCXXFLAGS += -O2 -g3 |
144 |
HEADER = debug-header |
145 |
DBGOK=1 |
146 |
@ENDIF |
147 |
FOOTER = finishmessage |
148 |
|
149 |
-CXXFLAGS += -Iinclude |
150 |
+MYCXXFLAGS += -Iinclude |
151 |
|
152 |
@GNU_ONLY MAKEFLAGS += --no-print-directory |
153 |
|
154 |
@@ -128,10 +128,11 @@ |
155 |
@ENDIF |
156 |
|
157 |
@IFDEF PURE_STATIC |
158 |
- CXXFLAGS += -DPURE_STATIC |
159 |
+ MYCXXFLAGS += -DPURE_STATIC |
160 |
@ENDIF |
161 |
|
162 |
-@DO_EXPORT RUNCC RUNLD CXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS |
163 |
+MYCXXFLAGS += $(CXXFLAGS) |
164 |
+@DO_EXPORT RUNCC RUNLD MYCXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS |
165 |
@DO_EXPORT SOURCEPATH BUILDPATH PURE_STATIC SPLIT_CC |
166 |
|
167 |
# Default target |
168 |
@@ -144,10 +145,10 @@ |
169 |
@GNU_ONLY TARGET = modules/$(M:.so=).so |
170 |
@ENDIF |
171 |
|
172 |
-@IFDEF T |
173 |
+@IFDEF TGT |
174 |
HEADER = |
175 |
FOOTER = target |
176 |
- TARGET = $(T) |
177 |
+ TARGET = $(TGT) |
178 |
@ENDIF |
179 |
|
180 |
@IFEQ $(DBGOK) 0 |
181 |
@@ -222,8 +223,8 @@ |
182 |
@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/data |
183 |
@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/logs |
184 |
@-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH) |
185 |
- @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/aliases |
186 |
- @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/modules |
187 |
+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/aliases |
188 |
+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/modules |
189 |
@-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH) |
190 |
[ $(BUILDPATH)/bin/ -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) $(BUILDPATH)/bin/inspircd $(BINPATH) |
191 |
@IFNDEF PURE_STATIC |
192 |
@@ -231,9 +232,9 @@ |
193 |
@ENDIF |
194 |
-$(INSTALL) -m $(INSTMODE_BIN) @STARTSCRIPT@ $(BASE) 2>/dev/null |
195 |
-$(INSTALL) -m $(INSTMODE_LIB) tools/gdbargs $(BASE)/.gdbargs 2>/dev/null |
196 |
- -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples |
197 |
- -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/examples/aliases |
198 |
- -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/examples/modules |
199 |
+ -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH) |
200 |
+ -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/aliases |
201 |
+ -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/modules |
202 |
@echo "" |
203 |
@echo "*************************************" |
204 |
@echo "* INSTALL COMPLETE! *" |
205 |
@@ -246,7 +247,7 @@ |
206 |
@echo ' Data:' $(DATPATH) |
207 |
@echo 'To start the ircd, run:' $(BASE)/inspircd start |
208 |
@echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf |
209 |
- @echo 'Examples are available at:' $(CONPATH)/examples/ |
210 |
+ @echo 'Examples are available at:' $(CONPATH) |
211 |
|
212 |
@GNU_ONLY RCS_FILES = $(wildcard .git/index src/version.sh) |
213 |
@BSD_ONLY RCS_FILES = src/version.sh |
214 |
diff -Nuar a/make/unit-cc.pl b/make/unit-cc.pl |
215 |
--- a/make/unit-cc.pl 2014-01-21 14:13:25.000000000 +0100 |
216 |
+++ b/make/unit-cc.pl 2014-01-27 12:12:25.179946158 +0100 |
217 |
@@ -97,7 +97,7 @@ |
218 |
my $libs = ''; |
219 |
my $binary = $ENV{RUNCC}; |
220 |
if ($do_compile) { |
221 |
- $flags = $ENV{CXXFLAGS}; |
222 |
+ $flags = $ENV{MYCXXFLAGS}; |
223 |
$flags =~ s/ -pedantic// if nopedantic($file); |
224 |
$flags .= ' ' . getcompilerflags($file); |
225 |
|
226 |
|
227 |
|
228 |
|
229 |
1.1 net-irc/inspircd/files/inspircd-2.0.15-init |
230 |
|
231 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/inspircd/files/inspircd-2.0.15-init?rev=1.1&view=markup |
232 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/inspircd/files/inspircd-2.0.15-init?rev=1.1&content-type=text/plain |
233 |
|
234 |
Index: inspircd-2.0.15-init |
235 |
=================================================================== |
236 |
#!/sbin/runscript |
237 |
# Copyright 1999-2014 Gentoo Foundation |
238 |
# Distributed under the terms of the GNU General Public License v2 |
239 |
# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/files/inspircd-2.0.15-init,v 1.1 2014/01/27 11:48:35 nimiux Exp $ |
240 |
|
241 |
extra_commands="rehash version" |
242 |
|
243 |
depend() { |
244 |
need net |
245 |
provide ircd |
246 |
} |
247 |
|
248 |
start() { |
249 |
ebegin "Starting InspIRCd" |
250 |
checkpath -d -m 0750 -o inspircd:inspircd /var/run/inspircd |
251 |
start-stop-daemon --start --quiet --user inspircd \ |
252 |
--exec /usr/bin/inspircd -- \ |
253 |
--config /etc/inspircd/inspircd.conf \ |
254 |
--logfile /var/log/inspircd/ircd.log |
255 |
eend $? |
256 |
} |
257 |
|
258 |
stop() { |
259 |
ebegin "Stopping InspIRCd" |
260 |
start-stop-daemon --stop --quiet --exec /usr/bin/inspircd |
261 |
eend $? |
262 |
} |
263 |
|
264 |
rehash() { |
265 |
ebegin "Rehashing InspIRCd" |
266 |
/usr/lib/inspircd/inspircd.launcher/inspircd rehash |
267 |
eend $? |
268 |
} |
269 |
|
270 |
version() { |
271 |
ebegin "Retrieve InspIRCd version" |
272 |
/usr/lib/inspircd/inspircd.launcher/inspircd version |
273 |
eend $? |
274 |
} |