Package: eresi
Version: 1:0.8a25-3.1
Followup-For: Bug #646172
User: [email protected]
Usertags: origin-ubuntu precise ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following:
* Update 01_build_fixes.dpatch not to link against termcap. Fixes
FTBFS. (Closes: #646172)
Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers oneiric-updates
APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500,
'oneiric-proposed'), (500, 'oneiric')
Architecture: amd64 (x86_64)
Kernel: Linux 3.0.0-12-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u eresi-0.8a25/debian/patches/01_build_fixes.dpatch eresi-0.8a25/debian/patches/01_build_fixes.dpatch
--- eresi-0.8a25/debian/patches/01_build_fixes.dpatch
+++ eresi-0.8a25/debian/patches/01_build_fixes.dpatch
@@ -3,8 +3,21 @@
## All lines beginning with `## DP:' are a description of the patch.
@DPATCH@
---- eresi-0.8a25.orig/configure
-+++ eresi-0.8a25/configure
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' eresi-0.8a25~/configure eresi-0.8a25/configure
+--- eresi-0.8a25~/configure 2011-10-28 19:30:45.000000000 -0400
++++ eresi-0.8a25/configure 2011-10-28 19:34:23.000000000 -0400
+@@ -146,9 +146,9 @@
+ READLN="1"
+ if [ "${OSNAME}" != OpenBSD ] ; then
+ echo "READLNOPT = -DUSE_READLN" >> $CONFIGFILE
+-echo "LDREADLNOPT = -L/opt/sfw/lib/ -lreadline -ltermcap" >> $CONFIGFILE
++echo "LDREADLNOPT = -L/opt/sfw/lib/ -lreadline" >> $CONFIGFILE
+ else
+-echo "LDREADLNOPT = -lreadline -ltermcap" >> $CONFIGFILE
++echo "LDREADLNOPT = -lreadline" >> $CONFIGFILE
+ fi
+ echo "LDUIOPT32 = -L../libui -lui32" >> $CONFIGFILE
+ echo "LDUIOPT64 = -L../libui -lui64" >> $CONFIGFILE
@@ -608,6 +608,11 @@
echo " @cd libstderesi && \$(MAKE) \$(BUILD_TARGET) " >> Makefile
echo " @echo 'Libstderesi has been built successfully.'" >> Makefile
@@ -17,8 +30,30 @@
echo " @echo 'Building libe2dbg...' " >> Makefile
echo " @cd libe2dbg && \$(MAKE) \$(BUILD_TARGET) " >> Makefile
echo " @echo 'Libe2dbg has been built successfully.'" >> Makefile
---- eresi-0.8a25.orig/libe2dbg/common/Makefile
-+++ eresi-0.8a25/libe2dbg/common/Makefile
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' eresi-0.8a25~/libdump/Makefile eresi-0.8a25/libdump/Makefile
+--- eresi-0.8a25~/libdump/Makefile 2008-04-06 19:15:44.000000000 -0400
++++ eresi-0.8a25/libdump/Makefile 2011-10-28 19:34:47.000000000 -0400
+@@ -11,7 +11,7 @@
+ OBJ = dump.o recv.o send.o
+ CFLAGS = -Wall $(BITS) -g3 -Iinclude -I../libc/include/ -I../libelfsh/include/ \
+ -I../libaspect/include/ -I../elibc/include -DELFSH_INTERN -fPIC
+-LDFLAGS = -L./ -L../libelfsh/ -lelfsh -ldump -L/usr/pkg/lib/ -ltermcap \
++LDFLAGS = -L./ -L../libelfsh/ -lelfsh -ldump -L/usr/pkg/lib/ \
+ -lreadline -laspect $(BITS) $(EXTRAOPT)
+ CC ?= gcc
+ LD ?= ld
+@@ -27,7 +27,7 @@
+ # $(CC) $(CFLAGS) $(LDFLAGS) dump_main.o -o dump_main
+ gcc -Wall -DERESI32 -g3 -Iinclude -I../libhash/include/ \
+ -DELFSH_INTERN -L./ -L../libelfsh/ -llibelfsh -L/usr/pkg/lib/ \
+- -ltermcap -lreadline -DERESI32 ../libhash/hash.o dump.o recv.o\
++ -lreadline -DERESI32 ../libhash/hash.o dump.o recv.o\
+ send.o dump_main.c -o dump_main
+
+ clean :
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' eresi-0.8a25~/libe2dbg/common/Makefile eresi-0.8a25/libe2dbg/common/Makefile
+--- eresi-0.8a25~/libe2dbg/common/Makefile 2008-04-06 19:16:29.000000000 -0400
++++ eresi-0.8a25/libe2dbg/common/Makefile 2011-10-28 19:30:45.000000000 -0400
@@ -14,7 +14,7 @@
CC ?= gcc
RM = rm -f
@@ -37,8 +72,9 @@
-I../../libelfsh/include/ -I../../libdump/include/ \
-I../../libasm/include/ -I../../libstderesi/include/ \
-I../../libui/include/ -I../../libmjollnir/include/ \
---- eresi-0.8a25.orig/librevm/Makefile
-+++ eresi-0.8a25/librevm/Makefile
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' eresi-0.8a25~/librevm/Makefile eresi-0.8a25/librevm/Makefile
+--- eresi-0.8a25~/librevm/Makefile 2011-10-28 19:30:45.000000000 -0400
++++ eresi-0.8a25/librevm/Makefile 2011-10-28 19:30:45.000000000 -0400
@@ -48,6 +48,7 @@
$(NAME32).so :
