Version bump (bug #311797).

(Portage version: HEAD/cvs/Linux x86_64)

3 files changed, 172 insertions, 1 deletions

diff --git a/net-wireless/aircrack-ng/ChangeLog b/net-wireless/aircrack-ng/ChangeLog
index fb806ccd9171..6e143e3702dc 100644
--- a/net-wireless/aircrack-ng/ChangeLog
+++ b/net-wireless/aircrack-ng/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/aircrack-ng
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/ChangeLog,v 1.57 2010/04/06 19:19:31 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/ChangeLog,v 1.58 2010/04/29 21:12:40 arfrever Exp $
+
+*aircrack-ng-1.1 (29 Apr 2010)
+
+  29 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -aircrack-ng-1.0_rc3.ebuild, -aircrack-ng-1.0_rc4.ebuild,
+  +aircrack-ng-1.1.ebuild, +files/aircrack-ng-1.1-respect_LDFLAGS.patch:
+  Version bump (bug #311797).
 
   06 Apr 2010; Jonathan Callen <abcd@gentoo.org> aircrack-ng-1.0.ebuild:
   Bump to EAPI=3, add prefix keywords
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.1.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.1.ebuild
new file mode 100644
index 000000000000..d38ff51bd190
--- /dev/null
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/aircrack-ng/aircrack-ng-1.1.ebuild,v 1.1 2010/04/29 21:12:40 arfrever Exp $
+
+EAPI="3"
+
+inherit eutils flag-o-matic toolchain-funcs versionator
+
+MY_PV="$(replace_version_separator 2 '-')"
+
+DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys"
+HOMEPAGE="http://www.aircrack-ng.org"
+SRC_URI="http://download.aircrack-ng.org/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+sqlite kernel_linux kernel_FreeBSD"
+
+DEPEND="dev-libs/openssl
+	sqlite? ( >=dev-db/sqlite-3.4 )"
+RDEPEND="${DEPEND}
+	kernel_linux? ( net-wireless/iw net-wireless/wireless-tools )"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+have_sqlite() {
+	use sqlite && echo "true" || echo "false"
+}
+
+pkg_setup() {
+	# aircrack-ng fails to build with -fPIE.
+	filter-flags -fPIE
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-respect_LDFLAGS.patch"
+	epatch "${FILESDIR}/${PN}-1.0_rc4-fix_build.patch"
+}
+
+src_compile() {
+	# UNSTABLE=true enables building of buddy-ng, easside-ng, tkiptun-ng and wesside-ng
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" sqlite="$(have_sqlite)" UNSTABLE=true || die "emake failed"
+}
+
+src_install() {
+	# UNSTABLE=true enables installation of buddy-ng, easside-ng, tkiptun-ng and wesside-ng
+	emake \
+		prefix="${EPREFIX}/usr" \
+		mandir="${EPREFIX}/usr/share/man/man1" \
+		DESTDIR="${D}" \
+		sqlite="$(have_sqlite)" \
+		UNSTABLE=true \
+		install \
+		|| die "emake install failed"
+
+	dodoc AUTHORS ChangeLog README
+}
+
+pkg_postinst() {
+	# Message is (c) FreeBSD
+	# http://www.freebsd.org/cgi/cvsweb.cgi/ports/net-mgmt/aircrack-ng/files/pkg-message.in?rev=1.5
+	if use kernel_FreeBSD ; then
+		einfo "Contrary to Linux, it is not necessary to use airmon-ng to enable the monitor"
+		einfo "mode of your wireless card.  So do not care about what the manpages say about"
+		einfo "airmon-ng, airodump-ng sets monitor mode automatically."
+		echo
+		einfo "To return from monitor mode, issue the following command:"
+		einfo "    ifconfig \${INTERFACE} -mediaopt monitor"
+		einfo
+		einfo "For aireplay-ng you need FreeBSD >= 7.0."
+	fi
+}
diff --git a/net-wireless/aircrack-ng/files/aircrack-ng-1.1-respect_LDFLAGS.patch b/net-wireless/aircrack-ng/files/aircrack-ng-1.1-respect_LDFLAGS.patch
new file mode 100644
index 000000000000..b7358b3cd264
--- /dev/null
+++ b/net-wireless/aircrack-ng/files/aircrack-ng-1.1-respect_LDFLAGS.patch
@@ -0,0 +1,91 @@
+--- src/Makefile
++++ src/Makefile
+@@ -90,13 +90,13 @@
+ 
+ 
+ OSD		= osdep
+-LIBS		= -L$(OSD) -l$(OSD) $(LIBPCAP) $(LDFLAGS)
++LIBS		= -L$(OSD) -l$(OSD) $(LIBPCAP)
+ ifeq ($(OSNAME), cygwin)
+ LIBS		+= -liphlpapi -lsetupapi -luuid
+ endif
+ LIBOSD		= $(OSD)/lib$(OSD).a
+ 
+-LIBSSL		= -lssl -lcrypto $(LDFLAGS)
++LIBSSL		= -lssl -lcrypto
+ LIBSQL		=
+ ifeq ($(SQLITE), true)
+ 	LIBSQL		= -L/usr/local/lib -lsqlite3
+@@ -140,55 +140,55 @@
+ 	aircrack-ng-opt-prof -lpthread $(LIBSQL)
+ 
+ aircrack-ng$(EXE): $(OBJS_AC)
+-	$(CC) $(CFLAGS) $(OBJS_AC) $(ASM_AC) -o $(@) -lpthread $(LIBSSL) $(LIBSQL)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AC) $(ASM_AC) -o $(@) -lpthread $(LIBSSL) $(LIBSQL)
+ 
+ airdecap-ng$(EXE): $(OBJS_AD)
+-	$(CC) $(CFLAGS) $(OBJS_AD) -o $(@) $(LIBSSL)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AD) -o $(@) $(LIBSSL)
+ 
+ packetforge-ng$(EXE): $(OBJS_PF)
+-	$(CC) $(CFLAGS) $(OBJS_PF) -o $(@) $(LIBSSL)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_PF) -o $(@) $(LIBSSL)
+ 
+ aireplay-ng$(EXE): $(OBJS_AR) $(LIBOSD)
+-	$(CC) $(CFLAGS) $(OBJS_AR) -o $(@) $(LIBS) $(LIBSSL)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AR) -o $(@) $(LIBS) $(LIBSSL)
+ 
+ airodump-ng$(EXE): $(OBJS_ADU) $(LIBOSD)
+-	$(CC) $(CFLAGS) $(OBJS_ADU) -o $(@) $(LIBS) $(LIBSSL) -lpthread
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_ADU) -o $(@) $(LIBS) $(LIBSSL) -lpthread
+ 
+ airserv-ng$(EXE): $(OBJS_AS) $(LIBOSD)
+-	$(CC) $(CFLAGS) $(OBJS_AS) -o $(@) $(LIBS) $(LIBPCAP)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AS) -o $(@) $(LIBS) $(LIBPCAP)
+ 
+ airtun-ng$(EXE): $(OBJS_AT) $(LIBOSD)
+-	$(CC) $(CFLAGS) $(OBJS_AT) -o $(@) $(LIBS) $(LIBSSL)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AT) -o $(@) $(LIBS) $(LIBSSL)
+ 
+ ivstools$(EXE): $(OBJS_IV)
+-	$(CC) $(CFLAGS) $(OBJS_IV) -o $(@) $(LIBSSL)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_IV) -o $(@) $(LIBSSL)
+ 
+ kstats$(EXE): kstats.o
+-	$(CC) $(CFLAGS) kstats.o -o $(@)
++	$(CC) $(CFLAGS) $(LDFLAGS) kstats.o -o $(@)
+ 
+ wesside-ng$(EXE): $(OBJS_WS) $(LIBOSD)
+-	$(CC) $(CFLAGS) $(OBJS_WS) -o $(@) $(LIBS) $(LIBSSL) -lz
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_WS) -o $(@) $(LIBS) $(LIBSSL) -lz
+ 
+ easside-ng$(EXE): $(OBJS_ES) $(LIBOSD)
+-	$(CC) $(CFLAGS) $(OBJS_ES) -o $(@) $(LIBS) -lz
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_ES) -o $(@) $(LIBS) -lz
+ 
+ buddy-ng$(EXE): $(OBJS_BUDDY)
+-	$(CC) $(CFLAGS) $(OBJS_BUDDY) -o $(@)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_BUDDY) -o $(@)
+ 
+ makeivs-ng$(EXE): $(OBJS_MI)
+-	$(CC) $(CFLAGS) $(OBJS_MI) -o $(@)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_MI) -o $(@)
+ 
+ airolib-ng$(EXE): $(OBJS_AL)
+-	$(CC) $(CFLAGS) $(OBJS_AL) -o $(@) $(LIBSSL) -DHAVE_REGEXP $(LIBSQL)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AL) -o $(@) $(LIBSSL) -DHAVE_REGEXP $(LIBSQL)
+ 
+ airbase-ng$(EXE): $(OBJS_AB) $(LIBOSD)
+-	$(CC) $(CFLAGS) $(OBJS_AB) -o $(@) $(LIBS) $(LIBSSL) -lpthread
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AB) -o $(@) $(LIBS) $(LIBSSL) -lpthread
+ 
+ airdecloak-ng$(EXE): $(OBJS_AU)
+-	$(CC) $(CFLAGS) $(OBJS_AU) -o $(@)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AU) -o $(@)
+ 
+ tkiptun-ng$(EXE): $(OBJS_TT) $(LIBOSD)
+-	$(CC) $(CFLAGS) $(OBJS_TT) -o $(@) $(LIBS) $(LIBSSL)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_TT) -o $(@) $(LIBS) $(LIBSSL)
+ 
+ strip: $(BINFILES) $(SBINFILES)
+ 	strip $(BINFILES) $(SBINFILES)