summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/dpkg/dpkg
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/dpkg/dpkg')
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/autofoo.patch48
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch26
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/nochroot.patch18
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/noman.patch16
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/noupdalt.patch16
5 files changed, 124 insertions, 0 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg/autofoo.patch b/meta/recipes-devtools/dpkg/dpkg/autofoo.patch
new file mode 100644
index 0000000000..691121e418
--- /dev/null
+++ b/meta/recipes-devtools/dpkg/dpkg/autofoo.patch
@@ -0,0 +1,48 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6--- dpkg-1.10.23/configure.in~autofoo
7+++ dpkg-1.10.23/configure.in
8@@ -227,21 +227,36 @@
9 # OpenBSD passes AC_TRY_COMPILE for va_copy even though
10 # it doesn't seem to exist, which is odd. We need to use
11 # AC_TRY_RUN.
12+#
13+# If crosscompiling, use AC_TRY_COMPILE. -CL
14 AC_TRY_RUN([
15 #include <stdarg.h>
16 main(){
17 va_list v1,v2;
18 va_copy(v1, v2);
19 exit(0);}
20-], [AC_MSG_RESULT(yes)
21-AC_DEFINE(HAVE_VA_COPY,,[Whether the va_copy macro exists])],[AC_MSG_RESULT(no)
22-AC_MSG_CHECKING([for va_list assignment copy])
23+], [dpkg_cv_va_copy=yes], [dpkg_cv_va_copy=no],
24 AC_TRY_COMPILE([
25 #include <stdarg.h>
26+main(){
27+va_list v1,v2;
28+va_copy(v1, v2);
29+exit(0);}
30+], [dpkg_cv_va_copy=yes], [dpkg_vc_va_copy=no]))
31+
32+if test "$dpkg_cv_va_copy" = "yes"; then
33+ AC_MSG_RESULT(yes)
34+ AC_DEFINE(HAVE_VA_COPY,,[Whether the va_copy macro exists])
35+else
36+ AC_MSG_RESULT(no)
37+ AC_MSG_CHECKING([for va_list assignment copy])
38+ AC_TRY_COMPILE([
39+#include <stdarg.h>
40 ],[
41 va_list v1,v2;
42 v1 = v2;
43-], AC_MSG_RESULT(yes),AC_MSG_ERROR(no))])
44+], AC_MSG_RESULT(yes), AC_MSG_ERROR(no))
45+fi
46
47 DPKG_C_GCC_ATTRIBUTE([,,],supported,[int x],[,,],ATTRIB,[Define if function attributes a la GCC 2.5 and higher are available.],
48 DPKG_C_GCC_ATTRIBUTE(noreturn,noreturn,[int x],noreturn,NORETURN,[Define if nonreturning functions a la GCC 2.5 and higher are available.])
diff --git a/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch b/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch
new file mode 100644
index 0000000000..d09343c6e5
--- /dev/null
+++ b/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch
@@ -0,0 +1,26 @@
1 dpkg-deb/build.c | 4 ++--
2 1 file changed, 2 insertions(+), 2 deletions(-)
3
4--- dpkg-1.14.19.orig/dpkg-deb/build.c
5+++ dpkg-1.14.19/dpkg-deb/build.c
6@@ -241,18 +241,18 @@ void do_build(const char *const *argv) {
7 if (checkedinfo->priority == pri_other) {
8 fprintf(stderr, _("warning, `%s' contains user-defined Priority value `%s'\n"),
9 controlfile, checkedinfo->otherpriority);
10 warns++;
11 }
12- for (field= checkedinfo->available.arbs; field; field= field->next) {
13+ /*for (field= checkedinfo->available.arbs; field; field= field->next) {
14 if (known_arbitrary_field(field))
15 continue;
16
17 fprintf(stderr, _("warning, `%s' contains user-defined field `%s'\n"),
18 controlfile, field->name);
19 warns++;
20- }
21+ }*/
22 checkversion(checkedinfo->available.version.version,"(upstream) version",&errs);
23 checkversion(checkedinfo->available.version.revision,"Debian revision",&errs);
24 if (errs) ohshit(_("%d errors in control file"),errs);
25
26 if (subdir) {
diff --git a/meta/recipes-devtools/dpkg/dpkg/nochroot.patch b/meta/recipes-devtools/dpkg/dpkg/nochroot.patch
new file mode 100644
index 0000000000..3a8beaebbf
--- /dev/null
+++ b/meta/recipes-devtools/dpkg/dpkg/nochroot.patch
@@ -0,0 +1,18 @@
1---
2 src/help.c | 2 ++
3 1 file changed, 2 insertions(+)
4
5--- dpkg-1.13.22.orig/src/help.c
6+++ dpkg-1.13.22/src/help.c
7@@ -175,9 +175,11 @@ static const char* preexecscript(const c
8 */
9 size_t instdirl;
10
11+#if 0
12 if (*instdir) {
13 if (chroot(instdir)) ohshite(_("failed to chroot to `%.250s'"),instdir);
14 }
15+#endif
16 if (f_debug & dbg_scripts) {
17 fprintf(stderr,"D0%05o: fork/exec %s (",dbg_scripts,path);
18 while (*++argv) fprintf(stderr," %s",*argv);
diff --git a/meta/recipes-devtools/dpkg/dpkg/noman.patch b/meta/recipes-devtools/dpkg/dpkg/noman.patch
new file mode 100644
index 0000000000..f5984fe14a
--- /dev/null
+++ b/meta/recipes-devtools/dpkg/dpkg/noman.patch
@@ -0,0 +1,16 @@
1---
2 Makefile.am | 3 +--
3 1 file changed, 1 insertion(+), 2 deletions(-)
4
5--- dpkg-1.13.22.orig/Makefile.am
6+++ dpkg-1.13.22/Makefile.am
7@@ -15,8 +15,7 @@ SUBDIRS = \
8 utils \
9 scripts \
10 po \
11- origins \
12- man
13+ origins
14
15 ACLOCAL_AMFLAGS = -I m4
16
diff --git a/meta/recipes-devtools/dpkg/dpkg/noupdalt.patch b/meta/recipes-devtools/dpkg/dpkg/noupdalt.patch
new file mode 100644
index 0000000000..023e99ae8d
--- /dev/null
+++ b/meta/recipes-devtools/dpkg/dpkg/noupdalt.patch
@@ -0,0 +1,16 @@
1---
2 scripts/Makefile.am | 3 +--
3 1 file changed, 1 insertion(+), 2 deletions(-)
4
5--- dpkg-1.13.22.orig/scripts/Makefile.am
6+++ dpkg-1.13.22/scripts/Makefile.am
7@@ -20,8 +20,7 @@ bin_SCRIPTS = \
8 sbin_SCRIPTS = \
9 cleanup-info \
10 dpkg-divert \
11- dpkg-statoverride \
12- update-alternatives
13+ dpkg-statoverride
14
15 changelogdir = $(pkglibdir)/parsechangelog
16 changelog_SCRIPTS = \