1 |
commit: fd79bfc0c19fd6985c6b4dcd4782006eb2123a66 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 28 10:03:52 2020 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 28 10:13:35 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd79bfc0 |
7 |
|
8 |
net-ftp/gproftpd: Fix building with CFLAGS=-fno-common |
9 |
|
10 |
Also: |
11 |
- EAPI=7 |
12 |
- Use HTTPS (except for SRC_URI which was already failing) |
13 |
- Drop pointless USE flags (see below) |
14 |
- Fix dependencies: openssl is not used (drop USE=ssl), proftpd should not be a |
15 |
dependency at all as gproftpd merely edits its run-time configuration |
16 |
files, add gettext/libiconv |
17 |
- Fix .desktop file and install it at the correct location (drop |
18 |
USE=gnome) |
19 |
- Drop configuration flags that very obviously belong to proftpd and not |
20 |
gproftpd |
21 |
|
22 |
Package-Manager: Portage-2.3.100, Repoman-2.3.22 |
23 |
Closes: https://bugs.gentoo.org/710878 |
24 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
25 |
|
26 |
.../gproftpd/files/gproftpd-8.3.2-desktop.patch | 12 +++++ |
27 |
.../gproftpd/files/gproftpd-8.3.2-fno-common.patch | 25 +++++++++++ |
28 |
.../gproftpd/files/gproftpd-8.3.2-install.patch | 39 ++++++++++++++++ |
29 |
net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild | 52 ++++++++++++++++++++++ |
30 |
4 files changed, 128 insertions(+) |
31 |
|
32 |
diff --git a/net-ftp/gproftpd/files/gproftpd-8.3.2-desktop.patch b/net-ftp/gproftpd/files/gproftpd-8.3.2-desktop.patch |
33 |
new file mode 100644 |
34 |
index 00000000000..a7ac93e0c4a |
35 |
--- /dev/null |
36 |
+++ b/net-ftp/gproftpd/files/gproftpd-8.3.2-desktop.patch |
37 |
@@ -0,0 +1,12 @@ |
38 |
+--- a/desktop/net-gproftpd.desktop |
39 |
++++ b/desktop/net-gproftpd.desktop |
40 |
+@@ -16,7 +16,7 @@ |
41 |
+ GenericName=GPROFTPD |
42 |
+ Comment=Proftpd FTP server administration |
43 |
+ Exec=gproftpd |
44 |
+-Icon=gproftpd.png |
45 |
++Icon=gproftpd |
46 |
+ Terminal=false |
47 |
+ Type=Application |
48 |
+-Categories=Application;Network;X-Red-Hat-ServerConfig;X-Red-Hat-Base; |
49 |
++Categories=Network |
50 |
|
51 |
diff --git a/net-ftp/gproftpd/files/gproftpd-8.3.2-fno-common.patch b/net-ftp/gproftpd/files/gproftpd-8.3.2-fno-common.patch |
52 |
new file mode 100644 |
53 |
index 00000000000..af3b579d77f |
54 |
--- /dev/null |
55 |
+++ b/net-ftp/gproftpd/files/gproftpd-8.3.2-fno-common.patch |
56 |
@@ -0,0 +1,25 @@ |
57 |
+--- a/src/apply_user.c |
58 |
++++ b/src/apply_user.c |
59 |
+@@ -52,11 +52,6 @@ |
60 |
+ //gchar *dir; // ??? |
61 |
+ extern gchar *homedir; |
62 |
+ |
63 |
+-/* The 18 checkbox values */ |
64 |
+-gchar *dir_val[19]; // ??? |
65 |
+- |
66 |
+-char *user_profile; // ??? |
67 |
+- |
68 |
+ extern long num_rows; |
69 |
+ extern int row_pos; |
70 |
+ |
71 |
+--- a/src/dir_treeview_funcs.h |
72 |
++++ b/src/dir_treeview_funcs.h |
73 |
+@@ -18,6 +18,8 @@ |
74 |
+ * |
75 |
+ */ |
76 |
+ |
77 |
++extern gchar *dir_val[19]; |
78 |
++extern char *user_profile; |
79 |
+ |
80 |
+ gboolean dirs_foreach(GtkTreeModel *model, GtkTreePath *path, |
81 |
+ GtkTreeIter *iter, struct w *widgets); |
82 |
|
83 |
diff --git a/net-ftp/gproftpd/files/gproftpd-8.3.2-install.patch b/net-ftp/gproftpd/files/gproftpd-8.3.2-install.patch |
84 |
new file mode 100644 |
85 |
index 00000000000..3db967d01a1 |
86 |
--- /dev/null |
87 |
+++ b/net-ftp/gproftpd/files/gproftpd-8.3.2-install.patch |
88 |
@@ -0,0 +1,39 @@ |
89 |
+--- a/Makefile.am |
90 |
++++ b/Makefile.am |
91 |
+@@ -19,26 +19,28 @@ |
92 |
+ fi \ |
93 |
+ done \ |
94 |
+ fi; |
95 |
+- if test -d $(DESTDIR)$(datadir)/pixmaps; then \ |
96 |
++ if test -d $(datadir)/pixmaps; then \ |
97 |
+ cp pixmaps/gproftpd.png $(DESTDIR)$(datadir)/pixmaps/; \ |
98 |
+ fi; |
99 |
+- if test -f $(DESTDIR)$(bindir)/consolehelper && test ! -f $(DESTDIR)$(bindir)/gproftpd; then \ |
100 |
++ if test -f $(bindir)/consolehelper && test ! -f $(DESTDIR)$(bindir)/gproftpd; then \ |
101 |
+ ln -s $(DESTDIR)$(bindir)/consolehelper $(DESTDIR)$(bindir)/gproftpd; \ |
102 |
+ fi; |
103 |
+ @echo "Failsafe for a mixed environment" |
104 |
+ if test -f $(DESTDIR)/usr/local/bin/consolehelper && test ! -f $(DESTDIR)/usr/local/bin/gproftpd; then \ |
105 |
+ ln -s $(DESTDIR)/usr/local/bin/consolehelper $(DESTDIR)/usr/local/bin/gproftpd; \ |
106 |
+ fi; |
107 |
+- if test -d $(DESTDIR)$(sysconfdir)/pam.d; then \ |
108 |
++ if test -d $(sysconfdir)/pam.d; then \ |
109 |
++ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pam.d; \ |
110 |
+ cp etc/pam.d/gproftpd $(DESTDIR)$(sysconfdir)/pam.d/; \ |
111 |
+ fi; |
112 |
+- if test -d $(DESTDIR)$(sysconfdir)/security/console.apps; then \ |
113 |
++ if test -d $(sysconfdir)/security/console.apps; then \ |
114 |
+ cp etc/security/console.apps/gproftpd $(DESTDIR)$(sysconfdir)/security/console.apps/; \ |
115 |
+- fi; |
116 |
+- if test -d $(DESTDIR)$(datadir)/applications; then \ |
117 |
+- cp desktop/net-gproftpd.desktop $(DESTDIR)$(datadir)/applications/; \ |
118 |
+ fi; |
119 |
+- if test -d $(DESTDIR)$(datadir)/gnome/apps/Internet; then \ |
120 |
++ if test -d $(datadir)/applications; then \ |
121 |
++ $(mkinstalldirs) $(DESTDIR)$(datadir)/applications/; \ |
122 |
++ cp desktop/net-gproftpd.desktop $(DESTDIR)$(datadir)/applications/gproftpd.desktop; \ |
123 |
++ fi; |
124 |
++ if test -d $(datadir)/gnome/apps/Internet; then \ |
125 |
+ cp desktop/net-gproftpd.desktop $(DESTDIR)$(datadir)/gnome/apps/Internet/; \ |
126 |
+ fi; |
127 |
+ if test ! -d $(DESTDIR)$(datadir)/doc/gproftpd; then \ |
128 |
|
129 |
diff --git a/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild b/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild |
130 |
new file mode 100644 |
131 |
index 00000000000..c801cf286c7 |
132 |
--- /dev/null |
133 |
+++ b/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild |
134 |
@@ -0,0 +1,52 @@ |
135 |
+# Copyright 1999-2020 Gentoo Authors |
136 |
+# Distributed under the terms of the GNU General Public License v2 |
137 |
+ |
138 |
+EAPI=7 |
139 |
+inherit autotools |
140 |
+ |
141 |
+DESCRIPTION="GTK frontend to proftpd" |
142 |
+HOMEPAGE="https://mange.dynalias.org/linux/gproftpd" |
143 |
+SRC_URI="http://mange.dynup.net/linux/gproftpd/${P}.tar.gz" |
144 |
+LICENSE="GPL-2" |
145 |
+KEYWORDS="~amd64 ~ppc ~sparc ~x86" |
146 |
+SLOT="0" |
147 |
+ |
148 |
+RDEPEND=" |
149 |
+ >=dev-libs/atk-1.0 |
150 |
+ >=media-libs/freetype-2.0 |
151 |
+ >=x11-libs/pango-1.0 |
152 |
+ dev-libs/glib:2 |
153 |
+ virtual/libiconv |
154 |
+ x11-libs/gtk+:2 |
155 |
+" |
156 |
+DEPEND=" |
157 |
+ ${RDEPEND} |
158 |
+" |
159 |
+BDEPEND=" |
160 |
+ sys-devel/gettext |
161 |
+ virtual/pkgconfig |
162 |
+" |
163 |
+PATCHES=( |
164 |
+ "${FILESDIR}"/${P}-desktop.patch |
165 |
+ "${FILESDIR}"/${P}-fno-common.patch |
166 |
+ "${FILESDIR}"/${P}-install.patch |
167 |
+) |
168 |
+DOCS="AUTHORS ChangeLog README" |
169 |
+ |
170 |
+src_prepare() { |
171 |
+ default |
172 |
+ eautoreconf |
173 |
+} |
174 |
+ |
175 |
+src_install() { |
176 |
+ default |
177 |
+ |
178 |
+ rm -r "${D}/usr/share/doc/gproftpd" || die |
179 |
+} |
180 |
+ |
181 |
+pkg_postinst() { |
182 |
+ elog "gproftpd looks for your proftpd.conf file in /etc/proftpd" |
183 |
+ elog "run gproftpd with the option -c to specify an alternate location" |
184 |
+ elog "ex: gproftpd -c /etc/proftpd.conf" |
185 |
+ elog "Do NOT edit /etc/conf.d/proftpd with this program" |
186 |
+} |