/[gentoo-x86]/eclass/eutils.eclass
Gentoo

Diff of /eclass/eutils.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.144 Revision 1.318
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2007 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.144 2005/02/03 22:11:33 chriswhite Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.318 2009/08/26 21:47:56 vapier Exp $
4#
5# Author: Martin Schlemmer <azarah@gentoo.org>
6#
7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves.
9#
10# NB: If you add anything, please comment it!
11 4
12inherit multilib 5# @ECLASS: eutils.eclass
13ECLASS=eutils 6# @MAINTAINER:
14INHERITED="$INHERITED $ECLASS" 7# base-system@gentoo.org
8# @BLURB: many extra (but common) functions that are used in ebuilds
9# @DESCRIPTION:
10# The eutils eclass contains a suite of functions that complement
11# the ones that ebuild.sh already contain. The idea is that the functions
12# are not required in all ebuilds but enough utilize them to have a common
13# home rather than having multiple ebuilds implementing the same thing.
14#
15# Due to the nature of this eclass, some functions may have maintainers
16# different from the overall eclass!
15 17
16DEPEND="!bootstrap? ( sys-devel/patch )" 18inherit multilib portability
17 19
18DESCRIPTION="Based on the ${ECLASS} eclass" 20DESCRIPTION="Based on the ${ECLASS} eclass"
19 21
20# ecpu_check 22# @FUNCTION: epause
21# Usage: 23# @USAGE: [seconds]
22# 24# @DESCRIPTION:
23# ecpu_check array_of_cpu_flags 25# Sleep for the specified number of seconds (default of 5 seconds). Useful when
24# 26# printing a message the user should probably be reading and often used in
25# array_of_cpu_flags - An array of cpu flags to check against USE flags 27# conjunction with the ebeep function. If the EPAUSE_IGNORE env var is set,
26# 28# don't wait at all.
27# Checks user USE related cpu flags against /proc/cpuinfo. If user enables a
28# cpu flag that is not supported in their processor flags, it will warn the
29# user if CROSSCOMPILE is not set to 1 ( because cross compile users are
30# obviously using different cpu flags than their own cpu ). Examples:
31#
32# CPU_FLAGS=(mmx mmx2 sse sse2)
33# ecpu_check CPU_FLAGS
34# Chris White <chriswhite@gentoo.org> (03 Feb 2005)
35
36ecpu_check() {
37 CPU_FLAGS=$1
38 USER_CPU=`grep "flags" /proc/cpuinfo`
39
40 for flags in `seq 1 ${#CPU_FLAGS[@]}`
41 do
42 if has ${CPU_FLAGS[$flags - 1]} $USER_CPU && ! has ${CPU_FLAGS[$flags - 1]} $USE
43 then
44 ewarn "Your system is ${CPU_FLAGS[$flags - 1]} capable but you don't have it enabled!"
45 ewarn "You might be cross compiling (in this case set CROSSCOMPILE to 1 to disable this warning."
46 fi
47
48 if ! has ${CPU_FLAGS[$flags - 1]} $USER_CPU && has ${CPU_FLAGS[$flags -1]} $USE
49 then
50 ewarn "You have ${CPU_FLAGS[$flags - 1]} support enabled but your processor doesn't"
51 ewarn "Seem to support it! You might be cross compiling or do not have /proc filesystem"
52 ewarn "enabled. If either is the case, set CROSSCOMPILE to 1 to disable this warning."
53 fi
54 done
55}
56
57# Wait for the supplied number of seconds. If no argument is supplied, defaults
58# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
59# outputting to a terminal, don't wait. For compatability purposes, the argument
60# must be an integer greater than zero.
61# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
62epause() { 29epause() {
63 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then 30 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
64 sleep ${1:-5}
65 fi
66} 31}
67 32
68# Beep the specified number of times (defaults to five). If our output 33# @FUNCTION: ebeep
69# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set, 34# @USAGE: [number of beeps]
35# @DESCRIPTION:
36# Issue the specified number of beeps (default of 5 beeps). Useful when
37# printing a message the user should probably be reading and often used in
38# conjunction with the epause function. If the EBEEP_IGNORE env var is set,
70# don't beep. 39# don't beep at all.
71# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
72ebeep() { 40ebeep() {
73 local n 41 local n
74 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then 42 if [[ -z ${EBEEP_IGNORE} ]] ; then
75 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 43 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
76 echo -ne "\a" 44 echo -ne "\a"
77 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null 45 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
78 echo -ne "\a" 46 echo -ne "\a"
79 sleep 1 47 sleep 1
80 done 48 done
81 fi 49 fi
82} 50}
83 51
84# This function generate linker scripts in /usr/lib for dynamic 52# @FUNCTION: ecvs_clean
85# libs in /lib. This is to fix linking problems when you have 53# @USAGE: [list of dirs]
86# the .so in /lib, and the .a in /usr/lib. What happens is that 54# @DESCRIPTION:
87# in some cases when linking dynamic, the .a in /usr/lib is used 55# Remove CVS directories recursiveley. Useful when a source tarball contains
88# instead of the .so in /lib due to gcc/libtool tweaking ld's 56# internal CVS directories. Defaults to $PWD.
89# library search path. This cause many builds to fail. 57ecvs_clean() {
90# See bug #4411 for more info. 58 [[ -z $* ]] && set -- .
91# 59 find "$@" -type d -name 'CVS' -prune -print0 | xargs -0 rm -rf
92# To use, simply call: 60 find "$@" -type f -name '.cvs*' -print0 | xargs -0 rm -rf
93#
94# gen_usr_ldscript libfoo.so
95#
96# Note that you should in general use the unversioned name of
97# the library, as ldconfig should usually update it correctly
98# to point to the latest version of the library present.
99#
100# <azarah@gentoo.org> (26 Oct 2002)
101#
102gen_usr_ldscript() {
103 local libdir="$(get_libdir)"
104 # Just make sure it exists
105 dodir /usr/${libdir}
106
107 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT
108/* GNU ld script
109 Because Gentoo have critical dynamic libraries
110 in /lib, and the static versions in /usr/lib, we
111 need to have a "fake" dynamic lib in /usr/lib,
112 otherwise we run into linking problems.
113 See bug #4411 on http://bugs.gentoo.org/ for
114 more info. */
115GROUP ( /${libdir}/${1} )
116END_LDSCRIPT
117 fperms a+x "/usr/${libdir}/${1}"
118} 61}
119 62
120# Simple function to draw a line consisting of '=' the same length as $* 63# @FUNCTION: esvn_clean
121# 64# @USAGE: [list of dirs]
122# <azarah@gentoo.org> (11 Nov 2002) 65# @DESCRIPTION:
123# 66# Remove .svn directories recursiveley. Useful when a source tarball contains
124draw_line() { 67# internal Subversion directories. Defaults to $PWD.
125 local i=0 68esvn_clean() {
126 local str_length="" 69 [[ -z $* ]] && set -- .
127 70 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
128 # Handle calls that do not have args, or wc not being installed ...
129 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
130 then
131 echo "==============================================================="
132 return 0
133 fi
134
135 # Get the length of $*
136 str_length="$(echo -n "$*" | wc -m)"
137
138 while [ "$i" -lt "${str_length}" ]
139 do
140 echo -n "="
141
142 i=$((i + 1))
143 done
144
145 echo
146
147 return 0
148} 71}
149 72
150# Default directory where patches are located 73# Default directory where patches are located
151EPATCH_SOURCE="${WORKDIR}/patch" 74EPATCH_SOURCE="${WORKDIR}/patch"
152# Default extension for patches 75# Default extension for patches
153EPATCH_SUFFIX="patch.bz2" 76EPATCH_SUFFIX="patch.bz2"
154# Default options for patch 77# Default options for patch
155# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 78# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
156EPATCH_OPTS="-g0" 79# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
80# Set -E to automatically remove empty files.
81EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
157# List of patches not to apply. Not this is only file names, 82# List of patches not to apply. Note this is only file names,
158# and not the full path .. 83# and not the full path ..
159EPATCH_EXCLUDE="" 84EPATCH_EXCLUDE=""
160# Change the printed message for a single patch. 85# Change the printed message for a single patch.
161EPATCH_SINGLE_MSG="" 86EPATCH_SINGLE_MSG=""
87# Change the printed message for multiple patches.
88EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
162# Force applying bulk patches even if not following the style: 89# Force applying bulk patches even if not following the style:
163# 90#
164# ??_${ARCH}_foo.${EPATCH_SUFFIX} 91# ??_${ARCH}_foo.${EPATCH_SUFFIX}
165# 92#
166EPATCH_FORCE="no" 93EPATCH_FORCE="no"
167 94
168# This function is for bulk patching, or in theory for just one 95# This function is for bulk patching, or in theory for just one
169# or two patches. 96# or two patches.
178# bug they should be left as is to ensure an ebuild can rely on 105# bug they should be left as is to ensure an ebuild can rely on
179# them for. 106# them for.
180# 107#
181# Patches are applied in current directory. 108# Patches are applied in current directory.
182# 109#
183# Bulk Patches should preferibly have the form of: 110# Bulk Patches should preferably have the form of:
184# 111#
185# ??_${ARCH}_foo.${EPATCH_SUFFIX} 112# ??_${ARCH}_foo.${EPATCH_SUFFIX}
186# 113#
187# For example: 114# For example:
188# 115#
189# 01_all_misc-fix.patch.bz2 116# 01_all_misc-fix.patch.bz2
190# 02_sparc_another-fix.patch.bz2 117# 02_sparc_another-fix.patch.bz2
191# 118#
192# This ensures that there are a set order, and you can have ARCH 119# This ensures that there are a set order, and you can have ARCH
193# specific patches. 120# specific patches.
194# 121#
195# If you however give an argument to epatch(), it will treat it as a 122# If you however give an argument to epatch(), it will treat it as a
197# hand its a directory, it will set EPATCH_SOURCE to this. 124# hand its a directory, it will set EPATCH_SOURCE to this.
198# 125#
199# <azarah@gentoo.org> (10 Nov 2002) 126# <azarah@gentoo.org> (10 Nov 2002)
200# 127#
201epatch() { 128epatch() {
129 _epatch_draw_line() {
130 [[ -z $1 ]] && set "$(printf "%65s" '')"
131 echo "${1//?/=}"
132 }
133 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
202 local PIPE_CMD="" 134 local PIPE_CMD=""
203 local STDERR_TARGET="${T}/$$.out" 135 local STDERR_TARGET="${T}/$$.out"
204 local PATCH_TARGET="${T}/$$.patch" 136 local PATCH_TARGET="${T}/$$.patch"
205 local PATCH_SUFFIX="" 137 local PATCH_SUFFIX=""
206 local SINGLE_PATCH="no" 138 local SINGLE_PATCH="no"
207 local x="" 139 local x=""
208 140
141 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
142
209 if [ "$#" -gt 1 ] 143 if [ "$#" -gt 1 ]
210 then 144 then
211 local m="" 145 local m=""
212 einfo "${#} patches to apply ..."
213 for m in "$@" ; do 146 for m in "$@" ; do
214 epatch "${m}" 147 epatch "${m}"
215 done 148 done
216 return 0 149 return 0
217 fi 150 fi
231 local EPATCH_SOURCE="$1/*" 164 local EPATCH_SOURCE="$1/*"
232 else 165 else
233 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 166 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
234 fi 167 fi
235 else 168 else
236 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ] 169 if [[ ! -d ${EPATCH_SOURCE} ]] || [[ -n $1 ]] ; then
237 then
238 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 170 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
239 then 171 then
240 EPATCH_SOURCE="$1" 172 EPATCH_SOURCE="$1"
241 fi 173 fi
242 174
251 183
252 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 184 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
253 fi 185 fi
254 186
255 case ${EPATCH_SUFFIX##*\.} in 187 case ${EPATCH_SUFFIX##*\.} in
188 xz)
189 PIPE_CMD="xz -dc"
190 PATCH_SUFFIX="xz"
191 ;;
192 lzma)
193 PIPE_CMD="lzma -dc"
194 PATCH_SUFFIX="lzma"
195 ;;
256 bz2) 196 bz2)
257 PIPE_CMD="bzip2 -dc" 197 PIPE_CMD="bzip2 -dc"
258 PATCH_SUFFIX="bz2" 198 PATCH_SUFFIX="bz2"
259 ;; 199 ;;
260 gz|Z|z) 200 gz|Z|z)
271 ;; 211 ;;
272 esac 212 esac
273 213
274 if [ "${SINGLE_PATCH}" = "no" ] 214 if [ "${SINGLE_PATCH}" = "no" ]
275 then 215 then
276 einfo "Applying various patches (bugfixes/updates) ..." 216 einfo "${EPATCH_MULTI_MSG}"
277 fi 217 fi
278 for x in ${EPATCH_SOURCE} 218 for x in ${EPATCH_SOURCE}
279 do 219 do
280 # New ARCH dependant patch naming scheme ... 220 # New ARCH dependant patch naming scheme ...
281 # 221 #
282 # ???_arch_foo.patch 222 # ???_arch_foo.patch
283 # 223 #
284 if [ -f ${x} ] && \ 224 if [ -f ${x} ] && \
285 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 225 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
286 [ "${EPATCH_FORCE}" = "yes" ]) 226 [ "${EPATCH_FORCE}" = "yes" ])
287 then 227 then
288 local count=0 228 local count=0
289 local popts="${EPATCH_OPTS}" 229 local popts="${EPATCH_OPTS}"
230 local patchname=${x##*/}
290 231
291 if [ -n "${EPATCH_EXCLUDE}" ] 232 if [ -n "${EPATCH_EXCLUDE}" ]
292 then 233 then
293 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 234 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
294 then 235 then
295 continue 236 continue
296 fi 237 fi
297 fi 238 fi
298 239
300 then 241 then
301 if [ -n "${EPATCH_SINGLE_MSG}" ] 242 if [ -n "${EPATCH_SINGLE_MSG}" ]
302 then 243 then
303 einfo "${EPATCH_SINGLE_MSG}" 244 einfo "${EPATCH_SINGLE_MSG}"
304 else 245 else
305 einfo "Applying ${x##*/} ..." 246 einfo "Applying ${patchname} ..."
306 fi 247 fi
307 else 248 else
308 einfo " ${x##*/} ..." 249 einfo " ${patchname} ..."
309 fi 250 fi
310 251
311 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 252 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
312 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 253 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
254
255 # Decompress the patch if need be
256 if [[ ${PATCH_SUFFIX} != "patch" ]] ; then
257 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
258 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
259
260 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 ; then
261 echo
262 eerror "Could not extract patch!"
263 #die "Could not extract patch!"
264 count=5
265 break
266 fi
267 else
268 PATCH_TARGET="${x}"
269 fi
270
271 # Check for absolute paths in patches. If sandbox is disabled,
272 # people could (accidently) patch files in the root filesystem.
273 # Or trigger other unpleasantries #237667. So disallow -p0 on
274 # such patches.
275 local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }')
276 if [[ -n ${abs_paths} ]] ; then
277 count=1
278 echo "NOTE: skipping -p0 due to absolute paths in patch:" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
279 echo "${abs_paths}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
280 fi
313 281
314 # Allow for prefix to differ ... im lazy, so shoot me :/ 282 # Allow for prefix to differ ... im lazy, so shoot me :/
315 while [ "${count}" -lt 5 ] 283 while [ "${count}" -lt 5 ]
316 do 284 do
317 # Generate some useful debug info ... 285 # Generate some useful debug info ...
318 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 286 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
319 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 287 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
320 288
321 if [ "${PATCH_SUFFIX}" != "patch" ] 289 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
291
292 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
293 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
294
295 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
322 then 296 then
323 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
324 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
325 else
326 PATCH_TARGET="${x}"
327 fi
328
329 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
330 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
331
332 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
333 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
334
335 if [ "${PATCH_SUFFIX}" != "patch" ]
336 then
337 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1
338 then
339 echo
340 eerror "Could not extract patch!"
341 #die "Could not extract patch!"
342 count=5
343 break
344 fi
345 fi
346
347 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1
348 then
349 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 297 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
350 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 298 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
351 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 299 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
352 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
353 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 301 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
354 302
355 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 303 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
304 _epatch_assert
356 305
357 if [ "$?" -ne 0 ] 306 if [ "$?" -ne 0 ]
358 then 307 then
359 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 308 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
360 echo 309 echo
361 eerror "A dry-run of patch command succeeded, but actually" 310 eerror "A dry-run of patch command succeeded, but actually"
362 eerror "applying the patch failed!" 311 eerror "applying the patch failed!"
363 #die "Real world sux compared to the dreamworld!" 312 #die "Real world sux compared to the dreamworld!"
364 count=5 313 count=5
365 fi 314 fi
366 315
367 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 316 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
368 317
369 break 318 break
370 fi 319 fi
371 320
372 count=$((count + 1)) 321 count=$((count + 1))
378 fi 327 fi
379 328
380 if [ "${count}" -eq 5 ] 329 if [ "${count}" -eq 5 ]
381 then 330 then
382 echo 331 echo
383 eerror "Failed Patch: ${x##*/}!" 332 eerror "Failed Patch: ${patchname} !"
333 eerror " ( ${PATCH_TARGET} )"
384 eerror 334 eerror
385 eerror "Include in your bugreport the contents of:" 335 eerror "Include in your bugreport the contents of:"
386 eerror 336 eerror
387 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 337 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
388 echo 338 echo
389 die "Failed Patch: ${x##*/}!" 339 die "Failed Patch: ${patchname}!"
390 fi 340 fi
391 341
392 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 342 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
393 343
394 eend 0 344 eend 0
395 fi 345 fi
396 done 346 done
397 if [ "${SINGLE_PATCH}" = "no" ] 347 if [ "${SINGLE_PATCH}" = "no" ]
398 then 348 then
399 einfo "Done with patching" 349 einfo "Done with patching"
400 fi 350 fi
401} 351}
352epatch_user() {
353 [[ $# -ne 0 ]] && die "epatch_user takes no options"
402 354
403# This function return true if we are using the NPTL pthreads 355 # don't clobber any EPATCH vars that the parent might want
404# implementation. 356 local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT}/etc/portage/patches
405# 357 for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do
406# <azarah@gentoo.org> (06 March 2003) 358 EPATCH_SOURCE=${base}/${CTARGET}/${check}
407# 359 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
408have_NPTL() { 360 [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
409 cat > ${T}/test-nptl.c <<-"END" 361 if [[ -d ${EPATCH_SOURCE} ]] ; then
410 #define _XOPEN_SOURCE 362 EPATCH_SOURCE=${EPATCH_SOURCE} \
411 #include <unistd.h> 363 EPATCH_SUFFIX="patch" \
412 #include <stdio.h> 364 EPATCH_FORCE="yes" \
413 365 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
414 int main() 366 epatch
415 { 367 break
416 char buf[255];
417 char *str = buf;
418
419 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
420 if (NULL != str) {
421 printf("%s\n", str);
422 if (NULL != strstr(str, "NPTL"))
423 return 0;
424 }
425
426 return 1;
427 }
428 END
429
430 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
431 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
432 then
433 echo "yes"
434 einfon "Checking what PTHREADS implementation we have ..."
435 if ${T}/nptl
436 then
437 return 0
438 else
439 return 1
440 fi
441 else
442 echo "no"
443 fi 368 fi
444 369 done
445 return 1
446} 370}
447 371
448# This function check how many cpu's are present, and then set 372# @FUNCTION: emktemp
449# -j in MAKEOPTS accordingly. 373# @USAGE: [temp dir]
450# 374# @DESCRIPTION:
451# Thanks to nall <nall@gentoo.org> for this.
452#
453get_number_of_jobs() {
454 local jobs=0
455
456 if [ ! -r /proc/cpuinfo ]
457 then
458 return 1
459 fi
460
461 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
462 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
463 then
464 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
465 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
466 ADMINPARAM="${ADMINPARAM/-j}"
467 fi
468
469 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
470
471 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
472 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
473 then
474 # these archs will always have "[Pp]rocessor"
475 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
476
477 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
478 then
479 # sparc always has "ncpus active"
480 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
481
482 elif [ "${ARCH}" = "alpha" ]
483 then
484 # alpha has "cpus active", but only when compiled with SMP
485 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
486 then
487 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
488 else
489 jobs=2
490 fi
491
492 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
493 then
494 # ppc has "processor", but only when compiled with SMP
495 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
496 then
497 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
498 else
499 jobs=2
500 fi
501 elif [ "${ARCH}" = "s390" ]
502 then
503 # s390 has "# processors : "
504 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
505 else
506 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
507 die "Unknown ARCH -- ${ARCH}!"
508 fi
509
510 # Make sure the number is valid ...
511 if [ "${jobs}" -lt 1 ]
512 then
513 jobs=1
514 fi
515
516 if [ -n "${ADMINPARAM}" ]
517 then
518 if [ "${jobs}" -gt "${ADMINPARAM}" ]
519 then
520 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
521 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
522 else
523 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
524 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
525 fi
526 fi
527}
528
529# Cheap replacement for when debianutils (and thus mktemp) 375# Cheap replacement for when debianutils (and thus mktemp)
530# does not exist on the users system 376# does not exist on the users system.
531# vapier@gentoo.org
532#
533# Takes just 1 optional parameter (the directory to create tmpfile in)
534emktemp() { 377emktemp() {
535 local exe="touch" 378 local exe="touch"
536 [ "$1" == "-d" ] && exe="mkdir" && shift 379 [[ $1 == -d ]] && exe="mkdir" && shift
537 local topdir="$1" 380 local topdir=$1
538 381
539 if [ -z "${topdir}" ] 382 if [[ -z ${topdir} ]] ; then
540 then
541 [ -z "${T}" ] \ 383 [[ -z ${T} ]] \
542 && topdir="/tmp" \ 384 && topdir="/tmp" \
543 || topdir="${T}" 385 || topdir=${T}
544 fi 386 fi
545 387
546 if [ -z "$(type -p mktemp)" ] 388 if ! type -P mktemp > /dev/null ; then
547 then 389 # system lacks `mktemp` so we have to fake it
548 local tmp=/ 390 local tmp=/
549 while [ -e "${tmp}" ] ; do 391 while [[ -e ${tmp} ]] ; do
550 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 392 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
551 done 393 done
552 ${exe} "${tmp}" 394 ${exe} "${tmp}" || ${exe} -p "${tmp}"
553 echo "${tmp}" 395 echo "${tmp}"
554 else 396 else
555 [ "${exe}" == "touch" ] \ 397 # the args here will give slightly wierd names on BSD,
556 && exe="-p" \ 398 # but should produce a usable file on all userlands
557 || exe="-d" 399 if [[ ${exe} == "touch" ]] ; then
558 mktemp ${exe} "${topdir}" 400 TMPDIR="${topdir}" mktemp -t tmp.XXXXXXXXXX
401 else
402 TMPDIR="${topdir}" mktemp -dt tmp.XXXXXXXXXX
559 fi 403 fi
404 fi
560} 405}
561 406
407# @FUNCTION: egetent
408# @USAGE: <database> <key>
409# @MAINTAINER:
410# base-system@gentoo.org (Linux)
411# Joe Jezak <josejx@gmail.com> (OS X)
412# usata@gentoo.org (OS X)
413# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
414# @DESCRIPTION:
562# Small wrapper for getent (Linux), nidump (Mac OS X), 415# Small wrapper for getent (Linux),
416# nidump (< Mac OS X 10.5), dscl (Mac OS X 10.5),
563# and pw (FreeBSD) used in enewuser()/enewgroup() 417# and pw (FreeBSD) used in enewuser()/enewgroup()
564# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
565# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
566#
567# egetent(database, key)
568egetent() { 418egetent() {
569 if useq ppc-macos ; then 419 case ${CHOST} in
420 *-darwin9)
421 local mytype=$1
422 [[ "passwd" == $mytype ]] && mytype="Users"
423 [[ "group" == $mytype ]] && mytype="Groups"
570 case "$2" in 424 case "$2" in
571 *[!0-9]*) # Non numeric 425 *[!0-9]*) # Non numeric
426 dscl . -read /$mytype/$2 2>/dev/null |grep RecordName
427 ;;
428 *) # Numeric
429 local mykey="UniqueID"
430 [[ $mytype == "Groups" ]] && mykey="PrimaryGroupID"
431 dscl . -search /$mytype $mykey $2 2>/dev/null
432 ;;
433 esac
434 ;;
435 *-darwin*)
436 case "$2" in
437 *[!0-9]*) # Non numeric
572 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 438 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
573 ;; 439 ;;
574 *) # Numeric 440 *) # Numeric
575 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 441 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
576 ;; 442 ;;
577 esac 443 esac
578 elif useq x86-fbsd ; then 444 ;;
579 local action 445 *-freebsd*|*-dragonfly*)
580 if [ "$1" == "passwd" ] 446 local opts action="user"
581 then 447 [[ $1 == "passwd" ]] || action="group"
582 action="user" 448
583 else 449 # lookup by uid/gid
584 action="group" 450 if [[ $2 == [[:digit:]]* ]] ; then
451 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
585 fi 452 fi
453
586 pw show "${action}" "$2" -q 454 pw show ${action} ${opts} "$2" -q
587 else 455 ;;
456 *-netbsd*|*-openbsd*)
457 grep "$2:\*:" /etc/$1
458 ;;
459 *)
588 which nscd >& /dev/null && nscd -i "$1" 460 type -p nscd >& /dev/null && nscd -i "$1"
589 getent "$1" "$2" 461 getent "$1" "$2"
590 fi 462 ;;
463 esac
591} 464}
592 465
593# Simplify/standardize adding users to the system 466# @FUNCTION: enewuser
594# vapier@gentoo.org 467# @USAGE: <user> [uid] [shell] [homedir] [groups] [params]
595# 468# @DESCRIPTION:
596# enewuser(username, uid, shell, homedir, groups, extra options) 469# Same as enewgroup, you are not required to understand how to properly add
597# 470# a user to the system. The only required parameter is the username.
598# Default values if you do not specify any: 471# Default uid is (pass -1 for this) next available, default shell is
599# username: REQUIRED ! 472# /bin/false, default homedir is /dev/null, there are no default groups,
600# uid: next available (see useradd(8)) 473# and default params sets the comment as 'added by portage for ${PN}'.
601# note: pass -1 to get default behavior
602# shell: /bin/false
603# homedir: /dev/null
604# groups: none
605# extra: comment of 'added by portage for ${PN}'
606enewuser() { 474enewuser() {
475 case ${EBUILD_PHASE} in
476 unpack|compile|test|install)
477 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
478 eerror "Package fails at QA and at life. Please file a bug."
479 die "Bad package! enewuser is only for use in pkg_* functions!"
480 esac
481
607 # get the username 482 # get the username
608 local euser="$1"; shift 483 local euser=$1; shift
609 if [ -z "${euser}" ] 484 if [[ -z ${euser} ]] ; then
610 then
611 eerror "No username specified !" 485 eerror "No username specified !"
612 die "Cannot call enewuser without a username" 486 die "Cannot call enewuser without a username"
613 fi 487 fi
614 488
615 # lets see if the username already exists 489 # lets see if the username already exists
616 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 490 if [[ -n $(egetent passwd "${euser}") ]] ; then
617 then
618 return 0 491 return 0
619 fi 492 fi
620 einfo "Adding user '${euser}' to your system ..." 493 einfo "Adding user '${euser}' to your system ..."
621 494
622 # options to pass to useradd 495 # options to pass to useradd
623 local opts= 496 local opts=
624 497
625 # handle uid 498 # handle uid
626 local euid="$1"; shift 499 local euid=$1; shift
627 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 500 if [[ -n ${euid} && ${euid} != -1 ]] ; then
628 then
629 if [ "${euid}" -gt 0 ] 501 if [[ ${euid} -gt 0 ]] ; then
630 then
631 if [ ! -z "`egetent passwd ${euid}`" ] 502 if [[ -n $(egetent passwd ${euid}) ]] ; then
632 then
633 euid="next" 503 euid="next"
634 fi 504 fi
635 else 505 else
636 eerror "Userid given but is not greater than 0 !" 506 eerror "Userid given but is not greater than 0 !"
637 die "${euid} is not a valid UID" 507 die "${euid} is not a valid UID"
638 fi 508 fi
639 else 509 else
640 euid="next" 510 euid="next"
641 fi 511 fi
642 if [ "${euid}" == "next" ] 512 if [[ ${euid} == "next" ]] ; then
643 then 513 for ((euid = 101; euid <= 999; euid++)); do
644 local pwrange
645 if [ "${USERLAND}" == "BSD" ] ; then
646 pwrange="`jot 898 101`"
647 else
648 pwrange="`seq 101 999`"
649 fi
650 for euid in ${pwrange} ; do
651 [ -z "`egetent passwd ${euid}`" ] && break 514 [[ -z $(egetent passwd ${euid}) ]] && break
652 done 515 done
653 fi 516 fi
654 opts="${opts} -u ${euid}" 517 opts="${opts} -u ${euid}"
655 einfo " - Userid: ${euid}" 518 einfo " - Userid: ${euid}"
656 519
657 # handle shell 520 # handle shell
658 local eshell="$1"; shift 521 local eshell=$1; shift
659 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 522 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
660 then 523 if [[ ! -e ${ROOT}${eshell} ]] ; then
661 if [ ! -e "${eshell}" ]
662 then
663 eerror "A shell was specified but it does not exist !" 524 eerror "A shell was specified but it does not exist !"
664 die "${eshell} does not exist" 525 die "${eshell} does not exist in ${ROOT}"
526 fi
527 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
528 eerror "Do not specify ${eshell} yourself, use -1"
529 die "Pass '-1' as the shell parameter"
665 fi 530 fi
666 else 531 else
667 if [ "${USERLAND}" == "BSD" ] 532 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
668 then 533 [[ -x ${ROOT}${shell} ]] && break
669 eshell="/usr/bin/false" 534 done
670 else 535
536 if [[ ${shell} == "/dev/null" ]] ; then
537 eerror "Unable to identify the shell to use, proceeding with userland default."
538 case ${USERLAND} in
671 eshell="/bin/false" 539 GNU) shell="/bin/false" ;;
540 BSD) shell="/sbin/nologin" ;;
541 Darwin) shell="/usr/sbin/nologin" ;;
542 *) die "Unable to identify the default shell for userland ${USERLAND}"
543 esac
672 fi 544 fi
545
546 eshell=${shell}
673 fi 547 fi
674 einfo " - Shell: ${eshell}" 548 einfo " - Shell: ${eshell}"
675 opts="${opts} -s ${eshell}" 549 opts="${opts} -s ${eshell}"
676 550
677 # handle homedir 551 # handle homedir
678 local ehome="$1"; shift 552 local ehome=$1; shift
679 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 553 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
680 then
681 ehome="/dev/null" 554 ehome="/dev/null"
682 fi 555 fi
683 einfo " - Home: ${ehome}" 556 einfo " - Home: ${ehome}"
684 opts="${opts} -d ${ehome}" 557 opts="${opts} -d ${ehome}"
685 558
686 # handle groups 559 # handle groups
687 local egroups="$1"; shift 560 local egroups=$1; shift
688 if [ ! -z "${egroups}" ] 561 if [[ ! -z ${egroups} ]] ; then
689 then
690 local oldifs="${IFS}" 562 local oldifs=${IFS}
691 local defgroup="" exgroups="" 563 local defgroup="" exgroups=""
692 564
693 export IFS="," 565 export IFS=","
694 for g in ${egroups} 566 for g in ${egroups} ; do
695 do
696 export IFS="${oldifs}" 567 export IFS=${oldifs}
697 if [ -z "`egetent group \"${g}\"`" ] 568 if [[ -z $(egetent group "${g}") ]] ; then
698 then
699 eerror "You must add group ${g} to the system first" 569 eerror "You must add group ${g} to the system first"
700 die "${g} is not a valid GID" 570 die "${g} is not a valid GID"
701 fi 571 fi
702 if [ -z "${defgroup}" ] 572 if [[ -z ${defgroup} ]] ; then
703 then
704 defgroup="${g}" 573 defgroup=${g}
705 else 574 else
706 exgroups="${exgroups},${g}" 575 exgroups="${exgroups},${g}"
707 fi 576 fi
708 export IFS="," 577 export IFS=","
709 done 578 done
710 export IFS="${oldifs}" 579 export IFS=${oldifs}
711 580
712 opts="${opts} -g ${defgroup}" 581 opts="${opts} -g ${defgroup}"
713 if [ ! -z "${exgroups}" ] 582 if [[ ! -z ${exgroups} ]] ; then
714 then
715 opts="${opts} -G ${exgroups:1}" 583 opts="${opts} -G ${exgroups:1}"
716 fi 584 fi
717 else 585 else
718 egroups="(none)" 586 egroups="(none)"
719 fi 587 fi
720 einfo " - Groups: ${egroups}" 588 einfo " - Groups: ${egroups}"
721 589
722 # handle extra and add the user 590 # handle extra and add the user
723 local eextra="$@"
724 local oldsandbox="${SANDBOX_ON}" 591 local oldsandbox=${SANDBOX_ON}
725 export SANDBOX_ON="0" 592 export SANDBOX_ON="0"
726 if useq ppc-macos 593 case ${CHOST} in
727 then 594 *-darwin*)
728 ### Make the user 595 ### Make the user
729 if [ -z "${eextra}" ] 596 if [[ -z $@ ]] ; then
730 then
731 dscl . create /users/${euser} uid ${euid} 597 dscl . create /users/${euser} uid ${euid}
732 dscl . create /users/${euser} shell ${eshell} 598 dscl . create /users/${euser} shell ${eshell}
733 dscl . create /users/${euser} home ${ehome} 599 dscl . create /users/${euser} home ${ehome}
734 dscl . create /users/${euser} realname "added by portage for ${PN}" 600 dscl . create /users/${euser} realname "added by portage for ${PN}"
735 ### Add the user to the groups specified 601 ### Add the user to the groups specified
736 local oldifs="${IFS}" 602 local oldifs=${IFS}
737 export IFS="," 603 export IFS=","
738 for g in ${egroups} 604 for g in ${egroups} ; do
739 do
740 dscl . merge /groups/${g} users ${euser} 605 dscl . merge /groups/${g} users ${euser}
741 done 606 done
742 export IFS="${oldifs}" 607 export IFS=${oldifs}
743 else 608 else
744 einfo "Extra options are not supported on macos yet" 609 einfo "Extra options are not supported on Darwin yet"
745 einfo "Please report the ebuild along with the info below" 610 einfo "Please report the ebuild along with the info below"
746 einfo "eextra: ${eextra}" 611 einfo "eextra: $@"
747 die "Required function missing" 612 die "Required function missing"
748 fi 613 fi
749 elif use x86-fbsd ; then 614 ;;
750 if [ -z "${eextra}" ] 615 *-freebsd*|*-dragonfly*)
751 then 616 if [[ -z $@ ]] ; then
752 pw useradd ${euser} ${opts} \ 617 pw useradd ${euser} ${opts} \
753 -c "added by portage for ${PN}" \ 618 -c "added by portage for ${PN}" \
754 die "enewuser failed" 619 die "enewuser failed"
755 else 620 else
756 einfo " - Extra: ${eextra}" 621 einfo " - Extra: $@"
757 pw useradd ${euser} ${opts} \ 622 pw useradd ${euser} ${opts} \
758 -c ${eextra} || die "enewuser failed" 623 "$@" || die "enewuser failed"
759 fi 624 fi
625 ;;
626
627 *-netbsd*)
628 if [[ -z $@ ]] ; then
629 useradd ${opts} ${euser} || die "enewuser failed"
760 else 630 else
761 if [ -z "${eextra}" ] 631 einfo " - Extra: $@"
762 then 632 useradd ${opts} ${euser} "$@" || die "enewuser failed"
633 fi
634 ;;
635
636 *-openbsd*)
637 if [[ -z $@ ]] ; then
638 useradd -u ${euid} -s ${eshell} \
639 -d ${ehome} -c "Added by portage for ${PN}" \
640 -g ${egroups} ${euser} || die "enewuser failed"
641 else
642 einfo " - Extra: $@"
643 useradd -u ${euid} -s ${eshell} \
644 -d ${ehome} -c "Added by portage for ${PN}" \
645 -g ${egroups} ${euser} "$@" || die "enewuser failed"
646 fi
647 ;;
648
649 *)
650 if [[ -z $@ ]] ; then
763 useradd ${opts} ${euser} \ 651 useradd ${opts} ${euser} \
764 -c "added by portage for ${PN}" \ 652 -c "added by portage for ${PN}" \
765 || die "enewuser failed" 653 || die "enewuser failed"
766 else 654 else
767 einfo " - Extra: ${eextra}" 655 einfo " - Extra: $@"
768 useradd ${opts} ${euser} ${eextra} \ 656 useradd ${opts} ${euser} "$@" \
769 || die "enewuser failed" 657 || die "enewuser failed"
770 fi 658 fi
659 ;;
660 esac
661
662 if [[ ! -e ${ROOT}/${ehome} ]] ; then
663 einfo " - Creating ${ehome} in ${ROOT}"
664 mkdir -p "${ROOT}/${ehome}"
665 chown ${euser} "${ROOT}/${ehome}"
666 chmod 755 "${ROOT}/${ehome}"
771 fi 667 fi
668
772 export SANDBOX_ON="${oldsandbox}" 669 export SANDBOX_ON=${oldsandbox}
773
774 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
775 then
776 einfo " - Creating ${ehome} in ${D}"
777 dodir ${ehome}
778 fowners ${euser} ${ehome}
779 fperms 755 ${ehome}
780 fi
781} 670}
782 671
783# Simplify/standardize adding groups to the system 672# @FUNCTION: enewgroup
784# vapier@gentoo.org 673# @USAGE: <group> [gid]
785# 674# @DESCRIPTION:
786# enewgroup(group, gid) 675# This function does not require you to understand how to properly add a
787# 676# group to the system. Just give it a group name to add and enewgroup will
788# Default values if you do not specify any: 677# do the rest. You may specify the gid for the group or allow the group to
789# groupname: REQUIRED ! 678# allocate the next available one.
790# gid: next available (see groupadd(8))
791# extra: none
792enewgroup() { 679enewgroup() {
680 case ${EBUILD_PHASE} in
681 unpack|compile|test|install)
682 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
683 eerror "Package fails at QA and at life. Please file a bug."
684 die "Bad package! enewgroup is only for use in pkg_* functions!"
685 esac
686
793 # get the group 687 # get the group
794 local egroup="$1"; shift 688 local egroup="$1"; shift
795 if [ -z "${egroup}" ] 689 if [ -z "${egroup}" ]
796 then 690 then
797 eerror "No group specified !" 691 eerror "No group specified !"
798 die "Cannot call enewgroup without a group" 692 die "Cannot call enewgroup without a group"
799 fi 693 fi
800 694
801 # see if group already exists 695 # see if group already exists
802 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 696 if [[ -n $(egetent group "${egroup}") ]]; then
803 then
804 return 0 697 return 0
805 fi 698 fi
806 einfo "Adding group '${egroup}' to your system ..." 699 einfo "Adding group '${egroup}' to your system ..."
807 700
808 # options to pass to useradd 701 # options to pass to useradd
814 then 707 then
815 if [ "${egid}" -gt 0 ] 708 if [ "${egid}" -gt 0 ]
816 then 709 then
817 if [ -z "`egetent group ${egid}`" ] 710 if [ -z "`egetent group ${egid}`" ]
818 then 711 then
819 if useq ppc-macos ; then 712 if [[ "${CHOST}" == *-darwin* ]]; then
820 opts="${opts} ${egid}" 713 opts="${opts} ${egid}"
821 else 714 else
822 opts="${opts} -g ${egid}" 715 opts="${opts} -g ${egid}"
823 fi 716 fi
824 else 717 else
838 opts="${opts} ${eextra}" 731 opts="${opts} ${eextra}"
839 732
840 # add the group 733 # add the group
841 local oldsandbox="${SANDBOX_ON}" 734 local oldsandbox="${SANDBOX_ON}"
842 export SANDBOX_ON="0" 735 export SANDBOX_ON="0"
843 if useq ppc-macos ; then 736 case ${CHOST} in
737 *-darwin*)
844 if [ ! -z "${eextra}" ]; 738 if [ ! -z "${eextra}" ];
845 then 739 then
846 einfo "Extra options are not supported on macos yet" 740 einfo "Extra options are not supported on Darwin/OS X yet"
847 einfo "Please report the ebuild along with the info below" 741 einfo "Please report the ebuild along with the info below"
848 einfo "eextra: ${eextra}" 742 einfo "eextra: ${eextra}"
849 die "Required function missing" 743 die "Required function missing"
850 fi 744 fi
851 745
852 # If we need the next available 746 # If we need the next available
853 case ${egid} in 747 case ${egid} in
854 *[!0-9]*) # Non numeric 748 *[!0-9]*) # Non numeric
855 for egid in `jot 898 101`; do 749 for ((egid = 101; egid <= 999; egid++)); do
856 [ -z "`egetent group ${egid}`" ] && break 750 [[ -z $(egetent group ${egid}) ]] && break
857 done 751 done
858 esac 752 esac
859 dscl . create /groups/${egroup} gid ${egid} 753 dscl . create /groups/${egroup} gid ${egid}
860 dscl . create /groups/${egroup} passwd '*' 754 dscl . create /groups/${egroup} passwd '*'
861 elif use x86-fbsd ; then 755 ;;
756
757 *-freebsd*|*-dragonfly*)
862 case ${egid} in 758 case ${egid} in
863 *[!0-9]*) # Non numeric 759 *[!0-9]*) # Non numeric
864 for egid in `jot 898 101`; do 760 for ((egid = 101; egid <= 999; egid++)); do
865 [ -z "`egetent group ${egid}`" ] && break 761 [[ -z $(egetent group ${egid}) ]] && break
866 done 762 done
867 esac 763 esac
868 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 764 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
869 else 765 ;;
766
767 *-netbsd*)
768 case ${egid} in
769 *[!0-9]*) # Non numeric
770 for ((egid = 101; egid <= 999; egid++)); do
771 [[ -z $(egetent group ${egid}) ]] && break
772 done
773 esac
774 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
775 ;;
776
777 *)
870 groupadd ${opts} ${egroup} || die "enewgroup failed" 778 groupadd ${opts} ${egroup} || die "enewgroup failed"
871 fi 779 ;;
780 esac
872 export SANDBOX_ON="${oldsandbox}" 781 export SANDBOX_ON="${oldsandbox}"
873} 782}
874 783
875# Simple script to replace 'dos2unix' binaries 784# @FUNCTION: edos2unix
876# vapier@gentoo.org 785# @USAGE: <file> [more files ...]
877# 786# @DESCRIPTION:
878# edos2unix(file, <more files> ...) 787# A handy replacement for dos2unix, recode, fixdos, etc... This allows you
788# to remove all of these text utilities from DEPEND variables because this
789# is a script based solution. Just give it a list of files to convert and
790# they will all be changed from the DOS CRLF format to the UNIX LF format.
879edos2unix() { 791edos2unix() {
880 for f in "$@" 792 echo "$@" | xargs sed -i 's/\r$//'
881 do
882 cp "${f}" ${T}/edos2unix
883 sed 's/\r$//' ${T}/edos2unix > "${f}"
884 done
885} 793}
886
887
888##############################################################
889# START: Handle .desktop files and menu entries #
890# maybe this should be separated into a new eclass some time #
891# lanius@gentoo.org #
892##############################################################
893 794
894# Make a desktop file ! 795# Make a desktop file !
895# Great for making those icons in kde/gnome startmenu ! 796# Great for making those icons in kde/gnome startmenu !
896# Amaze your friends ! Get the women ! Join today ! 797# Amaze your friends ! Get the women ! Join today !
897# 798#
898# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 799# make_desktop_entry(<command>, [name], [icon], [type], [path])
899# 800#
900# binary: what binary does the app run with ? 801# binary: what command does the app run with ?
901# name: the name that will show up in the menu 802# name: the name that will show up in the menu
902# icon: give your little like a pretty little icon ... 803# icon: give your little like a pretty little icon ...
903# this can be relative (to /usr/share/pixmaps) or 804# this can be relative (to /usr/share/pixmaps) or
904# a full path to an icon 805# a full path to an icon
905# type: what kind of application is this ? for categories: 806# type: what kind of application is this ? for categories:
906# http://www.freedesktop.org/standards/menu-spec/ 807# http://standards.freedesktop.org/menu-spec/latest/apa.html
907# path: if your app needs to startup in a specific dir 808# path: if your app needs to startup in a specific dir
908make_desktop_entry() { 809make_desktop_entry() {
909 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 810 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
910 811
911 local exec="${1}" 812 local exec=${1}
912 local name="${2:-${PN}}" 813 local name=${2:-${PN}}
913 local icon="${3:-${PN}.png}" 814 local icon=${3:-${PN}}
914 local type="${4}" 815 local type=${4}
915 local subdir="${6}" 816 local path=${5}
916 local path="${5:-${GAMES_BINDIR}}" 817
917 if [ -z "${type}" ] 818 if [[ -z ${type} ]] ; then
918 then 819 local catmaj=${CATEGORY%%-*}
919 case ${CATEGORY} in 820 local catmin=${CATEGORY##*-}
920 "app-emulation") 821 case ${catmaj} in
921 type=Emulator 822 app)
922 subdir="Emulation" 823 case ${catmin} in
824 accessibility) type=Accessibility;;
825 admin) type=System;;
826 antivirus) type=System;;
827 arch) type=Archiving;;
828 backup) type=Archiving;;
829 cdr) type=DiscBurning;;
830 dicts) type=Dictionary;;
831 doc) type=Documentation;;
832 editors) type=TextEditor;;
833 emacs) type=TextEditor;;
834 emulation) type=Emulator;;
835 laptop) type=HardwareSettings;;
836 office) type=Office;;
837 pda) type=PDA;;
838 vim) type=TextEditor;;
839 xemacs) type=TextEditor;;
840 *) type=;;
841 esac
923 ;; 842 ;;
924 "games-"*) 843
925 type=Game 844 dev)
926 subdir="Games" 845 type="Development"
927 ;; 846 ;;
928 "net-"*) 847
929 type=Network 848 games)
930 subdir="${type}" 849 case ${catmin} in
850 action|fps) type=ActionGame;;
851 arcade) type=ArcadeGame;;
852 board) type=BoardGame;;
853 emulation) type=Emulator;;
854 kids) type=KidsGame;;
855 puzzle) type=LogicGame;;
856 roguelike) type=RolePlaying;;
857 rpg) type=RolePlaying;;
858 simulation) type=Simulation;;
859 sports) type=SportsGame;;
860 strategy) type=StrategyGame;;
861 *) type=;;
862 esac
863 type="Game;${type}"
931 ;; 864 ;;
865
866 gnome)
867 type="Gnome;GTK"
868 ;;
869
870 kde)
871 type="KDE;Qt"
872 ;;
873
874 mail)
875 type="Network;Email"
876 ;;
877
878 media)
879 case ${catmin} in
880 gfx) type=Graphics;;
881 radio) type=Tuner;;
882 sound) type=Audio;;
883 tv) type=TV;;
884 video) type=Video;;
885 *) type=;;
886 esac
887 type="AudioVideo;${type}"
888 ;;
889
890 net)
891 case ${catmin} in
892 dialup) type=Dialup;;
893 ftp) type=FileTransfer;;
894 im) type=InstantMessaging;;
895 irc) type=IRCClient;;
896 mail) type=Email;;
897 news) type=News;;
898 nntp) type=News;;
899 p2p) type=FileTransfer;;
900 *) type=;;
901 esac
902 type="Network;${type}"
903 ;;
904
905 sci)
906 case ${catmin} in
907 astro*) type=Astronomy;;
908 bio*) type=Biology;;
909 calc*) type=Calculator;;
910 chem*) type=Chemistry;;
911 elec*) type=Electronics;;
912 geo*) type=Geology;;
913 math*) type=Math;;
914 physics) type=Physics;;
915 visual*) type=DataVisualization;;
916 *) type=;;
917 esac
918 type="Science;${type}"
919 ;;
920
921 sys)
922 type="System"
923 ;;
924
925 www)
926 case ${catmin} in
927 client) type=WebBrowser;;
928 *) type=;;
929 esac
930 type="Network"
931 ;;
932
932 *) 933 *)
933 type= 934 type=
934 subdir=
935 ;; 935 ;;
936 esac 936 esac
937 fi 937 fi
938 local desktop="${T}/${exec}.desktop" 938 if [ "${SLOT}" == "0" ] ; then
939 local desktop_name="${PN}"
940 else
941 local desktop_name="${PN}-${SLOT}"
942 fi
943 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
944 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
939 945
946 cat <<-EOF > "${desktop}"
940echo "[Desktop Entry] 947 [Desktop Entry]
941Encoding=UTF-8 948 Version=1.0
942Version=0.9.2
943Name=${name} 949 Name=${name}
944Type=Application 950 Type=Application
945Comment=${DESCRIPTION} 951 Comment=${DESCRIPTION}
946Exec=${exec} 952 Exec=${exec}
947Path=${path} 953 TryExec=${exec%% *}
948Icon=${icon} 954 Icon=${icon}
949Categories=Application;${type};" > "${desktop}" 955 Categories=${type};
956 EOF
950 957
958 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}"
959
960 (
961 # wrap the env here so that the 'insinto' call
962 # doesn't corrupt the env of the caller
951 insinto /usr/share/applications 963 insinto /usr/share/applications
952 doins "${desktop}" 964 doins "${desktop}"
953 965 )
954 return 0
955} 966}
956 967
957# Make a GDM/KDM Session file 968# @FUNCTION: validate_desktop_entries
958# 969# @USAGE: [directories]
959# make_desktop_entry(<title>, <command>) 970# @MAINTAINER:
960# title: File to execute to start the Window Manager 971# Carsten Lohrke <carlo@gentoo.org>
961# command: Name of the Window Manager 972# @DESCRIPTION:
973# Validate desktop entries using desktop-file-utils
974validate_desktop_entries() {
975 if [[ -x /usr/bin/desktop-file-validate ]] ; then
976 einfo "Checking desktop entry validity"
977 local directories=""
978 for d in /usr/share/applications $@ ; do
979 [[ -d ${D}${d} ]] && directories="${directories} ${D}${d}"
980 done
981 if [[ -n ${directories} ]] ; then
982 for FILE in $(find ${directories} -name "*\.desktop" \
983 -not -path '*.hidden*' | sort -u 2>/dev/null)
984 do
985 local temp=$(desktop-file-validate ${FILE} | grep -v "warning:" | \
986 sed -e "s|error: ||" -e "s|${FILE}:|--|g" )
987 [[ -n $temp ]] && elog ${temp/--/${FILE/${D}/}:}
988 done
989 fi
990 echo ""
991 else
992 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
993 fi
994}
962 995
996# @FUNCTION: make_session_desktop
997# @USAGE: <title> <command> [command args...]
998# @DESCRIPTION:
999# Make a GDM/KDM Session file. The title is the file to execute to start the
1000# Window Manager. The command is the name of the Window Manager.
1001#
1002# You can set the name of the file via the ${wm} variable.
963make_session_desktop() { 1003make_session_desktop() {
964
965 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 1004 [[ -z $1 ]] && eerror "$0: You must specify the title" && return 1
966 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1 1005 [[ -z $2 ]] && eerror "$0: You must specify the command" && return 1
967 1006
968 local title="${1}" 1007 local title=$1
969 local command="${2}" 1008 local command=$2
970 local desktop="${T}/${wm}.desktop" 1009 local desktop=${T}/${wm:-${PN}}.desktop
1010 shift 2
971 1011
1012 cat <<-EOF > "${desktop}"
972echo "[Desktop Entry] 1013 [Desktop Entry]
973Encoding=UTF-8
974Name=${title} 1014 Name=${title}
975Comment=This session logs you into ${title} 1015 Comment=This session logs you into ${title}
976Exec=${command} 1016 Exec=${command} $*
977TryExec=${command} 1017 TryExec=${command}
978Type=Application" > "${desktop}" 1018 Type=XSession
1019 EOF
979 1020
1021 (
1022 # wrap the env here so that the 'insinto' call
1023 # doesn't corrupt the env of the caller
980 insinto /usr/share/xsessions 1024 insinto /usr/share/xsessions
981 doins "${desktop}" 1025 doins "${desktop}"
982 1026 )
983 return 0
984} 1027}
985 1028
1029# @FUNCTION: domenu
1030# @USAGE: <menus>
1031# @DESCRIPTION:
1032# Install the list of .desktop menu files into the appropriate directory
1033# (/usr/share/applications).
986domenu() { 1034domenu() {
987 local i 1035 (
988 local j 1036 # wrap the env here so that the 'insinto' call
1037 # doesn't corrupt the env of the caller
1038 local i j ret=0
989 insinto /usr/share/applications 1039 insinto /usr/share/applications
990 for i in ${@} 1040 for i in "$@" ; do
991 do
992 if [ -f "${i}" ]; 1041 if [[ -f ${i} ]] ; then
993 then
994 doins ${i} 1042 doins "${i}"
1043 ((ret+=$?))
995 elif [ -d "${i}" ]; 1044 elif [[ -d ${i} ]] ; then
996 then
997 for j in ${i}/*.desktop 1045 for j in "${i}"/*.desktop ; do
998 do
999 doins ${j} 1046 doins "${j}"
1047 ((ret+=$?))
1000 done 1048 done
1049 else
1050 ((++ret))
1001 fi 1051 fi
1002 done 1052 done
1053 exit ${ret}
1054 )
1003} 1055}
1004 1056
1057# @FUNCTION: newmenu
1058# @USAGE: <menu> <newname>
1059# @DESCRIPTION:
1060# Like all other new* functions, install the specified menu as newname.
1061newmenu() {
1062 (
1063 # wrap the env here so that the 'insinto' call
1064 # doesn't corrupt the env of the caller
1065 insinto /usr/share/applications
1066 newins "$@"
1067 )
1068}
1069
1070# @FUNCTION: doicon
1071# @USAGE: <list of icons>
1072# @DESCRIPTION:
1073# Install the list of icons into the icon directory (/usr/share/pixmaps).
1074# This is useful in conjunction with creating desktop/menu files.
1005doicon() { 1075doicon() {
1006 local i 1076 (
1007 local j 1077 # wrap the env here so that the 'insinto' call
1078 # doesn't corrupt the env of the caller
1079 local i j ret
1008 insinto /usr/share/pixmaps 1080 insinto /usr/share/pixmaps
1009 for i in ${@} 1081 for i in "$@" ; do
1010 do
1011 if [ -f "${i}" ]; 1082 if [[ -f ${i} ]] ; then
1012 then
1013 doins ${i} 1083 doins "${i}"
1084 ((ret+=$?))
1014 elif [ -d "${i}" ]; 1085 elif [[ -d ${i} ]] ; then
1015 then
1016 for j in ${i}/*.png 1086 for j in "${i}"/*.png ; do
1017 do
1018 doins ${j} 1087 doins "${j}"
1088 ((ret+=$?))
1019 done 1089 done
1090 else
1091 ((++ret))
1020 fi 1092 fi
1021 done 1093 done
1094 exit ${ret}
1095 )
1022} 1096}
1023 1097
1024############################################################## 1098# @FUNCTION: newicon
1025# END: Handle .desktop files and menu entries # 1099# @USAGE: <icon> <newname>
1026############################################################## 1100# @DESCRIPTION:
1027 1101# Like all other new* functions, install the specified icon as newname.
1102newicon() {
1103 (
1104 # wrap the env here so that the 'insinto' call
1105 # doesn't corrupt the env of the caller
1106 insinto /usr/share/pixmaps
1107 newins "$@"
1108 )
1109}
1028 1110
1029# for internal use only (unpack_pdv and unpack_makeself) 1111# for internal use only (unpack_pdv and unpack_makeself)
1030find_unpackable_file() { 1112find_unpackable_file() {
1031 local src="$1" 1113 local src=$1
1032 if [ -z "${src}" ] 1114 if [[ -z ${src} ]] ; then
1033 then
1034 src="${DISTDIR}/${A}" 1115 src=${DISTDIR}/${A}
1035 else 1116 else
1036 if [ -e "${DISTDIR}/${src}" ] 1117 if [[ -e ${DISTDIR}/${src} ]] ; then
1037 then
1038 src="${DISTDIR}/${src}" 1118 src=${DISTDIR}/${src}
1039 elif [ -e "${PWD}/${src}" ] 1119 elif [[ -e ${PWD}/${src} ]] ; then
1040 then
1041 src="${PWD}/${src}" 1120 src=${PWD}/${src}
1042 elif [ -e "${src}" ] 1121 elif [[ -e ${src} ]] ; then
1043 then
1044 src="${src}" 1122 src=${src}
1045 fi
1046 fi 1123 fi
1047 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 1124 fi
1125 [[ ! -e ${src} ]] && return 1
1048 echo "${src}" 1126 echo "${src}"
1049} 1127}
1050 1128
1129# @FUNCTION: unpack_pdv
1130# @USAGE: <file to unpack> <size of off_t>
1131# @DESCRIPTION:
1051# Unpack those pesky pdv generated files ... 1132# Unpack those pesky pdv generated files ...
1052# They're self-unpacking programs with the binary package stuffed in 1133# They're self-unpacking programs with the binary package stuffed in
1053# the middle of the archive. Valve seems to use it a lot ... too bad 1134# the middle of the archive. Valve seems to use it a lot ... too bad
1054# it seems to like to segfault a lot :(. So lets take it apart ourselves. 1135# it seems to like to segfault a lot :(. So lets take it apart ourselves.
1055# 1136#
1056# Usage: unpack_pdv [file to unpack] [size of off_t]
1057# - you have to specify the off_t size ... i have no idea how to extract that 1137# You have to specify the off_t size ... I have no idea how to extract that
1058# information out of the binary executable myself. basically you pass in 1138# information out of the binary executable myself. Basically you pass in
1059# the size of the off_t type (in bytes) on the machine that built the pdv 1139# the size of the off_t type (in bytes) on the machine that built the pdv
1140# archive.
1141#
1060# archive. one way to determine this is by running the following commands: 1142# One way to determine this is by running the following commands:
1143#
1144# @CODE
1061# strings <pdv archive> | grep lseek 1145# strings <pdv archive> | grep lseek
1062# strace -elseek <pdv archive> 1146# strace -elseek <pdv archive>
1147# @CODE
1148#
1063# basically look for the first lseek command (we do the strings/grep because 1149# Basically look for the first lseek command (we do the strings/grep because
1064# sometimes the function call is _llseek or something) and steal the 2nd 1150# sometimes the function call is _llseek or something) and steal the 2nd
1065# parameter. here is an example: 1151# parameter. Here is an example:
1152#
1153# @CODE
1066# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1154# vapier@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1067# lseek 1155# lseek
1068# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1156# vapier@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1069# lseek(3, -4, SEEK_END) = 2981250 1157# lseek(3, -4, SEEK_END) = 2981250
1158# @CODE
1159#
1070# thus we would pass in the value of '4' as the second parameter. 1160# Thus we would pass in the value of '4' as the second parameter.
1071unpack_pdv() { 1161unpack_pdv() {
1072 local src="`find_unpackable_file $1`" 1162 local src=$(find_unpackable_file "$1")
1073 local sizeoff_t="$2" 1163 local sizeoff_t=$2
1074 1164
1165 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1075 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1166 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1076 1167
1077 local shrtsrc="`basename ${src}`" 1168 local shrtsrc=$(basename "${src}")
1078 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1169 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1079 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1170 local metaskip=$(tail -c ${sizeoff_t} "${src}" | hexdump -e \"%i\")
1080 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1171 local tailskip=$(tail -c $((${sizeoff_t}*2)) "${src}" | head -c ${sizeoff_t} | hexdump -e \"%i\")
1081 1172
1082 # grab metadata for debug reasons 1173 # grab metadata for debug reasons
1083 local metafile="$(emktemp)" 1174 local metafile=$(emktemp)
1084 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1175 tail -c +$((${metaskip}+1)) "${src}" > "${metafile}"
1085 1176
1086 # rip out the final file name from the metadata 1177 # rip out the final file name from the metadata
1087 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1178 local datafile=$(tail -c +$((${metaskip}+1)) "${src}" | strings | head -n 1)
1088 datafile="`basename ${datafile}`" 1179 datafile=$(basename "${datafile}")
1089 1180
1090 # now lets uncompress/untar the file if need be 1181 # now lets uncompress/untar the file if need be
1091 local tmpfile="$(emktemp)" 1182 local tmpfile=$(emktemp)
1092 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1183 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1093 1184
1094 local iscompressed="`file -b ${tmpfile}`" 1185 local iscompressed=$(file -b "${tmpfile}")
1095 if [ "${iscompressed:0:8}" == "compress" ] ; then 1186 if [[ ${iscompressed:0:8} == "compress" ]] ; then
1096 iscompressed=1 1187 iscompressed=1
1097 mv ${tmpfile}{,.Z} 1188 mv ${tmpfile}{,.Z}
1098 gunzip ${tmpfile} 1189 gunzip ${tmpfile}
1099 else 1190 else
1100 iscompressed=0 1191 iscompressed=0
1101 fi 1192 fi
1102 local istar="`file -b ${tmpfile}`" 1193 local istar=$(file -b "${tmpfile}")
1103 if [ "${istar:0:9}" == "POSIX tar" ] ; then 1194 if [[ ${istar:0:9} == "POSIX tar" ]] ; then
1104 istar=1 1195 istar=1
1105 else 1196 else
1106 istar=0 1197 istar=0
1107 fi 1198 fi
1108 1199
1136 true 1227 true
1137 #[ -s "${datafile}" ] || die "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')" 1228 #[ -s "${datafile}" ] || die "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')"
1138 #assert "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')" 1229 #assert "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')"
1139} 1230}
1140 1231
1232# @FUNCTION: unpack_makeself
1233# @USAGE: [file to unpack] [offset] [tail|dd]
1234# @DESCRIPTION:
1141# Unpack those pesky makeself generated files ... 1235# Unpack those pesky makeself generated files ...
1142# They're shell scripts with the binary package tagged onto 1236# They're shell scripts with the binary package tagged onto
1143# the end of the archive. Loki utilized the format as does 1237# the end of the archive. Loki utilized the format as does
1144# many other game companies. 1238# many other game companies.
1145# 1239#
1146# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1240# If the file is not specified, then ${A} is used. If the
1147# - If the file is not specified then unpack will utilize ${A}.
1148# - If the offset is not specified then we will attempt to extract 1241# offset is not specified then we will attempt to extract
1149# the proper offset from the script itself. 1242# the proper offset from the script itself.
1150unpack_makeself() { 1243unpack_makeself() {
1244 local src_input=${1:-${A}}
1151 local src="$(find_unpackable_file "$1")" 1245 local src=$(find_unpackable_file "${src_input}")
1152 local skip="$2" 1246 local skip=$2
1153 local exe="$3" 1247 local exe=$3
1154 1248
1249 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1250
1155 local shrtsrc="$(basename "${src}")" 1251 local shrtsrc=$(basename "${src}")
1156 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1252 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1157 if [ -z "${skip}" ] 1253 if [[ -z ${skip} ]] ; then
1158 then
1159 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1254 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1160 local skip=0 1255 local skip=0
1161 exe=tail 1256 exe=tail
1162 case ${ver} in 1257 case ${ver} in
1163 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1258 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1164 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1259 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1165 ;; 1260 ;;
1166 2.0|2.0.1) 1261 2.0|2.0.1)
1167 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1262 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1168 ;; 1263 ;;
1176 ;; 1271 ;;
1177 2.1.3) 1272 2.1.3)
1178 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1273 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1179 let skip="skip + 1" 1274 let skip="skip + 1"
1180 ;; 1275 ;;
1181 2.1.4) 1276 2.1.4|2.1.5)
1182 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1277 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1183 skip=$(head -n ${skip} "${src}" | wc -c) 1278 skip=$(head -n ${skip} "${src}" | wc -c)
1184 exe="dd" 1279 exe="dd"
1185 ;; 1280 ;;
1186 *) 1281 *)
1198 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1293 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1199 *) die "makeself cant handle exe '${exe}'" 1294 *) die "makeself cant handle exe '${exe}'"
1200 esac 1295 esac
1201 1296
1202 # lets grab the first few bytes of the file to figure out what kind of archive it is 1297 # lets grab the first few bytes of the file to figure out what kind of archive it is
1203 local tmpfile="$(emktemp)" 1298 local tmpfile=$(emktemp)
1204 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1299 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1205 local filetype="$(file -b "${tmpfile}")" 1300 local filetype=$(file -b "${tmpfile}")
1206 case ${filetype} in 1301 case ${filetype} in
1207 *tar\ archive) 1302 *tar\ archive*)
1208 eval ${exe} | tar --no-same-owner -xf - 1303 eval ${exe} | tar --no-same-owner -xf -
1209 ;; 1304 ;;
1210 bzip2*) 1305 bzip2*)
1211 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1306 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1212 ;; 1307 ;;
1222 ;; 1317 ;;
1223 esac 1318 esac
1224 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})" 1319 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})"
1225} 1320}
1226 1321
1322# @FUNCTION: check_license
1323# @USAGE: [license]
1324# @DESCRIPTION:
1227# Display a license for user to accept. 1325# Display a license for user to accept. If no license is
1228#
1229# Usage: check_license [license]
1230# - If the file is not specified then ${LICENSE} is used. 1326# specified, then ${LICENSE} is used.
1231check_license() { 1327check_license() {
1232 local lic=$1 1328 local lic=$1
1233 if [ -z "${lic}" ] ; then 1329 if [ -z "${lic}" ] ; then
1234 lic="${PORTDIR}/licenses/${LICENSE}" 1330 lic="${PORTDIR}/licenses/${LICENSE}"
1235 else 1331 else
1236 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1332 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1237 lic="${PORTDIR}/licenses/${src}" 1333 lic="${PORTDIR}/licenses/${lic}"
1238 elif [ -e "${PWD}/${src}" ] ; then 1334 elif [ -e "${PWD}/${lic}" ] ; then
1239 lic="${PWD}/${src}" 1335 lic="${PWD}/${lic}"
1240 elif [ -e "${src}" ] ; then 1336 elif [ -e "${lic}" ] ; then
1241 lic="${src}" 1337 lic="${lic}"
1242 fi
1243 fi 1338 fi
1339 fi
1244 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1340 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1245 local l="`basename ${lic}`" 1341 local l="`basename ${lic}`"
1246 1342
1247 # here is where we check for the licenses the user already 1343 # here is where we check for the licenses the user already
1248 # accepted ... if we don't find a match, we make the user accept 1344 # accepted ... if we don't find a match, we make the user accept
1249 local shopts=$- 1345 local shopts=$-
1250 local alic 1346 local alic
1251 set -o noglob #so that bash doesn't expand "*" 1347 set -o noglob #so that bash doesn't expand "*"
1252 for alic in ${ACCEPT_LICENSE} ; do 1348 for alic in ${ACCEPT_LICENSE} ; do
1253 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1349 if [[ ${alic} == ${l} ]]; then
1254 set +o noglob; set -${shopts} #reset old shell opts 1350 set +o noglob; set -${shopts} #reset old shell opts
1255 return 0 1351 return 0
1256 fi 1352 fi
1257 done 1353 done
1258 set +o noglob; set -$shopts #reset old shell opts 1354 set +o noglob; set -$shopts #reset old shell opts
1259 1355
1260 local licmsg="$(emktemp)" 1356 local licmsg=$(emktemp)
1261 cat << EOF > ${licmsg} 1357 cat <<-EOF > ${licmsg}
1262********************************************************** 1358 **********************************************************
1263The following license outlines the terms of use of this 1359 The following license outlines the terms of use of this
1264package. You MUST accept this license for installation to 1360 package. You MUST accept this license for installation to
1265continue. When you are done viewing, hit 'q'. If you 1361 continue. When you are done viewing, hit 'q'. If you
1266CTRL+C out of this, the install will not run! 1362 CTRL+C out of this, the install will not run!
1267********************************************************** 1363 **********************************************************
1268 1364
1269EOF 1365 EOF
1270 cat ${lic} >> ${licmsg} 1366 cat ${lic} >> ${licmsg}
1271 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}" 1367 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}"
1272 einfon "Do you accept the terms of this license (${l})? [yes/no] " 1368 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1273 read alic 1369 read alic
1274 case ${alic} in 1370 case ${alic} in
1281 die "Failed to accept license" 1377 die "Failed to accept license"
1282 ;; 1378 ;;
1283 esac 1379 esac
1284} 1380}
1285 1381
1382# @FUNCTION: cdrom_get_cds
1383# @USAGE: <file on cd1> [file on cd2] [file on cd3] [...]
1384# @DESCRIPTION:
1286# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates 1385# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates
1287# the whole 'non-interactive' policy, but damnit I want CD support ! 1386# the whole 'non-interactive' policy, but damnit I want CD support !
1288# 1387#
1289# with these cdrom functions we handle all the user interaction and 1388# With these cdrom functions we handle all the user interaction and
1290# standardize everything. all you have to do is call cdrom_get_cds() 1389# standardize everything. All you have to do is call cdrom_get_cds()
1291# and when the function returns, you can assume that the cd has been 1390# and when the function returns, you can assume that the cd has been
1292# found at CDROM_ROOT. 1391# found at CDROM_ROOT.
1293# 1392#
1393# The function will attempt to locate a cd based upon a file that is on
1394# the cd. The more files you give this function, the more cds
1395# the cdrom functions will handle.
1396#
1294# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1397# Normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1295# etc... if you want to give the cds better names, then just export 1398# etc... If you want to give the cds better names, then just export
1296# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1399# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1400# Use CDROM_NAME for one cd, or CDROM_NAME_# for multiple cds. You can
1401# also use the CDROM_NAME_SET bash array.
1297# 1402#
1298# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1403# For those multi cd ebuilds, see the cdrom_load_next_cd() function.
1299#
1300# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1301# - this will attempt to locate a cd based upon a file that is on
1302# the cd ... the more files you give this function, the more cds
1303# the cdrom functions will handle
1304cdrom_get_cds() { 1404cdrom_get_cds() {
1305 # first we figure out how many cds we're dealing with by 1405 # first we figure out how many cds we're dealing with by
1306 # the # of files they gave us 1406 # the # of files they gave us
1307 local cdcnt=0 1407 local cdcnt=0
1308 local f= 1408 local f=
1309 for f in "$@" ; do 1409 for f in "$@" ; do
1310 cdcnt=$((cdcnt + 1)) 1410 ((++cdcnt))
1311 export CDROM_CHECK_${cdcnt}="$f" 1411 export CDROM_CHECK_${cdcnt}="$f"
1312 done 1412 done
1313 export CDROM_TOTAL_CDS=${cdcnt} 1413 export CDROM_TOTAL_CDS=${cdcnt}
1314 export CDROM_CURRENT_CD=1 1414 export CDROM_CURRENT_CD=1
1315 1415
1316 # now we see if the user gave use CD_ROOT ... 1416 # now we see if the user gave use CD_ROOT ...
1317 # if they did, let's just believe them that it's correct 1417 # if they did, let's just believe them that it's correct
1318 if [[ ! -z ${CD_ROOT} ]] ; then
1319 export CDROM_ROOT=${CD_ROOT}
1320 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1321 return
1322 fi
1323 # do the same for CD_ROOT_X
1324 if [[ ! -z ${CD_ROOT_1} ]] ; then 1418 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1325 local var= 1419 local var=
1326 cdcnt=0 1420 cdcnt=0
1327 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1421 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1328 cdcnt=$((cdcnt + 1)) 1422 ((++cdcnt))
1329 var="CD_ROOT_${cdcnt}" 1423 var="CD_ROOT_${cdcnt}"
1424 [[ -z ${!var} ]] && var="CD_ROOT"
1330 if [[ -z ${!var} ]] ; then 1425 if [[ -z ${!var} ]] ; then
1331 eerror "You must either use just the CD_ROOT" 1426 eerror "You must either use just the CD_ROOT"
1332 eerror "or specify ALL the CD_ROOT_X variables." 1427 eerror "or specify ALL the CD_ROOT_X variables."
1333 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1428 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1334 die "could not locate CD_ROOT_${cdcnt}" 1429 die "could not locate CD_ROOT_${cdcnt}"
1335 fi 1430 fi
1336 export CDROM_ROOTS_${cdcnt}="${!var}"
1337 done 1431 done
1338 export CDROM_ROOT=${CDROM_ROOTS_1} 1432 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1339 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1433 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1434 export CDROM_SET=-1
1435 for f in ${CDROM_CHECK_1//:/ } ; do
1436 ((++CDROM_SET))
1437 [[ -e ${CD_ROOT}/${f} ]] && break
1438 done
1439 export CDROM_MATCH=${f}
1340 return 1440 return
1341 fi 1441 fi
1342 1442
1443 # User didn't help us out so lets make sure they know they can
1444 # simplify the whole process ...
1343 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1445 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1344 einfon "This ebuild will need the " 1446 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1345 if [[ -z ${CDROM_NAME} ]] ; then
1346 echo "cdrom for ${PN}."
1347 else
1348 echo "${CDROM_NAME}."
1349 fi
1350 echo 1447 echo
1351 einfo "If you do not have the CD, but have the data files" 1448 einfo "If you do not have the CD, but have the data files"
1352 einfo "mounted somewhere on your filesystem, just export" 1449 einfo "mounted somewhere on your filesystem, just export"
1353 einfo "the variable CD_ROOT so that it points to the" 1450 einfo "the variable CD_ROOT so that it points to the"
1354 einfo "directory containing the files." 1451 einfo "directory containing the files."
1355 echo 1452 echo
1356 einfo "For example:" 1453 einfo "For example:"
1357 einfo "export CD_ROOT=/mnt/cdrom" 1454 einfo "export CD_ROOT=/mnt/cdrom"
1358 echo 1455 echo
1359 else 1456 else
1457 if [[ -n ${CDROM_NAME_SET} ]] ; then
1458 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1459 cdcnt=0
1460 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1461 ((++cdcnt))
1462 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1463 done
1464 fi
1465
1360 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1466 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1361 cdcnt=0 1467 cdcnt=0
1362 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1468 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1363 cdcnt=$((cdcnt + 1)) 1469 ((++cdcnt))
1364 var="CDROM_NAME_${cdcnt}" 1470 var="CDROM_NAME_${cdcnt}"
1365 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1471 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1366 done 1472 done
1367 echo 1473 echo
1368 einfo "If you do not have the CDs, but have the data files" 1474 einfo "If you do not have the CDs, but have the data files"
1369 einfo "mounted somewhere on your filesystem, just export" 1475 einfo "mounted somewhere on your filesystem, just export"
1370 einfo "the following variables so they point to the right place:" 1476 einfo "the following variables so they point to the right place:"
1371 einfon "" 1477 einfon ""
1372 cdcnt=0 1478 cdcnt=0
1373 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1479 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1374 cdcnt=$((cdcnt + 1)) 1480 ((++cdcnt))
1375 echo -n " CD_ROOT_${cdcnt}" 1481 echo -n " CD_ROOT_${cdcnt}"
1376 done 1482 done
1377 echo 1483 echo
1378 einfo "Or, if you have all the files in the same place, or" 1484 einfo "Or, if you have all the files in the same place, or"
1379 einfo "you only have one cdrom, you can export CD_ROOT" 1485 einfo "you only have one cdrom, you can export CD_ROOT"
1382 echo 1488 echo
1383 einfo "For example:" 1489 einfo "For example:"
1384 einfo "export CD_ROOT_1=/mnt/cdrom" 1490 einfo "export CD_ROOT_1=/mnt/cdrom"
1385 echo 1491 echo
1386 fi 1492 fi
1493
1494 export CDROM_SET=""
1387 export CDROM_CURRENT_CD=0 1495 export CDROM_CURRENT_CD=0
1388 cdrom_load_next_cd 1496 cdrom_load_next_cd
1389} 1497}
1390 1498
1391# this is only used when you need access to more than one cd. 1499# @FUNCTION: cdrom_load_next_cd
1392# when you have finished using the first cd, just call this function. 1500# @DESCRIPTION:
1393# when it returns, CDROM_ROOT will be pointing to the second cd. 1501# Some packages are so big they come on multiple CDs. When you're done reading
1394# remember, you can only go forward in the cd chain, you can't go back. 1502# files off a CD and want access to the next one, just call this function.
1503# Again, all the messy details of user interaction are taken care of for you.
1504# Once this returns, just read the variable CDROM_ROOT for the location of the
1505# mounted CD. Note that you can only go forward in the CD list, so make sure
1506# you only call this function when you're done using the current CD.
1395cdrom_load_next_cd() { 1507cdrom_load_next_cd() {
1396 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1397 local var= 1508 local var
1398 1509 ((++CDROM_CURRENT_CD))
1399 if [[ ! -z ${CD_ROOT} ]] ; then
1400 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1401 return
1402 fi
1403 1510
1404 unset CDROM_ROOT 1511 unset CDROM_ROOT
1405 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1512 var=CD_ROOT_${CDROM_CURRENT_CD}
1513 [[ -z ${!var} ]] && var="CD_ROOT"
1406 if [[ -z ${!var} ]] ; then 1514 if [[ -z ${!var} ]] ; then
1407 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1515 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1408 cdrom_locate_file_on_cd ${!var} 1516 _cdrom_locate_file_on_cd ${!var}
1409 else 1517 else
1410 export CDROM_ROOT=${!var} 1518 export CDROM_ROOT=${!var}
1411 fi 1519 fi
1412 1520
1413 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1521 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1418# all it does is try to locate a give file on a cd ... if the cd isn't 1526# all it does is try to locate a give file on a cd ... if the cd isn't
1419# found, then a message asking for the user to insert the cdrom will be 1527# found, then a message asking for the user to insert the cdrom will be
1420# displayed and we'll hang out here until: 1528# displayed and we'll hang out here until:
1421# (1) the file is found on a mounted cdrom 1529# (1) the file is found on a mounted cdrom
1422# (2) the user hits CTRL+C 1530# (2) the user hits CTRL+C
1423cdrom_locate_file_on_cd() { 1531_cdrom_locate_file_on_cd() {
1532 local mline=""
1533 local showedmsg=0 showjolietmsg=0
1534
1424 while [[ -z ${CDROM_ROOT} ]] ; do 1535 while [[ -z ${CDROM_ROOT} ]] ; do
1536 local i=0
1537 local -a cdset=(${*//:/ })
1538 if [[ -n ${CDROM_SET} ]] ; then
1539 cdset=(${cdset[${CDROM_SET}]})
1540 fi
1541
1542 while [[ -n ${cdset[${i}]} ]] ; do
1425 local dir="$(dirname ${@})" 1543 local dir=$(dirname ${cdset[${i}]})
1426 local file="$(basename ${@})" 1544 local file=$(basename ${cdset[${i}]})
1427 local mline=""
1428 local showedmsg=0
1429 1545
1430 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1546 local point= node= fs= foo=
1547 while read point node fs foo ; do
1548 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \
1549 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1550 && continue
1551 point=${point//\040/ }
1431 [[ -d ${mline}/${dir} ]] || continue 1552 [[ ! -d ${point}/${dir} ]] && continue
1432 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1553 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1433 && export CDROM_ROOT=${mline} 1554 export CDROM_ROOT=${point}
1555 export CDROM_SET=${i}
1556 export CDROM_MATCH=${cdset[${i}]}
1557 return
1558 done <<< "$(get_mounts)"
1559
1560 ((++i))
1434 done 1561 done
1435 1562
1436 if [[ -z ${CDROM_ROOT} ]] ; then
1437 echo 1563 echo
1438 if [[ ${showedmsg} -eq 0 ]] ; then 1564 if [[ ${showedmsg} -eq 0 ]] ; then
1439 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1565 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1440 if [[ -z ${CDROM_NAME} ]] ; then 1566 if [[ -z ${CDROM_NAME} ]] ; then
1441 einfo "Please insert the cdrom for ${PN} now !" 1567 einfo "Please insert+mount the cdrom for ${PN} now !"
1442 else
1443 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1444 fi
1445 else 1568 else
1446 if [[ -z ${CDROM_NAME_1} ]] ; then
1447 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1448 else
1449 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1450 einfo "Please insert+mount the ${!var} cdrom now !" 1569 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1451 fi
1452 fi 1570 fi
1453 showedmsg=1 1571 else
1572 if [[ -z ${CDROM_NAME_1} ]] ; then
1573 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1574 else
1575 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1576 einfo "Please insert+mount the ${!var} cdrom now !"
1577 fi
1454 fi 1578 fi
1579 showedmsg=1
1580 fi
1455 einfo "Press return to scan for the cd again" 1581 einfo "Press return to scan for the cd again"
1456 einfo "or hit CTRL+C to abort the emerge." 1582 einfo "or hit CTRL+C to abort the emerge."
1457 read 1583 echo
1584 if [[ ${showjolietmsg} -eq 0 ]] ; then
1585 showjolietmsg=1
1586 else
1587 ewarn "If you are having trouble with the detection"
1588 ewarn "of your CD, it is possible that you do not have"
1589 ewarn "Joliet support enabled in your kernel. Please"
1590 ewarn "check that CONFIG_JOLIET is enabled in your kernel."
1591 ebeep 5
1458 fi 1592 fi
1593 read || die "something is screwed with your system"
1459 done 1594 done
1460} 1595}
1461 1596
1597# @FUNCTION: strip-linguas
1598# @USAGE: [<allow LINGUAS>|<-i|-u> <directories of .po files>]
1599# @DESCRIPTION:
1462# Make sure that LINGUAS only contains languages that 1600# Make sure that LINGUAS only contains languages that
1463# a package can support 1601# a package can support. The first form allows you to
1464# 1602# specify a list of LINGUAS. The -i builds a list of po
1465# usage: strip-linguas <allow LINGUAS> 1603# files found in all the directories and uses the
1466# strip-linguas -i <directories of .po files> 1604# intersection of the lists. The -u builds a list of po
1467# strip-linguas -u <directories of .po files> 1605# files found in all the directories and uses the union
1468# 1606# of the lists.
1469# The first form allows you to specify a list of LINGUAS.
1470# The -i builds a list of po files found in all the
1471# directories and uses the intersection of the lists.
1472# The -u builds a list of po files found in all the
1473# directories and uses the union of the lists.
1474strip-linguas() { 1607strip-linguas() {
1475 local ls newls 1608 local ls newls nols
1476 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1609 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1477 local op="$1"; shift 1610 local op=$1; shift
1478 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1611 ls=$(find "$1" -name '*.po' -exec basename {} .po ';'); shift
1479 local d f 1612 local d f
1480 for d in "$@" ; do 1613 for d in "$@" ; do
1481 if [ "${op}" == "-u" ] ; then 1614 if [[ ${op} == "-u" ]] ; then
1482 newls="${ls}" 1615 newls=${ls}
1483 else 1616 else
1484 newls="" 1617 newls=""
1485 fi 1618 fi
1486 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1619 for f in $(find "$d" -name '*.po' -exec basename {} .po ';') ; do
1487 if [ "${op}" == "-i" ] ; then 1620 if [[ ${op} == "-i" ]] ; then
1488 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1621 hasq ${f} ${ls} && newls="${newls} ${f}"
1489 else 1622 else
1490 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1623 hasq ${f} ${ls} || newls="${newls} ${f}"
1491 fi 1624 fi
1492 done 1625 done
1493 ls="${newls}" 1626 ls=${newls}
1494 done 1627 done
1495 ls="${ls//.po}"
1496 else 1628 else
1497 ls="$@" 1629 ls="$@"
1498 fi 1630 fi
1499 1631
1500 ls=" ${ls} " 1632 nols=""
1501 newls="" 1633 newls=""
1502 for f in ${LINGUAS} ; do 1634 for f in ${LINGUAS} ; do
1503 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1635 if hasq ${f} ${ls} ; then
1504 newls="${newls} ${f}" 1636 newls="${newls} ${f}"
1505 else 1637 else
1506 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1638 nols="${nols} ${f}"
1507 fi 1639 fi
1508 done 1640 done
1509 if [ -z "${newls}" ] ; then 1641 [[ -n ${nols} ]] \
1510 unset LINGUAS 1642 && ewarn "Sorry, but ${PN} does not support the LINGUAS:" ${nols}
1511 else
1512 export LINGUAS="${newls}" 1643 export LINGUAS=${newls:1}
1513 fi
1514} 1644}
1515 1645
1516# moved from kernel.eclass since they are generally useful outside of 1646# @FUNCTION: preserve_old_lib
1517# kernel.eclass -iggy (20041002) 1647# @USAGE: <libs to preserve> [more libs]
1518 1648# @DESCRIPTION:
1519# the following functions are useful in kernel module ebuilds, etc.
1520# for an example see ivtv or drbd ebuilds
1521
1522# set's ARCH to match what the kernel expects
1523set_arch_to_kernel() {
1524 i=10
1525 while ((i--)) ; do
1526 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1527 done
1528 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1529 case ${ARCH} in
1530 x86) export ARCH="i386";;
1531 amd64) export ARCH="x86_64";;
1532 hppa) export ARCH="parisc";;
1533 mips) export ARCH="mips";;
1534 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
1535 *) export ARCH="${ARCH}";;
1536 esac
1537}
1538
1539# set's ARCH back to what portage expects
1540set_arch_to_portage() {
1541 i=10
1542 while ((i--)) ; do
1543 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1544 done
1545 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1546}
1547
1548# Jeremy Huddleston <eradicator@gentoo.org>:
1549# preserve_old_lib /path/to/libblah.so.0
1550# preserve_old_lib_notify /path/to/libblah.so.0
1551#
1552# These functions are useful when a lib in your package changes --soname. Such 1649# These functions are useful when a lib in your package changes ABI SONAME.
1553# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1650# An example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1554# would break packages that link against it. Most people get around this 1651# would break packages that link against it. Most people get around this
1555# by using the portage SLOT mechanism, but that is not always a relevant 1652# by using the portage SLOT mechanism, but that is not always a relevant
1556# solution, so instead you can add the following to your ebuilds: 1653# solution, so instead you can call this from pkg_preinst. See also the
1557# 1654# preserve_old_lib_notify function.
1558# src_install() {
1559# ...
1560# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1561# ...
1562# }
1563#
1564# pkg_postinst() {
1565# ...
1566# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1567# ...
1568# }
1569
1570preserve_old_lib() { 1655preserve_old_lib() {
1571 LIB=$1 1656 if [[ ${EBUILD_PHASE} != "preinst" ]] ; then
1657 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1658 die "Invalid preserve_old_lib() usage"
1659 fi
1660 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1572 1661
1573 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1662 # let portage worry about it
1574 SONAME=`basename ${LIB}` 1663 has preserve-libs ${FEATURES} && return 0
1575 DIRNAME=`dirname ${LIB}`
1576 1664
1577 dodir ${DIRNAME} 1665 local lib dir
1578 cp ${ROOT}${LIB} ${D}${DIRNAME} 1666 for lib in "$@" ; do
1667 [[ -e ${ROOT}/${lib} ]] || continue
1668 dir=${lib%/*}
1669 dodir ${dir} || die "dodir ${dir} failed"
1670 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
1579 touch ${D}${LIB} 1671 touch "${D}"/${lib}
1580 fi 1672 done
1581} 1673}
1582 1674
1675# @FUNCTION: preserve_old_lib_notify
1676# @USAGE: <libs to notify> [more libs]
1677# @DESCRIPTION:
1678# Spit helpful messages about the libraries preserved by preserve_old_lib.
1583preserve_old_lib_notify() { 1679preserve_old_lib_notify() {
1584 LIB=$1 1680 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1681 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1682 die "Invalid preserve_old_lib_notify() usage"
1683 fi
1585 1684
1586 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1685 # let portage worry about it
1587 SONAME=`basename ${LIB}` 1686 has preserve-libs ${FEATURES} && return 0
1588 1687
1688 local lib notice=0
1689 for lib in "$@" ; do
1690 [[ -e ${ROOT}/${lib} ]] || continue
1691 if [[ ${notice} -eq 0 ]] ; then
1692 notice=1
1589 einfo "An old version of an installed library was detected on your system." 1693 ewarn "Old versions of installed libraries were detected on your system."
1590 einfo "In order to avoid breaking packages that link against is, this older version" 1694 ewarn "In order to avoid breaking packages that depend on these old libs,"
1591 einfo "is not being removed. In order to make full use of this newer version," 1695 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1592 einfo "you will need to execute the following command:" 1696 ewarn "in order to remove these old dependencies. If you do not have this"
1593 einfo " revdep-rebuild --soname ${SONAME}" 1697 ewarn "helper program, simply emerge the 'gentoolkit' package."
1594 einfo 1698 ewarn
1595 einfo "After doing that, you can safely remove ${LIB}"
1596 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1597 fi 1699 fi
1700 ewarn " # revdep-rebuild --library ${lib##*/}"
1701 done
1702 if [[ ${notice} -eq 1 ]] ; then
1703 ewarn
1704 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1705 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1706 for lib in "$@" ; do
1707 ewarn " # rm '${lib}'"
1708 done
1709 fi
1598} 1710}
1599 1711
1600# Hack for people to figure out if a package was built with 1712# @FUNCTION: built_with_use
1601# certain USE flags 1713# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1714# @DESCRIPTION:
1715# A temporary hack until portage properly supports DEPENDing on USE
1716# flags being enabled in packages. This will check to see if the specified
1717# DEPEND atom was built with the specified list of USE flags. The
1718# --missing option controls the behavior if called on a package that does
1719# not actually support the defined USE flags (aka listed in IUSE).
1720# The default is to abort (call die). The -a and -o flags control
1721# the requirements of the USE flags. They correspond to "and" and "or"
1722# logic. So the -a flag means all listed USE flags must be enabled
1723# while the -o flag means at least one of the listed IUSE flags must be
1724# enabled. The --hidden option is really for internal use only as it
1725# means the USE flag we're checking is hidden expanded, so it won't be found
1726# in IUSE like normal USE flags.
1602# 1727#
1603# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1728# Remember that this function isn't terribly intelligent so order of optional
1604# ex: built_with_use xchat gtk2 1729# flags matter.
1605#
1606# Flags: -a all USE flags should be utilized
1607# -o at least one USE flag should be utilized
1608# Note: the default flag is '-a'
1609built_with_use() { 1730built_with_use() {
1731 local hidden="no"
1732 if [[ $1 == "--hidden" ]] ; then
1733 hidden="yes"
1734 shift
1735 fi
1736
1737 local missing_action="die"
1738 if [[ $1 == "--missing" ]] ; then
1739 missing_action=$2
1740 shift ; shift
1741 case ${missing_action} in
1742 true|false|die) ;;
1743 *) die "unknown action '${missing_action}'";;
1744 esac
1745 fi
1746
1610 local opt=$1 1747 local opt=$1
1611 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1748 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1612 1749
1613 local PKG=$(best_version $1) 1750 local PKG=$(best_version $1)
1751 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1614 shift 1752 shift
1615 1753
1616 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1754 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1617 [[ ! -e ${USEFILE} ]] && return 1 1755 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1756
1757 # if the IUSE file doesn't exist, the read will error out, we need to handle
1758 # this gracefully
1759 if [[ ! -e ${USEFILE} ]] || [[ ! -e ${IUSEFILE} && ${hidden} == "no" ]] ; then
1760 case ${missing_action} in
1761 true) return 0;;
1762 false) return 1;;
1763 die) die "Unable to determine what USE flags $PKG was built with";;
1764 esac
1765 fi
1766
1767 if [[ ${hidden} == "no" ]] ; then
1768 local IUSE_BUILT=( $(<"${IUSEFILE}") )
1769 # Don't check USE_EXPAND #147237
1770 local expand
1771 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1772 if [[ $1 == ${expand}_* ]] ; then
1773 expand=""
1774 break
1775 fi
1776 done
1777 if [[ -n ${expand} ]] ; then
1778 if ! has $1 ${IUSE_BUILT[@]#[-+]} ; then
1779 case ${missing_action} in
1780 true) return 0;;
1781 false) return 1;;
1782 die) die "$PKG does not actually support the $1 USE flag!";;
1783 esac
1784 fi
1785 fi
1786 fi
1618 1787
1619 local USE_BUILT=$(<${USEFILE}) 1788 local USE_BUILT=$(<${USEFILE})
1620 while [[ $# -gt 0 ]] ; do 1789 while [[ $# -gt 0 ]] ; do
1621 if [[ ${opt} = "-o" ]] ; then 1790 if [[ ${opt} = "-o" ]] ; then
1622 has $1 ${USE_BUILT} && return 0 1791 has $1 ${USE_BUILT} && return 0
1626 shift 1795 shift
1627 done 1796 done
1628 [[ ${opt} = "-a" ]] 1797 [[ ${opt} = "-a" ]]
1629} 1798}
1630 1799
1800# @FUNCTION: epunt_cxx
1801# @USAGE: [dir to scan]
1802# @DESCRIPTION:
1631# Many configure scripts wrongly bail when a C++ compiler 1803# Many configure scripts wrongly bail when a C++ compiler could not be
1632# could not be detected. #73450 1804# detected. If dir is not specified, then it defaults to ${S}.
1805#
1806# http://bugs.gentoo.org/73450
1633epunt_cxx() { 1807epunt_cxx() {
1634 local dir=$1 1808 local dir=$1
1635 [[ -z ${dir} ]] && dir=${S} 1809 [[ -z ${dir} ]] && dir=${S}
1636 ebegin "Removing useless C++ checks" 1810 ebegin "Removing useless C++ checks"
1637 local f 1811 local f
1638 for f in $(find ${dir} -name configure) ; do 1812 find "${dir}" -name configure | while read f ; do
1639 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1813 patch --no-backup-if-mismatch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1640 done 1814 done
1641 eend 0 1815 eend 0
1642} 1816}
1643 1817
1644# dopamd [ file ] [ new file ] 1818# @FUNCTION: make_wrapper
1645# 1819# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath]
1646# Install pam auth config file in /etc/pam.d 1820# @DESCRIPTION:
1647# 1821# Create a shell wrapper script named wrapper in installpath
1648# The first argument, 'file' is required. Install as 'new file', if 1822# (defaults to the bindir) to execute target (default of wrapper) by
1649# specified. 1823# first optionally setting LD_LIBRARY_PATH to the colon-delimited
1650 1824# libpaths followed by optionally changing directory to chdir.
1651dopamd() { 1825make_wrapper() {
1652 local pamd="$1" newpamd="${2:-$1}" 1826 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1653 [[ -z "$1" ]] && die "dopamd requires at least one argument." 1827 local tmpwrapper=$(emktemp)
1654 1828 # We don't want to quote ${bin} so that people can pass complex
1655 use pam || return 0 1829 # things as $bin ... "./someprog --args"
1656 1830 cat << EOF > "${tmpwrapper}"
1657 insinto /etc/pam.d 1831#!/bin/sh
1658 # these are the default doins options, but be explicit just in case 1832cd "${chdir:-.}"
1659 insopts -m 0644 -o root -g root 1833if [ -n "${libdir}" ] ; then
1660 newins ${pamd} ${newpamd} || die "failed to install ${newpamd}" 1834 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1835 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1836 else
1837 export LD_LIBRARY_PATH="${libdir}"
1838 fi
1839fi
1840exec ${bin} "\$@"
1841EOF
1842 chmod go+rx "${tmpwrapper}"
1843 if [[ -n ${path} ]] ; then
1844 (
1845 exeinto "${path}"
1846 newexe "${tmpwrapper}" "${wrapper}"
1847 ) || die
1848 else
1849 newbin "${tmpwrapper}" "${wrapper}" || die
1850 fi
1661} 1851}
1852
1853# @FUNCTION: prepalldocs
1854# @USAGE:
1855# @DESCRIPTION:
1856# Compress files in /usr/share/doc which are not already
1857# compressed, excluding /usr/share/doc/${PF}/html.
1858# Uses the ecompressdir to do the compression.
1859# 2009-02-18 by betelgeuse:
1860# Commented because ecompressdir is even more internal to
1861# Portage than prepalldocs (it's not even mentioned in man 5
1862# ebuild). Please submit a better version for review to gentoo-dev
1863# if you want prepalldocs here.
1864#prepalldocs() {
1865# if [[ -n $1 ]] ; then
1866# ewarn "prepalldocs: invalid usage; takes no arguments"
1867# fi
1868
1869# cd "${D}"
1870# [[ -d usr/share/doc ]] || return 0
1871
1872# find usr/share/doc -exec gzip {} +
1873# ecompressdir --ignore /usr/share/doc/${PF}/html
1874# ecompressdir --queue /usr/share/doc
1875#}

Legend:
Removed from v.1.144  
changed lines
  Added in v.1.318

  ViewVC Help
Powered by ViewVC 1.1.20