[arch-commits] Commit in hping/repos (3 files)

[Eric Bélanger]

    Date: Thursday, February 26, 2009 @ 03:49:40
  Author: eric
Revision: 27822

Merged revisions 27821 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/hping/trunk

........
  r27821 | eric | 2009-02-26 03:49:06 -0500 (Thu, 26 Feb 2009) | 2 lines
  
  upgpkg: hping 3.0.0-1
      Upstream update, added libpcap depends, added license, updated Makefile.patch, FHS man pages, added hping and hping2 symlinks
........

Modified:
  hping/repos/extra-x86_64/	(properties)
  hping/repos/extra-x86_64/Makefile.patch
  hping/repos/extra-x86_64/PKGBUILD

----------------+
 Makefile.patch |   49 ++++++++++++++++++++++++++++---------------------
 PKGBUILD       |   25 +++++++++++--------------
 2 files changed, 39 insertions(+), 35 deletions(-)


Property changes on: hping/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /hping/trunk:1-8931
   + /hping/trunk:1-27821

Modified: extra-x86_64/Makefile.patch
===================================================================
--- extra-x86_64/Makefile.patch	2009-02-26 08:49:06 UTC (rev 27821)
+++ extra-x86_64/Makefile.patch	2009-02-26 08:49:40 UTC (rev 27822)
@@ -1,23 +1,30 @@
---- Makefile-orig	2003-09-18 23:01:03.000000000 -0400
-+++ Makefile	2003-09-18 23:01:51.000000000 -0400
-@@ -12,7 +12,7 @@
- #uncomment the following if you need libpcap based build under linux
- #(not raccomanded)
- COMPILE_TIME= 
--INSTALL_MANPATH=/usr/man
-+INSTALL_MANPATH=$(prefix)/man
+diff -Naur hping3-20051105/Makefile hping3-20051105-new/Makefile
+--- hping3-20051105/Makefile	2005-11-05 05:31:41.000000000 -0500
++++ hping3-20051105-new/Makefile	2009-02-26 03:21:46.000000000 -0500
+@@ -72,16 +72,18 @@
+ 	rm -rf hping3 *.o byteorder byteorder.h systype.h Makefile libars.a .depend
  
+ install: hping3
+-	cp -f hping3 /usr/sbin/
+-	chmod 755 /usr/sbin/hping3
+-	ln -s /usr/sbin/hping3 /usr/sbin/hping
+-	ln -s /usr/sbin/hping3 /usr/sbin/hping2
+-	@if [ -d ${INSTALL_MANPATH}/man8 ]; then \
+-		cp ./docs/hping3.8 ${INSTALL_MANPATH}/man8; \
+-		chmod 644 ${INSTALL_MANPATH}/man8/hping3.8; \
++	@[ ! -d ${DESTDIR}/usr/sbin ] && install -d ${DESTDIR}/usr/sbin
++	cp -f hping3 ${DESTDIR}/usr/sbin/
++	chmod 755 ${DESTDIR}/usr/sbin/hping3
++	ln -s /usr/sbin/hping3 ${DESTDIR}/usr/sbin/hping
++	ln -s /usr/sbin/hping3 ${DESTDIR}/usr/sbin/hping2
++	@[ ! -d ${DESTDIR}${INSTALL_MANPATH}/man8 ] && install -d ${DESTDIR}${INSTALL_MANPATH}/man8
++	@if [ -d ${DESTDIR}${INSTALL_MANPATH}/man8 ]; then \
++		cp ./docs/hping3.8 ${DESTDIR}${INSTALL_MANPATH}/man8; \
++		chmod 644 ${DESTDIR}${INSTALL_MANPATH}/man8/hping3.8; \
+ 	else \
+ 		echo "@@@@@@ WARNING @@@@@@"; \
+-		echo "Can't install the man page: ${INSTALL_MANPATH}/man8 does not exist"; \
++		echo "Can't install the man page: ${DESTDIR}${INSTALL_MANPATH}/man8 does not exist"; \
+ 	fi
  
- OBJ=	main.o getifname.o getlhs.o \
-@@ -55,9 +55,8 @@
- 	-(cd utils; $(MAKE) clean)
- 
- install: hping2
--	cp -f hping2 /usr/sbin/
--	chmod 755 /usr/sbin/hping2
--	ln -sf /usr/sbin/hping2 /usr/sbin/hping
-+	cp -f hping2 $(prefix)/sbin/
-+	chmod 755 $(prefix)/sbin/hping2
- 	@if [ -d ${INSTALL_MANPATH}/man8 ]; then \
- 		cp ./docs/hping2.8 ${INSTALL_MANPATH}/man8; \
- 		chmod 644 ${INSTALL_MANPATH}/man8/hping2.8; \
+ strip: hping3

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-02-26 08:49:06 UTC (rev 27821)
+++ extra-x86_64/PKGBUILD	2009-02-26 08:49:40 UTC (rev 27822)
@@ -1,26 +1,23 @@
 # $Id$
 # Maintainer: Kevin Piche <kevin at archlinux.org>
 pkgname=hping
-pkgver=2.0.0
-pkgextra=rc3
-pkgrel=2
+pkgver=3.0.0
+pkgrel=1
 pkgdesc="hping is a command-line oriented TCP/IP packet assembler/analyzer."
 arch=(i686 x86_64)
 url="http://www.hping.org"
-depends=('glibc')
-source=(http://www.hping.org/$pkgname$pkgver-$pkgextra.tar.gz Makefile.patch bytesex.h.patch)
-md5sums=('029bf240f2e0545b664b2f8b9118d9e8' '1b96ae1b7f8573f2b8fad41a5dae2503'\
+license=('GPL2' 'BSD')
+depends=('glibc' 'libpcap')
+source=(http://www.hping.org/hping3-20051105.tar.gz Makefile.patch bytesex.h.patch)
+md5sums=('ca4ea4e34bcc2162aedf25df8b2d1747' '3c6f920201fc980d377408917a28df93'\
          '8af8e336819df1447b0c1b879a704be9')
 
 build() {
-  cd $startdir/src/hping2-$pkgextra
-
+  cd $srcdir/hping3-20051105
   [ "$CARCH" == "x86_64" ] && patch -Np1 -i ../bytesex.h.patch || return 1
-
-  ./configure
-  patch -p0 < ../Makefile.patch
+  MANPATH=/usr/share/man ./configure --no-tcl || return 1
+  patch -p1 < ../Makefile.patch || return 1
   make || return 1
-  mkdir -p $startdir/pkg/usr/sbin
-  mkdir -p $startdir/pkg/usr/man/man8
-  make prefix=$startdir/pkg/usr install
+  make DESTDIR=$pkgdir install || return 1
+  install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }