| [fdd4f59] | 1 | $FreeWRT$
|
|---|
| 2 | --- ipkg-utils-1.7.orig/ipkg-build Sat Apr 24 09:43:29 2004
|
|---|
| 3 | +++ ipkg-utils-1.7/ipkg-build Thu Jul 27 10:21:58 2006
|
|---|
| 4 | @@ -47,6 +47,19 @@ pkg_appears_sane() {
|
|---|
| 5 |
|
|---|
| 6 | PKG_ERROR=0
|
|---|
| 7 |
|
|---|
| 8 | + cvs_dirs=`find . -name 'CVS'`
|
|---|
| 9 | + if [ -n "$cvs_dirs" ]; then
|
|---|
| 10 | + if [ "$noclean" = "1" ]; then
|
|---|
| 11 | + echo "*** Warning: The following CVS directories where found.
|
|---|
| 12 | +You probably want to remove them: " >&2
|
|---|
| 13 | + ls -ld $cvs_dirs
|
|---|
| 14 | + echo >&2
|
|---|
| 15 | + else
|
|---|
| 16 | + echo "*** Removing the following files: $cvs_dirs"
|
|---|
| 17 | + rm -rf "$cvs_dirs"
|
|---|
| 18 | + fi
|
|---|
| 19 | + fi
|
|---|
| 20 | +
|
|---|
| 21 | tilde_files=`find . -name '*~'`
|
|---|
| 22 | if [ -n "$tilde_files" ]; then
|
|---|
| 23 | if [ "$noclean" = "1" ]; then
|
|---|
| 24 | @@ -60,16 +73,6 @@ You probably want to remove them: " >&2
|
|---|
| 25 | fi
|
|---|
| 26 | fi
|
|---|
| 27 |
|
|---|
| 28 | - large_uid_files=`find . -uid +99 || true`
|
|---|
| 29 | -
|
|---|
| 30 | - if [ "$ogargs" = "" ] && [ -n "$large_uid_files" ]; then
|
|---|
| 31 | - echo "*** Warning: The following files have a UID greater than 99.
|
|---|
| 32 | -You probably want to chown these to a system user: " >&2
|
|---|
| 33 | - ls -ld $large_uid_files
|
|---|
| 34 | - echo >&2
|
|---|
| 35 | - fi
|
|---|
| 36 | -
|
|---|
| 37 | -
|
|---|
| 38 | if [ ! -f "$CONTROL/control" ]; then
|
|---|
| 39 | echo "*** Error: Control file $pkg_dir/$CONTROL/control not found." >&2
|
|---|
| 40 | cd $owd
|
|---|
| 41 | @@ -134,8 +137,12 @@ You probably want to chown these to a sy
|
|---|
| 42 |
|
|---|
| 43 | for script in $CONTROL/preinst $CONTROL/postinst $CONTROL/prerm $CONTROL/postrm; do
|
|---|
| 44 | if [ -f $script -a ! -x $script ]; then
|
|---|
| 45 | + if [ "$noclean" = "1" ]; then
|
|---|
| 46 | echo "*** Error: package script $script is not executable" >&2
|
|---|
| 47 | PKG_ERROR=1
|
|---|
| 48 | + else
|
|---|
| 49 | + chmod a+x $script
|
|---|
| 50 | + fi
|
|---|
| 51 | fi
|
|---|
| 52 | done
|
|---|
| 53 |
|
|---|
| 54 | @@ -162,10 +169,12 @@ usage="Usage: $0 [-c] [-C] [-o owner] [-
|
|---|
| 55 | while getopts "cg:ho:v" opt; do
|
|---|
| 56 | case $opt in
|
|---|
| 57 | o ) owner=$OPTARG
|
|---|
| 58 | - ogargs="--owner=$owner"
|
|---|
| 59 | +# ogargs="--owner=$owner"
|
|---|
| 60 | + ogargs="-M uidgid"
|
|---|
| 61 | ;;
|
|---|
| 62 | g ) group=$OPTARG
|
|---|
| 63 | - ogargs="$ogargs --group=$group"
|
|---|
| 64 | +# ogargs="$ogargs --group=$group"
|
|---|
| 65 | + ogargs="-M uidgid"
|
|---|
| 66 | ;;
|
|---|
| 67 | c ) outer=tar
|
|---|
| 68 | ;;
|
|---|
| 69 | @@ -225,10 +234,12 @@ fi
|
|---|
| 70 | tmp_dir=$dest_dir/IPKG_BUILD.$$
|
|---|
| 71 | mkdir $tmp_dir
|
|---|
| 72 |
|
|---|
| 73 | -echo $CONTROL > $tmp_dir/tarX
|
|---|
| 74 | -( cd $pkg_dir && tar $ogargs -czf $tmp_dir/data.tar.gz . -X $tmp_dir/tarX )
|
|---|
| 75 | +( cd $pkg_dir && pax -rw -pe $CONTROL $tmp_dir/ )
|
|---|
| 76 | +rm -rf $pkg_dir/$CONTROL
|
|---|
| 77 | +( cd $pkg_dir && tar $ogargs -czf $tmp_dir/data.tar.gz . )
|
|---|
| 78 | +( cd $tmp_dir && pax -rw -pe $CONTROL $pkg_dir/ )
|
|---|
| 79 | ( cd $pkg_dir/$CONTROL && tar $ogargs -czf $tmp_dir/control.tar.gz . )
|
|---|
| 80 | -rm $tmp_dir/tarX
|
|---|
| 81 | +rm -rf $tmp_dir/$CONTROL
|
|---|
| 82 |
|
|---|
| 83 | echo "2.0" > $tmp_dir/debian-binary
|
|---|
| 84 |
|
|---|
