Gentoo Archives: gentoo-commits

From: Sergey Popov <pinkbyte@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/crunch/files/, app-misc/crunch/
Date: Mon, 17 Jul 2017 12:28:31
Message-Id: 1500294380.d3ce6bc5c9b5b72358119de6c6ad2baaf6cfe084.pinkbyte@gentoo
1 commit: d3ce6bc5c9b5b72358119de6c6ad2baaf6cfe084
2 Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jul 17 12:26:02 2017 +0000
4 Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 17 12:26:20 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3ce6bc5
7
8 app-misc/crunch: drop old
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.1
11
12 app-misc/crunch/Manifest | 2 --
13 app-misc/crunch/crunch-3.4.ebuild | 27 ---------------------
14 app-misc/crunch/crunch-3.5.ebuild | 29 -----------------------
15 app-misc/crunch/files/crunch-3.4-gentoo.patch | 34 ---------------------------
16 4 files changed, 92 deletions(-)
17
18 diff --git a/app-misc/crunch/Manifest b/app-misc/crunch/Manifest
19 index 69042a6e318..df53bb47284 100644
20 --- a/app-misc/crunch/Manifest
21 +++ b/app-misc/crunch/Manifest
22 @@ -1,3 +1 @@
23 -DIST crunch-3.4.tgz 38388 SHA256 cd3b46409a1d8a3adeac68b1b618b2773c7dd4085d61e37f9d02a2060f261922 SHA512 b433c4cb0eb42ce4e76bb8c77d26f3738bd73f925d69c1e4220ac186daf6b8afe20665dfb87e0e869b0a3bb91fb76f1b341a438cd219afa0629ca961c13a71a8 WHIRLPOOL b089c2306f7a4fbf5412f7667bdb521b24748f4786c2b80ae0dea78efb3e1144b53507a66a242842b73499e01ced3f7ff867b562eed6a20ee1bced2731e9d39d
24 -DIST crunch-3.5.tgz 38459 SHA256 471195d9503f3420ffe80da00c1bc2e392e9bf39918ddda3cf0eaf5ef5627fda SHA512 70280e290fae392a1bd2c07f0235945438f81bccad055fe69d2ac94fedfd5f95fc22ba528be7671bb68fd33c824171fd03589d72bd089e806ff22d88c6e6e087 WHIRLPOOL 7a3b78cdb22362ca6d2c5d1b0898a3131726bc0b505aff20f6314c5ae5e17108998d123552797e3d834301d823a70eff56eb39264f2c810c0741ab2178bf3743
25 DIST crunch-3.6.tgz 38635 SHA256 6a8f6c3c7410cc1930e6854d1dadc6691bfef138760509b33722ff2de133fe55 SHA512 85a2a12bb481988ab27a19602122abc29bb307de0af279132dcc0565dfc4ba44ab9f7ca15d876001f2e6dcf7be77ed50168cb066fc6a65bf06ec5cf9d798e81f WHIRLPOOL 79a27e8af6472f4ab5a604e42a25e80aa957dbdee91478bc228df9d5fe45864cc468a3f3aadc0883d025fa804c16fd3e2ca836ea113ad6373b73114141ea153f
26
27 diff --git a/app-misc/crunch/crunch-3.4.ebuild b/app-misc/crunch/crunch-3.4.ebuild
28 deleted file mode 100644
29 index b702344d89e..00000000000
30 --- a/app-misc/crunch/crunch-3.4.ebuild
31 +++ /dev/null
32 @@ -1,27 +0,0 @@
33 -# Copyright 1999-2013 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=5
37 -
38 -inherit eutils toolchain-funcs
39 -
40 -DESCRIPTION="A wordlist generator"
41 -HOMEPAGE="https://sourceforge.net/projects/crunch-wordlist/"
42 -SRC_URI="mirror://sourceforge/crunch-wordlist/crunch-wordlist/${P}.tgz"
43 -
44 -LICENSE="GPL-2"
45 -SLOT="0"
46 -KEYWORDS="~amd64 ~arm ~mips ~x86"
47 -
48 -src_prepare() {
49 - tc-export CC
50 - epatch "${FILESDIR}/${P}-gentoo.patch"
51 - epatch_user
52 -}
53 -
54 -src_install(){
55 - dobin crunch
56 - doman crunch.1
57 - insinto /usr/share/crunch
58 - doins charset.lst
59 -}
60
61 diff --git a/app-misc/crunch/crunch-3.5.ebuild b/app-misc/crunch/crunch-3.5.ebuild
62 deleted file mode 100644
63 index 7488fad701e..00000000000
64 --- a/app-misc/crunch/crunch-3.5.ebuild
65 +++ /dev/null
66 @@ -1,29 +0,0 @@
67 -# Copyright 1999-2014 Gentoo Foundation
68 -# Distributed under the terms of the GNU General Public License v2
69 -
70 -EAPI=5
71 -
72 -inherit eutils toolchain-funcs
73 -
74 -DESCRIPTION="A wordlist generator"
75 -HOMEPAGE="https://sourceforge.net/projects/crunch-wordlist/"
76 -SRC_URI="mirror://sourceforge/crunch-wordlist/crunch-wordlist/${P}.tgz"
77 -
78 -LICENSE="GPL-2"
79 -SLOT="0"
80 -KEYWORDS="~amd64 ~arm ~mips ~x86"
81 -
82 -src_prepare() {
83 - epatch_user
84 -}
85 -
86 -src_compile() {
87 - emake CC="$(tc-getCC)"
88 -}
89 -
90 -src_install(){
91 - dobin crunch
92 - doman crunch.1
93 - insinto /usr/share/crunch
94 - doins charset.lst
95 -}
96
97 diff --git a/app-misc/crunch/files/crunch-3.4-gentoo.patch b/app-misc/crunch/files/crunch-3.4-gentoo.patch
98 deleted file mode 100644
99 index acdc757ef61..00000000000
100 --- a/app-misc/crunch/files/crunch-3.4-gentoo.patch
101 +++ /dev/null
102 @@ -1,34 +0,0 @@
103 ---- Makefile.orig 2013-11-21 11:53:21.835712927 +0400
104 -+++ Makefile 2013-11-21 11:53:42.557713372 +0400
105 -@@ -16,19 +16,19 @@
106 - # General variables
107 - PACKAGE = crunch
108 - VERSION = 3.4
109 --PREFIX = /usr
110 -+PREFIX ?= /usr
111 - DISTDIR = $(PACKAGE)-$(VERSION)
112 - DISTFILES = crunch.c crunch.1 charset.lst
113 - BINDIR = $(PREFIX)/bin
114 - BTBINDIR = /pentest/passwords/$(PACKAGE)
115 - MANDIR = $(PREFIX)/share/man/man1
116 - INSTALL = $(shell which install)
117 --CC = $(shell which gcc)
118 -+CC ?= $(shell which gcc)
119 - LIBFLAGS = -lm
120 - THREADFLAGS = -pthread
121 - OPTFLAGS = -g -o0
122 - LINTFLAGS = -Wall -pedantic
123 --CFLAGS = $(THREADFLAGS) $(LINTFLAGS) -std=c99
124 -+CFLAGS += $(THREADFLAGS) $(LINTFLAGS) -std=c99
125 - VCFLAGS = $(THREADFLAGS) $(LINTFLAGS) -std=c99 $(OPTFLAGS)
126 - LFS = $(shell getconf POSIX_V6_ILP32_OFFBIG_CFLAGS)
127 - INSTALL_OPTIONS = -o root -g root
128 -@@ -46,7 +46,7 @@
129 -
130 - crunch: crunch.c
131 - @echo "Building binary..."
132 -- $(CC) $(CFLAGS) $(LFS) $? $(LIBFLAGS) -o $@
133 -+ $(CC) $(CFLAGS) $(LDFLAGS) $(LFS) $? $(LIBFLAGS) -o $@
134 - @echo ""
135 -
136 - # Clean target