1 |
commit: 4529786c5d9cf0d7df7de8f65c3930b43d4a9a6a |
2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 12 12:44:36 2021 +0000 |
4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 12 12:48:42 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4529786c |
7 |
|
8 |
app-arch/makeself: drop unused patch/files |
9 |
|
10 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
11 |
|
12 |
.../files/makeself-2.2.0-help-header.patch | 124 --------------------- |
13 |
app-arch/makeself/files/makeself-unpack | 100 ----------------- |
14 |
2 files changed, 224 deletions(-) |
15 |
|
16 |
diff --git a/app-arch/makeself/files/makeself-2.2.0-help-header.patch b/app-arch/makeself/files/makeself-2.2.0-help-header.patch |
17 |
deleted file mode 100644 |
18 |
index 5726bf55f7d..00000000000 |
19 |
--- a/app-arch/makeself/files/makeself-2.2.0-help-header.patch |
20 |
+++ /dev/null |
21 |
@@ -1,124 +0,0 @@ |
22 |
-From c9f605cb4a3903985f2c6f816c30c1edf728c1b5 Mon Sep 17 00:00:00 2001 |
23 |
-From: Jon Salz <jsalz@××××××.com> |
24 |
-Date: Mon, 27 Jan 2014 16:04:33 +0800 |
25 |
-Subject: [PATCH] Add --help-header option to prepend a string to the archive's |
26 |
- --help. |
27 |
- |
28 |
---- |
29 |
- makeself-header.sh | 3 ++- |
30 |
- makeself.sh | 71 ++++++++++++++++++++++++++++++------------------------ |
31 |
- 2 files changed, 41 insertions(+), 33 deletions(-) |
32 |
- |
33 |
-diff --git a/makeself-header.sh b/makeself-header.sh |
34 |
-index e3f6c11..f97758c 100755 |
35 |
---- a/makeself-header.sh |
36 |
-+++ b/makeself-header.sh |
37 |
-@@ -13,6 +13,7 @@ label="$LABEL" |
38 |
- script="$SCRIPT" |
39 |
- scriptargs="$SCRIPTARGS" |
40 |
- licensetxt="$LICENSE" |
41 |
-+helpheader='$HELPHEADER' |
42 |
- targetdir="$archdirname" |
43 |
- filesizes="$filesizes" |
44 |
- keep="$KEEP" |
45 |
-@@ -119,7 +120,7 @@ MS_dd_Progress() |
46 |
- MS_Help() |
47 |
- { |
48 |
- cat << EOH >&2 |
49 |
--Makeself version $MS_VERSION |
50 |
-+\${helpheader}Makeself version $MS_VERSION |
51 |
- 1) Getting help or info about \$0 : |
52 |
- \$0 --help Print this message |
53 |
- \$0 --info Print embedded info : title, default target directory, embedded script ... |
54 |
-diff --git a/makeself.sh b/makeself.sh |
55 |
-index 361d710..cb2d6f2 100755 |
56 |
---- a/makeself.sh |
57 |
-+++ b/makeself.sh |
58 |
-@@ -88,38 +88,39 @@ MS_Usage() |
59 |
- { |
60 |
- echo "Usage: $0 [params] archive_dir file_name label startup_script [args]" |
61 |
- echo "params can be one or more of the following :" |
62 |
-- echo " --version | -v : Print out Makeself version number and exit" |
63 |
-- echo " --help | -h : Print out this help message" |
64 |
-- echo " --quiet | -q : Do not print any messages other than errors." |
65 |
-- echo " --gzip : Compress using gzip (default if detected)" |
66 |
-- echo " --bzip2 : Compress using bzip2 instead of gzip" |
67 |
-- echo " --pbzip2 : Compress using pbzip2 instead of gzip" |
68 |
-- echo " --xz : Compress using xz instead of gzip" |
69 |
-- echo " --compress : Compress using the UNIX 'compress' command" |
70 |
-- echo " --complevel lvl : Compression level for gzip xz bzip2 and pbzip2 (default 9)" |
71 |
-- echo " --base64 : Instead of compressing, encode the data using base64" |
72 |
-- echo " --nocomp : Do not compress the data" |
73 |
-- echo " --notemp : The archive will create archive_dir in the" |
74 |
-- echo " current directory and uncompress in ./archive_dir" |
75 |
-- echo " --copy : Upon extraction, the archive will first copy itself to" |
76 |
-- echo " a temporary directory" |
77 |
-- echo " --append : Append more files to an existing Makeself archive" |
78 |
-- echo " The label and startup scripts will then be ignored" |
79 |
-- echo " --target dir : Extract directly to a target directory" |
80 |
-- echo " directory path can be either absolute or relative" |
81 |
-- echo " --current : Files will be extracted to the current directory" |
82 |
-- echo " Both --current and --target imply --notemp" |
83 |
-- echo " --tar-extra opt : Append more options to the tar command line" |
84 |
-- echo " --nomd5 : Don't calculate an MD5 for archive" |
85 |
-- echo " --nocrc : Don't calculate a CRC for archive" |
86 |
-- echo " --header file : Specify location of the header script" |
87 |
-- echo " --follow : Follow the symlinks in the archive" |
88 |
-- echo " --noprogress : Do not show the progress during the decompression" |
89 |
-- echo " --nox11 : Disable automatic spawn of a xterm" |
90 |
-- echo " --nowait : Do not wait for user input after executing embedded" |
91 |
-- echo " program from an xterm" |
92 |
-- echo " --lsm file : LSM file describing the package" |
93 |
-- echo " --license file : Append a license file" |
94 |
-+ echo " --version | -v : Print out Makeself version number and exit" |
95 |
-+ echo " --help | -h : Print out this help message" |
96 |
-+ echo " --quiet | -q : Do not print any messages other than errors." |
97 |
-+ echo " --gzip : Compress using gzip (default if detected)" |
98 |
-+ echo " --bzip2 : Compress using bzip2 instead of gzip" |
99 |
-+ echo " --pbzip2 : Compress using pbzip2 instead of gzip" |
100 |
-+ echo " --xz : Compress using xz instead of gzip" |
101 |
-+ echo " --compress : Compress using the UNIX 'compress' command" |
102 |
-+ echo " --complevel lvl : Compression level for gzip xz bzip2 and pbzip2 (default 9)" |
103 |
-+ echo " --base64 : Instead of compressing, encode the data using base64" |
104 |
-+ echo " --nocomp : Do not compress the data" |
105 |
-+ echo " --notemp : The archive will create archive_dir in the" |
106 |
-+ echo " current directory and uncompress in ./archive_dir" |
107 |
-+ echo " --copy : Upon extraction, the archive will first copy itself to" |
108 |
-+ echo " a temporary directory" |
109 |
-+ echo " --append : Append more files to an existing Makeself archive" |
110 |
-+ echo " The label and startup scripts will then be ignored" |
111 |
-+ echo " --target dir : Extract directly to a target directory" |
112 |
-+ echo " directory path can be either absolute or relative" |
113 |
-+ echo " --current : Files will be extracted to the current directory" |
114 |
-+ echo " Both --current and --target imply --notemp" |
115 |
-+ echo " --tar-extra opt : Append more options to the tar command line" |
116 |
-+ echo " --nomd5 : Don't calculate an MD5 for archive" |
117 |
-+ echo " --nocrc : Don't calculate a CRC for archive" |
118 |
-+ echo " --header file : Specify location of the header script" |
119 |
-+ echo " --follow : Follow the symlinks in the archive" |
120 |
-+ echo " --noprogress : Do not show the progress during the decompression" |
121 |
-+ echo " --nox11 : Disable automatic spawn of a xterm" |
122 |
-+ echo " --nowait : Do not wait for user input after executing embedded" |
123 |
-+ echo " program from an xterm" |
124 |
-+ echo " --lsm file : LSM file describing the package" |
125 |
-+ echo " --license file : Append a license file" |
126 |
-+ echo " --help-header file : Add a header to the archive's --help output" |
127 |
- echo |
128 |
- echo "Do not forget to give a fully qualified startup script name" |
129 |
- echo "(i.e. with a ./ prefix if inside the archive)." |
130 |
-@@ -254,6 +255,12 @@ do |
131 |
- LSM_CMD="cat \"$2\" >> \"\$archname\"" |
132 |
- if ! shift 2; then MS_Help; exit 1; fi |
133 |
- ;; |
134 |
-+ --help-header) |
135 |
-+ HELPHEADER=`sed -e "s/'/'\\\\\''/g" $2` |
136 |
-+ if ! shift 2; then MS_Help; exit 1; fi |
137 |
-+ [ -n "$HELPHEADER" ] && HELPHEADER="$HELPHEADER |
138 |
-+" |
139 |
-+ ;; |
140 |
- -q | --quiet) |
141 |
- QUIET=y |
142 |
- shift |
143 |
--- |
144 |
-1.8.5.5 |
145 |
- |
146 |
|
147 |
diff --git a/app-arch/makeself/files/makeself-unpack b/app-arch/makeself/files/makeself-unpack |
148 |
deleted file mode 100644 |
149 |
index 90b98312c8b..00000000000 |
150 |
--- a/app-arch/makeself/files/makeself-unpack |
151 |
+++ /dev/null |
152 |
@@ -1,100 +0,0 @@ |
153 |
-#!/bin/bash |
154 |
- |
155 |
-# Glue to keep unpack_makeself() unchanged |
156 |
-source /lib/gentoo/functions.sh |
157 |
-find_unpackable_file() { echo "$@"; } |
158 |
-debug-print() { :; } |
159 |
-emktemp() { mktemp "$@"; } |
160 |
-die() { eerror "$*"; exit 1; } |
161 |
-assert() { _pipestatus="${PIPESTATUS[*]}"; [[ "${_pipestatus// /}" -eq 0 ]] || die; } |
162 |
- |
163 |
-# Straight copied from unpacker.eclass ... should be kept in sync |
164 |
- |
165 |
-unpack_banner() { |
166 |
- echo ">>> Unpacking ${1##*/} to ${PWD}" |
167 |
-} |
168 |
- |
169 |
-unpack_makeself() { |
170 |
- local src_input=${1:-${A}} |
171 |
- local src=$(find_unpackable_file "${src_input}") |
172 |
- local skip=$2 |
173 |
- local exe=$3 |
174 |
- |
175 |
- [[ -z ${src} ]] && die "Could not locate source for '${src_input}'" |
176 |
- |
177 |
- unpack_banner "${src}" |
178 |
- |
179 |
- if [[ -z ${skip} ]] ; then |
180 |
- local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}') |
181 |
- local skip=0 |
182 |
- exe=tail |
183 |
- case ${ver} in |
184 |
- 1.5.*|1.6.0-nv*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same |
185 |
- skip=$(grep -a ^skip= "${src}" | cut -d= -f2) |
186 |
- ;; |
187 |
- 2.0|2.0.1) |
188 |
- skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) |
189 |
- ;; |
190 |
- 2.1.1) |
191 |
- skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) |
192 |
- (( skip++ )) |
193 |
- ;; |
194 |
- 2.1.2) |
195 |
- skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) |
196 |
- (( skip++ )) |
197 |
- ;; |
198 |
- 2.1.3) |
199 |
- skip=`grep -a ^offset= "${src}" | awk '{print $3}'` |
200 |
- (( skip++ )) |
201 |
- ;; |
202 |
- 2.1.4|2.1.5|2.1.6|2.2.0) |
203 |
- skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) |
204 |
- skip=$(head -n ${skip} "${src}" | wc -c) |
205 |
- exe="dd" |
206 |
- ;; |
207 |
- *) |
208 |
- eerror "I'm sorry, but I was unable to support the Makeself file." |
209 |
- eerror "The version I detected was '${ver}'." |
210 |
- eerror "Please file a bug about the file ${src##*/} at" |
211 |
- eerror "http://bugs.gentoo.org/ so that support can be added." |
212 |
- die "makeself version '${ver}' not supported" |
213 |
- ;; |
214 |
- esac |
215 |
- debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" |
216 |
- fi |
217 |
- case ${exe} in |
218 |
- tail) exe="tail -n +${skip} '${src}'";; |
219 |
- dd) exe="dd ibs=${skip} skip=1 if='${src}'";; |
220 |
- *) die "makeself cant handle exe '${exe}'" |
221 |
- esac |
222 |
- |
223 |
- # lets grab the first few bytes of the file to figure out what kind of archive it is |
224 |
- local filetype tmpfile=$(emktemp) |
225 |
- eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" |
226 |
- filetype=$(file -b "${tmpfile}") || die |
227 |
- case ${filetype} in |
228 |
- *tar\ archive*) |
229 |
- eval ${exe} | tar --no-same-owner -xf - |
230 |
- ;; |
231 |
- bzip2*) |
232 |
- eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - |
233 |
- ;; |
234 |
- gzip*) |
235 |
- eval ${exe} | tar --no-same-owner -xzf - |
236 |
- ;; |
237 |
- compress*) |
238 |
- eval ${exe} | gunzip | tar --no-same-owner -xf - |
239 |
- ;; |
240 |
- XZ*) |
241 |
- eval ${exe} | unxz | tar --no-same-owner -xf - |
242 |
- ;; |
243 |
- *) |
244 |
- eerror "Unknown filetype \"${filetype}\" ?" |
245 |
- false |
246 |
- ;; |
247 |
- esac |
248 |
- assert "failure unpacking (${filetype}) makeself ${src##*/} ('${ver}' +${skip})" |
249 |
- rm "${tmpfile}" |
250 |
-} |
251 |
- |
252 |
-for x; do unpack_makeself "$x" ; done |