url fix - bug #91953. old versions removed. stopped installing LICENSE and INSTALL files

Package-Manager: portage-2.0.51.22-r2

9 files changed, 26 insertions, 106 deletions

diff --git a/net-analyzer/oinkmaster/ChangeLog b/net-analyzer/oinkmaster/ChangeLog
index 22c992bb9399..fc90cd30d048 100644
--- a/net-analyzer/oinkmaster/ChangeLog
+++ b/net-analyzer/oinkmaster/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/oinkmaster
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/oinkmaster/ChangeLog,v 1.10 2005/07/19 15:32:59 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/oinkmaster/ChangeLog,v 1.11 2005/09/04 03:22:41 dragonheart Exp $
+
+  04 Sep 2005; Daniel Black <dragonheart@gentoo.org>
+  -files/0.9-oinkmaster.conf.patch, -oinkmaster-0.9.ebuild,
+  -oinkmaster-1.0.ebuild, oinkmaster-1.1.ebuild, oinkmaster-1.2.ebuild:
+  url fix - bug #91953 thanks to Jonathan Halcrow. old versions removed.
+  stopped installing LICENSE and INSTALL files
 
   19 Jul 2005; David Holm <dholm@gentoo.org> oinkmaster-1.2.ebuild:
   Added to ~ppc.
diff --git a/net-analyzer/oinkmaster/Manifest b/net-analyzer/oinkmaster/Manifest
index e9ec380acfbc..eb4e52ec2e3b 100644
--- a/net-analyzer/oinkmaster/Manifest
+++ b/net-analyzer/oinkmaster/Manifest
@@ -1,11 +1,16 @@
-MD5 ac200a13dfc53fcdfcb5bcfcdf2c3f41 ChangeLog 1476
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 b807b01f2e4bbab81ecbe6b01657d13b metadata.xml 220
-MD5 2937d398ccfe907f15793596549d06d4 oinkmaster-0.9.ebuild 776
-MD5 21dacbf8f309e31c8c8ef2f193150304 oinkmaster-1.0.ebuild 846
-MD5 8be3ff15ef8778cd7a801e01e9650df5 oinkmaster-1.1.ebuild 849
-MD5 3ec33048e265ef30e8411d2a70fd30cd oinkmaster-1.2.ebuild 862
-MD5 8a3bdfb991ed6d399d9b803b553e8d77 files/0.9-oinkmaster.conf.patch 1097
-MD5 98cb0dba8ab5abbc004c2b6cc9a15a5d files/digest-oinkmaster-0.9 65
-MD5 35309b89b051a4fda09d13915c69d2e8 files/digest-oinkmaster-1.0 65
+MD5 a8a65581e34ee916b05579ecb8d2e821 ChangeLog 1788
+MD5 9bfb7a103040285d749b4f2fc68f5c10 oinkmaster-1.1.ebuild 973
+MD5 0e23bcefb74fdb588b4a876c7750c75d oinkmaster-1.2.ebuild 848
 MD5 d39a6dd3af176592dc47aff3885ca667 files/digest-oinkmaster-1.1 65
 MD5 cc825c2a99a50e5fdc0dd0a10ddd5a36 files/digest-oinkmaster-1.2 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGmiSmdTrptrqvGERAt0vAKCcHknyZ1Laao490z629GaCx+GgZgCdFZac
+eEg0tHIvhUrXCLvcBPBNZQk=
+=r6dx
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/oinkmaster/files/0.9-oinkmaster.conf.patch b/net-analyzer/oinkmaster/files/0.9-oinkmaster.conf.patch
deleted file mode 100644
index fae4045543dc..000000000000
--- a/net-analyzer/oinkmaster/files/0.9-oinkmaster.conf.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- oinkmaster-0.9/oinkmaster.conf	2003-12-01 04:01:57.000000000 +0800
-+++ oinkmaster-0.9/oinkmaster.conf.new	2004-02-17 12:10:22.000000000 +0800
-@@ -13,13 +13,14 @@
- # Must begin with http://, https://, ftp://, file:// or scp://
- # and end with .tar.gz
- 
--# Use this one if you're running the latest release version of Snort
--# (or following snort-STABLE):
--url = http://www.snort.org/dl/rules/snortrules-stable.tar.gz
--
--# Use this one *only* if you're following snort-CURRENT.
--# This ruleset may only work with recent develop snapshots of Snort!
--# url = http://www.snort.org/dl/rules/snortrules-current.tar.gz
-+# If you use a CVS snapshot of Snort, use this:
-+#url = http://www.snort.org/dl/rules/snortrules-snapshot-CURRENT.tar.gz
-+
-+# If you use Snort 2.1.x, use this:
-+url = http://www.snort.org/dl/rules/snortrules-snapshot-2_1.tar.gz
-+
-+# If you use Snort 2.0.x, use this:
-+#url = http://www.snort.org/dl/rules/snortrules-snapshot-2_0.tar.gz
- 
- # Or if you prefer to download the rules archive from outside Oinkmaster,
- # you can then point to the file on your local filesystem by using
diff --git a/net-analyzer/oinkmaster/files/digest-oinkmaster-0.9 b/net-analyzer/oinkmaster/files/digest-oinkmaster-0.9
deleted file mode 100644
index b505212f24e6..000000000000
--- a/net-analyzer/oinkmaster/files/digest-oinkmaster-0.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8ed30c07f2ef5c977e1201a014bf9c5c oinkmaster-0.9.tar.gz 38511
diff --git a/net-analyzer/oinkmaster/files/digest-oinkmaster-1.0 b/net-analyzer/oinkmaster/files/digest-oinkmaster-1.0
deleted file mode 100644
index 06d1afdeb137..000000000000
--- a/net-analyzer/oinkmaster/files/digest-oinkmaster-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1140fb5484944691268579ca7fc83518 oinkmaster-1.0.tar.gz 59252
diff --git a/net-analyzer/oinkmaster/oinkmaster-0.9.ebuild b/net-analyzer/oinkmaster/oinkmaster-0.9.ebuild
deleted file mode 100644
index b42979bcdfb7..000000000000
--- a/net-analyzer/oinkmaster/oinkmaster-0.9.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/oinkmaster/oinkmaster-0.9.ebuild,v 1.5 2005/01/13 10:08:13 dragonheart Exp $
-
-inherit eutils
-
-DESCRIPTION="Rule management for SNORT"
-SRC_URI="mirror://sourceforge/oinkmaster/${P}.tar.gz"
-HOMEPAGE="http://oinkmaster.sf.net/"
-
-DEPEND=""
-RDEPEND="dev-lang/perl
-	net-misc/wget
-	app-arch/tar
-	app-arch/gzip"
-
-SLOT="0"
-LICENSE="BSD"
-
-KEYWORDS="x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${PV}-oinkmaster.conf.patch
-}
-
-src_install() {
-	dobin oinkmaster.pl contrib/addmsg.pl contrib/makesidex.pl
-	dodoc ChangeLog LICENSE README INSTALL UPGRADING contrib/README.contrib
-	insinto /etc
-	doins oinkmaster.conf
-}
-
diff --git a/net-analyzer/oinkmaster/oinkmaster-1.0.ebuild b/net-analyzer/oinkmaster/oinkmaster-1.0.ebuild
deleted file mode 100644
index c6523bcb2ef5..000000000000
--- a/net-analyzer/oinkmaster/oinkmaster-1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/oinkmaster/oinkmaster-1.0.ebuild,v 1.5 2005/01/13 10:08:13 dragonheart Exp $
-
-inherit eutils
-
-DESCRIPTION="Rule management for SNORT"
-SRC_URI="mirror://sourceforge/oinkmaster/${P}.tar.gz"
-HOMEPAGE="http://oinkmaster.sf.net/"
-IUSE="X"
-
-DEPEND=""
-RDEPEND=">=dev-lang/perl-5.6.1
-	X? ( dev-perl/perl-tk )
-	net-misc/wget
-	app-arch/tar
-	app-arch/gzip"
-
-SLOT="0"
-LICENSE="BSD"
-
-KEYWORDS="x86"
-
-src_install() {
-	dobin oinkmaster.pl contrib/create-sidmap.pl contrib/addsid.pl contrib/makesidex.pl contrib/addmsg.pl
-	use X && dobin contrib/oinkgui.pl
-	dodoc FAQ UPGRADING README README.win32 README.gui LICENSE INSTALL contrib/README.contrib
-	doman oinkmaster.1
-	insinto /etc
-	doins oinkmaster.conf
-}
diff --git a/net-analyzer/oinkmaster/oinkmaster-1.1.ebuild b/net-analyzer/oinkmaster/oinkmaster-1.1.ebuild
index 53a7dbf1ea60..39d51a2ad387 100644
--- a/net-analyzer/oinkmaster/oinkmaster-1.1.ebuild
+++ b/net-analyzer/oinkmaster/oinkmaster-1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/oinkmaster/oinkmaster-1.1.ebuild,v 1.3 2005/02/25 13:26:57 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/oinkmaster/oinkmaster-1.1.ebuild,v 1.4 2005/09/04 03:22:41 dragonheart Exp $
 
 inherit eutils
 
@@ -24,8 +24,9 @@ KEYWORDS="x86 ~amd64"
 src_install() {
 	dobin oinkmaster.pl contrib/create-sidmap.pl contrib/addsid.pl contrib/makesidex.pl contrib/addmsg.pl
 	use X && dobin contrib/oinkgui.pl
-	dodoc FAQ UPGRADING README README.win32 README.gui LICENSE INSTALL contrib/README.contrib
+	dodoc FAQ UPGRADING README README.win32 README.gui contrib/README.contrib
 	doman oinkmaster.1
 	insinto /etc
-	doins oinkmaster.conf
+	sed -e 's|^url.*|url = http://www.snort.org/pub-bin/downloads.cgi/Download/comm_rules/Community-Rules.tar.gz|' \
+		oinkmaster.conf > ${D}/etc/oinkmaster.conf
 }
diff --git a/net-analyzer/oinkmaster/oinkmaster-1.2.ebuild b/net-analyzer/oinkmaster/oinkmaster-1.2.ebuild
index 89676d9c0250..e8f8e93b8f41 100644
--- a/net-analyzer/oinkmaster/oinkmaster-1.2.ebuild
+++ b/net-analyzer/oinkmaster/oinkmaster-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/oinkmaster/oinkmaster-1.2.ebuild,v 1.2 2005/07/19 15:32:59 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/oinkmaster/oinkmaster-1.2.ebuild,v 1.3 2005/09/04 03:22:41 dragonheart Exp $
 
 inherit eutils
 
@@ -25,8 +25,7 @@ src_install() {
 		contrib/makesidex.pl contrib/addmsg.pl
 	use X && dobin contrib/oinkgui.pl
 
-	dodoc FAQ UPGRADING README README.win32 README.gui LICENSE INSTALL \
-		contrib/README.contrib
+	dodoc FAQ UPGRADING README README.win32 README.gui contrib/README.contrib
 	doman oinkmaster.1
 
 	insinto /etc