diff options
Diffstat (limited to 'tools/ipkg-utils')
| -rw-r--r-- | tools/ipkg-utils/patches/100-build_clean.patch | 9 | ||||
| -rw-r--r-- | tools/ipkg-utils/patches/110-buildpackage.patch | 7 | ||||
| -rw-r--r-- | tools/ipkg-utils/patches/111-buildpackage_conffiles.patch | 6 | ||||
| -rw-r--r-- | tools/ipkg-utils/patches/120-build_tar.patch | 12 | ||||
| -rw-r--r-- | tools/ipkg-utils/patches/130-tar_wildcards.patch | 8 | ||||
| -rw-r--r-- | tools/ipkg-utils/patches/140-portability.patch | 14 | ||||
| -rw-r--r-- | tools/ipkg-utils/patches/150-uppercase_letters.patch | 16 | ||||
| -rw-r--r-- | tools/ipkg-utils/patches/160-find.patch | 10 |
8 files changed, 35 insertions, 47 deletions
diff --git a/tools/ipkg-utils/patches/100-build_clean.patch b/tools/ipkg-utils/patches/100-build_clean.patch index 4cff731..7df272f 100644 --- a/tools/ipkg-utils/patches/100-build_clean.patch +++ b/tools/ipkg-utils/patches/100-build_clean.patch @@ -1,7 +1,6 @@ -diff -ruN ipkg-utils-1.7-old/ipkg-build ipkg-utils-1.7-new/ipkg-build ---- ipkg-utils-1.7-old/ipkg-build 2004-08-24 04:56:12.000000000 +0200 -+++ ipkg-utils-1.7-new/ipkg-build 2004-08-24 04:55:49.000000000 +0200 -@@ -47,6 +47,19 @@ +--- a/ipkg-build ++++ b/ipkg-build +@@ -47,6 +47,19 @@ pkg_appears_sane() { PKG_ERROR=0 @@ -21,7 +20,7 @@ diff -ruN ipkg-utils-1.7-old/ipkg-build ipkg-utils-1.7-new/ipkg-build tilde_files=`find . -name '*~'` if [ -n "$tilde_files" ]; then if [ "$noclean" = "1" ]; then -@@ -134,8 +147,12 @@ +@@ -134,8 +147,12 @@ You probably want to chown these to a sy for script in $CONTROL/preinst $CONTROL/postinst $CONTROL/prerm $CONTROL/postrm; do if [ -f $script -a ! -x $script ]; then diff --git a/tools/ipkg-utils/patches/110-buildpackage.patch b/tools/ipkg-utils/patches/110-buildpackage.patch index d0a3048..8e62ee7 100644 --- a/tools/ipkg-utils/patches/110-buildpackage.patch +++ b/tools/ipkg-utils/patches/110-buildpackage.patch @@ -1,6 +1,5 @@ -diff -ruN ipkg-utils-1.7-old/ipkg-buildpackage ipkg-utils-1.7-new/ipkg-buildpackage ---- ipkg-utils-1.7-old/ipkg-buildpackage 2001-07-26 17:36:36.000000000 +0200 -+++ ipkg-utils-1.7-new/ipkg-buildpackage 2004-07-05 19:46:24.000000000 +0200 +--- a/ipkg-buildpackage ++++ b/ipkg-buildpackage @@ -30,8 +30,9 @@ set -e @@ -13,7 +12,7 @@ diff -ruN ipkg-utils-1.7-old/ipkg-buildpackage ipkg-utils-1.7-new/ipkg-buildpack SCRIPTNAME=`basename $0` -@@ -212,7 +213,7 @@ +@@ -212,7 +213,7 @@ done # build the ipk package owd=`pwd` cd .. diff --git a/tools/ipkg-utils/patches/111-buildpackage_conffiles.patch b/tools/ipkg-utils/patches/111-buildpackage_conffiles.patch index ac1b0c0..dacdaae 100644 --- a/tools/ipkg-utils/patches/111-buildpackage_conffiles.patch +++ b/tools/ipkg-utils/patches/111-buildpackage_conffiles.patch @@ -1,6 +1,6 @@ ---- ipkg-utils-1.7-old/ipkg-buildpackage 2008-05-21 07:18:21.000000000 +0200 -+++ ipkg-utils-1.7-new/ipkg-buildpackage 2008-05-21 03:22:19.000000000 +0200 -@@ -190,7 +190,7 @@ +--- a/ipkg-buildpackage ++++ b/ipkg-buildpackage +@@ -190,7 +190,7 @@ fi mkdir /tmp/${pkg}/CONTROL files_required="control" diff --git a/tools/ipkg-utils/patches/120-build_tar.patch b/tools/ipkg-utils/patches/120-build_tar.patch index 299d68f..acf6b79 100644 --- a/tools/ipkg-utils/patches/120-build_tar.patch +++ b/tools/ipkg-utils/patches/120-build_tar.patch @@ -3,11 +3,9 @@ This patch from aorlinsk fixes an issue with order in options passed to tar http://openwrt.org/forum/viewtopic.php?pid=8332#p8332 -Index: ipkg-utils-1.7/ipkg-build -=================================================================== ---- ipkg-utils-1.7.orig/ipkg-build 2007-06-30 14:19:16.519409000 +0200 -+++ ipkg-utils-1.7/ipkg-build 2007-06-30 14:20:12.722921500 +0200 -@@ -184,7 +184,7 @@ +--- a/ipkg-build ++++ b/ipkg-build +@@ -184,7 +184,7 @@ while getopts "cg:ho:v" opt; do g ) group=$OPTARG ogargs="$ogargs --group=$group" ;; @@ -16,7 +14,7 @@ Index: ipkg-utils-1.7/ipkg-build ;; C ) noclean=1 ;; -@@ -243,8 +243,8 @@ +@@ -243,8 +243,8 @@ tmp_dir=$dest_dir/IPKG_BUILD.$$ mkdir $tmp_dir echo $CONTROL > $tmp_dir/tarX @@ -27,7 +25,7 @@ Index: ipkg-utils-1.7/ipkg-build rm $tmp_dir/tarX echo "2.0" > $tmp_dir/debian-binary -@@ -254,7 +254,7 @@ +@@ -254,7 +254,7 @@ rm -f $pkg_file if [ "$outer" = "ar" ] ; then ( cd $tmp_dir && ar -crf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz ) else diff --git a/tools/ipkg-utils/patches/130-tar_wildcards.patch b/tools/ipkg-utils/patches/130-tar_wildcards.patch index 80a7d1d..ba949c1 100644 --- a/tools/ipkg-utils/patches/130-tar_wildcards.patch +++ b/tools/ipkg-utils/patches/130-tar_wildcards.patch @@ -1,6 +1,6 @@ ---- ipkg-utils-1.7/ipkg.py.orig 2006-06-29 14:16:00.000000000 +0200 -+++ ipkg-utils-1.7/ipkg.py 2006-06-29 14:36:01.000000000 +0200 -@@ -93,9 +93,9 @@ +--- a/ipkg.py ++++ b/ipkg.py +@@ -93,9 +93,9 @@ class Package: self.filename = os.path.basename(fn) ## sys.stderr.write(" extracting control.tar.gz from %s\n"% (fn,)) if self.isdeb: @@ -12,7 +12,7 @@ line = control.readline() while 1: if not line: break -@@ -122,7 +122,7 @@ +@@ -122,7 +122,7 @@ class Package: if self.isdeb: data = os.popen("ar p "+fn+" data.tar.gz | tar tfz -","r") else: diff --git a/tools/ipkg-utils/patches/140-portability.patch b/tools/ipkg-utils/patches/140-portability.patch index ae71d7a..417c409 100644 --- a/tools/ipkg-utils/patches/140-portability.patch +++ b/tools/ipkg-utils/patches/140-portability.patch @@ -1,8 +1,6 @@ -Index: ipkg-utils-1.7/ipkg-build -=================================================================== ---- ipkg-utils-1.7.orig/ipkg-build 2007-06-30 15:21:37.621213250 +0200 -+++ ipkg-utils-1.7/ipkg-build 2007-06-30 15:21:51.862103250 +0200 -@@ -11,6 +11,8 @@ +--- a/ipkg-build ++++ b/ipkg-build +@@ -11,6 +11,8 @@ set -e version=1.0 @@ -11,10 +9,8 @@ Index: ipkg-utils-1.7/ipkg-build ipkg_extract_value() { sed -e "s/^[^:]*:[[:space:]]*//" } -Index: ipkg-utils-1.7/ipkg-make-index -=================================================================== ---- ipkg-utils-1.7.orig/ipkg-make-index 2007-06-30 15:21:37.225188500 +0200 -+++ ipkg-utils-1.7/ipkg-make-index 2007-06-30 15:21:51.866103500 +0200 +--- a/ipkg-make-index ++++ b/ipkg-make-index @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python diff --git a/tools/ipkg-utils/patches/150-uppercase_letters.patch b/tools/ipkg-utils/patches/150-uppercase_letters.patch index c0baa1f..cef200d 100644 --- a/tools/ipkg-utils/patches/150-uppercase_letters.patch +++ b/tools/ipkg-utils/patches/150-uppercase_letters.patch @@ -1,8 +1,6 @@ -Index: ipkg-utils-1.7/ipkg-build -=================================================================== ---- ipkg-utils-1.7.orig/ipkg-build 2007-07-21 03:10:58.228362436 +0200 -+++ ipkg-utils-1.7/ipkg-build 2007-07-21 03:11:02.912629374 +0200 -@@ -133,7 +133,7 @@ +--- a/ipkg-build ++++ b/ipkg-build +@@ -133,7 +133,7 @@ You probably want to chown these to a sy disallowed_filename=`disallowed_field Filename` [ "$?" -ne 0 ] && PKG_ERROR=1 @@ -11,11 +9,9 @@ Index: ipkg-utils-1.7/ipkg-build echo "*** Error: Package name $name contains illegal characters, (other than [a-z0-9.+-])" >&2 PKG_ERROR=1; fi -Index: ipkg-utils-1.7/ipkg-buildpackage -=================================================================== ---- ipkg-utils-1.7.orig/ipkg-buildpackage 2007-07-21 03:10:43.859543602 +0200 -+++ ipkg-utils-1.7/ipkg-buildpackage 2007-07-21 03:10:52.212019583 +0200 -@@ -69,7 +69,7 @@ +--- a/ipkg-buildpackage ++++ b/ipkg-buildpackage +@@ -69,7 +69,7 @@ pkg_appears_sane_control() { required_field Maintainer >/dev/null required_field Description >/dev/null diff --git a/tools/ipkg-utils/patches/160-find.patch b/tools/ipkg-utils/patches/160-find.patch index 04a2ad4..45ef3c6 100644 --- a/tools/ipkg-utils/patches/160-find.patch +++ b/tools/ipkg-utils/patches/160-find.patch @@ -1,5 +1,5 @@ ---- /tmp/ipkg-build 2008-08-01 09:36:41.000000000 +0200 -+++ ipkg-utils-1.7/ipkg-build 2008-08-06 15:04:52.000000000 +0200 +--- a/ipkg-build ++++ b/ipkg-build @@ -10,7 +10,8 @@ set -e @@ -10,7 +10,7 @@ TAR="${TAR:-$(which tar)}" ipkg_extract_value() { -@@ -49,7 +50,7 @@ +@@ -49,7 +50,7 @@ pkg_appears_sane() { PKG_ERROR=0 @@ -19,7 +19,7 @@ if [ -n "$cvs_dirs" ]; then if [ "$noclean" = "1" ]; then echo "*** Warning: The following CVS directories where found. -@@ -62,7 +63,7 @@ +@@ -62,7 +63,7 @@ You probably want to remove them: " >&2 fi fi @@ -28,7 +28,7 @@ if [ -n "$tilde_files" ]; then if [ "$noclean" = "1" ]; then echo "*** Warning: The following files have names ending in '~'. -@@ -75,7 +76,7 @@ +@@ -75,7 +76,7 @@ You probably want to remove them: " >&2 fi fi |