Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/catalyst:master commit in: /, catalyst/base/, targets/netboot/, targets/support/, doc/, livecd/files/, ...
Date: Tue, 06 Oct 2015 13:46:38
Message-Id: 1444098635.d9cb012b6f360549398af0fdc3120862f2475b26.vapier@gentoo
1 commit: d9cb012b6f360549398af0fdc3120862f2475b26
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 6 02:30:35 2015 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 6 02:30:35 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d9cb012b
7
8 update various URLs
9
10 A lot of these have rotted -- like old Gentoo sites now in the wiki.
11 Also switch to https:// whenever possible.
12
13 README | 6 +++---
14 catalyst/base/stagebase.py | 2 +-
15 doc/HOWTO.txt | 9 ++++-----
16 doc/catalyst-config.5.txt | 2 +-
17 doc/catalyst-spec.5.txt | 2 +-
18 doc/catalyst.1.txt | 6 +++---
19 examples/README | 4 ++--
20 examples/generic_stage_template.spec | 2 +-
21 examples/grp_template.spec | 2 +-
22 examples/livecd-stage1_template.spec | 2 +-
23 examples/livecd-stage2_template.spec | 2 +-
24 examples/netboot_template.spec | 2 +-
25 examples/stage4_template.spec | 2 +-
26 examples/tinderbox_template.spec | 2 +-
27 livecd/files/gamecd.motd.txt | 2 +-
28 livecd/files/livecd.motd.txt | 2 +-
29 livecd/files/minimal.motd.txt | 4 ++--
30 setup.py | 4 ++--
31 targets/netboot/netboot-combine.sh | 2 +-
32 targets/support/chroot-functions.sh | 4 ++--
33 targets/support/livecdfs-update.sh | 4 ++--
34 21 files changed, 33 insertions(+), 34 deletions(-)
35
36 diff --git a/README b/README
37 index 46a99e8..94755ba 100644
38 --- a/README
39 +++ b/README
40 @@ -58,13 +58,13 @@ sharedir="/usr/share/catalyst"
41
42 There are many more options that can be set, but those defaults are good
43 for out of the box operation. For more documentation on what you can do
44 -with catalyst, please check the man page or the online documentation at
45 -http://www.gentoo.org/proj/en/releng/catalyst.
46 +with catalyst, please check the man page or the online documentation at:
47 +https://wiki.gentoo.org/wiki/Catalyst
48
49 Bugs
50 ========================
51
52 If you have questions or wish to help with development, contact the
53 gentoo-catalyst@l.g.o mailing list. Bug reports should be
54 -filed at http://tinyurl.com/79slrk (http://bugs.gentoo.org) under the
55 +filed at http://tinyurl.com/79slrk (https://bugs.gentoo.org) under the
56 "Catalyst" component of the "Gentoo Hosted Projects" product.
57
58 diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
59 index c6eaaa3..8a7456e 100644
60 --- a/catalyst/base/stagebase.py
61 +++ b/catalyst/base/stagebase.py
62 @@ -1120,7 +1120,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
63 myf.write('CBUILD="'+self.settings["CBUILD"]+'"\n')
64
65 if "CHOST" in self.settings:
66 - myf.write("# WARNING: Changing your CHOST is not something that should be done lightly.\n# Please consult http://www.gentoo.org/doc/en/change-chost.xml before changing.\n")
67 + myf.write("# WARNING: Changing your CHOST is not something that should be done lightly.\n# Please consult https://wiki.gentoo.org/wiki/Changing_the_CHOST_variable before changing.\n")
68 myf.write('CHOST="'+self.settings["CHOST"]+'"\n')
69
70 """ Figure out what our USE vars are for building """
71
72 diff --git a/doc/HOWTO.txt b/doc/HOWTO.txt
73 index cec22c3..b1d315e 100644
74 --- a/doc/HOWTO.txt
75 +++ b/doc/HOWTO.txt
76 @@ -33,13 +33,13 @@ Stage3 tarball
77
78 Get a stage3 tarball (containing the build tools you'll need to
79 construct your stage1) from your local
80 -http://www.gentoo.org/main/en/mirrors.xml[Gentoo mirror].
81 +https://www.gentoo.org/downloads/mirrors/[Gentoo mirror].
82
83 $GENTOO_MIRROR/releases/$ARCH/current-stage3/
84
85 For example,
86
87 - http://distfiles.gentoo.org/releases/amd64/current-stage3/stage3-amd64-20121213.tar.bz2
88 + http://distfiles.gentoo.org/releases/amd64/autobuilds/current-stage3-amd64/stage3-amd64-20121213.tar.bz2
89
90 Grab the tarball and put it where catalyst will find it:
91
92 @@ -164,7 +164,7 @@ Once we have a stage2, Catalyst builds all of the base system packages
93 for stage3, rebuilding any that were already built in stage2 (`emerge
94 -e @system`). The `@system` set of packages is defined by `packages`
95 files in your cascading profile. See
96 -http://dev.gentoo.org/~ulm/pms/5/pms.html#x1-520005.2.6[the Package
97 +https://dev.gentoo.org/~ulm/pms/5/pms.html#x1-520005.2.6[the Package
98 Manager Specification] for details.
99
100 For more details on the differences between the stages, look at the
101 @@ -225,8 +225,7 @@ and `dd`:
102 # dd if=filename.iso of=/dev/sdX
103
104 replacing `X` with the appropriate drive letter for your USB disk.
105 -See https://bugs.gentoo.org/show_bug.cgi?id=251719[bug 251719] for
106 -details.
107 +See https://bugs.gentoo.org/251719[bug 251719] for details.
108
109 Running catalyst from a Git checkout
110 ------------------------------------
111
112 diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt
113 index 61f3d93..31c4fe9 100644
114 --- a/doc/catalyst-config.5.txt
115 +++ b/doc/catalyst-config.5.txt
116 @@ -225,7 +225,7 @@ An example configuration file can be found at
117 BUGS
118 ----
119 An up-to-date list of Catalyst bugs can always be found listed on the Gentoo
120 -Linux bug-tracking system at `http://bugs.gentoo.org`.
121 +Linux bug-tracking system at `https://bugs.gentoo.org`.
122
123
124 SEE ALSO
125
126 diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt
127 index cba3166..a1559fa 100644
128 --- a/doc/catalyst-spec.5.txt
129 +++ b/doc/catalyst-spec.5.txt
130 @@ -509,7 +509,7 @@ include::subarches.generated.txt[tabsize=4]
131 BUGS
132 ----
133 An up-to-date list of Catalyst bugs can always be found listed on the Gentoo
134 -Linux bug-tracking system at 'http://bugs.gentoo.org'.
135 +Linux bug-tracking system at 'https://bugs.gentoo.org'.
136
137
138 SEE ALSO
139
140 diff --git a/doc/catalyst.1.txt b/doc/catalyst.1.txt
141 index 9f70f78..5a7a4d6 100644
142 --- a/doc/catalyst.1.txt
143 +++ b/doc/catalyst.1.txt
144 @@ -23,7 +23,7 @@ Platform (GRP) sets. *catalyst* is also capable of providing a simple
145 tinderbox environment for ebuild/package testing.
146
147 For more information, please visit the *catalyst* project page
148 -on the web at 'http://www.gentoo.org/proj/en/releng/catalyst'.
149 +on the web at 'https://wiki.gentoo.org/wiki/Catalyst'.
150
151
152 OPTIONS
153 @@ -111,7 +111,7 @@ include::subarches.generated.txt[tabsize=4]
154 BUGS
155 ----
156 An up-to-date list of Catalyst bugs can always be found listed on the Gentoo
157 -Linux bug-tracking system at 'http://bugs.gentoo.org'.
158 +Linux bug-tracking system at 'https://bugs.gentoo.org'.
159
160
161 NOTES
162 @@ -140,4 +140,4 @@ SEE ALSO
163
164 Also, a more in-depth examination of Catalyst options and procedures can be found
165 linked from the *catalyst* project page, which is located at
166 -'http://www.gentoo.org/proj/en/releng/catalyst'.
167 +'https://wiki.gentoo.org/wiki/Catalyst'.
168
169 diff --git a/examples/README b/examples/README
170 index bfd517a..3450797 100644
171 --- a/examples/README
172 +++ b/examples/README
173 @@ -1,5 +1,5 @@
174 For further examples, see the releases/weekly/specs directory [1] in
175 the releng Git repository [2].
176
177 -[1]: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=tree;f=releases/weekly/specs;hb=HEAD
178 -[2]: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=summary
179 +[1]: https://gitweb.gentoo.org/proj/releng.git/tree/releases/weekly/specs
180 +[2]: https://gitweb.gentoo.org/proj/releng.git
181
182 diff --git a/examples/generic_stage_template.spec b/examples/generic_stage_template.spec
183 index b43aebe..367a182 100644
184 --- a/examples/generic_stage_template.spec
185 +++ b/examples/generic_stage_template.spec
186 @@ -2,7 +2,7 @@
187 # used to build a stage1, stage2, or stage3 installation tarball
188
189 # The subarch can be any of the supported catalyst subarches (like athlon-xp).
190 -# Refer to "man catalyst" or <http://www.gentoo.org/proj/en/releng/catalyst/>
191 +# Refer to "man catalyst" or <https://wiki.gentoo.org/wiki/Catalyst>
192 # for supported subarches
193 # example:
194 # subarch: athlon-xp
195
196 diff --git a/examples/grp_template.spec b/examples/grp_template.spec
197 index c3d2c50..7116026 100644
198 --- a/examples/grp_template.spec
199 +++ b/examples/grp_template.spec
200 @@ -2,7 +2,7 @@
201 # used to build a GRP set
202
203 # The subarch can be any of the supported catalyst subarches (like athlon-xp).
204 -# Refer to "man catalyst" or <http://www.gentoo.org/proj/en/releng/catalyst/>
205 +# Refer to "man catalyst" or <https://wiki.gentoo.org/wiki/Catalyst>
206 # for supported subarches
207 # example:
208 # subarch: athlon-xp
209
210 diff --git a/examples/livecd-stage1_template.spec b/examples/livecd-stage1_template.spec
211 index a3cd939..90ae199 100644
212 --- a/examples/livecd-stage1_template.spec
213 +++ b/examples/livecd-stage1_template.spec
214 @@ -2,7 +2,7 @@
215 # used to build a livecd-stage1
216
217 # The subarch can be any of the supported catalyst subarches (like athlon-xp).
218 -# Refer to "man catalyst" or <http://www.gentoo.org/proj/en/releng/catalyst/>
219 +# Refer to "man catalyst" or <https://wiki.gentoo.org/wiki/Catalyst>
220 # for supported subarches
221 # example:
222 # subarch: athlon-xp
223
224 diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec
225 index 49ddcd7..a90b7aa 100644
226 --- a/examples/livecd-stage2_template.spec
227 +++ b/examples/livecd-stage2_template.spec
228 @@ -2,7 +2,7 @@
229 # used to build a livecd-stage2 iso image
230
231 # The subarch can be any of the supported catalyst subarches (like athlon-xp).
232 -# Refer to "man catalyst" or <http://www.gentoo.org/proj/en/releng/catalyst/>
233 +# Refer to "man catalyst" or <https://wiki.gentoo.org/wiki/Catalyst>
234 # for supported subarches
235 # example:
236 # subarch: athlon-xp
237
238 diff --git a/examples/netboot_template.spec b/examples/netboot_template.spec
239 index d10b645..0cffc66 100644
240 --- a/examples/netboot_template.spec
241 +++ b/examples/netboot_template.spec
242 @@ -2,7 +2,7 @@
243 # used to build a network bootable image
244
245 # The subarch can be any of the supported catalyst subarches (like athlon-xp).
246 -# Refer to "man catalyst" or <http://www.gentoo.org/proj/en/releng/catalyst/>
247 +# Refer to "man catalyst" or <https://wiki.gentoo.org/wiki/Catalyst>
248 # for supported subarches
249 # example:
250 # subarch: athlon-xp
251
252 diff --git a/examples/stage4_template.spec b/examples/stage4_template.spec
253 index c3a53d5..75aedff 100644
254 --- a/examples/stage4_template.spec
255 +++ b/examples/stage4_template.spec
256 @@ -2,7 +2,7 @@
257 # used to build a stage4
258
259 # The subarch can be any of the supported catalyst subarches (like athlon-xp).
260 -# Refer to "man catalyst" or <http://www.gentoo.org/proj/en/releng/catalyst/>
261 +# Refer to "man catalyst" or <https://wiki.gentoo.org/wiki/Catalyst>
262 # for supported subarches
263 # example:
264 # subarch: athlon-xp
265
266 diff --git a/examples/tinderbox_template.spec b/examples/tinderbox_template.spec
267 index db0dba2..f1af09c 100644
268 --- a/examples/tinderbox_template.spec
269 +++ b/examples/tinderbox_template.spec
270 @@ -1,7 +1,7 @@
271 # generic tinderbox specfile
272
273 # The subarch can be any of the supported catalyst subarches (like athlon-xp).
274 -# Refer to "man catalyst" or <http://www.gentoo.org/proj/en/releng/catalyst/>
275 +# Refer to "man catalyst" or <https://wiki.gentoo.org/wiki/Catalyst>
276 # for supported subarches
277 # example:
278 # subarch: athlon-xp
279
280 diff --git a/livecd/files/gamecd.motd.txt b/livecd/files/gamecd.motd.txt
281 index 498490e..7ee2d9c 100644
282 --- a/livecd/files/gamecd.motd.txt
283 +++ b/livecd/files/gamecd.motd.txt
284 @@ -1,7 +1,7 @@
285
286 To (re)start ##GAME_NAME, please type "startx" at the prompt below.
287
288 -Please report any bugs you find to http://bugs.gentoo.org. Be sure to include
289 +Please report any bugs you find to https://bugs.gentoo.org. Be sure to include
290 detailed information about how to reproduce the bug you are reporting.
291
292 Thank you for using Gentoo Linux!
293
294 diff --git a/livecd/files/livecd.motd.txt b/livecd/files/livecd.motd.txt
295 index 0fb391e..fe4c091 100644
296 --- a/livecd/files/livecd.motd.txt
297 +++ b/livecd/files/livecd.motd.txt
298 @@ -3,7 +3,7 @@ There is also a rescue session for X using twm if you simply use "startx".
299
300 You can start the installer by typing "installer" at the prompt below.
301
302 -Please report any bugs you find to http://bugs.gentoo.org. Be sure to include
303 +Please report any bugs you find to https://bugs.gentoo.org. Be sure to include
304 detailed information about how to reproduce the bug you are reporting.
305
306 Thank you for using Gentoo Linux!
307
308 diff --git a/livecd/files/minimal.motd.txt b/livecd/files/minimal.motd.txt
309 index 55f6158..3058b85 100644
310 --- a/livecd/files/minimal.motd.txt
311 +++ b/livecd/files/minimal.motd.txt
312 @@ -1,11 +1,11 @@
313 The latest version of the Handbook is always available from the Gentoo web
314 -site by typing "links http://www.gentoo.org/doc/en/handbook/handbook.xml".
315 +site by typing "links https://wiki.gentoo.org/wiki/Handbook".
316
317 To start an ssh server on this system, type "/etc/init.d/sshd start". If you
318 need to log in remotely as root, type "passwd root" to reset root's password
319 to a known value.
320
321 -Please report any bugs you find to http://bugs.gentoo.org. Be sure to include
322 +Please report any bugs you find to https://bugs.gentoo.org. Be sure to include
323 detailed information about how to reproduce the bug you are reporting.
324 Thank you for using Gentoo Linux!
325
326
327 diff --git a/setup.py b/setup.py
328 index 3eb76d7..feca894 100755
329 --- a/setup.py
330 +++ b/setup.py
331 @@ -22,7 +22,7 @@ def _posix_path(path):
332 Distutils wants all paths to be written in the Unix convention
333 (i.e. slash-separated) [1], so that's what we'll do here.
334
335 - [1]: http://docs.python.org/2/distutils/setupscript.html#writing-the-setup-script
336 + [1]: https://docs.python.org/2/distutils/setupscript.html
337 """
338 if _os.path.sep != '/':
339 return path.replace(_os.path.sep, '/')
340 @@ -81,7 +81,7 @@ _setup(
341 version=__version__,
342 maintainer=_maintainer_name,
343 maintainer_email=_maintainer_email,
344 - url='http://www.gentoo.org/proj/en/releng/{0}/'.format(_package_name),
345 + url='https://wiki.gentoo.org/wiki/Catalyst',
346 download_url='http://distfiles.gentoo.org/distfiles/{0}-{1}.tar.bz2'.format(
347 _package_name, __version__),
348 license='GNU General Public License (GPL)',
349
350 diff --git a/targets/netboot/netboot-combine.sh b/targets/netboot/netboot-combine.sh
351 index a96c567..5eef0d0 100755
352 --- a/targets/netboot/netboot-combine.sh
353 +++ b/targets/netboot/netboot-combine.sh
354 @@ -55,7 +55,7 @@ do
355 # please use catalyst 1.1.5 or older
356
357 #TEST TEST TEST TEST
358 - #http://lists.debian.org/debian-alpha/2004/07/msg00094.html
359 + #https://lists.debian.org/debian-alpha/2004/07/msg00094.html
360 #make \
361 # -C /usr/src/linux \
362 # INITRD=/initrd.gz \
363
364 diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
365 index 327705f..2482651 100755
366 --- a/targets/support/chroot-functions.sh
367 +++ b/targets/support/chroot-functions.sh
368 @@ -92,7 +92,7 @@ setup_myfeatures(){
369 echo "${clst_distcc_hosts}" > /etc/distcc/hosts
370
371 # This sets up automatic cross-distcc-fu according to
372 - # http://www.gentoo.org/doc/en/cross-compiling-distcc.xml
373 + # https://wiki.gentoo.org/wiki/Distcc/Cross-Compiling
374 CHOST=$(portageq envvar CHOST)
375 LIBDIR=$(get_libdir)
376 cd /usr/${LIBDIR}/distcc/bin
377 @@ -107,7 +107,7 @@ setup_myfeatures(){
378 clst_root_path=/ run_merge --oneshot --noreplace sys-devel/icecream || exit 1
379
380 # This sets up automatic cross-icecc-fu according to
381 - # http://gentoo-wiki.com/HOWTO_Setup_An_ICECREAM_Compile_Cluster#Icecream_and_cross-compiling
382 + # http://www.gentoo-wiki.info/HOWTO_Setup_An_ICECREAM_Compile_Cluster
383 CHOST=$(portageq envvar CHOST)
384 LIBDIR=$(get_libdir)
385 cd /usr/${LIBDIR}/icecc/bin
386
387 diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
388 index 12f8293..e10826d 100755
389 --- a/targets/support/livecdfs-update.sh
390 +++ b/targets/support/livecdfs-update.sh
391 @@ -87,7 +87,7 @@ ln -sf net.lo net.eth4
392 mkdir -p /etc/sysconfig
393
394 # Tweak the livecd fstab so that users know not to edit it
395 -# http://bugs.gentoo.org/show_bug.cgi?id=60887
396 +# https://bugs.gentoo.org/60887
397 echo "####################################################" > /etc/fstab
398 echo "## ATTENTION: THIS IS THE FSTAB ON THE LIVECD ##" >> /etc/fstab
399 echo "## PLEASE EDIT THE FSTAB at /mnt/gentoo/etc/fstab ##" >> /etc/fstab
400 @@ -104,7 +104,7 @@ then
401 fi
402
403 # Tweak the livecd make.conf so that users know not to edit it
404 -# http://bugs.gentoo.org/show_bug.cgi?id=144647
405 +# https://bugs.gentoo.org/144647
406 mv ${clst_make_conf} ${clst_make_conf}.old
407 echo "####################################################" >> ${clst_make_conf}
408 echo "## ATTENTION: THIS IS THE MAKE.CONF ON THE LIVECD ##" >> ${clst_make_conf}