Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/net-misc/miniupnpd
diff options
context:
space:
mode:
authorBjarke Istrup Pedersen <gurligebis@gentoo.org>2013-02-08 19:00:04 +0000
committerBjarke Istrup Pedersen <gurligebis@gentoo.org>2013-02-08 19:00:04 +0000
commit5d305153e2bc1dd95817593d51231a5e84ffd686 (patch)
treefd8d574754c431901a2962274e72d65add3967f3 /net-misc/miniupnpd
parent[bump] dev-perl/ShipIt-0.600.0 (diff)
downloadgentoo-2-5d305153e2bc1dd95817593d51231a5e84ffd686.tar.gz
gentoo-2-5d305153e2bc1dd95817593d51231a5e84ffd686.tar.bz2
gentoo-2-5d305153e2bc1dd95817593d51231a5e84ffd686.zip
Bumping to 1.8 and removing old versions and left over files
(Portage version: 2.2.0_alpha161/cvs/Linux i686, signed Manifest commit with key 15AE484C)
Diffstat (limited to 'net-misc/miniupnpd')
-rw-r--r--net-misc/miniupnpd/ChangeLog11
-rw-r--r--net-misc/miniupnpd/files/miniupnpd-1.3-Makefile_fix.diff11
-rw-r--r--net-misc/miniupnpd/files/miniupnpd-nf_nat-fix.diff61
-rw-r--r--net-misc/miniupnpd/miniupnpd-1.7.ebuild59
-rw-r--r--net-misc/miniupnpd/miniupnpd-1.8.ebuild (renamed from net-misc/miniupnpd/miniupnpd-1.8_pre20121005.ebuild)6
5 files changed, 12 insertions, 136 deletions
diff --git a/net-misc/miniupnpd/ChangeLog b/net-misc/miniupnpd/ChangeLog
index cc564d690f60..f7744d02d57c 100644
--- a/net-misc/miniupnpd/ChangeLog
+++ b/net-misc/miniupnpd/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-misc/miniupnpd
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/ChangeLog,v 1.30 2012/12/31 11:04:21 gurligebis Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/ChangeLog,v 1.31 2013/02/08 19:00:04 gurligebis Exp $
+
+*miniupnpd-1.8 (08 Feb 2013)
+
+ 08 Feb 2013; <gurligebis@gentoo.org> -files/miniupnpd-1.3-Makefile_fix.diff,
+ -miniupnpd-1.7.ebuild, -miniupnpd-1.8_pre20121005.ebuild,
+ +miniupnpd-1.8.ebuild, -files/miniupnpd-nf_nat-fix.diff:
+ Bumping to 1.8 and removing old versions and left over files
*miniupnpd-1.8_pre20121005 (31 Dec 2012)
diff --git a/net-misc/miniupnpd/files/miniupnpd-1.3-Makefile_fix.diff b/net-misc/miniupnpd/files/miniupnpd-1.3-Makefile_fix.diff
deleted file mode 100644
index 5c5a232b5cdc..000000000000
--- a/net-misc/miniupnpd/files/miniupnpd-1.3-Makefile_fix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.old 2009-04-23 11:43:02.000000000 +0000
-+++ Makefile 2009-04-23 11:43:16.000000000 +0000
-@@ -59,6 +59,8 @@ LIBS = $(IPTABLESPATH)/libiptc/libiptc.a
- endif
- endif
-
-+CFLAGS := $(CFLAGS) -DIPTABLES_143
-+
- TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o
-
- EXECUTABLES = miniupnpd testupnpdescgen testgetifstats \
diff --git a/net-misc/miniupnpd/files/miniupnpd-nf_nat-fix.diff b/net-misc/miniupnpd/files/miniupnpd-nf_nat-fix.diff
deleted file mode 100644
index 95f3b0f90903..000000000000
--- a/net-misc/miniupnpd/files/miniupnpd-nf_nat-fix.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -Naurp netfilter/iptcrdr.c netfilter.new/iptcrdr.c
---- netfilter/iptcrdr.c 2011-06-22 20:34:51.000000000 +0000
-+++ netfilter/iptcrdr.c 2011-07-29 19:26:50.703120526 +0000
-@@ -29,7 +29,7 @@
- #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
- #define LIST_POISON2 ((void *) 0x00200200 )
-
--#include <net/netfilter/nf_nat.h>
-+#include "tiny_nf_nat.h"
- #define ip_nat_multi_range nf_nat_multi_range
- #define ip_nat_range nf_nat_range
- #define IPTC_HANDLE struct iptc_handle *
-@@ -38,7 +38,7 @@
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
- #include <linux/netfilter_ipv4/ip_nat.h>
- #else
--#include <linux/netfilter/nf_nat.h>
-+#include "tiny_nf_nat.h"
- #endif
- #define IPTC_HANDLE iptc_handle_t
- #endif
-diff -Naurp netfilter/tiny_nf_nat.h netfilter.new/tiny_nf_nat.h
---- netfilter/tiny_nf_nat.h 1970-01-01 00:00:00.000000000 +0000
-+++ netfilter/tiny_nf_nat.h 2011-07-29 19:26:26.895119616 +0000
-@@ -0,0 +1,36 @@
-+/* Only what miniupnpd needs, until linux-libc-dev gains nf_nat.h */
-+
-+#ifndef TINY_NF_NAT_H
-+#define TINY_NF_NAT_H
-+
-+#include <linux/types.h>
-+
-+#define IP_NAT_RANGE_MAP_IPS 1
-+#define IP_NAT_RANGE_PROTO_SPECIFIED 2
-+#define IP_NAT_RANGE_PROTO_RANDOM 4
-+#define IP_NAT_RANGE_PERSISTENT 8
-+
-+union nf_conntrack_man_proto {
-+ __be16 all;
-+ struct { __be16 port; } tcp;
-+ struct { __be16 port; } udp;
-+ struct { __be16 id; } icmp;
-+ struct { __be16 port; } dccp;
-+ struct { __be16 port; } sctp;
-+ struct { __be16 key; } gre;
-+};
-+
-+struct nf_nat_range {
-+ unsigned int flags;
-+ __be32 min_ip, max_ip;
-+ union nf_conntrack_man_proto min, max;
-+};
-+
-+struct nf_nat_multi_range_compat {
-+ unsigned int rangesize;
-+ struct nf_nat_range range[1];
-+};
-+
-+#define nf_nat_multi_range nf_nat_multi_range_compat
-+
-+#endif /*TINY_NF_NAT_H*/
diff --git a/net-misc/miniupnpd/miniupnpd-1.7.ebuild b/net-misc/miniupnpd/miniupnpd-1.7.ebuild
deleted file mode 100644
index 3e7f8cf47988..000000000000
--- a/net-misc/miniupnpd/miniupnpd-1.7.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/miniupnpd-1.7.ebuild,v 1.1 2012/06/03 16:26:12 gurligebis Exp $
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-MY_PV=1.7
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DESCRIPTION="MiniUPnP IGD Daemon"
-SRC_URI="http://miniupnp.free.fr/files/${PN}-${MY_PV}.tar.gz"
-HOMEPAGE="http://miniupnp.free.fr/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=net-firewall/iptables-1.4.6"
-DEPEND="${RDEPEND}
- sys-apps/util-linux
- sys-apps/lsb-release"
-
-src_prepare() {
- mv Makefile.linux Makefile
- sed -i \
- -e "s#^CFLAGS = .*-D#CPPFLAGS += -I/usr/include -D#" \
- -e '/^CFLAGS :=/s/CFLAGS/CPPFLAGS/g' \
- -e "s/CFLAGS += -ansi/#CFLAGS += -ansi/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
-
- sed -i \
- -e 's/\/\*#define ENABLE_LEASEFILE\*\//#define ENABLE_LEASEFILE/g' \
- config.h || die
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install () {
- einstall PREFIX="${D}" STRIP="true" || die "einstall failed"
-
- newinitd "${FILESDIR}"/${PN}-init.d ${PN}
- newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
-}
-
-pkg_postinst() {
- elog "Please correct the external interface in the top of the two"
- elog "scripts in /etc/miniupnpd and edit the config file in there too"
-}
diff --git a/net-misc/miniupnpd/miniupnpd-1.8_pre20121005.ebuild b/net-misc/miniupnpd/miniupnpd-1.8.ebuild
index 1d399db5f77d..e7af42990755 100644
--- a/net-misc/miniupnpd/miniupnpd-1.8_pre20121005.ebuild
+++ b/net-misc/miniupnpd/miniupnpd-1.8.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/miniupnpd-1.8_pre20121005.ebuild,v 1.1 2012/12/31 11:04:21 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/miniupnpd-1.8.ebuild,v 1.1 2013/02/08 19:00:04 gurligebis Exp $
EAPI=2
inherit eutils toolchain-funcs
-MY_PV=1.7.20121005
+MY_PV=1.8
S="${WORKDIR}/${PN}-${MY_PV}"
DESCRIPTION="MiniUPnP IGD Daemon"