[Glibc-bsd-commits] r1398 - in trunk: . bsd-airtools bsd-airtools/debian bsd-airtools/debian/patches

Robert Millan rmh at costa.debian.org
Wed Mar 29 13:52:45 UTC 2006 

Author: rmh
Date: 2006-03-29 13:52:44 +0000 (Wed, 29 Mar 2006)
New Revision: 1398

Added:
   trunk/bsd-airtools/
   trunk/bsd-airtools/debian/
   trunk/bsd-airtools/debian/changelog
   trunk/bsd-airtools/debian/compat
   trunk/bsd-airtools/debian/control
   trunk/bsd-airtools/debian/copyright
   trunk/bsd-airtools/debian/install
   trunk/bsd-airtools/debian/patches/
   trunk/bsd-airtools/debian/patches/00_dweputils_dwepcrack_weakksa.diff
   trunk/bsd-airtools/debian/patches/01_gnu-kfreebsd.diff
   trunk/bsd-airtools/debian/patches/02_glibc.diff
   trunk/bsd-airtools/debian/patches/03_dstumbler_config.diff
   trunk/bsd-airtools/debian/patches/04_dstumbler_time_h.diff
   trunk/bsd-airtools/debian/rules
   trunk/bsd-airtools/fetch
Log:
Add preliminar bsd-airtools package (please test\!).

Added: trunk/bsd-airtools/debian/changelog
===================================================================
--- trunk/bsd-airtools/debian/changelog	2006-03-29 13:22:25 UTC (rev 1397)
+++ trunk/bsd-airtools/debian/changelog	2006-03-29 13:52:44 UTC (rev 1398)
@@ -0,0 +1,6 @@
+bsd-airtools (0.3-0.1) UNRELEASED; urgency=low
+
+  * Initial release.
+
+ -- Robert Millan <rmh at aybabtu.com>  Wed, 29 Mar 2006 14:31:37 +0200
+

Added: trunk/bsd-airtools/debian/compat
===================================================================
--- trunk/bsd-airtools/debian/compat	2006-03-29 13:22:25 UTC (rev 1397)
+++ trunk/bsd-airtools/debian/compat	2006-03-29 13:52:44 UTC (rev 1398)
@@ -0,0 +1 @@
+5

Added: trunk/bsd-airtools/debian/control
===================================================================
--- trunk/bsd-airtools/debian/control	2006-03-29 13:22:25 UTC (rev 1397)
+++ trunk/bsd-airtools/debian/control	2006-03-29 13:52:44 UTC (rev 1398)
@@ -0,0 +1,13 @@
+Source: bsd-airtools
+Section: net
+Priority: optional
+Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
+Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
+Build-Depends: cdbs, debhelper (>= 4.1.0), freebsd5-buildutils, libpcap-dev, libssl-dev, libncurses-dev, libbsd-dev
+Standards-Version: 3.6.2
+
+Package: bsd-airtools
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: wireless tools
+ wireless tools.

Added: trunk/bsd-airtools/debian/copyright
===================================================================
--- trunk/bsd-airtools/debian/copyright	2006-03-29 13:22:25 UTC (rev 1397)
+++ trunk/bsd-airtools/debian/copyright	2006-03-29 13:52:44 UTC (rev 1398)
@@ -0,0 +1,9 @@
+This package was debianized by Robert Millan <rmh at aybabtu.com> on
+Wed, 29 Mar 2006 14:31:37 +0200.
+
+It was downloaded from http://people.freebsd.org/~seanc/ports/bsd-airtools/
+
+Copyright Holder: ???
+
+License:
+

Added: trunk/bsd-airtools/debian/install
===================================================================
--- trunk/bsd-airtools/debian/install	2006-03-29 13:22:25 UTC (rev 1397)
+++ trunk/bsd-airtools/debian/install	2006-03-29 13:52:44 UTC (rev 1398)
@@ -0,0 +1,6 @@
+build-tree/bsd-airtools/dstumbler/dstumbler				usr/sbin
+build-tree/bsd-airtools/dweputils/dwepcrack/dwepcrack			usr/bin
+build-tree/bsd-airtools/dweputils/dwepdump/dwepdump			usr/sbin
+build-tree/bsd-airtools/dweputils/dwepkeygen/dwepkeygen			usr/bin
+build-tree/bsd-airtools/prism2ctl/prism2ctl				usr/sbin
+build-tree/bsd-airtools/prism2dump/prism2dump				usr/sbin

Added: trunk/bsd-airtools/debian/patches/00_dweputils_dwepcrack_weakksa.diff
===================================================================
--- trunk/bsd-airtools/debian/patches/00_dweputils_dwepcrack_weakksa.diff	2006-03-29 13:22:25 UTC (rev 1397)
+++ trunk/bsd-airtools/debian/patches/00_dweputils_dwepcrack_weakksa.diff	2006-03-29 13:52:44 UTC (rev 1398)
@@ -0,0 +1,16 @@
+
+$FreeBSD: /repoman/r/pcvs/ports/net-mgmt/bsd-airtools/files/patch-dweputils_dwepcrack_weakksa.c,v 1.1 2004/08/22 19:36:32 krion Exp $
+
+--- dweputils/dwepcrack/weakksa.c.orig	Sun Aug 22 21:34:55 2004
++++ dweputils/dwepcrack/weakksa.c	Sun Aug 22 21:35:13 2004
+@@ -168,8 +168,8 @@
+           memcpy(samples[B].s[samples[B].len].iv, iv, IV_SIZE);
+           samples[B].s[samples[B].len++].byte = iv[4] ^ 0xaa;
+ 
+-          fail:
+-        }
++          fail: break;
++	}
+       }
+     }
+   }

Added: trunk/bsd-airtools/debian/patches/01_gnu-kfreebsd.diff
===================================================================
--- trunk/bsd-airtools/debian/patches/01_gnu-kfreebsd.diff	2006-03-29 13:22:25 UTC (rev 1397)
+++ trunk/bsd-airtools/debian/patches/01_gnu-kfreebsd.diff	2006-03-29 13:52:44 UTC (rev 1398)
@@ -0,0 +1,216 @@
+diff -ur bsd-airtools.old/dstumbler/dstumbler.h bsd-airtools/dstumbler/dstumbler.h
+--- bsd-airtools.old/dstumbler/dstumbler.h	2006-03-29 14:39:25.000000000 +0200
++++ bsd-airtools/dstumbler/dstumbler.h	2006-03-29 14:41:16.000000000 +0200
+@@ -47,7 +47,7 @@
+ #include <net/if.h>
+ #include <sys/termios.h>
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #include <dev/wi/if_wavelan_ieee.h>
+ #else
+ #ifdef __OpenBSD__
+@@ -241,7 +241,7 @@
+ }
+ 
+ /* redefine these for compatibility with freebsd/openbsd */
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #define htole16(x) (x)
+ #define le16toh(x) (x)
+ #define O_SYNC     O_FSYNC
+diff -ur bsd-airtools.old/dweputils/dwepcrack/dwepcrack.h bsd-airtools/dweputils/dwepcrack/dwepcrack.h
+--- bsd-airtools.old/dweputils/dwepcrack/dwepcrack.h	2006-03-29 14:39:25.000000000 +0200
++++ bsd-airtools/dweputils/dwepcrack/dwepcrack.h	2006-03-29 14:41:16.000000000 +0200
+@@ -38,7 +38,7 @@
+ #include <sys/types.h>
+ #include <pcap.h>
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #include <dev/wi/if_wavelan_ieee.h>
+ #else
+ #ifdef __OpenBSD__
+@@ -76,7 +76,7 @@
+ /*
+  * macros
+  */
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #define le32toh(x) (x)
+ #define htole16(x) (x)
+ #define le16toh(x) (x)
+diff -ur bsd-airtools.old/dweputils/dwepdump/dwepdump.c bsd-airtools/dweputils/dwepdump/dwepdump.c
+--- bsd-airtools.old/dweputils/dwepdump/dwepdump.c	2006-03-29 14:39:25.000000000 +0200
++++ bsd-airtools/dweputils/dwepdump/dwepdump.c	2006-03-29 14:41:16.000000000 +0200
+@@ -47,7 +47,7 @@
+ 
+ #include <pcap.h>
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #include <dev/wi/if_wavelan_ieee.h>
+ #else
+ #ifdef __OpenBSD__
+@@ -74,7 +74,7 @@
+ /*
+  * macros
+  */
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #define le16toh(x) (x)
+ #else
+ #ifdef __OpenBSD__
+diff -ur bsd-airtools.old/prism2ctl/prism2ctl.c bsd-airtools/prism2ctl/prism2ctl.c
+--- bsd-airtools.old/prism2ctl/prism2ctl.c	2006-03-29 14:39:25.000000000 +0200
++++ bsd-airtools/prism2ctl/prism2ctl.c	2006-03-29 14:41:16.000000000 +0200
+@@ -50,7 +50,7 @@
+ #include <sys/time.h>
+ #include <net/if.h>
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #include <dev/wi/if_wavelan_ieee.h>
+ #else
+ #ifdef __OpenBSD__
+@@ -64,7 +64,7 @@
+ #include <err.h>
+ 
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #define le16toh(x) (x)
+ #define htole16(x) (x)
+ #else
+diff -ur bsd-airtools.old/prism2dump/decode_80211.c bsd-airtools/prism2dump/decode_80211.c
+--- bsd-airtools.old/prism2dump/decode_80211.c	2006-03-29 14:39:25.000000000 +0200
++++ bsd-airtools/prism2dump/decode_80211.c	2006-03-29 14:41:16.000000000 +0200
+@@ -40,7 +40,7 @@
+ 
+ #include <pcap.h>
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #include <dev/wi/if_wavelan_ieee.h>
+ #else
+ #ifdef __OpenBSD__
+diff -ur bsd-airtools.old/prism2dump/decode_ctl.c bsd-airtools/prism2dump/decode_ctl.c
+--- bsd-airtools.old/prism2dump/decode_ctl.c	2006-03-29 14:39:25.000000000 +0200
++++ bsd-airtools/prism2dump/decode_ctl.c	2006-03-29 14:41:16.000000000 +0200
+@@ -40,7 +40,7 @@
+ 
+ #include <pcap.h>
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #include <dev/wi/if_wavelan_ieee.h>
+ #else
+ #ifdef __OpenBSD__
+diff -ur bsd-airtools.old/prism2dump/decode_data.c bsd-airtools/prism2dump/decode_data.c
+--- bsd-airtools.old/prism2dump/decode_data.c	2006-03-29 14:39:25.000000000 +0200
++++ bsd-airtools/prism2dump/decode_data.c	2006-03-29 14:41:16.000000000 +0200
+@@ -40,7 +40,7 @@
+ 
+ #include <pcap.h>
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #include <dev/wi/if_wavelan_ieee.h>
+ #else
+ #ifdef __OpenBSD__
+diff -ur bsd-airtools.old/prism2dump/decode_mgmt.c bsd-airtools/prism2dump/decode_mgmt.c
+--- bsd-airtools.old/prism2dump/decode_mgmt.c	2006-03-29 14:39:25.000000000 +0200
++++ bsd-airtools/prism2dump/decode_mgmt.c	2006-03-29 14:41:16.000000000 +0200
+@@ -40,7 +40,7 @@
+ 
+ #include <pcap.h>
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #include <dev/wi/if_wavelan_ieee.h>
+ #else
+ #ifdef __OpenBSD__
+diff -ur bsd-airtools.old/prism2dump/fields_80211.c bsd-airtools/prism2dump/fields_80211.c
+--- bsd-airtools.old/prism2dump/fields_80211.c	2006-03-29 14:39:25.000000000 +0200
++++ bsd-airtools/prism2dump/fields_80211.c	2006-03-29 14:41:16.000000000 +0200
+@@ -40,7 +40,7 @@
+ 
+ #include <pcap.h>
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #include <dev/wi/if_wavelan_ieee.h>
+ #else
+ #ifdef __OpenBSD__
+diff -ur bsd-airtools.old/prism2dump/fields_data.c bsd-airtools/prism2dump/fields_data.c
+--- bsd-airtools.old/prism2dump/fields_data.c	2006-03-29 14:39:25.000000000 +0200
++++ bsd-airtools/prism2dump/fields_data.c	2006-03-29 14:41:16.000000000 +0200
+@@ -40,7 +40,7 @@
+ 
+ #include <pcap.h>
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #include <dev/wi/if_wavelan_ieee.h>
+ #else
+ #ifdef __OpenBSD__
+diff -ur bsd-airtools.old/prism2dump/fields_mgmt.c bsd-airtools/prism2dump/fields_mgmt.c
+--- bsd-airtools.old/prism2dump/fields_mgmt.c	2006-03-29 14:39:26.000000000 +0200
++++ bsd-airtools/prism2dump/fields_mgmt.c	2006-03-29 14:41:16.000000000 +0200
+@@ -40,7 +40,7 @@
+ 
+ #include <pcap.h>
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #include <dev/wi/if_wavelan_ieee.h>
+ #else
+ #ifdef __OpenBSD__
+diff -ur bsd-airtools.old/prism2dump/misc.c bsd-airtools/prism2dump/misc.c
+--- bsd-airtools.old/prism2dump/misc.c	2006-03-29 14:39:26.000000000 +0200
++++ bsd-airtools/prism2dump/misc.c	2006-03-29 14:41:16.000000000 +0200
+@@ -40,7 +40,7 @@
+ 
+ #include <pcap.h>
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #include <dev/wi/if_wavelan_ieee.h>
+ #else
+ #ifdef __OpenBSD__
+diff -ur bsd-airtools.old/prism2dump/prism2dump.c bsd-airtools/prism2dump/prism2dump.c
+--- bsd-airtools.old/prism2dump/prism2dump.c	2006-03-29 14:39:26.000000000 +0200
++++ bsd-airtools/prism2dump/prism2dump.c	2006-03-29 14:41:16.000000000 +0200
+@@ -52,7 +52,7 @@
+ 
+ #include <pcap.h>
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #include <dev/wi/if_wavelan_ieee.h>
+ #else
+ #ifdef __OpenBSD__
+diff -ur bsd-airtools.old/prism2dump/prism2dump.h bsd-airtools/prism2dump/prism2dump.h
+--- bsd-airtools.old/prism2dump/prism2dump.h	2006-03-29 14:39:26.000000000 +0200
++++ bsd-airtools/prism2dump/prism2dump.h	2006-03-29 14:41:16.000000000 +0200
+@@ -45,7 +45,7 @@
+ /*
+  * macros
+  */
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #define le16toh(x) (x)
+ #define le32toh(x) (x)
+ #else
+diff -ur bsd-airtools.old/wnet/libwnet/libwnet.h bsd-airtools/wnet/libwnet/libwnet.h
+--- bsd-airtools.old/wnet/libwnet/libwnet.h	2006-03-29 14:39:26.000000000 +0200
++++ bsd-airtools/wnet/libwnet/libwnet.h	2006-03-29 14:41:16.000000000 +0200
+@@ -44,7 +44,7 @@
+ #include <net/if.h>
+ #include <netinet/if_ether.h>
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #include <dev/wi/if_wavelan_ieee.h>
+ #include <dev/wi/if_wireg.h>
+ #include <net/if_ieee80211.h>

Added: trunk/bsd-airtools/debian/patches/02_glibc.diff
===================================================================
--- trunk/bsd-airtools/debian/patches/02_glibc.diff	2006-03-29 13:22:25 UTC (rev 1397)
+++ trunk/bsd-airtools/debian/patches/02_glibc.diff	2006-03-29 13:52:44 UTC (rev 1398)
@@ -0,0 +1,11 @@
+--- bsd-airtools/prism2dump/prism2dump.c~	2006-03-29 14:43:25.000000000 +0200
++++ bsd-airtools/prism2dump/prism2dump.c	2006-03-29 14:44:18.000000000 +0200
+@@ -41,7 +41,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+-#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) && !defined(__GLIBC__)
+ #include <sys/endian.h>
+ #endif
+ #include <netinet/in.h>

Added: trunk/bsd-airtools/debian/patches/03_dstumbler_config.diff
===================================================================
--- trunk/bsd-airtools/debian/patches/03_dstumbler_config.diff	2006-03-29 13:22:25 UTC (rev 1397)
+++ trunk/bsd-airtools/debian/patches/03_dstumbler_config.diff	2006-03-29 13:52:44 UTC (rev 1398)
@@ -0,0 +1,15 @@
+--- bsd-airtools/dstumbler/configure~	2006-03-29 15:37:24.000000000 +0200
++++ bsd-airtools/dstumbler/configure	2006-03-29 15:39:18.000000000 +0200
+@@ -33,6 +33,12 @@
+     ldflags="-L/usr/local/lib -lncurses"
+     curses="ncurses"
+     cursesincl="/usr/include/ncurses.h" ;;
++  "GNU/kFreeBSD"*)
++    hostos="freebsd"; echo $hostos
++    cflags="-Wall"
++    ldflags="-lncurses -lbsd"
++    curses="ncurses"
++    cursesincl="/usr/include/ncurses.h" ;;
+   *)
+     hostos="unsupported"; echo $hostos;
+     echo

Added: trunk/bsd-airtools/debian/patches/04_dstumbler_time_h.diff
===================================================================
--- trunk/bsd-airtools/debian/patches/04_dstumbler_time_h.diff	2006-03-29 13:22:25 UTC (rev 1397)
+++ trunk/bsd-airtools/debian/patches/04_dstumbler_time_h.diff	2006-03-29 13:52:44 UTC (rev 1398)
@@ -0,0 +1,21 @@
+--- bsd-airtools/dstumbler/aps.c~	2006-03-29 15:33:11.000000000 +0200
++++ bsd-airtools/dstumbler/aps.c	2006-03-29 15:34:38.000000000 +0200
+@@ -41,7 +41,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+-#include <sys/time.h>
++#include <time.h>
+ #include <errno.h>
+ 
+ #ifdef __OpenBSD__
+--- bsd-airtools/dstumbler/log.c~	2006-03-29 15:33:11.000000000 +0200
++++ bsd-airtools/dstumbler/log.c	2006-03-29 15:35:18.000000000 +0200
+@@ -43,6 +43,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/uio.h>
++#include <time.h>
+ #include <unistd.h>
+ 
+ #include "dstumbler.h"

Added: trunk/bsd-airtools/debian/rules
===================================================================
--- trunk/bsd-airtools/debian/rules	2006-03-29 13:22:25 UTC (rev 1397)
+++ trunk/bsd-airtools/debian/rules	2006-03-29 13:52:44 UTC (rev 1398)
@@ -0,0 +1,37 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses cdbs.  Originaly written by Robert Millan.
+# This file is public domain.
+  
+DEB_TAR_SRCDIR                  := bsd-airtools
+DEB_AUTO_CLEANUP_RCS            := yes
+
+package=bsd-airtools
+
+SHELL:=bash
+PATH:=/usr/lib/freebsd:$(PATH)
+PMAKE=make COPTS="-D_GNU_SOURCE" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO
+
+dirs=dweputils/{dwepcrack,dwepdump,dwepkeygen} prism2ctl prism2dump
+# FIXME: add wnet/{libwnet{,/examples},dinject,reinj}
+
+build/bsd-airtools:: apply-patches
+	set -e ; for i in $(dirs) \
+	; do \
+		$(PMAKE) -C $(DEB_SRCDIR)/$$i ; \
+	done
+	cd $(DEB_SRCDIR)/dstumbler && ./configure && $(PMAKE)
+
+include /usr/share/cdbs/1/rules/tarball.mk
+pre-build:: $(_cdbs_tarball_stamps)
+	find $(DEB_SRCDIR) -type f | (set -e ; while read i ; do sed -i $$i \
+		-e "/^__FBSDID/d" \
+		-e "/[ \t]*__\(dead2\|unused\|result\)[ \t]*/d" \
+		-e "s,<sys/queue\.h>,<bsd/queue.h>,g" \
+		-e "s,<sys/iconv\.h>,<iconv.h>,g" \
+		-e "s/^LDADD=/LDADD+=/g" \
+		-e "s/getline/bsd_&/g" \
+	; done)
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/tarball.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk


Property changes on: trunk/bsd-airtools/debian/rules
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/bsd-airtools/fetch
===================================================================
--- trunk/bsd-airtools/fetch	2006-03-29 13:22:25 UTC (rev 1397)
+++ trunk/bsd-airtools/fetch	2006-03-29 13:52:44 UTC (rev 1398)
@@ -0,0 +1,16 @@
+#!/bin/bash
+set -ex
+
+version="0.3"
+sha1sum="ed57eafa399300c0e90404e7850bf774719765ba"
+
+tarball="bsd-airtools-v${version}.tgz"
+url="http://people.freebsd.org/~seanc/ports/bsd-airtools/${tarball}"
+
+rm -f ${tarball}
+wget -c ${url}
+
+if ! echo "${sha1sum}  bsd-airtools-v0.3.tgz" | sha1sum -c ; then
+  echo "ERROR: hash missmatch, deleting tarball"
+  rm -f ${tarball}
+fi


Property changes on: trunk/bsd-airtools/fetch
___________________________________________________________________
Name: svn:executable
   + *

More information about the Glibc-bsd-commits mailing list