diff options
Diffstat (limited to 'main')
-rw-r--r-- | main/ipfw/APKBUILD | 53 | ||||
-rw-r--r-- | main/ipfw/no-sysctl.patch | 21 | ||||
-rw-r--r-- | main/ipfw/remove-werror.patch | 10 | ||||
-rw-r--r-- | main/ipfw/type-correctness.patch | 37 |
4 files changed, 0 insertions, 121 deletions
diff --git a/main/ipfw/APKBUILD b/main/ipfw/APKBUILD deleted file mode 100644 index 8d489b80fd..0000000000 --- a/main/ipfw/APKBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# Contributor: -# Maintainer: -pkgname=ipfw -_realver=20130607 -pkgver=3.0_git${_realver} -pkgrel=1 -pkgdesc="BSD ipfw firewall and dummynet suite (linux-grsec modules)" -url="http://info.iet.unipi.it/~luigi/dummynet/" -arch="all" -license="BSD" -depends="" -makedepends="bsd-compat-headers" -install= -source="http://info.iet.unipi.it/~luigi/doc/${_realver}-${pkgname}3.tgz - no-sysctl.patch - type-correctness.patch - remove-werror.patch" -subpackages="" - -_builddir="$srcdir/ipfw3-2012" -prepare() { - local i - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done -} - -build() { - cd "$_builddir" - make ipfw -} - -package() { - cd "$_builddir" - mkdir -p "$pkgdir/usr/sbin" - install -D -m755 ipfw/ipfw "$pkgdir/usr/sbin/ipfw" -} - -md5sums="004e65e6d545a89c4dcc3e741e287444 20130607-ipfw3.tgz -77b842449998afdbce62cedca529f7f0 no-sysctl.patch -a5fd21099c3733d52164189e30abf5ce type-correctness.patch -e136911cde9e86b7ddcda4fe4af766ab remove-werror.patch" -sha256sums="7dc80437b137e629f8ef3a7889b24ffbd1c27274e9cce15fd1f3b2c8620c6d64 20130607-ipfw3.tgz -b7f3b61af1a6dd88dc01662ef524da886d1f2c4684bdfe023cb6ffe2e9da63de no-sysctl.patch -ed1e32908b748c0fed5e3eaf5d07cd7df7b67e01fe051796d1b0ca290455009d type-correctness.patch -c8fd8b2fdb25ebe639e7312d6dfd70d3320cd6d43357bb40e9361f05c9de7620 remove-werror.patch" -sha512sums="6c4c2c7d4795094b9ff72212394e7dee44e5f9e09e97021b5ac9c3fad6de5a32b1d608ae9572da17f62cb37d076d89ab26859c61255d03d6bce22ca527f2c8ec 20130607-ipfw3.tgz -e32f7bcff5b36b0405f678d3144472f8d7c76321a66a71b4515e266c35dc99378a358fd8f92eab748988e9c94fccb03f61a86acfa43b1a550a14c79a9f059715 no-sysctl.patch -653d9cc30cedf012cfda8835750b05123e208e61aad5692c6b1714708fbfdc5d04f89e2b7c7a99819cdb607703bdad4507a613bbca6e16f3a439877a320a5b16 type-correctness.patch -51a1092842c2a1f81c67de8893620ef52c62669141174539d39bb2d88c814327aa6b2900df4d5022aecdd0f9d50e552e9d989cea3bf58945ffcf2a946c9c12dc remove-werror.patch" diff --git a/main/ipfw/no-sysctl.patch b/main/ipfw/no-sysctl.patch deleted file mode 100644 index 1007728296..0000000000 --- a/main/ipfw/no-sysctl.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- ipfw3-2012.orig/ipfw/dummynet.c -+++ ipfw3-2012/ipfw/dummynet.c -@@ -17,8 +17,6 @@ - - #include <sys/types.h> - #include <sys/socket.h> --/* XXX there are several sysctl leftover here */ --#include <sys/sysctl.h> - - #include "ipfw2.h" - ---- ipfw3-2012.orig/ipfw/ipfw2.c -+++ ipfw3-2012/ipfw/ipfw2.c -@@ -24,7 +24,6 @@ - #include <sys/param.h> - #include <sys/socket.h> - #include <sys/sockio.h> --#include <sys/sysctl.h> - - #include "ipfw2.h" - diff --git a/main/ipfw/remove-werror.patch b/main/ipfw/remove-werror.patch deleted file mode 100644 index 0632d1eded..0000000000 --- a/main/ipfw/remove-werror.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/ipfw/Makefile -+++ b/ipfw/Makefile -@@ -21,7 +21,6 @@ - ifneq ($(VER),openwrt) - ifeq ($(OSARCH),Linux) - EXTRA_CFLAGS += -D__BSD_VISIBLE -- EXTRA_CFLAGS += -Werror - # Required by GCC 4.6 - EXTRA_CFLAGS += -Wno-unused-but-set-variable - endif diff --git a/main/ipfw/type-correctness.patch b/main/ipfw/type-correctness.patch deleted file mode 100644 index 287dc2cfa7..0000000000 --- a/main/ipfw/type-correctness.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- ipfw3-2012.orig/ipfw/include/timeconv.h -+++ ipfw3-2012/ipfw/include/timeconv.h -@@ -1,13 +1,15 @@ - /* - * simple override for _long_to_time() - */ -+#include <stdint.h> -+ - #ifndef _TIMECONV_H_ - #define _TIMECONV_H_ - static __inline time_t - _long_to_time(long tlong) - { -- if (sizeof(long) == sizeof(__int32_t)) -- return((time_t)(__int32_t)(tlong)); -+ if (sizeof(long) == sizeof(int32_t)) -+ return((time_t)(int32_t)(tlong)); - return((time_t)tlong); - } - ---- ipfw3-2012.orig/sys/netinet/ip_fw.h -+++ ipfw3-2012/sys/netinet/ip_fw.h -@@ -445,10 +445,10 @@ - - /* Apply ipv6 mask on ipv6 addr */ - #define APPLY_MASK(addr,mask) \ -- (addr)->__u6_addr.__u6_addr32[0] &= (mask)->__u6_addr.__u6_addr32[0]; \ -- (addr)->__u6_addr.__u6_addr32[1] &= (mask)->__u6_addr.__u6_addr32[1]; \ -- (addr)->__u6_addr.__u6_addr32[2] &= (mask)->__u6_addr.__u6_addr32[2]; \ -- (addr)->__u6_addr.__u6_addr32[3] &= (mask)->__u6_addr.__u6_addr32[3]; -+ (addr)->s6_addr32[0] &= (mask)->s6_addr32[0]; \ -+ (addr)->s6_addr32[1] &= (mask)->s6_addr32[1]; \ -+ (addr)->s6_addr32[2] &= (mask)->s6_addr32[2]; \ -+ (addr)->s6_addr32[3] &= (mask)->s6_addr32[3]; - - /* Structure for ipv6 */ - typedef struct _ipfw_insn_ip6 { |