1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/dpkg/dpkg.patch Thu Jan 08 23:26:54 2009 +0100
1.3 @@ -0,0 +1,162 @@
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 +
1.10 + dpkg_deb_LDADD = \
1.11 +- ../libcompat/libcompat.a \
1.12 +- $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS)
1.13 ++ $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS) ../libcompat/libcompat.a
1.14 +
1.15 + all: all-am
1.16 +
1.17 +Index: dpkg-split/Makefile.in
1.18 +--- dpkg-split/Makefile.in.orig 2008-03-30 11:58:18 +0200
1.19 ++++ dpkg-split/Makefile.in 2008-04-01 21:57:43 +0200
1.20 +@@ -217,9 +217,8 @@
1.21 + split.c
1.22 +
1.23 + dpkg_split_LDADD = \
1.24 +- ../libcompat/libcompat.a \
1.25 + $(LIBINTL) \
1.26 +- ../lib/libdpkg.a
1.27 ++ ../lib/libdpkg.a ../libcompat/libcompat.a
1.28 +
1.29 + pkglib_SCRIPTS = mksplit
1.30 + EXTRA_DIST = mksplit.pl
1.31 +Index: dselect/Makefile.in
1.32 +--- dselect/Makefile.in.orig 2008-03-30 11:58:18 +0200
1.33 ++++ dselect/Makefile.in 2008-04-01 21:56:55 +0200
1.34 +@@ -249,10 +249,9 @@
1.35 + pkgtop.cc
1.36 +
1.37 + dselect_LDADD = \
1.38 +- ../libcompat/libcompat.a \
1.39 + $(LIBINTL) \
1.40 + $(CURSES_LIBS) \
1.41 +- ../lib/libdpkg.a
1.42 ++ ../lib/libdpkg.a ../libcompat/libcompat.a
1.43 +
1.44 + EXTRA_DIST = keyoverride mkcurkeys.pl
1.45 + CLEANFILES = curkeys.h
1.46 +@@ -640,8 +639,8 @@
1.47 +
1.48 + curkeys.$(OBJEXT): curkeys.h
1.49 + curkeys.h: $(srcdir)/keyoverride $(srcdir)/mkcurkeys.pl
1.50 +- cursesfile=`echo '#include <ncursesw/curses.h>' | \
1.51 +- $(CC) -E - | grep 'curses.h' | head -n 1 | \
1.52 ++ cursesfile=`echo '#include <ncurses/curses.h>' | \
1.53 ++ $(CC) $(CPPFLAGS) -E - | grep 'curses.h' | head -n 1 | \
1.54 + sed -e 's/^[^"]*"//; s/".*$$//'`; \
1.55 + if [ "$$cursesfile" = "" ]; then \
1.56 + echo "can't find curses file"; exit 1; \
1.57 +Index: dselect/dselect.h
1.58 +--- dselect/dselect.h.orig 2008-03-30 11:57:41 +0200
1.59 ++++ dselect/dselect.h 2008-04-01 21:56:55 +0200
1.60 +@@ -28,7 +28,7 @@
1.61 +
1.62 + #include <signal.h>
1.63 + #undef ERR
1.64 +-#include <ncursesw/curses.h>
1.65 ++#include <ncurses/curses.h>
1.66 +
1.67 + struct helpmenuentry {
1.68 + char key;
1.69 +Index: dselect/main.cc
1.70 +--- dselect/main.cc.orig 2008-03-30 11:57:41 +0200
1.71 ++++ dselect/main.cc 2008-04-01 21:56:55 +0200
1.72 +@@ -37,7 +37,7 @@
1.73 + #include <ctype.h>
1.74 + #include <assert.h>
1.75 +
1.76 +-#include <ncursesw/term.h>
1.77 ++#include <ncurses/term.h>
1.78 +
1.79 + extern "C" {
1.80 + #include <dpkg.h>
1.81 +Index: lib/tarfn.c
1.82 +--- lib/tarfn.c.orig 2008-03-30 10:58:51 +0200
1.83 ++++ lib/tarfn.c 2008-04-01 21:56:55 +0200
1.84 +@@ -62,7 +62,9 @@
1.85 + int len;
1.86 + char * str;
1.87 +
1.88 +- len = strnlen(s, size);
1.89 ++ len = strlen(s);
1.90 ++ if (len > size)
1.91 ++ len = size;
1.92 + str = m_malloc(len + 1);
1.93 + memcpy(str, s, len);
1.94 + str[len] = 0;
1.95 +Index: man/Makefile.in
1.96 +--- man/Makefile.in.orig 2008-03-30 11:58:18 +0200
1.97 ++++ man/Makefile.in 2008-04-01 21:56:55 +0200
1.98 +@@ -189,7 +189,7 @@
1.99 + top_srcdir = @top_srcdir@
1.100 +
1.101 + # Extract the list of languages from the po4a config file.
1.102 +-LINGUAS = $(shell sed -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p' $(srcdir)/po/po4a.cfg)
1.103 ++LINGUAS =
1.104 + dist_man_MANS = \
1.105 + 822-date.1 \
1.106 + cleanup-info.8 \
1.107 +@@ -540,7 +540,7 @@
1.108 + all-local: all-local-@USE_NLS@
1.109 +
1.110 + all-local-no:
1.111 +-all-local-yes: man.stamp
1.112 ++all-local-yes:
1.113 +
1.114 + # FIXME: Use a stamp file until po4a supports them internally.
1.115 + man.stamp:
1.116 +Index: scripts/Makefile.in
1.117 +--- scripts/Makefile.in.orig 2008-03-30 11:58:19 +0200
1.118 ++++ scripts/Makefile.in 2008-04-01 21:56:55 +0200
1.119 +@@ -757,8 +757,8 @@
1.120 + $(INSTALL_SCRIPT) install-info $(DESTDIR)$(sbindir)
1.121 +
1.122 + install-data-local:
1.123 +- $(mkdir_p) $(DESTDIR)$(sysconfdir)/alternatives
1.124 +- $(INSTALL_DATA) $(srcdir)/README.alternatives $(DESTDIR)$(sysconfdir)/alternatives/README
1.125 ++ $(mkdir_p) $(DESTDIR)$(sysconfdir)/dpkg/alternatives
1.126 ++ $(INSTALL_DATA) $(srcdir)/README.alternatives $(DESTDIR)$(sysconfdir)/dpkg/alternatives/README
1.127 +
1.128 + # Ideally we'd use 'sed -i', but unfortunately that's not portable.
1.129 + install-data-hook:
1.130 +Index: src/Makefile.in
1.131 +--- src/Makefile.in.orig 2008-03-30 11:58:19 +0200
1.132 ++++ src/Makefile.in 2008-04-01 21:56:55 +0200
1.133 +@@ -239,8 +239,8 @@
1.134 + update.c
1.135 +
1.136 + dpkg_LDADD = \
1.137 +- ../libcompat/libcompat.a \
1.138 +- $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS)
1.139 ++ \
1.140 ++ $(LIBINTL) ../lib/libdpkg.a $(ZLIB_LIBS) $(BZ2_LIBS) $(SELINUX_LIBS) ../libcompat/libcompat.a
1.141 +
1.142 + dpkg_query_SOURCES = \
1.143 + errors.c \
1.144 +@@ -248,17 +248,17 @@
1.145 + query.c
1.146 +
1.147 + dpkg_query_LDADD = \
1.148 +- ../libcompat/libcompat.a \
1.149 ++ \
1.150 + $(LIBINTL) \
1.151 +- ../lib/libdpkg.a
1.152 ++ ../lib/libdpkg.a ../libcompat/libcompat.a
1.153 +
1.154 + dpkg_trigger_SOURCES = \
1.155 + trigcmd.c
1.156 +
1.157 + dpkg_trigger_LDADD = \
1.158 +- ../libcompat/libcompat.a \
1.159 ++ \
1.160 + $(LIBINTL) \
1.161 +- ../lib/libdpkg.a
1.162 ++ ../lib/libdpkg.a ../libcompat/libcompat.a
1.163 +
1.164 + all: all-am
1.165 +
