Update to 0.51b2.

Submitted by:	maintainer

11 files changed, 122 insertions, 35 deletions

diff --git a/devel/elfsh/Makefile b/devel/elfsh/Makefile
index e001768de454..9b7e9934dc86 100644
--- a/devel/elfsh/Makefile
+++ b/devel/elfsh/Makefile
@@ -1,20 +1,22 @@
-# New ports collection makefile for:	elfsh
-# Date created:				May 02 2003
-# Whom:					Samy Al Bahra <samy@kerneled.com>
+# New ports collection makefile for: elfsh
+# Date created:		May 02 2003
+# Whom:			Samy Al Bahra <samy@kerneled.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	elfsh
-PORTVERSION=	0.43
+PORTVERSION=	0.51b2
 CATEGORIES=	devel
-MASTER_SITES=	http://www.kerneled.com/projects/elfsh/
-DISTNAME=	elfsh_0.43
+MASTER_SITES=	http://elfsh.segfault.net/files/	\
+		http://www.kerneled.com/projects/elfsh/
+DISTNAME=	elfsh-0.51b2-portable
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	samy@kerneled.com
 COMMENT=	An attractive toolkit for the analyzation of ELF object files
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/devel/elfsh/distinfo b/devel/elfsh/distinfo
index 88600c106e80..4df7a546c26e 100644
--- a/devel/elfsh/distinfo
+++ b/devel/elfsh/distinfo
@@ -1 +1 @@
-MD5 (elfsh_0.43.tgz) = 66b86581b3c9b76c932623caf53bcedc
+MD5 (elfsh-0.51b2-portable.tgz) = 091a9a89f69f861024a75d314b6d616f
diff --git a/devel/elfsh/files/patch-Makefile b/devel/elfsh/files/patch-Makefile
new file mode 100644
index 000000000000..1ae8ffd23bc2
--- /dev/null
+++ b/devel/elfsh/files/patch-Makefile
@@ -0,0 +1,17 @@
+--- Makefile	Wed Aug 13 16:31:55 2003
++++ Makefile.patch	Sat Aug 16 02:11:52 2003
+@@ -7,10 +7,10 @@
+ 
+ RM	= rm -f
+ ETAGS   = etags
+-MODPATH = /usr/share/elfsh/
+-BINPATH = /usr/bin
+-LIBPATH = /usr/lib/
+-INCPATH = /usr/include/
++MODPATH = $(PREFIX)/share/elfsh/
++BINPATH = $(PREFIX)/bin
++LIBPATH = $(PREFIX)/lib/
++INCPATH = $(PREFIX)/include/
+ 
+ all	:
+ 	@echo 'Builting libelfsh...'
diff --git a/devel/elfsh/files/patch-elfsh::Makefile b/devel/elfsh/files/patch-elfsh::Makefile
deleted file mode 100644
index 6ec586d4501c..000000000000
--- a/devel/elfsh/files/patch-elfsh::Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- elfsh/Makefile.orig	Mon Jun 23 17:33:38 2003
-+++ elfsh/Makefile	Mon Jun 23 17:35:00 2003
-@@ -12,7 +12,7 @@
- CC			= gcc
- NAME			= elfsh
- LDFLAGS			= -L../libelfsh/ -lelfsh
--CFLAGS			= -Wall -Iinclude -I../libelfsh/include -g3 -O2
-+CFLAGS			+= -Wall -Iinclude -I../libelfsh/include
- RM			= rm -f 
- NAME			= elfsh
- 
diff --git a/devel/elfsh/files/patch-libelfsh::Makefile b/devel/elfsh/files/patch-libelfsh::Makefile
index 87cccf531c1d..4b85e869bd57 100644
--- a/devel/elfsh/files/patch-libelfsh::Makefile
+++ b/devel/elfsh/files/patch-libelfsh::Makefile
@@ -1,11 +1,11 @@
---- libelfsh/Makefile.orig	Mon Jun 23 17:36:25 2003
-+++ libelfsh/Makefile	Mon Jun 23 17:37:33 2003
+--- libelfsh/Makefile	Wed Aug 13 16:31:55 2003
++++ libelfsh/Makefile.patch	Sat Aug 16 01:48:30 2003
 @@ -8,7 +8,7 @@
  CC			= gcc
  RM			= rm -f 
  AR			= ar rc
--CFLAGS			= -Iinclude -Wall -g3 -O2
-+CFLAGS			+= -Iinclude -Wall -fpic
+-CFLAGS			= -rdynamic -Iinclude -Wall -fPIC -g3 -O2 -DELFSH_INTERN
++CFLAGS			+= -rdynamic -Iinclude -Wall -fPIC -g3 -DELFSH_INTERN
  SRC			= dynamic.c dynsym.c elf.c fixup.c got.c hash.c \
-                           interp.c pht.c plt.c section.c sht.c error.c \
- 			  stab.c symbol.c notes.c reloc.c functions.c \
+                         interp.c pht.c plt.c section.c sht.c error.c stab.c \
+ 			symbol.c notes.c reloc.c blocks.c ctors.c dtors.c \
diff --git a/devel/elfsh/files/patch-libhash::Makefile b/devel/elfsh/files/patch-libhash::Makefile
new file mode 100644
index 000000000000..daea1d2e8202
--- /dev/null
+++ b/devel/elfsh/files/patch-libhash::Makefile
@@ -0,0 +1,11 @@
+--- libhash/Makefile	Wed Aug 13 16:31:55 2003
++++ libhash/Makefile.patch	Sat Aug 16 01:52:22 2003
+@@ -7,7 +7,7 @@
+ 
+ SRC	= hash.c
+ OBJ	= hash.o
+-CFLAGS	= -Wall -g3 -Iinclude -I../libelfsh/include/ -I../elfsh/include/ -DELFSH_INTERN
++CFLAGS	+= -Wall -g3 -Iinclude -I../libelfsh/include/ -I../elfsh/include/ -DELFSH_INTERN
+ CC	= gcc
+ AR	= ar rc
+ RANLIB	= ranlib
diff --git a/devel/elfsh/files/patch-modules-modflow::Makefile b/devel/elfsh/files/patch-modules-modflow::Makefile
new file mode 100644
index 000000000000..8b14dbff1b4a
--- /dev/null
+++ b/devel/elfsh/files/patch-modules-modflow::Makefile
@@ -0,0 +1,11 @@
+--- modules/modflow/Makefile	Sat Aug 16 01:52:00 2003
++++ modules/modflow/Makefile.patch	Sat Aug 16 01:51:51 2003
+@@ -17,7 +17,7 @@
+ 
+ NAME = modflow.so
+ 
+-CFLAGS = -Wall -Werror -ggdb -I../../vm/include \
++CFLAGS += -Wall -Werror -ggdb -I../../vm/include \
+ 	-I../../libelfsh/include -I../../libhash/include \
+ 	-fPIC -rdynamic -DELFSH_INTERN
+ 
diff --git a/devel/elfsh/files/patch-modules::Makefile b/devel/elfsh/files/patch-modules::Makefile
new file mode 100644
index 000000000000..d253ddee0bcf
--- /dev/null
+++ b/devel/elfsh/files/patch-modules::Makefile
@@ -0,0 +1,13 @@
+--- modules/Makefile	Wed Aug 13 16:31:56 2003
++++ modules/Makefile.patch	Sat Aug 16 01:51:05 2003
+@@ -18,8 +18,8 @@
+ OBJ3	= $(SRC3:.c=.o)
+ NAM3	= modremap.so
+ 
+-CFLAGS	= -I../vm/include/ -I../libhash/include/ -I../libelfsh/include/ \
+-	-Wall -g3 -O2 -fPIC -rdynamic -DELFSH_INTERN
++CFLAGS	+= -I../vm/include/ -I../libhash/include/ -I../libelfsh/include/ \
++	-Wall -g3 -fPIC -rdynamic -DELFSH_INTERN
+ CC	= gcc
+ 
+ all	: test remap #flow
diff --git a/devel/elfsh/files/patch-vm::Makefile b/devel/elfsh/files/patch-vm::Makefile
new file mode 100644
index 000000000000..9ba55340f34d
--- /dev/null
+++ b/devel/elfsh/files/patch-vm::Makefile
@@ -0,0 +1,31 @@
+--- vm/Makefile	Fri Aug 15 17:58:34 2003
++++ vm/Makefile.patch	Sat Aug 16 02:26:48 2003
+@@ -19,9 +19,6 @@
+ RM			= rm -f
+ NAME			= elfsh
+ 
+-DLOPT_freebsd4.4	=
+-DLOPT_linux-gnu		= -ldl
+-DLOPT_solaris		= -ldl
+ #EXTRAOPT		= -lefence
+ 
+ # Uncomment that to use libasm
+@@ -29,14 +26,14 @@
+ #LDASMOPT		= -lasm
+ 
+ # Uncommant that to use libreadline
+-#READLNOPT		= -DUSE_READLN
+-#LDREADLNOPT		= -lreadline -ltermcap
++READLNOPT		= -DUSE_READLN
++LDREADLNOPT		= -lreadline -ltermcap
+ 
+-CFLAGS			= -rdynamic -fPIC -g3 -O2 -Wall -Iinclude \
++CFLAGS			+= -rdynamic -fPIC -g3 -Wall -Iinclude \
+ 			-I../libhash/include/ -I../libelfsh/include/ \
+ 			-DELFSH_INTERN $(ASMOPT) $(READLNOPT)
+ LDFLAGS			= -L../libelfsh/ -lelfsh -L../libhash/ -lhashelfsh \
+-			-rdynamic -g3 -ldl $(LDASMOPT) $(LDREADLNOPT) \
++			-rdynamic -g3 $(LDASMOPT) $(LDREADLNOPT) \
+ 			$(EXTRAOPT)
+ 
+ 
diff --git a/devel/elfsh/pkg-descr b/devel/elfsh/pkg-descr
index 5ea7de51e854..b3bbc7e35438 100644
--- a/devel/elfsh/pkg-descr
+++ b/devel/elfsh/pkg-descr
@@ -1,13 +1,20 @@
-For impatient people, this is a short list for libelfsh's already 
-provided features: Mass file view with nice output and cross 
-references, unlink/relink the file, modify sections and program 
-header parameter fields, hijack GOT, CTORS, DTORS, modify the symbol 
-table, inject and remove symbols, inject sections, remove SHT, 
-support binaries without symtab, reconstruct the SHT. Look at 
-libelfsh-ref.txt for current libelfsh reference. elfsh offers an 
-attractive interface to libelfsh.
+The ELF shell 0.5 takes advantage of a hash based, lazy typed 
+object oriented architecture, a readline based interactive mode 
+(35+ builtin commands, with history, completion, regular 
+expression powered), a scripting mode (sample scripts and 
+session logs available on this page) and brings more 
+modification API (relocation tables, .interp, .dynamic, 
+.dynsym, PAX bits, and +), atomic operations with get/set and 
+add/sub/mul/div/mod commands, section injection by top (insert 
+unlimited amount of data in the executable PT_LOAD, even in 
+non-executable environments), a quiet output for tiny screens, 
+ELFsh modules support, sophisticated write/printf primitives, 
+SPARC PLT infection, experimental ET_EXEC relocation and 
+remapping features, ET_REL injection into ET_EXEC (with bss and 
+symtab merging support), disassembly (with good resolving) on 
+i386 binaries with libasm, and much more. 
 
-WWW: http://www.devhell.org/~mayhem/projects/elfsh/
+ WWW: http://elfsh.segfault.net/
 
 - Samy Al Bahra
 samy@kerneled.com
diff --git a/devel/elfsh/pkg-plist b/devel/elfsh/pkg-plist
index 19764da3497f..8527f3706696 100644
--- a/devel/elfsh/pkg-plist
+++ b/devel/elfsh/pkg-plist
@@ -1,5 +1,11 @@
 bin/elfsh
-lib/libelfsh.a
-lib/libelfsh.so
+include/libelfsh-compat.h
+include/libelfsh-internal.h
 include/libelfsh-sunos.h
 include/libelfsh.h
+lib/libelfsh.a
+lib/libelfsh.so
+share/elfsh/modremap.so
+share/elfsh/modtest.so
+@dirrm share/elfsh
+