1.1 --- a/dpkg/dpkg.patch Tue Aug 28 22:15:58 2012 +0200
1.2 +++ b/dpkg/dpkg.patch Tue Aug 28 19:00:20 2012 +0200
1.3 @@ -1,108 +1,37 @@
1.4 -Index: dpkg-deb/Makefile.in
1.5 ---- dpkg-deb/Makefile.in.orig 2008-03-30 11:58:18 +0200
1.6 -+++ dpkg-deb/Makefile.in 2008-04-01 21:56:55 +0200
1.7 -@@ -213,8 +213,7 @@
1.8 - main.c
1.9 +Index: configure
1.10 +--- configure.orig 2012-03-19 08:58:04.000000000 +0100
1.11 ++++ configure 2012-03-20 08:27:36.000000000 +0100
1.12 +@@ -10918,7 +10918,7 @@
1.13 + WFLAGS="-Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers \
1.14 + -Wmissing-declarations -Wmissing-format-attribute \
1.15 + -Wformat-security -Wpointer-arith \
1.16 +- -Wvla -Winit-self -Wwrite-strings -Wcast-align -Wshadow"
1.17 ++ -Winit-self -Wwrite-strings -Wcast-align -Wshadow"
1.18 + WCFLAGS="-Wdeclaration-after-statement -Wnested-externs -Wbad-function-cast \
1.19 + -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition"
1.20 + # Temporarily here until #542031 gets fixed in ncurses
1.21 +Index: lib/dpkg/dpkg-db.h
1.22 +--- lib/dpkg/dpkg-db.h.orig 2012-03-19 08:56:40.000000000 +0100
1.23 ++++ lib/dpkg/dpkg-db.h 2012-03-20 08:27:36.000000000 +0100
1.24 +@@ -27,6 +27,7 @@
1.25
1.26 - dpkg_deb_LDADD = \
1.27 -- ../libcompat/libcompat.a \
1.28 -- $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS)
1.29 -+ $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS) ../libcompat/libcompat.a
1.30 + #include <stdbool.h>
1.31 + #include <stdio.h>
1.32 ++#include <stdarg.h>
1.33
1.34 - all: all-am
1.35 + #include <dpkg/macros.h>
1.36 + #include <dpkg/varbuf.h>
1.37 +Index: man/Makefile.in
1.38 +--- man/Makefile.in.orig 2012-03-19 08:58:07.000000000 +0100
1.39 ++++ man/Makefile.in 2012-03-20 08:27:36.000000000 +0100
1.40 +@@ -636,12 +636,12 @@
1.41
1.42 -Index: dpkg-split/Makefile.in
1.43 ---- dpkg-split/Makefile.in.orig 2008-03-30 11:58:18 +0200
1.44 -+++ dpkg-split/Makefile.in 2008-04-01 21:57:43 +0200
1.45 -@@ -217,9 +217,8 @@
1.46 - split.c
1.47
1.48 - dpkg_split_LDADD = \
1.49 -- ../libcompat/libcompat.a \
1.50 - $(LIBINTL) \
1.51 -- ../lib/libdpkg.a
1.52 -+ ../lib/libdpkg.a ../libcompat/libcompat.a
1.53 + # If the user has not defined it let's use the default.
1.54 +-LINGUAS ?= $(LINGUAS_DIST)
1.55 ++LINGUAS =
1.56
1.57 - pkglib_SCRIPTS = mksplit
1.58 - EXTRA_DIST = mksplit.pl
1.59 -Index: dselect/Makefile.in
1.60 ---- dselect/Makefile.in.orig 2008-03-30 11:58:18 +0200
1.61 -+++ dselect/Makefile.in 2008-04-01 21:56:55 +0200
1.62 -@@ -249,10 +249,9 @@
1.63 - pkgtop.cc
1.64 -
1.65 - dselect_LDADD = \
1.66 -- ../libcompat/libcompat.a \
1.67 - $(LIBINTL) \
1.68 - $(CURSES_LIBS) \
1.69 -- ../lib/libdpkg.a
1.70 -+ ../lib/libdpkg.a ../libcompat/libcompat.a
1.71 -
1.72 - EXTRA_DIST = keyoverride mkcurkeys.pl
1.73 - CLEANFILES = curkeys.h
1.74 -@@ -640,8 +639,8 @@
1.75 -
1.76 - curkeys.$(OBJEXT): curkeys.h
1.77 - curkeys.h: $(srcdir)/keyoverride $(srcdir)/mkcurkeys.pl
1.78 -- cursesfile=`echo '#include <ncursesw/curses.h>' | \
1.79 -- $(CC) -E - | grep 'curses.h' | head -n 1 | \
1.80 -+ cursesfile=`echo '#include <ncurses/curses.h>' | \
1.81 -+ $(CC) $(CPPFLAGS) -E - | grep 'curses.h' | head -n 1 | \
1.82 - sed -e 's/^[^"]*"//; s/".*$$//'`; \
1.83 - if [ "$$cursesfile" = "" ]; then \
1.84 - echo "can't find curses file"; exit 1; \
1.85 -Index: dselect/dselect.h
1.86 ---- dselect/dselect.h.orig 2008-03-30 11:57:41 +0200
1.87 -+++ dselect/dselect.h 2008-04-01 21:56:55 +0200
1.88 -@@ -28,7 +28,7 @@
1.89 -
1.90 - #include <signal.h>
1.91 - #undef ERR
1.92 --#include <ncursesw/curses.h>
1.93 -+#include <ncurses/curses.h>
1.94 -
1.95 - struct helpmenuentry {
1.96 - char key;
1.97 -Index: dselect/main.cc
1.98 ---- dselect/main.cc.orig 2008-03-30 11:57:41 +0200
1.99 -+++ dselect/main.cc 2008-04-01 21:56:55 +0200
1.100 -@@ -37,7 +37,7 @@
1.101 - #include <ctype.h>
1.102 - #include <assert.h>
1.103 -
1.104 --#include <ncursesw/term.h>
1.105 -+#include <ncurses/term.h>
1.106 -
1.107 - extern "C" {
1.108 - #include <dpkg.h>
1.109 -Index: lib/tarfn.c
1.110 ---- lib/tarfn.c.orig 2008-03-30 10:58:51 +0200
1.111 -+++ lib/tarfn.c 2008-04-01 21:56:55 +0200
1.112 -@@ -62,7 +62,9 @@
1.113 - int len;
1.114 - char * str;
1.115 -
1.116 -- len = strnlen(s, size);
1.117 -+ len = strlen(s);
1.118 -+ if (len > size)
1.119 -+ len = size;
1.120 - str = m_malloc(len + 1);
1.121 - memcpy(str, s, len);
1.122 - str[len] = 0;
1.123 -Index: man/Makefile.in
1.124 ---- man/Makefile.in.orig 2008-03-30 11:58:18 +0200
1.125 -+++ man/Makefile.in 2008-04-01 21:56:55 +0200
1.126 -@@ -189,7 +189,7 @@
1.127 - top_srcdir = @top_srcdir@
1.128 -
1.129 - # Extract the list of languages from the po4a config file.
1.130 --LINGUAS = $(shell sed -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p' $(srcdir)/po/po4a.cfg)
1.131 -+LINGUAS =
1.132 - dist_man_MANS = \
1.133 - 822-date.1 \
1.134 - cleanup-info.8 \
1.135 -@@ -540,7 +540,7 @@
1.136 - all-local: all-local-@USE_NLS@
1.137 + all-local: all-local-@USE_PO4A@
1.138
1.139 all-local-no:
1.140 -all-local-yes: man.stamp
1.141 @@ -110,53 +39,3 @@
1.142
1.143 # FIXME: Use a stamp file until po4a supports them internally.
1.144 man.stamp:
1.145 -Index: scripts/Makefile.in
1.146 ---- scripts/Makefile.in.orig 2008-03-30 11:58:19 +0200
1.147 -+++ scripts/Makefile.in 2008-04-01 21:56:55 +0200
1.148 -@@ -757,8 +757,8 @@
1.149 - $(INSTALL_SCRIPT) install-info $(DESTDIR)$(sbindir)
1.150 -
1.151 - install-data-local:
1.152 -- $(mkdir_p) $(DESTDIR)$(sysconfdir)/alternatives
1.153 -- $(INSTALL_DATA) $(srcdir)/README.alternatives $(DESTDIR)$(sysconfdir)/alternatives/README
1.154 -+ $(mkdir_p) $(DESTDIR)$(sysconfdir)/dpkg/alternatives
1.155 -+ $(INSTALL_DATA) $(srcdir)/README.alternatives $(DESTDIR)$(sysconfdir)/dpkg/alternatives/README
1.156 -
1.157 - # Ideally we'd use 'sed -i', but unfortunately that's not portable.
1.158 - install-data-hook:
1.159 -Index: src/Makefile.in
1.160 ---- src/Makefile.in.orig 2008-03-30 11:58:19 +0200
1.161 -+++ src/Makefile.in 2008-04-01 21:56:55 +0200
1.162 -@@ -239,8 +239,8 @@
1.163 - update.c
1.164 -
1.165 - dpkg_LDADD = \
1.166 -- ../libcompat/libcompat.a \
1.167 -- $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS)
1.168 -+ \
1.169 -+ $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS) ../libcompat/libcompat.a
1.170 -
1.171 - dpkg_query_SOURCES = \
1.172 - errors.c \
1.173 -@@ -248,17 +248,17 @@
1.174 - query.c
1.175 -
1.176 - dpkg_query_LDADD = \
1.177 -- ../libcompat/libcompat.a \
1.178 -+ \
1.179 - $(LIBINTL) \
1.180 -- ../lib/libdpkg.a
1.181 -+ ../lib/libdpkg.a ../libcompat/libcompat.a
1.182 -
1.183 - dpkg_trigger_SOURCES = \
1.184 - trigcmd.c
1.185 -
1.186 - dpkg_trigger_LDADD = \
1.187 -- ../libcompat/libcompat.a \
1.188 -+ \
1.189 - $(LIBINTL) \
1.190 -- ../lib/libdpkg.a
1.191 -+ ../lib/libdpkg.a ../libcompat/libcompat.a
1.192 -
1.193 - all: all-am
1.194 -
