diff options
Diffstat (limited to 'recipes/apt')
32 files changed, 50 insertions, 787 deletions
diff --git a/recipes/apt/apt-0.5.28.6/autofoo.patch b/recipes/apt/apt-0.5.28.6/autofoo.patch deleted file mode 100644 index 02ee7e057f..0000000000 --- a/recipes/apt/apt-0.5.28.6/autofoo.patch +++ /dev/null @@ -1,92 +0,0 @@ -upstream: more recent version in OE - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - -Index: apt-0.5.28.6/configure.in -=================================================================== ---- apt-0.5.28.6.orig/configure.in 2005-03-22 08:03:50.000000000 +0100 -+++ apt-0.5.28.6/configure.in 2005-05-15 15:08:50.000000000 +0200 -@@ -18,9 +18,9 @@ - AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) - - dnl -- SET THIS TO THE RELEASE VERSION -- --AC_DEFINE_UNQUOTED(VERSION,"0.5.28.6") -+AC_DEFINE_UNQUOTED(VERSION,"0.5.28.6", [package version]) - PACKAGE="apt" --AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") -+AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE", [package name]) - AC_SUBST(PACKAGE) - - dnl Check the archs, we want the target type. -@@ -47,7 +47,7 @@ - LIBS="$SAVE_LIBS" - - dnl Checks for pthread -- disabled due to glibc bugs jgg --dnl AC_CHECK_LIB(pthread, pthread_create,[AC_DEFINE(HAVE_PTHREAD) PTHREADLIB="-lpthread"]) -+dnl AC_CHECK_LIB(pthread, pthread_create,[AC_DEFINE(HAVE_PTHREAD, 1, [define if we have pthreads]) PTHREADLIB="-lpthread"]) - AC_SUBST(PTHREADLIB) - dnl if test "$PTHREADLIB" != "-lpthread"; then - dnl AC_MSG_ERROR(failed: I need posix threads, pthread) -@@ -64,7 +64,7 @@ - [#include <db.h>], - [int r, s, t; db_version(&r, &s, &t);] - )], -- [AC_DEFINE(HAVE_BDB) -+ [AC_DEFINE(HAVE_BDB, 1, [define if we have BerkeleyDB]) - BDBLIB="-ldb" - AC_MSG_RESULT(yes)], - [BDBLIB="" -@@ -84,14 +84,14 @@ - AC_MSG_ERROR(failed: use --host= or check buildlib/archtable) - fi - AC_MSG_RESULT($archset) --AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset") -+AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset",[define to the system architecture]) - - dnl Get a common name for the host OS - this is primarily only for HURD and is - dnl non fatal if it fails - AC_MSG_CHECKING(system OS) - osset="`awk \" ! /^#|^\\\$/ {if (match(\\\"$target_vendor-$target_os\\\",\\\$1)) {print \\\$2; exit}}\" $srcdir/buildlib/ostable`" - AC_MSG_RESULT($osset) --AC_DEFINE_UNQUOTED(COMMON_OS,"$osset") -+AC_DEFINE_UNQUOTED(COMMON_OS,"$osset",[define to the system OS]) - - dnl We use C99 types if at all possible - AC_CACHE_CHECK([for C99 integer types],c9x_ints,[ -@@ -105,13 +105,13 @@ - - dnl Arg, linux and bsd put their statfs function in different places - if test x"$HAVE_STATVFS" != x"yes"; then -- AC_EGREP_HEADER(statfs,sys/vfs.h,[AC_DEFINE(HAVE_VFS_H)],[ -- AC_EGREP_HEADER(statfs,sys/mount.h,[AC_DEFINE(HAVE_MOUNT_H)],[AC_MSG_ERROR(failed: Need statvfs)]) -+ AC_EGREP_HEADER(statfs,sys/vfs.h,[AC_DEFINE(HAVE_VFS_H, 1, [define if statfs is in sys/vfs.h])],[ -+ AC_EGREP_HEADER(statfs,sys/mount.h,[AC_DEFINE(HAVE_MOUNT_H, 1, [define if statfs is in sys/mount.h])],[AC_MSG_ERROR(failed: Need statvfs)]) - ]) - fi - - dnl We should use the real timegm function if we have it. --AC_CHECK_FUNC(timegm,AC_DEFINE(HAVE_TIMEGM)) -+AC_CHECK_FUNC(timegm,AC_DEFINE(HAVE_TIMEGM, 1, [define if we have timegm])) - AC_SUBST(HAVE_TIMEGM) - - dnl Check the sizes etc. of the architecture -@@ -157,7 +157,7 @@ - dnl HP-UX sux.. - AC_MSG_CHECKING(for missing socklen_t) - AC_EGREP_HEADER(socklen_t, sys/socket.h,[AC_MSG_RESULT(no)],[ -- AC_DEFINE(NEED_SOCKLEN_T_DEFINE) -+ AC_DEFINE(NEED_SOCKLEN_T_DEFINE, 1, [define if we need to define socklen_t]) - NEED_SOCKLEN_T_DEFINE=yes - AC_MSG_RESULT(missing.)]) - AC_SUBST(NEED_SOCKLEN_T_DEFINE) -@@ -195,7 +195,7 @@ - ALL_LINGUAS="da de en_GB es fr hu it nl no_NO pl pt_BR ru sv zh_TW" - AM_GNU_GETTEXT(external) - if test x"$USE_NLS" = "xyes"; then -- AC_DEFINE(USE_NLS) -+ AC_DEFINE(USE_NLS, 1, [define if we have native language support]) - fi - AC_SUBST(USE_NLS) - AC_PATH_PROG(BASH, bash) diff --git a/recipes/apt/apt-0.6.25/autofoo.patch b/recipes/apt/apt-0.6.25/autofoo.patch deleted file mode 100644 index 1a6887bc8f..0000000000 --- a/recipes/apt/apt-0.6.25/autofoo.patch +++ /dev/null @@ -1,81 +0,0 @@ -upstream: more recent version in OE - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- apt-0.6.18/configure.in~autofoo -+++ apt-0.6.18/configure.in -@@ -17,9 +17,9 @@ - AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) - - dnl -- SET THIS TO THE RELEASE VERSION -- --AC_DEFINE_UNQUOTED(VERSION,"0.6.25") -+AC_DEFINE_UNQUOTED(VERSION,"0.6.25", [package version]) - PACKAGE="apt" --AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") -+AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE", [package name]) - AC_SUBST(PACKAGE) - - dnl Check the archs, we want the target type. -@@ -46,7 +46,7 @@ - LIBS="$SAVE_LIBS" - - dnl Checks for pthread -- disabled due to glibc bugs jgg --dnl AC_CHECK_LIB(pthread, pthread_create,[AC_DEFINE(HAVE_PTHREAD) PTHREADLIB="-lpthread"]) -+dnl AC_CHECK_LIB(pthread, pthread_create,[AC_DEFINE(HAVE_PTHREAD, 1, [define if we have pthreads]) PTHREADLIB="-lpthread"]) - AC_SUBST(PTHREADLIB) - dnl if test "$PTHREADLIB" != "-lpthread"; then - dnl AC_MSG_ERROR(failed: I need posix threads, pthread) -@@ -66,14 +66,14 @@ - AC_MSG_ERROR(failed: use --host=) - fi - AC_MSG_RESULT($archset) --AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset") -+AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset",[define to the system architecture]) - - dnl Get a common name for the host OS - this is primarily only for HURD and is - dnl non fatal if it fails - AC_MSG_CHECKING(system OS) - osset="`awk \" ! /^#|^\\\$/ {if (match(\\\"$target_vendor-$target_os\\\",\\\$1)) {print \\\$2; exit}}\" $srcdir/buildlib/ostable`" - AC_MSG_RESULT($osset) --AC_DEFINE_UNQUOTED(COMMON_OS,"$osset") -+AC_DEFINE_UNQUOTED(COMMON_OS,"$osset",[define to the system OS]) - - dnl We use C99 types if at all possible - AC_CACHE_CHECK([for C99 integer types],c9x_ints,[ -@@ -87,13 +87,13 @@ - - dnl Arg, linux and bsd put their statfs function in different places - if test x"$HAVE_STATVFS" != x"yes"; then -- AC_EGREP_HEADER(statfs,sys/vfs.h,[AC_DEFINE(HAVE_VFS_H)],[ -- AC_EGREP_HEADER(statfs,sys/mount.h,[AC_DEFINE(HAVE_MOUNT_H)],[AC_MSG_ERROR(failed: Need statvfs)]) -+ AC_EGREP_HEADER(statfs,sys/vfs.h,[AC_DEFINE(HAVE_VFS_H, 1, [define if statfs is in sys/vfs.h])],[ -+ AC_EGREP_HEADER(statfs,sys/mount.h,[AC_DEFINE(HAVE_MOUNT_H, 1, [define if statfs is in sys/mount.h])],[AC_MSG_ERROR(failed: Need statvfs)]) - ]) - fi - - dnl We should use the real timegm function if we have it. --AC_CHECK_FUNC(timegm,AC_DEFINE(HAVE_TIMEGM)) -+AC_CHECK_FUNC(timegm,AC_DEFINE(HAVE_TIMEGM, 1, [define if we have timegm])) - AC_SUBST(HAVE_TIMEGM) - - dnl Check the sizes etc. of the architecture -@@ -139,7 +139,7 @@ - dnl HP-UX sux.. - AC_MSG_CHECKING(for missing socklen_t) - AC_EGREP_HEADER(socklen_t, sys/socket.h,[AC_MSG_RESULT(no)],[ -- AC_DEFINE(NEED_SOCKLEN_T_DEFINE) -+ AC_DEFINE(NEED_SOCKLEN_T_DEFINE, 1, [define if we need to define socklen_t]) - NEED_SOCKLEN_T_DEFINE=yes - AC_MSG_RESULT(missing.)]) - AC_SUBST(NEED_SOCKLEN_T_DEFINE) -@@ -174,7 +174,7 @@ - ALL_LINGUAS="da de en_GB es fr hu it nl no_NO pl pt_BR ru sv zh_TW" - AM_GNU_GETTEXT(external) - if test x"$USE_NLS" = "xyes"; then -- AC_DEFINE(USE_NLS) -+ AC_DEFINE(USE_NLS, 1, [define if we have native language support]) - fi - AC_SUBST(USE_NLS) - AC_PATH_PROG(BASH, bash) diff --git a/recipes/apt/apt-0.6.46.2/autofoo.patch b/recipes/apt/apt-0.6.46.2/autofoo.patch deleted file mode 100644 index 74d787cefd..0000000000 --- a/recipes/apt/apt-0.6.46.2/autofoo.patch +++ /dev/null @@ -1,84 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- - configure.in | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - ---- apt-0.6.45exp2.orig/configure.in -+++ apt-0.6.45exp2/configure.in -@@ -18,9 +18,9 @@ AC_CONFIG_AUX_DIR(buildlib) - AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) - - dnl -- SET THIS TO THE RELEASE VERSION -- --AC_DEFINE_UNQUOTED(VERSION,"0.6.45exp2") -+AC_DEFINE_UNQUOTED(VERSION,"0.6.45exp2",[package version]) - PACKAGE="apt" --AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") -+AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE",[package name]) - AC_SUBST(PACKAGE) - - dnl Check the archs, we want the target type. -@@ -47,7 +47,7 @@ AC_SUBST(SOCKETLIBS) - LIBS="$SAVE_LIBS" - - dnl Checks for pthread -- disabled due to glibc bugs jgg --dnl AC_CHECK_LIB(pthread, pthread_create,[AC_DEFINE(HAVE_PTHREAD) PTHREADLIB="-lpthread"]) -+dnl AC_CHECK_LIB(pthread, pthread_create,[AC_DEFINE(HAVE_PTHREAD, 1, [define if we have pthreads]) PTHREADLIB="-lpthread"]) - AC_SUBST(PTHREADLIB) - dnl if test "$PTHREADLIB" != "-lpthread"; then - dnl AC_MSG_ERROR(failed: I need posix threads, pthread) -@@ -84,14 +84,14 @@ if test "x$archset" = "x"; then - AC_MSG_ERROR(failed: use --host= or check buildlib/archtable) - fi - AC_MSG_RESULT($archset) --AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset") -+AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset",[define to the system architecture]) - - dnl Get a common name for the host OS - this is primarily only for HURD and is - dnl non fatal if it fails - AC_MSG_CHECKING(system OS) - osset="`awk \" ! /^#|^\\\$/ {if (match(\\\"$target_vendor-$target_os\\\",\\\$1)) {print \\\$2; exit}}\" $srcdir/buildlib/ostable`" - AC_MSG_RESULT($osset) --AC_DEFINE_UNQUOTED(COMMON_OS,"$osset") -+AC_DEFINE_UNQUOTED(COMMON_OS,"$osset",[define to the system OS]) - - dnl We use C99 types if at all possible - AC_CACHE_CHECK([for C99 integer types],c9x_ints,[ -@@ -105,13 +105,13 @@ AC_SUBST(HAVE_STATVFS) - - dnl Arg, linux and bsd put their statfs function in different places - if test x"$HAVE_STATVFS" != x"yes"; then -- AC_EGREP_HEADER(statfs,sys/vfs.h,[AC_DEFINE(HAVE_VFS_H)],[ -- AC_EGREP_HEADER(statfs,sys/mount.h,[AC_DEFINE(HAVE_MOUNT_H)],[AC_MSG_ERROR(failed: Need statvfs)]) -+ AC_EGREP_HEADER(statfs,sys/vfs.h,[AC_DEFINE(HAVE_VFS_H, 1, [define if statfs is in sys/vfs.h])],[ -+ AC_EGREP_HEADER(statfs,sys/mount.h,[AC_DEFINE(HAVE_MOUNT_H, 1, [define if statfs is in sys/mount.h])],[AC_MSG_ERROR(failed: Need statvfs)]) - ]) - fi - - dnl We should use the real timegm function if we have it. --AC_CHECK_FUNC(timegm,AC_DEFINE(HAVE_TIMEGM)) -+AC_CHECK_FUNC(timegm,AC_DEFINE(HAVE_TIMEGM, 1, [define if we have timegm])) - AC_SUBST(HAVE_TIMEGM) - - dnl Check the sizes etc. of the architecture -@@ -157,7 +157,7 @@ fi - dnl HP-UX sux.. - AC_MSG_CHECKING(for missing socklen_t) - AC_EGREP_HEADER(socklen_t, sys/socket.h,[AC_MSG_RESULT(no)],[ -- AC_DEFINE(NEED_SOCKLEN_T_DEFINE) -+ AC_DEFINE(NEED_SOCKLEN_T_DEFINE, 1, [define if we need to define socklen_t]) - NEED_SOCKLEN_T_DEFINE=yes - AC_MSG_RESULT(missing.)]) - AC_SUBST(NEED_SOCKLEN_T_DEFINE) -@@ -204,7 +204,7 @@ dnl gettext approved makefiles, so this - ALL_LINGUAS="bg bs ca cs cy da de dz el en_GB es eu fi fr gl hu it ja ko nb nl nn pl pt_BR pt ro ru sk sl sv tl vi zn_CN zh_TW" - AM_GNU_GETTEXT(external) - if test x"$USE_NLS" = "xyes"; then -- AC_DEFINE(USE_NLS) -+ AC_DEFINE(USE_NLS, 1, [define if we have native language support]) - fi - AC_SUBST(USE_NLS) - AC_PATH_PROG(BASH, bash) diff --git a/recipes/apt/apt-0.6.46.2/noconfigure.patch b/recipes/apt/apt-0.6.46.2/noconfigure.patch deleted file mode 100644 index 682a96da24..0000000000 --- a/recipes/apt/apt-0.6.46.2/noconfigure.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- - apt-pkg/packagemanager.cc | 4 ++++ - 1 file changed, 4 insertions(+) - ---- apt-0.6.45exp2.orig/apt-pkg/packagemanager.cc -+++ apt-0.6.45exp2/apt-pkg/packagemanager.cc -@@ -534,10 +534,12 @@ bool pkgPackageManager::SmartUnPack(PkgI - - List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States); - -+#if 0 - // Perform immedate configuration of the package. - if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true) - if (SmartConfigure(Pkg) == false) - return _error->Error("Internal Error, Could not perform immediate configuration (2) on %s",Pkg.Name()); -+#endif - - return true; - } -@@ -609,6 +611,7 @@ pkgPackageManager::OrderResult pkgPackag - DoneSomething = true; - } - -+#if 0 - // Final run through the configure phase - if (ConfigureAll() == false) - return Failed; -@@ -623,6 +626,7 @@ pkgPackageManager::OrderResult pkgPackag - return Failed; - } - } -+#endif - - return Completed; - } diff --git a/recipes/apt/apt-0.6.46.2/nodoc.patch b/recipes/apt/apt-0.6.46.2/nodoc.patch deleted file mode 100644 index 9101847189..0000000000 --- a/recipes/apt/apt-0.6.46.2/nodoc.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- apt-0.6.45exp2.orig/Makefile -+++ apt-0.6.45exp2/Makefile -@@ -17,7 +17,7 @@ all headers library clean veryclean bina - $(MAKE) -C cmdline $@ - $(MAKE) -C ftparchive $@ - $(MAKE) -C dselect $@ -- $(MAKE) -C doc $@ -+# $(MAKE) -C doc $@ - $(MAKE) -C po $@ - - # Some very common aliases diff --git a/recipes/apt/apt-0.7.14/no-ko-translation.patch b/recipes/apt/apt-0.7.14/no-ko-translation.patch deleted file mode 100644 index 5f3634b32a..0000000000 --- a/recipes/apt/apt-0.7.14/no-ko-translation.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- - po/LINGUAS | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- apt-0.7.14.orig/po/LINGUAS -+++ apt-0.7.14/po/LINGUAS -@@ -1 +1 @@ --ar bg bs ca cs cy da de dz el en_GB es eu fi fr gl he hu it ja km ko ku mr nb ne nl nn pl pt pt_BR ro ru sk sl sv th tl uk vi zh_CN zh_TW -+ar bg bs ca cs cy da de dz el en_GB es eu fi fr gl he hu it ja km ku mr nb ne nl nn pl pt pt_BR ro ru sk sl sv th tl uk vi zh_CN zh_TW diff --git a/recipes/apt/apt-0.7.14/noconfigure.patch b/recipes/apt/apt-0.7.14/noconfigure.patch deleted file mode 100644 index 682a96da24..0000000000 --- a/recipes/apt/apt-0.7.14/noconfigure.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- - apt-pkg/packagemanager.cc | 4 ++++ - 1 file changed, 4 insertions(+) - ---- apt-0.6.45exp2.orig/apt-pkg/packagemanager.cc -+++ apt-0.6.45exp2/apt-pkg/packagemanager.cc -@@ -534,10 +534,12 @@ bool pkgPackageManager::SmartUnPack(PkgI - - List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States); - -+#if 0 - // Perform immedate configuration of the package. - if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true) - if (SmartConfigure(Pkg) == false) - return _error->Error("Internal Error, Could not perform immediate configuration (2) on %s",Pkg.Name()); -+#endif - - return true; - } -@@ -609,6 +611,7 @@ pkgPackageManager::OrderResult pkgPackag - DoneSomething = true; - } - -+#if 0 - // Final run through the configure phase - if (ConfigureAll() == false) - return Failed; -@@ -623,6 +626,7 @@ pkgPackageManager::OrderResult pkgPackag - return Failed; - } - } -+#endif - - return Completed; - } diff --git a/recipes/apt/apt-0.7.14/nodoc.patch b/recipes/apt/apt-0.7.14/nodoc.patch deleted file mode 100644 index db8cf93717..0000000000 --- a/recipes/apt/apt-0.7.14/nodoc.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- apt-0.7.14.orig/Makefile -+++ apt-0.7.14/Makefile -@@ -15,11 +15,11 @@ all headers library clean veryclean bina - $(MAKE) -C apt-inst $@ - $(MAKE) -C methods $@ - $(MAKE) -C cmdline $@ - $(MAKE) -C ftparchive $@ - $(MAKE) -C dselect $@ -- $(MAKE) -C doc $@ -+# $(MAKE) -C doc $@ - $(MAKE) -C po $@ - - # Some very common aliases - .PHONY: maintainer-clean dist-clean distclean pristine sanity - maintainer-clean dist-clean distclean pristine sanity: veryclean diff --git a/recipes/apt/apt-0.7.14/use-host.patch b/recipes/apt/apt-0.7.14/use-host.patch deleted file mode 100644 index 894a697661..0000000000 --- a/recipes/apt/apt-0.7.14/use-host.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- - buildlib/sizetable | 4 +++- - configure.in | 2 +- - 2 files changed, 4 insertions(+), 2 deletions(-) - ---- apt-0.7.14.orig/buildlib/sizetable -+++ apt-0.7.14/buildlib/sizetable -@@ -9,16 +9,19 @@ - # - # This is used primarily for the MD5 algorithm. - # The format is:- - # CPU endian sizeof: char, int, short, long - i386 little 1 4 2 4 -+i486 little 1 4 2 4 -+i586 little 1 4 2 4 -+i686 little 1 4 2 4 - armeb big 1 4 2 4 - arm little 1 4 2 4 - alpha little 1 4 2 8 - mipsel little 1 4 2 4 - sparc big 1 4 2 4 - sparc64 big 1 4 2 8 - m68k big 1 4 2 4 - powerpc big 1 4 2 4 - mips big 1 4 2 4 - hppa big 1 4 2 4 --m32r big 1 4 2 4 -\ No newline at end of file -+m32r big 1 4 2 4 ---- apt-0.7.14.orig/configure.in -+++ apt-0.7.14/configure.in -@@ -86,11 +86,11 @@ AC_SUBST(BDBLIB) - dnl Converts the ARCH to be something singular for this general CPU family - dnl This is often the dpkg architecture string. - dnl First check against the full canonical canoncial-system-type in $target - dnl and if that fails, just look for the cpu - AC_MSG_CHECKING(debian architecture) --archset="`dpkg-architecture -qDEB_HOST_ARCH`" -+archset="`echo $host_alias|cut -d'-' -f1`" - if test "x$archset" = "x"; then - AC_MSG_ERROR([failed: use --host= or output from dpkg-architecture]) - fi - AC_MSG_RESULT($archset) - AC_DEFINE_UNQUOTED(COMMON_ARCH,"$archset") diff --git a/recipes/apt/apt-0.7.19/no-curl.patch b/recipes/apt/apt-0.7.19/no-curl.patch deleted file mode 100644 index 3e5aff139c..0000000000 --- a/recipes/apt/apt-0.7.19/no-curl.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- - configure.in | 6 ------ - methods/makefile | 7 ------- - 2 files changed, 13 deletions(-) - -Index: apt-0.7.19/configure.in -=================================================================== ---- apt-0.7.19.orig/configure.in 2008-12-15 13:44:44.000000000 +0000 -+++ apt-0.7.19/configure.in 2008-12-15 13:57:16.000000000 +0000 -@@ -86,12 +86,6 @@ - - LIBS="$saveLIBS" - --AC_CHECK_LIB(curl, curl_easy_init, -- [AC_CHECK_HEADER(curl/curl.h, -- curl_ok=yes, -- curl_ok=no)], -- AC_MSG_ERROR([failed: I need CURL due https support]), --) - - AC_SUBST(BDBLIB) - -Index: apt-0.7.19/methods/makefile -=================================================================== ---- apt-0.7.19.orig/methods/makefile 2008-11-24 09:32:23.000000000 +0000 -+++ apt-0.7.19/methods/makefile 2008-12-15 13:57:44.000000000 +0000 -@@ -52,13 +52,6 @@ - SOURCE = http.cc rfc2553emu.cc connect.cc - include $(PROGRAM_H) - --# The https method --PROGRAM=https --SLIBS = -lapt-pkg -lcurl $(INTLLIBS) --LIB_MAKES = apt-pkg/makefile --SOURCE = https.cc --include $(PROGRAM_H) -- - # The ftp method - PROGRAM=ftp - SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS) diff --git a/recipes/apt/apt-0.7.19/noconfigure.patch b/recipes/apt/apt-0.7.19/noconfigure.patch deleted file mode 100644 index 682a96da24..0000000000 --- a/recipes/apt/apt-0.7.19/noconfigure.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- - apt-pkg/packagemanager.cc | 4 ++++ - 1 file changed, 4 insertions(+) - ---- apt-0.6.45exp2.orig/apt-pkg/packagemanager.cc -+++ apt-0.6.45exp2/apt-pkg/packagemanager.cc -@@ -534,10 +534,12 @@ bool pkgPackageManager::SmartUnPack(PkgI - - List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States); - -+#if 0 - // Perform immedate configuration of the package. - if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true) - if (SmartConfigure(Pkg) == false) - return _error->Error("Internal Error, Could not perform immediate configuration (2) on %s",Pkg.Name()); -+#endif - - return true; - } -@@ -609,6 +611,7 @@ pkgPackageManager::OrderResult pkgPackag - DoneSomething = true; - } - -+#if 0 - // Final run through the configure phase - if (ConfigureAll() == false) - return Failed; -@@ -623,6 +626,7 @@ pkgPackageManager::OrderResult pkgPackag - return Failed; - } - } -+#endif - - return Completed; - } diff --git a/recipes/apt/apt-0.7.19/nodoc.patch b/recipes/apt/apt-0.7.19/nodoc.patch deleted file mode 100644 index db8cf93717..0000000000 --- a/recipes/apt/apt-0.7.19/nodoc.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- apt-0.7.14.orig/Makefile -+++ apt-0.7.14/Makefile -@@ -15,11 +15,11 @@ all headers library clean veryclean bina - $(MAKE) -C apt-inst $@ - $(MAKE) -C methods $@ - $(MAKE) -C cmdline $@ - $(MAKE) -C ftparchive $@ - $(MAKE) -C dselect $@ -- $(MAKE) -C doc $@ -+# $(MAKE) -C doc $@ - $(MAKE) -C po $@ - - # Some very common aliases - .PHONY: maintainer-clean dist-clean distclean pristine sanity - maintainer-clean dist-clean distclean pristine sanity: veryclean diff --git a/recipes/apt/apt-0.7.2/noconfigure.patch b/recipes/apt/apt-0.7.2/noconfigure.patch deleted file mode 100644 index 682a96da24..0000000000 --- a/recipes/apt/apt-0.7.2/noconfigure.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- - apt-pkg/packagemanager.cc | 4 ++++ - 1 file changed, 4 insertions(+) - ---- apt-0.6.45exp2.orig/apt-pkg/packagemanager.cc -+++ apt-0.6.45exp2/apt-pkg/packagemanager.cc -@@ -534,10 +534,12 @@ bool pkgPackageManager::SmartUnPack(PkgI - - List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States); - -+#if 0 - // Perform immedate configuration of the package. - if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true) - if (SmartConfigure(Pkg) == false) - return _error->Error("Internal Error, Could not perform immediate configuration (2) on %s",Pkg.Name()); -+#endif - - return true; - } -@@ -609,6 +611,7 @@ pkgPackageManager::OrderResult pkgPackag - DoneSomething = true; - } - -+#if 0 - // Final run through the configure phase - if (ConfigureAll() == false) - return Failed; -@@ -623,6 +626,7 @@ pkgPackageManager::OrderResult pkgPackag - return Failed; - } - } -+#endif - - return Completed; - } diff --git a/recipes/apt/apt-0.7.2/nodoc.patch b/recipes/apt/apt-0.7.2/nodoc.patch deleted file mode 100644 index 9101847189..0000000000 --- a/recipes/apt/apt-0.7.2/nodoc.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- apt-0.6.45exp2.orig/Makefile -+++ apt-0.6.45exp2/Makefile -@@ -17,7 +17,7 @@ all headers library clean veryclean bina - $(MAKE) -C cmdline $@ - $(MAKE) -C ftparchive $@ - $(MAKE) -C dselect $@ -- $(MAKE) -C doc $@ -+# $(MAKE) -C doc $@ - $(MAKE) -C po $@ - - # Some very common aliases diff --git a/recipes/apt/apt-0.7.20.2/fix-gcc-4.4-compile.patch b/recipes/apt/apt-0.7.20.2/fix-gcc-4.4-compile.patch new file mode 100644 index 0000000000..eb4d5e4c16 --- /dev/null +++ b/recipes/apt/apt-0.7.20.2/fix-gcc-4.4-compile.patch @@ -0,0 +1,39 @@ +diff -rc apt-0.7.20.2.orig/apt-pkg/acquire.cc apt-0.7.20.2/apt-pkg/acquire.cc +*** apt-0.7.20.2.orig/apt-pkg/acquire.cc 2010-06-21 18:14:15.815760996 +0800 +--- apt-0.7.20.2/apt-pkg/acquire.cc 2010-06-21 18:15:30.865760994 +0800 +*************** +*** 24,29 **** +--- 24,30 ---- + + #include <iostream> + #include <sstream> ++ #include <cstdio> + + #include <dirent.h> + #include <sys/time.h> +diff -rc apt-0.7.20.2.orig/apt-pkg/contrib/sha256.h apt-0.7.20.2/apt-pkg/contrib/sha256.h +*** apt-0.7.20.2.orig/apt-pkg/contrib/sha256.h 2010-06-21 18:14:15.815760996 +0800 +--- apt-0.7.20.2/apt-pkg/contrib/sha256.h 2010-06-21 18:14:59.565760993 +0800 +*************** +*** 17,22 **** +--- 17,23 ---- + #include <string> + #include <cstring> + #include <algorithm> ++ #include <stdint.h> + + using std::string; + using std::min; +diff -rc apt-0.7.20.2.orig/apt-pkg/deb/dpkgpm.cc apt-0.7.20.2/apt-pkg/deb/dpkgpm.cc +*** apt-0.7.20.2.orig/apt-pkg/deb/dpkgpm.cc 2010-06-21 18:14:15.815760996 +0800 +--- apt-0.7.20.2/apt-pkg/deb/dpkgpm.cc 2010-06-21 18:16:12.045760992 +0800 +*************** +*** 22,27 **** +--- 22,28 ---- + #include <sys/select.h> + #include <sys/types.h> + #include <sys/wait.h> ++ #include <sys/stat.h> + #include <signal.h> + #include <errno.h> + #include <stdio.h> diff --git a/recipes/apt/apt-0.7.3/noconfigure.patch b/recipes/apt/apt-0.7.3/noconfigure.patch deleted file mode 100644 index 682a96da24..0000000000 --- a/recipes/apt/apt-0.7.3/noconfigure.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- - apt-pkg/packagemanager.cc | 4 ++++ - 1 file changed, 4 insertions(+) - ---- apt-0.6.45exp2.orig/apt-pkg/packagemanager.cc -+++ apt-0.6.45exp2/apt-pkg/packagemanager.cc -@@ -534,10 +534,12 @@ bool pkgPackageManager::SmartUnPack(PkgI - - List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States); - -+#if 0 - // Perform immedate configuration of the package. - if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true) - if (SmartConfigure(Pkg) == false) - return _error->Error("Internal Error, Could not perform immediate configuration (2) on %s",Pkg.Name()); -+#endif - - return true; - } -@@ -609,6 +611,7 @@ pkgPackageManager::OrderResult pkgPackag - DoneSomething = true; - } - -+#if 0 - // Final run through the configure phase - if (ConfigureAll() == false) - return Failed; -@@ -623,6 +626,7 @@ pkgPackageManager::OrderResult pkgPackag - return Failed; - } - } -+#endif - - return Completed; - } diff --git a/recipes/apt/apt-0.7.3/nodoc.patch b/recipes/apt/apt-0.7.3/nodoc.patch deleted file mode 100644 index 9101847189..0000000000 --- a/recipes/apt/apt-0.7.3/nodoc.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- apt-0.6.45exp2.orig/Makefile -+++ apt-0.6.45exp2/Makefile -@@ -17,7 +17,7 @@ all headers library clean veryclean bina - $(MAKE) -C cmdline $@ - $(MAKE) -C ftparchive $@ - $(MAKE) -C dselect $@ -- $(MAKE) -C doc $@ -+# $(MAKE) -C doc $@ - $(MAKE) -C po $@ - - # Some very common aliases diff --git a/recipes/apt/apt-native.inc b/recipes/apt/apt-native.inc index 4e4771a9cd..90f3ec5b53 100644 --- a/recipes/apt/apt-native.inc +++ b/recipes/apt/apt-native.inc @@ -6,7 +6,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/apt-${PV}" PACKAGES = "" USE_NLS = "yes" -SRC_URI += "file://db_linking_hack.patch;patch=1" +SRC_URI += "file://db_linking_hack.patch" python do_stage () { bb.build.exec_func('do_stage_base', d) diff --git a/recipes/apt/apt-native_0.6.46.2.bb b/recipes/apt/apt-native_0.6.46.2.bb deleted file mode 100644 index a0d4660bda..0000000000 --- a/recipes/apt/apt-native_0.6.46.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -require apt-native.inc -PR = "r3" - -SRC_URI += "file://nodoc.patch;patch=1 \ - file://noconfigure.patch;patch=1" - -SRC_URI[md5sum] = "67d439a252996357b0313b3ad999739a" -SRC_URI[sha256sum] = "6f1a7340d0de2a9a524055d0ed4289aa919dc29e9e1fe60aae598f2019105686" diff --git a/recipes/apt/apt-native_0.7.14.bb b/recipes/apt/apt-native_0.7.14.bb deleted file mode 100644 index 38a75eb1f7..0000000000 --- a/recipes/apt/apt-native_0.7.14.bb +++ /dev/null @@ -1,9 +0,0 @@ -require apt-native.inc -PR = "r3" - -SRC_URI += "file://nodoc.patch;patch=1 \ - file://noconfigure.patch;patch=1 \ - file://no-curl.patch;patch=1" - -SRC_URI[md5sum] = "19efa18fb1ef20c58b9b44e94258b814" -SRC_URI[sha256sum] = "8fc06effaf8a4e4333308eedcdc6840f1c8056f2e924210f151dfc076bcd4045" diff --git a/recipes/apt/apt-native_0.7.19.bb b/recipes/apt/apt-native_0.7.19.bb deleted file mode 100644 index 3331c93d15..0000000000 --- a/recipes/apt/apt-native_0.7.19.bb +++ /dev/null @@ -1,9 +0,0 @@ -require apt-native.inc -PR = "r3" - -SRC_URI += "file://nodoc.patch;patch=1 \ - file://noconfigure.patch;patch=1 \ - file://no-curl.patch;patch=1" - -SRC_URI[md5sum] = "0ef50176aea36cb0cce633a9b62dc7eb" -SRC_URI[sha256sum] = "c928f5eb2baffb50e7ccf02d07a16daf867945c8aa542d500bbbbaff7bbcef42" diff --git a/recipes/apt/apt-native_0.7.2.bb b/recipes/apt/apt-native_0.7.2.bb deleted file mode 100644 index 1d85762c22..0000000000 --- a/recipes/apt/apt-native_0.7.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -require apt-native.inc -PR = "r4" - -SRC_URI += "file://nodoc.patch;patch=1 \ - file://noconfigure.patch;patch=1" - -SRC_URI[md5sum] = "c66f943203fa24e85ed8c48f6ac5ad1e" -SRC_URI[sha256sum] = "e7d58e2b202713b4df8cd5fd58bc20ba8d31c0da6e5e3b3c89a138dbf0b24ad9" diff --git a/recipes/apt/apt-native_0.7.20.2.bb b/recipes/apt/apt-native_0.7.20.2.bb index 955edc8314..fb7a9a5cf0 100644 --- a/recipes/apt/apt-native_0.7.20.2.bb +++ b/recipes/apt/apt-native_0.7.20.2.bb @@ -1,9 +1,10 @@ require apt-native.inc -PR = "r1" +PR = "r2" -SRC_URI += "file://nodoc.patch;patch=1 \ - file://noconfigure.patch;patch=1 \ - file://no-curl.patch;patch=1" +SRC_URI += "file://nodoc.patch \ + file://noconfigure.patch \ + file://no-curl.patch \ + file://fix-gcc-4.4-compile.patch" SRC_URI[md5sum] = "e6ee1b594f6ed5fab5cb593ee46cfc21" SRC_URI[sha256sum] = "4dc935a520c65705795ada5942b658f6e86b22eefc7032342267272bd6566b05" diff --git a/recipes/apt/apt-native_0.7.3.bb b/recipes/apt/apt-native_0.7.3.bb deleted file mode 100644 index 0647707ccf..0000000000 --- a/recipes/apt/apt-native_0.7.3.bb +++ /dev/null @@ -1,8 +0,0 @@ -require apt-native.inc -PR = "r5" - -SRC_URI += "file://nodoc.patch;patch=1 \ - file://noconfigure.patch;patch=1" - -SRC_URI[md5sum] = "e2e6e23f43bfdf135b923205659dfaf1" -SRC_URI[sha256sum] = "d3a71446234e567a24740b02abe5bc6c695836343df6139eb7c03ec11871e710" diff --git a/recipes/apt/apt_0.5.28.6.bb b/recipes/apt/apt_0.5.28.6.bb deleted file mode 100644 index 5e3f7c7c5e..0000000000 --- a/recipes/apt/apt_0.5.28.6.bb +++ /dev/null @@ -1,16 +0,0 @@ -require apt.inc -PR = "r2" - -SRC_URI += "file://autofoo.patch;patch=1" - -inherit autotools gettext - -require apt-package.inc - -apt-manpages += "doc/vendors.list.5 \ - doc/fr/vendors.list.fr.5 \ - doc/es/vendors.list.es.5 \ - doc/de/apt.de.8" - -SRC_URI[md5sum] = "26b37525371cdaaec552237e0667305d" -SRC_URI[sha256sum] = "57de084860870cccf510de62eb8ded252f5951a6e59e34a963d61d69de3aff10" diff --git a/recipes/apt/apt_0.6.25.bb b/recipes/apt/apt_0.6.25.bb deleted file mode 100644 index e75f5588ac..0000000000 --- a/recipes/apt/apt_0.6.25.bb +++ /dev/null @@ -1,14 +0,0 @@ -require apt.inc -PR = "r3" - -SRC_URI += "file://autofoo.patch;patch=1" - -inherit autotools gettext - -require apt-package.inc - -FILES_${PN} += "${bindir}/apt-key" -apt-manpages += "doc/apt-key.8" - -SRC_URI[md5sum] = "6569fd95e829036c141a5ccaf8e5948c" -SRC_URI[sha256sum] = "fa00ce910ab6f0987c4a210962be357d4f013fc89ef72b015f39ae8649522b59" diff --git a/recipes/apt/apt_0.6.46.2.bb b/recipes/apt/apt_0.6.46.2.bb deleted file mode 100644 index 8273c160f2..0000000000 --- a/recipes/apt/apt_0.6.46.2.bb +++ /dev/null @@ -1,14 +0,0 @@ -require apt.inc -PR = "r2" - -SRC_URI += "file://nodoc.patch;patch=1" - -require apt-package.inc - -FILES_${PN} += "${bindir}/apt-key" -apt-manpages += "doc/apt-key.8" - - - -SRC_URI[md5sum] = "67d439a252996357b0313b3ad999739a" -SRC_URI[sha256sum] = "6f1a7340d0de2a9a524055d0ed4289aa919dc29e9e1fe60aae598f2019105686" diff --git a/recipes/apt/apt_0.7.14.bb b/recipes/apt/apt_0.7.14.bb deleted file mode 100644 index 5b121b0df6..0000000000 --- a/recipes/apt/apt_0.7.14.bb +++ /dev/null @@ -1,29 +0,0 @@ -DEPENDS = "curl db" -RDEPENDS = "dpkg" - -require apt.inc - -SRC_URI += "file://no-ko-translation.patch;patch=1 \ - file://use-host.patch;patch=1 " -PR = "r3" - -SRC_URI += "file://nodoc.patch;patch=1" - -require apt-package.inc - -FILES_${PN} += "${bindir}/apt-key" -apt-manpages += "doc/apt-key.8" - -do_stage() { - install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/apt-pkg - eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` - oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${STAGING_LIBDIR}/ - ln -sf libapt-pkg$GLIBC_VER-6.so ${STAGING_LIBDIR}/libapt-pkg.so - oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${STAGING_LIBDIR}/ - ln -sf libapt-inst$GLIBC_VER-6.so ${STAGING_LIBDIR}/libapt-inst.so - - install -m 0644 include/apt-pkg/*.h ${STAGING_INCDIR}/apt-pkg/ -} - -SRC_URI[md5sum] = "19efa18fb1ef20c58b9b44e94258b814" -SRC_URI[sha256sum] = "8fc06effaf8a4e4333308eedcdc6840f1c8056f2e924210f151dfc076bcd4045" diff --git a/recipes/apt/apt_0.7.19.bb b/recipes/apt/apt_0.7.19.bb deleted file mode 100644 index 15f127dbbe..0000000000 --- a/recipes/apt/apt_0.7.19.bb +++ /dev/null @@ -1,30 +0,0 @@ -DEPENDS = "curl db" -RDEPENDS = "dpkg" - -require apt.inc - -SRC_URI += "file://no-ko-translation.patch;patch=1 \ - file://use-host.patch;patch=1 " -PR = "r3" - -SRC_URI += "file://nodoc.patch;patch=1" - -require apt-package.inc - -FILES_${PN} += "${bindir}/apt-key" -apt-manpages += "doc/apt-key.8" - -do_stage() { - install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/apt-pkg - eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` - oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${STAGING_LIBDIR}/ - ln -sf libapt-pkg$GLIBC_VER-6.so ${STAGING_LIBDIR}/libapt-pkg.so - oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${STAGING_LIBDIR}/ - ln -sf libapt-inst$GLIBC_VER-6.so ${STAGING_LIBDIR}/libapt-inst.so - - install -m 0644 include/apt-pkg/*.h ${STAGING_INCDIR}/apt-pkg/ -} - -SRC_URI[md5sum] = "0ef50176aea36cb0cce633a9b62dc7eb" -SRC_URI[sha256sum] = "c928f5eb2baffb50e7ccf02d07a16daf867945c8aa542d500bbbbaff7bbcef42" - diff --git a/recipes/apt/apt_0.7.2.bb b/recipes/apt/apt_0.7.2.bb deleted file mode 100644 index 5db2cb9b86..0000000000 --- a/recipes/apt/apt_0.7.2.bb +++ /dev/null @@ -1,12 +0,0 @@ -require apt.inc -PR = "r3" - -SRC_URI += "file://nodoc.patch;patch=1" - -require apt-package.inc - -FILES_${PN} += "${bindir}/apt-key" -apt-manpages += "doc/apt-key.8" - -SRC_URI[md5sum] = "c66f943203fa24e85ed8c48f6ac5ad1e" -SRC_URI[sha256sum] = "e7d58e2b202713b4df8cd5fd58bc20ba8d31c0da6e5e3b3c89a138dbf0b24ad9" diff --git a/recipes/apt/apt_0.7.20.2.bb b/recipes/apt/apt_0.7.20.2.bb index ee247fabeb..bd0f41ebae 100644 --- a/recipes/apt/apt_0.7.20.2.bb +++ b/recipes/apt/apt_0.7.20.2.bb @@ -1,12 +1,12 @@ DEPENDS = "curl db" -RDEPENDS = "dpkg" +RDEPENDS_${PN} = "dpkg" require apt.inc -SRC_URI += "file://no-doxygen.patch;patch=1 \ - file://no-ko-translation.patch;patch=1 \ - file://use-host.patch;patch=1 " -PR = "r1" +SRC_URI += "file://no-doxygen.patch \ + file://no-ko-translation.patch \ + file://use-host.patch " +PR = "r2" require apt-package.inc diff --git a/recipes/apt/apt_0.7.3.bb b/recipes/apt/apt_0.7.3.bb deleted file mode 100644 index 4e8bbe765b..0000000000 --- a/recipes/apt/apt_0.7.3.bb +++ /dev/null @@ -1,12 +0,0 @@ -require apt.inc -PR = "r3" - -SRC_URI += "file://nodoc.patch;patch=1" - -require apt-package.inc - -FILES_${PN} += "${bindir}/apt-key" -apt-manpages += "doc/apt-key.8" - -SRC_URI[md5sum] = "e2e6e23f43bfdf135b923205659dfaf1" -SRC_URI[sha256sum] = "d3a71446234e567a24740b02abe5bc6c695836343df6139eb7c03ec11871e710" |