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