Gentoo Archives: gentoo-catalyst

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

Replies

Subject Author
Re: [gentoo-catalyst] [PATCH] update various URLs Brian Dolbec <dolsen@g.o>