summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjarke Istrup Pedersen <gurligebis@gentoo.org>2010-09-26 14:00:20 +0000
committerBjarke Istrup Pedersen <gurligebis@gentoo.org>2010-09-26 14:00:20 +0000
commitd7dc6a29edd1160f5df14d3270dbb9253e8a5481 (patch)
tree5081227ac696ee634c1db4a96d37c6eb83e637f0 /net-misc
parentVersion bump (diff)
downloadgentoo-2-d7dc6a29edd1160f5df14d3270dbb9253e8a5481.tar.gz
gentoo-2-d7dc6a29edd1160f5df14d3270dbb9253e8a5481.tar.bz2
gentoo-2-d7dc6a29edd1160f5df14d3270dbb9253e8a5481.zip
Bumping to 1.5_pre20100921
(Portage version: 2.2_rc87/cvs/Linux i686)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/miniupnpd/ChangeLog8
-rw-r--r--net-misc/miniupnpd/miniupnpd-1.5_pre20100921.ebuild (renamed from net-misc/miniupnpd/miniupnpd-1.5_pre20091222.ebuild)19
2 files changed, 21 insertions, 6 deletions
diff --git a/net-misc/miniupnpd/ChangeLog b/net-misc/miniupnpd/ChangeLog
index 77b8301b07d2..fae228d50234 100644
--- a/net-misc/miniupnpd/ChangeLog
+++ b/net-misc/miniupnpd/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-misc/miniupnpd
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/ChangeLog,v 1.14 2010/03/02 22:11:19 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/ChangeLog,v 1.15 2010/09/26 14:00:20 gurligebis Exp $
+
+*miniupnpd-1.5_pre20100921 (26 Sep 2010)
+
+ 26 Sep 2010; <gurligebis@gentoo.org> -miniupnpd-1.5_pre20091222.ebuild,
+ +miniupnpd-1.5_pre20100921.ebuild:
+ Bumping to 1.5_pre20100921 and fixing bug 338163.
02 Mar 2010; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
miniupnpd-1.5_pre20091222.ebuild:
diff --git a/net-misc/miniupnpd/miniupnpd-1.5_pre20091222.ebuild b/net-misc/miniupnpd/miniupnpd-1.5_pre20100921.ebuild
index b953719e1eae..fff04d20a029 100644
--- a/net-misc/miniupnpd/miniupnpd-1.5_pre20091222.ebuild
+++ b/net-misc/miniupnpd/miniupnpd-1.5_pre20100921.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/miniupnpd-1.5_pre20091222.ebuild,v 1.2 2010/03/02 22:11:19 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/miniupnpd-1.5_pre20100921.ebuild,v 1.1 2010/09/26 14:00:20 gurligebis Exp $
EAPI=2
inherit eutils linux-info toolchain-funcs
-MY_PV=1.4.20091222
+MY_PV=1.4.20100921
S="${WORKDIR}/${PN}-${MY_PV}"
DESCRIPTION="MiniUPnP IGD Daemon"
@@ -20,15 +20,24 @@ IUSE=""
RDEPEND=">=net-firewall/iptables-1.4.6
sys-apps/lsb-release
>=sys-kernel/linux-headers-2.6.31"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ sys-apps/util-linux
+ "
src_prepare() {
mv Makefile.linux Makefile
epatch "${FILESDIR}/${PN}-1.3-iptables_path.diff"
epatch "${FILESDIR}/${PN}-1.3-Makefile_fix.diff"
epatch "${FILESDIR}/${PN}-1.5-iptcrdr.diff"
- sed -i -e "s#^CFLAGS = #CFLAGS = -I${KV_OUT_DIR}/include #" Makefile
- sed -i "s/LIBS = -liptc/LIBS = -lip4tc/g" Makefile
+ sed -i \
+ -e "s#^CFLAGS = .*-D#CPPFLAGS += -I${KERNEL_DIR}/include -D#" \
+ -e '/^CFLAGS :=/s/CFLAGS/CPPFLAGS/g' \
+ -e "s/LIBS = -liptc/LIBS = -lip4tc/g" \
+ -e 's/genuuid||//' \
+ Makefile || die
+ sed -i \
+ -e 's/\(strncpy(\([->a-z.]\+\), "[a-zA-Z]\+", \)IPT_FUNCTION_MAXNAMELEN);/\1sizeof(\2));/' \
+ netfilter/iptcrdr.c || die
emake config.h
}