Contents of /trunk/mage/patches/mage-0.4.22-busybox.patch
Parent Directory | Revision Log
Revision 1219 -
(show annotations)
(download)
Tue Dec 7 20:08:32 2010 UTC (13 years, 9 months ago) by niro
File size: 6748 byte(s)
Tue Dec 7 20:08:32 2010 UTC (13 years, 9 months ago) by niro
File size: 6748 byte(s)
-all-in-one busybox patch
1 | diff -Naur mage-0.4.22/usr/lib/mage/mage.rc.global mage-0.4.22-mcore/usr/lib/mage/mage.rc.global |
2 | --- mage-0.4.22/usr/lib/mage/mage.rc.global 2010-06-28 20:50:53.000000000 +0200 |
3 | +++ mage-0.4.22-mcore/usr/lib/mage/mage.rc.global 2010-12-07 21:11:50.000000000 +0100 |
4 | @@ -35,7 +35,7 @@ |
5 | RSYNC_FETCH_OPTIONS="--recursive --links --perms --times --devices --timeout=600 --verbose --compress --progress --stats --delete --delete-after" |
6 | |
7 | # default fetch options for wget |
8 | -WGET_FETCH_OPTIONS="--passive-ftp --tries 3 --continue --progress bar" |
9 | +WGET_FETCH_OPTIONS="--passive-ftp --continue" |
10 | |
11 | # default build options |
12 | CHOST="${ARCH}-pc-linux-gnu" |
13 | diff -Naur mage-0.4.22/usr/lib/mage/mage4.functions.sh mage-0.4.22-mcore/usr/lib/mage/mage4.functions.sh |
14 | --- mage-0.4.22/usr/lib/mage/mage4.functions.sh 2010-06-28 20:50:53.000000000 +0200 |
15 | +++ mage-0.4.22-mcore/usr/lib/mage/mage4.functions.sh 2010-12-07 21:12:48.000000000 +0100 |
16 | @@ -55,7 +55,7 @@ |
17 | fi |
18 | |
19 | echo -e " ${COLBLUE}***${COLDEFAULT} unpacking (${count_current}/${count_total}): ${pkg} ... " |
20 | - tar xjmf ${PKGDIR}/${pkg} -C ${BUILDDIR} || die "Unpacking package ${pkg}" |
21 | + tar xjf ${PKGDIR}/${pkg} -C ${BUILDDIR} || die "Unpacking package ${pkg}" |
22 | done |
23 | |
24 | # add a crlf for a better view |
25 | @@ -1276,7 +1276,7 @@ |
26 | else |
27 | echo -ne "${COLBLUE} --- ${COLDEFAULT}" |
28 | echo -n "checking md5sum... " |
29 | - ( cd ${temp}; md5sum --check ${latest_md5} ) || die "md5 for ${latest_tarball} failed" |
30 | + ( cd ${temp}; md5sum -c ${latest_md5} ) || die "md5 for ${latest_tarball} failed" |
31 | fi |
32 | |
33 | if [[ -d ${MAGEDIR} ]] |
34 | @@ -1289,7 +1289,7 @@ |
35 | echo -ne "${COLBLUE} --- ${COLDEFAULT}" |
36 | echo "updating mage-tree from tarball ..." |
37 | # unpack in dirname of MAGEDIR, as the tarball has already the mage |
38 | - tar xjmf ${temp}/${latest_tarball} -C ${MAGEDIR%/*} || die "Unpacking tarball" |
39 | + tar xjf ${temp}/${latest_tarball} -C ${MAGEDIR%/*} || die "Unpacking tarball" |
40 | |
41 | if [[ -d ${temp} ]] |
42 | then |
43 | @@ -2470,7 +2470,7 @@ |
44 | then |
45 | echo -ne "${COLBLUE} *** ${COLDEFAULT}" |
46 | echo -ne "checking md5sum (${count_current}/${count_total}): " |
47 | - ( cd ${PKGDIR}; md5sum --check ${md5file}) || die "md5 for ${pkgfile} failed" |
48 | + ( cd ${PKGDIR}; md5sum -c ${md5file}) || die "md5 for ${pkgfile} failed" |
49 | else |
50 | echo -ne "${COLBLUE} --- ${COLDEFAULT}" |
51 | echo -e "!! no md5sum file found for ${pkgfile} :(" |
52 | diff -Naur mage-0.4.22/usr/lib/mage/mgroupadd mage-0.4.22-mcore/usr/lib/mage/mgroupadd |
53 | --- mage-0.4.22/usr/lib/mage/mgroupadd 2010-06-28 20:50:53.000000000 +0200 |
54 | +++ mage-0.4.22-mcore/usr/lib/mage/mgroupadd 2010-12-07 21:15:48.000000000 +0100 |
55 | @@ -39,17 +39,7 @@ |
56 | |
57 | GROUP_TO_ADD="$1" |
58 | |
59 | -#start nscd to cache /etc/group |
60 | -$(which nscd) -i group |
61 | -# get the info |
62 | -my_group="$(getent group ${GROUP_TO_ADD})" |
63 | - |
64 | # if above entries are empty the user/group does not exist |
65 | -if [ -z "${my_group}" ] |
66 | -then |
67 | - echo " Adding group '${GROUP_TO_ADD}' ..." |
68 | - groupadd ${GROUP_OPTS} "${GROUP_TO_ADD}" |
69 | -else |
70 | - echo " Modifing group '${GROUP_TO_ADD}' ..." |
71 | - groupmod ${GROUP_OPTS} "${GROUP_TO_ADD}" |
72 | -fi |
73 | +echo " Adding group '${GROUP_TO_ADD}' ..." |
74 | +addgroup ${GROUP_OPTS} "${GROUP_TO_ADD}" |
75 | + |
76 | diff -Naur mage-0.4.22/usr/lib/mage/mgroupdel mage-0.4.22-mcore/usr/lib/mage/mgroupdel |
77 | --- mage-0.4.22/usr/lib/mage/mgroupdel 2010-06-28 20:50:53.000000000 +0200 |
78 | +++ mage-0.4.22-mcore/usr/lib/mage/mgroupdel 2010-12-07 21:16:15.000000000 +0100 |
79 | @@ -20,15 +20,5 @@ |
80 | |
81 | GROUP_TO_DEL="$1" |
82 | |
83 | -#start nscd to cache /etc/group |
84 | -$(which nscd) -i group |
85 | -# get the info |
86 | -my_user="$(getent group ${GROUP_TO_DEL})" |
87 | - |
88 | -if [ -z "${my_user}" ] |
89 | -then |
90 | - echo " User '${GROUP_TO_DEL}' already deleted ..." |
91 | -else |
92 | - echo " Deleting user '${GROUP_TO_DEL}' ..." |
93 | - groupdel "${GROUP_TO_DEL}" |
94 | -fi |
95 | +echo " Deleting user '${GROUP_TO_DEL}' ..." |
96 | +delgroup "${GROUP_TO_DEL}" |
97 | diff -Naur mage-0.4.22/usr/lib/mage/museradd mage-0.4.22-mcore/usr/lib/mage/museradd |
98 | --- mage-0.4.22/usr/lib/mage/museradd 2010-06-28 20:50:53.000000000 +0200 |
99 | +++ mage-0.4.22-mcore/usr/lib/mage/museradd 2010-12-07 21:17:27.000000000 +0100 |
100 | @@ -39,16 +39,46 @@ |
101 | |
102 | USER_TO_ADD="$1" |
103 | |
104 | -#start nscd to cache passwd |
105 | -$(which nscd) -i passwd |
106 | -# get the info |
107 | -my_user="$(getent passwd ${USER_TO_ADD})" |
108 | - |
109 | -if [ -z "${my_user}" ] |
110 | -then |
111 | - echo " Adding user '${USER_TO_ADD}' ..." |
112 | - useradd ${USER_OPTS} "${USER_TO_ADD}" |
113 | -else |
114 | - echo " Modifing user '${USER_TO_ADD}' ..." |
115 | - usermod ${USER_OPTS} "${USER_TO_ADD}" |
116 | -fi |
117 | +fix_user_opts() |
118 | +{ |
119 | + local i |
120 | + local FIXED_USER_OPTS |
121 | + |
122 | + for i in $* |
123 | + do |
124 | + case $1 in |
125 | + -d) shift; FIXED_USER_OPTS+=" -h $1" ;; |
126 | + -g) shift; FIXED_USER_OPTS+=" -G $1" ;; |
127 | + -G) shift; shift; continue;; # will be parsed through fix_group_opts |
128 | + -u) shift; [[ $1 -lt 100 ]] && FIXED_USER_OPTS+=" -S" ;; |
129 | + *) FIXED_USER_OPTS+=" $1" ;; |
130 | + esac |
131 | + shift |
132 | + done |
133 | + |
134 | + echo "${FIXED_USER_OPTS}" |
135 | +} |
136 | + |
137 | +fix_group_opts() |
138 | +{ |
139 | + local i |
140 | + local FIXED_GROUP_OPTS |
141 | + |
142 | + for i in $* |
143 | + do |
144 | + case $1 in |
145 | + -G) shift; FIXED_GROUP_OPTS+="$(echo $1 | sed 's:,:\ :g')" ;; |
146 | + esac |
147 | + shift |
148 | + done |
149 | + |
150 | + echo "${FIXED_GROUP_OPTS}" |
151 | +} |
152 | + |
153 | + |
154 | +echo " Adding user '${USER_TO_ADD}' ..." |
155 | +adduser -D $(fix_user_opts ${USER_OPTS}) "${USER_TO_ADD}" |
156 | +for grp in $(fix_group_opts ${USER_OPTS}) |
157 | +do |
158 | + addgroup "${USER_TO_ADD}" "${grp}" |
159 | +done |
160 | diff -Naur mage-0.4.22/usr/lib/mage/muserdel mage-0.4.22-mcore/usr/lib/mage/muserdel |
161 | --- mage-0.4.22/usr/lib/mage/muserdel 2010-06-28 20:50:53.000000000 +0200 |
162 | +++ mage-0.4.22-mcore/usr/lib/mage/muserdel 2010-12-07 21:17:55.000000000 +0100 |
163 | @@ -20,15 +20,5 @@ |
164 | |
165 | USER_TO_DEL="$1" |
166 | |
167 | -#start nscd to cache passwd |
168 | -$(which nscd) -i passwd |
169 | -# get the info |
170 | -my_user="$(getent passwd ${USER_TO_DEL})" |
171 | - |
172 | -if [ -z "${my_user}" ] |
173 | -then |
174 | - echo " User '${USER_TO_DEL}' already deleted ..." |
175 | -else |
176 | - echo " Deleting user '${USER_TO_DEL}' ..." |
177 | - userdel "${USER_TO_DEL}" |
178 | -fi |
179 | +echo " Deleting user '${USER_TO_DEL}' ..." |
180 | +deluser "${USER_TO_DEL}" |
181 | diff -Naur mage-0.4.22/usr/lib/mage/smage2.sh mage-0.4.22-mcore/usr/lib/mage/smage2.sh |
182 | --- mage-0.4.22/usr/lib/mage/smage2.sh 2010-06-28 20:50:53.000000000 +0200 |
183 | +++ mage-0.4.22-mcore/usr/lib/mage/smage2.sh 2010-12-07 21:13:45.000000000 +0100 |
184 | @@ -159,7 +159,7 @@ |
185 | [ ! -d ${SOURCEDIR}/${PNAME} ] && install -d ${SOURCEDIR}/${PNAME} |
186 | |
187 | # check if FETCHING is needed |
188 | - ( cd ${SOURCEDIR}/${PNAME}; md5sum --check ${DB_MD5_SUM_FILE} &> /dev/null ) |
189 | + ( cd ${SOURCEDIR}/${PNAME}; md5sum -c ${DB_MD5_SUM_FILE} &> /dev/null ) |
190 | if [[ $? = 0 ]] |
191 | then |
192 | # md5's ok, no fetching needed |
193 | @@ -314,7 +314,7 @@ |
194 | # recheck md5 sums |
195 | echo |
196 | echo -e "${COLBLUE}===${COLGREEN} Checking MD5 sums:${COLDEFAULT}" |
197 | - ( cd ${SOURCEDIR}/${PNAME}; md5sum --check ${DB_MD5_SUM_FILE} ) || die "md5 failed" |
198 | + ( cd ${SOURCEDIR}/${PNAME}; md5sum -c ${DB_MD5_SUM_FILE} ) || die "md5 failed" |
199 | echo |
200 | |
201 | # not needed anymore |