Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/sud/files/, app-admin/sud/
Date: Fri, 29 Dec 2017 22:33:39
Message-Id: 1514586712.13c05c8df6610757b317024d339f8af680631d85.soap@gentoo
1 commit: 13c05c8df6610757b317024d339f8af680631d85
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 29 19:01:42 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 29 22:31:52 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13c05c8d
7
8 app-admin/sud: Port to EAPI 6
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 app-admin/sud/files/sud-1.3-fix-build-system.patch | 30 +++++++++++++++++++++
13 app-admin/sud/sud-1.3-r1.ebuild | 31 +++++++---------------
14 2 files changed, 40 insertions(+), 21 deletions(-)
15
16 diff --git a/app-admin/sud/files/sud-1.3-fix-build-system.patch b/app-admin/sud/files/sud-1.3-fix-build-system.patch
17 new file mode 100644
18 index 00000000000..5937d3f0a8e
19 --- /dev/null
20 +++ b/app-admin/sud/files/sud-1.3-fix-build-system.patch
21 @@ -0,0 +1,30 @@
22 +--- a/login/Makefile.am
23 ++++ b/login/Makefile.am
24 +@@ -2,5 +2,5 @@
25 + ilogin_SOURCES = login.c
26 + ilogin_CFLAGS = -Wall
27 +
28 +-install-data-hook:
29 +- chmod 500 $(sbindir)/ilogin
30 ++install-exec-hook:
31 ++ chmod 500 $(DESTDIR)$(sbindir)/ilogin
32 +--- a/su/Makefile.am
33 ++++ b/su/Makefile.am
34 +@@ -4,5 +4,5 @@
35 +
36 + INCLUDES = -I../sud
37 +
38 +-install-data-hook:
39 +- chmod 555 $(bindir)/suz
40 ++install-exec-hook:
41 ++ chmod 555 $(DESTDIR)$(bindir)/suz
42 +--- a/sud/Makefile.am
43 ++++ b/sud/Makefile.am
44 +@@ -7,5 +7,5 @@
45 + #INCLUDES = -I..
46 + CLEANFILES = conf_lexer.c conf_parser.h conf_parser.c
47 +
48 +-install-data-hook:
49 +- chmod 500 $(sbindir)/sud
50 ++install-exec-hook:
51 ++ chmod 500 $(DESTDIR)$(sbindir)/sud
52
53 diff --git a/app-admin/sud/sud-1.3-r1.ebuild b/app-admin/sud/sud-1.3-r1.ebuild
54 index ef9d6f7005d..7c72435d9c4 100644
55 --- a/app-admin/sud/sud-1.3-r1.ebuild
56 +++ b/app-admin/sud/sud-1.3-r1.ebuild
57 @@ -1,9 +1,9 @@
58 # Copyright 1999-2017 Gentoo Foundation
59 # Distributed under the terms of the GNU General Public License v2
60
61 -EAPI=2
62 +EAPI=6
63
64 -inherit eutils flag-o-matic
65 +inherit autotools flag-o-matic
66
67 DESCRIPTION="A daemon to execute processes with special privileges in a nosuid environment"
68 HOMEPAGE="http://s0ftpj.org/projects/sud/index.htm"
69 @@ -14,32 +14,21 @@ SLOT="0"
70 KEYWORDS="~amd64 ~ppc ~x86"
71 IUSE=""
72
73 +PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-build-system.patch )
74 +
75 src_prepare() {
76 - sed -i -e \
77 - 's/install-data-hook:$/& install-exec/' \
78 - -e \
79 - 's:chmod 500 $(sbindir)/ilogin:chmod 500 $(DESTDIR)$(sbindir)/ilogin:' \
80 - "${S}"/login/Makefile.in || die "sed failed."
81 - sed -i -e \
82 - 's/install-data-hook:$/& install-exec/' \
83 - -e \
84 - 's:chmod 555 $(bindir)/suz:chmod 500 $(DESTDIR)$(bindir)/suz:' \
85 - "${S}"/su/Makefile.in || die "sed failed."
86 - sed -i -e \
87 - 's/install-data-hook:$/& install-exec/' \
88 - -e \
89 - 's:chmod 500 $(sbindir)/sud:chmod 500 $(DESTDIR)$(sbindir)/sud:' \
90 - "${S}"/sud/Makefile.in || die "sed failed."
91 + default
92 + eautoreconf
93 }
94
95 src_configure() {
96 - append-flags -D_GNU_SOURCE
97 - default_src_configure
98 + append-cppflags -D_GNU_SOURCE
99 + default
100 }
101
102 src_install() {
103 - emake DESTDIR="${D}" install || die "emake install failed."
104 - dodoc AUTHORS ChangeLog* README NEWS TODO
105 + default
106 +
107 doman ilogin.1 sud.1 suz.1
108 insinto /etc
109 doins miscs/sud.conf*