Version bump.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

diff --git a/net-analyzer/cutter/ChangeLog b/net-analyzer/cutter/ChangeLog
index 46e06302f9e664380817df69c01cc1e4cf4b8af4..f0d54eeef35bea64ac2ff5f61ea03245f7dec6eb 100644 (file)
--- a/net-analyzer/cutter/ChangeLog
+++ b/net-analyzer/cutter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/cutter
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cutter/ChangeLog,v 1.13 2014/07/10 22:21:46 jer Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cutter/ChangeLog,v 1.14 2015/01/11 12:48:18 jer Exp $
+
+*cutter-1.04 (11 Jan 2015)
+
+  11 Jan 2015; Jeroen Roovers <jer@gentoo.org> +cutter-1.04.ebuild,
+  files/cutter-1.03-debian.patch, metadata.xml:
+  Version bump.
 
   10 Jul 2014; Jeroen Roovers <jer@gentoo.org> cutter-1.03-r1.ebuild:
   EAPI bump. Update HOMEPAGE/SRC_URI.

diff --git a/net-analyzer/cutter/Manifest b/net-analyzer/cutter/Manifest
index 8352dec62128366b6ec9c75592c2b5bba91c85d2..4941ae2796a744e8a04e354abefe4dfd7fd9255a 100644 (file)
--- a/net-analyzer/cutter/Manifest
+++ b/net-analyzer/cutter/Manifest
@@ -1,15 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX cutter-1.03-debian.patch 10101 SHA256 d94393ef26a6621d74e513780a0ebedcda860c561ebce7391b8049b3782f964f SHA512 1b5ddaa635711f67287be694e21e2929646588b524ebf09a7e31f548490b5b62269e6ad1035bcd4063c45b5e75aa8f687b88c636e5af3b6138a3fd1ea0efab69 WHIRLPOOL c0163f30a884e056b7f5ebc542e0a2b36c34aaed614628573ff3f234dc82640e9ad13ed9ebcd1e735ed20d56b63966f19fbc6572b8239d4150411eea3dab0d39
+AUX cutter-1.03-debian.patch 5160 SHA256 48fe2cb815b9c26f7307b001f4d213d899573a91567dee40f37d4a4be139acda SHA512 05eb0c5819687bbc6de4f4467013bae16b5faf470da062a847fe74cb0abf27fadf62dcf76760f43096db446a11f1b40107dd94c6003e24b50d5a3150a87327b6 WHIRLPOOL 2c4159d1fb7ca324c7c3c43e82153cbf4ce88334fe6252d65cec94d77866df0d649edd365d204b59fcfe0fe2e6c1b02c8c473ab92d2b4653c58ff3e15de0be6f
 DIST cutter-1.03.tgz 13176 SHA256 4df4fac7c2208afafb279abb443005bf77d3dcf01af05fe1f2898213b9109615 SHA512 821e8abf496e22b86bdd855fb1c9c51648a276ebb572edd2ccb172ae7025a38794df37dfe153c1807785ecec279c34b9df5e2bcc2de582b3a88ee3776cf46eea WHIRLPOOL f66ef5df14f51656505949596f6e98f8fc48c85bb200d2b54be3a71e165900e14b7c4ca1f25242fe7592054f6d5b358db13f714cf000c7e70a626961f906d425
+DIST cutter-1.04.tgz 13680 SHA256 1b336c69eb3393f6ca118a529773014c41126ac6dabd04b77151daa1c2f01180 SHA512 79c17ec8c17e696a79aa8b11fda347f2e6929eb35f9a37da450acf6aff7ab9471e13eaef24708f90f3f0c2791fade2eb944443b98df3d3ae4eef0c408abc7b3a WHIRLPOOL 6efab2b2af413600c7ff0f8d998860d635248ab81a584a5a769a723d4c5e3558d463a40d1ff2a10cd4b2344af5e8e11ab676ca866bee3efd10ebe4c2c7fe2a29
 EBUILD cutter-1.03-r1.ebuild 753 SHA256 9ef456608e3e9d02264b70fee7180fea5155725d7936a41c5cc3126386253be3 SHA512 dc2dc3e4fff58f3c5e585f88f9889403f737d25b99c4f62603abc94749dcaf4b02b0767226446d7bbd5f0dfb71902b5d6d1c7a1680cbb84c2981a7afdd02a966 WHIRLPOOL ce19863daf973fd90d8986a462a3dc71d47af25fe2b45d90e8702902a16ff7801e3780d15febe88ebf4c60eaccef65ed3d0ec2ea0785760f4166456a4ceeaa8b
-MISC ChangeLog 1802 SHA256 515f49ab576a6aeb9809c5865569c310f2c24a4d8414356bffcbc9c0eebfc879 SHA512 6792d9dc9c506f4a96b4988fb89d4c9d7daa0b738602b6033f8c2568c92709a64feedee10d795f44790ef0f4cfc618d096146a5ba0428052447042235bfa18bd WHIRLPOOL 6b89426616fa521b2e099c4cbbe57d9bb3692fb0af1b335f12a55c43fe94ff1b29fb5c7eb2f00da2c3dec0b1f6f6bf4abebd2e568657b65a202b73b8fa818056
-MISC metadata.xml 251 SHA256 02ec159f56a59bb635e6999510a81b8e606fbc5d9d21aa320ed3c8592b9ca3c8 SHA512 070b2f08fc918e4cf0d06638ef50d58aeb8b814633c1b4d94ab058b26a9b747b3a45152d9b8bca17bec41c222263f9b87ded45daa60d9ac342a380d085cf8ed2 WHIRLPOOL 775aab18a127a90df82ce0b8fb5d01f8c8fb82c8918669bb35015d64ca7ed33d072ed3de0c37fbd7e2ba514abc9073d9c90b340325a73ced70e96ea7b08e1dff
+EBUILD cutter-1.04.ebuild 758 SHA256 d495d31fbe1007d8ed276601d08fd0151f6f84acfd3a5b83de92fdfbeea0b88d SHA512 6d8aa29c26cbc0e53cb609dbbed0c7f9fd1c2b3769e34ab6ed16f2ace02c2358ae30917dfa7c725ba59a69389be5a73f17b8dd00f57a2754fb22b6c9310ea517 WHIRLPOOL 57c59c1dec6a0e1892971ae122a5689ec0bca7308c18f1f2fa8676a03bc1f9c02dc508167c70d35bb995b65f4d13f96ab8c5146caa402ceefea2bef7cbdd1005
+MISC ChangeLog 1963 SHA256 3067a076b586dab413a436ede21f3801ed79f0a7eab4a2a56f460a809d5499ef SHA512 a00707c3826413c88b8adb43e86f712e36a98e8d62394761ce5472bb704e9824c460bac9ec524623d35dcf2f07efda2b3f2e7a162cf18a3d3b8d03a1b70b0187 WHIRLPOOL fc0d921141df7e380f112e5e29fd4cdd0cafebdc64a95600facb089dbe75f0d208c7cca45d0426626ef8f54a53a7e6d246e72b27d9738bfaa6039c95d0423c13
+MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlO/EfsACgkQVWmRsqeSphOPlQCeKgm1ZAAJURz3qXRwRZEs9nQG
-CukAnjquwrfdKEklnJx9qDRF3lklIprf
-=Q71j
+iEUEAREIAAYFAlSycRQACgkQVWmRsqeSphPZlgCUDC4RU5ViZgB5vlmbw1GjyeKS
+BgCfdAa3BTGUPsIYteuH2+nvdbfNrsE=
+=kFmo
 -----END PGP SIGNATURE-----

diff --git a/net-analyzer/cutter/cutter-1.04.ebuild b/net-analyzer/cutter/cutter-1.04.ebuild
new file mode 100644 (file)
index 0000000..61f563d
--- /dev/null
+++ b/net-analyzer/cutter/cutter-1.04.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cutter/cutter-1.04.ebuild,v 1.1 2015/01/11 12:48:18 jer Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="TCP/IP Connection cutting on Linux Firewalls and Routers"
+HOMEPAGE="http://www.digitage.co.uk/digitage/software/linux-security/cutter"
+SRC_URI="http://www.digitage.co.uk/digitage/files/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+src_prepare() {
+       epatch "${FILESDIR}"/${PN}-1.03-debian.patch
+       rm -f Makefile # implicit rules are better ;x
+}
+
+src_compile() {
+       emake cutter CC="$(tc-getCC)"
+}
+
+src_install() {
+       dosbin cutter
+       dodoc README
+       doman debian/cutter.8
+}

diff --git a/net-analyzer/cutter/files/cutter-1.03-debian.patch b/net-analyzer/cutter/files/cutter-1.03-debian.patch
index e33612388476a1ea0cb3b910490bacf09aa05537..607e06df744f418769ccea31bd60b0c640038626 100644 (file)
--- a/net-analyzer/cutter/files/cutter-1.03-debian.patch
+++ b/net-analyzer/cutter/files/cutter-1.03-debian.patch
@@ -1,5 +1,5 @@
---- cutter-1.03.orig/Makefile
-+++ cutter-1.03/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -1,5 +1,5 @@
  cutter: cutter.c
 -      cc cutter.c -o cutter
@@ -7,8 +7,8 @@
  
  clean:
        rm -f cutter.o cutter
---- cutter-1.03.orig/cutter.c
-+++ cutter-1.03/cutter.c
+--- a/cutter.c
++++ b/cutter.c
 @@ -57,6 +57,7 @@
  #include <arpa/inet.h>
  #include <net/if.h>
@@ -53,149 +53,8 @@
        in_addr_t src1n, src2n, dst1n, dst2n;
        char buff[1024], *p;
        int found = 0;
---- cutter-1.03.orig/debian/compat
-+++ cutter-1.03/debian/compat
-@@ -0,0 +1 @@
-+4
---- cutter-1.03.orig/debian/dirs
-+++ cutter-1.03/debian/dirs
-@@ -0,0 +1 @@
-+usr/sbin
---- cutter-1.03.orig/debian/rules
-+++ cutter-1.03/debian/rules
-@@ -0,0 +1,79 @@
-+#!/usr/bin/make -f
-+# Sample debian/rules that uses debhelper.
-+# GNU copyright 1997 to 1999 by Joey Hess.
-+
-+# Uncomment this to turn on verbose mode.
-+#export DH_VERBOSE=1
-+
-+CFLAGS = -Wall -g
-+
-+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-+      CFLAGS += -O0
-+else
-+      CFLAGS += -O2
-+endif
-+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-+      INSTALL_PROGRAM += -s
-+endif
-+
-+configure: configure-stamp
-+configure-stamp:
-+      dh_testdir
-+      # Add here commands to configure the package.
-+
-+      touch configure-stamp
-+
-+
-+build: build-stamp
-+
-+build-stamp: configure-stamp 
-+      dh_testdir
-+
-+      # Add here commands to compile the package.
-+      $(MAKE) CFLAGS="$(CFLAGS)"
-+
-+      touch build-stamp
-+
-+clean:
-+      dh_testdir
-+      dh_testroot
-+      rm -f build-stamp configure-stamp
-+
-+      # Add here commands to clean up after the build process.
-+      -$(MAKE) clean
-+
-+      dh_clean 
-+
-+install: build
-+      dh_testdir
-+      dh_testroot
-+      dh_clean -k 
-+      dh_installdirs
-+
-+      dh_install cutter usr/sbin      
-+
-+
-+# Build architecture-independent files here.
-+binary-indep: build install
-+# We have nothing to do by default.
-+
-+# Build architecture-dependent files here.
-+binary-arch: build install
-+      dh_testdir
-+      dh_testroot
-+      dh_installchangelogs 
-+      dh_installdocs
-+      dh_installexamples
-+      dh_installman debian/cutter.8
-+      dh_link
-+      dh_strip
-+      dh_compress
-+      dh_fixperms
-+      dh_installdeb
-+      dh_shlibdeps
-+      dh_gencontrol
-+      dh_md5sums
-+      dh_builddeb
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary install configure
---- cutter-1.03.orig/debian/docs
-+++ cutter-1.03/debian/docs
-@@ -0,0 +1 @@
-+README
---- cutter-1.03.orig/debian/control
-+++ cutter-1.03/debian/control
-@@ -0,0 +1,14 @@
-+Source: cutter
-+Section: net
-+Priority: optional
-+Maintainer: Aurélien GÉRÔME <ag@roxor.cx>
-+Build-Depends: debhelper (>= 4.0.0)
-+Standards-Version: 3.7.2
-+
-+Package: cutter
-+Architecture: any
-+Depends: ${shlibs:Depends}
-+Description: disconnect routed IP connections
-+ Cutter will send packets to both ends of a TCP/IP connection to close
-+ the connection.  It is designed to be used on a Linux router to disconnect
-+ unwanted connections.
---- cutter-1.03.orig/debian/copyright
-+++ cutter-1.03/debian/copyright
-@@ -0,0 +1,27 @@
-+This package was debianized by Blars Blarson <blarson@blars.org> on
-+Sun, 26 Oct 2003 22:03:43 -0800.
-+
-+It was downloaded from http://www.lowth.com/cutter/
-+
-+Copyright Holder: 2003-2005 Chris Lowth <chris@lowth.com>
-+
-+License:
-+
-+   GNU GENERAL PUBLIC LICENSE Version 2, June 1991
-+
-+   This package is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; version 2 dated June, 1991.
-+
-+   This package is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+   02110-1301  USA
-+
-+On Debian GNU/Linux systems, the complete text of the GNU General
-+Public License can be found in `/usr/share/common-licenses/GPL'.
---- cutter-1.03.orig/debian/cutter.8
-+++ cutter-1.03/debian/cutter.8
+--- a/debian/cutter.8
++++ b/debian/cutter.8
 @@ -0,0 +1,124 @@
 +.\"                                      Hey, EMACS: -*- nroff -*-
 +.TH CUTTER 8 "April, 2005"
@@ -321,42 +180,3 @@
 +Blars Blarson addapted the README and web page written by Chris Lowth
 +into this man page for debian package of cutter.  This man page may be
 +distribuated under the terms of the Gnu GPL version 2.
---- cutter-1.03.orig/debian/changelog
-+++ cutter-1.03/debian/changelog
-@@ -0,0 +1,36 @@
-+cutter (1.03-2) unstable; urgency=low
-+
-+  * Adopt the package (Closes: #316195).
-+  * Update the manpage cutter.8.
-+  * Remove an old manpage manpage.1 left alone in the build system.
-+
-+ -- Aurélien GÉRÔME <ag@roxor.cx>  Sat, 22 Jul 2006 20:00:30 +0200
-+
-+cutter (1.03-1) unstable; urgency=low
-+
-+  * QA Upload
-+  * New upstream release.
-+  * Move cutter.8 to debian/
-+  * Conforms with new standards version
-+  * Update debian/copyright (new FSF Address)
-+  * Pass CFLAGS to Makefile
-+  * Fix Manpage
-+       + Most changes stripped from a patch  provided by Christian 
-+         Aichinger, thanks.  (Closes: #372251)
-+
-+ -- Michael Ablassmeier <abi@debian.org>  Wed, 14 Jun 2006 09:37:08 +0200
-+
-+cutter (1.02-2) unstable; urgency=low
-+
-+  * Package is orphaned; set maintainer to QA group.
-+  * Fix parsing of /proc/net/ip_conntrack for 2.6 kernels, unbreaking the
-+    package for those; patch from Christian Aichinger. (Closes: #232058)
-+
-+ -- Steinar H. Gunderson <sesse@debian.org>  Fri,  9 Jun 2006 21:08:56 +0200
-+
-+cutter (1.02-1) unstable; urgency=low
-+
-+  * Initial Release  (Closes: #197698)
-+  * write manpage based on readme and authors web page
-+
-+ -- Blars Blarson <blarson@blars.org>  Sun, 26 Oct 2003 22:03:43 -0800

diff --git a/net-analyzer/cutter/metadata.xml b/net-analyzer/cutter/metadata.xml
index 9713a95c794da9697d504e364625a07bf333288b..03aa50bab7e33a226c5d71690e0e01a920c3438e 100644 (file)
--- a/net-analyzer/cutter/metadata.xml
+++ b/net-analyzer/cutter/metadata.xml
@@ -2,5 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<longdescription>TCP/IP Connection cutting on Linux Firewalls and Routers</longdescription>
 </pkgmetadata>